Merge branch 'master' of https://github.com/0110/PlantCtrl
# Conflicts: # esp32/src/main.cpp
This commit is contained in:
commit
244dfb9b27
@ -5,13 +5,12 @@ framework = arduino
|
||||
build_flags = -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
|
||||
board_build.partitions = defaultWithSmallerSpiffs.csv
|
||||
|
||||
extra_configs = custom_platformio.ini
|
||||
|
||||
; the latest development brankitchen-lightch (convention V3.0.x)
|
||||
lib_deps = ArduinoJson@6.16.1
|
||||
https://github.com/homieiot/homie-esp8266.git#v3.0
|
||||
OneWire
|
||||
DallasTemperature
|
||||
pololu/VL53L0X
|
||||
https://github.com/homieiot/homie-esp8266.git#develop
|
||||
|
||||
; add additional parameter, like the upload port
|
||||
upload_port=/dev/ttyUSB1
|
||||
|
@ -992,6 +992,7 @@ void plantcontrol()
|
||||
|
||||
/** @}*/
|
||||
|
||||
#ifdef TIMED_LIGHT_PIN
|
||||
bool determineTimedLightState(bool lowLight)
|
||||
{
|
||||
bool onlyAllowedWhenDark = timedLightOnlyWhenDark.get();
|
||||
@ -1036,6 +1037,8 @@ bool determineTimedLightState(bool lowLight)
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
void log(int level, String message, int statusCode)
|
||||
{
|
||||
String buffer;
|
||||
|
Loading…
Reference in New Issue
Block a user