Diff: Interface/Interface.cpp

Revision:

18:93d050e7705d

Parent:

17:ba4d9cd1e347

Child:

19:5083339b55e8

--- a/Interface/Interface.cpp	Mon May 18 15:30:54 2020 +0000
+++ b/Interface/Interface.cpp	Thu May 21 15:20:33 2020 +0000
@@ -64,17 +64,18 @@
     {
         lcd.clear();
         lcd.printString("     MENU",0,0);
-        lcd.printString("        Start",0,2);
-        lcd.printString("   Start(Hell)",0,3);
-        lcd.printString("  user-defined",0,4);
+        lcd.printString("        Start",0,1);
+        lcd.printString("   Start(Hell)",0,2);
+        lcd.printString("  user-defined",0,3);
+        lcd.printString("   Instruction",0,4);
         lcd.printString("         Exit",0,5);
         _d = pad.get_direction();
         if(_d == N||_d ==NE||_d==NW){
-            option_flag = fsm_4[option_flag].next_state[0];
+            option_flag = fsm_5[option_flag].next_state[0];
         } else if(_d == S||_d==SE||_d==SW){
-            option_flag = fsm_4[option_flag].next_state[1];
+            option_flag = fsm_5[option_flag].next_state[1];
         }
-        lcd.drawSprite(0,8*option_flag+18,3,2,(int*)pointer); 
+        lcd.drawSprite(0,8*option_flag+10,3,2,(int*)pointer); 
         lcd.refresh();
         pad.leds_on();   
         wait(0.25);
@@ -92,7 +93,7 @@
     while (!pad.A_pressed())
     {
         lcd.clear();
-        lcd.printString(" shots/frames",0,0);
+        lcd.printString("  shots/frames",0,0);
         lcd.printString("       0.3",0,1);
         lcd.printString("       0.4",0,2);
         lcd.printString("       0.5",0,3);
@@ -104,10 +105,10 @@
         } else if(_d == S||_d==SE||_d==SW){
             option_flag = fsm_5[option_flag].next_state[1];
         }
-        lcd.drawSprite(10,8*option_flag+10,3,2,(int*)pointer); 
+        lcd.drawSprite(20,8*option_flag+10,3,2,(int*)pointer); 
         lcd.refresh();
         pad.leds_on();   
-        wait(0.2);
+        wait(0.25);
     }
     return option_flag;
 }
@@ -119,7 +120,7 @@
     while (!pad.A_pressed())
     {
         lcd.clear();
-        lcd.printString(" shots/frames",0,0);
+        lcd.printString("   Max.shots",0,0);
         lcd.printString("       15",0,1);
         lcd.printString("       20",0,2);
         lcd.printString("       25",0,3);
@@ -131,10 +132,10 @@
         } else if(_d == S||_d==SE||_d==SW){
             option_flag = fsm_5[option_flag].next_state[1];
         }
-        lcd.drawSprite(10,8*option_flag+10,3,2,(int*)pointer); 
+        lcd.drawSprite(20,8*option_flag+10,3,2,(int*)pointer); 
         lcd.refresh();
         pad.leds_on();   
-        wait(0.2);
+        wait(0.25);
     }
     _sound.begin_sound(pad);
     return option_flag;