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

gui: adapt to latest changes.

Browse Source 
need to work on other MainWindow derivates next.
This commit is contained in:
Martin Preuss
2026-05-11 00:42:42 +02:00
parent 0ec290e29c
commit 39b3d4d174
3 changed files with 288 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
avr/devices/c03/main/w_menu.asm
View File

@@ -54,12 +54,31 @@ MenuWin_new:
mov xl, r18 ; use root window as parent for main window
mov xh, r19
ldi r24, LOW(DLGLIGHTCONNS_SIZE)
ldi r25, HIGH(DLGLIGHTCONNS_SIZE)
bigcall Object_Alloc ; Y=space (!r16, !r17, !X)
brcc MenuWin_new_ret
rcall MenuWin_Init
MenuWin_new_ret:
ret
; @end
; ---------------------------------------------------------------------------
; @routine MenuWin_new @global
;
; @param Y pointer to new MainWindow
; @param X parent widget
; @return CFLAG set of okay, cleared otherwise
MenuWin_Init:
ldi r16, 0 ; OPTS
ldi r17, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_FILLED<<WIDGET_PACK_VSELF0_BIT) ; PACK
ldi r20, LOW(RESSOURCE_TXT_AQHOME)
ldi r21, HIGH(RESSOURCE_TXT_AQHOME)
bigcall MainWindow_new
brcc MenuWin_new_ret
bigcall MainWindow_Init
brcc MenuWin_Init_ret
; set default signal map
ldi r16, LOW(MenuWin_DefaultSignalmap*2)
@@ -67,24 +86,7 @@ MenuWin_new:
ldi r16, HIGH(MenuWin_DefaultSignalmap*2)
std Y+OBJECT_OFFS_SIGNALMAP_HI, r16
; Y=MainWindow
push yl
push yh
bigcall MainWindow_GetContentWidget ; r19:r18=content window
brcc MenuWin_new_popRet
mov xl, r18 ; use content window as parent
mov xh, r19
push xl ; content window
push xh
rcall menuWinCreateContent
pop xh
pop xl
MenuWin_new_popRet:
pop yh
pop yl
MenuWin_new_ret:
MenuWin_Init_ret:
ret
; @end
@@ -96,7 +98,6 @@ MenuWin_new_ret:
; @param Y pointer to MainWindow
; @param X pointer to MainWindow content window (becomes parent)
; @return CFLAG set of okay, cleared otherwise
; @return Y address of newly created object
menuWinCreateContent:
; create MLayout
@@ -188,6 +189,74 @@ menuWinCreateButton_ret:
; ---------------------------------------------------------------------------
; @routine MenuWin_OnShow
;
; @param Y MainWindow
MenuWin_OnShow:
; check visible flag
ldd r16, Y+OBJECT_OFFS_FLAGS
sbrc r16, WIDGET_FLAGS_VISIBLE_BIT
rjmp MenuWin_OnShow_ret
; create content
bigcall MainWindow_CreateContentWidget ; r19:r18=content window
brcc MenuWin_OnShow_ret
mov xl, r18 ; use content window as parent
mov xh, r19
; set VISIBLE flag
ldd r16, Y+OBJECT_OFFS_FLAGS
sbr r16, (1<<WIDGET_FLAGS_VISIBLE_BIT)
std Y+OBJECT_OFFS_FLAGS, r16
rcall menuWinCreateContent
MenuWin_OnShow_ret:
sec
ret
; @end
; ---------------------------------------------------------------------------
; @routine MenuWin_OnHide @global
;
; @param Y pointer to dialog
; @return CFLAG set of okay, cleared otherwise
; @clobbers any, !Y
MenuWin_OnHide:
ldd r16, Y+OBJECT_OFFS_FLAGS
sbrs r16, WIDGET_FLAGS_VISIBLE_BIT
rjmp MenuWin_OnHide_ret
; prepare destruction of content
bigcall MainWindow_GetContentWidget
brcc MenuWin_OnHide_ret
push yl
push yh
mov yl, r18
mov yh, r19
ldd r16, Y+OBJECT_OFFS_FLAGS
sbr r16, (1<<OBJECT_FLAGS_DESTROY_BIT)
std Y+OBJECT_OFFS_FLAGS, r16
pop yh
pop yl
; clr VISIBLE flag
ldd r16, Y+OBJECT_OFFS_FLAGS
cbr r16, (1<<WIDGET_FLAGS_VISIBLE_BIT)
std Y+OBJECT_OFFS_FLAGS, r16
MenuWin_OnHide_ret:
sec
ret
; @end
; ---------------------------------------------------------------------------
; @routine MenuWin_OnCmdClimate
@@ -253,6 +322,8 @@ MenuWin_DefaultSignalmap:
; header
.dw MainWindow_DefaultSignalmap*2 ; next table to use
; entries
.db 0, WIDGET_SIGNAL_SHOW, LOW(MenuWin_OnShow), HIGH(MenuWin_OnShow)
.db 0, WIDGET_SIGNAL_HIDE, LOW(MenuWin_OnHide), HIGH(MenuWin_OnHide)
.db MENUWIN_SEL_CLIMATE, WIDGET_SIGNAL_COMMAND, LOW(MenuWin_OnCmdClimate), HIGH(MenuWin_OnCmdClimate)
.db MENUWIN_SEL_LIGHT, WIDGET_SIGNAL_COMMAND, LOW(MenuWin_OnCmdLight), HIGH(MenuWin_OnCmdLight)
.db MENUWIN_SEL_WINDOWS, WIDGET_SIGNAL_COMMAND, LOW(MenuWin_OnCmdWindows), HIGH(MenuWin_OnCmdWindows)

120
avr/modules/lcd2/gui/aqhome/d_light_conns.asm
View File

@@ -87,7 +87,7 @@ DlgLightConns_new_ret:
DlgLightConns_Init:
push r20
push r21
ldi r16, 0 ; OPTS
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_LEDCONNECTIONS)
ldi r21, HIGH(RESSOURCE_TXT_LEDCONNECTIONS)
@@ -108,10 +108,6 @@ DlgLightConns_Init:
ldi r16, HIGH(DlgLightConns_DefaultSignalmap*2)
std Y+OBJECT_OFFS_SIGNALMAP_HI, r16
bigcall Dialog_AddDefaultButtons ; (any, !Y)
rcall DlgLightConns_toGui
DlgLightConns_Init_ret:
ret
; @end
@@ -165,6 +161,47 @@ DlgLightConns_toGui:
; ---------------------------------------------------------------------------
; @routine DlgLightConns_fromGui @global
;
; @param Y pointer to dialog
DlgLightConns_fromGui:
ldd zl, Y+DLGLIGHTCONNS_OFFS_SETTINGS_LO
ldd zh, Y+DLGLIGHTCONNS_OFFS_SETTINGS_HI
; motion source 1
ldi r16, DLGLIGHTCONNS_SEL_ADDR_MOTION1
rcall dlgLightConnsGetValue
std Z+LIGHTSETTINGS_OFFS_SOURCE1_NODEADDR, r18
ldi r16, DLGLIGHTCONNS_SEL_VALUE_MOTION1
rcall dlgLightConnsGetValue
std Z+LIGHTSETTINGS_OFFS_SOURCE1_VALUEID, r18
; motion source 2
ldi r16, DLGLIGHTCONNS_SEL_ADDR_MOTION2
rcall dlgLightConnsGetValue
std Z+LIGHTSETTINGS_OFFS_SOURCE2_NODEADDR, r18
ldi r16, DLGLIGHTCONNS_SEL_VALUE_MOTION2
rcall dlgLightConnsGetValue
std Z+LIGHTSETTINGS_OFFS_SOURCE2_VALUEID, r18
; light source
ldi r16, DLGLIGHTCONNS_SEL_ADDR_LIGHT
rcall dlgLightConnsGetValue
std Z+LIGHTSETTINGS_OFFS_BSOURCE_NODEADDR, r18
ldi r16, DLGLIGHTCONNS_SEL_VALUE_LIGHT
rcall dlgLightConnsGetValue
std Z+LIGHTSETTINGS_OFFS_BSOURCE_VALUEID, r18
ret
; @end
; ---------------------------------------------------------------------------
; @routine dlgLightConnsSetValue
; @param Y pointer to dialog
@@ -191,6 +228,32 @@ dlgLightConnsSetValue_ret:
; ---------------------------------------------------------------------------
; @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
@@ -199,6 +262,36 @@ dlgLightConnsSetValue_ret:
; signal handlers
; ---------------------------------------------------------------------------
; @routine DlgLightConns_OnToGui @global
;
; @param Y pointer to dialog
; @return CFLAG set of okay, cleared otherwise
; @clobbers any, !Y
DlgLightConns_OnToGui:
rcall DlgLightConns_toGui
sec
ret
; @end
; ---------------------------------------------------------------------------
; @routine DlgLightConns_OnFromGui @global
;
; @param Y pointer to dialog
; @return CFLAG set of okay, cleared otherwise
; @clobbers any, !Y
DlgLightConns_OnFromGui:
rcall DlgLightConns_fromGui
sec
ret
; @end
; ---------------------------------------------------------------------------
; @routine DlgLightConns_OnCmdMotion1 @global
;
@@ -221,13 +314,12 @@ DlgLightConns_OnCmdMotion1:
pop zh
pop zl
ldi r16, DLGLIGHTCONNS_SEL_DLG_MOTION1
std Y+OBJECT_OFFS_SELECTOR, r16
; set values
ldd xl, Z+LIGHTSETTINGS_OFFS_SOURCE1_NODEADDR
clr xh
push zl
push zh
bigcall DlgNodeValueId_SetNodeAddr
pop zh
pop zl
bigcall DlgNodeValueId_SetNodeAddr
ldd xl, Z+LIGHTSETTINGS_OFFS_SOURCE1_VALUEID
clr xh
bigcall DlgNodeValueId_SetValueId
@@ -239,10 +331,6 @@ DlgLightConns_OnCmdMotion1:
std Y+DLGLIGHTCONNS_OFFS_CURRDLG_LO, xl
std Y+DLGLIGHTCONNS_OFFS_CURRDLG_HI, xh
ldi r16, DLGLIGHTCONNS_SEL_DLG_MOTION1
adiw xh:xl, OBJECT_OFFS_SELECTOR
st X, r16
sbiw xh:xl, OBJECT_OFFS_SELECTOR
adiw xh:xl, OBJECT_OFFS_TARGET_LO
st X+, yl
st X, yh
@@ -296,8 +384,6 @@ DlgLightConns_OnDlgEndMotion1:
pop yh
pop yl
rcall DlgLightConns_toGui
DlgLightConns_OnDlgEndMotion1_leave:
; leave sub-dialog
push yl
@@ -559,6 +645,8 @@ DlgLightConns_DefaultSignalmap:
; header
.dw Dialog_DefaultSignalmap*2 ; next table to use
; entries
.db 0, DIALOG_SIGNAL_TOGUI, LOW(DlgLightConns_OnToGui), HIGH(DlgLightConns_OnToGui)
.db 0, DIALOG_SIGNAL_FROMGUI, LOW(DlgLightConns_OnFromGui), HIGH(DlgLightConns_OnFromGui)
.db DLGLIGHTCONNS_SEL_BTN_MOTION1, WIDGET_SIGNAL_COMMAND, LOW(DlgLightConns_OnCmdMotion1), HIGH(DlgLightConns_OnCmdMotion1)
.db DLGLIGHTCONNS_SEL_BTN_MOTION2, WIDGET_SIGNAL_COMMAND, LOW(DlgLightConns_OnCmdMotion2), HIGH(DlgLightConns_OnCmdMotion2)
.db DLGLIGHTCONNS_SEL_BTN_LIGHT, WIDGET_SIGNAL_COMMAND, LOW(DlgLightConns_OnCmdLight), HIGH(DlgLightConns_OnCmdLight)

110
avr/modules/lcd2/gui/aqhome/d_nodevalueid.asm
View File

@@ -17,7 +17,9 @@
; widget
.equ DLGNODEVALUEID_OFFS_BEGIN = CDIALOG_SIZE
.equ DLGNODEVALUEID_SIZE = DLGNODEVALUEID_OFFS_BEGIN+0
.equ DLGNODEVALUEID_OFFS_NODEADDR = DLGNODEVALUEID_OFFS_BEGIN+0
.equ DLGNODEVALUEID_OFFS_VALUEID = DLGNODEVALUEID_OFFS_BEGIN+1
.equ DLGNODEVALUEID_SIZE = DLGNODEVALUEID_OFFS_BEGIN+2
; selectors
@@ -73,7 +75,7 @@ DlgNodeValueId_new_ret:
; @clobbers any, !Y
DlgNodeValueId_Init:
ldi r16, 0 ; OPTS
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 r22, LOW(DlgNodeValueId_Config*2)
ldi r23, HIGH(DlgNodeValueId_Config*2)
@@ -86,8 +88,6 @@ DlgNodeValueId_Init:
ldi r16, HIGH(DlgNodeValueId_DefaultSignalmap*2)
std Y+OBJECT_OFFS_SIGNALMAP_HI, r16
bigcall Dialog_AddDefaultButtons
DlgNodeValueId_Init_ret:
ret
; @end
@@ -99,11 +99,11 @@ DlgNodeValueId_Init_ret:
;
; @param Y pointer to dialog
; @param X new value (only xl used)
; @clobbers any, !Y
; @clobbers none
DlgNodeValueId_SetNodeAddr:
ldi r16, DLGNODEVALUEID_SEL_NODEADDR
rjmp dlgNodeValueIdSetChildValue
std Y+DLGNODEVALUEID_OFFS_NODEADDR, xl
ret
; @end
@@ -113,11 +113,12 @@ DlgNodeValueId_SetNodeAddr:
;
; @param Y pointer to dialog
; @return r19:r18 value
; @clobbers any, !Y
; @clobbers none
DlgNodeValueId_GetNodeAddr:
ldi r16, DLGNODEVALUEID_SEL_NODEADDR
rjmp dlgNodeValueIdGetChildValue
ldd r18, Y+DLGNODEVALUEID_OFFS_NODEADDR
clr r19
ret
; @end
@@ -127,11 +128,11 @@ DlgNodeValueId_GetNodeAddr:
;
; @param Y pointer to dialog
; @param X new value (only xl used)
; @clobbers any, !Y
; @clobbers none
DlgNodeValueId_SetValueId:
ldi r16, DLGNODEVALUEID_SEL_VALUEID
rjmp dlgNodeValueIdSetChildValue
std Y+DLGNODEVALUEID_OFFS_VALUEID, xl
ret
; @end
@@ -141,11 +142,53 @@ DlgNodeValueId_SetValueId:
;
; @param Y pointer to dialog
; @return r19:r18 value
; @clobbers any, !Y
; @clobbers none
DlgNodeValueId_GetValueId:
ldd r18, Y+DLGNODEVALUEID_OFFS_VALUEID
clr r19
ret
; @end
; ---------------------------------------------------------------------------
; @routine DlgNodeValueId_toGui @global
;
; @param Y pointer to dialog
; @clobbers any, !Y, !Z
DlgNodeValueId_toGui:
; save node addr
ldd xl, Y+DLGNODEVALUEID_OFFS_NODEADDR
clr xh
ldi r16, DLGNODEVALUEID_SEL_NODEADDR
rcall dlgNodeValueIdSetChildValue
; save value id
ldd xl, Y+DLGNODEVALUEID_OFFS_VALUEID
clr xh
ldi r16, DLGNODEVALUEID_SEL_VALUEID
rjmp dlgNodeValueIdGetChildValue
rjmp dlgNodeValueIdSetChildValue
ret
; @end
; ---------------------------------------------------------------------------
; @routine DlgNodeValueId_fromGui @global
;
; @param Y pointer to dialog
; @clobbers any, !Y, !Z
DlgNodeValueId_fromGui:
ldi r16, DLGNODEVALUEID_SEL_NODEADDR
rcall dlgNodeValueIdGetChildValue
std Y+DLGNODEVALUEID_OFFS_NODEADDR, r18
ldi r16, DLGNODEVALUEID_SEL_VALUEID
rcall dlgNodeValueIdGetChildValue
std Y+DLGNODEVALUEID_OFFS_VALUEID, r18
ret
; @end
@@ -156,7 +199,7 @@ DlgNodeValueId_GetValueId:
; @param Y pointer to dialog
; @param X new value
; @param R16 selector of child to set value to
; @clobbers any, !Y
; @clobbers any, !Y, !Z
dlgNodeValueIdSetChildValue:
bigcall CDialog_GetChildBySelector ; r19:r18=result (R16-R19)
@@ -179,10 +222,10 @@ dlgNodeValueIdSetChildValue_ret:
;
; @param Y pointer to dialog
; @param R16 selector of child to set value to
; @clobbers any, !Y
; @clobbers any, !Y, !Z
dlgNodeValueIdGetChildValue:
bigcall CDialog_GetChildBySelector ; r19:r18=result (R16-R19)
bigcall CDialog_GetChildBySelector ; r19:r18=result (R16-R19)
brcc dlgNodeValueIdGetChildValue_retZero
push yl
push yh
@@ -203,10 +246,39 @@ dlgNodeValueIdGetChildValue_ret:
; ***************************************************************************
; signal handlers
; ---------------------------------------------------------------------------
; @routine DlgNodeValueId_OnToGui @global
;
; @param Y pointer to dialog
; @clobbers any, !Y
DlgNodeValueId_OnToGui:
rcall DlgNodeValueId_toGui
sec
ret
; @end
; ---------------------------------------------------------------------------
; @routine DlgNodeValueId_OnFromGui @global
;
; @param Y pointer to dialog
; @clobbers any, !Y
DlgNodeValueId_OnFromGui:
rcall DlgNodeValueId_fromGui
sec
ret
; @end
; ---------------------------------------------------------------------------
; @routine DlgNodeValueId_OnDialogEnd @global
;
@@ -299,6 +371,8 @@ DlgNodeValueId_DefaultSignalmap:
.dw Dialog_DefaultSignalmap*2 ; next table to use
; entries
; .db 0, WIDGET_SIGNAL_DIALOG_END, LOW(DlgNodeValueId_OnDialogEnd), HIGH(DlgNodeValueId_OnDialogEnd)
.db 0, DIALOG_SIGNAL_TOGUI, LOW(DlgNodeValueId_OnToGui), HIGH(DlgNodeValueId_OnToGui)
.db 0, DIALOG_SIGNAL_FROMGUI, LOW(DlgNodeValueId_OnFromGui), HIGH(DlgNodeValueId_OnFromGui)
; end of table
.db 0, 0, 0, 0