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

implemented DEVICE msg again.

Browse Source
This commit is contained in:
Martin Preuss
2023-04-18 23:46:58 +02:00
parent 5c111aa935
commit 87c1692a7c
1 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
avr/comproto_device.asm
View File

@@ -21,46 +21,32 @@
; ;
; IN: ; IN:
; - R16: destination address ; - R16: destination address
; - X : buffer to write to
; OUT: ; OUT:
; - CFLAG: set if okay, clear otherwise ; - nothing
; MODIFIED REGS: R6, R16, R17, R18, R20 (R3, R4, R15, R19, R21, X) ; REGS: R3, R4, R16, R17, R18, X (R19, R20, R21)
CPRO_EnqueueDevice:
mov r6, r16
rcall COM_AllocBufferAndGetXY ; (r16, r17, r21)
brcc CPRO_EnqueueDevice_error
CPRO_WriteDevice:
ldi r17, COM2_PAYLOAD_FLAGS_UID | (6<<COM2_PAYLOAD_FLAGS_SHIFT_NUM)
ldi r18, CPRO_CMD_DEVICE
push xh push xh
push xl push xl
mov r16, r6 rcall COM2_BeginMsgWithVariablePayload ; (R3, R4, R16, R17, R18, R19, R20, R21, X)
ldi r17, CPRO_PAYLOAD_FLAGS_UID | (6<<CPRO_PAYLOAD_FLAGS_SHIFT_NUM) lds r17, firmwareType
ldi r18, CPRO_CMD_DEVICE
rcall cproBeginMsgWithVariablePayload ; (R3, R4, R16, R17, R18, R19, R20, R21, X)
ldi r17, LOW(FW_TYPE)
st X+, r17 ; 6: firmware type low st X+, r17 ; 6: firmware type low
ldi r17, HIGH(FW_TYPE) lds r17, firmwareType+1
st X+, r17 ; 7: firmware type high st X+, r17 ; 7: firmware type high
ldi r17, FW_MAIN_VERSION_LOW lds r17, firmwareVersion
st X+, r17 ; 8: version low st X+, r17 ; 8: version low
ldi r17, FW_MAIN_VERSION_HIGH lds r17, firmwareVersion+1
st X+, r17 ; 9: version high st X+, r17 ; 9: version high
ldi r17, LOW(MODULES_MASK) lds r17, firmwareModules
st X+, r17 ; 10: modules mask low st X+, r17 ; 10: modules mask low
ldi r17, HIGH(MODULES_MASK) lds r17, firmwareModules+1
st X+, r17 ; 11: modules mask low st X+, r17 ; 11: modules mask low
pop xl pop xl
pop xh pop xh
rcall comCalcAndAddChecksumByte ; (R16, R17, R18, R19, X) rcall com2CalcAndAddChecksumByte ; (R16, R17, R18, R19, X)
; mark buffer as enqueued with PRIO "normal" (slightly limited number of retries)
ldi r20, COM_BUFFER_PRIO_NORMAL
rcall COM_EnqueuePacket ; (R15, R16)
brcc CPRO_EnqueueDevice_error
sec
ret
CPRO_EnqueueDevice_error:
clc
ret ret