Index: firmware/App/Controllers/Pressures.c
===================================================================
diff -u -r0831cb6bf766fe461340b711f2ff14c3d797e10d -rebd11d01f826a08806d2f4984bd57e829371b687
--- firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 0831cb6bf766fe461340b711f2ff14c3d797e10d)
+++ firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision ebd11d01f826a08806d2f4984bd57e829371b687)
@@ -171,23 +171,23 @@
     PRESSURE_STATE_T result = PRESSURE_CONTINUOUS_READ_STATE;
 
     // get latest raw pressure readings
-    measuredPressureReadingsRaw[ INT_ADC_RO_PUMP_INLET_PRESSURE ] = (S32)getIntADCReading( INT_ADC_RO_PUMP_INLET_PRESSURE ) - PUMP_PRESSURE_ZERO;
-    measuredPressureReadingsRaw[ INT_ADC_RO_PUMP_OUTLET_PRESSURE ] = (S32)getIntADCReading( INT_ADC_RO_PUMP_OUTLET_PRESSURE ) - PUMP_PRESSURE_ZERO;
-    measuredPressureReadingsRaw[ INT_ADC_DRAIN_PUMP_INLET_PRESSURE ] = (S32)getIntADCReading( INT_ADC_DRAIN_PUMP_INLET_PRESSURE ) - PUMP_PRESSURE_ZERO;
-    measuredPressureReadingsRaw[ INT_ADC_DRAIN_PUMP_OUTLET_PRESSURE ] = (S32)getIntADCReading( INT_ADC_DRAIN_PUMP_OUTLET_PRESSURE ) - PUMP_PRESSURE_ZERO;
+    measuredPressureReadingsRaw[ PRESSURE_SENSOR_RO_PUMP_INLET ] = (S32)getIntADCReading( INT_ADC_RO_PUMP_INLET_PRESSURE ) - PUMP_PRESSURE_ZERO;
+    measuredPressureReadingsRaw[ PRESSURE_SENSOR_RO_PUMP_OUTLET ] = (S32)getIntADCReading( INT_ADC_RO_PUMP_OUTLET_PRESSURE ) - PUMP_PRESSURE_ZERO;
+    measuredPressureReadingsRaw[ PRESSURE_SENSOR_DRAIN_PUMP_INLET ] = (S32)getIntADCReading( INT_ADC_DRAIN_PUMP_INLET_PRESSURE ) - PUMP_PRESSURE_ZERO;
+    measuredPressureReadingsRaw[ PRESSURE_SENSOR_DRAIN_PUMP_OUTLET ] = (S32)getIntADCReading( INT_ADC_DRAIN_PUMP_OUTLET_PRESSURE ) - PUMP_PRESSURE_ZERO;
     // update sums for pressure average calculations
-    measuredPressureReadingsSum[ INT_ADC_RO_PUMP_INLET_PRESSURE ] += measuredPressureReadingsRaw[ INT_ADC_RO_PUMP_INLET_PRESSURE ];
-    measuredPressureReadingsSum[ INT_ADC_RO_PUMP_OUTLET_PRESSURE ] += measuredPressureReadingsRaw[ INT_ADC_RO_PUMP_OUTLET_PRESSURE ];
-    measuredPressureReadingsSum[ INT_ADC_DRAIN_PUMP_INLET_PRESSURE ] += measuredPressureReadingsRaw[ INT_ADC_DRAIN_PUMP_INLET_PRESSURE ];
-    measuredPressureReadingsSum[ INT_ADC_DRAIN_PUMP_OUTLET_PRESSURE ] += measuredPressureReadingsRaw[ INT_ADC_DRAIN_PUMP_OUTLET_PRESSURE ];
+    measuredPressureReadingsSum[ PRESSURE_SENSOR_RO_PUMP_INLET ] += measuredPressureReadingsRaw[ PRESSURE_SENSOR_RO_PUMP_INLET ];
+    measuredPressureReadingsSum[ PRESSURE_SENSOR_RO_PUMP_OUTLET ] += measuredPressureReadingsRaw[ PRESSURE_SENSOR_RO_PUMP_OUTLET ];
+    measuredPressureReadingsSum[ PRESSURE_SENSOR_DRAIN_PUMP_INLET ] += measuredPressureReadingsRaw[ PRESSURE_SENSOR_DRAIN_PUMP_INLET ];
+    measuredPressureReadingsSum[ PRESSURE_SENSOR_DRAIN_PUMP_OUTLET ] += measuredPressureReadingsRaw[ PRESSURE_SENSOR_DRAIN_PUMP_OUTLET ];
 
     // filter every 200ms
     if ( ++pressureFilterCounter >= PRESSURE_SAMPLES_TO_AVERAGE )
     {   // calculate average pressures
-        F32 avgRoIn = (F32)measuredPressureReadingsSum[ INT_ADC_RO_PUMP_INLET_PRESSURE ] * PRESSURE_AVERAGE_MULTIPLIER;
-        F32 avgRoOut = (F32)measuredPressureReadingsSum[ INT_ADC_RO_PUMP_OUTLET_PRESSURE ] * PRESSURE_AVERAGE_MULTIPLIER;
-        F32 avgDrnIn = (F32)measuredPressureReadingsSum[ INT_ADC_DRAIN_PUMP_INLET_PRESSURE ] * PRESSURE_AVERAGE_MULTIPLIER;
-        F32 avgDrnOut = (F32)measuredPressureReadingsSum[ INT_ADC_DRAIN_PUMP_OUTLET_PRESSURE ] * PRESSURE_AVERAGE_MULTIPLIER;
+        F32 avgRoIn = (F32)measuredPressureReadingsSum[ PRESSURE_SENSOR_RO_PUMP_INLET ] * PRESSURE_AVERAGE_MULTIPLIER;
+        F32 avgRoOut = (F32)measuredPressureReadingsSum[ PRESSURE_SENSOR_RO_PUMP_OUTLET ] * PRESSURE_AVERAGE_MULTIPLIER;
+        F32 avgDrnIn = (F32)measuredPressureReadingsSum[ PRESSURE_SENSOR_DRAIN_PUMP_INLET ] * PRESSURE_AVERAGE_MULTIPLIER;
+        F32 avgDrnOut = (F32)measuredPressureReadingsSum[ PRESSURE_SENSOR_DRAIN_PUMP_OUTLET ] * PRESSURE_AVERAGE_MULTIPLIER;
 
         // reset average counter
         pressureFilterCounter = 0;
@@ -199,7 +199,7 @@
         pressures[ PRESSURE_SENSOR_DRAIN_PUMP_OUTLET ].data = avgDrnOut * PUMP_PRESSURE_PSIA_PER_COUNT - PUMP_PRESSURE_PSIA_TO_PSI_OFFSET;
 
         // reset sums for next averaging
-        measuredPressureReadingsSum[ INT_ADC_RO_PUMP_INLET_PRESSURE ] = 0;
+        measuredPressureReadingsSum[ PRESSURE_SENSOR_RO_PUMP_INLET ] = 0;
         measuredPressureReadingsSum[ PRESSURE_SENSOR_RO_PUMP_OUTLET ] = 0;
         measuredPressureReadingsSum[ PRESSURE_SENSOR_DRAIN_PUMP_INLET ] = 0;
         measuredPressureReadingsSum[ PRESSURE_SENSOR_DRAIN_PUMP_OUTLET ] = 0;