diff --git a/avr/devices/c03/main/a_c03.asm b/avr/devices/c03/main/a_c03.asm index 342d53f..c4a2aee 100644 --- a/avr/devices/c03/main/a_c03.asm +++ b/avr/devices/c03/main/a_c03.asm @@ -97,6 +97,7 @@ C03App_Init: rcall c03AppCreateWinMenu ; (any, !Y) rcall c03AppCreateWinClimate ; (any, !Y) rcall c03AppCreateWinNetStats ; (any, !Y) + rcall c03AppCreateWinDebug ; (any, !Y) rcall c03AppCreateScreenSaver ; (any, !Y) ; enter menu window @@ -157,6 +158,39 @@ c03AppCreateWinClimate_ret: +; --------------------------------------------------------------------------- +; @routine c03AppCreateWinDebug +; +; @param Y ptr to this guiapp +; @clobbers !X + +c03AppCreateWinDebug: + push yl + push yh + push yl + push yh + bigcall LightSettings_new + mov r20, yl + mov r21, yh + pop yh + pop yl + bigcall LightSettingsWin_new + mov xl, yl + mov xh, yh + pop yh + pop yl + brcc c03AppCreateWinDebug_ret + std Y+C03APP_OFFS_WDEBUG_LO, xl + std Y+C03APP_OFFS_WDEBUG_HI, xh + ldi r16, C03APP_SEL_DEBUG + rcall c03AppSetTargetAndSelector + sec +c03AppCreateWinDebug_ret: + ret +; @end + + + ; --------------------------------------------------------------------------- ; @routine c03AppCreateWinNetStats ; @@ -214,6 +248,7 @@ c03AppCreateScreenSaver_ret: ; @routine c03AppSetTargetAndSelector ; ; @param r16 selector +; @param Y pointer to this guiapp ; @param X pointer to new main window to set target/selector to ; @clobbers none diff --git a/avr/devices/c03/main/main.asm b/avr/devices/c03/main/main.asm index 53b4b2e..9c463d3 100644 --- a/avr/devices/c03/main/main.asm +++ b/avr/devices/c03/main/main.asm @@ -506,6 +506,7 @@ Debug_Style: .include "common/multiply.asm" .include "common/itoa.asm" .include "common/ressource.asm" +.include "common/list.asm" .include "style.asm" @@ -527,8 +528,10 @@ GUI_MODULE_BEGIN: .include "modules/lcd2/gui/base/hlayout.asm" .include "modules/lcd2/gui/base/vlayout.asm" .include "modules/lcd2/gui/base/mclayout.asm" +.include "modules/lcd2/gui/base/hspinner.asm" .include "modules/lcd2/gui/base/mainwindow.asm" .include "modules/lcd2/gui/aqhome/sensorwatch.asm" +.include "modules/lcd2/gui/aqhome/lightsettings.asm" .include "modules/lcd2/gui/screensavers/simple.asm" GUI_MODULE_END: .equ MODULE_SIZE_GUI = GUI_MODULE_END-GUI_MODULE_BEGIN @@ -537,7 +540,7 @@ GUI_MODULE_END: .include "w_menu.asm" .include "w_climate.asm" .include "w_netstats.asm" - +.include "w_lightsettings.asm" .include "ressources.inc"