avr: fixed definitions to use updated LED module.

2026-05-04 14:35:55 +02:00
parent 67d5d1687d
commit 44bb477680
50 changed files with 213 additions and 233 deletions
--- a/avr/devices/c01/defs.asm
+++ b/avr/devices/c01/defs.asm
@@ -52,12 +52,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 1     ; shorter
-.equ LED_SIMPLE_OFFTIME = 50    ; longer
-.equ LED_SIMPLE_DDR     = DDRE
-.equ LED_SIMPLE_PORT    = PORTE
-.equ LED_SIMPLE_PORTIN  = PINE
-.equ LED_SIMPLE_PINNUM  = PORTE2
+.equ LED1_DEFAULT_ONTIME  = 1     ; shorter
+.equ LED1_DEFAULT_OFFTIME = 99    ; longer
+.equ LED1_DEFAULT_REPEATS = 0     ; continous
+.equ LED1_DDR     = DDRE
+.equ LED1_PORT    = PORTE
+.equ LED1_PORTIN  = PINE
+.equ LED1_PINNUM  = PORTE2



--- a/avr/devices/c01/main/main.asm
+++ b/avr/devices/c01/main/main.asm
@@ -55,7 +55,7 @@
 #define MODULES_CLOCK
 #define MODULES_XRAM
 #define MODULES_HEAP
-#define MODULES_LED_SIMPLE
+#define MODULES_LED1
 #define MODULES_NETWORK
 ;#define MODULES_COMONUART0
 ;#define MODULES_UART_HW
--- a/avr/devices/c03/defs.asm
+++ b/avr/devices/c03/defs.asm
@@ -77,12 +77,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 1     ; shorter
-.equ LED_SIMPLE_OFFTIME = 50    ; longer
-.equ LED_SIMPLE_DDR     = DDRB
-.equ LED_SIMPLE_PORT    = PORTB
-.equ LED_SIMPLE_PORTIN  = PINB
-.equ LED_SIMPLE_PINNUM  = PORTB0
+.equ LED1_DEFAULT_ONTIME  = 1     ; shorter
+.equ LED1_DEFAULT_OFFTIME = 99    ; longer
+.equ LED1_DEFAULT_REPEATS = 0     ; continous
+.equ LED1_DDR     = DDRB
+.equ LED1_PORT    = PORTB
+.equ LED1_PORTIN  = PINB
+.equ LED1_PINNUM  = PORTB0



--- a/avr/devices/c03/main/main.asm
+++ b/avr/devices/c03/main/main.asm
@@ -48,7 +48,7 @@
 ;#define MODULES_XRAM
 #define MODULES_HEAP
 #define MODULES_BEEPER_SIMPLE
-#define MODULES_LED_SIMPLE
+#define MODULES_LED1
 #define MODULES_NETWORK
 ;#define MODULES_COMONUART0
 ;#define MODULES_UART_HW
--- a/avr/devices/e01/defs.asm
+++ b/avr/devices/e01/defs.asm
@@ -39,12 +39,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 2
-.equ LED_SIMPLE_OFFTIME = 30
-.equ LED_SIMPLE_DDR     = DDRB
-.equ LED_SIMPLE_PORT    = PORTB
-.equ LED_SIMPLE_PORTIN  = PINB
-.equ LED_SIMPLE_PINNUM  = PORTB2
+.equ LED1_DEFAULT_ONTIME  = 1     ; shorter
+.equ LED1_DEFAULT_OFFTIME = 99    ; longer
+.equ LED1_DEFAULT_REPEATS = 0     ; continous
+.equ LED1_DDR     = DDRB
+.equ LED1_PORT    = PORTB
+.equ LED1_PORTIN  = PINB
+.equ LED1_PINNUM  = PORTB2



--- a/avr/devices/e01/main/main.asm
+++ b/avr/devices/e01/main/main.asm
@@ -74,10 +74,7 @@
 #define MODULES_CLOCK
 ;#define MODULES_COM
 ;#define MODULES_COM_WITH_ADDR_PROTO
-;#define MODULES_LED
-;#define MODULES_LED_SIMPLE
-;#define MODULES_LED_SIGNAL
-#define MODULES_LED_ACTIVITY
+#define MODULES_LED1
 ;#define MODULES_TWI_MASTER
 ;#define MODULES_LCD
 ;#define LCD_MINIMAL_FONT
--- a/avr/devices/e02/defs.asm
+++ b/avr/devices/e02/defs.asm
@@ -39,12 +39,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 2
-.equ LED_SIMPLE_OFFTIME = 30
-.equ LED_SIMPLE_DDR     = DDRB
-.equ LED_SIMPLE_PORT    = PORTB
-.equ LED_SIMPLE_PORTIN  = PINB
-.equ LED_SIMPLE_PINNUM  = PORTB2
+.equ LED1_DEFAULT_ONTIME  = 1     ; shorter
+.equ LED1_DEFAULT_OFFTIME = 99    ; longer
+.equ LED1_DEFAULT_REPEATS = 0     ; continous
+.equ LED1_DDR     = DDRB
+.equ LED1_PORT    = PORTB
+.equ LED1_PORTIN  = PINB
+.equ LED1_PINNUM  = PORTB2



--- a/avr/devices/e02/main/main.asm
+++ b/avr/devices/e02/main/main.asm
@@ -72,7 +72,7 @@
 #define APP_ROUTER_NO_ADDR_MGR

 #define MODULES_CLOCK
-#define MODULES_LED_SIMPLE
+#define MODULES_LED1
 #define MODULES_NETWORK
 #define MODULES_COM2W
 #define MODULES_UARTFD0
--- a/avr/devices/e03/defs.asm
+++ b/avr/devices/e03/defs.asm
@@ -39,12 +39,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 1     ; shorter
-.equ LED_SIMPLE_OFFTIME = 99    ; longer
-.equ LED_SIMPLE_DDR     = DDRA
-.equ LED_SIMPLE_PORT    = PORTA
-.equ LED_SIMPLE_PORTIN  = PINA
-.equ LED_SIMPLE_PINNUM  = PORTA3
+.equ LED1_DEFAULT_ONTIME  = 1     ; shorter
+.equ LED1_DEFAULT_OFFTIME = 99    ; longer
+.equ LED1_DEFAULT_REPEATS = 0     ; continous
+.equ LED1_DDR     = DDRA
+.equ LED1_PORT    = PORTA
+.equ LED1_PORTIN  = PINA
+.equ LED1_PINNUM  = PORTA3



--- a/avr/devices/e03/main/main.asm
+++ b/avr/devices/e03/main/main.asm
@@ -58,8 +58,7 @@

 ; #define MODULES_TIMER
 #define MODULES_CLOCK
-#define MODULES_LED_SIMPLE
-;#define MODULES_LED_ACTIVITY
+#define MODULES_LED1
 #define MODULES_NETWORK
 #define MODULES_COM2W
 #define MODULES_TWI_MASTER
--- a/avr/devices/e04/defs.asm
+++ b/avr/devices/e04/defs.asm
@@ -39,12 +39,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 1     ; shorter
-.equ LED_SIMPLE_OFFTIME = 99    ; longer
-.equ LED_SIMPLE_DDR     = DDRA
-.equ LED_SIMPLE_PORT    = PORTA
-.equ LED_SIMPLE_PORTIN  = PINA
-.equ LED_SIMPLE_PINNUM  = PORTA3
+.equ LED1_DEFAULT_ONTIME  = 1     ; shorter
+.equ LED1_DEFAULT_OFFTIME = 99    ; longer
+.equ LED1_DEFAULT_REPEATS = 0     ; continous
+.equ LED1_DDR     = DDRA
+.equ LED1_PORT    = PORTA
+.equ LED1_PORTIN  = PINA
+.equ LED1_PINNUM  = PORTA3



--- a/avr/devices/e04/main/main.asm
+++ b/avr/devices/e04/main/main.asm
@@ -58,7 +58,7 @@

 ; #define MODULES_TIMER
 #define MODULES_CLOCK
-#define MODULES_LED_SIMPLE
+#define MODULES_LED1
 #define MODULES_NETWORK
 #define MODULES_COM2W
 #define MODULES_TWI_MASTER
--- a/avr/devices/e05/defs.asm
+++ b/avr/devices/e05/defs.asm
@@ -39,12 +39,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 1     ; shorter
-.equ LED_SIMPLE_OFFTIME = 99    ; longer
-.equ LED_SIMPLE_DDR     = DDRA
-.equ LED_SIMPLE_PORT    = PORTA
-.equ LED_SIMPLE_PORTIN  = PINA
-.equ LED_SIMPLE_PINNUM  = PORTA3
+.equ LED1_DEFAULT_ONTIME  = 1     ; shorter
+.equ LED1_DEFAULT_OFFTIME = 99    ; longer
+.equ LED1_DEFAULT_REPEATS = 0     ; continous
+.equ LED1_DDR     = DDRA
+.equ LED1_PORT    = PORTA
+.equ LED1_PORTIN  = PINA
+.equ LED1_PINNUM  = PORTA3



--- a/avr/devices/e05/main/main.asm
+++ b/avr/devices/e05/main/main.asm
@@ -59,7 +59,7 @@

 ; #define MODULES_TIMER
 #define MODULES_CLOCK
-#define MODULES_LED_SIMPLE
+#define MODULES_LED1
 ;#define MODULES_LED_ACTIVITY
 #define MODULES_NETWORK
 #define MODULES_COM2W
--- a/avr/devices/minimal/defs.asm
+++ b/avr/devices/minimal/defs.asm
@@ -39,12 +39,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 1     ; shorter
-.equ LED_SIMPLE_OFFTIME = 99    ; longer
-.equ LED_SIMPLE_DDR     = DDRA
-.equ LED_SIMPLE_PORT    = PORTA
-.equ LED_SIMPLE_PORTIN  = PINA
-.equ LED_SIMPLE_PINNUM  = PORTA3
+.equ LED1_DEFAULT_ONTIME  = 1     ; shorter
+.equ LED1_DEFAULT_OFFTIME = 99    ; longer
+.equ LED1_DEFAULT_REPEATS = 0     ; continous
+.equ LED1_DDR     = DDRA
+.equ LED1_PORT    = PORTA
+.equ LED1_PORTIN  = PINA
+.equ LED1_PINNUM  = PORTA3



--- a/avr/devices/minimal/main/main.asm
+++ b/avr/devices/minimal/main/main.asm
@@ -57,7 +57,7 @@
 ; firmware settings including list of modules used

 ;#define MODULES_CLOCK
-;#define MODULES_LED_SIMPLE
+;#define MODULES_LED1
 ;#define MODULES_NETWORK
 ;#define MODULES_COM2W

--- a/avr/devices/n14/boot/boot.asm
+++ b/avr/devices/n14/boot/boot.asm
@@ -21,8 +21,6 @@
 .include "common/calls.asm"
 .include "common/utils_io.asm"
 .include "common/utils_wait.asm"
-.include "modules/com2/defs.asm"
-.include "modules/comproto/defs.asm"



--- a/avr/devices/n14/defs.asm
+++ b/avr/devices/n14/defs.asm
@@ -35,12 +35,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 3
-.equ LED_SIMPLE_OFFTIME = 30
-.equ LED_SIMPLE_DDR     = DDRB
-.equ LED_SIMPLE_PORT    = PORTB
-.equ LED_SIMPLE_PORTIN  = PINB
-.equ LED_SIMPLE_PINNUM  = PORTB4
+.equ LED1_DEFAULT_ONTIME  = 1     ; shorter
+.equ LED1_DEFAULT_OFFTIME = 99    ; longer
+.equ LED1_DEFAULT_REPEATS = 0     ; continous
+.equ LED1_DDR     = DDRB
+.equ LED1_PORT    = PORTB
+.equ LED1_PORTIN  = PINB
+.equ LED1_PINNUM  = PORTB4



--- a/avr/devices/n14/main/main.asm
+++ b/avr/devices/n14/main/main.asm
@@ -51,7 +51,7 @@
 ; firmware settings including list of modules used

 #define MODULES_CLOCK
-#define MODULES_LED_SIMPLE
+#define MODULES_LED1
 #define MODULES_NETWORK
 #define MODULES_COM2W
 #define MODULES_OWI_MASTER
--- a/avr/devices/n16/defs.asm
+++ b/avr/devices/n16/defs.asm
@@ -39,22 +39,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 2
-.equ LED_SIMPLE_OFFTIME = 30
-.equ LED_SIMPLE_DDR     = DDRA
-.equ LED_SIMPLE_PORT    = PORTA
-.equ LED_SIMPLE_PORTIN  = PINA
-.equ LED_SIMPLE_PINNUM  = PORTA3
-
-
-
-; ---------------------------------------------------------------------------
-; LED activity module
-
-.equ LED_ACTIVITY_DDR     = DDRA
-.equ LED_ACTIVITY_PORT    = PORTA
-.equ LED_ACTIVITY_PORTIN  = PINA
-.equ LED_ACTIVITY_PINNUM  = PORTA3
+.equ LED1_DEFAULT_ONTIME  = 1     ; shorter
+.equ LED1_DEFAULT_OFFTIME = 99    ; longer
+.equ LED1_DEFAULT_REPEATS = 0     ; continous
+.equ LED1_DDR     = DDRA
+.equ LED1_PORT    = PORTA
+.equ LED1_PORTIN  = PINA
+.equ LED1_PINNUM  = PORTA3



--- a/avr/devices/n16/main/main.asm
+++ b/avr/devices/n16/main/main.asm
@@ -57,8 +57,7 @@
 ; firmware settings including list of modules used

 #define MODULES_CLOCK
-;#define MODULES_LED_SIMPLE
-#define MODULES_LED_ACTIVITY
+#define MODULES_LED1
 #define MODULES_NETWORK
 #define MODULES_COM2W
 #define MODULES_TWI_MASTER
--- a/avr/devices/n21/defs.asm
+++ b/avr/devices/n21/defs.asm
@@ -39,22 +39,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 1     ; shorter
-.equ LED_SIMPLE_OFFTIME = 50    ; longer
-.equ LED_SIMPLE_DDR     = DDRA
-.equ LED_SIMPLE_PORT    = PORTA
-.equ LED_SIMPLE_PORTIN  = PINA
-.equ LED_SIMPLE_PINNUM  = PORTA3
-
-
-
-; ---------------------------------------------------------------------------
-; LED activity module
-
-.equ LED_ACTIVITY_DDR     = DDRA
-.equ LED_ACTIVITY_PORT    = PORTA
-.equ LED_ACTIVITY_PORTIN  = PINA
-.equ LED_ACTIVITY_PINNUM  = PORTA3
+.equ LED1_DEFAULT_ONTIME  = 1     ; shorter
+.equ LED1_DEFAULT_OFFTIME = 99    ; longer
+.equ LED1_DEFAULT_REPEATS = 0     ; continous
+.equ LED1_DDR     = DDRA
+.equ LED1_PORT    = PORTA
+.equ LED1_PORTIN  = PINA
+.equ LED1_PINNUM  = PORTA3



--- a/avr/devices/n21/main/main.asm
+++ b/avr/devices/n21/main/main.asm
@@ -59,8 +59,7 @@

 ; #define MODULES_TIMER
 #define MODULES_CLOCK
-#define MODULES_LED_SIMPLE
-;#define MODULES_LED_ACTIVITY
+#define MODULES_LED1
 #define MODULES_NETWORK
 #define MODULES_COM2W
 #define MODULES_TWI_MASTER
--- a/avr/devices/n24/defs.asm
+++ b/avr/devices/n24/defs.asm
@@ -39,12 +39,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 1     ; shorter
-.equ LED_SIMPLE_OFFTIME = 50    ; longer
-.equ LED_SIMPLE_DDR     = DDRA
-.equ LED_SIMPLE_PORT    = PORTA
-.equ LED_SIMPLE_PORTIN  = PINA
-.equ LED_SIMPLE_PINNUM  = PORTA3
+.equ LED1_DEFAULT_ONTIME  = 1     ; shorter
+.equ LED1_DEFAULT_OFFTIME = 99    ; longer
+.equ LED1_DEFAULT_REPEATS = 0     ; continous
+.equ LED1_DDR     = DDRA
+.equ LED1_PORT    = PORTA
+.equ LED1_PORTIN  = PINA
+.equ LED1_PINNUM  = PORTA3



--- a/avr/devices/n24/main/main.asm
+++ b/avr/devices/n24/main/main.asm
@@ -61,7 +61,7 @@

 ; #define MODULES_TIMER
 #define MODULES_CLOCK
-#define MODULES_LED_SIMPLE
+#define MODULES_LED1
 #define MODULES_NETWORK
 #define MODULES_COM2W
 #define MODULES_TWI_MASTER
--- a/avr/devices/n25/defs.asm
+++ b/avr/devices/n25/defs.asm
@@ -38,12 +38,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 1
-.equ LED_SIMPLE_OFFTIME = 50
-.equ LED_SIMPLE_DDR     = DDRA
-.equ LED_SIMPLE_PORT    = PORTA
-.equ LED_SIMPLE_PORTIN  = PINA
-.equ LED_SIMPLE_PINNUM  = PORTA3
+.equ LED1_DEFAULT_ONTIME  = 1     ; shorter
+.equ LED1_DEFAULT_OFFTIME = 99    ; longer
+.equ LED1_DEFAULT_REPEATS = 0     ; continous
+.equ LED1_DDR     = DDRA
+.equ LED1_PORT    = PORTA
+.equ LED1_PORTIN  = PINA
+.equ LED1_PINNUM  = PORTA3



--- a/avr/devices/n25/main/main.asm
+++ b/avr/devices/n25/main/main.asm
@@ -52,7 +52,7 @@


 #define MODULES_CLOCK
-#define MODULES_LED_SIMPLE
+#define MODULES_LED1
 #define MODULES_NETWORK
 #define MODULES_COM2W
 #define MODULES_OWI_MASTER
--- a/avr/devices/n26/defs.asm
+++ b/avr/devices/n26/defs.asm
@@ -39,12 +39,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 1     ; shorter
-.equ LED_SIMPLE_OFFTIME = 99    ; longer
-.equ LED_SIMPLE_DDR     = DDRA
-.equ LED_SIMPLE_PORT    = PORTA
-.equ LED_SIMPLE_PORTIN  = PINA
-.equ LED_SIMPLE_PINNUM  = PORTA3
+.equ LED1_DEFAULT_ONTIME  = 1
+.equ LED1_DEFAULT_OFFTIME = 99
+.equ LED1_DEFAULT_REPEATS = 0 ; continous
+.equ LED1_DDR             = DDRA
+.equ LED1_PORT            = PORTA
+.equ LED1_PORTIN          = PINA
+.equ LED1_PINNUM          = PORTA3


 ; ---------------------------------------------------------------------------
--- a/avr/devices/n26/main/main.asm
+++ b/avr/devices/n26/main/main.asm
@@ -61,8 +61,7 @@

 ; #define MODULES_TIMER
 #define MODULES_CLOCK
-#define MODULES_LED_SIMPLE
-;#define MODULES_LED_ACTIVITY
+#define MODULES_LED1
 #define MODULES_NETWORK
 ;#define MODULES_UART_BITBANG
 #define MODULES_COM2W
--- a/avr/devices/n27/defs.asm
+++ b/avr/devices/n27/defs.asm
@@ -39,12 +39,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 1     ; shorter
-.equ LED_SIMPLE_OFFTIME = 99    ; longer
-.equ LED_SIMPLE_DDR     = DDRA
-.equ LED_SIMPLE_PORT    = PORTA
-.equ LED_SIMPLE_PORTIN  = PINA
-.equ LED_SIMPLE_PINNUM  = PORTA3
+.equ LED1_DEFAULT_ONTIME  = 1
+.equ LED1_DEFAULT_OFFTIME = 99
+.equ LED1_DEFAULT_REPEATS = 0 ; continous
+.equ LED1_DDR             = DDRA
+.equ LED1_PORT            = PORTA
+.equ LED1_PORTIN          = PINA
+.equ LED1_PINNUM          = PORTA3



--- a/avr/devices/n27/main/main.asm
+++ b/avr/devices/n27/main/main.asm
@@ -59,7 +59,7 @@

 ; #define MODULES_TIMER
 #define MODULES_CLOCK
-#define MODULES_LED_SIMPLE
+#define MODULES_LED1
 ;#define MODULES_LED_ACTIVITY
 #define MODULES_NETWORK
 ;#define MODULES_UART_BITBANG
--- a/avr/devices/n28/defs.asm
+++ b/avr/devices/n28/defs.asm
@@ -39,12 +39,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 1     ; shorter
-.equ LED_SIMPLE_OFFTIME = 50    ; longer
-.equ LED_SIMPLE_DDR     = DDRA
-.equ LED_SIMPLE_PORT    = PORTA
-.equ LED_SIMPLE_PORTIN  = PINA
-.equ LED_SIMPLE_PINNUM  = PORTA3
+.equ LED1_DEFAULT_ONTIME  = 1
+.equ LED1_DEFAULT_OFFTIME = 99
+.equ LED1_DEFAULT_REPEATS = 0 ; continous
+.equ LED1_DDR             = DDRA
+.equ LED1_PORT            = PORTA
+.equ LED1_PORTIN          = PINA
+.equ LED1_PINNUM          = PORTA3



--- a/avr/devices/n28/main/main.asm
+++ b/avr/devices/n28/main/main.asm
@@ -57,25 +57,15 @@
 ; ---------------------------------------------------------------------------
 ; firmware settings including list of modules used

-; #define MODULES_TIMER
 #define MODULES_CLOCK
-#define MODULES_LED_SIMPLE
-;#define MODULES_LED_ACTIVITY
+#define MODULES_LED1
 #define MODULES_NETWORK
 #define MODULES_COM2W
 #define MODULES_TWI_MASTER
-;#define MODULES_LCD
-;#define LCD_MINIMAL_FONT
 #define MODULES_SI7021
-;#define MODULES_STATS
-;#define MODULES_OWI_MASTER
-;#define MODULES_DS18B20
-;#define MODULES_MOTION
 #define MODULES_TCRT1000
-;#define MODULES_CCS811

 #define APPS_NETWORK
-;#define APPS_MOTION
 #define APPS_DOOR
 #define APPS_REPORTSENSORS
 #define APPS_STATS
--- a/avr/devices/n29/defs.asm
+++ b/avr/devices/n29/defs.asm
@@ -39,12 +39,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 1     ; shorter
-.equ LED_SIMPLE_OFFTIME = 99    ; longer
-.equ LED_SIMPLE_DDR     = DDRA
-.equ LED_SIMPLE_PORT    = PORTA
-.equ LED_SIMPLE_PORTIN  = PINA
-.equ LED_SIMPLE_PINNUM  = PORTA3
+.equ LED1_DEFAULT_ONTIME  = 1
+.equ LED1_DEFAULT_OFFTIME = 99
+.equ LED1_DEFAULT_REPEATS = 0 ; continous
+.equ LED1_DDR             = DDRA
+.equ LED1_PORT            = PORTA
+.equ LED1_PORTIN          = PINA
+.equ LED1_PINNUM          = PORTA3



--- a/avr/devices/n29/main/main.asm
+++ b/avr/devices/n29/main/main.asm
@@ -58,8 +58,7 @@

 ; #define MODULES_TIMER
 #define MODULES_CLOCK
-#define MODULES_LED_SIMPLE
-;#define MODULES_LED_ACTIVITY
+#define MODULES_LED1
 #define MODULES_NETWORK
 ;#define MODULES_UART_BITBANG
 #define MODULES_COM2W
--- a/avr/devices/n30/defs.asm
+++ b/avr/devices/n30/defs.asm
@@ -38,12 +38,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 1
-.equ LED_SIMPLE_OFFTIME = 50
-.equ LED_SIMPLE_DDR     = DDRA
-.equ LED_SIMPLE_PORT    = PORTA
-.equ LED_SIMPLE_PORTIN  = PINA
-.equ LED_SIMPLE_PINNUM  = PORTA3
+.equ LED1_DEFAULT_ONTIME  = 1
+.equ LED1_DEFAULT_OFFTIME = 99
+.equ LED1_DEFAULT_REPEATS = 0 ; continous
+.equ LED1_DDR             = DDRA
+.equ LED1_PORT            = PORTA
+.equ LED1_PORTIN          = PINA
+.equ LED1_PINNUM          = PORTA3



--- a/avr/devices/n30/main/main.asm
+++ b/avr/devices/n30/main/main.asm
@@ -52,7 +52,7 @@


 #define MODULES_CLOCK
-#define MODULES_LED_SIMPLE
+#define MODULES_LED1
 #define MODULES_NETWORK
 #define MODULES_COM2W
 #define MODULES_OWI_MASTER
--- a/avr/devices/n31/defs.asm
+++ b/avr/devices/n31/defs.asm
@@ -39,22 +39,32 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 1     ; shorter
-.equ LED_SIMPLE_OFFTIME = 99    ; longer
-.equ LED_SIMPLE_DDR     = DDRA
-.equ LED_SIMPLE_PORT    = PORTA
-.equ LED_SIMPLE_PORTIN  = PINA
-.equ LED_SIMPLE_PINNUM  = PORTA3
+; green LED
+.equ LED1_DEFAULT_ONTIME  = 1     ; shorter
+.equ LED1_DEFAULT_OFFTIME = 99    ; longer
+.equ LED1_DEFAULT_REPEATS = 0     ; continous
+.equ LED1_DDR     = DDRA
+.equ LED1_PORT    = PORTA
+.equ LED1_PORTIN  = PINA
+.equ LED1_PINNUM  = PORTA3

+; yellow LED
+.equ LED2_DEFAULT_ONTIME  = 1
+.equ LED2_DEFAULT_OFFTIME = 99
+.equ LED2_DEFAULT_REPEATS = 0
+.equ LED2_DDR     = DDRA
+.equ LED2_PORT    = PORTA
+.equ LED2_PORTIN  = PINA
+.equ LED2_PINNUM  = PORTA0

-
-; ---------------------------------------------------------------------------
-; LED Activity module
-
-.equ LED_ACTIVITY_DDR     = DDRA
-.equ LED_ACTIVITY_PORT    = PORTA
-.equ LED_ACTIVITY_PORTIN  = PINA
-.equ LED_ACTIVITY_PINNUM  = PORTA3
+; red LED
+.equ LED3_DEFAULT_ONTIME  = 1
+.equ LED3_DEFAULT_OFFTIME = 99
+.equ LED3_DEFAULT_REPEATS = 0
+.equ LED3_DDR     = DDRA
+.equ LED3_PORT    = PORTA
+.equ LED3_PORTIN  = PINA
+.equ LED3_PINNUM  = PORTA2



--- a/avr/devices/n31/main/main.asm
+++ b/avr/devices/n31/main/main.asm
@@ -59,10 +59,10 @@

 ; #define MODULES_TIMER
 #define MODULES_CLOCK
-#define MODULES_LED_SIMPLE
-;#define MODULES_LED_ACTIVITY
+#define MODULES_LED1
+#define MODULES_LED2
+#define MODULES_LED3
 #define MODULES_NETWORK
-;#define MODULES_UART_BITBANG
 #define MODULES_COM2W
 #define MODULES_TWI_MASTER
 ;#define MODULES_LCD
@@ -81,6 +81,12 @@
 ;#define APPS_MOTION
 #define APPS_REPORTSENSORS
 #define APPS_STATS
+#define APPS_CO2WATCH
+
+
+; defines for modules
+
+; #define LED1_NETWORK_ACTIVITY



--- a/avr/devices/r05/defs.asm
+++ b/avr/devices/r05/defs.asm
@@ -40,12 +40,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 2
-.equ LED_SIMPLE_OFFTIME = 30
-.equ LED_SIMPLE_DDR     = DDRB
-.equ LED_SIMPLE_PORT    = PORTB
-.equ LED_SIMPLE_PORTIN  = PINB
-.equ LED_SIMPLE_PINNUM  = PORTB2
+.equ LED1_DEFAULT_ONTIME  = 1     ; shorter
+.equ LED1_DEFAULT_OFFTIME = 99    ; longer
+.equ LED1_DEFAULT_REPEATS = 0     ; continous
+.equ LED1_DDR     = DDRB
+.equ LED1_PORT    = PORTB
+.equ LED1_PORTIN  = PINB
+.equ LED1_PINNUM  = PORTB2



--- a/avr/devices/r05/main/main.asm
+++ b/avr/devices/r05/main/main.asm
@@ -61,7 +61,7 @@
 #define COM_ACCEPT_ALL_DEST       ; accept all messages!

 #define MODULES_CLOCK
-#define MODULES_LED_SIMPLE
+#define MODULES_LED1
 #ifdef WITH_LCD
  #define MODULES_TWI_MASTER ; using TWI display for debugging
  #define MODULES_LCD
@@ -88,7 +88,6 @@

 .equ VALUE_ID_DS18B20_TEMP     = 0x06

-.equ VALUE_ID_LEDSIMPLE_TIMING = 0x88
 .equ VALUE_ID_ROUTER_SETRANGE  = 0x89


--- a/avr/devices/r05/test/main.asm
+++ b/avr/devices/r05/test/main.asm
@@ -65,8 +65,7 @@
 #define MODULES_CLOCK
 ;#define MODULES_COM
 ;#define MODULES_COM_WITH_ADDR_PROTO
-;#define MODULES_LED
-#define MODULES_LED_SIMPLE
+#define MODULES_LED1
 ;#define MODULES_TWI_MASTER
 ;#define MODULES_LCD
 ;#define LCD_MINIMAL_FONT
--- a/avr/devices/r06/defs.asm
+++ b/avr/devices/r06/defs.asm
@@ -39,12 +39,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 1     ; shorter
-.equ LED_SIMPLE_OFFTIME = 50    ; longer
-.equ LED_SIMPLE_DDR     = DDRB
-.equ LED_SIMPLE_PORT    = PORTB
-.equ LED_SIMPLE_PORTIN  = PINB
-.equ LED_SIMPLE_PINNUM  = PORTB0
+.equ LED1_DEFAULT_ONTIME  = 1     ; shorter
+.equ LED1_DEFAULT_OFFTIME = 99    ; longer
+.equ LED1_DEFAULT_REPEATS = 0     ; continous
+.equ LED1_DDR     = DDRB
+.equ LED1_PORT    = PORTB
+.equ LED1_PORTIN  = PINB
+.equ LED1_PINNUM  = PORTB0



--- a/avr/devices/r06/main/main.asm
+++ b/avr/devices/r06/main/main.asm
@@ -64,7 +64,7 @@

 ; #define MODULES_TIMER
 #define MODULES_CLOCK
-#define MODULES_LED_SIMPLE
+#define MODULES_LED1
 #define MODULES_NETWORK
 ;#define MODULES_UART_BITBANG
 #define MODULES_COM2WN
--- a/avr/devices/s03/defs.asm
+++ b/avr/devices/s03/defs.asm
@@ -52,22 +52,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 1     ; shorter
-.equ LED_SIMPLE_OFFTIME = 50    ; longer
-.equ LED_SIMPLE_DDR     = DDRB
-.equ LED_SIMPLE_PORT    = PORTB
-.equ LED_SIMPLE_PORTIN  = PINB
-.equ LED_SIMPLE_PINNUM  = PORTB0
-
-
-
-; ---------------------------------------------------------------------------
-; LED activity module
-
-.equ LED_ACTIVITY_DDR     = DDRB
-.equ LED_ACTIVITY_PORT    = PORTB
-.equ LED_ACTIVITY_PORTIN  = PINB
-.equ LED_ACTIVITY_PINNUM  = PORTB1
+.equ LED1_DEFAULT_ONTIME  = 1     ; shorter
+.equ LED1_DEFAULT_OFFTIME = 99    ; longer
+.equ LED1_DEFAULT_REPEATS = 0     ; continous
+.equ LED1_DDR     = DDRB
+.equ LED1_PORT    = PORTB
+.equ LED1_PORTIN  = PINB
+.equ LED1_PINNUM  = PORTB0



--- a/avr/devices/s03/main/main.asm
+++ b/avr/devices/s03/main/main.asm
@@ -50,8 +50,7 @@
 #define MODULES_CLOCK
 ;#define MODULES_XRAM
 ;#define MODULES_HEAP
-#define MODULES_LED_SIMPLE
-#define MODULES_LED_ACTIVITY
+#define MODULES_LED1
 #define MODULES_NETWORK
 #define MODULES_COM2WI
 ;#define MODULES_COMONUART0
--- a/avr/devices/t03/defs.asm
+++ b/avr/devices/t03/defs.asm
@@ -40,12 +40,13 @@
 ; ---------------------------------------------------------------------------
 ; LED module

-.equ LED_SIMPLE_ONTIME  = 2
-.equ LED_SIMPLE_OFFTIME = 30
-.equ LED_SIMPLE_DDR     = DDRB
-.equ LED_SIMPLE_PORT    = PORTB
-.equ LED_SIMPLE_PORTIN  = PINB
-.equ LED_SIMPLE_PINNUM  = PORTB2
+.equ LED1_DEFAULT_ONTIME  = 1     ; shorter
+.equ LED1_DEFAULT_OFFTIME = 99    ; longer
+.equ LED1_DEFAULT_REPEATS = 0     ; continous
+.equ LED1_DDR     = DDRB
+.equ LED1_PORT    = PORTB
+.equ LED1_PORTIN  = PINB
+.equ LED1_PINNUM  = PORTB2



--- a/avr/devices/t03/main/main.asm
+++ b/avr/devices/t03/main/main.asm
@@ -63,7 +63,7 @@
 ;#define MODULES_COM
 ;#define MODULES_COM_WITH_ADDR_PROTO
 ;#define MODULES_LED
-#define MODULES_LED_SIMPLE
+#define MODULES_LED1
 ;#define MODULES_TWI_MASTER
 ;#define MODULES_LCD
 ;#define LCD_MINIMAL_FONT
--- a/avr/devices/t03/test/main.asm
+++ b/avr/devices/t03/test/main.asm
@@ -63,8 +63,7 @@
 #define MODULES_CLOCK
 ;#define MODULES_COM
 ;#define MODULES_COM_WITH_ADDR_PROTO
-;#define MODULES_LED
-#define MODULES_LED_SIMPLE
+#define MODULES_LED1
 ;#define MODULES_TWI_MASTER
 ;#define MODULES_LCD
 ;#define LCD_MINIMAL_FONT
@@ -253,7 +252,7 @@ onMessageReceived:
 ; debug
 push r18
  push r19
-    rcall LedSimple_SetFastTiming
+    rcall Led1_SetFastTiming
  pop r19
 pop r18

--- a/avr/devices/t03/uartfd/main.asm
+++ b/avr/devices/t03/uartfd/main.asm
@@ -74,10 +74,7 @@
 #define MODULES_CLOCK
 ;#define MODULES_COM
 ;#define MODULES_COM_WITH_ADDR_PROTO
-;#define MODULES_LED
-;#define MODULES_LED_SIMPLE
-;#define MODULES_LED_SIGNAL
-#define MODULES_LED_ACTIVITY
+#define MODULES_LED1
 ;#define MODULES_TWI_MASTER
 ;#define MODULES_LCD
 ;#define LCD_MINIMAL_FONT
@@ -114,7 +111,6 @@

 .equ VALUE_ID_DS18B20_TEMP     = 0x06

-.equ VALUE_ID_LEDSIMPLE_TIMING = 0x88
 .equ VALUE_ID_ROUTER_SETRANGE  = 0x89