Index: firmware/App/Controllers/PresOccl.h
===================================================================
diff -u -rd336db3909e3c5865ede9da2da640e7df6743b11 -rf8feb10a7e19e17148e4ce8b247316c9772d1753
--- firmware/App/Controllers/PresOccl.h	(.../PresOccl.h)	(revision d336db3909e3c5865ede9da2da640e7df6743b11)
+++ firmware/App/Controllers/PresOccl.h	(.../PresOccl.h)	(revision f8feb10a7e19e17148e4ce8b247316c9772d1753)
@@ -48,20 +48,30 @@
     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 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 );
+U32  getMeasuredArterialPressure( void );
+U32  getMeasuredVenousPressure( void );
+U32  getMeasuredBloodPumpOcclusion( void );
+U32  getMeasuredDialInPumpOcclusion( void );
+U32  getMeasuredDialOutPumpOcclusion( void );
+
+BOOL isCartridgeLoaded( void );
 
 BOOL testSetPresOcclDataPublishIntervalOverride( U32 value );
 BOOL testResetPresOcclDataPublishIntervalOverride( void );