Index: firmware/App/Monitors/Temperature.h =================================================================== diff -u -r623587d96bf6c0bafd3ff94d47f8c783b4b999f0 -r4cdcb589ad34efa472c94180e6de938132cbc89b --- firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision 623587d96bf6c0bafd3ff94d47f8c783b4b999f0) +++ firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision 4cdcb589ad34efa472c94180e6de938132cbc89b) @@ -50,6 +50,7 @@ F32 d99AvgTemp; ///< D99 moving average temperature value F32 d28AvgTemp; ///< D28 moving average temperature value F32 d30AvgTemp; ///< D30 moving average temperature value + F32 d78AvgTemp; ///< D78 moving average temperature value F32 d9PresTemp; ///< Hydraulics outlet pressure temperature F32 d66PresTemp; ///< Bicarb bag temperature F32 d51PresTemp; ///< Spent Dialysate temperature @@ -72,21 +73,19 @@ F32 p16Temp; ///< Temperature RO outlet F32 p7InternalTemp; ///< P7 internal Temperature F32 p16InternalTemp; ///< P16 internal Temperature - } TEMPERATURE_SENSORS_FP_DATA_T; // ********** public function prototypes ********** void initTemperature( void ); SELF_TEST_STATUS_T execTemperatureSensorsSelfTest( void ); void execTemperatureSensors( void ); -F32 getD4AverageTemperature( void ); -F32 getD50AverageTemperature( void ); -F32 getD99AverageTemperature( void ); +F32 getFilteredTemperatureValue( TEMPERATURE_SENSORS_T sensor ); void checkDialysateTemperatureSensors( void ); BOOL testDDTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message ); BOOL testIOFPTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message ); +BOOL testDDTemperatureSensorFilteredReadingsOverride( MESSAGE_T *message ); /**@}*/