Merge branch 'master' into noprints

# Conflicts:
#	src/Heating.cpp
#	src/main.cpp

.gitlab-ci.yml

@@ -16,7 +16,7 @@ build:
   stage: build
   script:
     - "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
   artifacts:
     paths:

factory_settings.ini

@@ -13,6 +13,7 @@ build_flags =
     -D FACTORY_AP_LOCAL_IP=\"192.168.4.1\"
     -D FACTORY_AP_GATEWAY_IP=\"192.168.4.1\"
     -D FACTORY_AP_SUBNET_MASK=\"255.255.255.0\"
+    -D FACTORY_AP_VISIBLE=true
 
     ; User credentials for admin and guest user
     -D FACTORY_ADMIN_USERNAME=\"admin\"

interface/src/ap/APSettingsForm.tsx

@@ -3,8 +3,9 @@ import { TextValidator, ValidatorForm, SelectValidator } from 'react-material-ui
 
 import MenuItem from '@material-ui/core/MenuItem';
 import SaveIcon from '@material-ui/icons/Save';
+import Checkbox from '@material-ui/core/Checkbox';
 
-import { PasswordValidator, RestFormProps, FormActions, FormButton } from '../components';
+import {PasswordValidator, RestFormProps, FormActions, FormButton, BlockFormControlLabel} from '../components';
 
 import { isAPEnabled } from './APModes';
 import { APSettings, APProvisionMode } from './types';
@@ -91,6 +92,16 @@ class APSettingsForm extends React.Component<APSettingsFormProps> {
               onChange={handleValueChange('subnet_mask')}
               margin="normal"
             />
+              <BlockFormControlLabel
+                  control={
+                      <Checkbox
+                          value="network_visible"
+                          checked={data.network_visible}
+                          onChange={handleValueChange("network_visible")}
+                      />
+                  }
+                  label="Network visible?"
+              />
           </Fragment>
         }
         <FormActions>

interface/src/ap/types.ts

@@ -24,4 +24,5 @@ export interface APSettings {
   local_ip: string;
   gateway_ip: string;
   subnet_mask: string;
+  network_visible: boolean;
 }

interface/src/project/GeneralInformation.tsx

@@ -57,6 +57,12 @@ 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"

interface/src/project/HeatingInformation.tsx

@@ -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)}
                                 />
                             </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:"

interface/src/project/types.ts

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

lib/framework/APSettingsService.cpp

@@ -46,7 +46,7 @@ void APSettingsService::manageAP() {
 void APSettingsService::startAP() {
   Serial.println(F("Starting software access point"));
   WiFi.softAPConfig(_state.localIP, _state.gatewayIP, _state.subnetMask);
-  WiFi.softAP(_state.ssid.c_str(), _state.password.c_str());
+  WiFi.softAP(_state.ssid.c_str(), _state.password.c_str(), 1, !_state.networkVisible);
   if (!_dnsServer) {
     IPAddress apIp = WiFi.softAPIP();
     Serial.print(F("Starting captive portal on "));

lib/framework/APSettingsService.h

@@ -28,6 +28,10 @@
 #define FACTORY_AP_PASSWORD "esp-react"
 #endif
 
+#ifndef FACTORY_AP_VISIBLE
+#define FACTORY_AP_VISIBLE true
+#endif
+
 #ifndef FACTORY_AP_LOCAL_IP
 #define FACTORY_AP_LOCAL_IP "192.168.4.1"
 #endif
@@ -53,10 +57,11 @@ class APSettings {
   IPAddress localIP;
   IPAddress gatewayIP;
   IPAddress subnetMask;
+  bool networkVisible;
 
   bool operator==(const APSettings& settings) const {
     return provisionMode == settings.provisionMode && ssid == settings.ssid && password == settings.password &&
-           localIP == settings.localIP && gatewayIP == settings.gatewayIP && subnetMask == settings.subnetMask;
+           localIP == settings.localIP && gatewayIP == settings.gatewayIP && subnetMask == settings.subnetMask && networkVisible == settings.networkVisible;
   }
 
   static void read(APSettings& settings, JsonObject& root) {
@@ -66,6 +71,7 @@ class APSettings {
     root["local_ip"] = settings.localIP.toString();
     root["gateway_ip"] = settings.gatewayIP.toString();
     root["subnet_mask"] = settings.subnetMask.toString();
+    root["network_visible"] = settings.networkVisible;
   }
 
   static StateUpdateResult update(JsonObject& root, APSettings& settings) {
@@ -81,6 +87,7 @@ class APSettings {
     }
     newSettings.ssid = root["ssid"] | FACTORY_AP_SSID;
     newSettings.password = root["password"] | FACTORY_AP_PASSWORD;
+    newSettings.networkVisible = root["network_visible"] | FACTORY_AP_VISIBLE;
 
     JsonUtils::readIP(root, "local_ip", newSettings.localIP, FACTORY_AP_LOCAL_IP);
     JsonUtils::readIP(root, "gateway_ip", newSettings.gatewayIP, FACTORY_AP_GATEWAY_IP);

src/GeneralInfoService.cpp

@@ -9,7 +9,8 @@
 GeneralInfoService::GeneralInfoService(AsyncWebServer *server) :
         lastPumpTime(0),
         lastWaterOutage(0),
-        lastPumpDuration(0) {
+        lastPumpDuration(0),
+        pumpCycles(0) {
     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["pressuresensor"] = digitalRead(DruckSensorPin) ? true : false;
 
+    root["pumpcycles"] = pumpCycles;
+
     root["version"] = VERSION;
 
     response->setLength();
@@ -44,3 +47,7 @@ void GeneralInfoService::setlastWaterOutage(uint32_t lastWaterOutage) {
 void GeneralInfoService::setPumpDuration(uint32_t lastPumpDuration) {
     this->lastPumpDuration = lastPumpDuration;
 }
+
+void GeneralInfoService::setPumpCycles(uint32_t cycles) {
+    this->pumpCycles = cycles;
+}

src/GeneralInfoService.h

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

src/Heating.cpp

@@ -12,6 +12,7 @@ Heating::Heating() : mHeizungTicker(),
                      msettings(nullptr),
                      mheatingservice(nullptr),
                      mHeatingStatus(false),
+                     mPumpCycleActive(false),
                      lasttemp(0),
                      lasthum(0),
                      sensor() {}
@@ -32,8 +33,8 @@ void Heating::init(unsigned mode, const SettingState *settings, HeatingInfoServi
 
             sensor.onData([this](float hum, float temp) {
                 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);
 
@@ -55,13 +56,16 @@ void Heating::init(unsigned mode, const SettingState *settings, HeatingInfoServi
                     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]() {
-                sensor.read();
+                // only check if no pump cycle is active
+                if (!mPumpCycleActive) {
+                    sensor.read();
+                }
             });
 
             break;
@@ -76,9 +80,10 @@ 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);
 
             mHeatingStatus = true;
@@ -90,7 +95,9 @@ 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());
 
             // if heating status in on set ticker to turn of fan in 60sec
             if (mHeatingStatus) {
@@ -98,7 +105,7 @@ void Heating::handleHeatingEvents() {
                     // turn off fan
                     digitalWrite(LuefterPin, LOW);
                     schedule_function([]() {
-                        Serial.println("turning off fan");
+                        ////Serial.println("turning off fan");
                     });
                 });
             }
@@ -119,21 +126,46 @@ 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!");
         });
     };
 
     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();
+            }
+        });
+    }
+}

src/Heating.h

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

src/HeatingInfoService.cpp

@@ -10,7 +10,8 @@ HeatingInfoService::HeatingInfoService(AsyncWebServer *server) :
         hum(-1),
         temp(-1),
         lastheating(0),
-        lastheatend(0) {
+        lastheatend(0),
+        totalHeatTime(0) {
     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
     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);
 }
@@ -44,3 +48,11 @@ 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;
+}

src/HeatingInfoService.h

@@ -18,9 +18,16 @@ 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);
 
@@ -29,6 +36,8 @@ private:
 
     unsigned long lastheating;
     unsigned long lastheatend;
+
+    uint32_t totalHeatTime;
 };
 
 

src/Pins.h

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

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();
     }

src/main.cpp

@@ -21,6 +21,7 @@ Ticker pumpendauer;
 Heating mHeat;
 
 uint32_t turnontime = 0;
+uint32_t pumpcycles = 0;
 
 AsyncWebServer server(80);
 ESP8266React esp8266React(&server);
@@ -32,56 +33,69 @@ 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) {
         if (on) {
-            pumpendauer.once((float)settingsservice.getSettings()->maxpumpduration + 1, []() {
+            pumpcycles++;
+            generalinfo.setPumpCycles(pumpcycles);
+
+            // pump cycle started
+            mHeat.setPumCycleActive(true);
+
+            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;
                 }
             });
         } else {
             generalinfo.setPumpDuration(Timer::getSystemSeconds() - turnontime);
+
+            // pump cycle stopped...
+            mHeat.setPumCycleActive(false);
         }
 
         // save pump start time
         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) {
+    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 {
-            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
@@ -89,48 +103,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("noch ");
-            Serial.print(wateroutagewaitduration);
+            //Serial.print(wateroutagewaitduration);
-            Serial.println(" Sekunden verbleibend");
+            //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() {
@@ -151,9 +167,9 @@ void setup() {
 
     // initilize serial connection
     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
@@ -175,16 +191,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");
 }