Index: firmware/App/Drivers/PressureSensor.h
===================================================================
diff -u -red39129abdca4ec343369d83494530b23621e052 -r65824878503f019bf9db443c867e27df8de27c51
--- firmware/App/Drivers/PressureSensor.h	(.../PressureSensor.h)	(revision ed39129abdca4ec343369d83494530b23621e052)
+++ firmware/App/Drivers/PressureSensor.h	(.../PressureSensor.h)	(revision 65824878503f019bf9db443c867e27df8de27c51)
@@ -35,15 +35,27 @@
 /// Enumeration of pressure sensors monitored by this module.
 typedef enum PressureSensors
 {
-    M1_PRES = 0,                                ///< Water Inlet pressure before regulator (PRi)
-    PRESSURE_SENSOR_FIRST = M1_PRES,            ///< First pressure to scan
-    M3_PRES,                                    ///< Water Inlet pressure after regulator (PRo)
-    D9_PRES,                                    ///< Hydraulics outlet pressure (PHo/Pn)
+    D9_PRES = 0,                                ///< Hydraulics outlet pressure (PHo/Pn)
+    FIRST_DD_PRESSURE_SENSOR = D9_PRES,         ///< Start of DD pressure sensor group
     D66_PRES,                                   ///< Dry Bicarb pressure (PDB/PCb)
     D51_PRES,                                   ///< Spent Dialysate pressure (PDs)
     D18_PRES,                                   ///< Fresh Dialysate pressure (PDf)
     D41_PRES,                                   ///< Transmembrane pressure (Ptm)
-    BARO_PRES,                                  ///< barometric pressure sensor
+//    BARO_PRES,                                  ///< barometric pressure sensor    ToDo moved to TD
+    LAST_DD_PRESSURE_SENSOR = D41_PRES,        ///< End of DD pressure sensor group
+    M1_PRES,                                    ///< Water inlet pressure before regulator (PRi)
+    FIRST_IO_PRESSURE_SENSOR = M1_PRES,         ///< Start of IO pressure sensor group
+    M3_PRES,                                    ///< Water inlet pressure after regulator (PRo)
+    LAST_IO_PRESSURE_SENSOR = M3_PRES,          ///< End of IO pressure sensor group
+    P8_PRES,                                    ///< Water inlet pressure before conductivity sensor
+    FIRST_FP_PRESSURE_SENSOR = P8_PRES,         ///< Start of FP pressure sensor group
+    P13_PRES,                                   ///< Pressure before RO filter
+    P17_PRES,                                   ///< Pressure after RO filter
+    X1_PRES,                                    ///< Pressure before RO pump
+    X2_PRES,                                    ///< Pressure RO Concentrate
+    X3_PRES,                                    ///< Pressure after P32, concentrate drop
+    X4_PRES,                                    ///< Pressure drain drop
+    LAST_FP_PRESSURE_SENSOR = X4_PRES,          ///< End of FP pressure sensor group
     NUM_OF_PRESSURE_SENSORS                     ///< Number of pressure sensors
 } PRESSURE_SENSORS_T;
 
@@ -53,13 +65,11 @@
 void readPressureSensors( void );
 F32 getPressure( PRESSURE_SENSORS_T sensor );
 F32 getPressureSensorTemperature( PRESSURE_SENSORS_T sensor );
-U32 getPressureSensorReadCount( PRESSURE_SENSORS_T sensor );
-U32 getPressureSensorErrorCount( PRESSURE_SENSORS_T sensor );
 
-BOOL testPressureSensorReadingsOverride( MESSAGE_T *message );
-BOOL testPressureSensorTemperatureReadingsOverride( MESSAGE_T *message );
-BOOL testPressureSensorReadCounterOverride( MESSAGE_T *message );
-BOOL testPressureSensorErrorCounterOverride( MESSAGE_T *message );
+BOOL testDDPressureSensorReadingsOverride( MESSAGE_T *message );
+BOOL testDDPressureSensorTemperatureReadingsOverride( MESSAGE_T *message );
+BOOL testFPPressureSensorReadingsOverride( MESSAGE_T *message );
+BOOL testFPPressureSensorTemperatureReadingsOverride( MESSAGE_T *message );
 
 /**@}*/