From a9671773f371df035f21351c8977e6e31749fa6a Mon Sep 17 00:00:00 2001 From: lukas Date: Wed, 31 Mar 2021 17:03:36 +0200 Subject: [PATCH] comment out all Serialprints to not interrupt timer functions --- src/Heating.cpp | 18 +++++----- src/SettingsService.cpp | 8 ++--- src/main.cpp | 76 ++++++++++++++++++++++------------------- 3 files changed, 54 insertions(+), 48 deletions(-) diff --git a/src/Heating.cpp b/src/Heating.cpp index 509b86a..8d63a27 100644 --- a/src/Heating.cpp +++ b/src/Heating.cpp @@ -55,9 +55,9 @@ void Heating::init(unsigned mode, const SettingState *settings, HeatingInfoServi digitalWrite(HeizungPin, LOW); } - schedule_function([e]() { - Serial.printf("Error: %d\n", e); - }); +// schedule_function([e]() { +// Serial.printf("Error: %d\n", e); +// }); }); mHeizungTicker.attach(10, [this]() { @@ -76,7 +76,7 @@ void Heating::handleHeatingEvents() { if (mHeatingStatus == false) { // turn off active turnoff timers mLuefterTicker.detach(); - Serial.println("heating should run now!"); + ////Serial.println("heating should run now!"); // turn on heating and fan digitalWrite(LuefterPin, HIGH); digitalWrite(HeizungPin, HIGH); @@ -90,7 +90,7 @@ void Heating::handleHeatingEvents() { // if humidity too low turn off heating and fan after 60secs if (mHeatingStatus == true) { digitalWrite(HeizungPin, LOW); - Serial.println("heating should NOT run now!"); + ////Serial.println("heating should NOT run now!"); // add the heat time it took to the total mheatingservice->addHeatTime(Timer::getSystemSeconds() - mheatingservice->getLastHeatingStartTime()); @@ -100,7 +100,7 @@ void Heating::handleHeatingEvents() { // turn off fan digitalWrite(LuefterPin, LOW); schedule_function([]() { - Serial.println("turning off fan"); + ////Serial.println("turning off fan"); }); }); } @@ -121,18 +121,18 @@ void Heating::handleTimeHeater() { digitalWrite(LuefterPin, HIGH); digitalWrite(HeizungPin, HIGH); - Serial.println("Turning on heating"); + ////Serial.println("Turning on heating"); mTurnOffTicker.once((int) ((float) refreshperiod * (float) percentOn / 100.0), []() { digitalWrite(HeizungPin, LOW); - Serial.println("Turned off heating!"); + ////Serial.println("Turned off heating!"); }); mLuefterTicker.once((int) (((float) refreshperiod * (float) percentOn / 100.0) + 30.0), []() { digitalWrite(LuefterPin, LOW); - Serial.println("Turned off fan!"); + ////Serial.println("Turned off fan!"); }); }; diff --git a/src/SettingsService.cpp b/src/SettingsService.cpp index 0a646a3..27f49c3 100644 --- a/src/SettingsService.cpp +++ b/src/SettingsService.cpp @@ -17,12 +17,12 @@ SettingsService::SettingsService(AsyncWebServer *server, SecurityManager *securi } void SettingsService::onConfigUpdated() { - Serial.println("switching led!"); + ////Serial.println("switching led!"); File settingsFile = ESPFS.open("settings.json", "w+"); if (settingsFile) { - Serial.println("writing config file!"); + ////Serial.println("writing config file!"); StaticJsonDocument<256> doc; doc["waterOutageWaitDuration"] = _state.waterOutageWaitDuration; @@ -46,7 +46,7 @@ void SettingsService::begin() { // Deserialize the JSON document DeserializationError error = deserializeJson(doc, settingsFile); if (error) { - Serial.println(F("Failed to read file, using default configuration")); + ////Serial.println(F("Failed to read file, using default configuration")); onConfigUpdated(); return; } @@ -59,7 +59,7 @@ void SettingsService::begin() { _state.heatLow = doc["heatLow"] | 65; _state.fanRuntime = doc["fanRuntime"] | 60; - Serial.println("read config file!"); + ////Serial.println("read config file!"); settingsFile.close(); } diff --git a/src/main.cpp b/src/main.cpp index e3dffb3..41787c8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -33,11 +33,11 @@ SettingsService settingsservice = SettingsService(&server, esp8266React.getSecur void pumpeSchalten(bool on) { // digitalWrite(4,on); if (on) { - Serial.println("versuche Pumpe EIN zuschalten"); + //Serial.println("versuche Pumpe EIN zuschalten"); // refresh last pump counter generalinfo.setlastPumpTime(Timer::getSystemSeconds()); } else { - Serial.println("versuche Pumpe AUS zuschalten"); + //Serial.println("versuche Pumpe AUS zuschalten"); } if (allow && !error) { @@ -45,11 +45,12 @@ void pumpeSchalten(bool on) { pumpcycles++; generalinfo.setPumpCycles(pumpcycles); - pumpendauer.once((float)settingsservice.getSettings()->maxpumpduration + 1, []() { + pumpendauer.once((float) settingsservice.getSettings()->maxpumpduration + 1, []() { //erlaube keine einschaltung von mehr als 60 sek - if (Timer::getSystemSeconds() - turnontime >= (unsigned)settingsservice.getSettings()->maxpumpduration && turnontime != 0) { + if (Timer::getSystemSeconds() - turnontime >= + (unsigned) settingsservice.getSettings()->maxpumpduration && turnontime != 0) { //error zu lange - Serial.println("\n\npumpe lief mehr als 10 Minuten durchgaengig"); + //Serial.println("\n\npumpe lief mehr als 10 Minuten durchgaengig"); pumpeSchalten(false); error = true; } @@ -62,30 +63,33 @@ void pumpeSchalten(bool on) { turnontime = Timer::getSystemSeconds(); digitalWrite(SchuetzPin, on); - Serial.println("[Erfolg] pumpe wird geschalten"); + //Serial.println("[Erfolg] pumpe wird geschalten"); } else { - Serial.println("[FEHLGESCHLAGEN] Schalten des Schütz gesperrt durch Timeout oder Fehler-- sofortiges ausschalten der pumpe\n"); + //Serial.println("[FEHLGESCHLAGEN] Schalten des Schütz gesperrt durch Timeout oder Fehler-- sofortiges ausschalten der pumpe\n"); turnontime = -1; digitalWrite(SchuetzPin, LOW); } } ICACHE_RAM_ATTR void DruckschalterInt() { - if (digitalRead(DruckSensorPin) == HIGH) { - //pumpe einschalten - Serial.println("\n\nDruck Sensor EIN"); - if (digitalRead(WasserSensorPin)) { - Serial.println("Wasser Sensor EIN"); - pumpeSchalten(true); + schedule_function([]() { + if (digitalRead(DruckSensorPin) == HIGH) { + //pumpe einschalten + //Serial.println("\n\nDruck Sensor EIN"); + if (digitalRead(WasserSensorPin)) { + //Serial.println("Wasser Sensor EIN"); + pumpeSchalten(true); + } else { + //Serial.println("Wasser Sensor aus irgent einem Grund doch nicht ein -- sofort abschalten!"); + pumpeSchalten(false); + } } else { - Serial.println("Wasser Sensor aus irgent einem Grund doch nicht ein -- sofort abschalten!"); + //pumpe ausschalten + //Serial.println("\n\nDruck Sensor AUS"); pumpeSchalten(false); } - } else { - //pumpe ausschalten - Serial.println("\n\nDruck Sensor AUS"); - pumpeSchalten(false); - } + }); + } // time counter to wait @@ -93,48 +97,50 @@ int wateroutagewaitduration; void WasserSensorCheck() { if (digitalRead(WasserSensorPin) == LOW) { - Serial.println("Wasser Sensor AUS"); + //Serial.println("Wasser Sensor AUS"); //kein Wasser dh timer auf 10min stellen // refresh wateroutage counter generalinfo.setlastWaterOutage(Timer::getSystemSeconds()); allow = false; - Serial.println("Schalte pumpe aus"); + //Serial.println("Schalte pumpe aus"); pumpeSchalten(false); - Serial.println("warte 30min"); + //Serial.println("warte 30min"); status.detach(); wateroutagewaitduration = settingsservice.getSettings()->waterOutageWaitDuration; status.attach(5, []() { wateroutagewaitduration -= 5; - Serial.print("noch "); - Serial.print(wateroutagewaitduration); - Serial.println(" Sekunden verbleibend"); + //Serial.print("noch "); + //Serial.print(wateroutagewaitduration); + //Serial.println(" Sekunden verbleibend"); if (wateroutagewaitduration <= 0) { if (digitalRead(WasserSensorPin)) { allow = true; - Serial.println("Einschalten der Pumpe wieder erlaubt."); + //Serial.println("Einschalten der Pumpe wieder erlaubt."); //pruefen ob drucksensor ein DruckschalterInt(); } else { - Serial.print("wassersensor immer noch kein Wasser --> verlaengern um 120min\n\n"); + //Serial.print("wassersensor immer noch kein Wasser --> verlaengern um 120min\n\n"); WasserSensorCheck(); } status.detach(); } }); } else { - Serial.println("Wasser Sensor EIN"); + //Serial.println("Wasser Sensor EIN"); } } ICACHE_RAM_ATTR void WasserSensorInt() { - WasserSensorCheck(); + schedule_function([]() { + WasserSensorCheck(); + }); } void setup() { @@ -155,9 +161,9 @@ void setup() { // initilize serial connection Serial.begin(115200); - Serial.println("\n\n\n\nstartup of ESP"); - Serial.print("Version: "); - Serial.println(VERSION); + //Serial.println("\n\n\n\nstartup of ESP"); + //Serial.print("Version: "); + //Serial.println(VERSION); //initial measurement of water state @@ -179,16 +185,16 @@ void setup() { // initialize wifi - Serial.println("Initializing wifi"); + //Serial.println("Initializing wifi"); esp8266React.begin(); settingsservice.begin(); server.begin(); // initialize heating control - Serial.println("initializing heating service"); + //Serial.println("initializing heating service"); mHeat.init(Heating::HUMIDITY, settingsservice.getSettings(), &heatinginfo); - Serial.println("startup sequence complete!\n"); + //Serial.println("startup sequence complete!\n"); }