Compare commits

..

8 Commits

Author SHA1 Message Date
5cfd78f942 Merge branch 'master' into noprints
# Conflicts:
#	src/Heating.cpp
#	src/main.cpp
2021-03-31 17:50:29 +02:00
3a5f1a3a74 interrupt full heat cycle when pump starts 2021-03-31 17:46:36 +02:00
39a8ecde85 turn of fan when pump cycle starts to prevent too much current draw 2021-03-31 17:28:54 +02:00
a9671773f3 comment out all Serialprints to not interrupt timer functions 2021-03-31 17:03:36 +02:00
5351bcb15d round to two float precision 2021-03-20 15:46:31 +01:00
983d2b9ce7 correct percent value 2021-03-06 23:50:36 +01:00
62cea9932e correct version parsing
and float conversion of percent value
2021-03-06 14:39:32 +01:00
3b502ac434 add features to show total heating time and percentage on heating tab
and total pump cycles on homepage
2021-03-06 14:21:12 +01:00
5 changed files with 116 additions and 81 deletions

View File

@ -12,6 +12,7 @@ Heating::Heating() : mHeizungTicker(),
msettings(nullptr), msettings(nullptr),
mheatingservice(nullptr), mheatingservice(nullptr),
mHeatingStatus(false), mHeatingStatus(false),
mPumpCycleActive(false),
lasttemp(0), lasttemp(0),
lasthum(0), lasthum(0),
sensor() {} sensor() {}
@ -32,8 +33,8 @@ void Heating::init(unsigned mode, const SettingState *settings, HeatingInfoServi
sensor.onData([this](float hum, float temp) { sensor.onData([this](float hum, float temp) {
schedule_function([hum, temp, this]() { schedule_function([hum, temp, this]() {
Serial.printf("Temp: %gdegC\n", temp); // Serial.printf("Temp: %gdegC\n", temp);
Serial.printf("Humid: %g%%\n", hum); // Serial.printf("Humid: %g%%\n", hum);
mheatingservice->setSensorData(hum, temp); mheatingservice->setSensorData(hum, temp);
@ -55,13 +56,16 @@ void Heating::init(unsigned mode, const SettingState *settings, HeatingInfoServi
digitalWrite(HeizungPin, LOW); digitalWrite(HeizungPin, LOW);
} }
schedule_function([e]() { // schedule_function([e]() {
Serial.printf("Error: %d\n", e); // Serial.printf("Error: %d\n", e);
}); // });
}); });
mHeizungTicker.attach(10, [this]() { mHeizungTicker.attach(10, [this]() {
sensor.read(); // only check if no pump cycle is active
if (!mPumpCycleActive) {
sensor.read();
}
}); });
break; break;
@ -76,9 +80,10 @@ void Heating::handleHeatingEvents() {
if (mHeatingStatus == false) { if (mHeatingStatus == false) {
// turn off active turnoff timers // turn off active turnoff timers
mLuefterTicker.detach(); mLuefterTicker.detach();
Serial.println("heating should run now!"); //Serial.println("heating should run now!");
// turn on heating and fan
digitalWrite(LuefterPin, HIGH); digitalWrite(LuefterPin, HIGH);
digitalWrite(HeizungPin, HIGH); digitalWrite(HeizungPin, HIGH);
mHeatingStatus = true; mHeatingStatus = true;
@ -90,7 +95,7 @@ void Heating::handleHeatingEvents() {
// if humidity too low turn off heating and fan after 60secs // if humidity too low turn off heating and fan after 60secs
if (mHeatingStatus == true) { if (mHeatingStatus == true) {
digitalWrite(HeizungPin, LOW); 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 // add the heat time it took to the total
mheatingservice->addHeatTime(Timer::getSystemSeconds() - mheatingservice->getLastHeatingStartTime()); mheatingservice->addHeatTime(Timer::getSystemSeconds() - mheatingservice->getLastHeatingStartTime());
@ -100,7 +105,7 @@ void Heating::handleHeatingEvents() {
// turn off fan // turn off fan
digitalWrite(LuefterPin, LOW); digitalWrite(LuefterPin, LOW);
schedule_function([]() { schedule_function([]() {
Serial.println("turning off fan"); ////Serial.println("turning off fan");
}); });
}); });
} }
@ -121,21 +126,46 @@ void Heating::handleTimeHeater() {
digitalWrite(LuefterPin, HIGH); digitalWrite(LuefterPin, HIGH);
digitalWrite(HeizungPin, HIGH); digitalWrite(HeizungPin, HIGH);
Serial.println("Turning on heating"); ////Serial.println("Turning on heating");
mTurnOffTicker.once((int) ((float) refreshperiod * (float) percentOn / 100.0), []() { mTurnOffTicker.once((int) ((float) refreshperiod * (float) percentOn / 100.0), []() {
digitalWrite(HeizungPin, LOW); digitalWrite(HeizungPin, LOW);
Serial.println("Turned off heating!"); ////Serial.println("Turned off heating!");
}); });
mLuefterTicker.once((int) (((float) refreshperiod * (float) percentOn / 100.0) + 30.0), []() { mLuefterTicker.once((int) (((float) refreshperiod * (float) percentOn / 100.0) + 30.0), []() {
digitalWrite(LuefterPin, LOW); digitalWrite(LuefterPin, LOW);
Serial.println("Turned off fan!"); ////Serial.println("Turned off fan!");
}); });
}; };
func(); func();
mHeizungTicker.attach(refreshperiod, func); mHeizungTicker.attach(refreshperiod, func);
} }
void Heating::setPumCycleActive(bool active) {
mPumpCycleActive = active;
// turn off fan if pumpcycleactive
if (active) {
digitalWrite(LuefterPin, LOW);
digitalWrite(HeizungPin, LOW);
mHeizungTicker.detach();
if (mHeatingStatus) {
// to add the correct time to the heat min counter!
mheatingservice->addHeatTime(Timer::getSystemSeconds() - mheatingservice->getLastHeatingStartTime());
}
} else {
mHeizungTicker.detach();
mHeizungTicker.attach(10, [this]() {
// only check if no pump cycle is active
if (!mPumpCycleActive) {
sensor.read();
}
});
}
}

View File

@ -21,6 +21,8 @@ public:
*/ */
void init(unsigned mode, const SettingState* settings, HeatingInfoService *heatingservice); void init(unsigned mode, const SettingState* settings, HeatingInfoService *heatingservice);
void setPumCycleActive(bool active);
enum MODES {TIME, HUMIDITY}; enum MODES {TIME, HUMIDITY};
private: private:
Ticker mHeizungTicker; Ticker mHeizungTicker;
@ -30,7 +32,7 @@ private:
const SettingState* msettings; const SettingState* msettings;
HeatingInfoService *mheatingservice; HeatingInfoService *mheatingservice;
bool mHeatingStatus; bool mHeatingStatus, mPumpCycleActive;
float lasttemp; float lasttemp;
float lasthum; float lasthum;

View File

@ -16,6 +16,6 @@
#define TempSensorPin D4 #define TempSensorPin D4
// version info // version info
#define VERSION "v1.2.4-Alpha2" #define VERSION "v1.2.4-Alpa1"
#endif //PUMPENSTEUERUNG_PINS_H #endif //PUMPENSTEUERUNG_PINS_H

View File

@ -17,12 +17,12 @@ SettingsService::SettingsService(AsyncWebServer *server, SecurityManager *securi
} }
void SettingsService::onConfigUpdated() { void SettingsService::onConfigUpdated() {
Serial.println("switching led!"); ////Serial.println("switching led!");
File settingsFile = ESPFS.open("settings.json", "w+"); File settingsFile = ESPFS.open("settings.json", "w+");
if (settingsFile) { if (settingsFile) {
Serial.println("writing config file!"); ////Serial.println("writing config file!");
StaticJsonDocument<256> doc; StaticJsonDocument<256> doc;
doc["waterOutageWaitDuration"] = _state.waterOutageWaitDuration; doc["waterOutageWaitDuration"] = _state.waterOutageWaitDuration;
@ -46,7 +46,7 @@ void SettingsService::begin() {
// Deserialize the JSON document // Deserialize the JSON document
DeserializationError error = deserializeJson(doc, settingsFile); DeserializationError error = deserializeJson(doc, settingsFile);
if (error) { if (error) {
Serial.println(F("Failed to read file, using default configuration")); ////Serial.println(F("Failed to read file, using default configuration"));
onConfigUpdated(); onConfigUpdated();
return; return;
} }
@ -59,7 +59,7 @@ void SettingsService::begin() {
_state.heatLow = doc["heatLow"] | 65; _state.heatLow = doc["heatLow"] | 65;
_state.fanRuntime = doc["fanRuntime"] | 60; _state.fanRuntime = doc["fanRuntime"] | 60;
Serial.println("read config file!"); ////Serial.println("read config file!");
settingsFile.close(); settingsFile.close();
} }

View File

@ -15,7 +15,7 @@ bool error = false;
Ticker status; Ticker status;
//pumpendauer maximum ticker //pumpendauer maximum ticker
Ticker pumpendauer, wasserSensorDoubleCheck; Ticker pumpendauer;
//WifiManager mang; //WifiManager mang;
Heating mHeat; Heating mHeat;
@ -33,11 +33,11 @@ SettingsService settingsservice = SettingsService(&server, esp8266React.getSecur
void pumpeSchalten(bool on) { void pumpeSchalten(bool on) {
// digitalWrite(4,on); // digitalWrite(4,on);
if (on) { if (on) {
Serial.println("versuche Pumpe EIN zuschalten"); //Serial.println("versuche Pumpe EIN zuschalten");
// refresh last pump counter // refresh last pump counter
generalinfo.setlastPumpTime(Timer::getSystemSeconds()); generalinfo.setlastPumpTime(Timer::getSystemSeconds());
} else { } else {
Serial.println("versuche Pumpe AUS zuschalten"); //Serial.println("versuche Pumpe AUS zuschalten");
} }
if (allow && !error) { if (allow && !error) {
@ -45,49 +45,57 @@ void pumpeSchalten(bool on) {
pumpcycles++; pumpcycles++;
generalinfo.setPumpCycles(pumpcycles); generalinfo.setPumpCycles(pumpcycles);
// pump cycle started
mHeat.setPumCycleActive(true);
pumpendauer.once((float) settingsservice.getSettings()->maxpumpduration + 1, []() { pumpendauer.once((float) settingsservice.getSettings()->maxpumpduration + 1, []() {
//erlaube keine einschaltung von mehr als 60 sek //erlaube keine einschaltung von mehr als 60 sek
if (Timer::getSystemSeconds() - turnontime >= if (Timer::getSystemSeconds() - turnontime >=
(unsigned) settingsservice.getSettings()->maxpumpduration && turnontime != 0) { (unsigned) settingsservice.getSettings()->maxpumpduration && turnontime != 0) {
//error zu lange //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); pumpeSchalten(false);
error = true; error = true;
} }
}); });
} else { } else {
generalinfo.setPumpDuration(Timer::getSystemSeconds() - turnontime); generalinfo.setPumpDuration(Timer::getSystemSeconds() - turnontime);
// pump cycle stopped...
mHeat.setPumCycleActive(false);
} }
// save pump start time // save pump start time
turnontime = Timer::getSystemSeconds(); turnontime = Timer::getSystemSeconds();
digitalWrite(SchuetzPin, on); digitalWrite(SchuetzPin, on);
Serial.println("[Erfolg] pumpe wird geschalten"); //Serial.println("[Erfolg] pumpe wird geschalten");
} else { } else {
Serial.println( //Serial.println("[FEHLGESCHLAGEN] Schalten des Schütz gesperrt durch Timeout oder Fehler-- sofortiges ausschalten der pumpe\n");
"[FEHLGESCHLAGEN] Schalten des Schütz gesperrt durch Timeout oder Fehler-- sofortiges ausschalten der pumpe\n");
turnontime = -1; turnontime = -1;
digitalWrite(SchuetzPin, LOW); digitalWrite(SchuetzPin, LOW);
} }
} }
ICACHE_RAM_ATTR void DruckschalterInt() { ICACHE_RAM_ATTR void DruckschalterInt() {
if (digitalRead(DruckSensorPin) == HIGH) { schedule_function([]() {
//pumpe einschalten if (digitalRead(DruckSensorPin) == HIGH) {
Serial.println("\n\nDruck Sensor EIN"); //pumpe einschalten
if (digitalRead(WasserSensorPin)) { //Serial.println("\n\nDruck Sensor EIN");
Serial.println("Wasser Sensor EIN"); if (digitalRead(WasserSensorPin)) {
pumpeSchalten(true); //Serial.println("Wasser Sensor EIN");
pumpeSchalten(true);
} else {
//Serial.println("Wasser Sensor aus irgent einem Grund doch nicht ein -- sofort abschalten!");
pumpeSchalten(false);
}
} else { } else {
Serial.println("Wasser Sensor aus irgent einem Grund doch nicht ein -- sofort abschalten!"); //pumpe ausschalten
//Serial.println("\n\nDruck Sensor AUS");
pumpeSchalten(false); pumpeSchalten(false);
} }
} else { });
//pumpe ausschalten
Serial.println("\n\nDruck Sensor AUS");
pumpeSchalten(false);
}
} }
// time counter to wait // time counter to wait
@ -95,55 +103,50 @@ int wateroutagewaitduration;
void WasserSensorCheck() { void WasserSensorCheck() {
if (digitalRead(WasserSensorPin) == LOW) { if (digitalRead(WasserSensorPin) == LOW) {
// check if water sensor is also low after 500ms and lock it then //Serial.println("Wasser Sensor AUS");
wasserSensorDoubleCheck.once_ms(500, []() { //kein Wasser dh timer auf 10min stellen
if (digitalRead(WasserSensorPin) == LOW) {
Serial.println("Wasser Sensor AUS");
//kein Wasser dh timer auf 10min stellen
// refresh wateroutage counter // refresh wateroutage counter
generalinfo.setlastWaterOutage(Timer::getSystemSeconds()); generalinfo.setlastWaterOutage(Timer::getSystemSeconds());
allow = false; allow = false;
Serial.println("Schalte pumpe aus"); //Serial.println("Schalte pumpe aus");
pumpeSchalten(false); 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");
if (wateroutagewaitduration <= 0) {
if (digitalRead(WasserSensorPin)) {
allow = true;
//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");
WasserSensorCheck();
}
status.detach(); status.detach();
wateroutagewaitduration = settingsservice.getSettings()->waterOutageWaitDuration;
status.detach();
status.attach(5, []() {
wateroutagewaitduration -= 5;
Serial.print("noch ");
Serial.print(wateroutagewaitduration);
Serial.println(" Sekunden verbleibend");
if (wateroutagewaitduration <= 0) {
status.detach();
if (digitalRead(WasserSensorPin)) {
allow = true;
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");
WasserSensorCheck();
}
}
});
} }
}); });
} else { } else {
Serial.println("Wasser Sensor EIN"); //Serial.println("Wasser Sensor EIN");
} }
} }
ICACHE_RAM_ATTR void WasserSensorInt() { ICACHE_RAM_ATTR void WasserSensorInt() {
WasserSensorCheck(); schedule_function([]() {
WasserSensorCheck();
});
} }
void setup() { void setup() {
@ -164,9 +167,9 @@ void setup() {
// initilize serial connection // initilize serial connection
Serial.begin(115200); Serial.begin(115200);
Serial.println("\n\n\n\nstartup of ESP"); //Serial.println("\n\n\n\nstartup of ESP");
Serial.print("Version: "); //Serial.print("Version: ");
Serial.println(VERSION); //Serial.println(VERSION);
//initial measurement of water state //initial measurement of water state
@ -188,16 +191,16 @@ void setup() {
// initialize wifi // initialize wifi
Serial.println("Initializing wifi"); //Serial.println("Initializing wifi");
esp8266React.begin(); esp8266React.begin();
settingsservice.begin(); settingsservice.begin();
server.begin(); server.begin();
// initialize heating control // initialize heating control
Serial.println("initializing heating service"); //Serial.println("initializing heating service");
mHeat.init(Heating::HUMIDITY, settingsservice.getSettings(), &heatinginfo); mHeat.init(Heating::HUMIDITY, settingsservice.getSettings(), &heatinginfo);
Serial.println("startup sequence complete!\n"); //Serial.println("startup sequence complete!\n");
} }