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

gui: fixed ValueLabel to also use WIDGET_VALUE_CURRENTVALUE

Browse Source
This commit is contained in:
Martin Preuss
2026-05-09 01:59:47 +02:00
parent 35a45e5cb2
commit 21b6a992ff
4 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
avr/devices/c03/main/w_netstats.asm
View File

@@ -295,7 +295,7 @@ netStatWinUpdate_ret:
netWinStatsUpdatePacketsIn: netWinStatsUpdatePacketsIn:
lds xl, netInterfaceData+NET_IFACE_OFFS_PACKETSIN_LOW lds xl, netInterfaceData+NET_IFACE_OFFS_PACKETSIN_LOW
lds xh, netInterfaceData+NET_IFACE_OFFS_PACKETSIN_HIGH lds xh, netInterfaceData+NET_IFACE_OFFS_PACKETSIN_HIGH
bigcall ValueLabel_SetValue bigcall Widget_SetCurrentValue
rjmp netWinStatsSkip2 rjmp netWinStatsSkip2
; @end ; @end
@@ -304,7 +304,7 @@ netWinStatsUpdatePacketsIn:
netWinStatsUpdatePacketsOut: netWinStatsUpdatePacketsOut:
lds xl, netInterfaceData+NET_IFACE_OFFS_PACKETSOUT_LOW lds xl, netInterfaceData+NET_IFACE_OFFS_PACKETSOUT_LOW
lds xh, netInterfaceData+NET_IFACE_OFFS_PACKETSOUT_HIGH lds xh, netInterfaceData+NET_IFACE_OFFS_PACKETSOUT_HIGH
bigcall ValueLabel_SetValue bigcall Widget_SetCurrentValue
rjmp netWinStatsSkip2 rjmp netWinStatsSkip2
; @end ; @end
@@ -312,7 +312,7 @@ netWinStatsUpdatePacketsOut:
netWinStatsUpdateContentErrors: netWinStatsUpdateContentErrors:
lds xl, netInterfaceData+NET_IFACE_OFFS_ERR_CONTENT_LOW lds xl, netInterfaceData+NET_IFACE_OFFS_ERR_CONTENT_LOW
lds xh, netInterfaceData+NET_IFACE_OFFS_ERR_CONTENT_HIGH lds xh, netInterfaceData+NET_IFACE_OFFS_ERR_CONTENT_HIGH
bigcall ValueLabel_SetValue bigcall Widget_SetCurrentValue
rjmp netWinStatsSkip2 rjmp netWinStatsSkip2
; @end ; @end
@@ -321,7 +321,7 @@ netWinStatsUpdateContentErrors:
netWinStatsUpdateIoErrors: netWinStatsUpdateIoErrors:
lds xl, netInterfaceData+NET_IFACE_OFFS_ERR_IO_LOW lds xl, netInterfaceData+NET_IFACE_OFFS_ERR_IO_LOW
lds xh, netInterfaceData+NET_IFACE_OFFS_ERR_IO_HIGH lds xh, netInterfaceData+NET_IFACE_OFFS_ERR_IO_HIGH
bigcall ValueLabel_SetValue bigcall Widget_SetCurrentValue
rjmp netWinStatsSkip2 rjmp netWinStatsSkip2
; @end ; @end
@@ -329,7 +329,7 @@ netWinStatsUpdateIoErrors:
netWinStatsUpdateMsgSizeErrors: netWinStatsUpdateMsgSizeErrors:
lds xl, netInterfaceData+NET_IFACE_OFFS_ERR_MSGSIZE_LOW lds xl, netInterfaceData+NET_IFACE_OFFS_ERR_MSGSIZE_LOW
lds xh, netInterfaceData+NET_IFACE_OFFS_ERR_MSGSIZE_HIGH lds xh, netInterfaceData+NET_IFACE_OFFS_ERR_MSGSIZE_HIGH
bigcall ValueLabel_SetValue bigcall Widget_SetCurrentValue
ret ret
; @end ; @end

3
avr/modules/lcd2/gui/aqhome/sensorwatch.asm
View File

@@ -444,8 +444,7 @@ sensorWatchSetValueLabel:
ldd xh, Y+SENSORWATCH_OFFS_VALUE_HI ldd xh, Y+SENSORWATCH_OFFS_VALUE_HI
mov yl, r18 mov yl, r18
mov yh, r19 mov yh, r19
ldi r17, VLABEL_VALUE bigcall Widget_SetCurrentValue ; (any, !Y)
bigcall Widget_SetValue ; (any, !Y)
pop yh pop yh
pop yl pop yl
sensorWatchSetValueLabel_ret: sensorWatchSetValueLabel_ret:

2
avr/modules/lcd2/gui/base/hspinner.asm
View File

@@ -240,7 +240,7 @@ hSpinnerSendValue:
ldd xh, Y+HSPINNER_OFFS_CURVALUE_HI ldd xh, Y+HSPINNER_OFFS_CURVALUE_HI
mov yl, r18 mov yl, r18
mov yh, r19 mov yh, r19
bigcall ValueLabel_SetValue ; (any, !Y) bigcall Widget_SetCurrentValue ; (any, !Y)
pop yh pop yh
pop yl pop yl

38
avr/modules/lcd2/gui/base/valuelabel.asm
View File

@@ -22,10 +22,6 @@
.equ VLABEL_SIZE = VLABEL_OFFS_BEGIN+4 .equ VLABEL_SIZE = VLABEL_OFFS_BEGIN+4
.equ VLABEL_VALUE = WIDGET_VALUE_NEXTFREE+0
.equ VLABEL_VALUE_NEXTFREE = WIDGET_VALUE_NEXTFREE+1
; *************************************************************************** ; ***************************************************************************
; code ; code
@@ -97,19 +93,6 @@ ValueLabel_Init:
; ---------------------------------------------------------------------------
; @routine ValueLabel_SetValue @global
;
; @param Y address of widget
; @param X new value
ValueLabel_SetValue:
ldi r17, VLABEL_VALUE
bigjmp Widget_SetValue ; (any, !Y)
; @end
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; @routine ValueLabel_OnSetValue @global ; @routine ValueLabel_OnSetValue @global
; ;
@@ -132,6 +115,24 @@ ValueLabel_OnSetValue:
; ---------------------------------------------------------------------------
; @routine ValueLabel_OnGetValue @global
;
; @param Y address of widget
; @param X new value
; @return CFLAG set if signal handled
; @return r19:r18 value
; @clobbers r17
ValueLabel_OnGetValue:
ldd r18, Y+VLABEL_OFFS_VALUE_LO
ldd r19, Y+VLABEL_OFFS_VALUE_HI
sec
ret
; @end
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; @routine ValueLabel_OnDraw @global ; @routine ValueLabel_OnDraw @global
; ;
@@ -285,7 +286,8 @@ ValueLabel_DefaultSignalmap:
.dw Widget_DefaultSignalmap*2 ; next table to use .dw Widget_DefaultSignalmap*2 ; next table to use
; entries ; entries
.db 0, WIDGET_SIGNAL_DRAW, LOW(ValueLabel_OnDraw), HIGH(ValueLabel_OnDraw) .db 0, WIDGET_SIGNAL_DRAW, LOW(ValueLabel_OnDraw), HIGH(ValueLabel_OnDraw)
.db VLABEL_VALUE, WIDGET_SIGNAL_SETVALUE, LOW(ValueLabel_OnSetValue), HIGH(ValueLabel_OnSetValue) .db WIDGET_VALUE_CURRENTVALUE, WIDGET_SIGNAL_SETVALUE, LOW(ValueLabel_OnSetValue), HIGH(ValueLabel_OnSetValue)
.db WIDGET_VALUE_CURRENTVALUE, WIDGET_SIGNAL_GETVALUE, LOW(ValueLabel_OnGetValue), HIGH(ValueLabel_OnGetValue)
.db WIDGET_VALUE_DEFAULT_WIDTH, WIDGET_SIGNAL_GETVALUE, LOW(ValueLabel_OnGetDefaultWidth), HIGH(ValueLabel_OnGetDefaultWidth) .db WIDGET_VALUE_DEFAULT_WIDTH, WIDGET_SIGNAL_GETVALUE, LOW(ValueLabel_OnGetDefaultWidth), HIGH(ValueLabel_OnGetDefaultWidth)
.db WIDGET_VALUE_DEFAULT_HEIGHT, WIDGET_SIGNAL_GETVALUE, LOW(ValueLabel_OnGetDefaultHeight), HIGH(ValueLabel_OnGetDefaultHeight) .db WIDGET_VALUE_DEFAULT_HEIGHT, WIDGET_SIGNAL_GETVALUE, LOW(ValueLabel_OnGetDefaultHeight), HIGH(ValueLabel_OnGetDefaultHeight)