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

avr: move timing control from ma_light to sk6812.

Browse Source 
This allows for better control over the LED strip. We can now trigger the
LED strip externally (e.g. by setting a new RGBW value).
This commit is contained in:
Martin Preuss
2026-03-24 23:13:28 +01:00
parent 42874f27cd
commit 67be74d2ac
10 changed files with 262 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
avr/modules/sk6812/README
View File

@@ -16,6 +16,8 @@ RGB Value for activated light:
Example:
Set color of LED strip to blue (half intensity)
aqhome-tool setdata -N nodes/12345678/RGBWVALUE -v 0x80
or in modern format:
aqhome-tool setdata -N nodes/12345678/RGBWVALUE -v GREEN:RED:WHITE:BLUE
1.2. RGBWSTATE

124
avr/modules/sk6812/main.asm
View File

@@ -22,6 +22,8 @@
.equ SK6812_TYPE_BTF_NEW = 0
.equ SK6812_TYPE_NUM = 1
.equ SK6812_DEFAULT_ONTIME = 300 ; 30secs
; ***************************************************************************
@@ -30,11 +32,15 @@
.dseg
sk6812DataBegin:
sk6812NumLeds: .byte 1
sk6812Pattern: .byte 5*SK6812_PATTERN_NUM ; 1 byte num leds, 4 bytes colour (RGBW)
sk6812RGBW: .byte 4 ; current RGBW value
sk6812Mode: .byte 1
sk6812Type: .byte 1 ; which timing type to use
sk6812NumLeds: .byte 1
sk6812Pattern: .byte 5*SK6812_PATTERN_NUM ; 1 byte num leds, 4 bytes colour (RGBW)
sk6812RGBW: .byte 4 ; current RGBW value
sk6812Mode: .byte 1
sk6812Type: .byte 1 ; which timing type to use
sk6812Timer100ms: .byte 2 ; timer in 100msecs before turning light off
sk6812Reload100ms: .byte 2 ; reload value used when triggering light
sk6812DataEnd:
@@ -61,6 +67,11 @@ SK6812_Init:
ldi r16, SK6812_MODE_AUTO
sts sk6812Mode, r16
ldi r16, LOW(SK6812_DEFAULT_ONTIME)
sts sk6812Reload100ms, r16
ldi r16, HIGH(SK6812_DEFAULT_ONTIME)
sts sk6812Reload100ms+1, r16
sbi SK6812_DDR, SK6812_PINNUM ; set to output
cbi SK6812_PORT, SK6812_PINNUM ; set LOW
ldi r16, 144
@@ -68,8 +79,7 @@ SK6812_Init:
rcall sk6812ReadConfFromEeprom
ldi r18, 1 ; ON (DEBUG)
rcall SK6812_SetState ; (r16, r17, r18, r19, r20, r21, r23, r24, r25)
rcall SK6812_Trigger
sec
ret
@@ -87,12 +97,100 @@ SK6812_Init_error:
; USED:
SK6812_Fini:
clr r16
sts sk6812Reload100ms, r16
sts sk6812Reload100ms+1, r16
clr r18 ; turn light off
rcall sk6812SetState ; (r16, r17, r18, r19, r20, r21, r23, r24, r25)
sec
ret
; @end
; ---------------------------------------------------------------------------
; @routine SK6812_EverySecond
SK6812_Every100ms:
lds r16, sk6812Mode
cpi r16, SK6812_MODE_AUTO
brne SK6812_Every100ms_ret
lds r24, sk6812Timer100ms
lds r25, sk6812Timer100ms+1
mov r16, r24
or r16, r25
breq SK6812_Every100ms_ret
sbiw r25:r24, 1
sts sk6812Timer100ms, r24
sts sk6812Timer100ms+1, r25
brne SK6812_Every100ms_ret
; timer elapsed, turn off light
clr r18
rcall sk6812SetState
SK6812_Every100ms_ret:
ret
; @end
; ---------------------------------------------------------------------------
; @routine SK6812_SetAutoTimerReload @global
;
; @param r19:r18 value
; @clobbers none
SK6812_SetAutoTimerReload:
sts sk6812Reload100ms, r18
sts sk6812Reload100ms+1, r19
ret
; @end
; ---------------------------------------------------------------------------
; @routine SK6812_GetAutoTimerReload @global
;
; @return r19:r18 reload value in secs
; @clobbers none
SK6812_GetAutoTimerReload:
lds r18, sk6812Reload100ms
lds r19, sk6812Reload100ms+1
ret
; @end
; ---------------------------------------------------------------------------
; @routine SK6812_Trigger
;
; Restart on-timer, turn light on if it is off
; @clobbers r16, r17, r18, r19, r20, r21, r23, r24, r25
SK6812_Trigger:
lds r16, sk6812Mode
cpi r16, SK6812_MODE_AUTO
brne SK6812_Trigger_ret
lds r16, sk6812Timer100ms
lds r17, sk6812Timer100ms+1
or r16, r17
lds r17, sk6812Reload100ms
sts sk6812Timer100ms, r17
lds r17, sk6812Reload100ms+1
sts sk6812Timer100ms+1, r17
tst r16
brne SK6812_Trigger_ret
ldi r18, 1
rcall sk6812SetState ; (r16, r17, r18, r19, r20, r21, r23, r24, r25)
SK6812_Trigger_ret:
ret
; @end
; ---------------------------------------------------------------------------
; @routine SK6812_SetState @global
@@ -173,7 +271,7 @@ SK6812_SetRGBW:
; Set all LEDs to same colour according to state.
;
; @param r18 0: all LEDs off, otherwise all LEDs color stored in sk6812RGBW
; @clobbers r18, r19, r20, r21, (r16, r17, r23, r24, r25)
; @clobbers R16, R17, R18, R19, R20, R21, R22, R23, R24, R25, X
sk6812SetState:
tst r18
@@ -182,17 +280,21 @@ sk6812SetState:
lds r19, sk6812RGBW+1
lds r20, sk6812RGBW+2
lds r21, sk6812RGBW+3
rjmp sk6812SetState_haveValue
rcall sk6812SetAllColor ; (r16, r17, r23, r24, r25)
ldi r18, 1
rjmp sk6812ReportState
sk6812SetState_off:
clr r18
clr r19
clr r20
clr r21
sk6812SetState_haveValue:
rjmp sk6812SetAllColor ; (r16, r17, r23, r24, r25)
rcall sk6812SetAllColor ; (r16, r17, r23, r24, r25)
ldi r18, 0
rjmp sk6812ReportState ; (R16, R17, R18, R19, R20, R21, R22, R23, R24, R25, X)
; @end
; ---------------------------------------------------------------------------
; @routine sk6812SendPattern
;

24
avr/modules/sk6812/recv.asm
View File

@@ -12,7 +12,7 @@
; ---------------------------------------------------------------------------
; @routine SK6812_OnPacketReceived @global
;
; @clobbers any, -X
; @clobbers any, !X
SK6812_OnPacketReceived:
ldi zl, LOW(sk6812MsgTable*2)
@@ -24,40 +24,42 @@ SK6812_OnPacketReceived:
sk6812SetValueRGBW:
rcall SK6812_SetRGBW ; value is in R18-R21 (R16, R17, X)
ldi r23, NETMSG_CMD_VALUE_SET_ACK
sec
ret
rcall SK6812_Trigger
ldi r18, 1
rcall sk6812SetState
rjmp sk6812SetValueReturn
; @end
sk6812SetValueNumLeds:
sts sk6812NumLeds, r18
ldi r23, NETMSG_CMD_VALUE_SET_ACK
sec
ret
rjmp sk6812SetValueReturn
; @end
sk6812SetValueState:
rcall SK6812_SetState ; value is in R18 (r16, r17, r18, r19, r20, r21, r23, r24, r25)
ldi r23, NETMSG_CMD_VALUE_SET_ACK
sec
ret
rjmp sk6812SetValueReturn
; @end
sk6812SetValueMode:
rcall SK6812_SetMode ; value is in R18 (r16, r17, r18, r19, r20, r21, r23, r24, r25)
rjmp sk6812SetValueReturn
; @end
sk6812SetValueReturn:
ldi r23, NETMSG_CMD_VALUE_SET_ACK
sec
ret
; @end
sk6812MsgTable:
.db NETMSG_CMD_VALUE_SET, VALUE_ID_LED_RGBW_VALUE, LOW(sk6812SetValueRGBW), HIGH(sk6812SetValueRGBW)
.db NETMSG_CMD_VALUE_SET, VALUE_ID_LED_NUMLEDS, LOW(sk6812SetValueNumLeds), HIGH(sk6812SetValueNumLeds)

31
avr/modules/sk6812/send.asm Normal file
View File

@@ -0,0 +1,31 @@
; ***************************************************************************
; copyright : (C) 2024 by Martin Preuss
; email : martin@libchipcard.de
;
; ***************************************************************************
; * This file is part of the project "AqHome". *
; * Please see toplevel file COPYING of that project for license details. *
; ***************************************************************************
; ---------------------------------------------------------------------------
; @routine sk6812ReportState
;
; @param R18 state (0=off, 1=on)
; @clobbers R16, R17, R18, R19, R20, R21, R22, R23, R24, R25, X
sk6812ReportState:
ldi r17, VALUE_ID_MAL_STATE
clr r19
ldi r20, 1
clr r21
ldi r22, AQHOME_VALUETYPE_ONOFF
push yl
push yh
rcall Main_SendValueReport ; (R16, R17, R18, R19, R20, R21, R23, R24, R25, X)
pop yh
pop yl
ret
; @end