From 67d5d1687d39cfd6f0dd66ab299d72249eda97e8 Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Mon, 4 May 2026 14:35:20 +0200 Subject: [PATCH] avr: updated apps and modules to latest changes. --- avr/apps/door/main.asm | 4 ++-- avr/apps/motion/main.asm | 4 ++-- avr/apps/network/main.asm | 2 +- avr/apps/router/main.asm | 4 ++-- avr/common/debug.asm | 8 ++++---- avr/modules/com2w/com2w.asm | 4 ++-- avr/modules/com2w/com2wi.asm | 8 ++++---- avr/modules/com2w/com2wi2.asm | 8 +++++--- avr/modules/com2w/com2wn_recv.asm | 8 ++++---- 9 files changed, 26 insertions(+), 24 deletions(-) diff --git a/avr/apps/door/main.asm b/avr/apps/door/main.asm index c6a31b3..84f5d92 100644 --- a/avr/apps/door/main.asm +++ b/avr/apps/door/main.asm @@ -108,8 +108,8 @@ appDoorSendValue_send: ldi r17, VALUE_ID_TCRT1K ; VALUE ID ldi r22, AQHOME_VALUETYPE_DOOR ; VALUE TYPE rcall Main_Send8BitValueReport -#ifdef MODULES_LED_ACTIVITY - rcall LedActivity_Trigger ; (r16) +#ifdef MODULES_LED1 + rcall Led1_SetActivityTiming ; (r16) #endif ret ; @end diff --git a/avr/apps/motion/main.asm b/avr/apps/motion/main.asm index 4e17005..d76075a 100644 --- a/avr/apps/motion/main.asm +++ b/avr/apps/motion/main.asm @@ -101,8 +101,8 @@ appMotionSendValue: ldi r17, VALUE_ID_MOTION ; VALUE ID ldi r22, AQHOME_VALUETYPE_MOTION ; VALUE TYPE rcall Main_Send8BitValueReport -#ifdef MODULES_LED_SIMPLE - rcall LedSimple_SignalActivity ; (R18, R19, R20) +#ifdef MODULES_LED1 + rcall Led1_SetActivityTiming ; (R18, R19, R20) #endif ret ; @end diff --git a/avr/apps/network/main.asm b/avr/apps/network/main.asm index 6e47485..76993e8 100644 --- a/avr/apps/network/main.asm +++ b/avr/apps/network/main.asm @@ -163,7 +163,7 @@ AppNetwork_HandleMsg_handleRebootMsg: ret AppNetwork_HandleMsg_handlePingMsg: #ifdef MODULES_LED_SIMPLE - bigcall LedSimple_SignalId ; (R18, R19, R20) + bigcall Led1_SetIdTiming ; (R18, R19, R20) #endif rjmp appNetworkHandlePingRequest AppNetwork_HandleMsg_clcRet: diff --git a/avr/apps/router/main.asm b/avr/apps/router/main.asm index b077898..96c7939 100644 --- a/avr/apps/router/main.asm +++ b/avr/apps/router/main.asm @@ -465,12 +465,12 @@ appRouterLetSysHandleMsg_forMe: pop xl push xl push xh - rcall mainModulesOnPacketReceived + rcall modulesOnPacketReceived pop xh pop xl push xl push xh - rcall mainAppsOnPacketReceived + rcall appsOnPacketReceived pop xh pop xl appRouterLetSysHandleMsg_end: diff --git a/avr/common/debug.asm b/avr/common/debug.asm index b58ba74..4e6eb5b 100644 --- a/avr/common/debug.asm +++ b/avr/common/debug.asm @@ -1,5 +1,5 @@ ; *************************************************************************** -; copyright : (C) 2025 by Martin Preuss +; copyright : (C) 2026 by Martin Preuss ; email : martin@libchipcard.de ; ; *************************************************************************** @@ -61,12 +61,12 @@ DEBUG4: ; @clobbers (R19, R22) blinkLed: - sbi LED_SIMPLE_DDR, LED_SIMPLE_PINNUM ; out + sbi LED1_DDR, LED1_PINNUM ; out blinkLed_loop: - cbi LED_SIMPLE_PORT, LED_SIMPLE_PINNUM ; on + cbi LED1_PORT, LED1_PINNUM ; on mov r22, r20 rcall waitForMultiple100ms ; (R22) - sbi LED_SIMPLE_PORT, LED_SIMPLE_PINNUM ; off + sbi LED1_PORT, LED1_PINNUM ; off mov r22, r21 rcall waitForMultiple100ms ; (R22) dec r19 diff --git a/avr/modules/com2w/com2w.asm b/avr/modules/com2w/com2w.asm index 065149b..df625db 100644 --- a/avr/modules/com2w/com2w.asm +++ b/avr/modules/com2w/com2w.asm @@ -283,8 +283,8 @@ com2wReceiveNextPkg_copyLoop: brcc com2wReceiveNextPkg_eMissed ldi r16, NET_IFACE_OFFS_PACKETSIN_LOW rcall NET_Interface_IncCounter16 ; (R24, R25) -#ifdef MODULES_LED_ACTIVITY -; rcall LedActivity_Trigger ; (r16) +#ifdef LED1_NETWORK_ACTIVITY + bigcall LED1_SetActivityTiming #endif rjmp com2wReceiveNextPkg_end com2wReceiveNextPkg_eCrc: diff --git a/avr/modules/com2w/com2wi.asm b/avr/modules/com2w/com2wi.asm index aa66cfc..da8af9a 100644 --- a/avr/modules/com2w/com2wi.asm +++ b/avr/modules/com2w/com2wi.asm @@ -395,8 +395,8 @@ com2wiHandleRWaitForClockHi_dataInCarry: com2wiHandleRWaitForClockHi_msgRecvd: ldi r16, COM2WI_STATE_R_MSGRECVD std Y+COM2WI_IFACE_OFFS_STATE, r16 -#ifdef MODULES_LED_ACTIVITY - rcall LedActivity_Trigger ; (r16) [DEBUG] +#ifdef LED1_NETWORK_ACTIVITY + bigcall LED1_SetActivityTiming ; (r18-r20) #endif ret com2wiHandleRWaitForClockHi_overrun: @@ -476,8 +476,8 @@ com2wiHandleRMsgRecvd_copyLoop: rcall NET_Buffer_ReleaseByNum ; (R16, X) rjmp com2wiHandleRMsgRecvd_errorMem com2wiHandleRMsgRecvd_msgSaved: -#ifdef MODULES_LED_ACTIVITY - rcall LedActivity_Trigger ; (r16) +#ifdef LED1_NETWORK_ACTIVITY + bigcall LED1_SetActivityTiming ; (r18-r20) #endif ldi r16, NET_IFACE_OFFS_PACKETSIN_LOW rcall NET_Interface_IncCounter16 ; (R24, R25) diff --git a/avr/modules/com2w/com2wi2.asm b/avr/modules/com2w/com2wi2.asm index fa8f082..a194054 100644 --- a/avr/modules/com2w/com2wi2.asm +++ b/avr/modules/com2w/com2wi2.asm @@ -1131,7 +1131,9 @@ com2wiRunStateWMsgSent: rcall NET_Interface_IncCounter16 pop r25 pop r24 - rcall LedActivity_Trigger +#ifdef LED1_NETWORK_ACTIVITY + bigcall LED1_SetActivityTiming ; (r18-r20) +#endif sec ; did something com2wiRunStateWMsgSent_ret: ret @@ -1196,8 +1198,8 @@ com2wiRunStateRMsgRecvd_copyLoop: brcc com2wReceiveNextPkg_eMissed ldi r16, NET_IFACE_OFFS_PACKETSIN_LOW rcall NET_Interface_IncCounter16 ; (R24, R25) -#ifdef MODULES_LED_ACTIVITY - rcall LedActivity_Trigger ; (r16) +#ifdef LED1_NETWORK_ACTIVITY + bigcall LED1_SetActivityTiming ; (r18-r20) #endif ; fall-through to enter idle state com2wiRunStateRMsgRecvd_goIdle: diff --git a/avr/modules/com2w/com2wn_recv.asm b/avr/modules/com2w/com2wn_recv.asm index ab0b943..b24759f 100644 --- a/avr/modules/com2w/com2wn_recv.asm +++ b/avr/modules/com2w/com2wn_recv.asm @@ -120,10 +120,10 @@ com2wnReadNextBit_end: ; @clobbers r16, r17, r18, X com2wnByteRecvd: -#ifdef MODULES_LED_ACTIVITY -push r16 - rcall LedActivity_Trigger -pop r16 +#ifdef LED1_NETWORK_ACTIVITY + push r16 + bigcall LED1_SetActivityTiming ; (r18-r20) + pop r16 #endif ldd xl, Y+COM2W_IFACE_OFFS_BUFPOS_LOW ldd xh, Y+COM2W_IFACE_OFFS_BUFPOS_HIGH