make a lot of things better

lib/Pump/pump.h

@@ -9,6 +9,7 @@ class Pump {
             On = 1,
             Timer = 2,
             Standby = 3,
+            clearErrorHelper = 99,
             Error = 100,
             OnStupid = 200
         };
@@ -18,23 +19,27 @@ class Pump {
         void loop();
 
         void activate(uint32_t duration = 0);
+        void activateWithoutSecurity();
         void stop();
         void clearError();
 
-        uint16_t getPressure();
-        uint32_t getRunningTime();
-        uint16_t getFlow();
-        uint8_t getStatus();
+        uint16_t getPressure() const { return this->pressure; }
+        uint32_t getRunningTime() const;
+        uint32_t getRemainingTime() const;
+        uint16_t getFlow() const { return this->flow; }
+        uint8_t getStatus() const { return (uint8_t) this->state; }
 
-        State getState() { return this->state; }
+        State getState() const { return this->state; }
 
     private:
-        static const uint8_t delayCheckSensor = 50;
+        static const uint8_t delayCheckSensor = 100;
+        static const uint8_t delayReadSensor = 33;
         static const uint16_t blinkTime = 1000;
         static const uint16_t maxPressure = 1000;
         static const uint16_t maxMaxPressureTime = 30000;
 
-        bool checkSensors();
+        void readSensorValues();
+        bool checkSensorsValues();
         void handlePins(bool state);
         void changeState(State state);
         void stateTimer();
@@ -50,6 +55,7 @@ class Pump {
         uint8_t flowPin;
         uint8_t ledPin;
 
+        uint16_t delayTimer = 1000;
         uint16_t flow;
         uint16_t pressure;
 
@@ -57,5 +63,6 @@ class Pump {
         uint32_t duration;
         uint32_t lastMillisTimer = 0;
         uint32_t lastMillisCheckSensor = 0;
+        uint32_t lastMillisReadSensor = 0;
         uint32_t maxPressureStart = 0;
 };