Index: firmware/App/Monitors/Pressure.h
===================================================================
diff -u -r2205857f59dd884c4af450239381387cfb560c2e -rd8cd7de2f84b26aafc153e2bb665a5058a040bf0
--- firmware/App/Monitors/Pressure.h	(.../Pressure.h)	(revision 2205857f59dd884c4af450239381387cfb560c2e)
+++ firmware/App/Monitors/Pressure.h	(.../Pressure.h)	(revision d8cd7de2f84b26aafc153e2bb665a5058a040bf0)
@@ -35,12 +35,16 @@
 /// Pressure data struct.
 typedef struct
 {
-    F32 filteredWaterInletInputPressure;                        ///< Water Inlet Input pressure (P8 PC2o)
-    F32 filteredWaterInletOutputPressure;                       ///< Water Inlet Output pressure (P13 PPo)
-    F32 filteredWaterOutletPressure;                            ///< Water Outlet pressure (P17 PMp)
-    F32 filteredWaterInletInputTemp;                            ///< Water Inlet Input temperature
-    F32 filteredWaterInletOutputTemp;                           ///< Water Inlet Output temperature
-    F32 filteredWaterOutletTemp;                                ///< Water Outlet temperature
+    F32 PressurePRi;                                            ///< Pressure before pressure regulator (M1 PRi)
+    F32 PressurePRo;                                            ///< Pressure after pressure regulator (M3 PRo)
+    F32 PressurePC2o;                                           ///< Pressure before inlet conductivity sensor (P8 PC2o)
+    F32 PressurePPo;                                            ///< Pressure before RO filter (P13 PPo)
+    F32 PressurePMp;                                            ///< Pressure after RO filter (P17 PMp)
+    F32 TempPRi;                                                ///< Temperature before pressure regulator (M1 PRi)
+    F32 TempPRo;                                                ///< Temperature after pressure regulator (M3 PRo)
+    F32 TempPC2o;                                               ///< Temperature before inlet conductivity sensor (P8 PC2o)
+    F32 TempPPo;                                                ///< Temperature before RO filter (P13 PPo)
+    F32 TempPMp;                                                ///< Temperature after RO filter (P17 PMp)
 } PRESSURE_TEMP_DATA_T;
 
 // ********** public function prototypes **********
@@ -52,7 +56,7 @@
 //F32 getFilteredPressure( PRESSURE_SENSORS_T sensor );
 //F32 getFilteredPressureSensorTemperature( PRESSURE_SENSORS_T sensor );
 //
-//BOOL testPressureSensorDataPublishIntervalOverride( MESSAGE_T *message );
+BOOL testPressureSensorDataPublishIntervalOverride( MESSAGE_T *message );
 //BOOL testPressureSensorFilteredReadingsOverride( MESSAGE_T *message );
 //BOOL testPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message );