cross pressure sensors

5 files changed, 20 insertions, 15 deletions

diff --git a/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c b/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c
index b44af40fa..c130b0275 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c
@@ -213,7 +213,7 @@ int TemperatureListString(char* str)
                         TempSensorResponse[HEAD_PT100_ZONE_3_0X82_0].Temperature_C_mult_by_100/100,
                         TempSensorResponse[HEAD_PT100_AIR_HEATER_1_0X8C_0].Temperature_C_mult_by_100/100, TempSensorResponse[HEAD_PT100_AIR_HEATER_2_0X8C_1].Temperature_C_mult_by_100/100,
                         TempSensorResponse[HEAD_PT100_MIXER_0X8E_0].Temperature_C_mult_by_100/100,  TempSensorResponse[TEMP_SENSE_ANALOG_DRYER_TEMP1].Temperature_C_mult_by_100/100,
-                        (int)(GetWHSAirFlow(HEAD_FLOW_METER)*100),(int)(PressureSensorGetPressure(HEAD_PT100_ZONE_5_0X84_0)*100),(int)(PressureSensorGetPressure(HEAD_PT100_ZONE_7_0X86_0)*100));
+                        (int)(GetWHSAirFlow(HEAD_FLOW_METER)*100),(int)(PressureSensorGetPressure(HEAD_FAN_RIGHT)*100),(int)(PressureSensorGetPressure(HEAD_FAN_LEFT)*100));
     }
     else
     {
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index b159897aa..9d9c36623 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -532,10 +532,10 @@ void CopyTemperaturesToMonitor(void)
         DiagnosticsMonitor.n_headzone12temperature =
                 HeaterCounterIndex[HEATER_TYPE__HeaterZone12];
 
-        DiagnosticsMonitor.n_headblower1airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone5];
-        DiagnosticsMonitor.n_headblower2airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone7];
-        headblower1airflow = PressureSensorGetPressure(HEAD_PT100_ZONE_5_0X84_0);
-        headblower2airflow = PressureSensorGetPressure(HEAD_PT100_ZONE_7_0X86_0);
+        DiagnosticsMonitor.n_headblower1airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone7];
+        DiagnosticsMonitor.n_headblower2airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone5];
+        headblower1airflow = PressureSensorGetPressure(HEAD_FAN_RIGHT);
+        headblower2airflow = PressureSensorGetPressure(HEAD_FAN_LEFT);
         DiagnosticsMonitor.headblower1airflow = &headblower1airflow;
         DiagnosticsMonitor.headblower2airflow = &headblower2airflow;
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
index 59a0aee51..42def625c 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
@@ -58,7 +58,7 @@ extern uint8_t Head_Fan_PWM_Command[2];
 uint32_t    PressureSensorV0[2] = {0, 0};
 uint8_t     HeadBlowersCloseLoopTime[2] = {2, 2};
 uint8_t     HeadBlowersEnable = 1;
-uint8_t     BlowerIdToSensorId[2] = {HEAD_PT100_ZONE_5_0X84_0, HEAD_PT100_ZONE_7_0X86_0}; //HEAD_FAN_RIGHT, HEAD_FAN_LEFT
+uint8_t     BlowerIdToSensorId[2] = {HEAD_PT100_ZONE_7_0X86_0, HEAD_PT100_ZONE_5_0X84_0}; //HEAD_FAN_RIGHT, HEAD_FAN_LEFT
 
 typedef struct
 {
@@ -181,11 +181,16 @@ int HeadBlowerSensorIdToFanId(uint8_t sensorId)
         return HEAD_FAN_LEFT;
 }
 
+int HeadBlowerFanIdToBlowerId(uint8_t FanId)
+{
+    return BlowerIdToSensorId[FanId];
+}
+
 bool HeadBlowerFlowControl(double Q_value, uint8_t blowerId)
 {
     double currentFlow = 0.0;
 
-    currentFlow = PressureSensorGetPressure(BlowerIdToSensorId[blowerId]);
+    currentFlow = PressureSensorGetPressure(blowerId);
     HeadBlowerPidFunc(Q_value,currentFlow, blowerId);
     return OK;
 }
@@ -270,7 +275,7 @@ void ArcHeadAlarms(void)
         count4 = (count4 < 0)?(0):(count4);
     }
 
-    currentFlow = PressureSensorGetPressure(HEAD_PT100_ZONE_5_0X84_0);
+    currentFlow = PressureSensorGetPressure(HEAD_FAN_RIGHT);
     if (currentFlow > 5.0) {
         if (++count5 == ARC_ALARM_LIMIT)
             AlarmHandlingSetAlarm(EVENT_TYPE__DYEING_HEAD_BLOWER_1_FLOW_TOO_HIGH, true);
@@ -290,7 +295,7 @@ void ArcHeadAlarms(void)
         count6 = (count6 < 0)?(0):(count6);
     }
 
-    currentFlow = PressureSensorGetPressure(HEAD_PT100_ZONE_7_0X86_0);
+    currentFlow = PressureSensorGetPressure(HEAD_FAN_LEFT);
     if (currentFlow > 5.0) {
         if (++count7 == ARC_ALARM_LIMIT)
             AlarmHandlingSetAlarm(EVENT_TYPE__DYEING_HEAD_BLOWER_2_FLOW_TOO_HIGH, true);
@@ -369,12 +374,12 @@ int HeadBlowersGetPWM(uint8_t blowerId)
     return Head_Fan_PWM_Command[blowerId];
 }
 
-double PressureSensorGetPressure(uint8_t SensorId)
+double PressureSensorGetPressure(uint8_t FanId)
 {
     double V0, Vm, Q;
-    int FanId;
+    int SensorId;
 
-    FanId = HeadBlowerSensorIdToFanId(SensorId);
+    SensorId = BlowerIdToSensorId[FanId];
     V0 = PressureSensorV0[FanId];
     Vm = (double)(MillisecGetTemperatures(SensorId));
     Vm /= 10.0;
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h
index a23abf559..ee60a75cc 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h
@@ -44,7 +44,7 @@ uint32_t HeatersEnd(void);
 void HeatersControlStart(void);
 void HeatersControlStop(void);
 uint32_t Heaters_Init(void);
-double PressureSensorGetPressure(uint8_t SensorId);
+double PressureSensorGetPressure(uint8_t FanId);
 int HeadBlowersGetRPM(uint8_t fanId);
 uint32_t PressureSensorInit();
 void HeadBlowersInit();
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
index 25fb8e962..9c5fe9822 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
@@ -567,8 +567,8 @@ uint32_t Waste_PrepareCallbak(uint32_t IfIndex, uint32_t ReadValue)
 {
     bool ready = false, headready = false,whsready = false;
     double HeadFlow = GetWHSAirFlow(HEAD_FLOW_METER);
-    double HeadIn_Flow =  PressureSensorGetPressure(HEAD_PT100_ZONE_5_0X84_0);
-    double HeadOut_Flow = PressureSensorGetPressure(HEAD_PT100_ZONE_7_0X86_0);
+    double HeadIn_Flow =  PressureSensorGetPressure(HEAD_FAN_RIGHT);
+    double HeadOut_Flow = PressureSensorGetPressure(HEAD_FAN_LEFT);
     if ((HeadFlow<(headairflow*(1+AllowedRangeForWasteBlowerDeviation)))
             &&(HeadFlow>(headairflow*(1-AllowedRangeForWasteBlowerDeviation))))
     {