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

Reading sensors by frequency

Browse Source
This commit is contained in:
c3ma
2021-07-21 21:23:58 +02:00
parent 2d167c7393
commit d043d873cc
5 changed files with 82 additions and 183 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 2800 //swamp earth - 50 margin
#define MOIST_SENSOR_MIN_ADC 1200 //dry earth + 1500 margin
#define MOIST_SENSOR_MAX_FRQ 60000 // 60kHz (500Hz margin)
#define MOIST_SENSOR_MIN_FRQ 1000 // 1kHz (500Hz margin)
#define SOLAR_VOLT_FACTOR 11
#define BATTSENSOR_INDEX_SOLAR 0

16
esp32/include/PlantCtrl.h
View File

@@ -18,13 +18,16 @@
#include "RunningMedian.h"
#include "MathUtils.h"
#define MOISTURE_MEASUREMENT_DURATION 500 /** ms */
class Plant
{
private:
RunningMedian moistureRaw = RunningMedian(5);
HomieNode *mPlant = NULL;
HomieInternals::PropertyInterface mPump;
int32_t mMoisture_freq = 0;
int mPinSensor = 0; /**< Pin of the moist sensor */
int mPinPump = 0; /**< Pin of the pump */
bool mConnected = false;
@@ -51,8 +54,8 @@ public:
* @brief Measure a new analog moister value
*
*/
void addSenseValue(void);
void clearMoisture(void);
void startMoistureMeasurement(void);
void stopMoistureMeasurement(void);
void deactivatePump(void);
@@ -79,10 +82,7 @@ public:
float getCurrentMoisture()
{
if(moistureRaw.getCount()==0){
return MISSING_SENSOR;
}
return this->moistureRaw.getMedian();
return mMoisture_freq;
}
long getSetting2Moisture()
@@ -90,7 +90,7 @@ public:
if (this->mSetting->pSensorDry != NULL)
{
float percent = (this->mSetting->pSensorDry->get());
return MOIST_SENSOR_MIN_ADC + ((MOIST_SENSOR_MAX_ADC - MOIST_SENSOR_MIN_ADC) * percent);
return (((MOIST_SENSOR_MAX_FRQ - MOIST_SENSOR_MIN_FRQ) * percent) + MOIST_SENSOR_MIN_FRQ);
}
else
{