Insitu/Keller stage gauge per sensor error #180

neilh10 · Dec 6, 2024 · faa6a2c · faa6a2c
1 parent 56ec2c5
commit faa6a2c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/src/sensors/InsituParent.cpp b/src/sensors/InsituParent.cpp
@@ -131,9 +131,11 @@ bool InsituParent::addSingleMeasurementResult(void) {
     bool success = false;
 
     // Initialize float variables
-    float waterPressureBar   = -9999;
-    float waterTempertureC   = -9999;
-    float waterDepthM        = -9999;
+
+
+    float waterPressureBar   = SNSRDEF_IP_WATERPRESSUREBAR;
+    float waterTempertureC   = SNSRDEF_IP_WATERTEMPERATUREC;
+    float waterDepthM        = SNSRDEF_IP_WATERDEPTHM;
     float waterPressure_mBar = -9999;
 
     // Check a measurement was *successfully* started (status bit 6 set)
@@ -149,12 +151,12 @@ bool InsituParent::addSingleMeasurementResult(void) {
                                 // float waterTempertureC)
 
         // Fix not-a-number values
-        if (!success || isnan(waterPressureBar)) waterPressureBar = -9999;
-        if (!success || isnan(waterTempertureC)) waterTempertureC = -9999;
-        if (!success || isnan(waterDepthM)) waterDepthM = -9999;
+        if (!success || isnan(waterPressureBar)) waterPressureBar = SNSRDEF_IP_WATERPRESSUREBAR ;
+        if (!success || isnan(waterTempertureC)) waterTempertureC = SNSRDEF_IP_WATERTEMPERATUREC;
+        if (!success || isnan(waterDepthM)) waterDepthM = SNSRDEF_IP_WATERDEPTHM;
 
         // For waterPressureBar, convert bar to millibar
-        if (waterPressureBar != -9999)
+        if (waterPressureBar != SNSRDEF_IP_WATERPRESSUREBAR )
             waterPressure_mBar = 1000 * waterPressureBar;
 
         MS_DBG(F("  Pressure_mbar:"), waterPressure_mBar);

diff --git a/src/sensors/KellerParent.cpp b/src/sensors/KellerParent.cpp
@@ -137,9 +137,9 @@ bool KellerParent::addSingleMeasurementResult(void) {
     bool success = false;
 
     // Initialize float variables
-    float waterPressureBar   = -9999;
-    float waterTempertureC   = -9999;
-    float waterDepthM        = -9999;
+    float waterPressureBar   = SNSRDEF_KP_WATERPRESSUREBAR;
+    float waterTempertureC   = SNSRDEF_KP_WATERTEMPERATUREC ;
+    float waterDepthM        = SNSRDEF_KP_WATERDEPTHM;
     float waterPressure_mBar = -9999;
 
     // Check a measurement was *successfully* started (status bit 6 set)
@@ -155,12 +155,12 @@ bool KellerParent::addSingleMeasurementResult(void) {
                                 // float waterTempertureC)
 
         // Fix not-a-number values
-        if (!success || isnan(waterPressureBar)) waterPressureBar = -9999;
-        if (!success || isnan(waterTempertureC)) waterTempertureC = -9999;
-        if (!success || isnan(waterDepthM)) waterDepthM = -9999;
+        if (!success || isnan(waterPressureBar)) waterPressureBar = SNSRDEF_KP_WATERPRESSUREBAR;
+        if (!success || isnan(waterTempertureC)) waterTempertureC = SNSRDEF_KP_WATERTEMPERATUREC;
+        if (!success || isnan(waterDepthM)) waterDepthM = SNSRDEF_KP_WATERDEPTHM;
 
         // For waterPressureBar, convert bar to millibar
-        if (waterPressureBar != -9999)
+        if (waterPressureBar != SNSRDEF_KP_WATERPRESSUREBAR)
             waterPressure_mBar = 1000 * waterPressureBar;
 
         MS_DBG(F("  Pressure_mbar:"), waterPressure_mBar);