X-Git-Url: http://git.smho.de/?a=blobdiff_plain;f=common%2FOWRomFunctionsDual.s;h=59b3d40757c10d338bb375afda00108c7879c41f;hb=28c2911a7459ae2977c0cb0228c0ca2af1c345bf;hp=f9ffb2f9ca1e469f88587cb28125e82ca506a33e;hpb=a8381e5cea363746ce596f2b57e3dbe13d0a15a6;p=owSlave2.git

diff --git a/common/OWRomFunctionsDual.s b/common/OWRomFunctionsDual.s
index f9ffb2f..59b3d40 100644
--- a/common/OWRomFunctionsDual.s
+++ b/common/OWRomFunctionsDual.s
@@ -178,7 +178,7 @@ hrc_jmp_flasher:
 	lds r_temp,flashmarker
 	cpi r_temp,2
 	brne hrc_jmp_flasher_inc
-	ldi r_temp,0xE0
+	ldi r_temp,0xC0
 	push r_temp
 	ldi r_temp,0x0E
 	push r_temp
@@ -229,11 +229,13 @@ hrc_set_alarm_search:
 hrc_fw_configinfo1:
 	ldi r_mode,OW_FWCONFIGINFO1
 	ldi r_sendflag,1
+	CRCInit2
 	rjmp h_fwconfiginfo1
 
 hrc_fw_configinfo2:
 	ldi r_mode,OW_FWCONFIGINFO2
 	ldi r_sendflag,1
+	CRCInit2
 	rjmp h_fwconfiginfo2
 
 
@@ -557,7 +559,7 @@ OWINIT:
 	sbic _SFR_IO_ADDR(PINA),PINA5 
 	rjmp owinit_botest_end ;PINA5 nicht 0.... nicht verbunden
 	cbi _SFR_IO_ADDR(DDRA),PINA4
-	ldi r_temp,0xE0
+	ldi r_temp,0xC0
 	push r_temp
 	ldi r_temp,0x0E
 	push r_temp
@@ -610,6 +612,27 @@ owinit_odgen2:
 	brne owinit_odgen2
 	dec r_bytep
 	brne owinit_odgen1
+	;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 r_temp,7
+owinit_cpconfig1:
+	ld r_rwbyte,X+
+	st Y+,r_rwbyte
+	dec r_temp
+	brne owinit_cpconfig1
+	ldi  xl,lo8(owid2)
+	ldi  xh,hi8(owid2)
+	ldi	 yl,lo8(config_info1+9)
+	ldi  yh,hi8(config_info1+9)
+	ldi r_temp,7
+owinit_cpconfig2:
+	ld r_rwbyte,X+
+	st Y+,r_rwbyte
+	dec r_temp
+	brne owinit_cpconfig2
 
 
 	ldi r_temp,0