X-Git-Url: http://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=common%2FOWRomFunctionsDual.s;fp=common%2FOWRomFunctionsDual.s;h=9bbf71d328e1c6afda33fc6b54b6b7fe3f403b05;hp=1a9b0d4217659431f8f8315715c5dfa4d55ccb2c;hb=a6a04f58e4afd20f206fdf4a8a7b3ce4062f1b67;hpb=cd92472e6fd63693741f8e168123a4182802651b diff --git a/common/OWRomFunctionsDual.s b/common/OWRomFunctionsDual.s index 1a9b0d4..9bbf71d 100644 --- a/common/OWRomFunctionsDual.s +++ b/common/OWRomFunctionsDual.s @@ -1,665 +1,665 @@ -// Copyright (c) 2015, Tobias Mueller tm(at)tm3d.de -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the -// distribution. -// * All advertising materials mentioning features or use of this -// software must display the following acknowledgement: This product -// includes software developed by tm3d.de and its contributors. -// * Neither the name of tm3d.de nor the names of its contributors may -// be used to endorse or promote products derived from this software -// without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - -.macro cjmp val,addr - cpi r_rwbyte,\val - breq \addr -.endm -.macro cljmp val,addr; Weiter sprung, wenn das ziel zu weit entfernt fuer brxx - cpi r_rwbyte,\val - brne 1f - rjmp \addr -1: -.endm - -.macro cset val,mod ;Nur der Mode wird gesetzt. Abkuerzung da oft nur das noch bleibt - cpi r_rwbyte,\val - brne 1f - ldi r_mode,\mod - rjmp handle_end -1: -.endm - - - - -#define OW_SLEEP 0 -#define OW_READ_ROM_COMMAND 1 -#define OW_MATCHROM 2 -#define OW_SEARCHROMS 3 ;next send two bit -#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 - -.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 -.comm newid,8 - -.macro CHANGE_ID_COMMANDS - cset 0x75,OW_WRITE_NEWID - cljmp 0xA7,hrc_set_readid - cljmp 0x79,hrc_set_setid -.endm - - -#else -#define OW_FIRST_COMMAND 9 -#endif - -#ifndef _DIS_FLASH_ -; test auf run flasher command 0x88 in h_readcommand -.macro FLASH_COMMANDS - cpi r_rwbyte,0x88 - brne 1f - rjmp hrc_jmp_flasher -1: ldi r_temp,0 ;Anderes Kommando flashmarker zuruecksetzen... - sts flashmarker,r_temp -.endm -#endif - - -.macro FW_CONFIG_INFO1 - cljmp 0x85,hrc_fw_configinfo1 -.endm -.macro FW_CONFIG_INFO2 - cljmp 0x85,hrc_fw_configinfo2 -.endm - -#ifdef _CHANGEABLE_ID_ -; lesen der ID aus dem EEPROM beim Start -read_EEPROM_ID1: - ldi r_temp2,lo8(E2END) - ldi zh,hi8(E2END) - subi r_temp2,7 - out _SFR_IO_ADDR(EEARH), zh - ldi r_bytep,0 - ldi zl,lo8(owid1) - ldi zh,hi8(owid1) - rjmp read_EEPROM_ID_loop -read_EEPROM_ID2: - ldi r_temp2,lo8(E2END) - ldi zh,hi8(E2END) - subi r_temp2,15 - out _SFR_IO_ADDR(EEARH), zh - ldi r_bytep,0 - ldi zl,lo8(owid2) - ldi zh,hi8(owid2) -read_EEPROM_ID_loop: - sbic _SFR_IO_ADDR(EECR), EEPE - rjmp read_EEPROM_ID_loop - out _SFR_IO_ADDR(EEARL),r_temp2 - sbi _SFR_IO_ADDR(EECR), EERE - in r_rwbyte,_SFR_IO_ADDR(EEDR) - cpi r_rwbyte,0xFF - breq read_EEPROM_ID_end - st Z+,r_rwbyte - inc r_bytep - inc r_temp2 - cpi r_bytep,8 - brne read_EEPROM_ID_loop -read_EEPROM_ID_end: - ret -#endif - - - - - - - -handle_stable: - rjmp handle_end_no_bcount // sleep eventuell reset, nichts tun und auf Timeout warten - rjmp h_readromcommand - rjmp h_matchrom - rjmp h_searchroms - rjmp h_searchromr - rjmp h_readcommand1 - rjmp h_readcommand2 - rjmp h_fwconfiginfo1 - rjmp h_fwconfiginfo2 -#ifdef _CHANGEABLE_ID_ - rjmp h_writeid - rjmp h_readid - rjmp h_setid -#endif - COMMAND_TABLE - - - -h_readromcommand: - clr r_bytep - cjmp 0x55,hrc_set_matchrom - cjmp 0xF0,hrc_set_searchrom - cjmp 0xEC,hrc_set_alarm_search - - rjmp handle_end_sleep - -#ifndef _DIS_FLASH_ -;sprung zum flasher -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 -hrc_jmp_flasher_inc: - inc r_temp - sts flashmarker,r_temp - rjmp handle_end_sleep -#endif - -hrc_set_matchrom: - ldi r_temp,3 - sts srbyte,r_temp ; Beide geraete nehmen an searchrom teil - ldi r_mode,OW_MATCHROM - rjmp handle_end - - - -hrc_set_searchrom: - ldi r_temp,3 - sts srbyte,r_temp ; Beide geraete nehmen an searchrom teil - configZ idtable,r_bytep - rjmp h_searchrom_next_bit - -hrc_start_read_command: ;Skip rom und Matchrom ok... - 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 -hrc_start_read_command2: - ldi r_mode,OW_READ_COMMAND2 - rjmp handle_end - - -hrc_set_alarm_search: - lds r_temp,alarmflag - tst r_temp - brne hrc_set_searchrom ;alarm flag nicht 0 also gehe zu searchrom - ; sonst tue nichts - rjmp handle_end_sleep - -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 - - -;--------------------------------------------------- -; MATCH ROM -;--------------------------------------------------- - - -h_matchrom: - lds r_bcount,srbyte - sbrs r_bcount,0 ;ueberspringe wenn bit 1 =0 also geraet 1 nich mehr im rennen - rjmp h_matchrom_id2 - configZ owid1,r_bytep - ld r_temp2,Z - cp r_temp2,r_rwbyte - breq h_matchrom_id2 - cbr r_bcount,1 ; loesche geraet - breq h_matchrom_sleep -h_matchrom_id2: - configZ owid2,r_bytep - ld r_temp2,Z - cp r_temp2,r_rwbyte - breq hmr_next_byte - cbr r_bcount,2 ; loesche geraet - breq h_matchrom_sleep - -hmr_next_byte: - sts srbyte,r_bcount - cpi r_bytep,7 - breq hrc_start_read_command ;Starten von Read Command - rjmp handle_end_inc - -h_matchrom_sleep: - sts srbyte,r_bcount - rjmp handle_end_sleep - - -;--------------------------------------------------- -; SEARCH ROM -;--------------------------------------------------- - - -h_searchrom_next_bit: ;Setup next Bit of ID - ld r_temp2,Z - lds r_temp,srbyte ;srbyte ist ein zeiger auf die bits fuer ein bit im Table -h_searchrom_next_bit_l2: - cpi r_temp,3 - breq h_searchrom_next_bit_l1 - lsr r_temp2 - lsr r_temp2 - inc r_temp - rjmp h_searchrom_next_bit_l2 -h_searchrom_next_bit_l1: - lsr r_temp2 - rol r_rwbyte ; negiertes bit in rwbyte - lsr r_temp2 - rol r_rwbyte ; bit in rwbyte - ldi r_sendflag,1 - ldi r_bcount,0x40 ; zwei bits sensden dann zu Searchromr - ldi r_mode,OW_SEARCHROMR - rjmp handle_end_no_bcount - - - -h_searchroms: ; Modus Send zwei bit - configZ idtable,r_bytep - ld r_temp2,Z+ - lds r_temp,srbyte - cpi r_temp,3 - breq h_searchroms_idd - cpi r_temp,1 - breq h_searchroms_id1 - cpi r_temp,2 - breq h_searchroms_id2 - rjmp handle_end_sleep ; zur Sicherheit..... -h_searchroms_idd: - andi r_rwbyte,0x80 - breq h_searchroms_idd_zero - ; Master send 1 - sbrc r_temp2,0 ;springe wenn nicht beide bits 0 (id 1 negiert und id 2 negiert) - rjmp handle_end_sleep ; - sbrc r_temp2,4 ;id1 set? then skip - cbr r_temp,1 ; loesche bit 1 in srbyte - sbrc r_temp2,2 ; springe wenn id 2 gesetzt ist - cbr r_temp,2 ; loesche bit 2 in srbyte - sts srbyte,r_temp - rjmp h_searchroms_idX_end -h_searchroms_idd_zero: - sbrc r_temp2,1 ;springe wenn nicht beide 1 (id 1 und id 2 ) - rjmp handle_end_sleep ;beide 1 gehe schlafen - sbrs r_temp2,4 ;id1 0? then skip - cbr r_temp,1 ; loesche bit 1 in srbyte - sbrs r_temp2,2 ; springe wenn id 2 null ist - cbr r_temp,2 ; loesche bit 2 in srbyte - sts srbyte,r_temp - rjmp h_searchroms_idX_end -h_searchroms_id1: - andi r_rwbyte,0x80 - breq h_searchroms_id1_zero - ; Master send 1 - sbrs r_temp2,5 ;id1 set? then skip - rjmp handle_end_sleep ; - rjmp h_searchroms_idX_end -h_searchroms_id1_zero: - sbrs r_temp2,4 ;id1 set? then skip - rjmp handle_end_sleep ; - rjmp h_searchroms_idX_end -h_searchroms_id2: - andi r_rwbyte,0x80 - breq h_searchroms_id2_zero - ; Master send 1 - sbrs r_temp2,3 ;id1 set? then skip - rjmp handle_end_sleep ; - rjmp h_searchroms_idX_end -h_searchroms_id2_zero: - sbrs r_temp2,2 ;id1 set? then skip - rjmp handle_end_sleep ; - rjmp h_searchroms_idX_end -h_searchroms_idX_end: - lds r_temp,srbyte - tst r_temp - brne h_searchroms_idX_end1 - rjmp handle_end_sleep -h_searchroms_idX_end1: - inc r_bytep - cpi r_bytep,64 - breq h_searchrom_end_ok ;unterschied nur das letzt bit wird wohl nie vorkommen - rjmp h_searchrom_next_bit - -h_searchrom_end_ok: - clr r_sendflag - rjmp hrc_start_read_command - -h_searchromr: ; stelle um auf empfangen - clr r_sendflag - ldi r_mode,OW_SEARCHROMS - ldi r_bcount,0 ;gehe nach einem bit zu SEARCHROMS - rjmp handle_end_no_bcount - - -;--------------------------------------------------- -; FW_CONFIG_INFO -;--------------------------------------------------- - -h_fwconfiginfo1: - configZ config_info1,r_bytep - rjmp h_fwconfiginfo_go -h_fwconfiginfo2: - configZ config_info2,r_bytep - -h_fwconfiginfo_go: - cpi r_bytep,16 - breq h_fwconfiginfo_crc -#ifdef _CRC8_ - cpi r_bytep,17 - breq h_fwconfiginfo_all -#elif defined _CRC16_ - cpi r_bytep,17 - breq h_fwconfiginfo_crc2 - cpi r_bytep,18 - breq h_fwconfiginfo_all -#else - cpi r_bytep,16 - breq h_fwconfiginfo_all -#warning No CRC known code implemented -#endif - ld r_rwbyte,Z - rjmp handle_end_inc -h_fwconfiginfo_crc: - lds r_rwbyte,crc - rjmp handle_end_inc -h_fwconfiginfo_crc2: - lds r_rwbyte,crc+1 - rjmp handle_end_inc -h_fwconfiginfo_all: - rjmp handle_end_sleep - - -;--------------------------------------------------- -; CHANGE ROM FUNCTIONS -;--------------------------------------------------- - - -#ifdef _CHANGEABLE_ID_ - -h_writeid: - configZ newid,r_bytep - st Z,r_rwbyte - cpi r_bytep,7 - breq h_writeid_all - rjmp handle_end_inc -h_writeid_all: - rjmp handle_end_sleep - - -hrc_set_readid: - ldi r_mode,OW_READ_NEWID - ldi r_sendflag,1 -h_readid: - cpi r_bytep,8 - breq h_readid_all - configZ newid,r_bytep - ld r_rwbyte,Z - rjmp handle_end_inc -h_readid_all: - clr r_sendflag - rjmp handle_end_sleep - -hrc_set_setid: - ldi r_mode,OW_SET_NEWID - ;ldi r_bytep,1 ;start to write in 2 - rjmp handle_end_inc ;set r_bytep to 1!!! - -h_setid: - lds r_bcount,srbyte - cpi r_bcount,2 - breq h_setid2 -h_setid1: - configZ owid1,r_bytep - rjmp h_setido -h_setid2: - configZ owid2,r_bytep -h_setido: - ld r_temp,Z - cp r_rwbyte,r_temp - brne h_setid_bad_code_all - cpi r_bytep,1 - breq h_setid_set2 - cpi r_bytep,5 - breq h_setid_set3 - cpi r_bytep,6 - breq h_setid_copy_id - rjmp h_setid_bad_code_all ;sollte eigentlich nicht passieren -h_setid_set2: - ldi r_temp,3 - add r_bytep,r_temp -h_setid_set3: - inc r_bytep - rjmp handle_end -h_setid_copy_id: - ldi r_temp2,lo8(E2END) - ldi zh,hi8(E2END) - ldi r_temp,7 - sbrc r_bcount,1 - ldi r_temp,15 - sub r_temp2,r_temp - ;ldi r_temp,0 ;kommt nicht vor das ein E2ROM genau n*256+(0 bis 7) byte gross ist - ;sbc zh - out _SFR_IO_ADDR(EEARH),zh - ldi zl,lo8(newid) - ldi zh,hi8(newid) - ldi r_bytep,0 -h_setid_EEPROM_write: - sbic _SFR_IO_ADDR(EECR), EEPE - rjmp h_setid_EEPROM_write - ldi r_temp, (0<