Merge pull request #83 from makers-for-life/dev

Fixes + send all fatal errors to telemetry on startup calibration (full tested w/ UI)

Author: valeriansaliou

includes/telemetry.h

@@ -129,20 +129,20 @@ void sendControlAck(uint8_t setting, uint16_t value);
 void sendWatchdogRestartFatalError(void);
 
 // /// Send a "calibration" fatal error
-// void sendCalibrationFatalError(int16_t pressureOffsetValue,
-//                                int16_t minPressureValue,
-//                                int16_t maxPressureValue,
-//                                int16_t flowAtStartingValue,
-//                                int16_t flowWithBlowerOnValue);
+void sendCalibrationFatalError(int16_t pressureOffsetValue,
+                               int16_t minPressureValue,
+                               int16_t maxPressureValue,
+                               int16_t flowAtStartingValue,
+                               int16_t flowWithBlowerOnValue);
 
 /// Send a "battery deeply discharged" fatal error
 void sendBatteryDeeplyDischargedFatalError(uint16_t batteryLevelValue);
 
-// /// Send a "mass flow meter" fatal error
-// void sendMassFlowMeterFatalError(void);
+/// Send a "mass flow meter" fatal error
+void sendMassFlowMeterFatalError(void);
 
 // /// Send a "inconsistent pressure" fatal error
-// void sendInconsistentPressureFatalError(uint16_t pressureValue);
+void sendInconsistentPressureFatalError(uint16_t pressureValue);
 
 /**
  * Convert and round a pressure in mmH2O to a pressure in cmH2O

srcs/calibration.cpp

@@ -20,6 +20,7 @@
 #include "../includes/pressure.h"
 #include "../includes/pressure_valve.h"
 #include "../includes/screen.h"
+#include "../includes/telemetry.h"
 
 // External
 #include "Arduino.h"
@@ -71,6 +72,7 @@ void Calibration_Init() {
             // Invalid calibration
             calibrationValid = false;
             displayPressureOffsetUnstable(minOffsetValue, maxOffsetValue);
+            sendInconsistentPressureFatalError(inspiratoryPressureSensorOffset);
             Buzzer_High_Prio_Start();
             Calibration_Read_Keyboard();
         } else {
@@ -101,11 +103,26 @@ void Calibration_Init() {
             blower.stop();
 
             // Happens when flow meter fails
-            if (((flowMeterFlowAtStarting < -1000) || (flowMeterFlowAtStarting > 1000)
-                 || (flowMeterFlowWithBlowerOn < 20000) || (flowMeterFlowWithBlowerOn > 100000))) {
+            bool isMassFlowMeterOutOfRange = ((flowMeterFlowAtStarting < -1000)
+                                              || (flowMeterFlowAtStarting > 1000));
+
+            if ((isMassFlowMeterOutOfRange == true)
+                || ((flowMeterFlowWithBlowerOn < 20000) || (flowMeterFlowWithBlowerOn > 100000))) {
                 // Invalid calibration
                 calibrationValid = false;
                 displayFlowMeterFail(flowMeterFlowAtStarting, flowMeterFlowWithBlowerOn);
+
+                // MFM reports an out-of-range value, it might not be connected
+                if (isMassFlowMeterOutOfRange == true) {
+                    // MFM failure (eg. not connected)
+                    sendMassFlowMeterFatalError();
+                } else {
+                    // Other calibration errors
+                    sendCalibrationFatalError(inspiratoryPressureSensorOffset, minOffsetValue,
+                                              maxOffsetValue, flowMeterFlowAtStarting,
+                                              flowMeterFlowWithBlowerOn);
+                }
+
                 Buzzer_High_Prio_Start();
                 Calibration_Read_Keyboard();
             } else {