pause values somehow reasonable for flash and ram usage

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

diff --git a/betty/betty.c b/betty/betty.c
index ed42475..427d32b 100644 (file)
--- a/betty/betty.c
+++ b/betty/betty.c
@@ -23,7 +23,6 @@ int main() {
        char announce[]="betty - live from flash at 0x80000000! ;)\r\n";
        t_button button;
        u8 contrast;
-       int cnt;
 
        /* system init */
        pll_init();
@@ -47,10 +46,8 @@ int main() {
         * start it ...
         */
 
-       /* pause - seems to not work if running from flash! (?) */
-       pause(0xffffff);
-
        /* display init */
+       display_bl_toggle();
        display_init();
        contrast=0x38;
 
@@ -61,14 +58,14 @@ int main() {
 
        
        while(1) {
-               pause(0x0fffff);
+               pause(0x05ffff);
 
                /* button test! */
                if(button_get_event(&button)) {
                        uart0_send_string(announce);
                        switch(button.key[0]) {
                                case BUTTON_POWER:
-                                       display_load_logo(0);
+                                       display_logo((u8 *)default_logo);
                                        break;
                                case BUTTON_DOWN:
                                        if(contrast>0x00)
@@ -80,11 +77,36 @@ int main() {
                                                contrast+=1;
                                        DISPLAY_SET_CONTRAST(contrast);
                                        break;
+                               case BUTTON_A:
+                                       display_fill_screen(DISPLAY_FILL_W);
+                                       break;
+                               case BUTTON_B:
+                                       display_fill_screen(DISPLAY_FILL_LG);
+                                       break;
+                               case BUTTON_C:
+                                       display_fill_screen(DISPLAY_FILL_DG);
+                                       break;
+                               case BUTTON_D:
+                                       display_fill_screen(DISPLAY_FILL_B);
+                                       break;
+                               case BUTTON_1:
+                                       display_draw_rectangle(20,20,40,40,
+                                                              DISPLAY_FILL_B,
+                                                              0xff);
+                                       break;
+                               case BUTTON_2:
+                                       display_draw_rectangle(50,50,40,40,
+                                                              DISPLAY_FILL_LG,
+                                                              0x7f);
+                                       break;
+                               case BUTTON_3:
+                                       display_draw_font(70,70,
+                                                         (u8 *)default_font+(0x33>>3),
+                                                              DISPLAY_FILL_LG,
+                                                              0xff);
+                                       break;
                                default:
-                                       DISPLAY_SET_C_ADDR(0);
-                                       DISPLAY_SET_PAGE_ADDR(0);
-                                       for(cnt=0;cnt<DISPLAY_RAM_CONTENT;cnt++)
-                                               DISPLAY_DATA=button.key[0];
+                                       display_clear_screen();
                                        break;
                        }
                }