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

avr: updated apps and modules to latest changes.

Browse Source
This commit is contained in:
Martin Preuss
2026-05-04 14:35:20 +02:00
parent bea424de36
commit 67d5d1687d
9 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
avr/apps/door/main.asm
View File

@@ -108,8 +108,8 @@ appDoorSendValue_send:
ldi r17, VALUE_ID_TCRT1K ; VALUE ID ldi r17, VALUE_ID_TCRT1K ; VALUE ID
ldi r22, AQHOME_VALUETYPE_DOOR ; VALUE TYPE ldi r22, AQHOME_VALUETYPE_DOOR ; VALUE TYPE
rcall Main_Send8BitValueReport rcall Main_Send8BitValueReport
#ifdef MODULES_LED_ACTIVITY #ifdef MODULES_LED1
rcall LedActivity_Trigger ; (r16) rcall Led1_SetActivityTiming ; (r16)
#endif #endif
ret ret
; @end ; @end

4
avr/apps/motion/main.asm
View File

@@ -101,8 +101,8 @@ appMotionSendValue:
ldi r17, VALUE_ID_MOTION ; VALUE ID ldi r17, VALUE_ID_MOTION ; VALUE ID
ldi r22, AQHOME_VALUETYPE_MOTION ; VALUE TYPE ldi r22, AQHOME_VALUETYPE_MOTION ; VALUE TYPE
rcall Main_Send8BitValueReport rcall Main_Send8BitValueReport
#ifdef MODULES_LED_SIMPLE #ifdef MODULES_LED1
rcall LedSimple_SignalActivity ; (R18, R19, R20) rcall Led1_SetActivityTiming ; (R18, R19, R20)
#endif #endif
ret ret
; @end ; @end

2
avr/apps/network/main.asm
View File

@@ -163,7 +163,7 @@ AppNetwork_HandleMsg_handleRebootMsg:
ret ret
AppNetwork_HandleMsg_handlePingMsg: AppNetwork_HandleMsg_handlePingMsg:
#ifdef MODULES_LED_SIMPLE #ifdef MODULES_LED_SIMPLE
bigcall LedSimple_SignalId ; (R18, R19, R20) bigcall Led1_SetIdTiming ; (R18, R19, R20)
#endif #endif
rjmp appNetworkHandlePingRequest rjmp appNetworkHandlePingRequest
AppNetwork_HandleMsg_clcRet: AppNetwork_HandleMsg_clcRet:

4
avr/apps/router/main.asm
View File

@@ -465,12 +465,12 @@ appRouterLetSysHandleMsg_forMe:
pop xl pop xl
push xl push xl
push xh push xh
rcall mainModulesOnPacketReceived rcall modulesOnPacketReceived
pop xh pop xh
pop xl pop xl
push xl push xl
push xh push xh
rcall mainAppsOnPacketReceived rcall appsOnPacketReceived
pop xh pop xh
pop xl pop xl
appRouterLetSysHandleMsg_end: appRouterLetSysHandleMsg_end:

8
avr/common/debug.asm
View File

@@ -1,5 +1,5 @@
; *************************************************************************** ; ***************************************************************************
; copyright : (C) 2025 by Martin Preuss ; copyright : (C) 2026 by Martin Preuss
; email : martin@libchipcard.de ; email : martin@libchipcard.de
; ;
; *************************************************************************** ; ***************************************************************************
@@ -61,12 +61,12 @@ DEBUG4:
; @clobbers (R19, R22) ; @clobbers (R19, R22)
blinkLed: blinkLed:
sbi LED_SIMPLE_DDR, LED_SIMPLE_PINNUM ; out sbi LED1_DDR, LED1_PINNUM ; out
blinkLed_loop: blinkLed_loop:
cbi LED_SIMPLE_PORT, LED_SIMPLE_PINNUM ; on cbi LED1_PORT, LED1_PINNUM ; on
mov r22, r20 mov r22, r20
rcall waitForMultiple100ms ; (R22) rcall waitForMultiple100ms ; (R22)
sbi LED_SIMPLE_PORT, LED_SIMPLE_PINNUM ; off sbi LED1_PORT, LED1_PINNUM ; off
mov r22, r21 mov r22, r21
rcall waitForMultiple100ms ; (R22) rcall waitForMultiple100ms ; (R22)
dec r19 dec r19

4
avr/modules/com2w/com2w.asm
View File

@@ -283,8 +283,8 @@ com2wReceiveNextPkg_copyLoop:
brcc com2wReceiveNextPkg_eMissed brcc com2wReceiveNextPkg_eMissed
ldi r16, NET_IFACE_OFFS_PACKETSIN_LOW ldi r16, NET_IFACE_OFFS_PACKETSIN_LOW
rcall NET_Interface_IncCounter16 ; (R24, R25) rcall NET_Interface_IncCounter16 ; (R24, R25)
#ifdef MODULES_LED_ACTIVITY #ifdef LED1_NETWORK_ACTIVITY
; rcall LedActivity_Trigger ; (r16) bigcall LED1_SetActivityTiming
#endif #endif
rjmp com2wReceiveNextPkg_end rjmp com2wReceiveNextPkg_end
com2wReceiveNextPkg_eCrc: com2wReceiveNextPkg_eCrc:

8
avr/modules/com2w/com2wi.asm
View File

@@ -395,8 +395,8 @@ com2wiHandleRWaitForClockHi_dataInCarry:
com2wiHandleRWaitForClockHi_msgRecvd: com2wiHandleRWaitForClockHi_msgRecvd:
ldi r16, COM2WI_STATE_R_MSGRECVD ldi r16, COM2WI_STATE_R_MSGRECVD
std Y+COM2WI_IFACE_OFFS_STATE, r16 std Y+COM2WI_IFACE_OFFS_STATE, r16
#ifdef MODULES_LED_ACTIVITY #ifdef LED1_NETWORK_ACTIVITY
rcall LedActivity_Trigger ; (r16) [DEBUG] bigcall LED1_SetActivityTiming ; (r18-r20)
#endif #endif
ret ret
com2wiHandleRWaitForClockHi_overrun: com2wiHandleRWaitForClockHi_overrun:
@@ -476,8 +476,8 @@ com2wiHandleRMsgRecvd_copyLoop:
rcall NET_Buffer_ReleaseByNum ; (R16, X) rcall NET_Buffer_ReleaseByNum ; (R16, X)
rjmp com2wiHandleRMsgRecvd_errorMem rjmp com2wiHandleRMsgRecvd_errorMem
com2wiHandleRMsgRecvd_msgSaved: com2wiHandleRMsgRecvd_msgSaved:
#ifdef MODULES_LED_ACTIVITY #ifdef LED1_NETWORK_ACTIVITY
rcall LedActivity_Trigger ; (r16) bigcall LED1_SetActivityTiming ; (r18-r20)
#endif #endif
ldi r16, NET_IFACE_OFFS_PACKETSIN_LOW ldi r16, NET_IFACE_OFFS_PACKETSIN_LOW
rcall NET_Interface_IncCounter16 ; (R24, R25) rcall NET_Interface_IncCounter16 ; (R24, R25)

8
avr/modules/com2w/com2wi2.asm
View File

@@ -1131,7 +1131,9 @@ com2wiRunStateWMsgSent:
rcall NET_Interface_IncCounter16 rcall NET_Interface_IncCounter16
pop r25 pop r25
pop r24 pop r24
rcall LedActivity_Trigger #ifdef LED1_NETWORK_ACTIVITY
bigcall LED1_SetActivityTiming ; (r18-r20)
#endif
sec ; did something sec ; did something
com2wiRunStateWMsgSent_ret: com2wiRunStateWMsgSent_ret:
ret ret
@@ -1196,8 +1198,8 @@ com2wiRunStateRMsgRecvd_copyLoop:
brcc com2wReceiveNextPkg_eMissed brcc com2wReceiveNextPkg_eMissed
ldi r16, NET_IFACE_OFFS_PACKETSIN_LOW ldi r16, NET_IFACE_OFFS_PACKETSIN_LOW
rcall NET_Interface_IncCounter16 ; (R24, R25) rcall NET_Interface_IncCounter16 ; (R24, R25)
#ifdef MODULES_LED_ACTIVITY #ifdef LED1_NETWORK_ACTIVITY
rcall LedActivity_Trigger ; (r16) bigcall LED1_SetActivityTiming ; (r18-r20)
#endif #endif
; fall-through to enter idle state ; fall-through to enter idle state
com2wiRunStateRMsgRecvd_goIdle: com2wiRunStateRMsgRecvd_goIdle:

8
avr/modules/com2w/com2wn_recv.asm
View File

@@ -120,10 +120,10 @@ com2wnReadNextBit_end:
; @clobbers r16, r17, r18, X ; @clobbers r16, r17, r18, X
com2wnByteRecvd: com2wnByteRecvd:
#ifdef MODULES_LED_ACTIVITY #ifdef LED1_NETWORK_ACTIVITY
push r16 push r16
rcall LedActivity_Trigger bigcall LED1_SetActivityTiming ; (r18-r20)
pop r16 pop r16
#endif #endif
ldd xl, Y+COM2W_IFACE_OFFS_BUFPOS_LOW ldd xl, Y+COM2W_IFACE_OFFS_BUFPOS_LOW
ldd xh, Y+COM2W_IFACE_OFFS_BUFPOS_HIGH ldd xh, Y+COM2W_IFACE_OFFS_BUFPOS_HIGH