Index: firmware/App/Drivers/PressureSensor.c =================================================================== diff -u -r72ae21d8343d3a2b07a47452ff48549e25f876df -r69e32c52c41cfc8073a7eb59408fb30e6ac40f86 --- firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 72ae21d8343d3a2b07a47452ff48549e25f876df) +++ firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 69e32c52c41cfc8073a7eb59408fb30e6ac40f86) @@ -109,14 +109,23 @@ currentPressureReadings[ P13_PRES ].data = convertPressureReading( getFPGAP13RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); currentPressureReadings[ P17_PRES ].data = convertPressureReading( getFPGAP17RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); currentPressureReadings[ X1_PRES ].data = convertPressureReading( getFPGAX1RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); + currentPressureReadings[ X2_PRES ].data = convertPressureReading( getFPGAX2RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); + currentPressureReadings[ X3_PRES ].data = convertPressureReading( getFPGAX3RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); + currentPressureReadings[ X4_PRES ].data = convertPressureReading( getFPGAX4RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); + currentPressureReadings[ X5_PRES ].data = convertPressureReading( getFPGAX5RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); + // Update and convert raw pressure sensor temperatures to deg C currentPresTempReadings[ M1_PRES ].data = convertPressureTempReading2DegC( getFPGAM1RawTemperature() ); currentPresTempReadings[ M3_PRES ].data = convertPressureTempReading2DegC( getFPGAM3RawTemperature() ); currentPresTempReadings[ P8_PRES ].data = convertPressureTempReading2DegC( getFPGAP8RawTemperature() ); currentPresTempReadings[ P13_PRES ].data = convertPressureTempReading2DegC( getFPGAP13RawTemperature() ); currentPresTempReadings[ P17_PRES ].data = convertPressureTempReading2DegC( getFPGAP17RawTemperature() ); currentPresTempReadings[ X1_PRES ].data = convertPressureTempReading2DegC( getFPGAX1RawTemperature() ); + currentPresTempReadings[ X2_PRES ].data = convertPressureTempReading2DegC( getFPGAX2RawTemperature() ); + currentPresTempReadings[ X3_PRES ].data = convertPressureTempReading2DegC( getFPGAX3RawTemperature() ); + currentPresTempReadings[ X4_PRES ].data = convertPressureTempReading2DegC( getFPGAX4RawTemperature() ); + currentPresTempReadings[ X5_PRES ].data = convertPressureTempReading2DegC( getFPGAX5RawTemperature() ); // Update read and error counters for each pressure sensor lastPressureReadCounter[ M1_PRES ].data = (U32)getFPGAM1ReadCount(); @@ -125,13 +134,21 @@ lastPressureReadCounter[ P13_PRES ].data = (U32)getFPGAP13ReadCount(); lastPressureReadCounter[ P17_PRES ].data = (U32)getFPGAP17ReadCount(); lastPressureReadCounter[ X1_PRES ].data = (U32)getFPGAX1ReadCount(); + lastPressureReadCounter[ X2_PRES ].data = (U32)getFPGAX2ReadCount(); + lastPressureReadCounter[ X3_PRES ].data = (U32)getFPGAX3ReadCount(); + lastPressureReadCounter[ X4_PRES ].data = (U32)getFPGAX4ReadCount(); + lastPressureReadCounter[ X5_PRES ].data = (U32)getFPGAX5ReadCount(); lastPressureErrorCounter[ M1_PRES ].data = (U32)getFPGAM1ErrorCount(); lastPressureErrorCounter[ M3_PRES ].data = (U32)getFPGAM3ErrorCount(); lastPressureErrorCounter[ P8_PRES ].data = (U32)getFPGAP8ErrorCount(); lastPressureErrorCounter[ P13_PRES ].data = (U32)getFPGAP13ErrorCount(); lastPressureErrorCounter[ P17_PRES ].data = (U32)getFPGAP17ErrorCount(); lastPressureErrorCounter[ X1_PRES ].data = (U32)getFPGAX1ErrorCount(); + lastPressureErrorCounter[ X2_PRES ].data = (U32)getFPGAX2ErrorCount(); + lastPressureErrorCounter[ X3_PRES ].data = (U32)getFPGAX3ErrorCount(); + lastPressureErrorCounter[ X4_PRES ].data = (U32)getFPGAX4ErrorCount(); + lastPressureErrorCounter[ X5_PRES ].data = (U32)getFPGAX5ErrorCount(); // // Monitor pressure sensor health // checkPressureSensors();