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]
/
DS2450
/
OWDS2450.S
diff --git
a/DS2450/OWDS2450.S
b/DS2450/OWDS2450.S
index
4fba4bc
..
aec56b7
100644
(file)
--- a/
DS2450/OWDS2450.S
+++ b/
DS2450/OWDS2450.S
@@
-32,6
+32,7
@@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define _CHANGEABLE_ID_
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define _CHANGEABLE_ID_
+#define _ZERO_POLLING_
#include "../common/OWConfig.s"
#include "../common/OWCRC16.s"
#include "../common/OWConfig.s"
#include "../common/OWCRC16.s"
@@
-59,6
+60,7
@@
rjmp h_convert
rjmp h_convertcrc1
rjmp h_convertcrc2
rjmp h_convert
rjmp h_convertcrc1
rjmp h_convertcrc2
+ rjmp h_convert_conv
.endm
#include "../common/OWRomFunctions.s"
.endm
#include "../common/OWRomFunctions.s"
@@
-79,7
+81,7
@@
#define OW_CONVERT OW_FIRST_COMMAND+9
#define OW_CONVERT_CRC1 OW_FIRST_COMMAND+10
#define OW_CONVERT_CRC2 OW_FIRST_COMMAND+11
#define OW_CONVERT OW_FIRST_COMMAND+9
#define OW_CONVERT_CRC1 OW_FIRST_COMMAND+10
#define OW_CONVERT_CRC2 OW_FIRST_COMMAND+11
-
+#define OW_CONVERT_CONV OW_FIRST_COMMAND+12
;---------------------------------------------------
; READ COMMAND and start operation
;---------------------------------------------------
; READ COMMAND and start operation
@@
-230,9
+232,13
@@
h_convertcrc2:
ldi r_temp,1
sts gcontrol,r_temp
;ldi r_bcount,1
ldi r_temp,1
sts gcontrol,r_temp
;ldi r_bcount,1
- ldi r_mode,OW_SLEEP
- clr r_sendflag
- rjmp handle_end
+ ldi r_mode,OW_CONVERT_CONV
+ ;clr r_sendflag
+ ldi r_sendflag,3 ;set bit 0 and 1 for no zero polling
+h_convert_conv:
+ ldi r_bcount,0
+ ldi r_rwbyte,0
+ rjmp handle_end_no_bcount