Index: firmware/App/Controllers/PresOccl.h
===================================================================
diff -u -r1ffe793b3a3557a408b0f5d30539e8f0f499e559 -r1a685471524555a374854c0c9ec8e208e71fe2df
--- firmware/App/Controllers/PresOccl.h	(.../PresOccl.h)	(revision 1ffe793b3a3557a408b0f5d30539e8f0f499e559)
+++ firmware/App/Controllers/PresOccl.h	(.../PresOccl.h)	(revision 1a685471524555a374854c0c9ec8e208e71fe2df)
@@ -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,18 +34,18 @@
 /// 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;
 
 // ********** public function prototypes **********
@@ -57,11 +57,11 @@
 
 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 );
+F32 getMeasuredBloodPumpOcclusion( void );
+F32 getMeasuredDialInPumpOcclusion( void );
+F32 getMeasuredDialOutPumpOcclusion( void );
 
 BOOL testSetPresOcclDataPublishIntervalOverride( U32 value );
 BOOL testResetPresOcclDataPublishIntervalOverride( void );