C3MA/PlantCtrl
5
0
Fork 0
Code Issues 8 Pull Requests Packages Projects Releases Wiki Activity

code cleanups

Browse Source
This commit is contained in:
c3ma
2021-07-09 21:50:51 +02:00
parent 99703e5ad1
commit df39c09c50
8 changed files with 67 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
esp32/include/ControllerConfiguration.h
View File

@@ -80,8 +80,8 @@
*/
#define FIRMWARE_VERSION "sw 1.3 hw 0.10"
#define MOIST_SENSOR_MAX_ADC 1200 //swamp earth - 50 margin
#define MOIST_SENSOR_MIN_ADC 1800 //dry earth + 1500 margin
#define MOIST_SENSOR_MAX_ADC 2800 //swamp earth - 50 margin
#define MOIST_SENSOR_MIN_ADC 1200 //dry earth + 1500 margin
#define SOLAR_VOLT_FACTOR 11
#define BATTSENSOR_INDEX_SOLAR 0

3
esp32/include/HomieConfiguration.h
View File

@@ -18,6 +18,7 @@
#define MAX_PLANTS 7
/**
* @name Homie Attributes
* generated Information
@@ -88,7 +89,7 @@ HomieSetting<const char *> ntpServer("ntpServer", "NTP server (pool.ntp.org as d
**/
#define GENERATE_PLANT(plant, strplant) \
HomieSetting<long> mSensorDry##plant = HomieSetting<long>("dry" strplant, "Plant " strplant "- Moist sensor dry threshold"); \
HomieSetting<double> mSensorDry##plant = HomieSetting<double>("dry" strplant, "Plant " strplant "- Moist sensor dry %"); \
HomieSetting<long> mPumpAllowedHourRangeStart##plant = HomieSetting<long>("hourstart" strplant, "Plant" strplant " - Range pump allowed hour start (0-23)"); \
HomieSetting<long> mPumpAllowedHourRangeEnd##plant = HomieSetting<long>("hourend" strplant, "Plant" strplant " - Range pump allowed hour end (0-23)"); \
HomieSetting<bool> mPumpOnlyWhenLowLight##plant = HomieSetting<bool>("lowLight" strplant, "Plant" strplant " - Enable the Pump only, when there is no sunlight"); \

6
esp32/include/HomieTypes.h
View File

@@ -13,12 +13,12 @@
#include <Homie.h>
#define DEACTIVATED_PLANT 5000
#define MISSING_SENSOR 5001
#define DEACTIVATED_PLANT -1
#define MISSING_SENSOR -2
typedef struct PlantSettings_t
{
HomieSetting<long> *pSensorDry;
HomieSetting<double> *pSensorDry;
HomieSetting<long> *pPumpAllowedHourRangeStart;
HomieSetting<long> *pPumpAllowedHourRangeEnd;
HomieSetting<bool> *pPumpOnlyWhenLowLight;

7
esp32/include/MathUtils.h Normal file
View File

@@ -0,0 +1,7 @@
#ifndef MATHUTILS_H
#define MATHUTILS_H
bool equalish(double x, double y);
#endif

13
esp32/include/PlantCtrl.h
View File

@@ -13,7 +13,9 @@
#define PLANT_CTRL_H
#include "HomieTypes.h"
#include "ControllerConfiguration.h"
#include "RunningMedian.h"
#include "MathUtils.h"
class Plant
{
@@ -62,14 +64,15 @@ public:
*/
bool isPumpRequired()
{
bool isDry = getCurrentMoisture() > getSettingsMoisture();
bool isDry = getCurrentMoisture() > getSetting2Moisture();
bool isActive = isPumpTriggerActive();
return isDry && isActive;
}
bool isPumpTriggerActive()
{
return this->mSetting->pSensorDry->get() != DEACTIVATED_PLANT;
long current = this->mSetting->pSensorDry->get();
return !equalish(current,DEACTIVATED_PLANT);
}
float getCurrentMoisture()
@@ -79,11 +82,13 @@ public:
}
return this->moistureRaw.getMedian();
}
long getSettingsMoisture()
long getSetting2Moisture()
{
if (this->mSetting->pSensorDry != NULL)
{
return this->mSetting->pSensorDry->get();
float percent = (this->mSetting->pSensorDry->get());
return MOIST_SENSOR_MIN_ADC + ((MOIST_SENSOR_MAX_ADC - MOIST_SENSOR_MIN_ADC) * percent);
}
else
{