Index: firmware/App/Monitors/Pressure.c
===================================================================
diff -u -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 -r72ae21d8343d3a2b07a47452ff48549e25f876df
--- firmware/App/Monitors/Pressure.c	(.../Pressure.c)	(revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602)
+++ firmware/App/Monitors/Pressure.c	(.../Pressure.c)	(revision 72ae21d8343d3a2b07a47452ff48549e25f876df)
@@ -232,19 +232,19 @@
  * and triggers an alarm when pressure value is out of allowed range.
  * @details \b Inputs: RO pump inlet pressure sensor value
  * @details \b Outputs: Triggers low pressure persistent alarm
- * @details \b Alarms: ALARM_ID_DD_INLET_WATER_PRESSURE_IN_LOW_RANGE when
+ * @details \b Alarms: ALARM_ID_RO_INLET_WATER_PRESSURE_IN_LOW_RANGE when
  * the inlet water pressure is less than the low limit.
- * @details \b Alarms: ALARM_ID_DD_INLET_WATER_PRESSURE_IN_HIGH_RANGE when
+ * @details \b Alarms: ALARM_ID_RO_INLET_WATER_PRESSURE_IN_HIGH_RANGE when
  * the inlet water pressure is greater than the high limit.
  * @return none
  *************************************************************************/
 //void checkInletWaterPressure( void )
 //{
-//    F32 pressureIn  = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_INPUT );
-//    F32 PressureOut = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_OUTPUT );
+//    F32 pressureIn  = getFilteredPressure( M1_PRES );
+//    F32 PressureOut = getFilteredPressure( M3_PRES );
 //
 //    //Check Water Inlet Input pressure range
-//    if ( VALVE_STATE_OPEN == getValveStateName( VWI ) )
+//    if ( VALVE_STATE_OPEN == getValveStateName( M4_VALV ) )
 //    {
 //        BOOL isPressureTooLow;
 //        BOOL isPressureTooHigh;
@@ -254,27 +254,27 @@
 //        isPressureTooLow  = ( pressureIn < maxInletWaterPressureWarningLow ? TRUE : FALSE );
 //        isPressureTooHigh = ( pressureIn > MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG ? TRUE : FALSE );
 //
-//        if ( TRUE == isAlarmActive( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_LOW_RANGE ) )
+//        if ( TRUE == isAlarmActive( ALARM_ID_RO_INLET_WATER_PRESSURE_IN_LOW_RANGE ) )
 //        {
 //            isPressureTooLow = ( pressureIn >= minInletWaterPressureWarningLow ? FALSE : TRUE );
 //        }
-//        checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_LOW_RANGE, isPressureTooLow, pressureIn, maxInletWaterPressureWarningLow );
+//        checkPersistentAlarm( ALARM_ID_RO_INLET_WATER_PRESSURE_IN_LOW_RANGE, isPressureTooLow, pressureIn, maxInletWaterPressureWarningLow );
 //
-//        if ( TRUE == isAlarmActive( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_HIGH_RANGE ) )
+//        if ( TRUE == isAlarmActive( ALARM_ID_RO_INLET_WATER_PRESSURE_IN_HIGH_RANGE ) )
 //        {
 //            isPressureTooHigh = ( pressureIn <= MIN_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG ? FALSE : TRUE );
 //        }
-//        checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_HIGH_RANGE, isPressureTooHigh, pressureIn, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG );
+//        checkPersistentAlarm( ALARM_ID_RO_INLET_WATER_PRESSURE_IN_HIGH_RANGE, isPressureTooHigh, pressureIn, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG );
 //    }
 //    else
 //    {
-//        // VWI is closed - clear all alarms
-//        checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_LOW_RANGE, FALSE, pressureIn, MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG );
-//        checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_IN_HIGH_RANGE, FALSE, pressureIn, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG );
+//        // M4 valve is closed - clear all alarms
+//        checkPersistentAlarm( ALARM_ID_RO_INLET_WATER_PRESSURE_IN_LOW_RANGE, FALSE, pressureIn, MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG );
+//        checkPersistentAlarm( ALARM_ID_RO_INLET_WATER_PRESSURE_IN_HIGH_RANGE, FALSE, pressureIn, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG );
 //    }
 //
 //    //Check Water Inlet Output pressure range
-//    if ( VALVE_STATE_OPEN == getValveStateName( VWI ) )
+//    if ( VALVE_STATE_OPEN == getValveStateName( M4_VALV ) )
 //    {
 //        BOOL isPressureTooLow;
 //        BOOL isPressureTooHigh;
@@ -284,23 +284,23 @@
 //        isPressureTooLow  = ( PressureOut < maxInletWaterPressureWarningLow ? TRUE : FALSE );
 //        isPressureTooHigh = ( PressureOut > MAX_INLET_WATER_PRES_OUT_WARNING_HIGH_PSIG ? TRUE : FALSE );
 //
-//        if ( TRUE == isAlarmActive( ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_LOW_RANGE ) )
+//        if ( TRUE == isAlarmActive( ALARM_ID_RO_INLET_WATER_PRESSURE_OUT_LOW_RANGE ) )
 //        {
 //            isPressureTooLow = ( PressureOut >= minInletWaterPressureWarningLow ? FALSE : TRUE );
 //        }
-//        checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_LOW_RANGE, isPressureTooLow, PressureOut, maxInletWaterPressureWarningLow );
+//        checkPersistentAlarm( ALARM_ID_RO_INLET_WATER_PRESSURE_OUT_LOW_RANGE, isPressureTooLow, PressureOut, maxInletWaterPressureWarningLow );
 //
-//        if ( TRUE == isAlarmActive( ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_HIGH_RANGE ) )
+//        if ( TRUE == isAlarmActive( ALARM_ID_RO_INLET_WATER_PRESSURE_OUT_HIGH_RANGE ) )
 //        {
 //            isPressureTooHigh = ( PressureOut <= MIN_INLET_WATER_PRES_OUT_WARNING_HIGH_PSIG ? FALSE : TRUE );
 //        }
-//        checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_HIGH_RANGE, isPressureTooHigh, PressureOut, MAX_INLET_WATER_PRES_OUT_WARNING_HIGH_PSIG );
+//        checkPersistentAlarm( ALARM_ID_RO_INLET_WATER_PRESSURE_OUT_HIGH_RANGE, isPressureTooHigh, PressureOut, MAX_INLET_WATER_PRES_OUT_WARNING_HIGH_PSIG );
 //    }
 //    else
 //    {
-//        // VWI is closed - clear all alarms
-//        checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_LOW_RANGE, FALSE, PressureOut, MIN_INLET_WATER_PRES_OUT_WARNING_LOW_PSIG );
-//        checkPersistentAlarm( ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_HIGH_RANGE, FALSE, PressureOut, MAX_INLET_WATER_PRES_OUT_WARNING_HIGH_PSIG );
+//        // M4 valve is closed - clear all alarms
+//        checkPersistentAlarm( ALARM_ID_RO_INLET_WATER_PRESSURE_OUT_LOW_RANGE, FALSE, PressureOut, MIN_INLET_WATER_PRES_OUT_WARNING_LOW_PSIG );
+//        checkPersistentAlarm( ALARM_ID_RO_INLET_WATER_PRESSURE_OUT_HIGH_RANGE, FALSE, PressureOut, MAX_INLET_WATER_PRES_OUT_WARNING_HIGH_PSIG );
 //    }
 //}
 
@@ -480,19 +480,19 @@
     {
         PRESSURE_TEMP_DATA_T data;
 
-        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.m1Pressure  = getFilteredPressure( M1_PRES );
+        data.m3Pressure  = getFilteredPressure( M3_PRES );
+        data.p8Pressure  = getFilteredPressure( P8_PRES );
+        data.p13Pressure = getFilteredPressure( P13_PRES );
+        data.p17Pressure = getFilteredPressure( P17_PRES );
+        data.x1Pressure  = getFilteredPressure( X1_PRES );
 
-        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 );
+        data.m1Temp      = getFilteredPressureSensorTemperature( M1_PRES );
+        data.m3Temp      = getFilteredPressureSensorTemperature( M3_PRES );
+        data.p8Temp      = getFilteredPressureSensorTemperature( P8_PRES );
+        data.p13Temp     = getFilteredPressureSensorTemperature( P13_PRES );
+        data.p17Temp     = getFilteredPressureSensorTemperature( P17_PRES );
+        data.x1Temp      = getFilteredPressureSensorTemperature( X1_PRES );
 
         broadcastData( MSG_ID_RO_PRESSURES_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( PRESSURE_TEMP_DATA_T ) );
         pressuresDataPublicationTimerCounter        = 0;