2.0.9 Basic Surface screen

kornel-schrenk · kornel-schrenk · commit e7c86a509772 · 2020-08-27T11:46:25.000+02:00
diff --git a/DiveIno/include/screens/DiveInoScreen.h b/DiveIno/include/screens/DiveInoScreen.h
@@ -1,6 +1,7 @@
 #ifndef DiveInoScreen_h
 #define DiveInoScreen_h
 
+#define STAY_ON_SCREEN    456
 #define SCREEN_HOME       310
 #define SCREEN_DIVE       320
 #define SCREEN_GAUGE      330
diff --git a/DiveIno/include/screens/DiveScreen.h b/DiveIno/include/screens/DiveScreen.h
@@ -25,7 +25,7 @@ class DiveScreen : public DiveInoScreen {
         
         void init(DiveInoSettings diveInoSettings, PressureSensorData sensorData, bool replayEnabled, bool emulatorEnabled);
 
-        void display(PressureSensorData sensorData);
+        int display(PressureSensorData sensorData);
 
         void displayStopwatch();
         void displayZeroTime();
@@ -37,6 +37,8 @@ class DiveScreen : public DiveInoScreen {
         
         bool isRunning();
 
+        DiveResult* getDiveResult();
+
         void handleButtonPress(String buttonName);
 
     private:        
@@ -49,7 +51,7 @@ class DiveScreen : public DiveInoScreen {
         bool _replayEnabled = false;
 
         unsigned long _previousDiveDurationInSeconds = 0;
-        void _replayDive();
+        bool _replayDive();
 
         bool _isStopWatchRunning = false;
         unsigned long _stopwatchStartTimestamp;
@@ -73,6 +75,7 @@ class DiveScreen : public DiveInoScreen {
 
         void _clearDecoDisplay();
         DiveInfo _currentDiveInfo;
+        DiveResult* _diveResult = NULL;
         void startDive();
         void _diveProgress(float temperatureInCelsius, float pressureInMillibar, float depthInMeter, unsigned int durationInSeconds);
         void stopDive();
diff --git a/DiveIno/include/screens/HomeScreen.h b/DiveIno/include/screens/HomeScreen.h
@@ -19,7 +19,7 @@ class HomeScreen : public DiveInoScreen {
         void updateDate();
         void updateAmPm();
 
-        void handleButtonPress(String buttonName);
+        int handleButtonPress(String buttonName);
 
     private:
         bool _isMinimalModeActive = false;
diff --git a/DiveIno/include/screens/SurfaceScreen.h b/DiveIno/include/screens/SurfaceScreen.h
@@ -6,15 +6,17 @@
 #include "ezTime.h"
 
 #include "screens/DiveInoScreen.h"
+#include "deco/Buhlmann.h"
 
 class SurfaceScreen : public DiveInoScreen {
 
     public:
-        void init(DiveInoSettings diveInoSettings);
-        
+        void init(DiveInoSettings diveInoSettings, DiveResult* diveResult);
         void handleButtonPress(String buttonName);
-
     private:
+         DiveResult* _diveResult;
+         DiveInoSettings _diveInoSettings;
+         void _display();
 };
 
 #endif
diff --git a/DiveIno/src/main.cpp b/DiveIno/src/main.cpp
@@ -24,7 +24,7 @@
 
 #include "deco/Buhlmann.h"
 
-const String VERSION_NUMBER = "2.0.8";
+const String VERSION_NUMBER = "2.0.9";
 
 struct PressureSensorData _sensorData;
 
@@ -66,6 +66,25 @@ MainMenu mainMenuScreen = MainMenu();
 
 SettingsPicker settingsPicker;
 
+/////////////////////
+// Utility methods //
+/////////////////////
+
+void openDiveScreen()
+{
+  _backToMenu = false;
+  _currentScreen = SCREEN_DIVE;
+  diveScreen.init(settingsUtils.getDiveInoSettings(), _sensorData, serialApi.isReplayEnabled(), serialApi.isEmulatorEnabled());
+  serialApi.reset();
+}
+
+void openSurfaceScreen()
+{
+  _backToMenu = false;
+  _currentScreen = SCREEN_SURFACE;
+  surfaceScreen.init(settingsUtils.getDiveInoSettings(), diveScreen.getDiveResult());  
+}
+
 ///////////////////////
 // Lifecycle methods //
 ///////////////////////
@@ -126,10 +145,7 @@ void loop()
       homeScreen.initHomeScreen(settingsUtils.getDiveInoSettings());
       break;
     case 1:
-      _backToMenu = false;
-      _currentScreen = SCREEN_DIVE; 
-      diveScreen.init(settingsUtils.getDiveInoSettings(), _sensorData, serialApi.isReplayEnabled(), serialApi.isEmulatorEnabled());    
-      serialApi.reset();
+      openDiveScreen();
       break;
     case 2:
       _backToMenu = false;
@@ -143,9 +159,7 @@ void loop()
       logbookScreen.init(settingsUtils.getDiveInoSettings());
       break;
     case 4:
-      _backToMenu = false;
-      _currentScreen = SCREEN_SURFACE;
-      surfaceScreen.init(settingsUtils.getDiveInoSettings());
+      openSurfaceScreen();
       break;
     case 5:
       settingsPicker.runOnce("Settings");
@@ -164,8 +178,10 @@ void loop()
     //Handle button press on the current screen
     switch (_currentScreen)
     {
-    case SCREEN_HOME:
-      homeScreen.handleButtonPress(buttonPressed);
+    case SCREEN_HOME:      
+      if (homeScreen.handleButtonPress(buttonPressed) == SCREEN_DIVE) {
+        openDiveScreen();
+      }
       break;
     case SCREEN_DIVE:
       diveScreen.handleButtonPress(buttonPressed);
@@ -197,11 +213,12 @@ void loop()
     case SCREEN_DIVE:
       if (minuteChanged())
       {
-        diveScreen.refreshClockWidget();
-        diveScreen.display(_sensorData);
+        diveScreen.refreshClockWidget();        
       }
-      if (secondChanged()) {
-        diveScreen.display(_sensorData);
+      if (minuteChanged() || secondChanged()) {
+        if (diveScreen.display(_sensorData) == SCREEN_SURFACE) {
+          openSurfaceScreen();
+        }
       }
       break;
     case SCREEN_GAUGE:
diff --git a/DiveIno/src/screens/DiveScreen.cpp b/DiveIno/src/screens/DiveScreen.cpp
@@ -59,7 +59,7 @@ void DiveScreen::_drawCurrentDepth(float depthInMeter)
     ez.canvas.color(ez.theme->foreground);
     ez.canvas.font(numonly7seg48);
 
-    ez.canvas.pos(210, 150);
+    ez.canvas.pos(200, 150);
     
     if (depthInMeter < 10) {
         ez.canvas.color(ez.theme->background);
@@ -382,7 +382,7 @@ void DiveScreen::stopDive()
 
     Serial.println(F("DIVE - Finished"));
 
-    DiveResult* diveResult = _buhlmann->stopDive(ez.clock.tz.now());
+    this->_diveResult = _buhlmann->stopDive(ez.clock.tz.now());
 
     //TODO Navigate to the surface display screen
 }
@@ -391,14 +391,22 @@ void DiveScreen::_diveProgress(float temperatureInCelsius, float pressureInMilli
 	_currentDiveInfo = _buhlmann->progressDive(pressureInMillibar, durationInSeconds);
 }
 
+ DiveResult* DiveScreen::getDiveResult()
+ {
+     return _diveResult;
+ }
+
 /////////////
 // Display //
 /////////////
 
-void DiveScreen::display(PressureSensorData sensorData)
+int DiveScreen::display(PressureSensorData sensorData)
 {
     if (_replayEnabled) {
-        _replayDive();
+        if (_replayDive()) {
+            //Once the dive was completed open the Surface Screen
+            return SCREEN_SURFACE;
+        }
     } else {
         if (minuteChanged())
         {
@@ -418,9 +426,10 @@ void DiveScreen::display(PressureSensorData sensorData)
         _drawCurrentDepth(currentDepthInMeter);
         _drawDiveIndicator();
     }
+    return STAY_ON_SCREEN;
 }
 
-void DiveScreen::_replayDive()
+bool DiveScreen::_replayDive()
 {
 	// Check if test data is available, which comes through the serial interface
 	if (Serial.available() > 0) {
@@ -481,8 +490,10 @@ void DiveScreen::_replayDive()
             _diveProgress(temperatureInCelsius, pressureInMillibar, depthInMeter, diveDurationInSeconds);            
             this->stopDive();
             _replayEnabled = false;
+            return true; 
         }
     }
+    return false;
 }
 
 /////////////
diff --git a/DiveIno/src/screens/GaugeScreen.cpp b/DiveIno/src/screens/GaugeScreen.cpp
@@ -59,8 +59,19 @@ void GaugeScreen::_drawCurrentDepth(float depthInMeter)
     ez.canvas.color(ez.theme->foreground);
     ez.canvas.font(numonly7seg48);
 
-    ez.canvas.pos(210, 150);
-    ez.canvas.print(depthInMeter, 1);
+    ez.canvas.pos(200, 150);
+    
+    if (depthInMeter < 10) {
+        ez.canvas.color(ez.theme->background);
+        ez.canvas.print("0");    
+        ez.canvas.color(ez.theme->foreground);
+        ez.canvas.print(zeropad((int)depthInMeter, 1));
+    } else {
+        ez.canvas.print(zeropad((int)depthInMeter, 2));
+    }
+
+    ez.canvas.print(".");
+    ez.canvas.print(zeropad((int)(depthInMeter*10) % 10, 1));
 }
 
 void GaugeScreen::_drawMaximumDepth(float depthInMeter)
diff --git a/DiveIno/src/screens/HomeScreen.cpp b/DiveIno/src/screens/HomeScreen.cpp
@@ -41,7 +41,7 @@ void HomeScreen::updateAmPm()
 
 void HomeScreen::initHomeScreen(DiveInoSettings diveInoSettings) 
 { 
-  _diveInoSettings = diveInoSettings;
+  _diveInoSettings = diveInoSettings;  
 
   ez.screen.clear();
   ez.header.show("DiveIno");
@@ -112,7 +112,7 @@ void HomeScreen::displayHomeClock()
   }
 }
 
-void HomeScreen::handleButtonPress(String buttonName)
+int HomeScreen::handleButtonPress(String buttonName)
 {
   if (buttonName == "Update")
   {
@@ -127,7 +127,8 @@ void HomeScreen::handleButtonPress(String buttonName)
     initHomeScreen(_diveInoSettings);
   }
   else if (buttonName == "Dive")
-  {
-    //TODO Show Dive Screen
+  {    
+    return SCREEN_DIVE;
   }
+  return STAY_ON_SCREEN;
 }
diff --git a/DiveIno/src/screens/LogbookScreen.cpp b/DiveIno/src/screens/LogbookScreen.cpp
@@ -5,7 +5,7 @@ void LogbookScreen::init(DiveInoSettings diveInoSettings)
     ez.screen.clear();
     ez.header.show("Logbook");
 
-    ez.buttons.show("# # Menu");
+    ez.buttons.show("Menu");
 }
 
 void LogbookScreen::handleButtonPress(String buttonName)
diff --git a/DiveIno/src/screens/SurfaceScreen.cpp b/DiveIno/src/screens/SurfaceScreen.cpp
@@ -1,11 +1,76 @@
 #include "screens/SurfaceScreen.h"
 
-void SurfaceScreen::init(DiveInoSettings diveInoSettings)
+void SurfaceScreen::init(DiveInoSettings diveInoSettings, DiveResult* diveResult)
 {
+    _diveInoSettings = diveInoSettings;
+    _diveResult = diveResult;
+
     ez.screen.clear();
     ez.header.show("Surface");
 
-    ez.buttons.show("# # Menu");
+    ez.buttons.show("Menu");
+
+    _display();
+}
+
+void SurfaceScreen::_display()
+{
+    
+    if (ez.theme->name == "Default") { 
+        M5.Lcd.drawJpg((uint8_t *)ok_small_jpg, (sizeof(ok_small_jpg) / sizeof(ok_small_jpg[0])), 105, 35, 32, 32);
+        M5.Lcd.drawJpg((uint8_t *)airplane_small_jpg, (sizeof(airplane_small_jpg) / sizeof(airplane_small_jpg[0])), 105, 75, 32, 32);
+        M5.Lcd.drawJpg((uint8_t *)max_depth_small_jpg, (sizeof(max_depth_small_jpg) / sizeof(max_depth_small_jpg[0])), 105, 115, 32, 32);
+        M5.Lcd.drawJpg((uint8_t *)deco_stop_small_jpg, (sizeof(deco_stop_small_jpg) / sizeof(deco_stop_small_jpg[0])), 105, 155, 32, 32);
+    }
+    if (ez.theme->name == "Dark") {
+        M5.Lcd.drawJpg((uint8_t *)ok_small_jpg_dark, (sizeof(ok_small_jpg_dark) / sizeof(ok_small_jpg_dark[0])), 105, 35, 32, 32);
+        M5.Lcd.drawJpg((uint8_t *)airplane_small_jpg, (sizeof(airplane_small_jpg) / sizeof(airplane_small_jpg[0])), 105, 75, 32, 32);
+        M5.Lcd.drawJpg((uint8_t *)max_depth_small_jpg, (sizeof(max_depth_small_jpg) / sizeof(max_depth_small_jpg[0])), 105, 115, 32, 32);
+        M5.Lcd.drawJpg((uint8_t *)deco_stop_small_jpg_dark, (sizeof(deco_stop_small_jpg_dark) / sizeof(deco_stop_small_jpg_dark[0])), 105, 155, 32, 32);
+    }
+
+    ez.canvas.color(ez.theme->foreground);
+    ez.canvas.font(sans26);
+
+    if (_diveResult != NULL) {
+        ez.canvas.pos(150, 40);
+        ez.canvas.print(zeropad(_diveResult->durationInSeconds/60, 2)); //minutes
+        ez.canvas.print(":");
+        ez.canvas.print(zeropad(_diveResult->durationInSeconds%60, 2)); //seconds
+
+        ez.canvas.pos(150, 80);        
+        ez.canvas.print(zeropad(_diveResult->noFlyTimeInMinutes/60, 2)); //hours
+        ez.canvas.print(":");
+        ez.canvas.print(zeropad(_diveResult->noFlyTimeInMinutes%60, 2)); //minutes        
+
+        ez.canvas.pos(150, 120);
+        if (_diveInoSettings.imperialUnitsSetting) {
+            ez.canvas.print(_diveResult->maxDepthInMeters*3.28, 0);
+            ez.canvas.print(" ft");
+        } else {
+            ez.canvas.print(_diveResult->maxDepthInMeters);
+            ez.canvas.print(" m");
+        }        
+
+        ez.canvas.pos(150, 160);
+        if (_diveResult->wasDecoDive) {
+            ez.canvas.print("yes");
+        } else {
+            ez.canvas.print("no");
+        }        
+    } else {
+        ez.canvas.pos(150, 40);
+        ez.canvas.print("00:00");
+
+        ez.canvas.pos(150, 80);
+        ez.canvas.print("00:00");
+
+        ez.canvas.pos(150, 120);
+        ez.canvas.print("n/a");
+
+        ez.canvas.pos(150, 160);
+        ez.canvas.print("n/a");
+    }
 }
 
 void SurfaceScreen::handleButtonPress(String buttonName)

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ void DiveScreen::_drawCurrentDepth(float depthInMeter)`
`59`	`59`	`ez.canvas.color(ez.theme->foreground);`
`60`	`60`	`ez.canvas.font(numonly7seg48);`
`61`	`61`
`62`		`- ez.canvas.pos(210, 150);`
	`62`	`+ ez.canvas.pos(200, 150);`
`63`	`63`
`64`	`64`	`if (depthInMeter < 10) {`
`65`	`65`	`ez.canvas.color(ez.theme->background);`
`@@ -382,7 +382,7 @@ void DiveScreen::stopDive()`
`382`	`382`
`383`	`383`	`Serial.println(F("DIVE - Finished"));`
`384`	`384`
`385`		`- DiveResult* diveResult = _buhlmann->stopDive(ez.clock.tz.now());`
	`385`	`+ this->_diveResult = _buhlmann->stopDive(ez.clock.tz.now());`
`386`	`386`
`387`	`387`	`//TODO Navigate to the surface display screen`
`388`	`388`	`}`
`@@ -391,14 +391,22 @@ void DiveScreen::_diveProgress(float temperatureInCelsius, float pressureInMilli`
`391`	`391`	`_currentDiveInfo = _buhlmann->progressDive(pressureInMillibar, durationInSeconds);`
`392`	`392`	`}`
`393`	`393`
	`394`	`+ DiveResult* DiveScreen::getDiveResult()`
	`395`	`+ {`
	`396`	`+ return _diveResult;`
	`397`	`+ }`
	`398`	`+`
`394`	`399`	`/////////////`
`395`	`400`	`// Display //`
`396`	`401`	`/////////////`
`397`	`402`
`398`		`-void DiveScreen::display(PressureSensorData sensorData)`
	`403`	`+int DiveScreen::display(PressureSensorData sensorData)`
`399`	`404`	`{`
`400`	`405`	`if (_replayEnabled) {`
`401`		`- _replayDive();`
	`406`	`+ if (_replayDive()) {`
	`407`	`+ //Once the dive was completed open the Surface Screen`
	`408`	`+ return SCREEN_SURFACE;`
	`409`	`+ }`
`402`	`410`	`} else {`
`403`	`411`	`if (minuteChanged())`
`404`	`412`	`{`
`@@ -418,9 +426,10 @@ void DiveScreen::display(PressureSensorData sensorData)`
`418`	`426`	`_drawCurrentDepth(currentDepthInMeter);`
`419`	`427`	`_drawDiveIndicator();`
`420`	`428`	`}`
	`429`	`+ return STAY_ON_SCREEN;`
`421`	`430`	`}`
`422`	`431`
`423`		`-void DiveScreen::_replayDive()`
	`432`	`+bool DiveScreen::_replayDive()`
`424`	`433`	`{`
`425`	`434`	`// Check if test data is available, which comes through the serial interface`
`426`	`435`	`if (Serial.available() > 0) {`
`@@ -481,8 +490,10 @@ void DiveScreen::_replayDive()`
`481`	`490`	`_diveProgress(temperatureInCelsius, pressureInMillibar, depthInMeter, diveDurationInSeconds);`
`482`	`491`	`this->stopDive();`
`483`	`492`	`_replayEnabled = false;`
	`493`	`+ return true;`
`484`	`494`	`}`
`485`	`495`	`}`
	`496`	`+ return false;`
`486`	`497`	`}`
`487`	`498`
`488`	`499`	`/////////////`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ void HomeScreen::updateAmPm()`
`41`	`41`
`42`	`42`	`void HomeScreen::initHomeScreen(DiveInoSettings diveInoSettings)`
`43`	`43`	`{`
`44`		`- _diveInoSettings = diveInoSettings;`
	`44`	`+ _diveInoSettings = diveInoSettings;`
`45`	`45`
`46`	`46`	`ez.screen.clear();`
`47`	`47`	`ez.header.show("DiveIno");`
`@@ -112,7 +112,7 @@ void HomeScreen::displayHomeClock()`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
`115`		`-void HomeScreen::handleButtonPress(String buttonName)`
	`115`	`+int HomeScreen::handleButtonPress(String buttonName)`
`116`	`116`	`{`
`117`	`117`	`if (buttonName == "Update")`
`118`	`118`	`{`
`@@ -127,7 +127,8 @@ void HomeScreen::handleButtonPress(String buttonName)`
`127`	`127`	`initHomeScreen(_diveInoSettings);`
`128`	`128`	`}`
`129`	`129`	`else if (buttonName == "Dive")`
`130`		`- {`
`131`		`- //TODO Show Dive Screen`
	`130`	`+ {`
	`131`	`+ return SCREEN_DIVE;`
`132`	`132`	`}`
	`133`	`+ return STAY_ON_SCREEN;`
`133`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ void LogbookScreen::init(DiveInoSettings diveInoSettings)`
`5`	`5`	`ez.screen.clear();`
`6`	`6`	`ez.header.show("Logbook");`
`7`	`7`
`8`		`- ez.buttons.show("# # Menu");`
	`8`	`+ ez.buttons.show("Menu");`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`void LogbookScreen::handleButtonPress(String buttonName)`