Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r93a439cf9d1b347e23b84d1156417380ee01efaa -ra60ec05d359c0d3f014015e9080b6dbcef0fea28
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 93a439cf9d1b347e23b84d1156417380ee01efaa)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision a60ec05d359c0d3f014015e9080b6dbcef0fea28)
@@ -54,13 +54,15 @@
 static PRESSURE_STATE_T presOcclState = PRESSURE_INIT_STATE;                    ///< current state of pressure monitor state machine.
 static U32 presOcclDataPublicationTimerCounter = 0;                             ///< used to schedule pressure data publication to CAN bus.
 
-DATA_DECL( U32, PresOcclDataPub, presOcclDataPublishInterval, PRES_OCCL_DATA_PUB_INTERVAL, PRES_OCCL_DATA_PUB_INTERVAL ); ///< interval (in ms) at which to publish pressure/occlusion data to CAN bus.
-DATA_DECL( F32, ArterialPressure, arterialPressure, 0, 0 );                     ///< measured arterial pressure.
-DATA_DECL( F32, VenousPressure, venousPressure, 0.0, 0.0 );                     ///< measured venous pressure.
-DATA_DECL( F32, BloodPumpOcclusion, bloodPumpOcclusion, 0.0, 0.0 );             ///< measured blood pump occlusion pressure.
-DATA_DECL( F32, DialInPumpOcclusion, dialInPumpOcclusion, 0.0, 0.0 );           ///< measured dialysate inlet pump occlusion pressure.
-DATA_DECL( F32, DialOutPumpOcclusion, dialOutPumpOcclusion, 0.0, 0.0 );         ///< measured dialysate outlet pump occlusion pressure.
+static OVERRIDE_F32_T measuredBloodFlowRate = { 0.0, 0.0, 0.0, 0 };             ///< measured blood flow rate
 
+static OVERRIDE_U32_T presOcclDataPublishInterval = { PRES_OCCL_DATA_PUB_INTERVAL, PRES_OCCL_DATA_PUB_INTERVAL, 0, 0 }; ///< interval (in ms) at which to publish pressure/occlusion data to CAN bus.
+static OVERRIDE_F32_T arterialPressure = {0.0, 0.0, 0.0, 0 };                   ///< measured arterial pressure.
+static OVERRIDE_F32_T venousPressure = {0.0, 0.0, 0.0, 0 };                     ///< measured venous pressure.
+static OVERRIDE_F32_T bloodPumpOcclusion = {0.0, 0.0, 0.0, 0 };                 ///< measured blood pump occlusion pressure.
+static OVERRIDE_F32_T dialInPumpOcclusion = {0.0, 0.0, 0.0, 0 };                ///< measured dialysate inlet pump occlusion pressure.
+static OVERRIDE_F32_T dialOutPumpOcclusion = {0.0, 0.0, 0.0, 0 };               ///< measured dialysate outlet pump occlusion pressure.
+
 static PRESSURE_SELF_TEST_STATE_T presOcclSelfTestState = PRESSURE_SELF_TEST_STATE_START;  ///< current pressure self test state.
 static U32 bloodPumpSelfTestTimerCount = 0;                                     ///< timer counter for pressure self test.