Index: firmware/App/Monitors/Pressure.h
===================================================================
diff -u -r67731d57db9a620418b3b848d8f75ff204902c36 -raeffb83507735fc1c84773e868e20ac7aeb60afc
--- firmware/App/Monitors/Pressure.h	(.../Pressure.h)	(revision 67731d57db9a620418b3b848d8f75ff204902c36)
+++ firmware/App/Monitors/Pressure.h	(.../Pressure.h)	(revision aeffb83507735fc1c84773e868e20ac7aeb60afc)
@@ -32,25 +32,36 @@
 
 // ********** public definitions **********
 
-/// Pressure data struct.
+/// DD Pressure data struct.
 typedef struct
 {
-    F32 m1Pressure;                        ///< Water Inlet Input pressure
-    F32 m3Pressure;                        ///< Water Inlet Output pressure
     F32 d9Pressure;                        ///< Hydraulics outlet pressure
     F32 d66Pressure;                       ///< Bicarb bag pressure
     F32 d51Pressure;                       ///< Spent Dialysate pressure
     F32 d18Pressure;                       ///< Fresh Dialysate pressure
     F32 d41Pressure;                       ///< Transmembrane pressure
-    F32 m1PresTemp;                        ///< Water Inlet Input temperature
-    F32 m3PresTemp;                        ///< Water Inlet Output temperature
     F32 d9PresTemp;                        ///< Hydraulics outlet pressure temperature
     F32 d66PresTemp;                       ///< Bicarb bag temperature
     F32 d51PresTemp;                       ///< Spent Dialysate temperature
     F32 d18PresTemp;                       ///< Fresh Dialysate temperature
     F32 d41PresTemp;                       ///< Transmembrane temperature
-} PRESSURE_TEMP_DATA_T;
+} PRESSURE_DD_TEMP_DATA_T;
 
+/// FP Pressure data struct.
+typedef struct
+{
+    F32 m1Pressure;                        ///< Water Inlet Input pressure
+    F32 m3Pressure;                        ///< Water Inlet Output pressure
+    F32 p8Pressure;                        ///< Pressure before inlet conductivity sensor (P8)
+    F32 p13Pressure;                       ///< Pressure before RO filter (P13)
+    F32 p17Pressure;                       ///< Pressure after RO filter (P17)
+    F32 m1PresTemp;                        ///< Water Inlet Input temperature
+    F32 m3PresTemp;                        ///< Water Inlet Output temperature
+    F32 p8PresTemp;                        ///< temperature before inlet conductivity sensor (P8)
+    F32 p13PresTemp;                       ///< temperature before RO filter (P13)
+    F32 p17PresTemp;                       ///< temperature after RO filter (P17)
+} PRESSURE_FP_TEMP_DATA_T;
+
 // ********** public function prototypes **********
 
 void initPressure( void );
@@ -59,7 +70,8 @@
 F32 getFilteredPressure( PRESSURE_SENSORS_T sensor );
 F32 getFilteredPressureSensorTemperature( PRESSURE_SENSORS_T sensor );
 
-BOOL testPressureSensorDataPublishIntervalOverride( MESSAGE_T *message );
+BOOL testDDPressureSensorDataPublishIntervalOverride( MESSAGE_T *message );
+BOOL testFPPressureSensorDataPublishIntervalOverride( MESSAGE_T *message );
 BOOL testPressureSensorFilteredReadingsOverride( MESSAGE_T *message );
 BOOL testPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message );