Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -rce66580e076bffa157868ff7e422556f78a95cac -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision ce66580e076bffa157868ff7e422556f78a95cac) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -480,19 +480,19 @@ { PRESSURE_TEMP_DATA_T data; - data.PressurePRi = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_PRE_REG ); - data.PressurePRo = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_POST_REG ); - data.PressurePC2o = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_PRE_COND ); - data.PressurePPo = getFilteredPressure( PRESSURE_SENSOR_PRE_RO_FILTER ); - data.PressurePMp = getFilteredPressure( PRESSURE_SENSOR_POST_RO_FILTER ); - data.PressurePPi = getFilteredPressure( PRESSURE_SENSOR_PRE_RO_PUMP ); + data.PressureM1 = getFilteredPressure( M1_PRES ); + data.PressureM3 = getFilteredPressure( M3_PRES ); + data.PressureP8 = getFilteredPressure( P8_PRES ); + data.PressureP13 = getFilteredPressure( P13_PRES ); + data.PressureP17 = getFilteredPressure( P17_PRES ); + data.PressureX1 = getFilteredPressure( X1_PRES ); - data.TempPRi = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_WATER_INLET_PRE_REG ); - data.TempPRo = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_WATER_INLET_POST_REG ); - data.TempPC2o = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_WATER_INLET_PRE_COND ); - data.TempPPo = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_PRE_RO_FILTER ); - data.TempPMp = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_POST_RO_FILTER ); - data.TempPPi = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_PRE_RO_PUMP ); + data.TempM1 = getFilteredPressureSensorTemperature( M1_PRES ); + data.TempM3 = getFilteredPressureSensorTemperature( M3_PRES ); + data.TempP8 = getFilteredPressureSensorTemperature( P8_PRES ); + data.TempP13 = getFilteredPressureSensorTemperature( P13_PRES ); + data.TempP17 = getFilteredPressureSensorTemperature( P17_PRES ); + data.TempX1 = getFilteredPressureSensorTemperature( X1_PRES ); broadcastData( MSG_ID_RO_PRESSURES_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( PRESSURE_TEMP_DATA_T ) ); pressuresDataPublicationTimerCounter = 0;