Merge branch 'pumpcounter' into 'master'

Total heating time and pump count

See merge request lukas/pumpensteuerung!9
This commit is contained in:
Lukas Heiligenbrunner 2021-03-26 22:15:20 +00:00
commit 9c782879a5
11 changed files with 56 additions and 5 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -91,6 +91,8 @@ void Heating::handleHeatingEvents() {
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
mheatingservice->addHeatTime(Timer::getSystemSeconds() - mheatingservice->getLastHeatingStartTime());
// if heating status in on set ticker to turn of fan in 60sec // if heating status in on set ticker to turn of fan in 60sec
if (mHeatingStatus) { if (mHeatingStatus) {

View File

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

View File

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

View File

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

View File

@ -21,6 +21,7 @@ Ticker pumpendauer;
Heating mHeat; Heating mHeat;
uint32_t turnontime = 0; uint32_t turnontime = 0;
uint32_t pumpcycles = 0;
AsyncWebServer server(80); AsyncWebServer server(80);
ESP8266React esp8266React(&server); ESP8266React esp8266React(&server);
@ -41,6 +42,9 @@ void pumpeSchalten(bool on) {
if (allow && !error) { if (allow && !error) {
if (on) { 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 //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) {