light_control: started working on new app (replaces ma_light).
This commit is contained in:
Martin Preuss
15
avr/apps/light_control/0BUILD
Normal file
15
avr/apps/light_control/0BUILD
Normal file
@@ -0,0 +1,15 @@
|
||||
<?xml?>
|
||||
|
||||
<gwbuild>
|
||||
|
||||
<subdirs>
|
||||
</subdirs>
|
||||
|
||||
<extradist>
|
||||
main.asm
|
||||
</extradist>
|
||||
|
||||
|
||||
</gwbuild>
|
||||
|
||||
|
||||
40
avr/apps/light_control/defs.asm
Normal file
40
avr/apps/light_control/defs.asm
Normal file
@@ -0,0 +1,40 @@
|
||||
; ***************************************************************************
|
||||
; copyright : (C) 2026 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. *
|
||||
; ***************************************************************************
|
||||
|
||||
#ifndef AQH_AVR_APPS_LIGHT_CONTROL_DEFS_ASM
|
||||
#define AQH_AVR_APPS_LIGHT_CONTROL_DEFS_ASM
|
||||
|
||||
|
||||
.equ APP_LIGHTCONTROL_FLASH_OFFS_BEGIN = TCA_FLASH_SIZE
|
||||
.equ APP_LIGHTCONTROL_FLASH_SIZE = APP_LIGHTCONTROL_FLASH_OFFS_BEGIN+0
|
||||
|
||||
|
||||
.equ APP_LIGHTCONTROL_RAM_OFFS_BEGIN = TCA_RAM_SIZE
|
||||
.equ APP_LIGHTCONTROL_RAM_OFFS_VALUE_RED = APP_LIGHTCONTROL_RAM_OFFS_BEGIN+0
|
||||
.equ APP_LIGHTCONTROL_RAM_OFFS_VALUE_GREEN = APP_LIGHTCONTROL_RAM_OFFS_BEGIN+1
|
||||
.equ APP_LIGHTCONTROL_RAM_OFFS_VALUE_BLUE = APP_LIGHTCONTROL_RAM_OFFS_BEGIN+2
|
||||
.equ APP_LIGHTCONTROL_RAM_OFFS_VALUE_WHITE = APP_LIGHTCONTROL_RAM_OFFS_BEGIN+3
|
||||
.equ APP_LIGHTCONTROL_RAM_OFFS_LEDCOUNT_LO = APP_LIGHTCONTROL_RAM_OFFS_BEGIN+4
|
||||
.equ APP_LIGHTCONTROL_RAM_OFFS_LEDCOUNT_HI = APP_LIGHTCONTROL_RAM_OFFS_BEGIN+5
|
||||
.equ APP_LIGHTCONTROL_RAM_SIZE = APP_LIGHTCONTROL_RAM_OFFS_BEGIN+6
|
||||
|
||||
|
||||
.equ APP_LIGHTCONTROL_EE_OFFS_BEGIN = TCA_EE_SIZE
|
||||
.equ APP_LIGHTCONTROL_EE_OFFS_VALUE_RED = APP_LIGHTCONTROL_EE_OFFS_BEGIN+0
|
||||
.equ APP_LIGHTCONTROL_EE_OFFS_VALUE_GREEN = APP_LIGHTCONTROL_EE_OFFS_BEGIN+1
|
||||
.equ APP_LIGHTCONTROL_EE_OFFS_VALUE_BLUE = APP_LIGHTCONTROL_EE_OFFS_BEGIN+2
|
||||
.equ APP_LIGHTCONTROL_EE_OFFS_VALUE_WHITE = APP_LIGHTCONTROL_EE_OFFS_BEGIN+3
|
||||
.equ APP_LIGHTCONTROL_EE_OFFS_LEDCOUNT_LO = APP_LIGHTCONTROL_EE_OFFS_BEGIN+4
|
||||
.equ APP_LIGHTCONTROL_EE_OFFS_LEDCOUNT_HI = APP_LIGHTCONTROL_EE_OFFS_BEGIN+5
|
||||
.equ APP_LIGHTCONTROL_EE_SIZE = APP_LIGHTCONTROL_EE_OFFS_BEGIN+6
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
279
avr/apps/light_control/main.asm
Normal file
279
avr/apps/light_control/main.asm
Normal file
@@ -0,0 +1,279 @@
|
||||
; ***************************************************************************
|
||||
; copyright : (C) 2026 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. *
|
||||
; ***************************************************************************
|
||||
|
||||
#ifndef AQH_AVR_APPS_LIGHT_CONTROL_MAIN_ASM
|
||||
#define AQH_AVR_APPS_LIGHT_CONTROL_MAIN_ASM
|
||||
|
||||
|
||||
.equ APP_LIGHTCONTROL_LIGHT_LIMIT = 15
|
||||
|
||||
|
||||
|
||||
|
||||
.cseg
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine AppLightControl_Init
|
||||
|
||||
AppLightControl_Init:
|
||||
ldi zl, LOW(appLightControlObjectFlash*2)
|
||||
ldi zh, HIGH(appLightControlObjectFlash*2)
|
||||
|
||||
; preset RAM
|
||||
lpm xl, Z+
|
||||
lpm xh, Z
|
||||
sbiw zh:zl, 1
|
||||
clr r16
|
||||
ldi r17,TCA_RAM_SIZE
|
||||
bigcall Utils_FillSram
|
||||
|
||||
; init base class
|
||||
bigcall TCA_Init
|
||||
|
||||
; preset source limits (low=1, high=65535)
|
||||
lpm yl, Z+
|
||||
lpm yh, Z
|
||||
sbiw zh:zl, 1
|
||||
ldi r16, 1
|
||||
std Y+(TCA_RAM_OFFS_TRIGGER_SOURCE1+TCA_SOURCE_OFFS_LOWLIM_LO), r16
|
||||
std Y+(TCA_RAM_OFFS_TRIGGER_SOURCE2+TCA_SOURCE_OFFS_LOWLIM_LO), r16
|
||||
ldi r16, 0xff
|
||||
std Y+(TCA_RAM_OFFS_TRIGGER_SOURCE1+TCA_SOURCE_OFFS_HIGHLIM_LO), r16
|
||||
std Y+(TCA_RAM_OFFS_TRIGGER_SOURCE1+TCA_SOURCE_OFFS_HIGHLIM_HI), r16
|
||||
std Y+(TCA_RAM_OFFS_TRIGGER_SOURCE2+TCA_SOURCE_OFFS_HIGHLIM_LO), r16
|
||||
std Y+(TCA_RAM_OFFS_TRIGGER_SOURCE2+TCA_SOURCE_OFFS_HIGHLIM_HI), r16
|
||||
|
||||
; preset guard limits
|
||||
clr r16
|
||||
std Y+(TCA_RAM_OFFS_GUARD_SOURCE+TCA_SOURCE_OFFS_LOWLIM_LO), r16
|
||||
std Y+(TCA_RAM_OFFS_GUARD_SOURCE+TCA_SOURCE_OFFS_LOWLIM_HI), r16
|
||||
ldi r16, LOW(APP_LIGHTCONTROL_LIGHT_LIMIT)
|
||||
ldi r17, HIGH(APP_LIGHTCONTROL_LIGHT_LIMIT)
|
||||
std Y+(TCA_RAM_OFFS_GUARD_SOURCE+TCA_SOURCE_OFFS_HIGHLIM_LO), r16
|
||||
std Y+(TCA_RAM_OFFS_GUARD_SOURCE+TCA_SOURCE_OFFS_HIGHLIM_HI), r17
|
||||
|
||||
clr r16
|
||||
std Y+HTIM_RAM_OFFS_MODE, r16
|
||||
|
||||
; set default color to white
|
||||
clr r16
|
||||
std Y+APP_LIGHTCONTROL_RAM_OFFS_VALUE_RED, r16
|
||||
std Y+APP_LIGHTCONTROL_RAM_OFFS_VALUE_GREEN, r16
|
||||
std Y+APP_LIGHTCONTROL_RAM_OFFS_VALUE_BLUE, r16
|
||||
ldi r16, 32
|
||||
std Y+APP_LIGHTCONTROL_RAM_OFFS_VALUE_WHITE, r16
|
||||
|
||||
ldi r16, 144
|
||||
std Y+APP_LIGHTCONTROL_RAM_OFFS_LEDCOUNT_LO, r16
|
||||
clr r16
|
||||
std Y+APP_LIGHTCONTROL_RAM_OFFS_LEDCOUNT_HI, r16
|
||||
|
||||
; setup from eeprom
|
||||
push yl
|
||||
push yh
|
||||
rcall appLightControlReadEeprom
|
||||
pop yh
|
||||
pop yl
|
||||
|
||||
; start in given mode
|
||||
rcall appLightControlUpdate
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine AppLightControl_OnEveryTick @global
|
||||
|
||||
AppLightControl_OnEveryTick:
|
||||
ldi zl, LOW(appLightControlObjectFlash*2)
|
||||
ldi zh, HIGH(appLightControlObjectFlash*2)
|
||||
|
||||
lpm yl, Z+
|
||||
lpm yh, Z
|
||||
sbiw zh:zl, 1
|
||||
|
||||
bigcall TCA_OnEveryTick
|
||||
|
||||
; check update flag
|
||||
ldd r16, Y+HTIM_RAM_OFFS_FLAGS
|
||||
sbrs r16, TCA_FLAGBIT_UPDATED
|
||||
rjmp AppLightControl_OnEveryTick_ret ; jump if clear (value unchanged)
|
||||
; value updated
|
||||
cbr r16, (1<<TCA_FLAGBIT_UPDATED) ; clear update bit
|
||||
std Y+HTIM_RAM_OFFS_FLAGS, r16
|
||||
rcall appLightControlWriteEeprom
|
||||
rcall appLightControlUpdate
|
||||
AppLightControl_OnEveryTick_ret:
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine appLightControlUpdate
|
||||
|
||||
appLightControlUpdate:
|
||||
ldd r18, Y+APP_LIGHTCONTROL_RAM_OFFS_LEDCOUNT_LO
|
||||
ldd r19, Y+APP_LIGHTCONTROL_RAM_OFFS_LEDCOUNT_HI
|
||||
bigcall SK6812_SetLedNum ; (none)
|
||||
|
||||
ldd r16, Y+HTIM_RAM_OFFS_FLAGS
|
||||
ldd r17, Y+HTIM_RAM_OFFS_MODE
|
||||
cpi r17, 2 ; auto?
|
||||
breq appLightControlUpdate_auto
|
||||
; non-auto
|
||||
cbr r16, (1<<HTIM_FLAGBIT_ACTIVE) | (1<<HTIM_FLAGBIT_ACTORENABLED) ; disable timer
|
||||
std Y+HTIM_RAM_OFFS_FLAGS, r16
|
||||
cpi r17, 1 ; on?
|
||||
breq appLightControlUpdate_on
|
||||
rcall appLightControlActorOff
|
||||
rjmp appLightControlUpdate_ret
|
||||
appLightControlUpdate_auto:
|
||||
sbr r16, (1<<HTIM_FLAGBIT_ACTIVE) | (1<<HTIM_FLAGBIT_ACTORENABLED) ; enable timer
|
||||
std Y+HTIM_RAM_OFFS_FLAGS, r16
|
||||
sbrs r16, HTIM_FLAGBIT_STATE
|
||||
rjmp appLightControlUpdate_ret ; jump if clear (actor is off)
|
||||
rcall appLightControlActorOn
|
||||
rjmp appLightControlUpdate_ret
|
||||
appLightControlUpdate_on:
|
||||
rcall appLightControlActorOn
|
||||
appLightControlUpdate_ret:
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine appLightControlReadEeprom
|
||||
;
|
||||
; @param Y pointer to data in RAM
|
||||
|
||||
appLightControlReadEeprom:
|
||||
ldi r16, APP_LIGHTCONTROL_EEID
|
||||
bigcall EepromTlv_FindFirst
|
||||
brcc appLightControlReadEeprom_ret
|
||||
|
||||
; let base class read
|
||||
bigcall TCA_ReadEepromAt ; (r16, r17, Y)
|
||||
brcc appLightControlReadEeprom_ret
|
||||
|
||||
push yl
|
||||
push yh
|
||||
adiw yh:yl, APP_LIGHTCONTROL_RAM_OFFS_BEGIN
|
||||
ldi r17, (APP_LIGHTCONTROL_EE_SIZE-APP_LIGHTCONTROL_EE_OFFS_BEGIN)
|
||||
bigcall Eeprom_ReadBytes ; (r16, r17, X, Y)
|
||||
pop yh
|
||||
pop yl
|
||||
appLightControlReadEeprom_ret:
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine appLightControlWriteEeprom
|
||||
;
|
||||
; @param Y pointer to data in RAM
|
||||
|
||||
appLightControlWriteEeprom:
|
||||
ldi r16, APP_LIGHTCONTROL_EEID
|
||||
bigcall EepromTlv_FindFirst
|
||||
brcs appLightControlWriteEeprom_write
|
||||
; create eeprom TLV
|
||||
ldi r16, APP_LIGHTCONTROL_EEID
|
||||
ldi r17, APP_LIGHTCONTROL_EE_SIZE
|
||||
bigcall EepromTlv_AddTlv
|
||||
brcc appLightControlWriteEeprom_ret
|
||||
appLightControlWriteEeprom_write:
|
||||
; let base class write
|
||||
bigcall TCA_WriteEepromAt
|
||||
brcc appLightControlWriteEeprom_ret
|
||||
push yl
|
||||
push yh
|
||||
adiw yh:yl, APP_LIGHTCONTROL_RAM_OFFS_BEGIN
|
||||
ldi r17, (APP_LIGHTCONTROL_EE_SIZE-APP_LIGHTCONTROL_EE_OFFS_BEGIN)
|
||||
bigcall Eeprom_WriteBytes ; (r16, r17, r18, X, Y)
|
||||
pop yh
|
||||
pop yl
|
||||
appLightControlWriteEeprom_ret:
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine appLightControlActorOn
|
||||
; @param Z pointer to timer data in FLASH (byte address for lpm!)
|
||||
; @param Y pointer to data in RAM
|
||||
|
||||
appLightControlActorOn:
|
||||
ldd r18, Y+APP_LIGHTCONTROL_RAM_OFFS_VALUE_RED
|
||||
ldd r19, Y+APP_LIGHTCONTROL_RAM_OFFS_VALUE_GREEN
|
||||
ldd r20, Y+APP_LIGHTCONTROL_RAM_OFFS_VALUE_BLUE
|
||||
ldd r21, Y+APP_LIGHTCONTROL_RAM_OFFS_VALUE_WHITE
|
||||
bigcall SK6812_SetRGBW ; (r16, r24, r25)
|
||||
ldi r18, 1
|
||||
push yl
|
||||
push yh
|
||||
bigcall AppLightControl_ReportState
|
||||
pop yh
|
||||
pop yl
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine appLightControlActorOff
|
||||
;
|
||||
; @param Z pointer to timer data in FLASH (byte address for lpm!)
|
||||
; @param Y pointer to data in RAM
|
||||
|
||||
appLightControlActorOff:
|
||||
clr r18
|
||||
clr r19
|
||||
clr r20
|
||||
clr r21
|
||||
bigcall SK6812_SetRGBW ; (r16, r24, r25)
|
||||
ldi r18, 0
|
||||
push yl
|
||||
push yh
|
||||
bigcall AppLightControl_ReportState
|
||||
pop yh
|
||||
pop yl
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
appLightControlObjectFlash:
|
||||
.dw appLightControlObjectRam ; HTIM_FLASH_OFFS_RAMPTR
|
||||
.dw appLightControlActorOn ; HTIM_FLASH_OFFS_ON_PTR
|
||||
.dw appLightControlActorOff ; HTIM_FLASH_OFFS_OFF_PTR
|
||||
.dw (10*60*10) ; HTIM_FLASH_OFFS_RELOADVAL
|
||||
|
||||
|
||||
|
||||
|
||||
.dseg
|
||||
|
||||
|
||||
appLightControlObjectRam:
|
||||
.byte APP_LIGHTCONTROL_RAM_SIZE
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
88
avr/apps/light_control/recv.asm
Normal file
88
avr/apps/light_control/recv.asm
Normal file
@@ -0,0 +1,88 @@
|
||||
; ***************************************************************************
|
||||
; copyright : (C) 2026 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. *
|
||||
; ***************************************************************************
|
||||
|
||||
#ifndef AQH_AVR_APPS_LIGHT_CONTROL_RECV_ASM
|
||||
#define AQH_AVR_APPS_LIGHT_CONTROL_RECV_ASM
|
||||
|
||||
|
||||
.cseg
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine AppLightControl_OnPacketReceived @global
|
||||
;
|
||||
; @clobbers any, -X
|
||||
|
||||
AppLightControl_OnPacketReceived:
|
||||
ldi zl, LOW(appLightControlObjectFlash*2)
|
||||
ldi zh, HIGH(appLightControlObjectFlash*2)
|
||||
push zl
|
||||
push zh
|
||||
lpm yl, Z+
|
||||
lpm yh, Z
|
||||
ldi zl, LOW(appLightControlMsgTable*2)
|
||||
ldi zh, HIGH(appLightControlMsgTable*2)
|
||||
bigcall Main_HandleValueMsg
|
||||
pop zh
|
||||
pop zl
|
||||
AppLightControl_OnPacketReceived_ret:
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine appLightControlSetValue
|
||||
;
|
||||
; @clobbers any, -X
|
||||
|
||||
appLightControlSetValue:
|
||||
std Y+APP_LIGHTCONTROL_RAM_OFFS_VALUE_RED, r18
|
||||
std Y+APP_LIGHTCONTROL_RAM_OFFS_VALUE_GREEN, r19
|
||||
std Y+APP_LIGHTCONTROL_RAM_OFFS_VALUE_BLUE, r20
|
||||
std Y+APP_LIGHTCONTROL_RAM_OFFS_VALUE_WHITE, r21
|
||||
bigjmp TCA_SetValueACK
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine appLightControlSetNumLeds
|
||||
;
|
||||
; @clobbers any, -X
|
||||
|
||||
appLightControlSetNumLeds:
|
||||
std Y+APP_LIGHTCONTROL_RAM_OFFS_LEDCOUNT_LO, r18
|
||||
std Y+APP_LIGHTCONTROL_RAM_OFFS_LEDCOUNT_HI, r19
|
||||
bigjmp TCA_SetValueACK
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
|
||||
appLightControlMsgTable:
|
||||
.db NETMSG_CMD_VALUE_REPORT, 0, LOW(TCA_HandleMsg), HIGH(TCA_HandleMsg)
|
||||
.db NETMSG_CMD_VALUE_SET, VALUE_ID_LIGHTCTRL_GUARDSRC, LOW(TCA_SetValue_GuardSrc), HIGH(TCA_SetValue_GuardSrc)
|
||||
.db NETMSG_CMD_VALUE_SET, VALUE_ID_LIGHTCTRL_GUARDLIM, LOW(TCA_SetValue_GuardLimits), HIGH(TCA_SetValue_GuardLimits)
|
||||
.db NETMSG_CMD_VALUE_SET, VALUE_ID_LIGHTCTRL_TRIGGER1SRC, LOW(TCA_SetValue_Trigger1Src), HIGH(TCA_SetValue_Trigger1Src)
|
||||
.db NETMSG_CMD_VALUE_SET, VALUE_ID_LIGHTCTRL_TRIGGER1LIM, LOW(TCA_SetValue_Trigger1Limits), HIGH(TCA_SetValue_Trigger1Limits)
|
||||
.db NETMSG_CMD_VALUE_SET, VALUE_ID_LIGHTCTRL_TRIGGER2SRC, LOW(TCA_SetValue_Trigger2Src), HIGH(TCA_SetValue_Trigger2Src)
|
||||
.db NETMSG_CMD_VALUE_SET, VALUE_ID_LIGHTCTRL_TRIGGER2LIM, LOW(TCA_SetValue_Trigger2Limits), HIGH(TCA_SetValue_Trigger2Limits)
|
||||
.db NETMSG_CMD_VALUE_SET, VALUE_ID_LIGHTCTRL_HOLDTIME, LOW(TCA_SetValue_HoldTime), HIGH(TCA_SetValue_HoldTime)
|
||||
.db NETMSG_CMD_VALUE_SET, VALUE_ID_LIGHTCTRL_MODE, LOW(TCA_SetValue_Mode), HIGH(TCA_SetValue_Mode)
|
||||
.db NETMSG_CMD_VALUE_SET, VALUE_ID_LIGHTCTRL_VALUE, LOW(appLightControlSetValue), HIGH(appLightControlSetValue)
|
||||
.db NETMSG_CMD_VALUE_SET, VALUE_ID_LIGHTCTRL_NUMLEDS, LOW(appLightControlSetNumLeds), HIGH(appLightControlSetNumLeds)
|
||||
.db 0, 0, 0, 0
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
40
avr/apps/light_control/send.asm
Normal file
40
avr/apps/light_control/send.asm
Normal file
@@ -0,0 +1,40 @@
|
||||
; ***************************************************************************
|
||||
; 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. *
|
||||
; ***************************************************************************
|
||||
|
||||
#ifndef AQH_AVR_APPS_LIGHT_CONTROL_SEND_ASM
|
||||
#define AQH_AVR_APPS_LIGHT_CONTROL_SEND_ASM
|
||||
|
||||
.cseg
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine sk6812ReportState
|
||||
;
|
||||
; @param R18 state (0=off, 1=on)
|
||||
; @clobbers R16, R17, R18, R19, R20, R21, R22, R23, R24, R25, X
|
||||
|
||||
AppLightControl_ReportState:
|
||||
ldi r17, VALUE_ID_LIGHTCONTROL_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
|
||||
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
@@ -99,3 +99,8 @@
|
||||
.equ SK6812_PINNUM = PORTA6
|
||||
|
||||
|
||||
; EEPROM TLV ids
|
||||
|
||||
.equ APP_LIGHTCONTROL_EEID = 0x31
|
||||
|
||||
|
||||
|
||||
@@ -3,8 +3,10 @@
|
||||
<gwbuild>
|
||||
|
||||
<extradist>
|
||||
io0.asm
|
||||
io1.asm
|
||||
main.asm
|
||||
recv.asm
|
||||
send.asm
|
||||
README
|
||||
</extradist>
|
||||
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
; ***************************************************************************
|
||||
; copyright : (C) 2026 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. *
|
||||
; ***************************************************************************
|
||||
|
||||
|
||||
|
||||
|
||||
sk6812JumpTableSendByte:
|
||||
rjmp sk6812SetAllColor0 ; new BTF 1m and 5m stripes
|
||||
; rjmp sk6812SetAllColor1 ; old BTF 1m and 5m stripes
|
||||
|
||||
@@ -80,7 +80,7 @@ l_end:
|
||||
; @param r19 green value
|
||||
; @param r20 blue value
|
||||
; @param r21 white value
|
||||
; @clobbers r16, r23
|
||||
; @clobbers r16, r24, r25
|
||||
|
||||
sk6812SetAllColor0:
|
||||
sbi SK6812_DDR, SK6812_PINNUM ; set to output
|
||||
@@ -90,10 +90,13 @@ sk6812SetAllColor0:
|
||||
in r15, SREG
|
||||
cli
|
||||
|
||||
lds r23, sk6812NumLeds
|
||||
lds r24, sk6812NumLeds
|
||||
lds r25, sk6812NumLeds+1
|
||||
|
||||
sk6812SetAllColor0_loop:
|
||||
SK6812_SENDQUADRUPEL0
|
||||
dec r23 ; +1
|
||||
sbiw r25:r24, 1 ; +2
|
||||
; dec r24 ; +1
|
||||
breq sk6812SetAllColor0_loopEnd ; +1
|
||||
rjmp sk6812SetAllColor0_loop ; +2
|
||||
sk6812SetAllColor0_loopEnd:
|
||||
|
||||
@@ -7,22 +7,16 @@
|
||||
; * Please see toplevel file COPYING of that project for license details. *
|
||||
; ***************************************************************************
|
||||
|
||||
#ifndef AQH_AVR_MODULES_SK6812_MAIN_ASM
|
||||
#define AQH_AVR_MODULES_SK6812_MAIN_ASM
|
||||
|
||||
|
||||
|
||||
; ***************************************************************************
|
||||
; defines
|
||||
|
||||
.equ SK6812_PATTERN_NUM = 3
|
||||
|
||||
.equ SK6812_MODE_OFF = 0
|
||||
.equ SK6812_MODE_ON = 1
|
||||
.equ SK6812_MODE_AUTO = 2
|
||||
|
||||
|
||||
.equ SK6812_TYPE_BTF_TYPE1 = 0 ; new BTF stripes
|
||||
.equ SK6812_TYPE_NUM = 1
|
||||
|
||||
.equ SK6812_DEFAULT_ONTIME = 300 ; 30secs
|
||||
.equ SK6812_DEFAULT_NUMLEDS = 144
|
||||
|
||||
|
||||
|
||||
@@ -32,16 +26,8 @@
|
||||
.dseg
|
||||
|
||||
sk6812DataBegin:
|
||||
sk6812State: .byte 1 ; 0=off, other values: on
|
||||
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
|
||||
|
||||
sk6812NumLeds: .byte 2
|
||||
; sk6812Pattern: .byte 5*SK6812_PATTERN_NUM ; 1 byte num leds, 4 bytes colour (RGBW)
|
||||
sk6812DataEnd:
|
||||
|
||||
|
||||
@@ -65,22 +51,18 @@ SK6812_Init:
|
||||
ldi r17, (sk6812DataEnd-sk6812DataBegin)
|
||||
rcall Utils_FillSram
|
||||
|
||||
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
|
||||
ldi r16, LOW(SK6812_DEFAULT_NUMLEDS)
|
||||
ldi r17, HIGH(SK6812_DEFAULT_NUMLEDS)
|
||||
sts sk6812NumLeds, r16
|
||||
sts sk6812NumLeds+1, r17
|
||||
|
||||
rcall sk6812ReadConfFromEeprom
|
||||
|
||||
rcall SK6812_Trigger
|
||||
ldi r18, 0x40
|
||||
ldi r19, 0x20
|
||||
ldi r20, 0x10
|
||||
ldi r21, 0x08
|
||||
rcall SK6812_SetRGBW
|
||||
|
||||
sec
|
||||
ret
|
||||
@@ -98,144 +80,17 @@ 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)
|
||||
|
||||
clr r19
|
||||
clr r20
|
||||
clr r21
|
||||
rcall SK6812_SetRGBW
|
||||
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
|
||||
;
|
||||
; 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)
|
||||
|
||||
SK6812_SetState:
|
||||
lds r16, sk6812Mode
|
||||
cpi r16, SK6812_MODE_AUTO
|
||||
brne SK6812_SetState_end
|
||||
rjmp sk6812SetState
|
||||
SK6812_SetState_end:
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine SK6812_SetMode @global
|
||||
;
|
||||
; @param r18 mode (SK6812_MODE_OFF, SK6812_MODE_ON, SK6812_MODE_AUTO)
|
||||
; @clobbers r18, (r16, r17, r19, r20, r21, r23, r24, r25)
|
||||
|
||||
SK6812_SetMode:
|
||||
sts sk6812Mode, r18
|
||||
cpi r18, SK6812_MODE_OFF
|
||||
breq SK6812_SetState_off
|
||||
; cpi r18, SK6812_MODE_ON
|
||||
; breq SK6812_SetState_on
|
||||
rjmp SK6812_SetState_on
|
||||
ret
|
||||
SK6812_SetState_off:
|
||||
clr r18
|
||||
rjmp sk6812SetState ; (r16, r17, r18, r19, r20, r21, r23, r24, r25)
|
||||
SK6812_SetState_on:
|
||||
ldi r18, 1
|
||||
rjmp sk6812SetState ; (r16, r17, r18, r19, r20, r21, r23, r24, r25)
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine SK6812_SetRGBW @global
|
||||
;
|
||||
@@ -245,59 +100,30 @@ SK6812_SetState_on:
|
||||
; @param r19 green value
|
||||
; @param r20 blue color
|
||||
; @param r21 white color
|
||||
; @clobbers (r16, r17, r18, r19, r20, r21, r23, r24, r25, X)
|
||||
; @clobbers (r16, r24, r25)
|
||||
|
||||
SK6812_SetRGBW:
|
||||
push r15
|
||||
in r15, SREG
|
||||
cli
|
||||
sts sk6812RGBW, r18
|
||||
sts sk6812RGBW+1, r19
|
||||
sts sk6812RGBW+2, r20
|
||||
sts sk6812RGBW+3, r21
|
||||
rcall sk6812WriteConfToEeprom ; (R16, R17, X)
|
||||
; no longer set state
|
||||
; ldi r18, 1 ; ON
|
||||
; rcall SK6812_SetState ; (r16, r17, r18, r19, r20, r21, r23, r24, r25)
|
||||
out SREG, r15
|
||||
pop r15
|
||||
rcall sk6812SetAllColor0 ; (r16, r24, r25)
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine sk6812SetState
|
||||
; @routine SK6812_SetLedNum @global
|
||||
;
|
||||
; Set all LEDs to same colour according to state.
|
||||
;
|
||||
; @param r18 0: all LEDs off, otherwise all LEDs color stored in sk6812RGBW
|
||||
; @clobbers R16, R17, R18, R19, R20, R21, R22, R23, R24, R25, X
|
||||
; @param r19:r18 number of LEDs
|
||||
; @clobbers none
|
||||
|
||||
sk6812SetState:
|
||||
tst r18
|
||||
breq sk6812SetState_off
|
||||
lds r18, sk6812RGBW
|
||||
lds r19, sk6812RGBW+1
|
||||
lds r20, sk6812RGBW+2
|
||||
lds r21, sk6812RGBW+3
|
||||
rcall sk6812SetAllColor ; (r16, r17, r23, r24, r25)
|
||||
ldi r18, 1
|
||||
sts sk6812State, r18
|
||||
rjmp sk6812ReportState
|
||||
sk6812SetState_off:
|
||||
clr r18
|
||||
clr r19
|
||||
clr r20
|
||||
clr r21
|
||||
rcall sk6812SetAllColor ; (r16, r17, r23, r24, r25)
|
||||
ldi r18, 0
|
||||
sts sk6812State, r18
|
||||
rjmp sk6812ReportState ; (R16, R17, R18, R19, R20, R21, R22, R23, R24, R25, X)
|
||||
SK6812_SetLedNum:
|
||||
sts sk6812NumLeds, r18
|
||||
sts sk6812NumLeds+1, r19
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
|
||||
#if 0
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine sk6812SendPattern
|
||||
@@ -331,144 +157,8 @@ sk6812SendPattern_loop2:
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine sk6812SetAllColor
|
||||
;
|
||||
; Set all LEDs to same colour.
|
||||
;
|
||||
; @param r18 red value
|
||||
; @param r19 green value
|
||||
; @param r20 blue value
|
||||
; @param r21 white value
|
||||
; @clobbers r23 (r16)
|
||||
|
||||
sk6812SetAllColor:
|
||||
push zl
|
||||
push zh
|
||||
rcall sk6812GetJumpTableEntryForCurrentType
|
||||
brcc sk6812SetAllColor_done
|
||||
icall
|
||||
sk6812SetAllColor_done:
|
||||
pop zh
|
||||
pop zl
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; @clobbers r24
|
||||
|
||||
sk6812GetJumpTableEntryForCurrentType:
|
||||
ldi zl, LOW(sk6812JumpTableSendByte)
|
||||
ldi zh, HIGH(sk6812JumpTableSendByte)
|
||||
lds r24, sk6812Type
|
||||
cpi r24, SK6812_TYPE_NUM
|
||||
brcc sk6812GetJumpTableEntryForCurrentType_ret
|
||||
add zl, r24
|
||||
adc zh, r24
|
||||
sub zh, r24
|
||||
sec
|
||||
sk6812GetJumpTableEntryForCurrentType_ret:
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine sk6812WriteConfToEeprom
|
||||
;
|
||||
; @clobbers r16, r17, X
|
||||
|
||||
sk6812WriteConfToEeprom:
|
||||
push r15
|
||||
in r15, SREG
|
||||
cli
|
||||
|
||||
ldi xl, LOW(EEPROM_OFFS_SK6812_RGBW)
|
||||
ldi xh, HIGH(EEPROM_OFFS_SK6812_RGBW)
|
||||
|
||||
lds r16, sk6812RGBW
|
||||
rcall Eeprom_WriteByteIfChanged ; (R17)
|
||||
adiw xh:xl, 1
|
||||
lds r16, sk6812RGBW+1
|
||||
rcall Eeprom_WriteByteIfChanged ; (R17)
|
||||
adiw xh:xl, 1
|
||||
lds r16, sk6812RGBW+2
|
||||
rcall Eeprom_WriteByteIfChanged ; (R17)
|
||||
adiw xh:xl, 1
|
||||
lds r16, sk6812RGBW+3
|
||||
rcall Eeprom_WriteByteIfChanged ; (R17)
|
||||
adiw xh:xl, 1
|
||||
lds r16, sk6812Type
|
||||
rcall Eeprom_WriteByteIfChanged ; (R17)
|
||||
|
||||
out SREG, r15
|
||||
pop r15
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine sk6812ReadConfFromEeprom
|
||||
;
|
||||
; @clobbers r16, r17, X
|
||||
|
||||
sk6812ReadConfFromEeprom:
|
||||
push r15
|
||||
in r15, SREG
|
||||
cli
|
||||
ldi xl, LOW(EEPROM_OFFS_SK6812_RGBW)
|
||||
ldi xh, HIGH(EEPROM_OFFS_SK6812_RGBW)
|
||||
rcall Eeprom_ReadByte
|
||||
brcc sk6812ReadConfFromEeprom_default
|
||||
mov r18, r16
|
||||
adiw xh:xl, 1
|
||||
|
||||
rcall Eeprom_ReadByte
|
||||
brcc sk6812ReadConfFromEeprom_default
|
||||
mov r19, r16
|
||||
adiw xh:xl, 1
|
||||
|
||||
rcall Eeprom_ReadByte
|
||||
brcc sk6812ReadConfFromEeprom_default
|
||||
mov r20, r16
|
||||
adiw xh:xl, 1
|
||||
|
||||
rcall Eeprom_ReadByte
|
||||
brcc sk6812ReadConfFromEeprom_default
|
||||
mov r21, r16
|
||||
adiw xh:xl, 1
|
||||
|
||||
; read type
|
||||
rcall Eeprom_ReadByte
|
||||
brcc sk6812ReadConfFromEeprom_default
|
||||
cpi r16, SK6812_TYPE_NUM
|
||||
brcc sk6812ReadConfFromEeprom_checkColor
|
||||
sts sk6812Type, r16
|
||||
|
||||
sk6812ReadConfFromEeprom_checkColor:
|
||||
mov r16, r18
|
||||
and r16, r19
|
||||
and r16, r20
|
||||
and r16, r21
|
||||
inc r16
|
||||
brne sk6812ReadConfFromEeprom_storeColor
|
||||
; fall through if value from EEPROM is 0xffffffff
|
||||
sk6812ReadConfFromEeprom_default:
|
||||
ldi r18, 128 ; R
|
||||
ldi r19, 69 ; G
|
||||
ldi r20, 0 ; B
|
||||
ldi r21, 0 ; W
|
||||
sk6812ReadConfFromEeprom_storeColor:
|
||||
sts sk6812RGBW, r18
|
||||
sts sk6812RGBW+1, r19
|
||||
sts sk6812RGBW+2, r20
|
||||
sts sk6812RGBW+3, r21
|
||||
sk6812ReadConfFromEeprom_end:
|
||||
out SREG, r15
|
||||
pop r15
|
||||
ret
|
||||
; @end
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
@@ -1,88 +0,0 @@
|
||||
; ***************************************************************************
|
||||
; 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 SK6812_OnPacketReceived @global
|
||||
;
|
||||
; @clobbers any, !X
|
||||
|
||||
SK6812_OnPacketReceived:
|
||||
ldi zl, LOW(sk6812MsgTable*2)
|
||||
ldi zh, HIGH(sk6812MsgTable*2)
|
||||
rjmp Main_HandleValueMsg
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
sk6812SetValueRGBW:
|
||||
rcall SK6812_SetRGBW ; value is in R18-R21 (R16, R17, X)
|
||||
rcall SK6812_Trigger
|
||||
ldi r18, 1
|
||||
rcall sk6812SetState
|
||||
rjmp sk6812SetValueACK
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
sk6812SetValueNumLeds:
|
||||
sts sk6812NumLeds, r18
|
||||
rjmp sk6812SetValueACK
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
sk6812SetValueState:
|
||||
rcall SK6812_SetState ; value is in R18 (r16, r17, r18, r19, r20, r21, r23, r24, r25)
|
||||
rjmp sk6812SetValueACK
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
sk6812SetValueMode:
|
||||
rcall SK6812_SetMode ; value is in R18 (r16, r17, r18, r19, r20, r21, r23, r24, r25)
|
||||
rjmp sk6812SetValueACK
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
sk6812SetValueType:
|
||||
cpi r18, SK6812_TYPE_NUM
|
||||
brcc sk6812SetValueNACK
|
||||
sts sk6812Type, r18
|
||||
rjmp sk6812SetValueACK
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
sk6812SetValueACK:
|
||||
ldi r23, NETMSG_CMD_VALUE_SET_ACK
|
||||
sec
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
sk6812SetValueNACK:
|
||||
ldi r23, NETMSG_CMD_VALUE_SET_NACK
|
||||
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)
|
||||
.db NETMSG_CMD_VALUE_SET, VALUE_ID_LED_STATE, LOW(sk6812SetValueState), HIGH(sk6812SetValueState)
|
||||
.db NETMSG_CMD_VALUE_SET, VALUE_ID_LED_MODE, LOW(sk6812SetValueMode), HIGH(sk6812SetValueMode)
|
||||
.db NETMSG_CMD_VALUE_SET, VALUE_ID_LED_TYPE, LOW(sk6812SetValueType), HIGH(sk6812SetValueType)
|
||||
.db 0, 0, 0, 0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user