X-Git-Url: http://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=common%2FOWRomFunctionsDual.s;h=cb4ac7fcb556fa1e4e24324dc17a5f5af24d190e;hp=9bbf71d328e1c6afda33fc6b54b6b7fe3f403b05;hb=3f2aceaf525eeceff3baece206b2048bbf286c40;hpb=1624c8ce9acb762d2cdc0b2f6b064448561ff752

diff --git a/common/OWRomFunctionsDual.s b/common/OWRomFunctionsDual.s
index 9bbf71d..cb4ac7f 100644
--- a/common/OWRomFunctionsDual.s
+++ b/common/OWRomFunctionsDual.s
@@ -61,18 +61,20 @@
 #define OW_SEARCHROMR 4  ; next resive master answer
 #define OW_READ_COMMAND1 5
 #define OW_READ_COMMAND2 6
-#define OW_FWCONFIGINFO1 7
-#define OW_FWCONFIGINFO2 8
+#define OW_READ_COMMAND12 7 ;Skip ROM.... eigentlich nicht mit mehreren geraeten, aber bei loxone schon (CC 44)
+#define OW_FWCONFIGINFO1 8
+#define OW_FWCONFIGINFO2 9
 
 .comm idtable,64
 
 #ifdef _CHANGEABLE_ID_
-#define OW_WRITE_NEWID 9
-#define OW_READ_NEWID 10
-#define OW_SET_NEWID 11
-#define OW_FIRST_COMMAND 12
+#define OW_WRITE_NEWID 10
+#define OW_READ_NEWID 11
+#define OW_SET_NEWID 12
+#define OW_FIRST_COMMAND 13
 .comm newid,8
-       
+
+   
 .macro CHANGE_ID_COMMANDS
 	cset 0x75,OW_WRITE_NEWID
 	cljmp 0xA7,hrc_set_readid
@@ -81,7 +83,7 @@
 
 
 #else
-#define OW_FIRST_COMMAND 9
+#define OW_FIRST_COMMAND 10
 #endif
 
 #ifndef _DIS_FLASH_
@@ -153,6 +155,11 @@ handle_stable:
 		rjmp h_searchromr
 		rjmp h_readcommand1 
 		rjmp h_readcommand2
+#ifdef _HANDLE_CC_COMMAND_
+		rjmp h_readcommand12
+#else
+		rjmp handle_end_no_bcount
+#endif
 		rjmp h_fwconfiginfo1
 		rjmp h_fwconfiginfo2
 #ifdef _CHANGEABLE_ID_
@@ -169,7 +176,9 @@ h_readromcommand:
 	cjmp 0x55,hrc_set_matchrom
 	cjmp 0xF0,hrc_set_searchrom
 	cjmp 0xEC,hrc_set_alarm_search
-	
+#ifdef _HANDLE_CC_COMMAND_
+	cjmp 0xCC,hrc_start_read_command12
+#endif
 	rjmp handle_end_sleep
 
 #ifndef _DIS_FLASH_
@@ -218,6 +227,11 @@ hrc_start_read_command2:
 	ldi r_mode,OW_READ_COMMAND2
 	rjmp handle_end
 
+#ifdef _HANDLE_CC_COMMAND_
+hrc_start_read_command12:
+	ldi r_mode,OW_READ_COMMAND12
+	rjmp handle_end
+#endif
 
 hrc_set_alarm_search:
 	lds r_temp,alarmflag