tm3d
/
owSlave2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- OWINIT save Register used in C
[owSlave2.git]
/
DS2438_SHT2X
/
DS2438_SHT2X.c
diff --git
a/DS2438_SHT2X/DS2438_SHT2X.c
b/DS2438_SHT2X/DS2438_SHT2X.c
index
00345f6
..
dddca10
100644
(file)
--- a/
DS2438_SHT2X/DS2438_SHT2X.c
+++ b/
DS2438_SHT2X/DS2438_SHT2X.c
@@
-55,7
+55,7
@@
extern uint8_t gcontrol;
extern uint8_t reset_indicator;
extern uint8_t alarmflag;
extern uint8_t reset_indicator;
extern uint8_t alarmflag;
-volatile uint8_t wdcounter;
+volatile uint8_t wdcounter
=5
;
typedef union {
typedef union {
@@
-180,7
+180,7
@@
int main(void){
if (testSW()) {
am2302_hum= humidityRH*10.0;
am2302_temp=temperatureC*25.6;
if (testSW()) {
am2302_hum= humidityRH*10.0;
am2302_temp=temperatureC*25.6;
- am2302_temp=am2302_temp-45;
+
//
am2302_temp=am2302_temp-45;
config_info[5]=8;
}else{
config_info[5]=8;
}else{
@@
-189,7
+189,7
@@
int main(void){
//am2302_hum=0.318*hhum +76.0;
am2302_hum=0.31*hhum +80;
am2302_temp=temperatureC*25.6;
//am2302_hum=0.318*hhum +76.0;
am2302_hum=0.31*hhum +80;
am2302_temp=temperatureC*25.6;
- am2302_temp=am2302_temp-45;
+
//
am2302_temp=am2302_temp-45;
config_info[5]=7;
}
//PORTB&=~(1<<PINB1);
config_info[5]=7;
}
//PORTB&=~(1<<PINB1);