Merge branch 'hydro'

# Conflicts: # esp32/PlantControl.code-workspace # esp32/include/ControllerConfiguration.h # esp32/platformio.ini # esp32/src/main.cpp
2022-04-27 19:19:26 +00:00
parent 6c475a2ade 27cd6af02d
commit c43da98245
15 changed files with 566 additions and 570 deletions
@@ -122,13 +122,6 @@ public:
        }
    }

-    float getCurrentTemperature(){
-        if(mTemperature_degree.getCount() == 0){
-            return PLANT_WITHOUT_TEMPSENSOR; 
-        }
-        return mTemperature_degree.getMedian();
-    }
-
    float getCurrentMoisturePCT()
    {
        switch (getSensorMode())
@@ -139,8 +132,6 @@ public:
            return mapf(mMoisture_raw.getMedian(), MOIST_SENSOR_MAX_FRQ, MOIST_SENSOR_MIN_FRQ, 0, 100);
        case ANALOG_RESISTANCE_PROBE:
            return mapf(mMoisture_raw.getMedian(), ANALOG_SENSOR_MIN_MV, ANALOG_SENSOR_MAX_MV, 0, 100);
-        case SHT20:
-            return mMoisture_raw.getMedian();
        }
        return MISSING_SENSOR;
    }
@@ -210,6 +201,12 @@ public:
    {
        return this->mSetting->pPumpDuration->get();
    }
+    long getPumpMl()
+    {
+        return this->mSetting->pPumpMl->get();
+    }
+
+    
 };

 #endif