Change from 16 to 24 Byte Config Code

[owSlave2.git] / common / OWRomFunctions.s

diff --git a/common/OWRomFunctions.s b/common/OWRomFunctions.s
index e5c007b..fb1d85b 100644 (file)
--- a/common/OWRomFunctions.s
+++ b/common/OWRomFunctions.s
@@ -1,4 +1,4 @@
-// Copyright (c) 2015, Tobias Mueller tm(at)tm3d.de\r
+// Copyright (c) 2017, Tobias Mueller tm(at)tm3d.de\r
 // All rights reserved. \r
 // \r
 // Redistribution and use in source and binary forms, with or without \r
@@ -185,6 +185,8 @@ hrc_set_searchrom:
        lds r_rwbyte,owid ;erstes Byte lesen\r
        rjmp h_searchrom_next_bit\r
 \r
+\r
+\r
 hrc_start_read_command: ;Skip rom und Matchrom ok...\r
        ldi r_mode,OW_READ_COMMAND\r
        CRCInit1\r
@@ -312,30 +314,36 @@ h_readrom_all:
 ;---------------------------------------------------\r
 \r
 h_fwconfiginfo:\r
-       cpi  r_bytep,16\r
+       cpi  r_bytep,24\r
        breq h_fwconfiginfo_crc\r
 #ifdef _CRC8_\r
-       cpi  r_bytep,17\r
+       cpi  r_bytep,25\r
        breq h_fwconfiginfo_all\r
 #elif defined _CRC16_\r
-       cpi  r_bytep,17\r
-       breq h_fwconfiginfo_crc2\r
-       cpi  r_bytep,18\r
+       cpi  r_bytep,26\r
        breq h_fwconfiginfo_all\r
 #else\r
-       cpi  r_bytep,16\r
+       cpi  r_bytep,25\r
        breq h_fwconfiginfo_all\r
 #warning No CRC known code implemented\r
 #endif\r
+h_fwconfiginfo_end:\r
        configZ config_info,r_bytep\r
        ld   r_rwbyte,Z\r
        rjmp handle_end_inc\r
 h_fwconfiginfo_crc:\r
+#ifdef _CRC8_\r
        lds r_rwbyte,crc\r
        rjmp handle_end_inc\r
-h_fwconfiginfo_crc2:\r
-       lds r_rwbyte,crc+1\r
-       rjmp handle_end_inc\r
+#elif defined _CRC16_\r
+       lds r_temp,crc\r
+       com r_temp\r
+       sts config_info+24,r_temp\r
+       lds r_temp,crc+1\r
+       com r_temp\r
+       sts config_info+25,r_temp\r
+       rjmp h_fwconfiginfo_end\r
+#endif\r
 h_fwconfiginfo_all:\r
        rjmp handle_end_sleep\r
 \r