X-Git-Url: http://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=common%2FOWRomFunctionsDual.s;fp=common%2FOWRomFunctionsDual.s;h=6f1e7095a5ce823eefe7fd5204b1341fc11ee6ba;hp=3c2d15246ab8b5c435b795650e596f89b644bb11;hb=485bc58764a5b2a1296dee25aadb42316e8defe0;hpb=a07a7e7b05471927bf3046ee265792231711f8a4

diff --git a/common/OWRomFunctionsDual.s b/common/OWRomFunctionsDual.s
index 3c2d152..6f1e709 100644
--- a/common/OWRomFunctionsDual.s
+++ b/common/OWRomFunctionsDual.s
@@ -213,13 +213,13 @@ hrc_set_searchrom:
 	rjmp h_searchrom_next_bit
 
 hrc_start_read_command: ;Skip rom und Matchrom ok...
+	CRCInit1
 	lds r_temp,srbyte
 	cpi r_temp,1
 	breq hrc_start_read_command1
 	cpi r_temp,2
 	breq hrc_start_read_command2
 	rjmp handle_end_sleep
-	CRCInit1
 hrc_start_read_command1:
 	ldi r_mode,OW_READ_COMMAND1
 	rjmp handle_end
@@ -241,17 +241,24 @@ hrc_set_alarm_search:
 	rjmp handle_end_sleep
 
 hrc_fw_configinfo1:
+#ifdef _NO_CONFIGBYTES_
+	rjmp handle_end_sleep
+#else
 	ldi r_mode,OW_FWCONFIGINFO1
 	ldi r_sendflag,1
 	CRCInit2
 	rjmp h_fwconfiginfo1
+#endif
 
 hrc_fw_configinfo2:
+#ifdef _NO_CONFIGBYTES_
+	rjmp handle_end_sleep
+#else
 	ldi r_mode,OW_FWCONFIGINFO2
 	ldi r_sendflag,1
 	CRCInit2
 	rjmp h_fwconfiginfo2
-
+#endif
 
 ;---------------------------------------------------
 ;   MATCH ROM
@@ -395,10 +402,26 @@ h_searchromr:  ; stelle um auf empfangen
 ;---------------------------------------------------
 
 h_fwconfiginfo1:
+#ifdef _NO_CONFIGBYTES_
+h_fwconfiginfo2:
+	rjmp handle_end_sleep
+#else
 	configZ config_info1,r_bytep
 	rjmp h_fwconfiginfo_go
 h_fwconfiginfo2:
 	configZ config_info2,r_bytep
+/*#ifdef _CRC16_
+	cpi  r_bytep,24
+	breq h_fwconfiginfo_crc
+	cpi  r_bytep,26
+	breq h_fwconfiginfo_all
+//h_fwconfiginfo_end:
+	//configZ config_info1,r_bytep  //crc16 wird in config_info1 gespeichert, auch bei config_info2 
+	configZ config_info2,r_bytep
+	ld   r_rwbyte,Z
+	rjmp handle_end_inc
+#endif
+*/
 
 h_fwconfiginfo_go:
 	cpi  r_bytep,24
@@ -414,8 +437,10 @@ h_fwconfiginfo_go:
 	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 
+	//configZ config_info1,r_bytep
 	ld   r_rwbyte,Z
 	rjmp handle_end_inc
 h_fwconfiginfo_crc:
@@ -429,11 +454,15 @@ h_fwconfiginfo_crc:
 	lds r_temp,crc+1
 	com r_temp
 	sts config_info1+25,r_temp
-	rjmp h_fwconfiginfo_end
+	ldi r_mode,OW_FWCONFIGINFO1  //auch CRC vom Dev 2 wird in Configinfo 1 geschrieben also da weiter machen
+	configZ config_info1,r_bytep
+	ld   r_rwbyte,Z
+	rjmp handle_end_inc
+
 #endif
 h_fwconfiginfo_all:
 	rjmp handle_end_sleep
-
+#endif
 
 ;---------------------------------------------------
 ;   CHANGE ROM FUNCTIONS
@@ -554,11 +583,10 @@ spause:
 .global OWINIT
 OWINIT:
 	
-#ifndef _DIS_FLASH_
 ; check for bootloader jumper
 	;vor allen anderen Registerconfigs
 	push r_temp
-
+#ifndef _DIS_FLASH_
 	ldi r_temp,(1<<PUD) ;enable pullup 
 	out _SFR_IO_ADDR(MCUCR) ,r_temp
 	sbi _SFR_IO_ADDR(PORTA),PINA5 ;internal pullup on PINA5
@@ -635,6 +663,7 @@ owinit_odgen2:
 	dec r_bytep
 	brne owinit_odgen1
 	;copy ids in config bytes
+#ifndef _NO_CONFIGBYTES_
 	ldi  xl,lo8(owid1)
 	ldi  xh,hi8(owid1)
 	ldi	 yl,lo8(config_info2+17)
@@ -655,7 +684,7 @@ owinit_cpconfig2:
 	st Y+,r_rwbyte
 	dec r_temp
 	brne owinit_cpconfig2
-
+#endif
 
 	ldi r_temp,0
 	sts mode,r_temp