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

Revert "add resistive frequency sensor, updated dependencies"

Browse Source 
This reverts commit 17d16a6eef.
This commit is contained in:
Empire
2023-02-12 12:40:38 +01:00
parent 2b6d766492
commit 42ce4cdda2
8 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
esp32/include/ControllerConfiguration.h
View File

@@ -82,7 +82,11 @@
/** \addtogroup Configuration
* @{
*/
#define FIRMWARE_VERSION "2.5 HW0.10b"
#define CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE
#define CONFIG_COMPILER_CXX_EXCEPTIONS
#define FIRMWARE_VERSION "2.4 HW0.10b"
#define TIMED_LIGHT_PIN CUSTOM1_PIN5
#define FLOWMETER_PIN CUSTOM1_PIN1

2
esp32/include/HomieTypes.h
View File

@@ -21,7 +21,7 @@
#define FOREACH_SENSOR(SENSOR) \
SENSOR(NONE) \
SENSOR(FREQUENCY_MOD_RESISTANCE_PROBE) \
SENSOR(CAPACITIVE_FREQUENCY) \
SENSOR(ANALOG_RESISTANCE_PROBE)
/**

8
esp32/include/PlantCtrl.h
View File

@@ -19,6 +19,7 @@
#include "MathUtils.h"
#include "MQTTUtils.h"
#include "LogDefines.h"
#include "SHT2x.h"
#define ANALOG_REREADS 5
#define MOISTURE_MEASUREMENT_DURATION 400 /** ms */
@@ -38,6 +39,7 @@ private:
bool mConnected = false;
int mPlantId = -1;
SENSOR_MODE mSensorMode;
SHT2x sht20;
public:
@@ -132,8 +134,8 @@ public:
{
case NONE:
return DEACTIVATED_PLANT;
case FREQUENCY_MOD_RESISTANCE_PROBE:
return mapf(mMoisture_raw.getMedian(), MOIST_SENSOR_MIN_FRQ, MOIST_SENSOR_MAX_FRQ, 0, 100);
case CAPACITIVE_FREQUENCY:
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_MAX_MV, ANALOG_SENSOR_MIN_MV, 0, 100);
}
@@ -142,7 +144,7 @@ public:
float getCurrentMoistureRaw()
{
if (getSensorMode() == FREQUENCY_MOD_RESISTANCE_PROBE)
if (getSensorMode() == CAPACITIVE_FREQUENCY)
{
if (mMoisture_raw.getMedian() < MOIST_SENSOR_MIN_FRQ)
{

11
esp32/include/ulp-pwm.h
View File

@@ -101,6 +101,17 @@ static inline uint16_t ulp_internal_data_read(size_t offset)
return RTC_SLOW_MEM[offset] & 0xffff;
}
static inline uint32_t rtc_io_number_get(gpio_num_t gpio_num)
{
assert(rtc_gpio_is_valid_gpio(gpio_num) && "Invalid GPIO for RTC");
uint32_t bit = rtc_bit[gpio_num];
Serial.print("Resolved GPIO ");
Serial.print(gpio_num);
Serial.print(" to rtc bit ");
Serial.println(bit);
return bit;
}
void ulp_internal_start(void)
{
rtc_gpio_init(PIN);