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

gui: more work on spinner.

Browse Source
This commit is contained in:
Martin Preuss
2026-04-30 00:10:07 +02:00
parent 5767329895
commit 8b25922b88
1 changed files with 297 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,23 +27,27 @@
.equ HSPINNER_OFFS_MINVALUE_HI = HSPINNER_OFFS_BEGIN+3 .equ HSPINNER_OFFS_MINVALUE_HI = HSPINNER_OFFS_BEGIN+3
.equ HSPINNER_OFFS_MAXVALUE_LO = HSPINNER_OFFS_BEGIN+4 .equ HSPINNER_OFFS_MAXVALUE_LO = HSPINNER_OFFS_BEGIN+4
.equ HSPINNER_OFFS_MAXVALUE_HI = HSPINNER_OFFS_BEGIN+5 .equ HSPINNER_OFFS_MAXVALUE_HI = HSPINNER_OFFS_BEGIN+5
.equ HSPINNER_OFFS_DIGITS = HSPINNER_OFFS_BEGIN+6 .equ HSPINNER_OFFS_FLAGS = HSPINNER_OFFS_BEGIN+6
.equ HSPINNER_OFFS_FLAGS = HSPINNER_OFFS_BEGIN+7 .equ HSPINNER_SIZE = HSPINNER_OFFS_BEGIN+7
.equ HSPINNER_SIZE = HSPINNER_OFFS_BEGIN+8
; signals ; selectors
.equ HSPINNER_SIGNAL_LEFT = WIDGET_SIGNAL_NEXTFREE+0 .equ HSPINNER_SEL_LEFT = 1
.equ HSPINNER_SIGNAL_RIGHT = WIDGET_SIGNAL_NEXTFREE+1 .equ HSPINNER_SEL_RIGHT = 2
.equ HSPINNER_SIGNAL_NEXTFREE = WIDGET_SIGNAL_NEXTFREE+2
; values ; values
.equ HSPINNER_VALUE_MINVALUE = WIDGET_VALUE_NEXTFREE+0 .equ HSPINNER_VALUE_VALUE = WIDGET_VALUE_NEXTFREE+0
.equ HSPINNER_VALUE_MAXVALUE = WIDGET_VALUE_NEXTFREE+1 .equ HSPINNER_VALUE_MINVALUE = WIDGET_VALUE_NEXTFREE+1
.equ HSPINNER_VALUE_NEXTFREE = WIDGET_VALUE_NEXTFREE+2 .equ HSPINNER_VALUE_MAXVALUE = WIDGET_VALUE_NEXTFREE+2
.equ HSPINNER_VALUE_NEXTFREE = WIDGET_VALUE_NEXTFREE+3
; child widgets
.equ HSPINNER_CHILDIDX_LEFT = 0
.equ HSPINNER_CHILDIDX_VALUE = 1
.equ HSPINNER_CHILDIDX_EIGHT = 2
; *************************************************************************** ; ***************************************************************************
; code ; code
@@ -57,11 +61,11 @@
; ;
; @return CFLAG set of okay, cleared otherwise ; @return CFLAG set of okay, cleared otherwise
; @return Y address of newly created object ; @return Y address of newly created object
; @param X parent widget ; @param X parent widget
; @param r16 value for OBJECT_OFFS_OPTS ; @param r16 value for OBJECT_OFFS_OPTS
; @param r17 value for WIDGET_OFFS_PACK ; @param r17 value for WIDGET_OFFS_PACK
; @param r20 number of postkomma digits ; @param r20 number of postkomma digits
; @param r21 total number of digits (including komma, if r20>0) ; @param r21 total number of digits (including komma, if r20>0)
; @clobbers any ; @clobbers any
HSpinner_new: HSpinner_new:
@@ -84,8 +88,8 @@ HSpinner_new_ret:
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; @routine HSpinner_Init @global ; @routine HSpinner_Init @global
; ;
; @param Y address of widget ; @param Y address of widget
; @param X parent widget (if any) ; @param X parent widget (if any)
; @param r16 value for OBJECT_OFFS_OPTS ; @param r16 value for OBJECT_OFFS_OPTS
; @param r17 value for WIDGET_OFFS_PACK ; @param r17 value for WIDGET_OFFS_PACK
; @param r20 number of postkomma digits ; @param r20 number of postkomma digits
@@ -102,9 +106,6 @@ HSpinner_Init:
pop r20 pop r20
brcc HSpinner_Init_ret brcc HSpinner_Init_ret
; set values
std Y+HSPINNER_OFFS_DIGITS, r20
; set default signal map ; set default signal map
ldi r16, LOW(HSpinner_DefaultSignalmap*2) ldi r16, LOW(HSpinner_DefaultSignalmap*2)
std Y+OBJECT_OFFS_SIGNALMAP_LO, r16 std Y+OBJECT_OFFS_SIGNALMAP_LO, r16
@@ -118,6 +119,63 @@ HSpinner_Init_ret:
; ---------------------------------------------------------------------------
; @routine HSpinner_SetValue @global
;
; @param Y spinner object
; @param X new value
; @clobbers any, !Y
HSpinner_SetValue:
ldi r17, HSPINNER_VALUE_VALUE
bigjmp Widget_SetValue
; @end
; ---------------------------------------------------------------------------
; @routine HSpinner_GetValue @global
;
; @param Y spinner object
; @return CFLAG set if value retrieved, cleared on error
; @return R19:r18 new value
; @clobbers any, !Y
HSpinner_GetValue:
ldi r17, HSPINNER_VALUE_VALUE
bigjmp Widget_GetValue
; @end
; ---------------------------------------------------------------------------
; @routine HSpinner_SetMinValue @global
;
; @param Y spinner object
; @param X new value
; @clobbers any, !Y
HSpinner_SetMinValue:
ldi r17, HSPINNER_VALUE_MINVALUE
bigjmp Widget_SetValue
; @end
; ---------------------------------------------------------------------------
; @routine HSpinner_SetMaxValue @global
;
; @param Y spinner object
; @param X new value
; @clobbers any, !Y
HSpinner_SetMaxValue:
ldi r17, HSPINNER_VALUE_MAXVALUE
bigjmp Widget_SetValue
; @end
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; @routine hSpinnerCreateChildren ; @routine hSpinnerCreateChildren
; ;
@@ -139,7 +197,8 @@ hSpinnerCreateChildren:
ldi r17, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) ; PACK ldi r17, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) ; PACK
ldi r20, LOW(RESSOURCE_IMG_ARROWLEFT) ; image ressource ldi r20, LOW(RESSOURCE_IMG_ARROWLEFT) ; image ressource
ldi r21, HIGH(RESSOURCE_IMG_ARROWLEFT) ldi r21, HIGH(RESSOURCE_IMG_ARROWLEFT)
ldi r22, HSPINNER_SIGNAL_LEFT ; selector ldi r22, HSPINNER_SEL_LEFT ; selector
ldi r23, BUTTON_MODE_REPEATED
push xl push xl
push xh push xh
bigcall ImageButton_new bigcall ImageButton_new
@@ -148,10 +207,10 @@ hSpinnerCreateChildren:
pop r21 pop r21
pop r20 pop r20
brcc hSpinnerCreateChildren_popRet brcc hSpinnerCreateChildren_popRet
; create value label ; create value label
ldi r16, 0 ; OPTS ldi r16, 0 ; OPTS
ldi r17, (WIDGET_PACK_CENTER<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) ; PACK ldi r17, (WIDGET_PACK_END<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
(WIDGET_PACK_END<<WIDGET_PACK_HCONTENT0_BIT) | (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT) ; PACK
push xl push xl
push xh push xh
bigcall ValueLabel_new bigcall ValueLabel_new
@@ -164,7 +223,8 @@ hSpinnerCreateChildren:
ldi r17, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) ; PACK ldi r17, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) ; PACK
ldi r20, LOW(RESSOURCE_IMG_ARROWRIGHT) ; image ressource ldi r20, LOW(RESSOURCE_IMG_ARROWRIGHT) ; image ressource
ldi r21, HIGH(RESSOURCE_IMG_ARROWRIGHT) ldi r21, HIGH(RESSOURCE_IMG_ARROWRIGHT)
ldi r22, HSPINNER_SIGNAL_RIGHT ; selector ldi r22, HSPINNER_SEL_RIGHT ; selector
ldi r23, BUTTON_MODE_REPEATED
push xl push xl
push xh push xh
bigcall ImageButton_new bigcall ImageButton_new
@@ -178,11 +238,217 @@ hSpinnerCreateChildren_popRet:
; ---------------------------------------------------------------------------
; @routine hSpinnerSetValue
;
; @param Y widget
; @param X new value
; @clobbers any, !Y
hSpinnerSetValue:
std Y+HSPINNER_OFFS_CURVALUE_LO, xl
std Y+HSPINNER_OFFS_CURVALUE_HI, xh
ldi r16, HSPINNER_CHILDIDX_VALUE
bigcall OBJ_GetChildAt ; r19:r18=value label (r16)
brcc HSpinner_OnCmdLeft_ret
push yl
push yh
mov yl, r18
mov yh, r19
bigcall ValueLabel_SetValue ; (any, !Y)
pop yh
pop yl
rcall hSpinnerEmitCmdSignal
ret
; @end
; ---------------------------------------------------------------------------
; @routine hSpinnerValidate
;
; @param Y widget
; @return CFLAG set if value changed, cleared otherwise
; @clobbers r20, r21, X
hSpinnerValidate:
ldd xl, Y+HSPINNER_OFFS_CURVALUE_LO
ldd xh, Y+HSPINNER_OFFS_CURVALUE_HI
; compare against minimum
ldd r20, Y+HSPINNER_OFFS_MINVALUE_LO
ldd r21, Y+HSPINNER_OFFS_MINVALUE_HI
cp xl, r20
cpc xh, r21
brcc hSpinnerValidate_l1
mov xl, r20
mov xh, r21
hSpinnerValidate_l1:
; compare against maximum
ldd r20, Y+HSPINNER_OFFS_MAXVALUE_LO
ldd r21, Y+HSPINNER_OFFS_MAXVALUE_HI
cp r20, xl
cpc r21, xh
brcc hSpinnerValidate_l2
mov xl, r20
mov xh, r21
hSpinnerValidate_l2:
; check for change
ldd r18, Y+HSPINNER_OFFS_CURVALUE_LO
ldd r19, Y+HSPINNER_OFFS_CURVALUE_HI
cp r18, xl
brne hSpinnerValidate_l3
cp r19, xh
brne hSpinnerValidate_l3
clc
rjmp hSpinnerValidate_ret
hSpinnerValidate_l3:
std Y+HSPINNER_OFFS_CURVALUE_LO, xl
std Y+HSPINNER_OFFS_CURVALUE_HI, xh
sec
hSpinnerValidate_ret:
ret
; @end
; ---------------------------------------------------------------------------
; @routine hSpinnerEmitCmdSignal
;
; @param Y widget
; @clobbers any, !Y
hSpinnerEmitCmdSignal:
ldi r16, WIDGET_SIGNAL_COMMAND
ldd xl, Y+HSPINNER_OFFS_CURVALUE_LO
ldd xh, Y+HSPINNER_OFFS_CURVALUE_HI
bigjmp OBJ_EmitSignal
; @end
; *************************************************************************** ; ***************************************************************************
; signal handlers ; signal handlers
; ---------------------------------------------------------------------------
; @routine HSpinner_OnCmdLeft @global
;
; @param Y widget
HSpinner_OnCmdLeft:
ldd xl, Y+HSPINNER_OFFS_CURVALUE_LO
ldd xh, Y+HSPINNER_OFFS_CURVALUE_HI
ldd r18, Y+HSPINNER_OFFS_MINVALUE_LO
ldd r19, Y+HSPINNER_OFFS_MINVALUE_HI
cp r18, xl ; current value > minimum?
cpc r19, xh
brcc HSpinner_OnCmdLeft_ret ; no, jmp
sbiw xh:xl, 1
rcall hSpinnerSetValue
HSpinner_OnCmdLeft_ret:
sec
ret
; @end
; ---------------------------------------------------------------------------
; @routine HSpinner_OnCmdRight @global
;
; @param Y widget
HSpinner_OnCmdRight:
ldd xl, Y+HSPINNER_OFFS_CURVALUE_LO
ldd xh, Y+HSPINNER_OFFS_CURVALUE_HI
ldd r18, Y+HSPINNER_OFFS_MAXVALUE_LO
ldd r19, Y+HSPINNER_OFFS_MAXVALUE_HI
cp xl, r18 ; max value > current value?
cpc xh, r19
brcc HSpinner_OnCmdRight_ret ; no, jmp
adiw xh:xl, 1
rcall hSpinnerSetValue
HSpinner_OnCmdRight_ret:
sec
ret
; @end
; ---------------------------------------------------------------------------
; @routine HSpinner_OnSetValue @global
;
; @param Y widget
; @param X new value
HSpinner_OnSetValue:
std Y+HSPINNER_OFFS_CURVALUE_LO, xl
std Y+HSPINNER_OFFS_CURVALUE_HI, xh
rcall hSpinnerValidate
sec
ret
; @end
; ---------------------------------------------------------------------------
; @routine HSpinner_OnGetValue @global
;
; @param Y widget
; @return r19:r18 value
HSpinner_OnGetValue:
ldd r18, Y+HSPINNER_OFFS_CURVALUE_LO
ldd r19, Y+HSPINNER_OFFS_CURVALUE_HI
sec
ret
; @end
; ---------------------------------------------------------------------------
; @routine HSpinner_OnSetMinValue @global
;
; @param Y widget
; @param X new value
HSpinner_OnSetMinValue:
std Y+HSPINNER_OFFS_MINVALUE_LO, xl
std Y+HSPINNER_OFFS_MINVALUE_HI, xh
rcall hSpinnerValidate
brcc HSpinner_OnSetMinValue_done
rcall hSpinnerEmitCmdSignal
HSpinner_OnSetMinValue_done:
sec
ret
; @end
; ---------------------------------------------------------------------------
; @routine HSpinner_OnSetMaxValue @global
;
; @param Y widget
; @param X new value
HSpinner_OnSetMaxValue:
std Y+HSPINNER_OFFS_MAXVALUE_LO, xl
std Y+HSPINNER_OFFS_MAXVALUE_HI, xh
rcall hSpinnerValidate
brcc HSpinner_OnSetMaxValue_done
rcall hSpinnerEmitCmdSignal
HSpinner_OnSetMaxValue_done:
sec
ret
; @end
@@ -196,6 +462,13 @@ HSpinner_DefaultSignalmap:
; header ; header
.dw HLayout_DefaultSignalmap*2 ; next table to use .dw HLayout_DefaultSignalmap*2 ; next table to use
; entries ; entries
.db HSPINNER_SEL_LEFT, WIDGET_SIGNAL_COMMAND, LOW(HSpinner_OnCmdLeft), HIGH(HSpinner_OnCmdLeft)
.db HSPINNER_SEL_RIGHT, WIDGET_SIGNAL_COMMAND, LOW(HSpinner_OnCmdRight), HIGH(HSpinner_OnCmdRight)
.db HSPINNER_VALUE_VALUE, WIDGET_SIGNAL_SETVALUE, LOW(HSpinner_OnSetValue), HIGH(HSpinner_OnSetValue)
.db HSPINNER_VALUE_VALUE, WIDGET_SIGNAL_GETVALUE, LOW(HSpinner_OnGetValue), HIGH(HSpinner_OnGetValue)
.db HSPINNER_VALUE_MINVALUE, WIDGET_SIGNAL_SETVALUE, LOW(HSpinner_OnSetMinValue), HIGH(HSpinner_OnSetMinValue)
.db HSPINNER_VALUE_MAXVALUE, WIDGET_SIGNAL_SETVALUE, LOW(HSpinner_OnSetMaxValue), HIGH(HSpinner_OnSetMaxValue)
.db 0, 0, 0, 0 ; end of table .db 0, 0, 0, 0 ; end of table