minor updates and fixes

brushknight · Sep 26, 2021 · 14bdd10 · 14bdd10
1 parent 457f6f9
commit 14bdd10
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 11 deletions.
diff --git a/esp32/src/climate.cpp b/esp32/src/climate.cpp
@@ -52,7 +52,6 @@ time in UTC
     {
         ClimateData data;
 
-        // Get temperature event and print its value.
         sensors_event_t event;
         dht.temperature().getEvent(&event);
         if (isnan(event.temperature))
@@ -196,6 +195,8 @@ time in UTC
         telemetryData.climateConfig.nightTempToleranceWarm = NIGHT_TEMP_TOLERANCE_WARM;
         telemetryData.climateConfig.nightTempToleranceCold = NIGHT_TEMP_TOLERANCE_COLD;
 
+        telemetryData.fullfilled = true;
+
         return telemetryData;
     }
 }
diff --git a/esp32/src/config.h b/esp32/src/config.h
@@ -2,6 +2,8 @@
 #define CONFIG
 
 #define SENSORS_COUNT 2
-#define TERRARIUM_ID 3
+#define TERRARIUM_ID 1
+
+#define VERSION "v2.0.1"
 
 #endif
diff --git a/esp32/src/display.cpp b/esp32/src/display.cpp
@@ -11,10 +11,10 @@ namespace Display
     void render(DisplayData displayData)
     {
         // just do clear?
- //       clearRow(0);
- //       clearRow(1);
- //       clearRow(2);
- //       clearRow(3);
+        //       clearRow(0);
+        //       clearRow(1);
+        //       clearRow(2);
+        //       clearRow(3);
 
         renderHarvestInfo(displayData.nextHarvestInSec);
         renderClimate(displayData);
@@ -23,16 +23,23 @@ namespace Display
         renderSubmissionInfo(displayData.submission);
     }
 
-void renderSubmissionInfo(bool submission)
-{
+    void bootScreen(){
+         lcd.setCursor(0, 0);
+         lcd.print("version: ");
+         lcd.print(VERSION);
+    }
+
+    void renderSubmissionInfo(bool submission)
+    {
         lcd.setCursor(9, 2);
         lcd.print(" ");
         lcd.print(" ");
-        if (submission){
+        if (submission)
+        {
             lcd.setCursor(9, 2);
             lcd.print("S");
         }
-}
+    }
 
     void renderHarvestInfo(int secondsToNextHarvest)
     {

diff --git a/esp32/src/display.h b/esp32/src/display.h
@@ -38,6 +38,6 @@ namespace Display
      void clearRow(int row);
      void render(DisplayData displayData);
      void renderSubmissionInfo(bool submission);
-
+     void bootScreen();
 }
 #endif
diff --git a/esp32/src/main.cpp b/esp32/src/main.cpp
@@ -38,6 +38,8 @@ void setup()
   Serial.begin(115200);
   Display::displaySetup();
 
+  Display::bootScreen();
+
   //connect();
   RealTime::setupRtcModule();
 
@@ -56,6 +58,8 @@ void setup()
     NULL             // Task handle
   );
 
+  delay(1000);
+
 }
 
 void loop()

diff --git a/esp32/src/telemetry.cpp b/esp32/src/telemetry.cpp
@@ -8,6 +8,21 @@ namespace Telemetry
     void send(TelemteryData telemteryData)
     {
 
+        if (!telemteryData.fullfilled){
+            Serial.println("sample is not fullfilled yet.");
+            return;
+        }
+
+        if (telemteryData.hotSide.t == 0 || telemteryData.coldSide.t == 0){
+            Serial.println("sample is not fullfilled yet.");
+            return;
+        }
+
+        if (telemteryData.hotSide.h > 100 || telemteryData.hotCenter.h > 100 || telemteryData.coldCenter.h > 100 || telemteryData.coldSide.h > 100){
+            Serial.println("sample data has been corrupted (humidity > 100%).");
+            return;
+        }
+
         Net::connect(false);
 
         char telemetryEndpoint [200];

diff --git a/esp32/src/telemetry.h b/esp32/src/telemetry.h
@@ -31,6 +31,7 @@ namespace Telemetry
         ClimateConfig climateConfig;
         bool heater;
         HeaterPhase heaterPhase;
+        bool fullfilled;
     };
 
     void send(TelemteryData telemteryData);