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
@@ -36,4 +36,5 @@
 #define LOG_SLEEP_NIGHT 100
 #define LOG_SLEEP_DAY 101
 #define LOG_SLEEP_CYCLE 102
-#define LOG_MISSING_PUMP -4
+#define LOG_MISSING_PUMP -4
+#define LOG_BOOT_ERROR_DETECTION 10000