Diff: Interface/Interface.cpp

Revision:

13:eb60628db8bf

Parent:

12:009895f6b6e4

Child:

14:42b8a91e463c

--- a/Interface/Interface.cpp	Mon May 11 14:43:16 2020 +0000
+++ b/Interface/Interface.cpp	Thu May 14 16:45:20 2020 +0000
@@ -31,12 +31,16 @@
 
 void Interface::Welcome(N5110 &lcd,Gamepad &pad)
 {
-    lcd.printString("   Welcome!   ",0,1);
-    lcd.printString("   Game by    ",0,2);
-    lcd.printString("   Z. FENG    ",0,3);
-    lcd.refresh();
     while (!pad.start_pressed()) 
     {
+        lcd.clear();
+        lcd.printString("   Welcome!   ",0,1);
+        lcd.printString("   Game by    ",0,2);
+        lcd.printString("   Z. FENG    ",0,3);
+        lcd.setContrast( pad.read_pot1());
+        lcd.drawRect(0,44,int(pad.read_pot1()*WIDTH),2,FILL_BLACK);
+        //printf("WIDTH of contrast = %d, contrast = %f\n",(int)pad.read_pot1()*WIDTH,pad.read_pot1());
+        lcd.refresh();
         pad.leds_on();
         wait(0.1);
         pad.leds_off();
@@ -71,6 +75,7 @@
 void Interface::game_over(N5110 &lcd,Gamepad &pad)
 {
     lcd.clear();
+    pad.init();
     while(!pad.B_pressed()){
         lcd.printString("  Game over   ",0,1);
         lcd.printString("  Press B to  ",0,2);
@@ -101,7 +106,7 @@
 int Interface::count_down(N5110 &lcd,int count_flag)
 {
     char buffer[6];
-    sprintf(buffer,"%d",(int)count_flag/6);
+    sprintf(buffer,"%d",int(count_flag/6));
     lcd.printString(buffer,40,2);
     //printf("count: %d\n",count_flag);
     count_flag--;
@@ -111,6 +116,7 @@
 void Interface::exit(N5110 &lcd,Gamepad &pad)
 {
     lcd.clear();
+    pad.init();
     pad.leds_off();
     while(!pad.B_pressed()){
         lcd.printString(" Press B back ",0,2);
@@ -123,6 +129,7 @@
 void Interface::victory(N5110 &lcd,Gamepad &pad)
 {
     lcd.clear();
+    pad.init();
     while(!pad.B_pressed()){
         lcd.printString("   Victory!  ",0,1);
         lcd.printString(" Press B back ",0,2);