X-Git-Url: https://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=DS2450%2FOWDS2450.S;h=aec56b74526db1a98f1d65bbe0576918b8857fa0;hp=26147866f5c74be45da0559ccd4c4c86f802e815;hb=4df4c7ba2c95a48e95873b1f3a93d62ed9727eba;hpb=22f8e0389304cc3f78fec16d8ecc30069afe8584 diff --git a/DS2450/OWDS2450.S b/DS2450/OWDS2450.S index 2614786..aec56b7 100644 --- 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_ +#define _ZERO_POLLING_ #include "../common/OWConfig.s" #include "../common/OWCRC16.s" @@ -59,6 +60,7 @@ rjmp h_convert rjmp h_convertcrc1 rjmp h_convertcrc2 + rjmp h_convert_conv .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_CONV OW_FIRST_COMMAND+12 ;--------------------------------------------------- ; READ COMMAND and start operation @@ -94,6 +96,7 @@ h_readcommand: cset 0xAA,OW_READ_MEMORY_ADDR cset 0x55,OW_WRITE_MEMORY_ADDR cset 0x3C,OW_CONVERT + FW_CONFIG_INFO #ifdef _CHANGEABLE_ID_ CHANGE_ID_COMMANDS #endif @@ -229,9 +232,13 @@ h_convertcrc2: 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