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

avr: minor changes

Browse Source 
- save Y in GuiApp_ShowView
- fix apidoc
- change order in guiAppShowCurrent
This commit is contained in:
Martin Preuss
2026-02-09 19:07:05 +01:00
parent 05ac62ef54
commit 4fec5433b3
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
avr/modules/lcd2/gui2/generic/guiapp.asm
View File

@@ -357,8 +357,12 @@ GuiApp_ShowView:
or r18, r19 ; 0 if r19:r18==X or r18, r19 ; 0 if r19:r18==X
breq GuiApp_ShowView_ret ; same, no change breq GuiApp_ShowView_ret ; same, no change
rcall guiAppHideCurrent push yl
push yh
rcall guiAppHideCurrent ; (any, !X, !Z)
pop yh
pop yl
; store new view ; store new view
std Y+GUIAPP_SD_OFFS_CURRENTWIDGET_LO, xl std Y+GUIAPP_SD_OFFS_CURRENTWIDGET_LO, xl
std Y+GUIAPP_SD_OFFS_CURRENTWIDGET_HI, xh std Y+GUIAPP_SD_OFFS_CURRENTWIDGET_HI, xh
@@ -448,7 +452,7 @@ GuiApp_UngrabTouchEvents_ret:
; @routine guiAppHideCurrent ; @routine guiAppHideCurrent
; ;
; @param Z byte address of gui app object (for LPM!) ; @param Z byte address of gui app object (for LPM!)
; @clobbers any, !X, !Y. !Z ; @clobbers any, !X, !Z
guiAppHideCurrent: guiAppHideCurrent:
push zl push zl
@@ -476,7 +480,7 @@ guiAppHideCurrent_done:
; @routine guiAppShowCurrent ; @routine guiAppShowCurrent
; ;
; @param Z byte address of gui app object (for LPM!) ; @param Z byte address of gui app object (for LPM!)
; @clobbers any, !X, !Y. !Z ; @clobbers any, !X, !Z
guiAppShowCurrent: guiAppShowCurrent:
push zl push zl
@@ -487,14 +491,16 @@ guiAppShowCurrent:
mov r16, zl mov r16, zl
or r16, zh or r16, zh
breq guiAppShowCurrent_done breq guiAppShowCurrent_done
ldi r16, WIDGET_SIGNAL_SHOW
clr r17
bigcall OBJ_HandleSignal
ldi r16, (1<<WIDGET_FLAGS_ACTIVE_BIT) | (1<<WIDGET_FLAGS_DIRTY_BIT) ldi r16, (1<<WIDGET_FLAGS_ACTIVE_BIT) | (1<<WIDGET_FLAGS_DIRTY_BIT)
bigcall Widget_AddFlagsDown bigcall Widget_AddFlagsDown
ldi r16, WIDGET_SIGNAL_SHOW
clr r17
bigcall OBJ_HandleSignal ; (any, !X, !Y. !Z)
guiAppShowCurrent_done: guiAppShowCurrent_done:
pop zh pop zh
pop zl pop zl
rcall guiAppDrawWidgets ; (any, !Z)
ret ret
; @end ; @end