From 06755382585f8e86e4f6b73e5b97d5d9d35f1908 Mon Sep 17 00:00:00 2001
From: Martin Preuss <martin@aquamaniac.de>
Date: Mon, 13 Jul 2026 23:23:49 +0200
Subject: [PATCH] lcd2: more work on light settings.

---
 avr/devices/c03/main/w_lightsettings.asm      | 137 ++++--
 avr/modules/lcd2/gui/aqhome/d_light_conns.asm | 167 +------
 .../lcd2/gui/aqhome/d_light_settings.asm      | 442 ++++++++++++++++++
 3 files changed, 558 insertions(+), 188 deletions(-)
 create mode 100644 avr/modules/lcd2/gui/aqhome/d_light_settings.asm

diff --git a/avr/devices/c03/main/w_lightsettings.asm b/avr/devices/c03/main/w_lightsettings.asm
index bf8183d..372010a 100644
--- a/avr/devices/c03/main/w_lightsettings.asm
+++ b/avr/devices/c03/main/w_lightsettings.asm
@@ -26,12 +26,11 @@
 ; selectors
 .equ LIGHTSETTINGSWIN_SEL_DIALOG_OK    = 1
 .equ LIGHTSETTINGSWIN_SEL_DIALOG_ABORT = 2
-.equ LIGHTSETTINGSWIN_SEL_NODEADDR     = 3
-.equ LIGHTSETTINGSWIN_SEL_LEDCOUNT     = 4
-.equ LIGHTSETTINGSWIN_SEL_ONTIME       = 5
-.equ LIGHTSETTINGSWIN_SEL_MSRC1        = 6
-.equ LIGHTSETTINGSWIN_SEL_MSRC2        = 7
-.equ LIGHTSETTINGSWIN_SEL_BSRC         = 8
+.equ LIGHTSETTINGSWIN_SEL_NAME         = 3
+.equ LIGHTSETTINGSWIN_SEL_SUFFIX       = 4
+.equ LIGHTSETTINGSWIN_SEL_LEDCOUNT     = 5
+.equ LIGHTSETTINGSWIN_SEL_ONTIME       = 6
+.equ LIGHTSETTINGSWIN_SEL_CONNECTIONS  = 7
 
 
 
@@ -111,41 +110,50 @@ LightSettingsWin_Init_ret:
 
 
 
+; ---------------------------------------------------------------------------
+; @routine LightSettingsWin_toGui @global
+;
+; @param  Y       pointer to dialog
+
+LightSettingsWin_toGui:
+  ldd zl, Y+LIGHTSETTINGSWIN_OFFS_SETTINGS_LO
+  ldd zh, Y+LIGHTSETTINGSWIN_OFFS_SETTINGS_HI
+
+  ; name
+  ldd xl, Z+LIGHTSETTINGS_OFFS_NAME
+  clr xh
+  ldi r16, LIGHTSETTINGSWIN_SEL_NAME
+  bigcall CDialog_SetChildValue
+
+  ; suffix
+  ldd xl, Z+LIGHTSETTINGS_OFFS_IDX
+  clr xh
+  ldi r16, LIGHTSETTINGSWIN_SEL_SUFFIX
+  bigcall CDialog_SetChildValue
+
+  ; LED count
+  ldd xl, Z+LIGHTSETTINGS_OFFS_LEDNUM_LO
+  ldd xh, Z+LIGHTSETTINGS_OFFS_LEDNUM_HI
+  ldi r16, LIGHTSETTINGSWIN_SEL_LEDCOUNT
+  bigcall CDialog_SetChildValue
+
+  ; ON time
+  ldd xl, Z+LIGHTSETTINGS_OFFS_ONTIME_LO
+  ldd xh, Z+LIGHTSETTINGS_OFFS_ONTIME_HI
+  ldi r16, LIGHTSETTINGSWIN_SEL_ONTIME
+  bigcall CDialog_SetChildValue
+
+  ret
+; @end
+
+
+
 
 
 ; ***************************************************************************
 ; signal handlers
 
 
-; ---------------------------------------------------------------------------
-; @routine LightSettingsWin_OnDestroy @global
-;
-; @param Y address of object in SDRAM
-; @return CFLAG set if signal handled
-; @clobbers any, !Y
-
-
-LightSettingsWin_OnDestroy:
-  ldd xl, Y+LIGHTSETTINGSWIN_OFFS_SETTINGS_LO
-  ldd xh, Y+LIGHTSETTINGSWIN_OFFS_SETTINGS_HI
-  mov r16, xl
-  or r16, xh
-  breq LightSettingsWin_OnDestroy_done
-  clr r16
-  std Y+LIGHTSETTINGSWIN_OFFS_SETTINGS_LO, r16
-  std Y+LIGHTSETTINGSWIN_OFFS_SETTINGS_HI, r16
-  bigcall Heap_Free
-  
-  ; Clear CFLAG so that destroy handlers of base classes are called
-  ; after this routine returns. This way the last routine called will be
-  ; OBJ_OnDestroy which then frees the whole SDRAM object on heap.
-LightSettingsWin_OnDestroy_done:
-  clc
-  ret
-; @end
-
-
-
 
 
 
@@ -158,7 +166,8 @@ LightSettingsWin_Config:
   .dw 0                                                     ; STYLE
   .db 2, 0                                                  ; PARAM1, PARAM2
   
-  ; line 1, left widget
+  ; line 1: name
+  ; left widget
   .db CWIDGETCFG_WIDGET_TYPE_LABEL, 0                       ; TYPE, FLAGS
   .db 0, 0                                                  ; SELECTOR, RESERVED
   .db 0, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
@@ -166,13 +175,39 @@ LightSettingsWin_Config:
          (WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | \
          (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)    ; OPTS, PACK
   .dw 0                                                     ; STYLE
-  .dw RESSOURCE_TXT_LEDNODEADDR                             ; PARAM1, PARAM2
+  .dw RESSOURCE_TXT_LEDNAME                                 ; PARAM1, PARAM2
   .dw 0                                                     ; PARAM3, PARAM4
   .dw 0, 0                                                  ; MINVAL, MAXVAL
 
-  ; line 1, right widget
+  ; right widget
+  .db CWIDGETCFG_WIDGET_TYPE_TEXTSEL, 0                     ; TYPE, FLAGS
+  .db LIGHTSETTINGSWIN_SEL_NAME, 0                          ; SELECTOR, RESERVED
+  .db (1<<WIDGET_OPTS_BORDER_BIT), \
+      (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+      (WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)       ; OPTS, PACK
+  .dw 0                                                     ; STYLE
+  .dw (LightSettingsWin_Names*2)                            ; PARAM1, PARAM2 (pointer to name list)
+  .dw 0                                                     ; PARAM3, PARAM4
+  .dw 0, 0                                                  ; MINVAL, MAXVAL
+
+  ; line 2: suffix
+  ; left widget
+  .db CWIDGETCFG_WIDGET_TYPE_LABEL, 0                       ; TYPE, FLAGS
+  .db 0, 0                                                  ; SELECTOR, RESERVED
+  .db 0, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
+         (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+         (WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | \
+         (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)    ; OPTS, PACK
+  .dw 0                                                     ; STYLE
+  .dw RESSOURCE_TXT_LEDNAME                                 ; PARAM1, PARAM2
+  .dw 0                                                     ; PARAM3, PARAM4
+  .dw 0, 0                                                  ; MINVAL, MAXVAL
+
+  ; right widget
   .db CWIDGETCFG_WIDGET_TYPE_HSPINNER, (1<<CWIDGETCFG_WIDGET_FLAGS_MINMAXVALUES_BIT)  ; TYPE, FLAGS
-  .db LIGHTSETTINGSWIN_SEL_NODEADDR, 0                      ; SELECTOR, RESERVED
+  .db LIGHTSETTINGSWIN_SEL_SUFFIX, 0                        ; SELECTOR, RESERVED
   .db (1<<WIDGET_OPTS_BORDER_BIT), \
       (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
       (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
@@ -181,9 +216,10 @@ LightSettingsWin_Config:
   .dw 0                                                     ; STYLE
   .db 0, 5                                                  ; PARAM1, PARAM2 (postkomma digits, total digits)
   .dw 0                                                     ; PARAM3, PARAM4
-  .dw 1, 255                                                ; MINVAL, MAXVAL
+  .dw 0, 9                                                  ; MINVAL, MAXVAL
 
-  ; line 2, left widget
+  ; line 3: LED count
+  ; left widget
   .db CWIDGETCFG_WIDGET_TYPE_LABEL, 0                       ; TYPE, FLAGS
   .db 0, 0                                                  ; SELECTOR, RESERVED
   .db 0, \
@@ -196,7 +232,7 @@ LightSettingsWin_Config:
   .dw 0                                                     ; PARAM3, PARAM4
   .dw 0, 0                                                  ; MINVAL, MAXVAL
 
-  ; line 2, right widget
+  ; right widget
   .db CWIDGETCFG_WIDGET_TYPE_HSPINNER, (1<<CWIDGETCFG_WIDGET_FLAGS_MINMAXVALUES_BIT)  ; TYPE, FLAGS
   .db LIGHTSETTINGSWIN_SEL_LEDCOUNT, 0                      ; SELECTOR, RESERVED
   .db (1<<WIDGET_OPTS_BORDER_BIT), \
@@ -209,7 +245,8 @@ LightSettingsWin_Config:
   .dw 0                                                     ; PARAM3, PARAM4
   .dw 1, 300                                                ; MINVAL, MAXVAL
 
-  ; line 3, left widget
+  ; line 4: ON time
+  ; left widget
   .db CWIDGETCFG_WIDGET_TYPE_LABEL, 0                       ; TYPE, FLAGS
   .db 0, 0                                                  ; SELECTOR, RESERVED
   .db 0, \
@@ -222,7 +259,7 @@ LightSettingsWin_Config:
   .dw 0                                                     ; PARAM3, PARAM4
   .dw 0, 0                                                  ; MINVAL, MAXVAL
 
-  ; line 3, right widget
+  ; right widget
   .db CWIDGETCFG_WIDGET_TYPE_HSPINNER, (1<<CWIDGETCFG_WIDGET_FLAGS_MINMAXVALUES_BIT)  ; TYPE, FLAGS
   .db LIGHTSETTINGSWIN_SEL_ONTIME, 0                        ; SELECTOR, RESERVED
   .db (1<<WIDGET_OPTS_BORDER_BIT), \
@@ -235,16 +272,24 @@ LightSettingsWin_Config:
   .dw 0                                                     ; PARAM3, PARAM4
   .dw 1, 60000                                              ; MINVAL, MAXVAL
 
+  ; line 5: connections (TODO)
+
   ; end of configuration
   .dw 0
 
 
+LightSettingsWin_Names:
+  .dw RESSOURCE_TXT_LEDNAME_MAIN
+  .dw RESSOURCE_TXT_LEDNAME_CUPBOARD
+  .dw RESSOURCE_TXT_LEDNAME_WALL
+  .dw 0
+
+
 
 LightSettingsWin_DefaultSignalmap:
   ; header
-  .dw MainWindow_DefaultSignalmap*2  ; next table to use
+  .dw CDialog_DefaultSignalmap*2  ; next table to use
   ; entries
-  .db 0, OBJECT_SIGNAL_DESTROY, LOW(LightSettingsWin_OnDestroy), HIGH(LightSettingsWin_OnDestroy)
   .db 0, 0, 0, 0  ; end of table
 
 
diff --git a/avr/modules/lcd2/gui/aqhome/d_light_conns.asm b/avr/modules/lcd2/gui/aqhome/d_light_conns.asm
index 7f21aec..f6744d1 100644
--- a/avr/modules/lcd2/gui/aqhome/d_light_conns.asm
+++ b/avr/modules/lcd2/gui/aqhome/d_light_conns.asm
@@ -19,9 +19,7 @@
 .equ DLGLIGHTCONNS_OFFS_BEGIN            = CDIALOG_SIZE
 .equ DLGLIGHTCONNS_OFFS_SETTINGS_LO      = DLGLIGHTCONNS_OFFS_BEGIN+0
 .equ DLGLIGHTCONNS_OFFS_SETTINGS_HI      = DLGLIGHTCONNS_OFFS_BEGIN+1
-.equ DLGLIGHTCONNS_OFFS_CURRDLG_LO       = DLGLIGHTCONNS_OFFS_BEGIN+2
-.equ DLGLIGHTCONNS_OFFS_CURRDLG_HI       = DLGLIGHTCONNS_OFFS_BEGIN+3
-.equ DLGLIGHTCONNS_SIZE                  = DLGLIGHTCONNS_OFFS_BEGIN+4
+.equ DLGLIGHTCONNS_SIZE                  = DLGLIGHTCONNS_OFFS_BEGIN+2
 
 
 ; selectors
@@ -127,34 +125,34 @@ DlgLightConns_toGui:
   ldd xl, Z+LIGHTSETTINGS_OFFS_SOURCE1_NODEADDR
   clr xh
   ldi r16, DLGLIGHTCONNS_SEL_ADDR_MOTION1
-  rcall dlgLightConnsSetValue
+  bigcall CDialog_SetChildValue
 
   ldd xl, Z+LIGHTSETTINGS_OFFS_SOURCE1_VALUEID
   clr xh
   ldi r16, DLGLIGHTCONNS_SEL_VALUE_MOTION1
-  rcall dlgLightConnsSetValue
+  bigcall CDialog_SetChildValue
 
   ; motion source 2
   ldd xl, Z+LIGHTSETTINGS_OFFS_SOURCE2_NODEADDR
   clr xh
   ldi r16, DLGLIGHTCONNS_SEL_ADDR_MOTION2
-  rcall dlgLightConnsSetValue
+  bigcall CDialog_SetChildValue
 
   ldd xl, Z+LIGHTSETTINGS_OFFS_SOURCE2_VALUEID
   clr xh
   ldi r16, DLGLIGHTCONNS_SEL_VALUE_MOTION2
-  rcall dlgLightConnsSetValue
+  bigcall CDialog_SetChildValue
 
   ; light source
   ldd xl, Z+LIGHTSETTINGS_OFFS_BSOURCE_NODEADDR
   clr xh
   ldi r16, DLGLIGHTCONNS_SEL_ADDR_LIGHT
-  rcall dlgLightConnsSetValue
+  bigcall CDialog_SetChildValue
 
   ldd xl, Z+LIGHTSETTINGS_OFFS_BSOURCE_VALUEID
   clr xh
   ldi r16, DLGLIGHTCONNS_SEL_VALUE_LIGHT
-  rcall dlgLightConnsSetValue
+  bigcall CDialog_SetChildValue
   
   ret
 ; @end
@@ -172,29 +170,29 @@ DlgLightConns_fromGui:
   
   ; motion source 1
   ldi r16, DLGLIGHTCONNS_SEL_ADDR_MOTION1
-  rcall dlgLightConnsGetValue
+  rcall CDialog_GetChildValue
   std Z+LIGHTSETTINGS_OFFS_SOURCE1_NODEADDR, r18
 
   ldi r16, DLGLIGHTCONNS_SEL_VALUE_MOTION1
-  rcall dlgLightConnsGetValue
+  rcall CDialog_GetChildValue
   std Z+LIGHTSETTINGS_OFFS_SOURCE1_VALUEID, r18
 
   ; motion source 2
   ldi r16, DLGLIGHTCONNS_SEL_ADDR_MOTION2
-  rcall dlgLightConnsGetValue
+  rcall CDialog_GetChildValue
   std Z+LIGHTSETTINGS_OFFS_SOURCE2_NODEADDR, r18
 
   ldi r16, DLGLIGHTCONNS_SEL_VALUE_MOTION2
-  rcall dlgLightConnsGetValue
+  rcall CDialog_GetChildValue
   std Z+LIGHTSETTINGS_OFFS_SOURCE2_VALUEID, r18
 
   ; light source
   ldi r16, DLGLIGHTCONNS_SEL_ADDR_LIGHT
-  rcall dlgLightConnsGetValue
+  rcall CDialog_GetChildValue
   std Z+LIGHTSETTINGS_OFFS_BSOURCE_NODEADDR, r18
 
   ldi r16, DLGLIGHTCONNS_SEL_VALUE_LIGHT
-  rcall dlgLightConnsGetValue
+  rcall CDialog_GetChildValue
   std Z+LIGHTSETTINGS_OFFS_BSOURCE_VALUEID, r18
 
   ret
@@ -202,121 +200,6 @@ DlgLightConns_fromGui:
 
 
 
-; ---------------------------------------------------------------------------
-; @routine dlgLightConnsSetValue
-; @param Y   pointer to dialog
-; @param r16 selector of widget to modify
-; @param X   value to set
-
-dlgLightConnsSetValue:
-  bigcall CDialog_GetChildBySelector   ; r19:r18=result (R16-R19)
-  brcc dlgLightConnsSetValue_ret
-  push yl
-    push yh
-      mov yl, r18
-      mov yh, r19
-      push zl
-        push zh
-          bigcall Widget_SetCurrentValue
-        pop zh
-      pop zl
-    pop yh
-  pop yl
-dlgLightConnsSetValue_ret:
-  ret
-; @end
-
-
-
-; ---------------------------------------------------------------------------
-; @routine dlgLightConnsGetValue
-; @param Y   pointer to dialog
-; @param r16 selector of widget to modify
-; @param X   value to set
-
-dlgLightConnsGetValue:
-  bigcall CDialog_GetChildBySelector   ; r19:r18=result (R16-R19)
-  brcc dlgLightConnsGetValue_ret
-  push yl
-    push yh
-      mov yl, r18
-      mov yh, r19
-      push zl
-        push zh
-          bigcall Widget_GetCurrentValue ; r19:r18=result (any, !Y)
-        pop zh
-      pop zl
-    pop yh
-  pop yl
-dlgLightConnsGetValue_ret:
-  ret
-; @end
-
-
-
-; ---------------------------------------------------------------------------
-; @routine dlgLightConnsEnterSubDialog
-; @param Y   pointer to dialog
-; @param X   pointer to new dialog to enter
-; @clobbers any, !Y
-
-dlgLightConnsEnterSubDialog:
-  std Y+DLGLIGHTCONNS_OFFS_CURRDLG_LO, xl
-  std Y+DLGLIGHTCONNS_OFFS_CURRDLG_HI, xh
-  
-  adiw xh:xl, OBJECT_OFFS_TARGET_LO
-  st X+, yl
-  st X, yh
-  sbiw xh:xl, (OBJECT_OFFS_TARGET_LO+1)
-  
-  push yl
-    push yh
-      bigcall Widget_GetApp                     ; R19:R18=gui (none)
-      mov yl, r18
-      mov yh, r19
-      bigcall GuiApp_EnterWindow
-    pop yh
-  pop yl
-  ret
-; @end
-
-
-
-; ---------------------------------------------------------------------------
-; @routine dlgLightConnsLeaveSubDialog
-; @param Y   pointer to dialog
-; @clobbers any, !Y
-
-dlgLightConnsLeaveSubDialog:
-  ; leave sub-dialog
-  push yl
-    push yh
-      bigcall Widget_GetApp                     ; R19:R18=gui
-      mov yl, r18
-      mov yh, r19
-      bigcall GuiApp_LeaveWindow
-    pop yh
-  pop yl
-
-  ; mark sub-dialog for destruction
-  ldd xl, Y+DLGLIGHTCONNS_OFFS_CURRDLG_LO
-  ldd xh, Y+DLGLIGHTCONNS_OFFS_CURRDLG_HI
-  clr r16
-  std Y+DLGLIGHTCONNS_OFFS_CURRDLG_LO, r16
-  std Y+DLGLIGHTCONNS_OFFS_CURRDLG_HI, r16
-  adiw xh:xl, OBJECT_OFFS_FLAGS
-  ld r16, X
-  sbr r16, (1<<OBJECT_FLAGS_DESTROY_BIT)
-  st X, r16
-  ret
-; @end
-
-
-
-
-
-
-
 ; ***************************************************************************
 ; signal handlers
 
@@ -388,7 +271,7 @@ DlgLightConns_OnCmdMotion1:
     pop yh
   pop yl
 
-  rcall dlgLightConnsEnterSubDialog
+  rcall Dialog_EnterSubDialog
 
   sec
   ret
@@ -411,8 +294,8 @@ DlgLightConns_OnDlgEndMotion1:
   ldd zh, Y+DLGLIGHTCONNS_OFFS_SETTINGS_HI
   push yl
     push yh
-      ldd r16, Y+DLGLIGHTCONNS_OFFS_CURRDLG_LO
-      ldd yh, Y+DLGLIGHTCONNS_OFFS_CURRDLG_HI
+      ldd r16, Y+DIALOG_OFFS_CURRSUBDLG_LO
+      ldd yh, Y+DIALOG_OFFS_CURRSUBDLG_HI
       mov yl, r16
       bigcall DlgNodeValueId_GetNodeAddr
       std Z+LIGHTSETTINGS_OFFS_SOURCE1_NODEADDR, r18
@@ -422,7 +305,7 @@ DlgLightConns_OnDlgEndMotion1:
   pop yl
   
 DlgLightConns_OnDlgEndMotion1_leave:
-  rcall dlgLightConnsLeaveSubDialog
+  bigcall Dialog_LeaveSubDialog
   sec
   ret
 ; @end
@@ -466,7 +349,7 @@ DlgLightConns_OnCmdMotion2:
     pop yh
   pop yl
 
-  rcall dlgLightConnsEnterSubDialog
+  rcall Dialog_EnterSubDialog
 
   sec
   ret
@@ -489,8 +372,8 @@ DlgLightConns_OnDlgEndMotion2:
   ldd zh, Y+DLGLIGHTCONNS_OFFS_SETTINGS_HI
   push yl
     push yh
-      ldd r16, Y+DLGLIGHTCONNS_OFFS_CURRDLG_LO
-      ldd yh, Y+DLGLIGHTCONNS_OFFS_CURRDLG_HI
+      ldd r16, Y+DIALOG_OFFS_CURRSUBDLG_LO
+      ldd yh, Y+DIALOG_OFFS_CURRSUBDLG_HI
       mov yl, r16
       bigcall DlgNodeValueId_GetNodeAddr
       std Z+LIGHTSETTINGS_OFFS_SOURCE2_NODEADDR, r18
@@ -500,7 +383,7 @@ DlgLightConns_OnDlgEndMotion2:
   pop yl
   
 DlgLightConns_OnDlgEndMotion2_leave:
-  rcall dlgLightConnsLeaveSubDialog
+  bigcall Dialog_LeaveSubDialog
   sec
   ret
 ; @end
@@ -544,7 +427,7 @@ DlgLightConns_OnCmdLight:
     pop yh
   pop yl
 
-  rcall dlgLightConnsEnterSubDialog
+  rcall Dialog_EnterSubDialog
   sec
   ret
 ; @end
@@ -566,8 +449,8 @@ DlgLightConns_OnDlgEndLight:
   ldd zh, Y+DLGLIGHTCONNS_OFFS_SETTINGS_HI
   push yl
     push yh
-      ldd r16, Y+DLGLIGHTCONNS_OFFS_CURRDLG_LO
-      ldd yh, Y+DLGLIGHTCONNS_OFFS_CURRDLG_HI
+      ldd r16, Y+DIALOG_OFFS_CURRSUBDLG_LO
+      ldd yh, Y+DIALOG_OFFS_CURRSUBDLG_HI
       mov yl, r16
       bigcall DlgNodeValueId_GetNodeAddr
       std Z+LIGHTSETTINGS_OFFS_BSOURCE_NODEADDR, r18
@@ -577,7 +460,7 @@ DlgLightConns_OnDlgEndLight:
   pop yl
   
 DlgLightConns_OnDlgEndLight_leave:
-  rcall dlgLightConnsLeaveSubDialog
+  bigcall Dialog_LeaveSubDialog
   sec
   ret
 ; @end
diff --git a/avr/modules/lcd2/gui/aqhome/d_light_settings.asm b/avr/modules/lcd2/gui/aqhome/d_light_settings.asm
new file mode 100644
index 0000000..a701bb7
--- /dev/null
+++ b/avr/modules/lcd2/gui/aqhome/d_light_settings.asm
@@ -0,0 +1,442 @@
+; ***************************************************************************
+; copyright   : (C) 2026 by Martin Preuss
+; email       : martin@libchipcard.de
+;
+; ***************************************************************************
+; * This file is part of the project "AqHome".                              *
+; * Please see toplevel file COPYING of that project for license details.   *
+; ***************************************************************************
+
+#ifndef AQH_AVR_GUI2_AQHOME_D_LIGHT_SETTINGS_ASM
+#define AQH_AVR_GUI2_AQHOME_D_LIGHT_SETTINGS_ASM
+
+
+; ***************************************************************************
+; defines
+
+.equ DLGLIGHTSETTINGS_OFFS_BEGIN            = CDIALOG_SIZE
+.equ DLGLIGHTSETTINGS_OFFS_SETTINGS_LO      = DLGLIGHTSETTINGS_OFFS_BEGIN+0
+.equ DLGLIGHTSETTINGS_OFFS_SETTINGS_HI      = DLGLIGHTSETTINGS_OFFS_BEGIN+1
+.equ DLGLIGHTSETTINGS_SIZE                  = DLGLIGHTSETTINGS_OFFS_BEGIN+2
+
+
+; selectors
+.equ DLGLIGHTSETTINGS_SEL_DIALOG_OK    = 1
+.equ DLGLIGHTSETTINGS_SEL_DIALOG_ABORT = 2
+.equ DLGLIGHTSETTINGS_SEL_NAME         = 3
+.equ DLGLIGHTSETTINGS_SEL_SUFFIX       = 4
+.equ DLGLIGHTSETTINGS_SEL_LEDCOUNT     = 5
+.equ DLGLIGHTSETTINGS_SEL_ONTIME       = 6
+.equ DLGLIGHTSETTINGS_SEL_BTN_CONNS    = 7
+.equ DLGLIGHTSETTINGS_SEL_DLG_CONNS    = 8
+
+
+
+
+; ***************************************************************************
+; code
+
+.cseg
+
+
+
+; ---------------------------------------------------------------------------
+; @routine DlgLightSettings_new @global
+;
+; @param Y pointer to GUIAPP
+; @param r21:r20 pointer to settings
+; @return CFLAG set of okay, cleared otherwise
+; @return Y address of newly created object
+
+DlgLightSettings_new:
+  bigcall GuiApp_GetRootWindow        ; r19:r18=root window (none)
+  brcc DlgLightSettings_new_ret
+  mov xl, r18                         ; use root window as parent for main window
+  mov xh, r19
+  ldi r24, LOW(DLGLIGHTSETTINGS_SIZE)
+  ldi r25, HIGH(DLGLIGHTSETTINGS_SIZE)
+  push r20
+    push r21
+      bigcall Object_Alloc            ; Y=space (!r16, !r17, !X)
+    pop r21
+  pop r20
+  brcc DlgLightSettings_new_ret
+  rcall DlgLightSettings_Init
+DlgLightSettings_new_ret:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine DlgLightSettings_Init @global
+;
+; @param Y pointer to newly allocated widget data
+; @param X pointer to root window
+; @param r21:r20 pointer to settings
+; @return CFLAG set of okay, cleared otherwise
+; @clobbers any, !Y
+
+DlgLightSettings_Init:
+  push r20
+    push r21
+      ldi r16, (1<<DIALOG_OPTS_STDBTNS_BIT)                                                                ; OPTS
+      ldi r17, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_FILLED<<WIDGET_PACK_VSELF0_BIT) ; PACK
+      ldi r20, LOW(RESSOURCE_TXT_LIGHTSETTINGS)
+      ldi r21, HIGH(RESSOURCE_TXT_LIGHTSETTINGS)
+      ldi r22, LOW(DlgLightSettings_Config*2)
+      ldi r23, HIGH(DlgLightSettings_Config*2)
+      bigcall CDialog_Init               ; Y=main window
+    pop r21
+  pop r20
+  brcc DlgLightSettings_Init_ret
+
+  ; store data
+  std Y+DLGLIGHTSETTINGS_OFFS_SETTINGS_LO, r20
+  std Y+DLGLIGHTSETTINGS_OFFS_SETTINGS_HI, r21
+
+  ; set default signal map
+  ldi r16, LOW(DlgLightSettings_DefaultSignalmap*2)
+  std Y+OBJECT_OFFS_SIGNALMAP_LO, r16
+  ldi r16, HIGH(DlgLightSettings_DefaultSignalmap*2)
+  std Y+OBJECT_OFFS_SIGNALMAP_HI, r16
+
+DlgLightSettings_Init_ret:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine DlgLightSettings_toGui @global
+;
+; @param  Y       pointer to dialog
+
+DlgLightSettings_toGui:
+  ldd zl, Y+DLGLIGHTSETTINGS_OFFS_SETTINGS_LO
+  ldd zh, Y+DLGLIGHTSETTINGS_OFFS_SETTINGS_HI
+
+  ; name
+  ldd xl, Z+LIGHTSETTINGS_OFFS_NAME
+  clr xh
+  ldi r16, DLGLIGHTSETTINGS_SEL_NAME
+  bigcall CDialog_SetChildValue
+
+  ; suffix
+  ldd xl, Z+LIGHTSETTINGS_OFFS_IDX
+  clr xh
+  ldi r16, DLGLIGHTSETTINGS_SEL_SUFFIX
+  bigcall CDialog_SetChildValue
+
+  ; LED count
+  ldd xl, Z+LIGHTSETTINGS_OFFS_LEDNUM_LO
+  ldd xh, Z+LIGHTSETTINGS_OFFS_LEDNUM_HI
+  ldi r16, DLGLIGHTSETTINGS_SEL_LEDCOUNT
+  bigcall CDialog_SetChildValue
+
+  ; ON time
+  ldd xl, Z+LIGHTSETTINGS_OFFS_ONTIME_LO
+  ldd xh, Z+LIGHTSETTINGS_OFFS_ONTIME_HI
+  ldi r16, DLGLIGHTSETTINGS_SEL_ONTIME
+  bigcall CDialog_SetChildValue
+
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine DlgLightSettings_fromGui @global
+;
+; @param  Y       pointer to dialog
+
+DlgLightSettings_fromGui:
+  ldd zl, Y+DLGLIGHTSETTINGS_OFFS_SETTINGS_LO
+  ldd zh, Y+DLGLIGHTSETTINGS_OFFS_SETTINGS_HI
+  
+  ; name
+  ldi r16, DLGLIGHTSETTINGS_SEL_NAME
+  rcall CDialog_GetChildValue
+  std Z+LIGHTSETTINGS_OFFS_NAME, r18
+
+  ; suffix
+  ldi r16, DLGLIGHTSETTINGS_SEL_SUFFIX
+  rcall CDialog_GetChildValue
+  std Z+LIGHTSETTINGS_OFFS_IDX, r18
+
+  ; LED count
+  ldi r16, DLGLIGHTSETTINGS_SEL_LEDCOUNT
+  rcall CDialog_GetChildValue
+  std Z+LIGHTSETTINGS_OFFS_LEDNUM_LO, r18
+  std Z+LIGHTSETTINGS_OFFS_LEDNUM_HI, r19
+
+  ; ON time
+  ldi r16, DLGLIGHTSETTINGS_SEL_ONTIME
+  rcall CDialog_GetChildValue
+  std Z+LIGHTSETTINGS_OFFS_ONTIME_LO, r18
+  std Z+LIGHTSETTINGS_OFFS_ONTIME_HI, r19
+
+  ret
+; @end
+
+
+
+
+
+; ***************************************************************************
+; signal handlers
+
+; ---------------------------------------------------------------------------
+; @routine DlgLightSettings_OnToGui @global
+;
+; @param  Y       pointer to dialog
+; @return CFLAG set of okay, cleared otherwise
+; @clobbers any, !Y
+
+DlgLightSettings_OnToGui:
+  rcall DlgLightSettings_toGui
+  sec
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine DlgLightSettings_OnFromGui @global
+;
+; @param  Y       pointer to dialog
+; @return CFLAG set of okay, cleared otherwise
+; @clobbers any, !Y
+
+DlgLightSettings_OnFromGui:
+  rcall DlgLightSettings_fromGui
+  sec
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine DlgLightSettings_OnCmdConns @global
+;
+; @param  Y       pointer to dialog
+; @return CFLAG set of okay, cleared otherwise
+; @clobbers any, !Y
+
+DlgLightSettings_OnCmdConns:
+  push yl
+    push yh
+      bigcall Widget_GetApp                     ; R19:R18=gui
+      mov yl, r18
+      mov yh, r19
+      ldd r20, Y+DLGLIGHTSETTINGS_OFFS_SETTINGS_LO
+      ldd r21, Y+DLGLIGHTSETTINGS_OFFS_SETTINGS_HI
+      bigcall DlgLightConns_new
+      mov xl, yl
+      mov xh, yh
+    pop yh
+  pop yl
+  brcc DlgLightSettings_OnCmdConns_ret
+  rcall Dialog_EnterSubDialog
+DlgLightSettings_OnCmdConns_ret:
+  sec
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine DlgLightSettings_OnDlgEndConns @global
+;
+; @param  Y       pointer to dialog
+; @return CFLAG set of okay, cleared otherwise
+; @clobbers any, !Y
+
+DlgLightSettings_OnDlgEndConns:
+  cpi xl, DIALOG_RESULT_OK
+  brne DlgLightSettings_OnDlgEndConns_leave
+  ; nothing TODO for now
+DlgLightSettings_OnDlgEndConns_leave:
+  bigcall Dialog_LeaveSubDialog
+  sec
+  ret
+; @end
+
+
+
+
+
+; ***************************************************************************
+; data in FLASH
+
+
+DlgLightSettings_Config:
+  .db CWIDGETCFG_MAINWIDGET_TYPE_MLAYOUT, 0                 ; TYPE, FLAGS
+  .dw 0                                                     ; STYLE
+  .db 2, 0                                                  ; PARAM1, PARAM2
+  
+  ; line 1: name
+  ; left widget
+  .db CWIDGETCFG_WIDGET_TYPE_LABEL, 0                       ; TYPE, FLAGS
+  .db 0, 0                                                  ; SELECTOR, RESERVED
+  .db 0, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
+         (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+         (WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | \
+         (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)    ; OPTS, PACK
+  .dw 0                                                     ; STYLE
+  .dw RESSOURCE_TXT_LEDNAME                                 ; PARAM1, PARAM2
+  .dw 0                                                     ; PARAM3, PARAM4
+  .dw 0, 0                                                  ; MINVAL, MAXVAL
+
+  ; right widget
+  .db CWIDGETCFG_WIDGET_TYPE_TEXTSEL, 0                     ; TYPE, FLAGS
+  .db DLGLIGHTSETTINGS_SEL_NAME, 0                          ; SELECTOR, RESERVED
+  .db (1<<WIDGET_OPTS_BORDER_BIT), \
+      (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+      (WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)       ; OPTS, PACK
+  .dw 0                                                     ; STYLE
+  .dw (DlgLightSettings_Names*2)                            ; PARAM1, PARAM2 (pointer to name list)
+  .dw 0                                                     ; PARAM3, PARAM4
+  .dw 0, 0                                                  ; MINVAL, MAXVAL
+
+  ; line 2: suffix
+  ; left widget
+  .db CWIDGETCFG_WIDGET_TYPE_LABEL, 0                       ; TYPE, FLAGS
+  .db 0, 0                                                  ; SELECTOR, RESERVED
+  .db 0, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
+         (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+         (WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | \
+         (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)    ; OPTS, PACK
+  .dw 0                                                     ; STYLE
+  .dw RESSOURCE_TXT_LEDNAME                                 ; PARAM1, PARAM2
+  .dw 0                                                     ; PARAM3, PARAM4
+  .dw 0, 0                                                  ; MINVAL, MAXVAL
+
+  ; right widget
+  .db CWIDGETCFG_WIDGET_TYPE_HSPINNER, (1<<CWIDGETCFG_WIDGET_FLAGS_MINMAXVALUES_BIT)  ; TYPE, FLAGS
+  .db DLGLIGHTSETTINGS_SEL_SUFFIX, 0                        ; SELECTOR, RESERVED
+  .db (1<<WIDGET_OPTS_BORDER_BIT), \
+      (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+      (WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)       ; OPTS, PACK
+  .dw 0                                                     ; STYLE
+  .db 0, 5                                                  ; PARAM1, PARAM2 (postkomma digits, total digits)
+  .dw 0                                                     ; PARAM3, PARAM4
+  .dw 0, 9                                                  ; MINVAL, MAXVAL
+
+  ; line 3: LED count
+  ; left widget
+  .db CWIDGETCFG_WIDGET_TYPE_LABEL, 0                       ; TYPE, FLAGS
+  .db 0, 0                                                  ; SELECTOR, RESERVED
+  .db 0, \
+      (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+      (WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)    ; OPTS, PACK
+  .dw 0                                                     ; STYLE
+  .dw RESSOURCE_TXT_LEDCOUNT                                ; PARAM1, PARAM2
+  .dw 0                                                     ; PARAM3, PARAM4
+  .dw 0, 0                                                  ; MINVAL, MAXVAL
+
+  ; right widget
+  .db CWIDGETCFG_WIDGET_TYPE_HSPINNER, (1<<CWIDGETCFG_WIDGET_FLAGS_MINMAXVALUES_BIT)  ; TYPE, FLAGS
+  .db DLGLIGHTSETTINGS_SEL_LEDCOUNT, 0                      ; SELECTOR, RESERVED
+  .db (1<<WIDGET_OPTS_BORDER_BIT), \
+      (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+      (WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)       ; OPTS, PACK
+  .dw 0                                                     ; STYLE
+  .db 0, 5                                                  ; PARAM1, PARAM2 (postkomma digits, total digits)
+  .dw 0                                                     ; PARAM3, PARAM4
+  .dw 1, 300                                                ; MINVAL, MAXVAL
+
+  ; line 4: ON time
+  ; left widget
+  .db CWIDGETCFG_WIDGET_TYPE_LABEL, 0                       ; TYPE, FLAGS
+  .db 0, 0                                                  ; SELECTOR, RESERVED
+  .db 0, \
+      (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+      (WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)    ; OPTS, PACK
+  .dw 0                                                     ; STYLE
+  .dw RESSOURCE_TXT_LEDONTIME                               ; PARAM1, PARAM2
+  .dw 0                                                     ; PARAM3, PARAM4
+  .dw 0, 0                                                  ; MINVAL, MAXVAL
+
+  ; right widget
+  .db CWIDGETCFG_WIDGET_TYPE_HSPINNER, (1<<CWIDGETCFG_WIDGET_FLAGS_MINMAXVALUES_BIT)  ; TYPE, FLAGS
+  .db DLGLIGHTSETTINGS_SEL_ONTIME, 0                        ; SELECTOR, RESERVED
+  .db (1<<WIDGET_OPTS_BORDER_BIT), \
+      (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+      (WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)       ; OPTS, PACK
+  .dw 0                                                     ; STYLE
+  .db 0, 5                                                  ; PARAM1, PARAM2 (postkomma digits, total digits)
+  .dw 0                                                     ; PARAM3, PARAM4
+  .dw 1, 60000                                              ; MINVAL, MAXVAL
+
+  ; line 5: connections (TODO)
+  ; left widget
+  .db CWIDGETCFG_WIDGET_TYPE_LABEL, 0                       ; TYPE, FLAGS
+  .db 0, 0                                                  ; SELECTOR, RESERVED
+  .db 0, \
+      (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+      (WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)       ; OPTS, PACK
+  .dw 0                                                     ; STYLE
+  .dw RESSOURCE_TXT_CONN_S                                  ; PARAM1, PARAM2
+  .dw 0                                                     ; PARAM3, PARAM4
+  .dw 0, 0                                                  ; MINVAL, MAXVAL
+
+  ; right widget
+  .db CWIDGETCFG_WIDGET_TYPE_TEXTBUTTON, 0                  ; TYPE, FLAGS
+  .db DLGLIGHTSETTINGS_SEL_BTN_CONNS, 0                     ; SELECTOR, RESERVED
+  .db (1<<WIDGET_OPTS_BORDER_BIT), \
+      (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+      (WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | \
+      (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)       ; OPTS, PACK
+  .dw (DefaultStyle_SpacyButton*2)                          ; STYLE
+  .dw RESSOURCE_TXT_CONN_SETUP                              ; PARAM1, PARAM2 (text ressource)
+  .db 0, BUTTON_MODE_NORMAL                                 ; PARAM3, PARAM4
+  .dw 0, 0                                                  ; MINVAL, MAXVAL
+
+  ; end of configuration
+  .dw 0
+
+
+
+DlgLightSettings_Names:        ; @todo move to lightsettings.asm
+  .dw RESSOURCE_TXT_LEDNAME_MAIN
+  .dw RESSOURCE_TXT_LEDNAME_CUPBOARD
+  .dw RESSOURCE_TXT_LEDNAME_WALL
+  .dw 0
+
+
+
+DlgLightSettings_DefaultSignalmap:
+  ; header
+  .dw CDialog_DefaultSignalmap*2  ; next table to use
+  ; entries
+  .db 0,                              DIALOG_SIGNAL_TOGUI,      LOW(DlgLightSettings_OnToGui),       HIGH(DlgLightSettings_OnToGui)
+  .db 0,                              DIALOG_SIGNAL_FROMGUI,    LOW(DlgLightSettings_OnFromGui),     HIGH(DlgLightSettings_OnFromGui)
+  .db DLGLIGHTSETTINGS_SEL_BTN_CONNS, WIDGET_SIGNAL_COMMAND,    LOW(DlgLightSettings_OnCmdConns),    HIGH(DlgLightSettings_OnCmdConns)
+  .db DLGLIGHTSETTINGS_SEL_DLG_CONNS, WIDGET_SIGNAL_DIALOG_END, LOW(DlgLightSettings_OnDlgEndConns), HIGH(DlgLightSettings_OnDlgEndConns)
+  ; end of table
+  .db 0, 0, 0, 0
+
+
+
+
+
+
+
+#endif
+