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

gui2: renamed *layout2* to *layout*

Browse Source
This commit is contained in:
Martin Preuss
2026-04-12 17:10:15 +02:00
parent 98f1ab779d
commit 5fe4b4b705
8 changed files with 176 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -540,9 +540,9 @@ GUI2_MODULE_BEGIN:
.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/base/layout2.asm"
.include "modules/lcd2/gui2/base/hlayout2.asm"
.include "modules/lcd2/gui2/base/vlayout2.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/mclayout.asm"
.include "modules/lcd2/gui2/base/mainwindow.asm"
.include "modules/lcd2/gui2/aqhome/sensorwatch.asm"

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

@@ -96,9 +96,8 @@ 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
bigcall HLayout2_new
ldi r20, HLAYOUT_MODE_SPREAD
bigcall HLayout_new
brcc climateWinCreateSensorWatches_ret
ldi r16, LOW(ClimateWindow_HLayoutStyle*2)