diff --git a/avr/devices/n16/main/main.asm b/avr/devices/n16/main/main.asm index a1dc52d..b0c1e34 100644 --- a/avr/devices/n16/main/main.asm +++ b/avr/devices/n16/main/main.asm @@ -82,17 +82,16 @@ ; --------------------------------------------------------------------------- ; defines for values -.equ VALUE_ID_SI7021_TEMP = 0x01 -.equ VALUE_ID_SI7021_HUM = 0x02 +.equ VALUE_ID_SI7021_TEMP = 0x01 +.equ VALUE_ID_SI7021_HUM = 0x02 -.equ VALUE_ID_ADC = 0x03 -;.equ VALUE_ID_REED1 = 0x04 -;.equ VALUE_ID_REED2 = 0x05 -;.equ VALUE_ID_DS18B20_TEMP = 0x06 -.equ VALUE_ID_MOTION = 0x07 -.equ VALUE_ID_TCRT1K = 0x08 +.equ VALUE_ID_ADC = 0x03 +;.equ VALUE_ID_DS18B20_TEMP = 0x06 +.equ VALUE_ID_MOTION = 0x07 +.equ VALUE_ID_TCRT1K = 0x08 ;.equ VALUE_ID_REED_CONF = 0x81 +.equ VALUE_ID_LEDSIMPLE_TIMING = 0x88 diff --git a/avr/devices/n22/main/main.asm b/avr/devices/n22/main/main.asm index a6a45af..da7be3c 100644 --- a/avr/devices/n22/main/main.asm +++ b/avr/devices/n22/main/main.asm @@ -77,12 +77,14 @@ .equ VALUE_ID_DS18B20_TEMP = 0x06 ;.equ VALUE_ID_REED_CONF = 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_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_LEDSIMPLE_TIMING = 0x88 ; *************************************************************************** @@ -156,13 +158,22 @@ onMessageReceived: ; Called every 100ms. Add your routine calls here. No arguments, no results. onEvery100ms: -onEverySecond: onEveryMinute: onEveryHour: onEveryDay: ret ; @end +onEverySecond: + ret + ; debug + ldi r19, 0x00 ; G + ldi r18, 0xff ; R + ldi r20, 0x55 ; B + ldi r21, 0xaa ; W + rcall SK6812_SetAllColor ; r23 (r16, r17) + ret + ; --------------------------------------------------------------------------- diff --git a/avr/devices/n23/boot/boot.asm b/avr/devices/n23/boot/boot.asm index 3ea0a26..7d74df3 100644 --- a/avr/devices/n23/boot/boot.asm +++ b/avr/devices/n23/boot/boot.asm @@ -123,7 +123,7 @@ main: .include "modules/network/msg/defs.asm" .include "modules/network/msg/crc.asm" -.include "common/debug.asm" +;.include "common/debug.asm" diff --git a/avr/devices/n23/main/main.asm b/avr/devices/n23/main/main.asm index 3c7c3cf..6987604 100644 --- a/avr/devices/n23/main/main.asm +++ b/avr/devices/n23/main/main.asm @@ -85,21 +85,21 @@ ; --------------------------------------------------------------------------- ; defines for values -.equ VALUE_ID_SI7021_TEMP = 0x01 -.equ VALUE_ID_SI7021_HUM = 0x02 +.equ VALUE_ID_SI7021_TEMP = 0x01 +.equ VALUE_ID_SI7021_HUM = 0x02 -.equ VALUE_ID_ADC = 0x03 -;.equ VALUE_ID_REED1 = 0x04 -;.equ VALUE_ID_REED2 = 0x05 -;.equ VALUE_ID_DS18B20_TEMP = 0x06 -.equ VALUE_ID_MOTION = 0x07 +.equ VALUE_ID_ADC = 0x03 +;.equ VALUE_ID_DS18B20_TEMP = 0x06 +.equ VALUE_ID_MOTION = 0x07 -.equ VALUE_ID_CO2 = 0x08 -.equ VALUE_ID_TVOC = 0x09 +.equ VALUE_ID_CO2 = 0x08 +.equ VALUE_ID_TVOC = 0x09 ;.equ VALUE_ID_REED_CONF = 0x81 -.equ VALUE_ID_DEBUG = 0x7f +.equ VALUE_ID_DEBUG = 0x7f + +.equ VALUE_ID_LEDSIMPLE_TIMING = 0x88