tm3d
/
owSlave2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Many changes from 2018
[owSlave2.git]
/
DS2438_SHT3X
/
DS2438_SHT3X.c
diff --git
a/DS2438_SHT3X/DS2438_SHT3X.c
b/DS2438_SHT3X/DS2438_SHT3X.c
index
d283508
..
a5b53e1
100644
(file)
--- a/
DS2438_SHT3X/DS2438_SHT3X.c
+++ b/
DS2438_SHT3X/DS2438_SHT3X.c
@@
-150,7
+150,8
@@
int main(void){
MCUSR=0;
\r
USI_TWI_Master_Initialise();
\r
\r
MCUSR=0;
\r
USI_TWI_Master_Initialise();
\r
\r
-
\r
+ pack.page3[0]=0xF1;
\r
+
\r
\r
initSHT3x(0);
\r
_delay_ms(100);
\r
\r
initSHT3x(0);
\r
_delay_ms(100);
\r
@@
-188,6
+189,7
@@
int main(void){
\r
if (((TIMSK0 & (1<<TOIE0))==0)&& (mode==0)) {
\r
MCUCR|=(1<<SE)|(1<<SM1);
\r
\r
if (((TIMSK0 & (1<<TOIE0))==0)&& (mode==0)) {
\r
MCUCR|=(1<<SE)|(1<<SM1);
\r
+
\r
MCUCR&=~(1<<ISC01);
\r
} else {
\r
MCUCR|=(1<<SE);
\r
MCUCR&=~(1<<ISC01);
\r
} else {
\r
MCUCR|=(1<<SE);
\r