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

gui2: new layout modules basically work now.

Browse Source
This commit is contained in:
Martin Preuss
2026-04-12 17:01:30 +02:00
parent 505910bd12
commit 710af679cb
8 changed files with 517 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
avr/devices/c03/test/a_c03.asm
View File

@@ -348,7 +348,7 @@ C03App_CreateButton:
push r21
push r22
ldi r20, BUTTON_MODE_NORMAL
rcall Button_new
bigcall Button_new
pop r22
pop r21
pop r20

24
avr/devices/c03/test/main.asm
View File

@@ -358,6 +358,15 @@ DEBUG_DUMPWDG:
clr r5
clr r6
clr r7
ldi r16, 3
add r4, r16
adc r5, r17
rcall DEBUG_DUMPCWDG
ldi r16, 20
clr r17
add r6, r16
adc r7, r17
push yl
push yh
@@ -520,22 +529,23 @@ Debug_Style:
GUI2_MODULE_BEGIN:
.include "modules/lcd2/gui2/base/object.asm"
.include "modules/lcd2/gui2/base/widget.asm"
.include "modules/lcd2/gui2/base/layout.asm"
.include "modules/lcd2/gui2/base/hlayout.asm"
.include "modules/lcd2/gui2/base/vlayout.asm"
.include "modules/lcd2/gui2/base/mlayout.asm"
.include "modules/lcd2/gui2/base/mlayout_column.asm"
;.include "modules/lcd2/gui2/base/layout.asm"
;.include "modules/lcd2/gui2/base/hlayout.asm"
;.include "modules/lcd2/gui2/base/vlayout.asm"
;.include "modules/lcd2/gui2/base/mlayout.asm"
;.include "modules/lcd2/gui2/base/mlayout_column.asm"
.include "modules/lcd2/gui2/base/guiapp.asm"
.include "modules/lcd2/gui2/base/mainwindow.asm"
.include "modules/lcd2/gui2/base/rootwindow.asm"
.include "modules/lcd2/gui2/base/label.asm"
.include "modules/lcd2/gui2/base/button.asm"
.include "modules/lcd2/gui2/base/imageview.asm"
.include "modules/lcd2/gui2/base/valuelabel.asm"
.include "modules/lcd2/gui2/aqhome/sensorwatch.asm"
.include "modules/lcd2/gui2/base/layout2.asm"
.include "modules/lcd2/gui2/base/hlayout2.asm"
.include "modules/lcd2/gui2/base/vlayout2.asm"
.include "modules/lcd2/gui2/base/mclayout.asm"
.include "modules/lcd2/gui2/base/mainwindow.asm"
.include "modules/lcd2/gui2/aqhome/sensorwatch.asm"
GUI2_MODULE_END:
.equ MODULE_SIZE_GUI2 = GUI2_MODULE_END-GUI2_MODULE_BEGIN

34
avr/devices/c03/test/w_climate.asm
View File

@@ -96,11 +96,16 @@ ClimateWin_Init_ret:
climateWinCreateSensorWatches:
ldi r16, 0 ; OPTS
ldi r17, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_FILLED<<WIDGET_PACK_VSELF0_BIT) ; PACK
; ldi r20, HLAYOUT2_MODE_SPREAD
ldi r20, HLAYOUT2_MODE_EXPAND
ldi r20, HLAYOUT2_MODE_SPREAD
; ldi r20, HLAYOUT2_MODE_EXPAND
bigcall HLayout2_new
brcc climateWinCreateSensorWatches_ret
ldi r16, LOW(ClimateWindow_HLayoutStyle*2)
std Y+WIDGET_OFFS_STYLE_LO, r16
ldi r16, HIGH(ClimateWindow_HLayoutStyle*2)
std Y+WIDGET_OFFS_STYLE_HI, r16
mov xl, yl ; use HLayout as parent
mov xh, yh
@@ -157,5 +162,28 @@ climateWinCreateSensorWatches_ret:
; ***************************************************************************
; data in FLASH
ClimateWindow_HLayoutStyle:
.dw DISPLAY_COLOR_BLACK ; frontCol_norm
.dw DISPLAY_COLOR_LIGHTGREY ; backCol_norm
.dw DISPLAY_COLOR_BLACK ; borderCol_norm
.dw DISPLAY_COLOR_WHITE ; shadowCol_norm
.dw DISPLAY_COLOR_WHITE ; frontCol_activated
.dw DISPLAY_COLOR_NAVY ; backCol_activated
.dw DISPLAY_COLOR_BLACK ; borderCol_activated
.dw DISPLAY_COLOR_WHITE ; shadowCol_activated
.db 0, 1 ; outerBorderSize, innerBorderSize
.dw ili9341Font12x16_1*2 ; font
.db 12, 16 ; charWidth, charHeight
#endif