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

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