From cb37426fbb92c03078715c4557a311845f4ee079 Mon Sep 17 00:00:00 2001 From: Ollo Date: Mon, 1 Apr 2024 13:03:04 +0200 Subject: [PATCH] Deepsleep increased and Sensor-Enable for HW0.7 corrected --- esp32/include/ControllerConfiguration.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/esp32/include/ControllerConfiguration.h b/esp32/include/ControllerConfiguration.h index 8a1ea42..4d987da 100644 --- a/esp32/include/ControllerConfiguration.h +++ b/esp32/include/ControllerConfiguration.h @@ -72,19 +72,24 @@ #define OUTPUT_PUMP6 GPIO_NUM_23 /**< GPIO 23 */ #endif -#define OUTPUT_ENABLE_SENSOR GPIO_NUM_14 /**< GPIO 14 - Enable Sensors */ #define OUTPUT_ENABLE_PUMP GPIO_NUM_13 /**< GPIO 13 - Enable Pumps */ -#ifdef HWREVISION07 +#ifdef HWREVISION07 +#define OUTPUT_ENABLE_SENSOR GPIO_NUM_16 /**< GPIO 16 - Enable Sensors */ #define SENSOR_ONEWIRE GPIO_NUM_2 /** GPIO 02 - Temperatur sensor, Battery and other cool onewire stuff */ #else +#define OUTPUT_ENABLE_SENSOR GPIO_NUM_14 /**< GPIO 14 - Enable Sensors */ #define SENSOR_ONEWIRE GPIO_NUM_4 /**< GPIO 12 - Temperatur sensor, Battery and other cool onewire stuff */ #endif #ifdef ANALOG_WATER #define SENSOR_TANK_ANALOG ANALOG_WATER /**< GPIO 34 - analog water sensor (GPIO_NUM_34) */ +#else +#ifdef HWREVISION07 + #else #define SENSOR_TANK_SDA GPIO_NUM_17 /**< GPIO 17 - water sensor SDA */ #define SENSOR_TANK_SCL GPIO_NUM_16 /**< GPIO 16 - water sensor SCL */ #endif +#endif #define BUTTON GPIO_NUM_0 /**< GPIO 0 - Fix button of NodeMCU */ #define CUSTOM1_PIN1 GPIO_NUM_34 /** direct gpio */ @@ -122,7 +127,7 @@ #define FIRMWARE_BASENAME "PlantControl" #define FIRMWARE_NAME FIRMWARE_BASENAME FIRMWARE_FEATURE1 FIRMWARE_FEATURE2 -#define FIRMWARE_VERSIONNMUMBER "3.001" +#define FIRMWARE_VERSIONNMUMBER "3.002" #ifdef HWREVISION07 #define FIRMWARE_VERSION FIRMWARE_VERSIONNMUMBER " HW0.7" @@ -155,7 +160,7 @@ #define VOLT_MAX_BATT 4.2f #define VOLT_MIN_BATT 3.0f /**< Minimum battery voltage for normal operation */ #define LOWVOLT_SLEEP_FACTOR 3 /**< Factor for nightsleep delay, if the battery drops below minimum (@see VOLT_MIN_BATT) */ -#define LOWVOLT_SLEEP_MINIMUM 1800 /**< At low voltage sleep at least for 30 minutes */ +#define LOWVOLT_SLEEP_MINIMUM 5400 /**< At low voltage sleep at least for 90 minutes */ #define WATER_LEVEL_MINIMUM 500 /**< Minimum Analog value (1023 is the maximum)*/