Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -r69e32c52c41cfc8073a7eb59408fb30e6ac40f86 -r85a88a4ffdc56784d261ccd2e87d156805666c5d --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 69e32c52c41cfc8073a7eb59408fb30e6ac40f86) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 85a88a4ffdc56784d261ccd2e87d156805666c5d) @@ -489,6 +489,7 @@ data.x2Pressure = getFilteredPressure( X2_PRES ); data.x3Pressure = getFilteredPressure( X3_PRES ); data.x4Pressure = getFilteredPressure( X4_PRES ); + data.x5Pressure = getFilteredPressure( X5_PRES ); data.m1Temp = getFilteredPressureSensorTemperature( M1_PRES ); data.m3Temp = getFilteredPressureSensorTemperature( M3_PRES ); @@ -499,6 +500,7 @@ data.x2Temp = getFilteredPressureSensorTemperature( X2_PRES ); data.x3Temp = getFilteredPressureSensorTemperature( X3_PRES ); data.x4Temp = getFilteredPressureSensorTemperature( X4_PRES ); + data.x4Temp = getFilteredPressureSensorTemperature( X5_PRES ); broadcastData( MSG_ID_RO_PRESSURES_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( PRESSURE_TEMP_DATA_T ) ); pressuresDataPublicationTimerCounter = 0; Index: firmware/App/Monitors/Pressure.h =================================================================== diff -u -r69e32c52c41cfc8073a7eb59408fb30e6ac40f86 -r85a88a4ffdc56784d261ccd2e87d156805666c5d --- firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision 69e32c52c41cfc8073a7eb59408fb30e6ac40f86) +++ firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision 85a88a4ffdc56784d261ccd2e87d156805666c5d) @@ -44,6 +44,7 @@ F32 x2Pressure; ///< Pressure RO Concentrate F32 x3Pressure; ///< Pressure RO Concentrate drop F32 x4Pressure; ///< Pressure drain drop + F32 x5Pressure; ///< Spare pressure sensor slot F32 m1Temp; ///< Temperature before pressure regulator (M1) F32 m3Temp; ///< Temperature after pressure regulator (M3) F32 p8Temp; ///< Temperature before inlet conductivity sensor (P8) @@ -53,6 +54,7 @@ F32 x2Temp; ///< Temperature RO Concentrate F32 x3Temp; ///< Temperature RO Concentrate drop F32 x4Temp; ///< Temperature drain drop + F32 x5Temp; ///< Spare pressure sensor slot } PRESSURE_TEMP_DATA_T; // ********** public function prototypes ********** Index: firmware/App/Services/FpgaRO.h =================================================================== diff -u -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 -r85a88a4ffdc56784d261ccd2e87d156805666c5d --- firmware/App/Services/FpgaRO.h (.../FpgaRO.h) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) +++ firmware/App/Services/FpgaRO.h (.../FpgaRO.h) (revision 85a88a4ffdc56784d261ccd2e87d156805666c5d) @@ -82,6 +82,26 @@ U08 getFPGAX1ReadCount( void ); U08 getFPGAX1ErrorCount( void ); +S16 getFPGAX2RawPressure( void ); +S16 getFPGAX2RawTemperature( void ); +U08 getFPGAX2ReadCount( void ); +U08 getFPGAX2ErrorCount( void ); + +S16 getFPGAX3RawPressure( void ); +S16 getFPGAX3RawTemperature( void ); +U08 getFPGAX3ReadCount( void ); +U08 getFPGAX3ErrorCount( void ); + +S16 getFPGAX4RawPressure( void ); +S16 getFPGAX4RawTemperature( void ); +U08 getFPGAX4ReadCount( void ); +U08 getFPGAX4ErrorCount( void ); + +S16 getFPGAX5RawPressure( void ); +S16 getFPGAX5RawTemperature( void ); +U08 getFPGAX5ReadCount( void ); +U08 getFPGAX5ErrorCount( void ); + U32 getFPGAP23Temperature( void ); U32 getFPGAP22Temperature( void );