Diff: main.cpp

Revision:

15:75a121b14e5d

Parent:

14:d8a6134cafa3

Child:

16:4b4e6cf66e7c

--- a/main.cpp	Thu Dec 08 23:10:41 2016 +0000
+++ b/main.cpp	Thu Dec 08 23:40:59 2016 +0000
@@ -213,6 +213,7 @@
                     break;
                 case 2:
                     //uLCD.cls();
+                    uLCD.text_mode(TRANSPARENT);
                     uLCD.locate(0,2);
                     uLCD.printf("                ");
                     uLCD.locate(0,3);
@@ -221,6 +222,14 @@
                     uLCD.printf("%02dhrs %02dminutes", hoursToNextClass, minutesToNextClass);
                     uLCD.locate(0, 5);
                     uLCD.printf("%02dseconds", secondsToNextClass);
+                    uLCD.locate(0,7);
+                    uLCD.printf("ETA: (min)");
+                    uLCD.locate(0,8);
+                    uLCD.printf("%f",eta);
+                    uLCD.locate(0,10);
+                    uLCD.printf("Displacement:");
+                    uLCD.locate(0,11);
+                    uLCD.printf("%f",dis);
                     uLCD.locate(0, 0);
                     uLCD.printf("Next class        ");
                     if (nextClass != currClass) {
@@ -285,6 +294,7 @@
 
 void displayCourseVec()
 {
+    uLCD.text_mode(TRANSPARENT);
     if (courseVec.size() == 0) {
         uLCD.cls();
         uLCD.locate(0,0);
@@ -417,9 +427,9 @@
 }
 float calc_eta(float displacement, float speed)
 {
-    float eta = displacement/speed; // for displacement. take average speed // convert to minutes later
-    eta = eta+ 0.25*eta; //adding delay for distance vs displacement and traffic lights
-    return eta;
+    float estTimeArr = displacement/speed; // for displacement. take average speed // convert to minutes later
+    estTimeArr = estTimeArr+ 0.25*estTimeArr; //adding delay for distance vs displacement and traffic lights
+    return estTimeArr;
 }
 
 float longToDecimal(float longitudeInDDMM, char eastOrWest)