X-Git-Url: https://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=common%2FOWRomFunctionsDual.s;h=d4d13d56a8a28a06baf83831410334c2146edc4b;hp=6f1e7095a5ce823eefe7fd5204b1341fc11ee6ba;hb=refs%2Fheads%2Fmaster;hpb=6467d8138460abffd9ddabc7b0a9f00c764af19c

diff --git a/common/OWRomFunctionsDual.s b/common/OWRomFunctionsDual.s
index 6f1e709..d4d13d5 100644
--- a/common/OWRomFunctionsDual.s
+++ b/common/OWRomFunctionsDual.s
@@ -105,7 +105,7 @@
 	cljmp 0x85,hrc_fw_configinfo2
 .endm
 
-#ifdef _CHANGEABLE_ID_
+//#ifdef _CHANGEABLE_ID_ //--> ID vom EEPROM lesen auch wenn sie sich nicht ändern laesst
 ; lesen der ID aus dem EEPROM beim Start
 read_EEPROM_ID1:  
 	ldi r_temp2,lo8(E2END)
@@ -139,7 +139,7 @@ read_EEPROM_ID_loop:
 	brne read_EEPROM_ID_loop
 read_EEPROM_ID_end:
 	ret
-#endif
+//#endif
 
 
 
@@ -187,11 +187,7 @@ hrc_jmp_flasher:
 	lds r_temp,flashmarker
 	cpi r_temp,2
 	brne hrc_jmp_flasher_inc
-	ldi r_temp,0xC0
-	push r_temp
-	ldi r_temp,0x0E
-	push r_temp
-	ret ; Direkter Sprung zum Bootloader
+	JMP_FLASHER
 hrc_jmp_flasher_inc:
 	inc r_temp
 	sts flashmarker,r_temp
@@ -426,7 +422,7 @@ h_fwconfiginfo2:
 h_fwconfiginfo_go:
 	cpi  r_bytep,24
 	breq h_fwconfiginfo_crc
-#ifdef _CRC8_
+#if defined(_CRC8_)  || defined( _CRC8_16_) 
 	cpi  r_bytep,25
 	breq h_fwconfiginfo_all
 #elif defined _CRC16_
@@ -587,27 +583,7 @@ OWINIT:
 	;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
-	sbi _SFR_IO_ADDR(PORTA),PINA4 ;internal pullup on PINA4
-	rcall spause
-	sbis _SFR_IO_ADDR(PINA),PINA5
-	rjmp owinit_botest_end  ;PinA5 nicht auf 1
-  	sbis _SFR_IO_ADDR(PINA),PINA4
-	rjmp owinit_botest_end ;PinA4 nicht auf 1
-	cbi _SFR_IO_ADDR(PORTA),PINA4 
-	sbi _SFR_IO_ADDR(DDRA),PINA4  ;PINA4 AUSGANG und 0
-	rcall spause
-	sbic _SFR_IO_ADDR(PINA),PINA5 
-	rjmp owinit_botest_end ;PINA5 nicht 0.... nicht verbunden
-	cbi _SFR_IO_ADDR(DDRA),PINA4
-	ldi r_temp,0xC0
-	push r_temp
-	ldi r_temp,0x0E
-	push r_temp
-	ret ; Direkter Sprung zum Bootloader*/
-owinit_botest_end:
+	CHECK_BOOTLOADER_PIN 
 #endif
 	HW_INIT  //Microcontroller specific
 	CHIP_INIT //1-Wire device specific
@@ -619,10 +595,10 @@ init_idtable:
 	push r_rwbyte
 	push r_idn1
 	push r_idn2
-#ifdef _CHANGEABLE_ID_
+//#ifdef _CHANGEABLE_ID_
 	rcall read_EEPROM_ID1
 	rcall read_EEPROM_ID2
-#endif
+//#endif
 	ldi r_bytep,8
 	ldi r_temp,0
 	ldi  zl,lo8(idtable)