From 8a2f320b1a10a4f9112b4b93f83a9de741d6e750 Mon Sep 17 00:00:00 2001
From: Ollo <Ollo@host>
Date: Sat, 31 Oct 2020 12:44:25 +0100
Subject: [PATCH 1/3] Adapt time comment

---
 esp32/include/ControllerConfiguration.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esp32/include/ControllerConfiguration.h b/esp32/include/ControllerConfiguration.h
index 7cb273b..e06c6b9 100644
--- a/esp32/include/ControllerConfiguration.h
+++ b/esp32/include/ControllerConfiguration.h
@@ -11,7 +11,7 @@
 #ifndef CONTROLLER_CONFIG_H
 #define CONTROLLER_CONFIG_H
 
-#define FIRMWARE_VERSION        "1.0.6"
+#define FIRMWARE_VERSION        "1.0.7"
 
 #define ADC_TO_VOLT(adc)                      ((adc) * 3.3 ) / 4095)
 #define ADC_TO_VOLT_WITH_MULTI(adc, multi)    (((adc) * 3.3 * (multi)) / 4095)

From 979baf5ff9e2e141a0f62b9c5d3b2c85e390f77a Mon Sep 17 00:00:00 2001
From: Ollo <Ollo@host>
Date: Sat, 31 Oct 2020 12:44:32 +0100
Subject: [PATCH 2/3] Adapt time comment

---
 esp32/include/HomieConfiguration.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esp32/include/HomieConfiguration.h b/esp32/include/HomieConfiguration.h
index 9146754..8351c0c 100644
--- a/esp32/include/HomieConfiguration.h
+++ b/esp32/include/HomieConfiguration.h
@@ -37,8 +37,8 @@ HomieNode stayAlive("stay", "alive", "alive");
 /**
  *********************************** Settings *******************************
  */
-HomieSetting<long> deepSleepTime("deepsleep", "time in milliseconds to sleep (0 deactivats it)");
-HomieSetting<long> deepSleepNightTime("nightsleep", "time in milliseconds to sleep (0 uses same setting: deepsleep at night, too)");
+HomieSetting<long> deepSleepTime("deepsleep", "time in seconds to sleep (0 deactivats it)");
+HomieSetting<long> deepSleepNightTime("nightsleep", "time in seconds to sleep (0 uses same setting: deepsleep at night, too)");
 HomieSetting<long> wateringDeepSleep("pumpdeepsleep", "time seconds to sleep, while a pump is running");
 
 HomieSetting<long> waterLevelMax("watermaxlevel", "distance (mm) at maximum water level");

From 5b420ab90436c213d665b38e08af70c736f70b56 Mon Sep 17 00:00:00 2001
From: Ollo <Ollo@host>
Date: Sat, 31 Oct 2020 12:44:49 +0100
Subject: [PATCH 3/3] Adapt time comment

---
 esp32/src/main.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/esp32/src/main.cpp b/esp32/src/main.cpp
index cb17175..392e04e 100644
--- a/esp32/src/main.cpp
+++ b/esp32/src/main.cpp
@@ -453,8 +453,8 @@ void systemInit(){
   // Set default values
   
   //in seconds
-  deepSleepTime.setDefaultValue(10);
-  deepSleepNightTime.setDefaultValue(30);
+  deepSleepTime.setDefaultValue(60);
+  deepSleepNightTime.setDefaultValue(600);
   wateringDeepSleep.setDefaultValue(5);
 
   /* waterLevelMax 1000    */             /* 100cm in mm */
@@ -504,12 +504,9 @@ void systemInit(){
 
 
 bool mode1(){
-  Serial.println("m1");
+  Serial.println("==== Mode 1 ====");
   Serial << getCurrentTime() << " curtime" << endl;
 
-  /* Disable all sleeping stuff before reading sensors */
-  gpio_deep_sleep_hold_dis();
-
   readSensors();
   //queue sensor values for 
 
@@ -571,7 +568,7 @@ bool mode1(){
 }
 
 void mode2(){
-  Serial.println("m2");
+  Serial.println("==== Mode 2 ====");
   systemInit();
 
   /* Jump into Mode 3, if not configured */