tm3d
/
owSlave2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change Slave sends '0' during convert prozess on all DS18B20
[owSlave2.git]
/
DS18B20_BMP280
/
OWDS18B20.S
diff --git
a/DS18B20_BMP280/OWDS18B20.S
b/DS18B20_BMP280/OWDS18B20.S
index
27aa8d2
..
f0331cf
100644
(file)
--- a/
DS18B20_BMP280/OWDS18B20.S
+++ b/
DS18B20_BMP280/OWDS18B20.S
@@
-33,7
+33,6
@@
#define _CHANGEABLE_ID_
#define _ZERO_POLLING_
#define _CHANGEABLE_ID_
#define _ZERO_POLLING_
-//#define _DB_
#include "../common/OWConfig.s"
#include "../common/OWCRC8.s"
#include "../common/OWConfig.s"
#include "../common/OWCRC8.s"
@@
-61,6
+60,7
@@
Init_EEPROM_read:
.macro COMMAND_TABLE
rjmp h_readscratchpad
rjmp h_writescratchpad
.macro COMMAND_TABLE
rjmp h_readscratchpad
rjmp h_writescratchpad
+ rjmp h_convert_run
.endm
#include "../common/OWRomFunctions.s"
.endm
#include "../common/OWRomFunctions.s"
@@
-71,6
+71,7
@@
Init_EEPROM_read:
; Ab hier Geraeteabhaenging
#define OW_READ_SCRATCHPAD OW_FIRST_COMMAND+0
#define OW_WRITE_SCRATCHPAD OW_FIRST_COMMAND+1
; Ab hier Geraeteabhaenging
#define OW_READ_SCRATCHPAD OW_FIRST_COMMAND+0
#define OW_WRITE_SCRATCHPAD OW_FIRST_COMMAND+1
+#define OW_CONVERT_RUN OW_FIRST_COMMAND+2
;---------------------------------------------------
;---------------------------------------------------
@@
-139,8
+140,12
@@
hrc_set_convertT:
; ldi r_rwbyte,1
;hrc_set_convertT_end:
; sts alarmflag,r_rwbyte
; ldi r_rwbyte,1
;hrc_set_convertT_end:
; sts alarmflag,r_rwbyte
- rjmp handle_end_sleep
-
+ ldi r_mode,OW_CONVERT_RUN
+ ldi r_sendflag,3 ;set bit 0 and 1 for no zero polling
+h_convert_run:
+ ldi r_bcount,0
+ ldi r_rwbyte,0
+ rjmp handle_end_no_bcount
hrc_copy_scratchpad:
ldi r_bytep,2
hrc_copy_scratchpad:
ldi r_bytep,2
@@
-232,6
+237,5
@@
h_writescratchpad_all:
-
#include "../common/OWPinInterrupt.s"
.end
\ No newline at end of file
#include "../common/OWPinInterrupt.s"
.end
\ No newline at end of file