-// Copyright (c) 2015, Tobias Mueller tm(at)tm3d.de\r
+// Copyright (c) 2017, Tobias Mueller tm(at)tm3d.de\r
// All rights reserved. \r
// \r
// Redistribution and use in source and binary forms, with or without \r
#define OW_SEARCHROMR 4 ; next resive master answer\r
#define OW_READ_COMMAND1 5\r
#define OW_READ_COMMAND2 6\r
-#define OW_FWCONFIGINFO1 7\r
-#define OW_FWCONFIGINFO2 8\r
+#define OW_READ_COMMAND12 7 ;Skip ROM.... eigentlich nicht mit mehreren geraeten, aber bei loxone schon (CC 44)\r
+#define OW_FWCONFIGINFO1 8\r
+#define OW_FWCONFIGINFO2 9\r
\r
.comm idtable,64\r
\r
#ifdef _CHANGEABLE_ID_\r
-#define OW_WRITE_NEWID 9\r
-#define OW_READ_NEWID 10\r
-#define OW_SET_NEWID 11\r
-#define OW_FIRST_COMMAND 12\r
+#define OW_WRITE_NEWID 10\r
+#define OW_READ_NEWID 11\r
+#define OW_SET_NEWID 12\r
+#define OW_FIRST_COMMAND 13\r
.comm newid,8\r
- \r
+\r
+ \r
.macro CHANGE_ID_COMMANDS\r
cset 0x75,OW_WRITE_NEWID\r
cljmp 0xA7,hrc_set_readid\r
\r
\r
#else\r
-#define OW_FIRST_COMMAND 9\r
+#define OW_FIRST_COMMAND 10\r
#endif\r
\r
#ifndef _DIS_FLASH_\r
cljmp 0x85,hrc_fw_configinfo2\r
.endm\r
\r
-#ifdef _CHANGEABLE_ID_\r
+//#ifdef _CHANGEABLE_ID_ //--> ID vom EEPROM lesen auch wenn sie sich nicht ändern laesst\r
; lesen der ID aus dem EEPROM beim Start\r
read_EEPROM_ID1: \r
ldi r_temp2,lo8(E2END)\r
brne read_EEPROM_ID_loop\r
read_EEPROM_ID_end:\r
ret\r
-#endif\r
+//#endif\r
\r
\r
\r
rjmp h_searchromr\r
rjmp h_readcommand1 \r
rjmp h_readcommand2\r
+#ifdef _HANDLE_CC_COMMAND_\r
+ rjmp h_readcommand12\r
+#else\r
+ rjmp handle_end_no_bcount\r
+#endif\r
rjmp h_fwconfiginfo1\r
rjmp h_fwconfiginfo2\r
#ifdef _CHANGEABLE_ID_\r
cjmp 0x55,hrc_set_matchrom\r
cjmp 0xF0,hrc_set_searchrom\r
cjmp 0xEC,hrc_set_alarm_search\r
- \r
+#ifdef _HANDLE_CC_COMMAND_\r
+ cjmp 0xCC,hrc_start_read_command12\r
+#endif\r
rjmp handle_end_sleep\r
\r
#ifndef _DIS_FLASH_\r
lds r_temp,flashmarker\r
cpi r_temp,2\r
brne hrc_jmp_flasher_inc\r
- ldi r_temp,0xC0\r
- push r_temp\r
- ldi r_temp,0x0E\r
- push r_temp\r
- ret ; Direkter Sprung zum Bootloader\r
+ JMP_FLASHER\r
hrc_jmp_flasher_inc:\r
inc r_temp\r
sts flashmarker,r_temp\r
rjmp h_searchrom_next_bit\r
\r
hrc_start_read_command: ;Skip rom und Matchrom ok...\r
+ CRCInit1\r
lds r_temp,srbyte\r
cpi r_temp,1\r
breq hrc_start_read_command1\r
cpi r_temp,2\r
breq hrc_start_read_command2\r
rjmp handle_end_sleep\r
- CRCInit1\r
hrc_start_read_command1:\r
ldi r_mode,OW_READ_COMMAND1\r
rjmp handle_end\r
ldi r_mode,OW_READ_COMMAND2\r
rjmp handle_end\r
\r
+#ifdef _HANDLE_CC_COMMAND_\r
+hrc_start_read_command12:\r
+ ldi r_mode,OW_READ_COMMAND12\r
+ rjmp handle_end\r
+#endif\r
\r
hrc_set_alarm_search:\r
lds r_temp,alarmflag\r
rjmp handle_end_sleep\r
\r
hrc_fw_configinfo1:\r
+#ifdef _NO_CONFIGBYTES_\r
+ rjmp handle_end_sleep\r
+#else\r
ldi r_mode,OW_FWCONFIGINFO1\r
ldi r_sendflag,1\r
CRCInit2\r
rjmp h_fwconfiginfo1\r
+#endif\r
\r
hrc_fw_configinfo2:\r
+#ifdef _NO_CONFIGBYTES_\r
+ rjmp handle_end_sleep\r
+#else\r
ldi r_mode,OW_FWCONFIGINFO2\r
ldi r_sendflag,1\r
CRCInit2\r
rjmp h_fwconfiginfo2\r
-\r
+#endif\r
\r
;---------------------------------------------------\r
; MATCH ROM\r
;---------------------------------------------------\r
\r
h_fwconfiginfo1:\r
+#ifdef _NO_CONFIGBYTES_\r
+h_fwconfiginfo2:\r
+ rjmp handle_end_sleep\r
+#else\r
configZ config_info1,r_bytep\r
rjmp h_fwconfiginfo_go\r
h_fwconfiginfo2:\r
configZ config_info2,r_bytep\r
+/*#ifdef _CRC16_\r
+ cpi r_bytep,24\r
+ breq h_fwconfiginfo_crc\r
+ cpi r_bytep,26\r
+ breq h_fwconfiginfo_all\r
+//h_fwconfiginfo_end:\r
+ //configZ config_info1,r_bytep //crc16 wird in config_info1 gespeichert, auch bei config_info2 \r
+ configZ config_info2,r_bytep\r
+ ld r_rwbyte,Z\r
+ rjmp handle_end_inc\r
+#endif\r
+*/\r
\r
h_fwconfiginfo_go:\r
- cpi r_bytep,16\r
+ cpi r_bytep,24\r
breq h_fwconfiginfo_crc\r
-#ifdef _CRC8_\r
- cpi r_bytep,17\r
+#if defined(_CRC8_) || defined( _CRC8_16_) \r
+ cpi r_bytep,25\r
breq h_fwconfiginfo_all\r
#elif defined _CRC16_\r
- cpi r_bytep,17\r
- breq h_fwconfiginfo_crc2\r
- cpi r_bytep,18\r
+ cpi r_bytep,26\r
breq h_fwconfiginfo_all\r
#else\r
- cpi r_bytep,16\r
+ cpi r_bytep,25\r
breq h_fwconfiginfo_all\r
#warning No CRC known code implemented\r
#endif\r
+\r
+h_fwconfiginfo_end:\r
+ //configZ config_info1,r_bytep //crc16 wird in config_info1 gespeichert, auch bei config_info2 \r
+ //configZ config_info1,r_bytep\r
ld r_rwbyte,Z\r
rjmp handle_end_inc\r
h_fwconfiginfo_crc:\r
+#ifdef _CRC8_ \r
lds r_rwbyte,crc\r
rjmp handle_end_inc\r
-h_fwconfiginfo_crc2:\r
- lds r_rwbyte,crc+1\r
+#elif defined _CRC16_\r
+ lds r_temp,crc\r
+ com r_temp\r
+ sts config_info1+24,r_temp\r
+ lds r_temp,crc+1\r
+ com r_temp\r
+ sts config_info1+25,r_temp\r
+ ldi r_mode,OW_FWCONFIGINFO1 //auch CRC vom Dev 2 wird in Configinfo 1 geschrieben also da weiter machen\r
+ configZ config_info1,r_bytep\r
+ ld r_rwbyte,Z\r
rjmp handle_end_inc\r
+\r
+#endif\r
h_fwconfiginfo_all:\r
rjmp handle_end_sleep\r
-\r
+#endif\r
\r
;---------------------------------------------------\r
; CHANGE ROM FUNCTIONS\r
.global OWINIT\r
OWINIT:\r
\r
-#ifndef _DIS_FLASH_\r
; check for bootloader jumper\r
;vor allen anderen Registerconfigs\r
push r_temp\r
-\r
- ldi r_temp,(1<<PUD) ;enable pullup \r
- out _SFR_IO_ADDR(MCUCR) ,r_temp\r
- sbi _SFR_IO_ADDR(PORTA),PINA5 ;internal pullup on PINA5\r
- sbi _SFR_IO_ADDR(PORTA),PINA4 ;internal pullup on PINA4\r
- rcall spause\r
- sbis _SFR_IO_ADDR(PINA),PINA5\r
- rjmp owinit_botest_end ;PinA5 nicht auf 1\r
- sbis _SFR_IO_ADDR(PINA),PINA4\r
- rjmp owinit_botest_end ;PinA4 nicht auf 1\r
- cbi _SFR_IO_ADDR(PORTA),PINA4 \r
- sbi _SFR_IO_ADDR(DDRA),PINA4 ;PINA4 AUSGANG und 0\r
- rcall spause\r
- sbic _SFR_IO_ADDR(PINA),PINA5 \r
- rjmp owinit_botest_end ;PINA5 nicht 0.... nicht verbunden\r
- cbi _SFR_IO_ADDR(DDRA),PINA4\r
- ldi r_temp,0xC0\r
- push r_temp\r
- ldi r_temp,0x0E\r
- push r_temp\r
- ret ; Direkter Sprung zum Bootloader*/\r
-owinit_botest_end:\r
+#ifndef _DIS_FLASH_\r
+ CHECK_BOOTLOADER_PIN \r
#endif\r
HW_INIT //Microcontroller specific\r
CHIP_INIT //1-Wire device specific\r
push r_rwbyte\r
push r_idn1\r
push r_idn2\r
-#ifdef _CHANGEABLE_ID_\r
+//#ifdef _CHANGEABLE_ID_\r
rcall read_EEPROM_ID1\r
rcall read_EEPROM_ID2\r
-#endif\r
+//#endif\r
ldi r_bytep,8\r
ldi r_temp,0\r
ldi zl,lo8(idtable)\r
dec r_bytep\r
brne owinit_odgen1\r
;copy ids in config bytes\r
+#ifndef _NO_CONFIGBYTES_\r
ldi xl,lo8(owid1)\r
ldi xh,hi8(owid1)\r
- ldi yl,lo8(config_info2+9)\r
- ldi yh,hi8(config_info2+9)\r
+ ldi yl,lo8(config_info2+17)\r
+ ldi yh,hi8(config_info2+17)\r
ldi r_temp,7\r
owinit_cpconfig1:\r
ld r_rwbyte,X+\r
brne owinit_cpconfig1\r
ldi xl,lo8(owid2)\r
ldi xh,hi8(owid2)\r
- ldi yl,lo8(config_info1+9)\r
- ldi yh,hi8(config_info1+9)\r
+ ldi yl,lo8(config_info1+17)\r
+ ldi yh,hi8(config_info1+17)\r
ldi r_temp,7\r
owinit_cpconfig2:\r
ld r_rwbyte,X+\r
st Y+,r_rwbyte\r
dec r_temp\r
brne owinit_cpconfig2\r
-\r
+#endif\r
\r
ldi r_temp,0\r
sts mode,r_temp\r
tm3d / owSlave2.git / blobdiff