avr: cleanup structure of graphics apps and gui2.

avr/devices/c03/main/g_app.asm

@@ -15,6 +15,9 @@
 ; defines
 
 
+.equ APPC03_SEL_BUTTON_NETWORK = 1
+
+
 
 ; ***************************************************************************
 ; data
@@ -51,10 +54,11 @@ appC03:
   .dw winRoot*2  ; root widget
 
 appC03_signalmap:
-  .db 0, OBJECT_SIGNAL_TIMER,   LOW(GuiApp_OnTimer),       HIGH(GuiApp_OnTimer)
+  .db 0,                         OBJECT_SIGNAL_TIMER,   LOW(GuiApp_OnTimer),          HIGH(GuiApp_OnTimer)
-  .db 0, WIDGET_SIGNAL_TOUCH,   LOW(GuiApp_OnTouch),       HIGH(GuiApp_OnTouch)
+  .db 0,                         WIDGET_SIGNAL_TOUCH,   LOW(GuiApp_OnTouch),          HIGH(GuiApp_OnTouch)
-  .db 0, OBJECT_SIGNAL_RECVMSG, LOW(GuiApp_OnMsgReceived), HIGH(GuiApp_OnMsgReceived)
+  .db 0,                         OBJECT_SIGNAL_RECVMSG, LOW(GuiApp_OnMsgReceived),    HIGH(GuiApp_OnMsgReceived)
-  .db 0, OBJECT_SIGNAL_CREATE,  LOW(GuiApp_OnCreate),      HIGH(GuiApp_OnCreate)
+  .db 0,                         OBJECT_SIGNAL_CREATE,  LOW(GuiApp_OnCreate),         HIGH(GuiApp_OnCreate)
+  .db APPC03_SEL_BUTTON_NETWORK, WIDGET_SIGNAL_CLICKED, LOW(AppC03_OnClickedNetwork), HIGH(AppC03_OnClickedNetwork)
   .db 0, 0, 0, 0           ; end of table
 
 
@@ -88,6 +92,14 @@ testRootWin_signalmap:
 
 
 
+
+
+AppC03_OnClickedNetwork:
+; TODO: select network window
+  ret
+
+
+
 #endif
 
 

avr/devices/c03/main/g_win_climate.asm

@@ -450,10 +450,10 @@ winClimate_signalmap:
         ; OBJECT
         .db 0x55, 0xaa                             ; magic
         .dw 0                                      ; next
-        .dw winClimateBody*2                ; parent
+        .dw winClimateBody*2                       ; parent
         .dw 0                                      ; first child
-        .dw winClimateBody*2                ; target
+        .dw appC03*2                               ; target
-        .dw 0                                      ; selector (ony lower 8 bits used)
+        .dw APPC03_SEL_BUTTON_NETWORK              ; selector (ony lower 8 bits used)
         .dw buttonNetwork_signalmap*2              ; signal map
         ; WIDGET
         .db (1<<WIDGET_OPTSLO_INPUT_BIT) | (1<<WIDGET_OPTSLO_BORDER_BIT), 0 ; opts lo, hi

avr/devices/c03/main/main.asm

@@ -307,15 +307,15 @@ test:
 
 .include "style.asm"
 
-.include "modules/lcd2/gui2/object.asm"
+.include "modules/lcd2/gui2/generic/object.asm"
-.include "modules/lcd2/gui2/widget.asm"
+.include "modules/lcd2/gui2/generic/widget.asm"
-.include "modules/lcd2/gui2/rootwidget.asm"
+.include "modules/lcd2/gui2/generic/rootwidget.asm"
-.include "modules/lcd2/gui2/label.asm"
+.include "modules/lcd2/gui2/generic/label.asm"
-.include "modules/lcd2/gui2/button.asm"
+.include "modules/lcd2/gui2/generic/button.asm"
-.include "modules/lcd2/gui2/imageview.asm"
+.include "modules/lcd2/gui2/generic/imageview.asm"
+.include "modules/lcd2/gui2/generic/valuelabel.asm"
+.include "modules/lcd2/gui2/generic/guiapp.asm"
 .include "modules/lcd2/gui2/sensorwatch.asm"
-.include "modules/lcd2/gui2/valuelabel.asm"
-.include "modules/lcd2/gui2/guiapp.asm"
 
 .include "g_app.asm"
 .include "g_win_climate.asm"

avr/devices/n28/.gitignore

@@ -1,2 +1,3 @@
 *.eep.hex
 *.obj
+n28-enclosure.stl

avr/modules/0BUILD

@@ -13,6 +13,7 @@
     ds18b20
     flash
     lcd
+    lcd2
     led
     led_activity
     led_simple

avr/modules/lcd2/0BUILD

@@ -4,7 +4,7 @@
 
   <subdirs>
     font
-    gui
+    gui2
     ili9341
     xpt2046
   </subdirs>

avr/modules/lcd2/gui2/0BUILD

@@ -3,6 +3,7 @@
 <gwbuild>
 
   <extradist>
+    sensorwatch.asm
   </extradist>
 
 </gwbuild>

avr/modules/lcd2/gui2/generic/0BUILD

@@ -0,0 +1,18 @@
+<?xml?>
+
+<gwbuild>
+
+  <extradist>
+    button.asm
+    guiapp.asm
+    imageview.asm
+    label.asm
+    object.asm
+    rootwidget.asm
+    valuelabel.asm
+    widget.asm
+  </extradist>
+
+</gwbuild>
+
+