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

avr: fixed typos

Browse Source
This commit is contained in:
Martin Preuss
2026-04-20 23:57:41 +02:00
parent abe218e7b0
commit 71a9df7332
6 changed files with 199 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
avr/devices/c03/main/a_c03.asm
View File

@@ -421,8 +421,8 @@ C03App_CreateButton_ret:
C03App_CreateBackButton: C03App_CreateBackButton:
ldi r16, 0 ldi r16, 0
ldi r17, (WIDGET_PACK_END<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_END<<WIDGET_PACK_VSELF0_BIT) ; PACK ldi r17, (WIDGET_PACK_END<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_END<<WIDGET_PACK_VSELF0_BIT) ; PACK
ldi r20, LOW(RESSSOURCE_IMG_ARROWBACK) ldi r20, LOW(RESSOURCE_IMG_ARROWBACK)
ldi r21, HIGH(RESSSOURCE_IMG_ARROWBACK) ldi r21, HIGH(RESSOURCE_IMG_ARROWBACK)
ldi r22, C03APP_SEL_BACK ldi r22, C03APP_SEL_BACK
bigcall C03App_CreateButton bigcall C03App_CreateButton
brcc C03App_CreateBackButton brcc C03App_CreateBackButton

168
avr/devices/c03/main/ressources.asm
View File

@@ -24,50 +24,56 @@
.org RESSOURCE_ADDR .org RESSOURCE_ADDR
RessourceTable: RessourceTable:
.dw 41 ; num of ressources .dw 46 ; num of ressources
.dw (resImageNetwork*2) ; 0: RESSSOURCE_IMG_NETWORK .dw (resImageNetwork*2) ; 0: RESSOURCE_IMG_NETWORK
.dw (resImageCloud*2) ; 1: RESSSOURCE_IMG_CLOUD .dw (resImageCloud*2) ; 1: RESSOURCE_IMG_CLOUD
.dw (resImageTemp*2) ; 2: RESSSOURCE_IMG_TEMP .dw (resImageTemp*2) ; 2: RESSOURCE_IMG_TEMP
.dw (resImageHumidity*2) ; 3: RESSSOURCE_IMG_HUMIDITY .dw (resImageHumidity*2) ; 3: RESSOURCE_IMG_HUMIDITY
.dw (resImageLight*2) ; 4: RESSSOURCE_IMG_LIGHT .dw (resImageLight*2) ; 4: RESSOURCE_IMG_LIGHT
.dw (resImageWindowOpen*2) ; 5: RESSSOURCE_IMG_WINOPEN .dw (resImageWindowOpen*2) ; 5: RESSOURCE_IMG_WINOPEN
.dw (resImageWindowClosed*2) ; 6: RESSSOURCE_IMG_WINCLOSED .dw (resImageWindowClosed*2) ; 6: RESSOURCE_IMG_WINCLOSED
.dw (resImageArrowLeft*2) ; 7: RESSSOURCE_IMG_ARROWLEFT .dw (resImageArrowLeft*2) ; 7: RESSOURCE_IMG_ARROWLEFT
.dw (resImageArrowRight*2) ; 8: RESSSOURCE_IMG_ARROWRIGHT .dw (resImageArrowRight*2) ; 8: RESSOURCE_IMG_ARROWRIGHT
.dw (resImageArrowUp*2) ; 9: RESSSOURCE_IMG_ARROWUP .dw (resImageArrowUp*2) ; 9: RESSOURCE_IMG_ARROWUP
.dw (resImageArrowDown*2) ; 10: RESSSOURCE_IMG_ARROWDOWN .dw (resImageArrowDown*2) ; 10: RESSOURCE_IMG_ARROWDOWN
.dw (resImageArrowBack*2) ; 11: RESSSOURCE_IMG_ARROWBACK .dw (resImageArrowBack*2) ; 11: RESSOURCE_IMG_ARROWBACK
.dw (resImageCloud96*2) ; 12: RESSSOURCE_IMG_CLOUD96 .dw (resImageCloud96*2) ; 12: RESSOURCE_IMG_CLOUD96
.dw (resImageTemp96*2) ; 13: RESSSOURCE_IMG_TEMP96 .dw (resImageTemp96*2) ; 13: RESSOURCE_IMG_TEMP96
.dw (resImageHumidity96*2) ; 14: RESSSOURCE_IMG_HUMIDITY96 .dw (resImageHumidity96*2) ; 14: RESSOURCE_IMG_HUMIDITY96
.dw (resFont12x16_1*2) ; 15: RESSSOURCE_FNT_12X16_1 .dw (resFont12x16_1*2) ; 15: RESSOURCE_FNT_12X16_1
.dw (resFont6x8_1*2) ; 16: RESSSOURCE_FNT_6X8_1 .dw (resFont6x8_1*2) ; 16: RESSOURCE_FNT_6X8_1
.dw (resTextCorridor*2) ; 17: RESSSOURCE_TXT_CORRIDOR .dw (resTextCorridor*2) ; 17: RESSOURCE_TXT_CORRIDOR
.dw (resTextLivingRoom*2) ; 18: RESSSOURCE_TXT_LIVINGROOM .dw (resTextLivingRoom*2) ; 18: RESSOURCE_TXT_LIVINGROOM
.dw (resTextBedRoom*2) ; 19: RESSSOURCE_TXT_BEDROOM .dw (resTextBedRoom*2) ; 19: RESSOURCE_TXT_BEDROOM
.dw (resTextKitchen*2) ; 20: RESSSOURCE_TXT_KITCHEN .dw (resTextKitchen*2) ; 20: RESSOURCE_TXT_KITCHEN
.dw (resTextBuero*2) ; 21: RESSSOURCE_TXT_BUERO .dw (resTextBuero*2) ; 21: RESSOURCE_TXT_BUERO
.dw (resTextChildrensRoom*2) ; 22: RESSSOURCE_TXT_CHILDRENSROOM .dw (resTextChildrensRoom*2) ; 22: RESSOURCE_TXT_CHILDRENSROOM
.dw (resTextStorageRoom*2) ; 23: RESSSOURCE_TXT_STORAGEROOM .dw (resTextStorageRoom*2) ; 23: RESSOURCE_TXT_STORAGEROOM
.dw (resTextBathRoom*2) ; 24: RESSSOURCE_TXT_BATHROOM .dw (resTextBathRoom*2) ; 24: RESSOURCE_TXT_BATHROOM
.dw (resTextCellar*2) ; 25: RESSSOURCE_TXT_CELLAR .dw (resTextCellar*2) ; 25: RESSOURCE_TXT_CELLAR
.dw (resTextAttic*2) ; 26: RESSSOURCE_TXT_ATTIC .dw (resTextAttic*2) ; 26: RESSOURCE_TXT_ATTIC
.dw (resImageReset*2) ; 27: RESSSOURCE_IMG_RESET .dw (resImageReset*2) ; 27: RESSOURCE_IMG_RESET
.dw (resImageDebugEeprom*2) ; 28: RESSSOURCE_IMG_DEBUGEEPROM .dw (resImageDebugEeprom*2) ; 28: RESSOURCE_IMG_DEBUGEEPROM
.dw (resTextC02_s*2) ; 29: RESSSOURCE_TXT_CO2_S .dw (resTextC02_s*2) ; 29: RESSOURCE_TXT_CO2_S
.dw (resTextTemp_s*2) ; 30: RESSSOURCE_TXT_TEMP_S .dw (resTextTemp_s*2) ; 30: RESSOURCE_TXT_TEMP_S
.dw (resTextHum_s*2) ; 31: RESSSOURCE_TXT_HUM_S .dw (resTextHum_s*2) ; 31: RESSOURCE_TXT_HUM_S
.dw (resTextUnknown_s*2) ; 32: RESSSOURCE_TXT_UNKNOWN_S .dw (resTextUnknown_s*2) ; 32: RESSOURCE_TXT_UNKNOWN_S
.dw (resTextRoomClimate*2) ; 33: RESSSOURCE_TXT_ROOMCLIMATE .dw (resTextRoomClimate*2) ; 33: RESSOURCE_TXT_ROOMCLIMATE
.dw (resTextAqHome*2) ; 34: RESSSOURCE_TXT_AQHOME .dw (resTextAqHome*2) ; 34: RESSOURCE_TXT_AQHOME
.dw (resTextPacketsIn*2) ; 35: RESSOURCE_TXT_PACKETSIN
.dw (resTextPacketsOut*2) ; 36: RESSOURCE_TXT_PACKETSOUT
.dw (resTextEContent*2) ; 37: RESSOURCE_TXT_ECONTENT
.dw (resTextEMsgSize*2) ; 38: RESSOURCE_TXT_EMSGSIZE
.dw (resTextEIO*2) ; 39: RESSOURCE_TXT_EIO
.dw (resTextNetStats*2) ; 40: RESSOURCE_TXT_NETSTATS
.dw (resTextPacketsIn*2) ; 35: RESSSOURCE_TXT_PACKETSIN .dw (resImageCheckboxUnchecked12x16*2) ; 41: RESSOURCE_IMG_CHECKBOX_UNCHECKED
.dw (resTextPacketsOut*2) ; 36: RESSSOURCE_TXT_PACKETSOUT .dw (resImageCheckboxChecked12x16*2) ; 42: RESSOURCE_IMG_CHECKBOX_CHECKED
.dw (resTextEContent*2) ; 37: RESSSOURCE_TXT_ECONTENT
.dw (resTextEMsgSize*2) ; 38: RESSSOURCE_TXT_EMSGSIZE
.dw (resTextEIO*2) ; 39: RESSSOURCE_TXT_EIO
.dw (resTextNetStats*2) ; 40: RESSSOURCE_TXT_NETSTATS
.dw (resImageLight16x16On*2) ; 43: RESSOURCE_IMG_LIGHT16X16ON
.dw (resImageLight16x16Off*2) ; 44: RESSOURCE_IMG_LIGHT16X16OFF
.dw (resImageLight16x16Auto*2) ; 45: RESSOURCE_IMG_LIGHT16X16AUTO
resImageNetwork: resImageNetwork:
@@ -670,6 +676,74 @@ resImageResetPixels:
resImageCheckboxUnchecked12x16:
.dw DISPLAY_IMAGETYPE_IDX2RLE
.dw 12, 16
.dw (resImageCheckboxUnchecked12x16ColorMap*2)
.dw (resImageCheckboxUnchecked12x16Pixels*2)
resImageCheckboxUnchecked12x16ColorMap:
.dw 4
.dw 0, DISPLAY_COLOR_BLACK, DISPLAY_COLOR_BLUE, DISPLAY_COLOR_WHITE
resImageCheckboxUnchecked12x16Pixels:
.db 0x89, 0x00, 0x1e, 0x15, 0x55, 0x54, 0x15, 0x55, 0x54, 0x14, 0x00, 0x14, 0x14, 0x00, 0x14, 0x14
.db 0x00, 0x14, 0x14, 0x00, 0x14, 0x14, 0x00, 0x14, 0x14, 0x00, 0x14, 0x15, 0x55, 0x54, 0x15, 0x55
.db 0x54, 0x89, 0x00, 0x00
resImageCheckboxChecked12x16:
.dw DISPLAY_IMAGETYPE_IDX2RLE
.dw 12, 16
.dw (resImageCheckboxChecked12x16ColorMap*2)
.dw (resImageCheckboxChecked12x16Pixels*2)
resImageCheckboxChecked12x16ColorMap:
.dw 4
.dw 0, DISPLAY_COLOR_BLACK, DISPLAY_COLOR_BLUE, DISPLAY_COLOR_WHITE
resImageCheckboxChecked12x16Pixels:
.db 0x89, 0x00, 0x1e, 0x15, 0x55, 0x54, 0x15, 0x55, 0x54, 0x16, 0xaa, 0x94, 0x16, 0xaa, 0x94, 0x16
.db 0xaa, 0x94, 0x16, 0xaa, 0x94, 0x16, 0xaa, 0x94, 0x16, 0xaa, 0x94, 0x15, 0x55, 0x54, 0x15, 0x55
.db 0x54, 0x89, 0x00, 0x00
resImageLight16x16On:
.dw DISPLAY_IMAGETYPE_IDX2RLE
.dw 16, 16
.dw (resImageLight16x16OnColorMap*2)
.dw (resImageCheckboxChecked12x16Pixels*2)
resImageLight16x16OnColorMap:
.dw 4
.dw 0, DISPLAY_COLOR_BLACK, DISPLAY_COLOR_BLUE, DISPLAY_COLOR_YELLOW
resImageLight16x16Off:
.dw DISPLAY_IMAGETYPE_IDX2RLE
.dw 16, 16
.dw (resImageLight16x16OffColorMap*2)
.dw (resImageCheckboxChecked12x16Pixels*2)
resImageLight16x16OffColorMap:
.dw 4
.dw 0, DISPLAY_COLOR_BLACK, DISPLAY_COLOR_BLUE, DISPLAY_COLOR_LIGHTGREY
resImageLight16x16Auto:
.dw DISPLAY_IMAGETYPE_IDX2RLE
.dw 16, 16
.dw (resImageLight16x16AutoColorMap*2)
.dw (resImageCheckboxChecked12x16Pixels*2)
resImageLight16x16AutoColorMap:
.dw 4
.dw 0, DISPLAY_COLOR_BLACK, DISPLAY_COLOR_BLUE, DISPLAY_COLOR_GREENYELLOW
resImageLight16x16Pixels:
.db 0x3b, 0x00, 0x05, 0x50, 0x00, 0x00, 0x1a, 0xa4, 0x00, 0x00, 0x6a, 0xa9, 0x00, 0x01, 0xaa, 0xaa
.db 0x40, 0x01, 0xaa, 0xaa, 0x40, 0x01, 0xaa, 0xaa, 0x40, 0x01, 0xaa, 0xaa, 0x40, 0x00, 0x6a, 0xa9
.db 0x00, 0x00, 0x6a, 0xa9, 0x00, 0x00, 0x1a, 0xa4, 0x00, 0x00, 0x1a, 0xa4, 0x00, 0x00, 0x05, 0x50
.db 0x00, 0x00, 0x07, 0xd0, 0x00, 0x00, 0x07, 0xd0, 0x00, 0x00, 0x01, 0x40, 0x85, 0x00
resFont12x16_1: ; (12x16_horizontal_LSB_2) resFont12x16_1: ; (12x16_horizontal_LSB_2)
.db 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, ; 0x20 .db 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, ; 0x20
.db 0x60,0x00,0x60,0x00,0xF0,0x00,0xF0,0x00,0xF0,0x00,0xF0,0x00,0xF0,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x60,0x00,0x00,0x00,0x00,0x00, ; 0x21 .db 0x60,0x00,0x60,0x00,0xF0,0x00,0xF0,0x00,0xF0,0x00,0xF0,0x00,0xF0,0x00,0x60,0x00,0x60,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x60,0x00,0x00,0x00,0x00,0x00, ; 0x21
@@ -1057,10 +1131,10 @@ resTextAqHome:
.db "AqHome", 0, 0 .db "AqHome", 0, 0
resTextPacketsIn: resTextPacketsIn:
.db "Eingehende Pakete:", 0 .db "Eingehende Pakete:", 0, 0
resTextPacketsOut: resTextPacketsOut:
.db "Ausgehende Pakete:", 0 .db "Ausgehende Pakete:", 0, 0
resTextEContent: resTextEContent:
.db "CRC Fehler:", 0 .db "CRC Fehler:", 0
@@ -1075,6 +1149,12 @@ resTextNetStats:
.db "Netzwerk Statistik", 0, 0 .db "Netzwerk Statistik", 0, 0
deviceCodeEnd:
.if deviceCodeEnd >= BOOTLOADER_ADDR
.warning "Code reaches into boot loader!"
.endif
#endif #endif

89
avr/devices/c03/main/ressources.inc
View File

@@ -11,48 +11,53 @@
#define AQH_AVR_DEVICE_C03_RESSOURCES_INC #define AQH_AVR_DEVICE_C03_RESSOURCES_INC
.equ RESSSOURCE_IMG_NETWORK = 0 .equ RESSOURCE_IMG_NETWORK = 0
.equ RESSSOURCE_IMG_CLOUD = 1 .equ RESSOURCE_IMG_CLOUD = 1
.equ RESSSOURCE_IMG_TEMP = 2 .equ RESSOURCE_IMG_TEMP = 2
.equ RESSSOURCE_IMG_HUMIDITY = 3 .equ RESSOURCE_IMG_HUMIDITY = 3
.equ RESSSOURCE_IMG_LIGHT = 4 .equ RESSOURCE_IMG_LIGHT = 4
.equ RESSSOURCE_IMG_WINOPEN = 5 .equ RESSOURCE_IMG_WINOPEN = 5
.equ RESSSOURCE_IMG_WINCLOSED = 6 .equ RESSOURCE_IMG_WINCLOSED = 6
.equ RESSSOURCE_IMG_ARROWLEFT = 7 .equ RESSOURCE_IMG_ARROWLEFT = 7
.equ RESSSOURCE_IMG_ARROWRIGHT = 8 .equ RESSOURCE_IMG_ARROWRIGHT = 8
.equ RESSSOURCE_IMG_ARROWUP = 9 .equ RESSOURCE_IMG_ARROWUP = 9
.equ RESSSOURCE_IMG_ARROWDOWN = 10 .equ RESSOURCE_IMG_ARROWDOWN = 10
.equ RESSSOURCE_IMG_ARROWBACK = 11 .equ RESSOURCE_IMG_ARROWBACK = 11
.equ RESSSOURCE_IMG_CLOUD96 = 12 .equ RESSOURCE_IMG_CLOUD96 = 12
.equ RESSSOURCE_IMG_TEMP96 = 13 .equ RESSOURCE_IMG_TEMP96 = 13
.equ RESSSOURCE_IMG_HUMIDITY96 = 14 .equ RESSOURCE_IMG_HUMIDITY96 = 14
.equ RESSSOURCE_FNT_12X16_1 = 15 .equ RESSOURCE_FNT_12X16_1 = 15
.equ RESSSOURCE_FNT_6X8_1 = 16 .equ RESSOURCE_FNT_6X8_1 = 16
.equ RESSSOURCE_TXT_CORRIDOR = 17 .equ RESSOURCE_TXT_CORRIDOR = 17
.equ RESSSOURCE_TXT_LIVINGROOM = 18 .equ RESSOURCE_TXT_LIVINGROOM = 18
.equ RESSSOURCE_TXT_BEDROOM = 19 .equ RESSOURCE_TXT_BEDROOM = 19
.equ RESSSOURCE_TXT_KITCHEN = 20 .equ RESSOURCE_TXT_KITCHEN = 20
.equ RESSSOURCE_TXT_BUERO = 21 .equ RESSOURCE_TXT_BUERO = 21
.equ RESSSOURCE_TXT_CHILDRENSROOM = 22 .equ RESSOURCE_TXT_CHILDRENSROOM = 22
.equ RESSSOURCE_TXT_STORAGEROOM = 23 .equ RESSOURCE_TXT_STORAGEROOM = 23
.equ RESSSOURCE_TXT_BATHROOM = 24 .equ RESSOURCE_TXT_BATHROOM = 24
.equ RESSSOURCE_TXT_CELLAR = 25 .equ RESSOURCE_TXT_CELLAR = 25
.equ RESSSOURCE_TXT_ATTIC = 26 .equ RESSOURCE_TXT_ATTIC = 26
.equ RESSSOURCE_IMG_RESET = 27 .equ RESSOURCE_IMG_RESET = 27
.equ RESSSOURCE_IMG_DEBUGEEPROM = 28 .equ RESSOURCE_IMG_DEBUGEEPROM = 28
.equ RESSSOURCE_TXT_CO2_S = 29 .equ RESSOURCE_TXT_CO2_S = 29
.equ RESSSOURCE_TXT_TEMP_S = 30 .equ RESSOURCE_TXT_TEMP_S = 30
.equ RESSSOURCE_TXT_HUM_S = 31 .equ RESSOURCE_TXT_HUM_S = 31
.equ RESSSOURCE_TXT_UNKNOWN_S = 32 .equ RESSOURCE_TXT_UNKNOWN_S = 32
.equ RESSSOURCE_TXT_ROOMCLIMATE = 33 .equ RESSOURCE_TXT_ROOMCLIMATE = 33
.equ RESSSOURCE_TXT_AQHOME = 34 .equ RESSOURCE_TXT_AQHOME = 34
.equ RESSSOURCE_TXT_PACKETSIN = 35 .equ RESSOURCE_TXT_PACKETSIN = 35
.equ RESSSOURCE_TXT_PACKETSOUT = 36 .equ RESSOURCE_TXT_PACKETSOUT = 36
.equ RESSSOURCE_TXT_ECONTENT = 37 .equ RESSOURCE_TXT_ECONTENT = 37
.equ RESSSOURCE_TXT_EMSGSIZE = 38 .equ RESSOURCE_TXT_EMSGSIZE = 38
.equ RESSSOURCE_TXT_EIO = 39 .equ RESSOURCE_TXT_EIO = 39
.equ RESSSOURCE_TXT_NETSTATS = 40 .equ RESSOURCE_TXT_NETSTATS = 40
.equ RESSOURCE_IMG_CHECKBOX_UNCHECKED = 41
.equ RESSOURCE_IMG_CHECKBOX_CHECKED = 42
.equ RESSOURCE_IMG_LIGHT16X16ON = 43
.equ RESSOURCE_IMG_LIGHT16X16OFF = 44
.equ RESSOURCE_IMG_LIGHT16X16AUTO = 45
#endif ; AQH_AVR_DEVICE_C03_RESSOURCES_INC #endif ; AQH_AVR_DEVICE_C03_RESSOURCES_INC

4
avr/devices/c03/main/w_climate.asm
View File

@@ -60,8 +60,8 @@ ClimateWin_new_ret:
ClimateWin_Init: ClimateWin_Init:
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_ROOMCLIMATE) ldi r20, LOW(RESSOURCE_TXT_ROOMCLIMATE)
ldi r21, HIGH(RESSSOURCE_TXT_ROOMCLIMATE) ldi r21, HIGH(RESSOURCE_TXT_ROOMCLIMATE)
bigcall MainWindow_new ; Y=main window bigcall MainWindow_new ; Y=main window
brcc ClimateWin_Init_ret brcc ClimateWin_Init_ret

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

@@ -56,8 +56,8 @@ MenuWin_new:
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_AQHOME) ldi r20, LOW(RESSOURCE_TXT_AQHOME)
ldi r21, HIGH(RESSSOURCE_TXT_AQHOME) ldi r21, HIGH(RESSOURCE_TXT_AQHOME)
bigcall MainWindow_new bigcall MainWindow_new
brcc MenuWin_new_ret brcc MenuWin_new_ret
@@ -112,32 +112,32 @@ menuWinCreateContent:
pop yl pop yl
brcc menuWinCreateContent_ret brcc menuWinCreateContent_ret
ldi r20, LOW(RESSSOURCE_IMG_TEMP) ldi r20, LOW(RESSOURCE_IMG_TEMP)
ldi r21, HIGH(RESSSOURCE_IMG_TEMP) ldi r21, HIGH(RESSOURCE_IMG_TEMP)
ldi r22, MENUWIN_SEL_CLIMATE ldi r22, MENUWIN_SEL_CLIMATE
rcall menuWinCreateButton rcall menuWinCreateButton
brcc menuWinCreateContent_ret brcc menuWinCreateContent_ret
ldi r20, LOW(RESSSOURCE_IMG_LIGHT) ldi r20, LOW(RESSOURCE_IMG_LIGHT)
ldi r21, HIGH(RESSSOURCE_IMG_LIGHT) ldi r21, HIGH(RESSOURCE_IMG_LIGHT)
ldi r22, MENUWIN_SEL_LIGHT ldi r22, MENUWIN_SEL_LIGHT
rcall menuWinCreateButton rcall menuWinCreateButton
brcc menuWinCreateContent_ret brcc menuWinCreateContent_ret
ldi r20, LOW(RESSSOURCE_IMG_WINCLOSED) ldi r20, LOW(RESSOURCE_IMG_WINCLOSED)
ldi r21, HIGH(RESSSOURCE_IMG_WINCLOSED) ldi r21, HIGH(RESSOURCE_IMG_WINCLOSED)
ldi r22, MENUWIN_SEL_WINDOWS ldi r22, MENUWIN_SEL_WINDOWS
rcall menuWinCreateButton rcall menuWinCreateButton
brcc menuWinCreateContent_ret brcc menuWinCreateContent_ret
ldi r20, LOW(RESSSOURCE_IMG_NETWORK) ldi r20, LOW(RESSOURCE_IMG_NETWORK)
ldi r21, HIGH(RESSSOURCE_IMG_NETWORK) ldi r21, HIGH(RESSOURCE_IMG_NETWORK)
ldi r22, MENUWIN_SEL_NETSTATS ldi r22, MENUWIN_SEL_NETSTATS
rcall menuWinCreateButton rcall menuWinCreateButton
brcc menuWinCreateContent_ret brcc menuWinCreateContent_ret
ldi r20, LOW(RESSSOURCE_IMG_DEBUGEEPROM) ldi r20, LOW(RESSOURCE_IMG_DEBUGEEPROM)
ldi r21, HIGH(RESSSOURCE_IMG_DEBUGEEPROM) ldi r21, HIGH(RESSOURCE_IMG_DEBUGEEPROM)
ldi r22, MENUWIN_SEL_DEBUG ldi r22, MENUWIN_SEL_DEBUG
rcall menuWinCreateButton rcall menuWinCreateButton
brcc menuWinCreateContent_ret brcc menuWinCreateContent_ret

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

@@ -63,8 +63,8 @@ NetStatWin_new_ret:
NetStatWin_Init: NetStatWin_Init:
ldi r16, (1<<OBJECT_OPTS_TIMER_BIT) ; OPTS ldi r16, (1<<OBJECT_OPTS_TIMER_BIT) ; 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_NETSTATS) ldi r20, LOW(RESSOURCE_TXT_NETSTATS)
ldi r21, HIGH(RESSSOURCE_TXT_NETSTATS) ldi r21, HIGH(RESSOURCE_TXT_NETSTATS)
bigcall MainWindow_Init ; (any, !Y) bigcall MainWindow_Init ; (any, !Y)
brcc NetStatWin_Init_ret brcc NetStatWin_Init_ret
@@ -159,28 +159,28 @@ netStatWinCreateContent:
mov xl, yl ; use MLayout as parent mov xl, yl ; use MLayout as parent
mov xh, yh mov xh, yh
ldi r20, LOW(RESSSOURCE_TXT_PACKETSIN) ldi r20, LOW(RESSOURCE_TXT_PACKETSIN)
ldi r21, HIGH(RESSSOURCE_TXT_PACKETSIN) ldi r21, HIGH(RESSOURCE_TXT_PACKETSIN)
rcall netStatWinCreateWidgetPair ; (any, !X, !Y) rcall netStatWinCreateWidgetPair ; (any, !X, !Y)
brcc netStatWinCreateContent_ret brcc netStatWinCreateContent_ret
ldi r20, LOW(RESSSOURCE_TXT_PACKETSOUT) ldi r20, LOW(RESSOURCE_TXT_PACKETSOUT)
ldi r21, HIGH(RESSSOURCE_TXT_PACKETSOUT) ldi r21, HIGH(RESSOURCE_TXT_PACKETSOUT)
rcall netStatWinCreateWidgetPair ; (any, !X, !Y) rcall netStatWinCreateWidgetPair ; (any, !X, !Y)
brcc netStatWinCreateContent_ret brcc netStatWinCreateContent_ret
ldi r20, LOW(RESSSOURCE_TXT_ECONTENT) ldi r20, LOW(RESSOURCE_TXT_ECONTENT)
ldi r21, HIGH(RESSSOURCE_TXT_ECONTENT) ldi r21, HIGH(RESSOURCE_TXT_ECONTENT)
rcall netStatWinCreateWidgetPair ; (any, !X, !Y) rcall netStatWinCreateWidgetPair ; (any, !X, !Y)
brcc netStatWinCreateContent_ret brcc netStatWinCreateContent_ret
ldi r20, LOW(RESSSOURCE_TXT_EIO) ldi r20, LOW(RESSOURCE_TXT_EIO)
ldi r21, HIGH(RESSSOURCE_TXT_EIO) ldi r21, HIGH(RESSOURCE_TXT_EIO)
rcall netStatWinCreateWidgetPair ; (any, !X, !Y) rcall netStatWinCreateWidgetPair ; (any, !X, !Y)
brcc netStatWinCreateContent_ret brcc netStatWinCreateContent_ret
ldi r20, LOW(RESSSOURCE_TXT_EMSGSIZE) ldi r20, LOW(RESSOURCE_TXT_EMSGSIZE)
ldi r21, HIGH(RESSSOURCE_TXT_EMSGSIZE) ldi r21, HIGH(RESSOURCE_TXT_EMSGSIZE)
rcall netStatWinCreateWidgetPair ; (any, !X, !Y) rcall netStatWinCreateWidgetPair ; (any, !X, !Y)
netStatWinCreateContent_ret: netStatWinCreateContent_ret: