Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -r5ac18a9f617f6f023ebcf1b4a56c3bc74e6c0319 -r9b9ab4a5135966c607c657eb18fe368c30247113 --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 5ac18a9f617f6f023ebcf1b4a56c3bc74e6c0319) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 9b9ab4a5135966c607c657eb18fe368c30247113) @@ -416,11 +416,11 @@ data.d51Pressure = getFilteredPressure( D51_PRES ); data.d18Pressure = getFilteredPressure( D18_PRES ); data.d41Pressure = getFilteredPressure( D41_PRES ); - data.d9PresTemp = getFilteredPressureSensorTemperature( D9_PRES ); - data.d66PresTemp = getFilteredPressureSensorTemperature( D66_PRES ); - data.d51PresTemp = getFilteredPressureSensorTemperature( D51_PRES ); - data.d18PresTemp = getFilteredPressureSensorTemperature( D18_PRES ); - data.d41PresTemp = getFilteredPressureSensorTemperature( D41_PRES ); +// data.d9PresTemp = getFilteredPressureSensorTemperature( D9_PRES ); +// data.d66PresTemp = getFilteredPressureSensorTemperature( D66_PRES ); +// data.d51PresTemp = getFilteredPressureSensorTemperature( D51_PRES ); +// data.d18PresTemp = getFilteredPressureSensorTemperature( D18_PRES ); +// data.d41PresTemp = getFilteredPressureSensorTemperature( D41_PRES ); ddPressuresDataPublicationTimerCounter = 0; broadcastData( MSG_ID_DD_PRESSURES_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( PRESSURE_TEMP_DD_DATA_T ) ); @@ -447,11 +447,6 @@ data.p8Pressure = getFilteredPressure( P8_PRES ); data.p13Pressure = getFilteredPressure( P13_PRES ); data.p17Pressure = getFilteredPressure( P17_PRES ); - data.m1PresTemp = getFilteredPressureSensorTemperature( M1_PRES ); - data.m3PresTemp = getFilteredPressureSensorTemperature( M3_PRES ); - data.p8PresTemp = getFilteredPressureSensorTemperature( P8_PRES ); - data.p13PresTemp = getFilteredPressureSensorTemperature( P13_PRES ); - data.p17PresTemp = getFilteredPressureSensorTemperature( P17_PRES ); broadcastData( MSG_ID_FP_PRESSURES_DATA, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&data, sizeof( PRESSURE_TEMP_FP_DATA_T ) ); fpPressuresDataPublicationTimerCounter = 0; Index: firmware/App/Monitors/Pressure.h =================================================================== diff -u -r5ac18a9f617f6f023ebcf1b4a56c3bc74e6c0319 -r9b9ab4a5135966c607c657eb18fe368c30247113 --- firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision 5ac18a9f617f6f023ebcf1b4a56c3bc74e6c0319) +++ firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision 9b9ab4a5135966c607c657eb18fe368c30247113) @@ -40,11 +40,6 @@ F32 d51Pressure; ///< Spent Dialysate pressure F32 d18Pressure; ///< Fresh Dialysate pressure F32 d41Pressure; ///< Transmembrane pressure - F32 d9PresTemp; ///< Hydraulics outlet pressure temperature - F32 d66PresTemp; ///< Bicarb bag temperature - F32 d51PresTemp; ///< Spent Dialysate temperature - F32 d18PresTemp; ///< Fresh Dialysate temperature - F32 d41PresTemp; ///< Transmembrane temperature } PRESSURE_TEMP_DD_DATA_T; /// FP Pressure data struct. @@ -55,11 +50,6 @@ F32 p8Pressure; ///< Pressure before inlet conductivity sensor (P8) F32 p13Pressure; ///< Pressure before RO filter (P13) F32 p17Pressure; ///< Pressure after RO filter (P17) - F32 m1PresTemp; ///< Water Inlet Input temperature - F32 m3PresTemp; ///< Water Inlet Output temperature - F32 p8PresTemp; ///< temperature before inlet conductivity sensor (P8) - F32 p13PresTemp; ///< temperature before RO filter (P13) - F32 p17PresTemp; ///< temperature after RO filter (P17) } PRESSURE_TEMP_FP_DATA_T; // ********** public function prototypes ********** Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -r5ac18a9f617f6f023ebcf1b4a56c3bc74e6c0319 -r9b9ab4a5135966c607c657eb18fe368c30247113 --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 5ac18a9f617f6f023ebcf1b4a56c3bc74e6c0319) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 9b9ab4a5135966c607c657eb18fe368c30247113) @@ -474,6 +474,11 @@ data.d50AvgTemp = getD50AverageTemperature(); data.d28AvgTemp = dialTempMovingAvgData[ DIAL_TEMP_D28 ].dialTempAvgC; data.d30AvgTemp = dialTempMovingAvgData[ DIAL_TEMP_D30 ].dialTempAvgC; + data.d9PresTemp = getFilteredPressureSensorTemperature( D9_PRES ); + data.d66PresTemp = getFilteredPressureSensorTemperature( D66_PRES ); + data.d51PresTemp = getFilteredPressureSensorTemperature( D51_PRES ); + data.d18PresTemp = getFilteredPressureSensorTemperature( D18_PRES ); + data.d41PresTemp = getFilteredPressureSensorTemperature( D41_PRES ); broadcastData( MSG_ID_DD_TEMPERATURE_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( TEMPERATURE_SENSORS_DD_DATA_T ) ); ddTempDataPublicationTimerCounter = 0; Index: firmware/App/Monitors/Temperature.h =================================================================== diff -u -r5ac18a9f617f6f023ebcf1b4a56c3bc74e6c0319 -r9b9ab4a5135966c607c657eb18fe368c30247113 --- firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision 5ac18a9f617f6f023ebcf1b4a56c3bc74e6c0319) +++ firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision 9b9ab4a5135966c607c657eb18fe368c30247113) @@ -49,6 +49,11 @@ F32 d50AvgTemp; ///< D50 moving average temperature value F32 d28AvgTemp; ///< D28 moving average temperature value F32 d30AvgTemp; ///< D30 moving average temperature value + F32 d9PresTemp; ///< Hydraulics outlet pressure temperature + F32 d66PresTemp; ///< Bicarb bag temperature + F32 d51PresTemp; ///< Spent Dialysate temperature + F32 d18PresTemp; ///< Fresh Dialysate temperature + F32 d41PresTemp; ///< Transmembrane temperature } TEMPERATURE_SENSORS_DD_DATA_T; /// Temperature sensors data structure.