X-Git-Url: http://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=common%2FOWRomFunctionsDual.s;fp=common%2FOWRomFunctionsDual.s;h=3c2d15246ab8b5c435b795650e596f89b644bb11;hp=cb4ac7fcb556fa1e4e24324dc17a5f5af24d190e;hb=22b81b6c288ca56f58d064627c310e437f9453a4;hpb=b57c0ca6b523661b0d4e4a0bfb3626df890dfb99

diff --git a/common/OWRomFunctionsDual.s b/common/OWRomFunctionsDual.s
index cb4ac7f..3c2d152 100644
--- a/common/OWRomFunctionsDual.s
+++ b/common/OWRomFunctionsDual.s
@@ -1,4 +1,4 @@
-// Copyright (c) 2015, Tobias Mueller tm(at)tm3d.de
+// Copyright (c) 2017, Tobias Mueller tm(at)tm3d.de
 // All rights reserved. 
 // 
 // Redistribution and use in source and binary forms, with or without 
@@ -401,29 +401,36 @@ h_fwconfiginfo2:
 	configZ config_info2,r_bytep
 
 h_fwconfiginfo_go:
-	cpi  r_bytep,16
+	cpi  r_bytep,24
 	breq h_fwconfiginfo_crc
 #ifdef _CRC8_
-	cpi  r_bytep,17
+	cpi  r_bytep,25
 	breq h_fwconfiginfo_all
 #elif defined _CRC16_
-	cpi  r_bytep,17
-	breq h_fwconfiginfo_crc2
-	cpi  r_bytep,18
+	cpi  r_bytep,26
 	breq h_fwconfiginfo_all
 #else
-	cpi  r_bytep,16
+	cpi  r_bytep,25
 	breq h_fwconfiginfo_all
 #warning No CRC known code implemented
 #endif
+h_fwconfiginfo_end:
+	//configZ config_info1,r_bytep  //crc16 wird in config_info1 gespeichert, auch bei config_info2 
 	ld   r_rwbyte,Z
 	rjmp handle_end_inc
 h_fwconfiginfo_crc:
+#ifdef _CRC8_ 
 	lds r_rwbyte,crc
 	rjmp handle_end_inc
-h_fwconfiginfo_crc2:
-	lds r_rwbyte,crc+1
-	rjmp handle_end_inc
+#elif defined _CRC16_
+	lds r_temp,crc
+	com r_temp
+	sts config_info1+24,r_temp
+	lds r_temp,crc+1
+	com r_temp
+	sts config_info1+25,r_temp
+	rjmp h_fwconfiginfo_end
+#endif
 h_fwconfiginfo_all:
 	rjmp handle_end_sleep
 
@@ -630,8 +637,8 @@ owinit_odgen2:
 	;copy ids in config bytes
 	ldi  xl,lo8(owid1)
 	ldi  xh,hi8(owid1)
-	ldi	 yl,lo8(config_info2+9)
-	ldi  yh,hi8(config_info2+9)
+	ldi	 yl,lo8(config_info2+17)
+	ldi  yh,hi8(config_info2+17)
 	ldi r_temp,7
 owinit_cpconfig1:
 	ld r_rwbyte,X+
@@ -640,8 +647,8 @@ owinit_cpconfig1:
 	brne owinit_cpconfig1
 	ldi  xl,lo8(owid2)
 	ldi  xh,hi8(owid2)
-	ldi	 yl,lo8(config_info1+9)
-	ldi  yh,hi8(config_info1+9)
+	ldi	 yl,lo8(config_info1+17)
+	ldi  yh,hi8(config_info1+17)
 	ldi r_temp,7
 owinit_cpconfig2:
 	ld r_rwbyte,X+