supplied memcpy and memset now (gcc built-in functions)

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

diff --git a/betty/betty.c b/betty/betty.c
index e5923e9..093232b 100644 (file)
--- a/betty/betty.c
+++ b/betty/betty.c
@@ -14,16 +14,35 @@
 
 #define cc1100_init    spi1_init(8,SPI_MASTER,8)
 
+void display_string_page(u8 x,u8 p,u8 *s,u8 f,u8 o,u8 sp) {
+
+       while(*(s)) {
+               if(x==DISPLAY_DIMX) {
+                       p+=1;
+                       x=o;
+               }
+               display_font_page(x,p,(u8 *)default_font+(*(s)<<3),f);
+               x+=sp;
+               s++;
+       }
+}
+
+/*
+ * global variables
+ */
+
+const char announce[]="betty - live from flash at 0x80000000! ;)\r\n";
+const char d1_txt[]="betty";
+const char d2_txt[]="- alphablend -";
+
 /*
  * main function
  */
 
 int main() {
 
-       char announce[]="betty - live from flash at 0x80000000! ;)\r\n";
        t_button button;
        u8 contrast;
-       int cnt;
 
        /* system init */
        pll_init();
@@ -47,9 +66,6 @@ int main() {
         * start it ...
         */
 
-       /* pause - seems to not work if running from flash! (?) */
-       pause(0xffffff);
-
        /* display init */
        display_bl_toggle();
        display_init();
@@ -58,7 +74,7 @@ int main() {
        /* pasue again */
 
        /* announce */
-       uart0_send_string(announce);
+       uart0_send_string((char *)announce);
 
        
        while(1) {
@@ -66,10 +82,10 @@ int main() {
 
                /* button test! */
                if(button_get_event(&button)) {
-                       uart0_send_string(announce);
+                       //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)
@@ -81,6 +97,45 @@ 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_rectangle_page(4,2,60,5,DISPLAY_FILL_B,0xff);
+                                       break;
+                               case BUTTON_2:
+                                       display_rectangle_page(40,5,50,5,DISPLAY_FILL_LG,0x7f);
+                                       break;
+                               case BUTTON_3:
+                                       break;
+                               case BUTTON_4:
+                                       display_font_page(42,18,(u8 *)default_font+(0x34<<3),DISPLAY_FILL_B);
+                                       break;
+                               case BUTTON_5:
+                                       display_font_page(50,18,(u8 *)default_font+(0x35<<3),DISPLAY_FILL_DG);
+                                       break;
+                               case BUTTON_6:
+                                       display_font_page(58,18,(u8 *)default_font+(0x36<<3),DISPLAY_FILL_W);
+                                       break;
+                               case BUTTON_7:
+                                       break;
+                               case BUTTON_8:
+                                       break;
+                               case BUTTON_BETTY:
+                                       display_string_page(50,13,(u8 *)d1_txt,DISPLAY_FILL_B,0,8);
+                                       break;
+                               case BUTTON_EXIT:
+                                       display_string_page(10,8,(u8 *)d2_txt,DISPLAY_FILL_B,0,8);
+                                       break;
                                default:
                                        display_clear_screen();
                                        break;