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 427d32b..8d7ce84 100644 (file)
--- a/betty/betty.c
+++ b/betty/betty.c
@@ -58,11 +58,11 @@ int main() {
 
        
        while(1) {
-               pause(0x05ffff);
+               pause(0x0fffff);
 
                /* button test! */
                if(button_get_event(&button)) {
-                       uart0_send_string(announce);
+                       //uart0_send_string(announce);
                        switch(button.key[0]) {
                                case BUTTON_POWER:
                                        display_logo((u8 *)default_logo);
@@ -101,10 +101,37 @@ int main() {
                                        break;
                                case BUTTON_3:
                                        display_draw_font(70,70,
-                                                         (u8 *)default_font+(0x33>>3),
+                                                         (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();
                                        break;