n14, n25, n30: use new app LightControl instead of old app MA_Light

avr/devices/n25/main/main.asm

@@ -62,37 +62,26 @@
 #define APPS_NETWORK
 #define APPS_REPORTSENSORS
 #define APPS_STATS
-#define APPS_MA_LIGHT
+#define APPS_LIGHTCONTROL
 
 
 
 ; ---------------------------------------------------------------------------
 ; defines for modules
 
-;.equ VALUE_ID_SI7021_TEMP    = 0x01
-;.equ VALUE_ID_SI7021_HUM     = 0x02
+.equ VALUE_ID_DS18B20_TEMP          = 0x06
 
-;.equ VALUE_ID_ADC            = 0x03
-;.equ VALUE_ID_REED1          = 0x04
-;.equ VALUE_ID_REED2          = 0x05
-.equ VALUE_ID_DS18B20_TEMP    = 0x06
-.equ VALUE_ID_MAL_STATE       = 0x07
-
-
-;.equ VALUE_ID_REED_CONF      = 0x81
-.equ VALUE_ID_LED_STATE        = 0x81
-.equ VALUE_ID_LED_NUMLEDS      = 0x82
-.equ VALUE_ID_LED_RGBW_VALUE   = 0x83
-.equ VALUE_ID_MAL_RGBW_VALUE   = 0x84
-.equ VALUE_ID_MAL_ONTIME       = 0x85
-.equ VALUE_ID_MAL_SOURCE1      = 0x86
-.equ VALUE_ID_MAL_SOURCE2      = 0x87
-.equ VALUE_ID_MAL_BSOURCE      = 0x89
-.equ VALUE_ID_MAL_BVALUE       = 0x8a
-.equ VALUE_ID_LED_MODE         = 0x8b
-.equ VALUE_ID_LED_TYPE         = 0x8c
-
-.equ VALUE_ID_LEDSIMPLE_TIMING = 0x88
+.equ VALUE_ID_LIGHTCONTROL_STATE    = 0x07
+.equ VALUE_ID_LIGHTCTRL_NUMLEDS     = 0x82
+.equ VALUE_ID_LIGHTCTRL_VALUE       = 0x84
+.equ VALUE_ID_LIGHTCTRL_HOLDTIME    = 0x85
+.equ VALUE_ID_LIGHTCTRL_TRIGGER1SRC = 0x86
+.equ VALUE_ID_LIGHTCTRL_TRIGGER2SRC = 0x87
+.equ VALUE_ID_LIGHTCTRL_GUARDSRC    = 0x89
+.equ VALUE_ID_LIGHTCTRL_MODE        = 0x8b
+.equ VALUE_ID_LIGHTCTRL_GUARDLIM    = 0x8c
+.equ VALUE_ID_LIGHTCTRL_TRIGGER1LIM = 0x8d
+.equ VALUE_ID_LIGHTCTRL_TRIGGER2LIM = 0x8e
 
 
 
@@ -142,63 +131,16 @@ firmwareStart:
 
 
 
-; ---------------------------------------------------------------------------
-; @routine onSystemStart
-
 onSystemStart:
-  ret
-; @end
-
-
-
-; ---------------------------------------------------------------------------
-; @routine onMessageReceived
-;
-; Called on every message received
-
 onMessageReceived:
-  clc
-  ret
-; @end
-
-
-
-; ---------------------------------------------------------------------------
-; @routine onEvery100ms
-;
-; Called every 100ms. Add your routine calls here. No arguments, no results.
-
 onEvery100ms:
+onEverySecond:
 onEveryMinute:
 onEveryHour:
 onEveryDay:
-  ret
-; @end
-
-onEverySecond:
-  ret
-#if 0
-  ; debug
-  ldi r19, 0x00           ; G
-  ldi r18, 0xff           ; R
-  ldi r20, 0x55           ; B
-  ldi r21, 0xaa           ; W
-  rcall SK6812_SetAllColor ; r23 (r16, r17)
-#endif
-  ret
-
-
-
-; ---------------------------------------------------------------------------
-; @routine onEveryLoop
-;
-; Called on every loop (i.e. after awakening from sleep).
-;
 onEveryLoop:
+  clc
   ret
-; @end
-
-
 
 
 
@@ -207,6 +149,7 @@ onEveryLoop:
 
 .include "devices/all/hw_tn84.asm"
 .include "devices/all/includes.asm"
+.include "common/eeprom_tlv.asm"
 ;.include "common/debug.asm"