Merge branch 'hydro'

# Conflicts:
#	esp32/PlantControl.code-workspace
#	esp32/include/ControllerConfiguration.h
#	esp32/platformio.ini
#	esp32/src/main.cpp
This commit is contained in:
Empire
2022-04-27 19:19:26 +00:00
15 changed files with 566 additions and 570 deletions
+2 -2
View File
@@ -13,7 +13,7 @@ platform = espressif32
board = esp32doit-devkit-v1
framework = arduino
build_flags = -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
-DPLANT0_SENSORTYPE=SHT20
-DPLANT0_SENSORTYPE=ANALOG_RESISTANCE_PROBE
-DPLANT1_SENSORTYPE=ANALOG_RESISTANCE_PROBE
-DPLANT2_SENSORTYPE=CAPACITIVE_FREQUENCY
-DPLANT3_SENSORTYPE=CAPACITIVE_FREQUENCY
@@ -33,4 +33,4 @@ lib_deps = ArduinoJson@6.16.1
[platformio]
extra_configs = custom_platformio.ini
extra_configs = custom_platformio.ini