Index: firmware/App/Controllers/Pressures.h
===================================================================
diff -u -r138efd92a8645e0d2fe422409ef5a33dd2929a25 -r68fc03b5a22f14190146fc9069f022c109682b63
--- firmware/App/Controllers/Pressures.h	(.../Pressures.h)	(revision 138efd92a8645e0d2fe422409ef5a33dd2929a25)
+++ firmware/App/Controllers/Pressures.h	(.../Pressures.h)	(revision 68fc03b5a22f14190146fc9069f022c109682b63)
@@ -5,26 +5,26 @@
  *  THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  *  WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
- *  @file PresOccl.h
+ *  @file Pressures.h
  *
- *  @date 15-Jan-2020
+ *  @date 05-Apr-2020
  *  @author S. Nash
  *
- *  @brief PresOccl header file.
+ *  @brief Pressures header file.
  *
  **************************************************************************/
 
-#ifndef __PRESSURE_OCCLUSION_H__
-#define __PRESSURE_OCCLUSION_H__
+#ifndef __PRESSURES_H__
+#define __PRESSURES_H__
 
 #include "DGCommon.h"
 
 /**
- *  @defgroup PressureOcclusion PressureOcclusion
- *  @brief Pressure & Occlusion controller/monitor module.  Monitors the
- *  blood line pressure sensors and pump occlusion sensors.
+ *  @defgroup DGPressures DGPressures
+ *  @brief Pressure sensors monitor module.  Monitors the various DG pressure
+ *  sensors.
  *
- *  @addtogroup PressureOcclusion
+ *  @addtogroup DGPressures
  *  @{
  */
 
@@ -33,49 +33,27 @@
 /// Enumeration of pressure sensors monitored by this module.
 typedef enum PressureSensors
 {
-    PRESSURE_SENSOR_ARTERIAL = 0,           ///< arterial blood line pressure sensor.
-    PRESSURE_SENSOR_VENOUS,                 ///< vensous blood line pressure sensor.
-    NUM_OF_PRESSURE_SENSORS                 ///< Number of pressure sensors.
+    PRESSURE_SENSOR_RO_PUMP_INLET = 0,          ///< RO pump pressure sensor.
+    PRESSURE_SENSOR_RO_PUMP_OUTLET,             ///< RO pump pressure sensor.
+    PRESSURE_SENSOR_DRAIN_PUMP_INLET,           ///< drain pump inlet pressure.
+    PRESSURE_SENSOR_DRAIN_PUMP_OUTLET,          ///< drain pump outlet pressure.
+    NUM_OF_PRESSURE_SENSORS                     ///< Number of pressure sensors.
 } PRESSURE_SENSORS_T;
 
-/// Enumeration of occlusion sensors monitored by this module.
-typedef enum OcclusionSensors
-{
-    OCCLUSION_SENSOR_BLOOD_PUMP = 0,        ///< blood pump occlusion sensor.
-    OCCLUSION_SENSOR_DIAL_IN_PUMP,          ///< dialysate inlet pump occlusion sensor.
-    OCCLUSION_SENSOR_DIAL_OUT_PUMP,         ///< dialysate outlet pump occlusion sensor.
-    NUM_OF_OCCLUSION_SENSORS                ///< Number of occlusion sensors.
-} OCCLUSION_SENSORS_T;
-
 // ********** public function prototypes **********
 
-void initPresOccl( void );
-void execPresOccl( void );
+void initPressures( void );
+void execPressures( void );
 
-void setPressureLimits( PRESSURE_SENSORS_T sensor, F32 low, F32 high );
-void setOcclusionThreshold( OCCLUSION_SENSORS_T sensor, F32 threshold );
+SELF_TEST_STATUS_T execPressuresTest( void );
 
-SELF_TEST_STATUS_T execPresOcclTest( void );
+DATA_ARRAY_GET_PROTOTYPE( F32, getMeasuredDGPressure, pressureID );
 
-DATA_GET_PROTOTYPE( F32, getMeasuredArterialPressure );
-DATA_GET_PROTOTYPE( F32, getMeasuredVenousPressure);
-DATA_GET_PROTOTYPE( F32, getMeasuredBloodPumpOcclusion );
-DATA_GET_PROTOTYPE( F32, getMeasuredDialInPumpOcclusion );
-DATA_GET_PROTOTYPE( F32, getMeasuredDialOutPumpOcclusion );
+BOOL testSetPressuresDataPublishIntervalOverride( U32 value );
+BOOL testResetPressuresDataPublishIntervalOverride( void );
+BOOL testSetDGPressureSensorOverride( U32 sensor, F32 value );
+BOOL testResetDGPressureSensorOverride( U32 sensor );
 
-BOOL testSetPresOcclDataPublishIntervalOverride( U32 value );
-BOOL testResetPresOcclDataPublishIntervalOverride( void );
-BOOL testSetArterialPressureOverride( F32 value );
-BOOL testResetArterialPressureOverride( void );
-BOOL testSetVenousPressureOverride( F32 value );
-BOOL testResetVenousPressureOverride( void );
-BOOL testSetBloodPumpOcclusionOverride( F32 value );
-BOOL testResetBloodPumpOcclusionOverride( void );
-BOOL testSetDialInPumpOcclusionOverride( F32 value );
-BOOL testResetDialInPumpOcclusionOverride( void );
-BOOL testSetDialOutPumpOcclusionOverride( F32 value );
-BOOL testResetDialOutPumpOcclusionOverride( void );
-
 /**@}*/
 
 #endif