Yu Jun Qin / Mbed 2 deprecated ECE_4180_Final_No_Songs

Tested

Dependencies:   mbed wave_player mbed-rtos C12832_lcd 4DGL-uLCD-SE LCD_fonts SDFileSystem

Files at this revision

API Documentation at this revision

Revision 2:765774781bb1, committed 2019-12-03

Comitter:
yqin70
Date:
Tue Dec 03 22:57:12 2019 +0000
Parent:
1:a1aa9a79070a
Commit message:
v3

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/main.cpp	Tue Dec 03 22:42:46 2019 +0000
+++ b/main.cpp	Tue Dec 03 22:57:12 2019 +0000
@@ -112,20 +112,22 @@
         if (homescreen){
             lcd_mutex.lock();
             uLCD.cls();
-            uLCD.text_height(1.8);
-            uLCD.text_width(1.8);
+            uLCD.text_height(1.9);
+            uLCD.text_width(1.9);
             uLCD.color(WHITE);
             uLCD.locate(0,0);
             uLCD.printf("Pick a song");
-            uLCD.text_height(2);
-            uLCD.text_width(2);
+            uLCD.text_height(1.9);
+            uLCD.text_width(1.9);
             uLCD.locate(1,2);
             uLCD.printf("Song1");
             uLCD.locate(1,4);
             uLCD.printf("Song2");
             uLCD.locate(1,6);
             uLCD.printf("Song3");
-            uLCD.rectangle(5, songnum*30, 100, songnum*30+25 ,GREEN);
+            uLCD.locate(1,8);
+            uLCD.printf("Song4");
+            uLCD.rectangle(5, songnum*16-2, 100, songnum*16+8 ,GREEN);
             lcd_mutex.unlock();
             
                 }
@@ -142,7 +144,7 @@
             if ((joy_pot <= (1.4/3.3)) && songnum>1) {
                 songnum--;
                 } 
-            else if ((joy_pot >= (1.8/3.3)) && songnum<3){
+            else if ((joy_pot >= (1.8/3.3)) && songnum<4){
                 songnum++;
                 }
             }