diff --git a/avr/devices/c01/defs.asm b/avr/devices/c01/defs.asm
index 5218d23..391ecd4 100644
--- 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
 
 
 
diff --git a/avr/devices/c01/main/main.asm b/avr/devices/c01/main/main.asm
index 4b9dff9..4761064 100644
--- 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
diff --git a/avr/devices/c03/defs.asm b/avr/devices/c03/defs.asm
index ac4a224..52fefb9 100644
--- 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
 
 
 
diff --git a/avr/devices/c03/main/main.asm b/avr/devices/c03/main/main.asm
index 9c463d3..7eb1228 100644
--- 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
diff --git a/avr/devices/e01/defs.asm b/avr/devices/e01/defs.asm
index ca8f763..2a3c8e9 100644
--- 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
 
 
 
diff --git a/avr/devices/e01/main/main.asm b/avr/devices/e01/main/main.asm
index 2eb0c92..1f275ca 100644
--- 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
diff --git a/avr/devices/e02/defs.asm b/avr/devices/e02/defs.asm
index 52f2928..64a4e33 100644
--- 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
 
 
 
diff --git a/avr/devices/e02/main/main.asm b/avr/devices/e02/main/main.asm
index f39c742..432fbf0 100644
--- 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
diff --git a/avr/devices/e03/defs.asm b/avr/devices/e03/defs.asm
index b6dba86..08e57b4 100644
--- 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
 
 
 
diff --git a/avr/devices/e03/main/main.asm b/avr/devices/e03/main/main.asm
index 529ed7a..23cd42e 100644
--- 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
diff --git a/avr/devices/e04/defs.asm b/avr/devices/e04/defs.asm
index 130aa19..f6d43a8 100644
--- 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
 
 
 
diff --git a/avr/devices/e04/main/main.asm b/avr/devices/e04/main/main.asm
index e174407..557d97d 100644
--- 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
diff --git a/avr/devices/e05/defs.asm b/avr/devices/e05/defs.asm
index 4934024..7fc7b89 100644
--- 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
 
 
 
diff --git a/avr/devices/e05/main/main.asm b/avr/devices/e05/main/main.asm
index dddb454..a11449a 100644
--- 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
diff --git a/avr/devices/minimal/defs.asm b/avr/devices/minimal/defs.asm
index fd18cb1..77b78a7 100644
--- 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
 
 
 
diff --git a/avr/devices/minimal/main/main.asm b/avr/devices/minimal/main/main.asm
index ab1d389..16f9e2d 100644
--- 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
 
diff --git a/avr/devices/n14/boot/boot.asm b/avr/devices/n14/boot/boot.asm
index 175be30..352db2c 100644
--- 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"
 
 
 
diff --git a/avr/devices/n14/defs.asm b/avr/devices/n14/defs.asm
index b450626..f2ba9a5 100644
--- 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
 
 
 
diff --git a/avr/devices/n14/main/main.asm b/avr/devices/n14/main/main.asm
index 27cc7bd..1161115 100644
--- 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
diff --git a/avr/devices/n16/defs.asm b/avr/devices/n16/defs.asm
index 271634a..6b8dd80 100644
--- 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
 
 
 
diff --git a/avr/devices/n16/main/main.asm b/avr/devices/n16/main/main.asm
index 9a84286..caecfd7 100644
--- 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
diff --git a/avr/devices/n21/defs.asm b/avr/devices/n21/defs.asm
index c4f08f2..391d218 100644
--- 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
 
 
 
diff --git a/avr/devices/n21/main/main.asm b/avr/devices/n21/main/main.asm
index 58ebf4c..f976acb 100644
--- 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
diff --git a/avr/devices/n24/defs.asm b/avr/devices/n24/defs.asm
index 1e7d5cb..e478f7d 100644
--- 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
 
 
 
diff --git a/avr/devices/n24/main/main.asm b/avr/devices/n24/main/main.asm
index 7171249..dd428ec 100644
--- 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
diff --git a/avr/devices/n25/defs.asm b/avr/devices/n25/defs.asm
index fa508c6..2f217e4 100644
--- 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
 
 
 
diff --git a/avr/devices/n25/main/main.asm b/avr/devices/n25/main/main.asm
index 00c9f01..d4e6fa6 100644
--- 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
diff --git a/avr/devices/n26/defs.asm b/avr/devices/n26/defs.asm
index e920766..9f1c186 100644
--- 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
 
 
 ; ---------------------------------------------------------------------------
diff --git a/avr/devices/n26/main/main.asm b/avr/devices/n26/main/main.asm
index 41dd86e..23aceeb 100644
--- 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
diff --git a/avr/devices/n27/defs.asm b/avr/devices/n27/defs.asm
index 346503b..69f83ab 100644
--- 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
 
 
 
diff --git a/avr/devices/n27/main/main.asm b/avr/devices/n27/main/main.asm
index c135c37..025ed97 100644
--- 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
diff --git a/avr/devices/n28/defs.asm b/avr/devices/n28/defs.asm
index 9d709d0..c08f542 100644
--- 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
 
 
 
diff --git a/avr/devices/n28/main/main.asm b/avr/devices/n28/main/main.asm
index 76228d6..4dc82c7 100644
--- 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
diff --git a/avr/devices/n29/defs.asm b/avr/devices/n29/defs.asm
index 9de419c..184a4f1 100644
--- 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
 
 
 
diff --git a/avr/devices/n29/main/main.asm b/avr/devices/n29/main/main.asm
index 4ce5f74..29a2abf 100644
--- 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
diff --git a/avr/devices/n30/defs.asm b/avr/devices/n30/defs.asm
index b1098a9..5f9a153 100644
--- 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
 
 
 
diff --git a/avr/devices/n30/main/main.asm b/avr/devices/n30/main/main.asm
index 4d0e6c2..763548e 100644
--- 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
diff --git a/avr/devices/n31/defs.asm b/avr/devices/n31/defs.asm
index f2d60b7..efa0292 100644
--- 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
 
 
 
diff --git a/avr/devices/n31/main/main.asm b/avr/devices/n31/main/main.asm
index 1e39c94..6dc9340 100644
--- 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
 
 
 
diff --git a/avr/devices/r05/defs.asm b/avr/devices/r05/defs.asm
index 7e1b8d5..abd17db 100644
--- 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
 
 
 
diff --git a/avr/devices/r05/main/main.asm b/avr/devices/r05/main/main.asm
index 01ec7f5..6d6a425 100644
--- 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
 
 
diff --git a/avr/devices/r05/test/main.asm b/avr/devices/r05/test/main.asm
index 3a090fc..c2fb629 100644
--- 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
diff --git a/avr/devices/r06/defs.asm b/avr/devices/r06/defs.asm
index e952453..52ac3c0 100644
--- 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
 
 
 
diff --git a/avr/devices/r06/main/main.asm b/avr/devices/r06/main/main.asm
index a1ffb17..3493c7e 100644
--- 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
diff --git a/avr/devices/s03/defs.asm b/avr/devices/s03/defs.asm
index 06d6a17..8cb6bf4 100644
--- 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
 
 
 
diff --git a/avr/devices/s03/main/main.asm b/avr/devices/s03/main/main.asm
index ace74c6..e292fdb 100644
--- 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
diff --git a/avr/devices/t03/defs.asm b/avr/devices/t03/defs.asm
index d5a774a..82fd6f2 100644
--- 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
 
 
 
diff --git a/avr/devices/t03/main/main.asm b/avr/devices/t03/main/main.asm
index 3512966..1e74fed 100644
--- 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
diff --git a/avr/devices/t03/test/main.asm b/avr/devices/t03/test/main.asm
index 3aeae6c..c3e8b4e 100644
--- 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
 
diff --git a/avr/devices/t03/uartfd/main.asm b/avr/devices/t03/uartfd/main.asm
index 5ce57ac..14e31bb 100644
--- 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