basical alpha blending working (modulo minor pits)

[my-code/arm.git] / betty / betty.c

diff --git a/betty/betty.c b/betty/betty.c
index c2aaa38..8d7ce84 100644 (file)
--- a/betty/betty.c
+++ b/betty/betty.c
@@ -46,13 +46,10 @@ int main() {
         * start it ...
         */
 
-       /* pause - seems to not work if running from flash! (?) */
-       pause(0xffffff);
-
        /* display init */
        display_bl_toggle();
        display_init();
-       contrast=0x32;
+       contrast=0x38;
 
        /* pasue again */
 
@@ -66,10 +63,9 @@ int main() {
                /* button test! */
                if(button_get_event(&button)) {
                        //uart0_send_string(announce);
-                       uart0_send_byte(contrast);
                        switch(button.key[0]) {
                                case BUTTON_POWER:
-                                       display_load_logo(0);
+                                       display_logo((u8 *)default_logo);
                                        break;
                                case BUTTON_DOWN:
                                        if(contrast>0x00)
@@ -96,12 +92,45 @@ int main() {
                                case BUTTON_1:
                                        display_draw_rectangle(20,20,40,40,
                                                               DISPLAY_FILL_B,
-                                                              0);
+                                                              0xff);
                                        break;
                                case BUTTON_2:
                                        display_draw_rectangle(50,50,40,40,
                                                               DISPLAY_FILL_LG,
-                                                              0);
+                                                              0x7f);
+                                       break;
+                               case BUTTON_3:
+                                       display_draw_font(70,70,
+                                                         (u8 *)default_font+(0x33<<3),
+                                                              DISPLAY_FILL_LG,
+                                                              0xff);
+                                       break;
+                               case BUTTON_4:
+                                       display_font_page(23,19,(u8 *)default_font+(0x34<<3),DISPLAY_FILL_B);
+                                       break;
+                               case BUTTON_5:
+                                       display_font_page(10,19,(u8 *)default_font+(0x35<<3),DISPLAY_FILL_DG);
+                                       break;
+                               case BUTTON_6:
+                                       display_font_page(2,19,(u8 *)default_font+(0x36<<3),DISPLAY_FILL_LG);
+                                       break;
+                               case BUTTON_7:
+                                       display_draw_rectangle(2,2,4,4,
+                                                              DISPLAY_FILL_B,
+                                                              0xff);
+                                       break;
+                               case BUTTON_8:
+                                       display_draw_rectangle(8,8,4,4,
+                                                              DISPLAY_FILL_DG,
+                                                              0xff);
+                                       break;
+                               case BUTTON_BETTY:
+                                       display_rectangle_page(80,15,16,2,DISPLAY_FILL_B,0x7f);
+                                       uart0_send_byte('b');
+                                       break;
+                               case BUTTON_EXIT:
+                                       display_rectangle_page(90,16,16,2,DISPLAY_FILL_LG,0x7f);
+                                       uart0_send_byte('e');
                                        break;
                                default:
                                        display_clear_screen();