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

avr/modules/flash: make protocol more robust

Browse Source 
- wait for ATTN high after error receiving a packet
- use different wait times when waiting for FLASH_START and FLASH_DATA
This commit is contained in:
Martin Preuss
2025-05-05 21:05:07 +02:00
parent 9063962c7d
commit eecb022a0c
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
avr/modules/flash/defs.asm
View File

@@ -29,5 +29,6 @@
.equ FLASH_PACKET_START_OFFS_UID = FLASH_MSG_OFFS_PAYLOAD+0 ; 4 bytes .equ FLASH_PACKET_START_OFFS_UID = FLASH_MSG_OFFS_PAYLOAD+0 ; 4 bytes
.equ FLASH_WAITFORDATA_TRIES = 30
.equ FLASH_WAITFORSTART_TRIES = 5

8
avr/modules/flash/flashprocess.asm
View File

@@ -48,6 +48,7 @@ checkFlash:
rcall ioRawSendMsg ; (r16, r17, X) rcall ioRawSendMsg ; (r16, r17, X)
ldi r16, NETMSG_CMD_FLASH_START ldi r16, NETMSG_CMD_FLASH_START
ldi r20, FLASH_WAITFORSTART_TRIES
rcall ioWaitForGivenMsg ; (r16, r17, r18, r19, r20, r22, X) rcall ioWaitForGivenMsg ; (r16, r17, r18, r19, r20, r22, X)
brcc checkFlash_end brcc checkFlash_end
@@ -59,8 +60,8 @@ checkFlash:
ldi xl, LOW(flashRecvBuffer) ldi xl, LOW(flashRecvBuffer)
ldi xh, HIGH(flashRecvBuffer) ldi xh, HIGH(flashRecvBuffer)
rcall flashProcessHandleFlashStart rcall flashProcessHandleFlashStart
brcc checkFlash_end ; brcc checkFlash_end
sec ; sec
checkFlash_end: checkFlash_end:
ret ret
; @end ; @end
@@ -80,6 +81,7 @@ flashProcess:
flashProcess_loop1: flashProcess_loop1:
; wait up to 10s for incoming FLASH_DATA message ; wait up to 10s for incoming FLASH_DATA message
ldi r16, NETMSG_CMD_FLASH_DATA ldi r16, NETMSG_CMD_FLASH_DATA
ldi r20, FLASH_WAITFORDATA_TRIES
rcall ioWaitForGivenMsg ; (r16, r17, r18, r19, r20, r22, X) rcall ioWaitForGivenMsg ; (r16, r17, r18, r19, r20, r22, X)
brcc flashProcess_end ; no FLASH_DATA or FLASH_END msg brcc flashProcess_end ; no FLASH_DATA or FLASH_END msg
; either FLASH_DATA or FLASH_END received ; either FLASH_DATA or FLASH_END received
@@ -186,7 +188,7 @@ flashProcessHandleFlashData_sendResponse:
pop r16 pop r16
#endif #endif
ldi r24, 50 ldi r24, 25
rcall flashWaitForMillisecs ; (R22, R24) rcall flashWaitForMillisecs ; (R22, R24)
rcall flashProcessSendFlashResponse ; (R16, R17, R18, R19, R20, X) rcall flashProcessSendFlashResponse ; (R16, R17, R18, R19, R20, X)
sbi LED_PIN, LED_PINNUM ; toggle sbi LED_PIN, LED_PINNUM ; toggle

2
avr/modules/flash/io.asm
View File

@@ -22,10 +22,10 @@
; @return CFLAG set if okay (packet received), cleared on error ; @return CFLAG set if okay (packet received), cleared on error
; @return r16 code of received msg ; @return r16 code of received msg
; @param r16 command to wait for ; @param r16 command to wait for
; @param r20 number of tries (low number when waiting for FLASH_START, higher when waiting for FLASH_DATA)
; @clobbers: r16, r17, r20, X (r18, r19, r22) ; @clobbers: r16, r17, r20, X (r18, r19, r22)
ioWaitForGivenMsg: ioWaitForGivenMsg:
ldi r20, 10 ; number of tries
ioWaitForGivenMsg_loop: ioWaitForGivenMsg_loop:
push r16 push r16
push r20 push r20

5
avr/modules/flash/io_bitbang.asm
View File

@@ -135,6 +135,11 @@ ioRawWaitForValidMsg_attnLow:
ldi r17, FLASH_RECVBUFFER_MAXLEN-3 ldi r17, FLASH_RECVBUFFER_MAXLEN-3
rcall ioRawReceivePacketIntoBuffer rcall ioRawReceivePacketIntoBuffer
brcs ioRawWaitForValidMsg_packetReceived brcs ioRawWaitForValidMsg_packetReceived
; wait until ATTN is high (up to 10s)
ldi r16, 0xff ; expect ATTN high
ldi r17, 100
rcall ioWaitForAttnState100ms ; wait for up to 10s
clc
ret ret
ioRawWaitForValidMsg_packetReceived: ioRawWaitForValidMsg_packetReceived:
ldi r16, 0xff ; expect ATTN high ldi r16, 0xff ; expect ATTN high