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

# Conflicts: # esp32/src/main.cpp
2021-10-01 23:51:29 +02:00
parent f4e13454e3 1619b93fa1
commit 244dfb9b27
3 changed files with 6 additions and 4 deletions
--- a/esp32/src/main.cpp
+++ b/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;