Index: firmware/App/Controllers/PresOccl.h
===================================================================
diff -u -ref5af6dd03da43ed68e147403f5923a9e1d8de8b -r8e7158d8231435496fcf1d5649e51babf859ccc7
--- firmware/App/Controllers/PresOccl.h	(.../PresOccl.h)	(revision ef5af6dd03da43ed68e147403f5923a9e1d8de8b)
+++ firmware/App/Controllers/PresOccl.h	(.../PresOccl.h)	(revision 8e7158d8231435496fcf1d5649e51babf859ccc7)
@@ -1,18 +1,19 @@
-/**********************************************************************//**
- *
- *  Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
- *
- *  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
- *
- *  @date 15-Jan-2020
- *  @author S. Nash
- *
- *  @brief PresOccl header file.
- *
- **************************************************************************/
+/**************************************************************************
+*
+* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+*
+* 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
+*
+* @author (last) Sean Nash
+* @date (last) 01-Dec-2020
+*
+* @author (original) Sean
+* @date (original) 15-Jan-2020
+*
+***************************************************************************/
 
 #ifndef __PRESSURE_OCCLUSION_H__
 #define __PRESSURE_OCCLUSION_H__
@@ -33,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 );
 
 /**@}*/