martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gui: use CWidget.

Browse Source
This commit is contained in:
Martin Preuss
2026-05-07 22:09:55 +02:00
parent d1c823c11e
commit 12a701014a
3 changed files with 17 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
avr/devices/c03/main/main.asm
View File

@@ -535,6 +535,7 @@ GUI_MODULE_BEGIN:
.include "modules/lcd2/gui/base/keypad.asm"
.include "modules/lcd2/gui/base/keypad_num.asm"
.include "modules/lcd2/gui/base/d_numinput.asm"
.include "modules/lcd2/gui/base/cwidget.asm"
.include "modules/lcd2/gui/base/cdialog.asm"
.include "modules/lcd2/gui/aqhome/sensorwatch.asm"
.include "modules/lcd2/gui/aqhome/lightsettings.asm"

14
avr/devices/c03/main/w_lightsettings.asm
View File

@@ -154,11 +154,11 @@ LightSettingsWin_OnDestroy_done:
LightSettingsWin_Config:
.db CDIALOGCFG_MAINWIDGET_TYPE_MLAYOUT, 0 ; TYPE, FLAGS
.db CWIDGETCFG_MAINWIDGET_TYPE_MLAYOUT, 0 ; TYPE, FLAGS
.db 2, 0 ; PARAM1, PARAM2
; line 1, left widget
.db CDIALOGCFG_WIDGET_TYPE_LABEL, 0 ; TYPE, FLAGS
.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) | \
@@ -170,7 +170,7 @@ LightSettingsWin_Config:
.dw 0, 0 ; MINVAL, MAXVAL
; line 1, right widget
.db CDIALOGCFG_WIDGET_TYPE_HSPINNER, (1<<CDIALOGCFG_WIDGET_FLAGS_MINMAXVALUES_BIT) ; TYPE, FLAGS
.db CWIDGETCFG_WIDGET_TYPE_HSPINNER, (1<<CWIDGETCFG_WIDGET_FLAGS_MINMAXVALUES_BIT) ; TYPE, FLAGS
.db LIGHTSETTINGSWIN_SEL_NODEADDR, 0 ; SELECTOR, RESERVED
.db (1<<WIDGET_OPTS_BORDER_BIT), \
(WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
@@ -183,7 +183,7 @@ LightSettingsWin_Config:
.dw 1, 255 ; MINVAL, MAXVAL
; line 2, left widget
.db CDIALOGCFG_WIDGET_TYPE_LABEL, 0 ; TYPE, FLAGS
.db CWIDGETCFG_WIDGET_TYPE_LABEL, 0 ; TYPE, FLAGS
.db 0, 0 ; SELECTOR, RESERVED
.db 0, \
(WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
@@ -196,7 +196,7 @@ LightSettingsWin_Config:
.dw 0, 0 ; MINVAL, MAXVAL
; line 2, right widget
.db CDIALOGCFG_WIDGET_TYPE_HSPINNER, (1<<CDIALOGCFG_WIDGET_FLAGS_MINMAXVALUES_BIT) ; TYPE, FLAGS
.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), \
(WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
@@ -209,7 +209,7 @@ LightSettingsWin_Config:
.dw 1, 300 ; MINVAL, MAXVAL
; line 3, left widget
.db CDIALOGCFG_WIDGET_TYPE_LABEL, 0 ; TYPE, FLAGS
.db CWIDGETCFG_WIDGET_TYPE_LABEL, 0 ; TYPE, FLAGS
.db 0, 0 ; SELECTOR, RESERVED
.db 0, \
(WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
@@ -222,7 +222,7 @@ LightSettingsWin_Config:
.dw 0, 0 ; MINVAL, MAXVAL
; line 3, right widget
.db CDIALOGCFG_WIDGET_TYPE_HSPINNER, (1<<CDIALOGCFG_WIDGET_FLAGS_MINMAXVALUES_BIT) ; TYPE, FLAGS
.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), \
(WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \