Index: firmware/App/Controllers/Pressures.c =================================================================== diff -u -rdd4b570099bb9b669fa652e1db4e076add853cf4 -rddd2e1231f42f7ab69f3da2288c9794175484ae4 --- firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision dd4b570099bb9b669fa652e1db4e076add853cf4) +++ firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision ddd2e1231f42f7ab69f3da2288c9794175484ae4) @@ -19,6 +19,7 @@ #include "AlarmMgmt.h" #include "FPGA.h" #include "InternalADC.h" +#include "MessageSupport.h" #include "NVDataMgmt.h" #include "OperationModes.h" #include "PersistentAlarm.h" @@ -386,20 +387,23 @@ * @brief * The publishPressuresData function publishes DG pressures data at a set interval. * @details Inputs: pressuresDataPublicationTimerCounter - * @details Outputs: Pressures data are published to CAN bus + * @details Outputs: pressuresDataPublicationTimerCounter * @return none *************************************************************************/ static void publishPressuresData( void ) { // publish pressure/occlusion data on interval if ( ++pressuresDataPublicationTimerCounter >= getU32OverrideValue( &pressuresDataPublishInterval ) ) - { - F32 roIn = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_INLET ); - F32 roOut = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_OUTLET ); - F32 drainIn = getMeasuredDGPressure( PRESSURE_SENSOR_DRAIN_PUMP_INLET ); - F32 drainOut = getMeasuredDGPressure( PRESSURE_SENSOR_DRAIN_PUMP_OUTLET ); + { + PRESSURES_DATA_T data; - broadcastPressureSensorsData( roIn, roOut, drainIn, drainOut ); + data.roPumpInletPressure = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_INLET ); + data.roPumpOutletPressure = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_OUTLET ); + data.drainPumpInletPressure = getMeasuredDGPressure( PRESSURE_SENSOR_DRAIN_PUMP_INLET ); + data.drainPumpOutletPressure = getMeasuredDGPressure( PRESSURE_SENSOR_DRAIN_PUMP_OUTLET ); + + broadcastData( MSG_ID_DG_PRESSURES_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( PRESSURES_DATA_T ) ); + pressuresDataPublicationTimerCounter = 0; } }