diff --git a/avr/devices/c03/main/a_c03.asm b/avr/devices/c03/main/a_c03.asm index 4b7c905..904fb60 100644 --- a/avr/devices/c03/main/a_c03.asm +++ b/avr/devices/c03/main/a_c03.asm @@ -421,8 +421,8 @@ C03App_CreateButton_ret: C03App_CreateBackButton: ldi r16, 0 ldi r17, (WIDGET_PACK_END<= BOOTLOADER_ADDR + .warning "Code reaches into boot loader!" + .endif + + #endif diff --git a/avr/devices/c03/main/ressources.inc b/avr/devices/c03/main/ressources.inc index ca23e06..a809a9b 100644 --- a/avr/devices/c03/main/ressources.inc +++ b/avr/devices/c03/main/ressources.inc @@ -11,48 +11,53 @@ #define AQH_AVR_DEVICE_C03_RESSOURCES_INC -.equ RESSSOURCE_IMG_NETWORK = 0 -.equ RESSSOURCE_IMG_CLOUD = 1 -.equ RESSSOURCE_IMG_TEMP = 2 -.equ RESSSOURCE_IMG_HUMIDITY = 3 -.equ RESSSOURCE_IMG_LIGHT = 4 -.equ RESSSOURCE_IMG_WINOPEN = 5 -.equ RESSSOURCE_IMG_WINCLOSED = 6 -.equ RESSSOURCE_IMG_ARROWLEFT = 7 -.equ RESSSOURCE_IMG_ARROWRIGHT = 8 -.equ RESSSOURCE_IMG_ARROWUP = 9 -.equ RESSSOURCE_IMG_ARROWDOWN = 10 -.equ RESSSOURCE_IMG_ARROWBACK = 11 -.equ RESSSOURCE_IMG_CLOUD96 = 12 -.equ RESSSOURCE_IMG_TEMP96 = 13 -.equ RESSSOURCE_IMG_HUMIDITY96 = 14 -.equ RESSSOURCE_FNT_12X16_1 = 15 -.equ RESSSOURCE_FNT_6X8_1 = 16 -.equ RESSSOURCE_TXT_CORRIDOR = 17 -.equ RESSSOURCE_TXT_LIVINGROOM = 18 -.equ RESSSOURCE_TXT_BEDROOM = 19 -.equ RESSSOURCE_TXT_KITCHEN = 20 -.equ RESSSOURCE_TXT_BUERO = 21 -.equ RESSSOURCE_TXT_CHILDRENSROOM = 22 -.equ RESSSOURCE_TXT_STORAGEROOM = 23 -.equ RESSSOURCE_TXT_BATHROOM = 24 -.equ RESSSOURCE_TXT_CELLAR = 25 -.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 -.equ RESSSOURCE_TXT_ROOMCLIMATE = 33 -.equ RESSSOURCE_TXT_AQHOME = 34 -.equ RESSSOURCE_TXT_PACKETSIN = 35 -.equ RESSSOURCE_TXT_PACKETSOUT = 36 -.equ RESSSOURCE_TXT_ECONTENT = 37 -.equ RESSSOURCE_TXT_EMSGSIZE = 38 -.equ RESSSOURCE_TXT_EIO = 39 -.equ RESSSOURCE_TXT_NETSTATS = 40 - +.equ RESSOURCE_IMG_NETWORK = 0 +.equ RESSOURCE_IMG_CLOUD = 1 +.equ RESSOURCE_IMG_TEMP = 2 +.equ RESSOURCE_IMG_HUMIDITY = 3 +.equ RESSOURCE_IMG_LIGHT = 4 +.equ RESSOURCE_IMG_WINOPEN = 5 +.equ RESSOURCE_IMG_WINCLOSED = 6 +.equ RESSOURCE_IMG_ARROWLEFT = 7 +.equ RESSOURCE_IMG_ARROWRIGHT = 8 +.equ RESSOURCE_IMG_ARROWUP = 9 +.equ RESSOURCE_IMG_ARROWDOWN = 10 +.equ RESSOURCE_IMG_ARROWBACK = 11 +.equ RESSOURCE_IMG_CLOUD96 = 12 +.equ RESSOURCE_IMG_TEMP96 = 13 +.equ RESSOURCE_IMG_HUMIDITY96 = 14 +.equ RESSOURCE_FNT_12X16_1 = 15 +.equ RESSOURCE_FNT_6X8_1 = 16 +.equ RESSOURCE_TXT_CORRIDOR = 17 +.equ RESSOURCE_TXT_LIVINGROOM = 18 +.equ RESSOURCE_TXT_BEDROOM = 19 +.equ RESSOURCE_TXT_KITCHEN = 20 +.equ RESSOURCE_TXT_BUERO = 21 +.equ RESSOURCE_TXT_CHILDRENSROOM = 22 +.equ RESSOURCE_TXT_STORAGEROOM = 23 +.equ RESSOURCE_TXT_BATHROOM = 24 +.equ RESSOURCE_TXT_CELLAR = 25 +.equ RESSOURCE_TXT_ATTIC = 26 +.equ RESSOURCE_IMG_RESET = 27 +.equ RESSOURCE_IMG_DEBUGEEPROM = 28 +.equ RESSOURCE_TXT_CO2_S = 29 +.equ RESSOURCE_TXT_TEMP_S = 30 +.equ RESSOURCE_TXT_HUM_S = 31 +.equ RESSOURCE_TXT_UNKNOWN_S = 32 +.equ RESSOURCE_TXT_ROOMCLIMATE = 33 +.equ RESSOURCE_TXT_AQHOME = 34 +.equ RESSOURCE_TXT_PACKETSIN = 35 +.equ RESSOURCE_TXT_PACKETSOUT = 36 +.equ RESSOURCE_TXT_ECONTENT = 37 +.equ RESSOURCE_TXT_EMSGSIZE = 38 +.equ RESSOURCE_TXT_EIO = 39 +.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 + diff --git a/avr/devices/c03/main/w_climate.asm b/avr/devices/c03/main/w_climate.asm index 2a0126d..a4720ef 100644 --- a/avr/devices/c03/main/w_climate.asm +++ b/avr/devices/c03/main/w_climate.asm @@ -60,8 +60,8 @@ ClimateWin_new_ret: ClimateWin_Init: ldi r16, 0 ; OPTS ldi r17, (WIDGET_PACK_FILLED<