Index: firmware/App/Monitors/Pressure.h =================================================================== diff -u -r9b9ab4a5135966c607c657eb18fe368c30247113 -rfd42b31a0572ab85c862ebf94997766f27dd8e97 --- firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision 9b9ab4a5135966c607c657eb18fe368c30247113) +++ firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision fd42b31a0572ab85c862ebf94997766f27dd8e97) @@ -40,7 +40,7 @@ F32 d51Pressure; ///< Spent Dialysate pressure F32 d18Pressure; ///< Fresh Dialysate pressure F32 d41Pressure; ///< Transmembrane pressure -} PRESSURE_TEMP_DD_DATA_T; +} PRESSURE_DD_DATA_T; /// FP Pressure data struct. typedef struct @@ -50,7 +50,7 @@ F32 p8Pressure; ///< Pressure before inlet conductivity sensor (P8) F32 p13Pressure; ///< Pressure before RO filter (P13) F32 p17Pressure; ///< Pressure after RO filter (P17) -} PRESSURE_TEMP_FP_DATA_T; +} PRESSURE_FP_DATA_T; // ********** public function prototypes ********** @@ -61,11 +61,11 @@ F32 getFilteredPressureSensorTemperature( PRESSURE_SENSORS_T sensor ); BOOL testDDPressureSensorDataPublishIntervalOverride( MESSAGE_T *message ); -BOOL testFPPressureSensorDataPublishIntervalOverride( MESSAGE_T *message ); +BOOL testIOFPPressureSensorDataPublishIntervalOverride( MESSAGE_T *message ); BOOL testDDPressureSensorFilteredReadingsOverride( MESSAGE_T *message ); BOOL testDDPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ); -BOOL testFPPressureSensorFilteredReadingsOverride( MESSAGE_T *message ); -BOOL testFPPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ); +BOOL testIOFPPressureSensorFilteredReadingsOverride( MESSAGE_T *message ); +BOOL testIOFPPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ); /**@}*/