more improvements

2023-07-06 11:56:35 +02:00
parent ac995522db
commit a62c403cc2
4 changed files with 85 additions and 17 deletions
@@ -10,7 +10,8 @@ class Pump {
            Timer = 2,
            Standby = 3,
            clearErrorHelper = 99,
-            Error = 100,
+            PreError = 100,
+            Error = 110,
            OnStupid = 200
        };

@@ -33,10 +34,13 @@ class Pump {

    private:
        static const uint8_t delayCheckSensor = 100;
-        static const uint8_t delayReadSensor = 33;
+        static const uint8_t delayReadPressure = 33;
+        static const uint8_t minPressure = 100;
        static const uint16_t blinkTime = 1000;
+        static const uint16_t delayReadFlow = 1000;
        static const uint16_t maxPressure = 1000;
        static const uint16_t maxMaxPressureTime = 30000;
+        static const uint16_t maxPreErrorTime = 30000;

        void readSensorValues();
        bool checkSensorsValues();
@@ -45,7 +49,9 @@ class Pump {
        void stateTimer();
        void stateStandby();
        void stateError();
+        void statePreError(bool checkSensors);
        State state = State::Off;
+        State lastStatePreError;

        bool ledState = false;
        bool timerStandby = false;
@@ -63,6 +69,8 @@ class Pump {
        uint32_t duration;
        uint32_t lastMillisTimer = 0;
        uint32_t lastMillisCheckSensor = 0;
-        uint32_t lastMillisReadSensor = 0;
+        uint32_t lastMillisReadPressure = 0;
+        uint32_t lastMillisReadFlow = 0;
        uint32_t maxPressureStart = 0;
+        uint32_t preErrorStartTime;
 };