tm3d
/
owSlave2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New Devices
[owSlave2.git]
/
common
/
OWDS18B20_DS2438.S
diff --git
a/common/OWDS18B20_DS2438.S
b/common/OWDS18B20_DS2438.S
index
4ad7394
..
3694b11
100644
(file)
--- a/
common/OWDS18B20_DS2438.S
+++ b/
common/OWDS18B20_DS2438.S
@@
-33,6
+33,7
@@
\r
#define _CHANGEABLE_ID_
\r
#define _ZERO_POLLING_
\r
\r
#define _CHANGEABLE_ID_
\r
#define _ZERO_POLLING_
\r
+#define _HANDLE_CC_COMMAND_
\r
//#define _DB_
\r
\r
#include "../common/OWConfig.s"
\r
//#define _DB_
\r
\r
#include "../common/OWConfig.s"
\r
@@
-99,6
+100,14
@@
Init_EEPROM_read:
; READ COMMAND and start operation
\r
;---------------------------------------------------
\r
\r
; READ COMMAND and start operation
\r
;---------------------------------------------------
\r
\r
+#ifdef _HANDLE_CC_COMMAND_
\r
+h_readcommand12:
\r
+ clr r_bytep
\r
+ cjmp 0x44,hrc_set_convertT12
\r
+ ldi r_mode,OW_SLEEP
\r
+ rjmp handle_end
\r
+#endif
\r
+
\r
\r
h_readcommand1:
\r
clr r_bytep
\r
\r
h_readcommand1:
\r
clr r_bytep
\r
@@
-132,12
+141,21
@@
hrc_recall_eeprom1:
rcall hrc_recall_eeprom_func1
\r
rjmp handle_end
\r
\r
rcall hrc_recall_eeprom_func1
\r
rjmp handle_end
\r
\r
-
\r
+#ifdef _HANDLE_CC_COMMAND_
\r
+hrc_set_convertT12:
\r
+ ldi r_temp,3
\r
+ sts gcontrol,r_temp
\r
+ lds r_temp,am2302_temp
\r
+ sts pack2+1,r_temp
\r
+ lds r_temp,am2302_temp+1
\r
+ sts pack2+2,r_temp
\r
+ rjmp hrc_set_convertT12b
\r
+#endif
\r
\r
hrc_set_convertT1:
\r
ldi r_temp,1
\r
sts gcontrol,r_temp
\r
\r
hrc_set_convertT1:
\r
ldi r_temp,1
\r
sts gcontrol,r_temp
\r
-
\r
+hrc_set_convertT12b:
\r
ldi r_mode,OW_CONVERT_RUN1
\r
ldi r_sendflag,3 ;set bit 0 and 1 for no zero polling
\r
h_convert_run1:
\r
ldi r_mode,OW_CONVERT_RUN1
\r
ldi r_sendflag,3 ;set bit 0 and 1 for no zero polling
\r
h_convert_run1:
\r
@@
-146,6
+164,7
@@
h_convert_run1:
rjmp handle_end_no_bcount
\r
\r
\r
rjmp handle_end_no_bcount
\r
\r
\r
+
\r
hrc_copy_scratchpad1:
\r
ldi r_bytep,2
\r
configZ pack1,r_bytep
\r
hrc_copy_scratchpad1:
\r
ldi r_bytep,2
\r
configZ pack1,r_bytep
\r