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

gui: use CDialog_GetChildValue

Browse Source
This commit is contained in:
Martin Preuss
2026-05-14 13:44:25 +02:00
parent 73b7699054
commit 0c4a2aace9
1 changed files with 4 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,12 +163,12 @@ DlgNodeValueId_toGui:
ldd xl, Y+DLGNODEVALUEID_OFFS_NODEADDR ldd xl, Y+DLGNODEVALUEID_OFFS_NODEADDR
clr xh clr xh
ldi r16, DLGNODEVALUEID_SEL_NODEADDR ldi r16, DLGNODEVALUEID_SEL_NODEADDR
rcall dlgNodeValueIdSetChildValue bigcall CDialog_SetChildValue
; save value id ; save value id
ldd xl, Y+DLGNODEVALUEID_OFFS_VALUEID ldd xl, Y+DLGNODEVALUEID_OFFS_VALUEID
clr xh clr xh
ldi r16, DLGNODEVALUEID_SEL_VALUEID ldi r16, DLGNODEVALUEID_SEL_VALUEID
rjmp dlgNodeValueIdSetChildValue bigjmp CDialog_SetChildValue
ret ret
; @end ; @end
@@ -182,69 +182,17 @@ DlgNodeValueId_toGui:
DlgNodeValueId_fromGui: DlgNodeValueId_fromGui:
ldi r16, DLGNODEVALUEID_SEL_NODEADDR ldi r16, DLGNODEVALUEID_SEL_NODEADDR
rcall dlgNodeValueIdGetChildValue bigcall CDialog_GetChildValue
std Y+DLGNODEVALUEID_OFFS_NODEADDR, r18 std Y+DLGNODEVALUEID_OFFS_NODEADDR, r18
ldi r16, DLGNODEVALUEID_SEL_VALUEID ldi r16, DLGNODEVALUEID_SEL_VALUEID
rcall dlgNodeValueIdGetChildValue bigcall CDialog_GetChildValue
std Y+DLGNODEVALUEID_OFFS_VALUEID, r18 std Y+DLGNODEVALUEID_OFFS_VALUEID, r18
ret ret
; @end ; @end
; ---------------------------------------------------------------------------
; @routine dlgNodeValueIdSetChildValue
;
; @param Y pointer to dialog
; @param X new value
; @param R16 selector of child to set value to
; @clobbers any, !Y, !Z
dlgNodeValueIdSetChildValue:
bigcall CDialog_GetChildBySelector ; r19:r18=result (R16-R19)
brcc dlgNodeValueIdSetChildValue_ret
push yl
push yh
mov yl, r18
mov yh, r19
bigcall Widget_SetCurrentValue
pop yh
pop yl
dlgNodeValueIdSetChildValue_ret:
ret
; @end
; ---------------------------------------------------------------------------
; @routine dlgNodeValueIdGetChildValue
;
; @param Y pointer to dialog
; @param R16 selector of child to set value to
; @clobbers any, !Y, !Z
dlgNodeValueIdGetChildValue:
bigcall CDialog_GetChildBySelector ; r19:r18=result (R16-R19)
brcc dlgNodeValueIdGetChildValue_retZero
push yl
push yh
mov yl, r18
mov yh, r19
bigcall Widget_GetCurrentValue
pop yh
pop yl
brcs dlgNodeValueIdGetChildValue_ret
dlgNodeValueIdGetChildValue_retZero:
clr r18
clr r19
dlgNodeValueIdGetChildValue_ret:
ret
; @end
; *************************************************************************** ; ***************************************************************************