lukas/PumpenSteuerung
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: lukas:master
Branches Tags
lukas:master
lukas:noprints
lukas:v1.2.4
lukas:v1.2.3
lukas:v1.2.2
lukas:v1.2.0
..
compare: lukas:v1.2.4
Branches Tags
lukas:master
lukas:noprints
lukas:v1.2.4
lukas:v1.2.3
lukas:v1.2.2
lukas:v1.2.0

No commits in common. "master" and "v1.2.4" have entirely different histories.
master ... v1.2.4

11 changed files with 37 additions and 97 deletions
Show Stats Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -16,7 +16,7 @@ build:
stage: build
script:
- "platformio run -e esp12e"
- vers=$(grep -Po '[0-9]+\.[0-9]+\.[0-9]+[-0-9A-Za-z]*(?=\")' ./src/Pins.h)
- vers=$(grep -Po '[0-9]*\.[0-9]*\.[0-9]*(?=\")' ./src/Pins.h)
- mv .pio/build/esp12e/*.bin Pumpensteuerung-${vers}.bin
artifacts:
paths:

6
interface/src/project/GeneralInformation.tsx
View File

@ -57,12 +57,6 @@ class GeneralInformation extends Component<GeneralInformationRestControllerProps
secondary={props.data.lastPumpDuration !== 0 ? stringifyTime(props.data.lastPumpDuration) : "-"}
/>
</ListItem>
<ListItem>
<ListItemText
primary="Pumpzyklen seit Programmstart"
secondary={props.data.pumpcycles}
/>
</ListItem>
<ListItem>
<ListItemText
primary="WasserSensor / DruckSensor"

6
interface/src/project/HeatingInformation.tsx
View File

@ -39,12 +39,6 @@ class HeatingInformation extends React.Component<HeatingRestcontollerprops> {
secondary={props.data.lastheatduration === 0 ? "-" : props.data.lastheatduration === -1 ? "läuft gerade!" : stringifyTime(props.data.lastheatduration)}
/>
</ListItem>
<ListItem>
<ListItemText
primary="Gesammte Heizdauer / Prozentuelle Einschaltzeit"
secondary={stringifyTime(props.data.totalheattime) + ' / ' + (props.data.heattimepercent * 100).toFixed(2) + '%'}
/>
</ListItem>
<ListItem>
<ListItemText
primary="Temperatur/Luftfeuchtigkeit:"

4
interface/src/project/types.ts
View File

@ -14,7 +14,6 @@ export interface GeneralInformaitonState {
watersensor: boolean;
pressuresensor: boolean;
version: string;
pumpcycles: number;
}
export interface HeatingInformationState {
@ -22,6 +21,5 @@ export interface HeatingInformationState {
lastheatduration: number;
hum: number;
temp: number;
totalheattime: number;
heattimepercent: number;
}

9
src/GeneralInfoService.cpp
View File

@ -9,8 +9,7 @@
GeneralInfoService::GeneralInfoService(AsyncWebServer *server) :
lastPumpTime(0),
lastWaterOutage(0),
lastPumpDuration(0),
pumpCycles(0) {
lastPumpDuration(0) {
server->on(GENERALINFO_SERVICE_PATH, HTTP_GET, std::bind(&GeneralInfoService::reply, this, std::placeholders::_1));
}
@ -28,8 +27,6 @@ void GeneralInfoService::reply(AsyncWebServerRequest *request) {
root["watersensor"] = digitalRead(WasserSensorPin) ? true : false;
root["pressuresensor"] = digitalRead(DruckSensorPin) ? true : false;
root["pumpcycles"] = pumpCycles;
root["version"] = VERSION;
response->setLength();
@ -47,7 +44,3 @@ void GeneralInfoService::setlastWaterOutage(uint32_t lastWaterOutage) {
void GeneralInfoService::setPumpDuration(uint32_t lastPumpDuration) {
this->lastPumpDuration = lastPumpDuration;
}
void GeneralInfoService::setPumpCycles(uint32_t cycles) {
this->pumpCycles = cycles;
}

3
src/GeneralInfoService.h
View File

@ -37,14 +37,11 @@ public:
*/
void setPumpDuration(uint32_t lastPumpDuration);
void setPumpCycles(uint32_t i);
private:
void reply(AsyncWebServerRequest* request);
unsigned long lastPumpTime, lastWaterOutage, lastPumpDuration;
uint32_t pumpCycles;
};

2
src/Heating.cpp
View File

@ -91,8 +91,6 @@ void Heating::handleHeatingEvents() {
if (mHeatingStatus == true) {
digitalWrite(HeizungPin, LOW);
Serial.println("heating should NOT run now!");
// add the heat time it took to the total
mheatingservice->addHeatTime(Timer::getSystemSeconds() - mheatingservice->getLastHeatingStartTime());
// if heating status in on set ticker to turn of fan in 60sec
if (mHeatingStatus) {

14
src/HeatingInfoService.cpp
View File

@ -10,8 +10,7 @@ HeatingInfoService::HeatingInfoService(AsyncWebServer *server) :
hum(-1),
temp(-1),
lastheating(0),
lastheatend(0),
totalHeatTime(0) {
lastheatend(0) {
server->on(HEATINGINFO_SERVICE_PATH, HTTP_GET, std::bind(&HeatingInfoService::reply, this, std::placeholders::_1));
}
@ -29,9 +28,6 @@ void HeatingInfoService::reply(AsyncWebServerRequest *request) {
// if lastheatend == 0 => heating is currently active
root["lastheatduration"] = lastheating == 0 ? 0 : lastheatend == 0 ? -1 : lastheatend - lastheating;
root["totalheattime"] = this->totalHeatTime;
root["heattimepercent"] = (float)this->totalHeatTime / (float)Timer::getSystemSeconds();
response->setLength();
request->send(response);
}
@ -48,11 +44,3 @@ void HeatingInfoService::setLastHeatingStarttime(unsigned long time) {
void HeatingInfoService::setLastHetingEndtime(unsigned long time) {
this->lastheatend = time;
}
uint32_t HeatingInfoService::getLastHeatingStartTime() {
return this->lastheating;
}
void HeatingInfoService::addHeatTime(uint32_t time) {
totalHeatTime += time;
}

9
src/HeatingInfoService.h
View File

@ -18,16 +18,9 @@ public:
void setSensorData(float hum, float temp);
void setLastHeatingStarttime(unsigned long time);
uint32_t getLastHeatingStartTime();
void setLastHetingEndtime(unsigned long time);
/**
* add time how long the heater heated
* @param time time in seconds
*/
void addHeatTime(uint32_t time);
private:
void reply(AsyncWebServerRequest* request);
@ -36,8 +29,6 @@ private:
unsigned long lastheating;
unsigned long lastheatend;
uint32_t totalHeatTime;
};

2
src/Pins.h
View File

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

77
src/main.cpp
View File

@ -15,13 +15,12 @@ bool error = false;
Ticker status;
//pumpendauer maximum ticker
Ticker pumpendauer, wasserSensorDoubleCheck;
Ticker pumpendauer;
//WifiManager mang;
Heating mHeat;
uint32_t turnontime = 0;
uint32_t pumpcycles = 0;
AsyncWebServer server(80);
ESP8266React esp8266React(&server);
@ -42,13 +41,9 @@ void pumpeSchalten(bool on) {
if (allow && !error) {
if (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");
pumpeSchalten(false);
@ -65,8 +60,7 @@ void pumpeSchalten(bool on) {
digitalWrite(SchuetzPin, on);
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);
}
@ -95,46 +89,39 @@ int wateroutagewaitduration;
void WasserSensorCheck() {
if (digitalRead(WasserSensorPin) == LOW) {
// check if water sensor is also low after 500ms and lock it then
wasserSensorDoubleCheck.once_ms(500, []() {
if (digitalRead(WasserSensorPin) == LOW) {
Serial.println("Wasser Sensor AUS");
//kein Wasser dh timer auf 10min stellen
Serial.println("Wasser Sensor AUS");
//kein Wasser dh timer auf 10min stellen
// refresh wateroutage counter
generalinfo.setlastWaterOutage(Timer::getSystemSeconds());
// refresh wateroutage counter
generalinfo.setlastWaterOutage(Timer::getSystemSeconds());
allow = false;
Serial.println("Schalte pumpe aus");
pumpeSchalten(false);
allow = false;
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");
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();
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 {