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

c03: remove border, use new ressource RESSSOURCE_TXT_ROOMCLIMATE

Browse Source
This commit is contained in:
Martin Preuss
2026-03-15 20:26:43 +01:00
parent 13a3c3a189
commit 274c404732
1 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,8 +40,8 @@ ClimateWin_new:
mov xh, r19 mov xh, r19
ldi r16, 0 ; OPTS ldi r16, 0 ; OPTS
ldi r17, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_FILLED<<WIDGET_PACK_VSELF0_BIT) ; PACK ldi r17, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_FILLED<<WIDGET_PACK_VSELF0_BIT) ; PACK
ldi r20, LOW(RESSSOURCE_TXT_LIVINGROOM) ; TODO: use "Room Climate" ldi r20, LOW(RESSSOURCE_TXT_ROOMCLIMATE)
ldi r21, HIGH(RESSSOURCE_TXT_LIVINGROOM) ldi r21, HIGH(RESSSOURCE_TXT_ROOMCLIMATE)
bigcall MainWindow_new bigcall MainWindow_new
brcc ClimateWin_new_ret brcc ClimateWin_new_ret
@@ -94,7 +94,6 @@ climateWinCreateSensorWatches:
push xh push xh
ldi r16, (1<<OBJECT_OPTS_TIMER_BIT) | \ ldi r16, (1<<OBJECT_OPTS_TIMER_BIT) | \
(1<<WIDGET_OPTS_INPUT_BIT) | \ (1<<WIDGET_OPTS_INPUT_BIT) | \
(1<<WIDGET_OPTS_BORDER_BIT) | \
(1<<OBJECT_OPTS_MSGRECV_BIT) ; OPTS (1<<OBJECT_OPTS_MSGRECV_BIT) ; OPTS
ldi r17, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \ ldi r17, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
(WIDGET_PACK_BEGIN<<WIDGET_PACK_VSELF0_BIT) ; PACK (WIDGET_PACK_BEGIN<<WIDGET_PACK_VSELF0_BIT) ; PACK
@@ -111,7 +110,6 @@ climateWinCreateSensorWatches:
push xh push xh
ldi r16, (1<<OBJECT_OPTS_TIMER_BIT) | \ ldi r16, (1<<OBJECT_OPTS_TIMER_BIT) | \
(1<<WIDGET_OPTS_INPUT_BIT) | \ (1<<WIDGET_OPTS_INPUT_BIT) | \
(1<<WIDGET_OPTS_BORDER_BIT) | \
(1<<OBJECT_OPTS_MSGRECV_BIT); OPTS (1<<OBJECT_OPTS_MSGRECV_BIT); OPTS
ldi r17, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \ ldi r17, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
(WIDGET_PACK_BEGIN<<WIDGET_PACK_VSELF0_BIT) ; PACK (WIDGET_PACK_BEGIN<<WIDGET_PACK_VSELF0_BIT) ; PACK
@@ -128,7 +126,6 @@ climateWinCreateSensorWatches:
push xh push xh
ldi r16, (1<<OBJECT_OPTS_TIMER_BIT) | \ ldi r16, (1<<OBJECT_OPTS_TIMER_BIT) | \
(1<<WIDGET_OPTS_INPUT_BIT) | \ (1<<WIDGET_OPTS_INPUT_BIT) | \
(1<<WIDGET_OPTS_BORDER_BIT) | \
(1<<OBJECT_OPTS_MSGRECV_BIT); OPTS (1<<OBJECT_OPTS_MSGRECV_BIT); OPTS
ldi r17, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \ ldi r17, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | \
(WIDGET_PACK_BEGIN<<WIDGET_PACK_VSELF0_BIT) ; PACK (WIDGET_PACK_BEGIN<<WIDGET_PACK_VSELF0_BIT) ; PACK
@@ -144,24 +141,6 @@ climateWinCreateSensorWatches_ret:
; @end ; @end
#if 0
Debug_Style:
.dw DISPLAY_COLOR_BLACK ; frontCol_norm
; .dw DISPLAY_COLOR_LIGHTGREY ; backCol_norm
.dw DISPLAY_COLOR_GREEN ; 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 1, 1 ; outerBorderSize, innerBorderSize
.dw ili9341Font12x16_1*2 ; font
.db 12, 16 ; charWidth, charHeight
# endif
#endif #endif