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

# Conflicts:
#	esp32/src/main.cpp

esp32/custom_platformio.ini.example

@@ -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

esp32/include/ControllerConfiguration.h

@@ -84,7 +84,7 @@
  */
 #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_MIN_FRQ                1000 // 1kHz (500Hz margin)

esp32/src/main.cpp

@@ -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;