c03, gui2: new GUI now basically works.

avr/modules/lcd2/gui2/base/button.asm

@@ -87,6 +87,11 @@ Button_Init:
   
   ; setup button data
   std Y+BUTTON_OFFS_MODE, r20
+
+  ; set input opts
+  ldd r16, Y+OBJECT_OFFS_OPTS
+  sbr r16, (1<<WIDGET_OPTS_INPUT_BIT)
+  std Y+OBJECT_OFFS_OPTS, r16
   
   ; set default signal map
   ldi r16, LOW(Button_DefaultSignalmap*2)

avr/modules/lcd2/gui2/base/mlayout.asm

@@ -56,8 +56,8 @@
 
 
 ; values for MLAYOUT_OFFS_MODE
-.equ HLAYOUT_MODE_COLUMNS   = 0
-.equ HLAYOUT_MODE_ROWS      = 1
+.equ MLAYOUT_MODE_COLUMNS   = 0
+.equ MLAYOUT_MODE_ROWS      = 1
 
 
 
@@ -145,7 +145,7 @@ MLayout_OnLayout:
   brcc MLayout_OnLayout_ret             ; none, done here
 
   ldd r16, Y+MLAYOUT_OFFS_MODE
-  cpi r16, HLAYOUT_MODE_COLUMNS
+  cpi r16, MLAYOUT_MODE_COLUMNS
   breq MLayout_OnLayout_columns
   rjmp MLayout_OnLayout_ret
 MLayout_OnLayout_columns:
@@ -166,7 +166,7 @@ MLayout_OnGetDefaultWidth:
   brcc MLayout_OnGetDefaultWidth_ret           ; none, done here
 
   ldd r16, Y+MLAYOUT_OFFS_MODE
-  cpi r16, HLAYOUT_MODE_COLUMNS
+  cpi r16, MLAYOUT_MODE_COLUMNS
   breq MLayout_OnGetDefaultWidth_columns
   rjmp MLayout_OnLayout_ret
 MLayout_OnGetDefaultWidth_columns:
@@ -188,7 +188,7 @@ MLayout_OnGetDefaultHeight:
   brcc MLayout_OnGetDefaultHeight_ret           ; none, done here
 
   ldd r16, Y+MLAYOUT_OFFS_MODE
-  cpi r16, HLAYOUT_MODE_COLUMNS
+  cpi r16, MLAYOUT_MODE_COLUMNS
   breq MLayout_OnGetDefaultHeight_columns
   rjmp MLayout_OnLayout_ret
 MLayout_OnGetDefaultHeight_columns:

avr/modules/lcd2/gui2/base/object.asm

@@ -88,6 +88,8 @@
 ; ---------------------------------------------------------------------------
 ; @routine Object_Alloc @global
 ;
+; Allocate memory and preset it with zeroes.
+;
 ; @return CFLAG set if object created, cleared otherwise
 ; @return Y address of created object in SDRAM (if CFLAG set)
 ; @param r25:r24 size of object to allocate