martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avr: adapted to latest changes in COM2 module (using uartBitbang)

Browse Source
This commit is contained in:
Martin Preuss
2024-10-25 00:15:24 +02:00
parent e232b4adbf
commit 3546c93d23
20 changed files with 174 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
avr/modules/flash/bootloader.asm
View File

@@ -72,12 +72,11 @@ bootLoader:
; rcall watchdogOff ; turn off watchdog timer (sometimes it stays on after reboot)
; setup pins and interrupts
cbi COM_PORT_DATA, COM_PINNUM_DATA ; disable internal pullup for DATA
cbi COM_DDR_DATA, COM_PINNUM_DATA ; set DATA port as input
cbi COM_PORT_ATTN, COM_PINNUM_ATTN ; disable internal pullup for ATTN
cbi COM_DDR_ATTN, COM_PINNUM_ATTN ; set ATTN port as input
cbi COM_TXD_DATA, COM_TXD_PIN ; disable internal pullup for DATA
cbi COM_TXD_DDR, COM_TXD_PIN ; set DATA port as input
cbi COM_ATTN_OUTPUT, COM_ATTN_PIN ; disable internal pullup for ATTN
cbi COM_ATTN_DDR, COM_ATTN_PIN ; set ATTN port as input
sbi LED_DDR, LED_PINNUM ; out
cbi LED_PORT, LED_PINNUM ; on

6
avr/modules/flash/recv.asm
View File

@@ -80,7 +80,7 @@ flashWaitForSpecificMessage_isLow: ; is low, receive message, check for
ldi r17, FLASH_RECVBUFFER_MAXLEN-3
ldi xl, LOW(flashRecvBuffer)
ldi xh, HIGH(flashRecvBuffer)
rcall com2ReceivePacketRaw
rcall uartBitbang_ReceivePacketIntoBuffer
pop r17
brcc flashWaitForSpecificMessage_waitAttnHigh
ldi xl, LOW(flashRecvBuffer)
@@ -125,9 +125,9 @@ flashWaitForAttnState1ms:
ldi r24, 100
flashWaitForAttnState1ms_loop:
push r17
in r17, COM_PIN_ATTN
in r17, COM_ATTN_INPUT
eor r17, r16
andi r17, (1<<COM_PINNUM_ATTN)
andi r17, (1<<COM_ATTN_PIN)
pop r17
breq flashWaitForAttnState1ms_stateReached
rcall Utils_WaitFor10MicroSecs ; wait for 10us (R22)

4
avr/modules/flash/send.asm
View File

@@ -29,7 +29,7 @@
flashSendPacketUntilSuccess:
push xl
push xh
rcall COM2_SendPacketWithAttn ; (R16, R17, R21, R22, X)
rcall uartBitbang_SendPacket ; (R16, R17, R21, R22, X)
pop xh
pop xl
brcc flashSendPacket_error
@@ -50,7 +50,7 @@ flashSendPacket_error:
; REGS: (R16, R17, R18, R22, R24, R25)
flashWaitForAttnHigh:
rcall com2WaitForAttnHigh ; (r17, r22)
rcall uartBitbang_WaitForAttnHigh ; (r17, r22)
brcc flashWaitForAttnHigh_stillLow
ret
flashWaitForAttnHigh_stillLow: