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

flash: wait for ATTN high before waiting for message.

Browse Source 
this helps with syncing.
This commit is contained in:
Martin Preuss
2025-05-07 20:03:58 +02:00
parent 9102d90c34
commit cc7ef0cf30
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,14 +101,14 @@ ioRawInit:
ioRawSendMsg: ioRawSendMsg:
ioRawSendMsg_loop: ioRawSendMsg_loop:
ldi r16, 0xff ; expect ATTN high ldi r16, 0xff ; expect ATTN high
ldi r17, 3 ldi r17, 10
rcall ioWaitForAttnState100ms ; wait for up to 300ms rcall ioWaitForAttnState100ms ; wait for up to 1s
brcs ioRawSendMsg_attnHigh brcs ioRawSendMsg_attnHigh
ret ret
ioRawSendMsg_attnHigh: ioRawSendMsg_attnHigh:
ldi xl, LOW(flashSendBuffer) ldi xl, LOW(flashSendBuffer)
ldi xh, HIGH(flashSendBuffer) ldi xh, HIGH(flashSendBuffer)
rcall ioRawSendPacket ; R16, R22 (R17, R21, X) rcall ioRawSendPacket ; R16, R22 (R17, R21, X)
brcc ioRawSendMsg_loop brcc ioRawSendMsg_loop
ret ret
; @end ; @end
@@ -117,12 +117,21 @@ ioRawSendMsg_attnHigh:
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; @routine ioRawWaitForValidMsg ; @routine ioRawWaitForValidMsg
;
; Wait for valid incoming msg ; Wait for valid incoming msg
; ;
; First waits for ATTN line to go high (released) then wait for ATTN
; line to go low. This way we will only start listening at the beginning of
; a message.
;
; @return CFLAG set if okay (packet received), cleared on error ; @return CFLAG set if okay (packet received), cleared on error
; @clobbers: r16, r17 (r18, r19, r20, r21, r22, X) ; @clobbers: r16, r17 (r18, r19, r20, r21, r22, X)
ioRawWaitForValidMsg: ioRawWaitForValidMsg:
ldi r16, 0xff ; expect ATTN high
ldi r17, 100
rcall ioWaitForAttnState100ms ; wait for up to 10s
brcc ioRawWaitForValidMsg_end ; ATTN not high, exit
ldi r16, 0 ; expect ATTN low ldi r16, 0 ; expect ATTN low
ldi r17, 100 ldi r17, 100
rcall ioWaitForAttnState100ms ; wait for up to 10s rcall ioWaitForAttnState100ms ; wait for up to 10s
@@ -322,7 +331,7 @@ ioRawAcquireBus:
cbi COM_ATTN_OUTPUT, COM_ATTN_PIN ; disable pullup on ATTN cbi COM_ATTN_OUTPUT, COM_ATTN_PIN ; disable pullup on ATTN
nop ; needed to sample current input nop ; needed to sample current input
sbis COM_ATTN_INPUT, COM_ATTN_PIN ; ATTN low? sbis COM_ATTN_INPUT, COM_ATTN_PIN ; ATTN low?
rjmp ioRawAcquireBus_busy ; jump if it is rjmp ioRawAcquireBus_busy ; jump if it is
sbi COM_ATTN_DDR, COM_ATTN_PIN ; set ATTN as output sbi COM_ATTN_DDR, COM_ATTN_PIN ; set ATTN as output
cbi COM_ATTN_OUTPUT, COM_ATTN_PIN ; set ATTN low cbi COM_ATTN_OUTPUT, COM_ATTN_PIN ; set ATTN low
sec sec