diff --git a/avr/devices/n12/n12_defs.asm b/avr/devices/n12/n12_defs.asm index 0446294..1fb450d 100644 --- a/avr/devices/n12/n12_defs.asm +++ b/avr/devices/n12/n12_defs.asm @@ -148,4 +148,22 @@ .equ OWI_PINNUM = PORTB2 +; --------------------------------------------------------------------------- +; SK6812 + +.equ SK6812_DDR = DDRA +.equ SK6812_PORT = PORTA +.equ SK6812_PINNUM = PORTA5 + + + +; --------------------------------------------------------------------------- +; debug + +.equ DEBUG_LED_DDR = DDRA +.equ DEBUG_LED_PORT_OUT = PORTA +.equ DEBUG_LED_PORT_IN = PINA +.equ DEBUG_LED_PINNUM = PORTA5 + + diff --git a/avr/devices/n12/n12_main.asm b/avr/devices/n12/n12_main.asm index 4bb6d3d..3076d31 100644 --- a/avr/devices/n12/n12_main.asm +++ b/avr/devices/n12/n12_main.asm @@ -44,28 +44,32 @@ #define MODULES_COM_WITH_ADDR_PROTO ;#define MODULES_LED #define MODULES_LED_SIMPLE -#define MODULES_TWI_MASTER +;#define MODULES_TWI_MASTER ;#define MODULES_LCD ;#define LCD_MINIMAL_FONT ;#define MODULES_SI7021 #define MODULES_STATS ;#define MODULES_CNY70 ;#define MODULES_REED -#define MODULES_OWI_MASTER +;#define MODULES_OWI_MASTER ;#define MODULES_DS18B20 +#define MODULES_SK6812 + ; --------------------------------------------------------------------------- ; defines for modules -.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_ADC = 0x03 +.equ VALUE_ID_REED1 = 0x04 +.equ VALUE_ID_REED2 = 0x05 -.equ VALUE_ID_REED_CONF = 0x81 +.equ VALUE_ID_REED_CONF = 0x81 +.equ VALUE_ID_LED_NUMLEDS = 0x82 +.equ VALUE_ID_LED_RGBW_VALUE = 0x83 @@ -171,7 +175,9 @@ firmwareStart: rjmp main #ifdef MODULES_DS18B20 .include "modules/ds18b20/main.asm" #endif - +#ifdef MODULES_SK6812 + .include "modules/sk6812/main.asm" +#endif ; *************************************************************************** @@ -252,6 +258,13 @@ timerList: systemSetSpeed: +.if clock == 1000000 + ldi r16, (1<