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

gui2: started working on SensorWatch for GUI2. Works so far.

Browse Source
This commit is contained in:
Martin Preuss
2026-03-10 00:15:52 +01:00
parent d3f24284ca
commit 282cd738b4
8 changed files with 369 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,49 +266,24 @@ test:
bigcall MainWindow_new
bigcall MainWindow_GetContentWidget
brcc DEBUG_STOP
mov xl, yl
mov xl, yl ; X=MainWindow
mov xh, yh
push xl
push xl ; mainWindow
push xh
mov xl, r18
mov xl, r18 ; contentWindow
mov xh, r19
push xl ; content window
push xh
ldi r16, (1<<OBJECT_OPTS_TIMER_BIT) | (1<<WIDGET_OPTS_INPUT_BIT) ; OPTS
push xl
push xh
ldi r16, (1<<OBJECT_OPTS_TIMER_BIT) | (1<<WIDGET_OPTS_INPUT_BIT) | (1<<WIDGET_OPTS_BORDER_BIT) ; OPTS
ldi r17, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_BEGIN<<WIDGET_PACK_VSELF0_BIT) ; PACK
ldi r20, BUTTON_MODE_NORMAL
bigcall Button_new
mov xl, yl
mov xh, yh
ldi r16, (1<<WIDGET_OPTS_BORDER_BIT)
ldi r17, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_BEGIN<<WIDGET_PACK_VSELF0_BIT) |\
(WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | (WIDGET_PACK_BEGIN<<WIDGET_PACK_VCONTENT0_BIT)
ldi r20, LOW(RESSSOURCE_TXT_BUERO)
ldi r21, HIGH(RESSSOURCE_TXT_BUERO)
bigcall Label_new
ldi r20, VALUE_ID_SENSOR_CO2_BASE
ldi r21, C03_EEID_SENSOR_CO2
ldi r22, SENSORWATCH_TYPE_CO2
bigcall SensorWatch_new
pop xh
pop xl
push xl
push xh
ldi r16, (1<<OBJECT_OPTS_TIMER_BIT) | (1<<WIDGET_OPTS_INPUT_BIT) ; OPTS
ldi r17, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_BEGIN<<WIDGET_PACK_VSELF0_BIT) ; PACK
ldi r20, BUTTON_MODE_NORMAL
bigcall Button_new
mov xl, yl
mov xh, yh
ldi r16, (1<<WIDGET_OPTS_BORDER_BIT)
ldi r17, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_BEGIN<<WIDGET_PACK_VSELF0_BIT) |\
(WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | (WIDGET_PACK_BEGIN<<WIDGET_PACK_VCONTENT0_BIT)
ldi r20, LOW(RESSSOURCE_IMG_TEMP96)
ldi r21, HIGH(RESSSOURCE_IMG_TEMP96)
bigcall ImageView_new
pop xh
pop xl
pop xh
pop xl
pop yh
@@ -365,6 +340,7 @@ DEBUG_STOP3:
.include "style.asm"
GUI2_MODULE_BEGIN:
.include "modules/lcd2/gui2/base/object.asm"
.include "modules/lcd2/gui2/base/widget.asm"
.include "modules/lcd2/gui2/base/layout.asm"
@@ -377,6 +353,10 @@ DEBUG_STOP3:
.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"
GUI2_MODULE_END:
.equ MODULE_SIZE_GUI2 = GUI2_MODULE_END-GUI2_MODULE_BEGIN

18
avr/devices/c03/test/ressources.asm
View File

@@ -24,7 +24,7 @@
.org RESSOURCE_ADDR
RessourceTable:
.dw 29 ; num of ressources
.dw 33 ; num of ressources
.dw (resImageNetwork*2) ; 0: RESSSOURCE_IMG_NETWORK
.dw (resImageCloud*2) ; 1: RESSSOURCE_IMG_CLOUD
.dw (resImageTemp*2) ; 2: RESSSOURCE_IMG_TEMP
@@ -54,6 +54,10 @@ RessourceTable:
.dw (resTextAttic*2) ; 26: RESSSOURCE_TXT_ATTIC
.dw (resImageReset*2) ; 27: RESSSOURCE_IMG_RESET
.dw (resImageDebugEeprom*2) ; 28: RESSSOURCE_IMG_DEBUGEEPROM
.dw (resTextC02_s*2) ; 29: RESSSOURCE_TXT_CO2_S
.dw (resTextTemp_s*2) ; 30: RESSSOURCE_TXT_TEMP_S
.dw (resTextHum_s*2) ; 31: RESSSOURCE_TXT_HUM_S
.dw (resTextUnknown_s*2) ; 32: RESSSOURCE_TXT_UNKNOWN_S
resImageNetwork:
@@ -1023,6 +1027,18 @@ resTextCellar:
resTextAttic:
.db "Dachboden", 0
resTextC02_s:
.db "CO2", 0
resTextTemp_s:
.db "Temp", 0, 0
resTextHum_s:
.db "Feuchte", 0
resTextUnknown_s:
.db "???", 0

4
avr/devices/c03/test/ressources.inc
View File

@@ -40,6 +40,10 @@
.equ RESSSOURCE_TXT_ATTIC = 26
.equ RESSSOURCE_IMG_RESET = 27
.equ RESSSOURCE_IMG_DEBUGEEPROM = 28
.equ RESSSOURCE_TXT_CO2_S = 29
.equ RESSSOURCE_TXT_TEMP_S = 30
.equ RESSSOURCE_TXT_HUM_S = 31
.equ RESSSOURCE_TXT_UNKNOWN_S = 32