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

gui2: fixed a bug, added debug code.

Browse Source
This commit is contained in:
Martin Preuss
2026-03-09 02:28:33 +01:00
parent 0758579b43
commit 648b0f33c5
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
avr/modules/lcd2/gui2/base/mainwindow.asm
View File

@@ -88,7 +88,7 @@ MainWindow_Init:
; create sub widgets ; create sub widgets
rcall mainWindowCreateTitleWidget rcall mainWindowCreateTitleWidget
; rcall mainWindowCreateContentWidget rcall mainWindowCreateContentWidget
ret ret
; @end ; @end
@@ -178,6 +178,12 @@ mainWindowCreateTitleWidget:
std Y+WIDGET_OFFS_STYLE_LO, r16 std Y+WIDGET_OFFS_STYLE_LO, r16
ldi r16, HIGH(MainWindow_TitleStyle*2) ldi r16, HIGH(MainWindow_TitleStyle*2)
std Y+WIDGET_OFFS_STYLE_HI, r16 std Y+WIDGET_OFFS_STYLE_HI, r16
; DEBUG
ldd r16, Y+OBJECT_OFFS_FLAGS
sbr r16, (1<<WIDGET_FLAGS_VISIBLE_BIT) | (1<<WIDGET_FLAGS_LAYOUT_BIT) | (1<<WIDGET_FLAGS_DIRTY_BIT)
std Y+OBJECT_OFFS_FLAGS, r16
sec sec
mainWindowCreateTitleWidget_done: mainWindowCreateTitleWidget_done:
pop yh pop yh

3
avr/modules/lcd2/gui2/base/widget.asm
View File

@@ -901,7 +901,7 @@ widgetDrawChar:
ldd zl, Y+WIDGET_OFFS_STYLE_LO ldd zl, Y+WIDGET_OFFS_STYLE_LO
ldd zh, Y+WIDGET_OFFS_STYLE_HI ldd zh, Y+WIDGET_OFFS_STYLE_HI
adiw zh:zl, WIDGET_STYLE_OFFS_CHARWIDTH adiw zh:zl, WIDGET_STYLE_OFFS_CHARWIDTH
lpm r18, Z lpm r18, Z ; char width
sbiw zh:zl, WIDGET_STYLE_OFFS_CHARWIDTH sbiw zh:zl, WIDGET_STYLE_OFFS_CHARWIDTH
adiw zh:zl, WIDGET_STYLE_OFFS_FONT_LO adiw zh:zl, WIDGET_STYLE_OFFS_FONT_LO
lpm r19, Z+ lpm r19, Z+
@@ -909,6 +909,7 @@ widgetDrawChar:
mov zl, r19 mov zl, r19
; check whether char fits into widget ; check whether char fits into widget
mov r16, r18
clr r17 clr r17
add r16, r4 ; char width+X add r16, r4 ; char width+X
adc r17, r5 adc r17, r5