Update to work with latest mBed

Dependencies:   mbed-dev

Fork of FONA_CellPhone by Dream Team

Files at this revision

API Documentation at this revision

Comitter:
George windoge T
Date:
Fri Mar 11 02:55:42 2016 -0500
Parent:
7:7f116e2a184b
Child:
9:06eca688f2a3
Child:
11:eb8938e62739
Commit message:
GT: added radio functionality except volume

Changed in this revision

main_withULCD.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/main_withULCD.cpp	Fri Mar 11 02:40:06 2016 -0500
+++ b/main_withULCD.cpp	Fri Mar 11 02:55:42 2016 -0500
@@ -121,26 +121,32 @@
             }
             case radio_TUNE: {
                 myTopMenu = radio_VOLUME;
-                //uLCD.cls();
+                uLCD.cls();
                 //printTopLine();
                 //uLCD.locate(0,3);
                 //uLCD.printf("RADIO\n->VOLUME");
+                uLCD.locate(0,3);
+                uLCD.printf("RADIO\n->VOLUME");
                 break;
             }
             case radio_OFF: {
                 myTopMenu = radio_TUNE;
-                //uLCD.cls();
+                uLCD.cls();
                 //printTopLine();
                 //uLCD.locate(0,3);
                 //uLCD.printf("RADIO\n->TUNE");
+                uLCD.locate(0,3);
+                uLCD.printf("RADIO\n->TUNE");
                 break;
             }
             case radio_VOLUME: {
                 myTopMenu = radio_OFF;
-                //uLCD.cls();
+                uLCD.cls();
                 //printTopLine();
                 //uLCD.locate(0,3);
                 //uLCD.printf("RADIO\n->OFF");
+                uLCD.locate(0,3);
+                uLCD.printf("RADIO\n->OFF");
                 break;
             }
         }
@@ -158,20 +164,20 @@
                 led3=!led3;
                 break;
             }
-            case RADIO: 
+            case RADIO: {
                 myTopMenu = radio_TUNE;
                 break;
                 //led4=!led4;
             }
             case radio_TUNE: {
-                uLCD.cls();
+                //uLCD.cls();
                 //printTopLine()
                 myTopMenu = EXECUTE_TUNE;
                 break;
                 //led4=!led4;
             }
             case radio_OFF: {
-                uLCD.cls();
+                //uLCD.cls();
                 //printTopLine();
                 myTopMenu = EXECUTE_radio_OFF;
                 break;
@@ -207,20 +213,26 @@
             }
             case radio_TUNE: {
                 myTopMenu = radio_OFF;
-                //uLCD.cls();
+                uLCD.cls();
                 //printTopLine();
+                uLCD.locate(0,3);
+                uLCD.printf("RADIO\n->OFF");
                 break;
             }
             case radio_OFF: {
                 myTopMenu = radio_VOLUME;
-                //uLCD.cls();
+                uLCD.cls();
                 //printTopLine();
+                uLCD.locate(0,3);
+                uLCD.printf("RADIO\n->VOLUME");
                 break;
             }
             case radio_VOLUME: {
                 myTopMenu = radio_TUNE;
-                //uLCD.cls();
+                uLCD.cls();
                 //printTopLine();
+                uLCD.locate(0,3);
+                uLCD.printf("RADIO\n->TUNE");
                 break;
             }
         }
@@ -328,10 +340,7 @@
             }
             case radio_TUNE: {
                 if (printFirst){
-                    uLCD.cls();
                     printTopLine();
-                    uLCD.locate(0,3);
-                    uLCD.printf("RADIO\n->TUNE");
                     printFirst = false;
                     wait(.5);
                 }
@@ -339,20 +348,14 @@
             }
             case radio_OFF: {
                 if (printFirst){
-                    uLCD.cls();
                     printTopLine();
-                    uLCD.locate(0,3);
-                    uLCD.printf("RADIO\n->OFF");
                     printFirst = false;
                 }
                 break;
             }
             case radio_VOLUME: {
                 if (printFirst){
-                    uLCD.cls();
                     printTopLine();
-                    uLCD.locate(0,3);
-                    uLCD.printf("RADIO\n->VOLUME");
                     printFirst = false;
                 }
                 break;