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

Merge branch 'master' of https://github.com/0110/PlantCtrl

Browse Source 
# Conflicts:
#	esp32/src/main.cpp
This commit is contained in:
Your Name 2021-10-01 23:51:29 +02:00
commit 244dfb9b27
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
esp32/custom_platformio.ini.example
View File

@ -5,13 +5,12 @@ framework = arduino
build_flags = -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY build_flags = -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
board_build.partitions = defaultWithSmallerSpiffs.csv board_build.partitions = defaultWithSmallerSpiffs.csv
extra_configs = custom_platformio.ini
; the latest development brankitchen-lightch (convention V3.0.x) ; the latest development brankitchen-lightch (convention V3.0.x)
lib_deps = ArduinoJson@6.16.1 lib_deps = ArduinoJson@6.16.1
https://github.com/homieiot/homie-esp8266.git#v3.0
OneWire OneWire
DallasTemperature DallasTemperature
pololu/VL53L0X
https://github.com/homieiot/homie-esp8266.git#develop
; add additional parameter, like the upload port ; add additional parameter, like the upload port
upload_port=/dev/ttyUSB1 upload_port=/dev/ttyUSB1

2
esp32/include/ControllerConfiguration.h
View File

@ -84,7 +84,7 @@
*/ */
#define FIRMWARE_VERSION "sw 1.4 hw 0.10" #define FIRMWARE_VERSION "sw 1.4 hw 0.10"
#define TIMED_LIGHT_PIN CUSTOM1_PIN5 #define TIMED_LIGHT_PIN CUSTOM1_PIN5
#define MOIST_SENSOR_MAX_FRQ 60000 // 60kHz (500Hz margin) #define MOIST_SENSOR_MAX_FRQ 60000 // 60kHz (500Hz margin)
#define MOIST_SENSOR_MIN_FRQ 1000 // 1kHz (500Hz margin) #define MOIST_SENSOR_MIN_FRQ 1000 // 1kHz (500Hz margin)

3
esp32/src/main.cpp
View File

@ -992,6 +992,7 @@ void plantcontrol()
/** @}*/ /** @}*/
#ifdef TIMED_LIGHT_PIN
bool determineTimedLightState(bool lowLight) bool determineTimedLightState(bool lowLight)
{ {
bool onlyAllowedWhenDark = timedLightOnlyWhenDark.get(); bool onlyAllowedWhenDark = timedLightOnlyWhenDark.get();
@ -1036,6 +1037,8 @@ bool determineTimedLightState(bool lowLight)
} }
} }
#endif
void log(int level, String message, int statusCode) void log(int level, String message, int statusCode)
{ {
String buffer; String buffer;