Changed the design for mp3 player application.

diff --git a/firm/sample/sample1/os/task_menu.c b/firm/sample/sample1/os/task_menu.c
index eb55355..71ef6fa 100644 (file)
--- a/firm/sample/sample1/os/task_menu.c
+++ b/firm/sample/sample1/os/task_menu.c
@@ -10,9 +10,6 @@
 #define MENU_CMD_SWITCH     's'
 #define MENU_CMD_REMOTE     'i'
 
-#define NIJIMASU_MOVE_DEMO  (1)
-
-int nx = 40, ny = 12;
 int volume = 250;
 
 int menu_file_info(const char *filename, int location)
@@ -64,28 +61,6 @@ int menu_remote_from_isr(char *signal, int siz)
   return 0;
 }
 
-#define NIJIMASU_GO_LEFT() \
-    do { \
-        if (40 < nx) { \
-          nx--; \
-          display_draw_box(nx + 20, ny, nx + 20, ny + 16, 0); \
-          display_draw_logo(nx, ny, 0); \
-          display_led_write(1, 0); \
-          display_led_toggle(0); \
-        } \
-    } while (0)
-
-#define NIJIMASU_GO_RIGHT() \
-    do { \
-        if (nx < 100) { \
-          nx++; \
-          display_draw_box(nx + 20, ny, nx + 20, ny + 16, 0); \
-          display_draw_logo(nx, ny, 0); \
-          display_led_write(0, 0); \
-          display_led_toggle(1); \
-        } \
-    } while (0)
-
 #define LED_LEFT() \
     do { \
       display_led_write(1, 0); \
@@ -103,37 +78,27 @@ static int menu_cmdproc(char *p)
   int cmd = p[0];
   switch (cmd) {
   case MENU_CMD_FILEINFO:
-    putxval(p[1], 2);
-    puts(&p[2]);
-    puts("\n");
+    display_draw_progressbar(5, 20, 121 - 5, 25, 0, 100, p[1]);
+    display_draw_text(24, 2, &p[2]);
     break;
   case MENU_CMD_ROTARY:
     if (p[1]) {
-#if (NIJIMASU_MOVE_DEMO == 1)
-        NIJIMASU_GO_LEFT();
-#else
         LED_LEFT();
-#endif
     }
     if (p[2]) {
-#if (NIJIMASU_MOVE_DEMO == 1)
-        NIJIMASU_GO_RIGHT();
-#else
         LED_RIGHT();
-#endif
     }
     break;
   case MENU_CMD_SWITCH:
     if (p[1]) {
-        puts("1");
+        LED_LEFT();
     }
     if (p[2]) {
-        puts("2");
+        LED_RIGHT();
     }
     if (p[3]) {
-        puts("R");
+        // @todo
     }
-    puts("\n");
     break;
   case MENU_CMD_REMOTE:
     {
@@ -159,18 +124,10 @@ static int menu_cmdproc(char *p)
                 }
                 break;
             case 0xaa5511ee:
-#if (NIJIMASU_MOVE_DEMO == 1)
-                NIJIMASU_GO_LEFT();
-#else
                 LED_LEFT();
-#endif
                 break;
             case 0xaa5510ef:
-#if (NIJIMASU_MOVE_DEMO == 1)
-                NIJIMASU_GO_RIGHT();
-#else
                 LED_RIGHT();
-#endif
                 break;
             default:
                 puts("Unknown: ");
@@ -194,10 +151,8 @@ static int menu_cmdproc(char *p)
 int task_menu(int argc, char *argv[])
 {
   display_clear();
-  display_draw_logo(  0, 0, 2);
   display_draw_box(0, 0, 121, 31, 1);
-  display_draw_text(40, 4, "KOZOS EXPBRD #00");
-  display_draw_logo(nx, ny, 0);
+  display_draw_logo(2, 2, 0);
 
   audio_volume(volume, volume);