Index: firmware/App/Controllers/PresOccl.h
===================================================================
diff -u -rde5a0d43bdef611d963d11855bc958a8d8899a09 -r933a18d740285e70be9d00696ed0f5a5381bc8e4
--- firmware/App/Controllers/PresOccl.h	(.../PresOccl.h)	(revision de5a0d43bdef611d963d11855bc958a8d8899a09)
+++ firmware/App/Controllers/PresOccl.h	(.../PresOccl.h)	(revision 933a18d740285e70be9d00696ed0f5a5381bc8e4)
@@ -7,8 +7,8 @@
 *
 * @file PresOccl.h
 *
-* @author (last) Sean
-* @date (last) 27-Feb-2020
+* @author (last) Sean Nash
+* @date (last) 22-Sep-2020
 *
 * @author (original) Sean
 * @date (original) 15-Jan-2020
@@ -34,47 +34,56 @@
 /// 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_ARTERIAL = 0,           ///< arterial blood line pressure sensor
+    PRESSURE_SENSOR_VENOUS,                 ///< vensous blood line pressure sensor
+    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_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;
 
+/// Payload record structure for the pressure & occlusions data message.
+typedef struct
+{
+    F32 arterialPressure;
+    F32 venousPressure;
+    U32 bldPumpOcclusion;
+    U32 diPumpOcclusion;
+    U32 doPumpOcclusion;
+} PRESSURE_OCCLUSION_DATA_T;
+
 // ********** public function prototypes **********
 
 void initPresOccl( void );
 void execPresOccl( void );
 
-void setPressureLimits( PRESSURE_SENSORS_T sensor, F32 low, F32 high );
-void setOcclusionThreshold( OCCLUSION_SENSORS_T sensor, F32 threshold );
-
 SELF_TEST_STATUS_T execPresOcclTest( void );
 
-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 );
-
+F32  getMeasuredArterialPressure( void );
+F32  getMeasuredVenousPressure( void );
+U32  getMeasuredBloodPumpOcclusion( void );
+U32  getMeasuredDialInPumpOcclusion( void );
+U32  getMeasuredDialOutPumpOcclusion( void );
+
+BOOL isCartridgeLoaded( void );
+
 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 testSetBloodPumpOcclusionOverride( U32 value );
 BOOL testResetBloodPumpOcclusionOverride( void );
-BOOL testSetDialInPumpOcclusionOverride( F32 value );
+BOOL testSetDialInPumpOcclusionOverride( U32 value );
 BOOL testResetDialInPumpOcclusionOverride( void );
-BOOL testSetDialOutPumpOcclusionOverride( F32 value );
+BOOL testSetDialOutPumpOcclusionOverride( U32 value );
 BOOL testResetDialOutPumpOcclusionOverride( void );
 
 /**@}*/