Index: firmware/App/Controllers/AlarmLamp.c
===================================================================
diff -u -rc67def50892f9a7c2f1f22985b5351465a8f6773 -r0b3a29a3a189b9d357d3eaa554c7baf22de30e81
--- firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision c67def50892f9a7c2f1f22985b5351465a8f6773)
+++ firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision 0b3a29a3a189b9d357d3eaa554c7baf22de30e81)
@@ -176,7 +176,7 @@
  * @details Outputs: none
  * @return currentLampPattern
  *************************************************************************/
-LAMP_PATTERN_T  getCurrentAlarmLampPattern( void )
+LAMP_PATTERN_T getCurrentAlarmLampPattern( void )
 {
     LAMP_PATTERN_T result = (LAMP_PATTERN_T)currentLampPattern.data;
 
Index: firmware/App/Controllers/AlarmLamp.h
===================================================================
diff -u -rc67def50892f9a7c2f1f22985b5351465a8f6773 -r0b3a29a3a189b9d357d3eaa554c7baf22de30e81
--- firmware/App/Controllers/AlarmLamp.h	(.../AlarmLamp.h)	(revision c67def50892f9a7c2f1f22985b5351465a8f6773)
+++ firmware/App/Controllers/AlarmLamp.h	(.../AlarmLamp.h)	(revision 0b3a29a3a189b9d357d3eaa554c7baf22de30e81)
@@ -50,7 +50,7 @@
 void requestAlarmLampPattern( LAMP_PATTERN_T lampPattern );
 SELF_TEST_STATUS_T execAlarmLampTest( void );
 
-DATA_GET_PROTOTYPE( LAMP_PATTERN_T, getCurrentAlarmLampPattern );
+LAMP_PATTERN_T getCurrentAlarmLampPattern( void );
 BOOL getAlarmLampOn( void );
 
 BOOL testSetCurrentLampPatternOverride( U32 value );
Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r40a0bc77c53a4eb538580d44f1117d26f1d37fb2 -r0b3a29a3a189b9d357d3eaa554c7baf22de30e81
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 40a0bc77c53a4eb538580d44f1117d26f1d37fb2)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 0b3a29a3a189b9d357d3eaa554c7baf22de30e81)
@@ -210,7 +210,7 @@
 static void checkBloodPumpFlowAgainstSpeed( void );
 static void checkBloodPumpMCCurrent( void );
 static void checkBloodFlowSensorSignalStrength( void );
-static DATA_GET_PROTOTYPE( U32, getPublishBloodFlowDataInterval );
+static U32 getPublishBloodFlowDataInterval( void );
 
 /*********************************************************************//**
  * @brief
Index: firmware/App/Controllers/Buttons.c
===================================================================
diff -u -rc67def50892f9a7c2f1f22985b5351465a8f6773 -r0b3a29a3a189b9d357d3eaa554c7baf22de30e81
--- firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision c67def50892f9a7c2f1f22985b5351465a8f6773)
+++ firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision 0b3a29a3a189b9d357d3eaa554c7baf22de30e81)
@@ -175,7 +175,7 @@
  * @details Outputs: none
  * @return BUTTON_STATE_PRESSED if off button pressed, BUTTON_STATE_RELEASED if not
  *************************************************************************/
-BUTTON_STATE_T  getOffButtonState( void )
+BUTTON_STATE_T getOffButtonState( void )
 {
     BUTTON_STATE_T result = (BUTTON_STATE_T)dataOffButtonState.data;
 
Index: firmware/App/Controllers/Buttons.h
===================================================================
diff -u -rf3b83f75a19b975ad1abead662c8151a2907ac00 -r0b3a29a3a189b9d357d3eaa554c7baf22de30e81
--- firmware/App/Controllers/Buttons.h	(.../Buttons.h)	(revision f3b83f75a19b975ad1abead662c8151a2907ac00)
+++ firmware/App/Controllers/Buttons.h	(.../Buttons.h)	(revision 0b3a29a3a189b9d357d3eaa554c7baf22de30e81)
@@ -54,8 +54,8 @@
 void userConfirmOffButton( U08 response );
 SELF_TEST_STATUS_T execStuckButtonTest( void );
 
-DATA_GET_PROTOTYPE( BUTTON_STATE_T, getOffButtonState );
-DATA_GET_PROTOTYPE( BUTTON_STATE_T, getStopButtonState );
+BUTTON_STATE_T getOffButtonState( void );
+BUTTON_STATE_T getStopButtonState( void );
 
 BOOL testSetOffButtonStateOverride( U32 value );
 BOOL testResetOffButtonStateOverride( void );
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r40a0bc77c53a4eb538580d44f1117d26f1d37fb2 -r0b3a29a3a189b9d357d3eaa554c7baf22de30e81
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 40a0bc77c53a4eb538580d44f1117d26f1d37fb2)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 0b3a29a3a189b9d357d3eaa554c7baf22de30e81)
@@ -204,7 +204,7 @@
 static void checkDialInPumpFlowAgainstSpeed( void );
 static void checkDialInPumpMCCurrent( void );
 static void checkDialInFlowSensorSignalStrength( void );
-static DATA_GET_PROTOTYPE( U32, getPublishDialInFlowDataInterval );
+static U32 getPublishDialInFlowDataInterval( void );
 
 /*********************************************************************//**
  * @brief
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -rb01542f8e4ef5a29e9b08fc0d465478de516bf02 -r0b3a29a3a189b9d357d3eaa554c7baf22de30e81
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision b01542f8e4ef5a29e9b08fc0d465478de516bf02)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 0b3a29a3a189b9d357d3eaa554c7baf22de30e81)
@@ -185,7 +185,7 @@
 static void checkDialOutPumpSpeeds( void );
 static void checkDialOutPumpMCCurrent( void );
 
-static DATA_GET_PROTOTYPE( U32, getPublishDialOutDataInterval );
+static U32 getPublishDialOutDataInterval( void );
 
 /*********************************************************************//**
  * @brief
Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r40a0bc77c53a4eb538580d44f1117d26f1d37fb2 -r0b3a29a3a189b9d357d3eaa554c7baf22de30e81
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 40a0bc77c53a4eb538580d44f1117d26f1d37fb2)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 0b3a29a3a189b9d357d3eaa554c7baf22de30e81)
@@ -104,7 +104,7 @@
 static void checkVenousPressureInRange( void );
 static void checkOcclusions( void );
 static void publishPresOcclData( void );
-static DATA_GET_PROTOTYPE( U32, getPublishPresOcclDataInterval );
+static U32 getPublishPresOcclDataInterval( void );
 
 /*********************************************************************//**
  * @brief
Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r1a685471524555a374854c0c9ec8e208e71fe2df -r0b3a29a3a189b9d357d3eaa554c7baf22de30e81
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 1a685471524555a374854c0c9ec8e208e71fe2df)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 0b3a29a3a189b9d357d3eaa554c7baf22de30e81)
@@ -235,7 +235,7 @@
 static void setFPGAValveSetPoint( VALVE_T valve, S16 position, BOOL enableCurrentRelaxation );
 static void convertAndMonitorValvesCurrent( void );
 static void getAndMonitorValvesCurrentPosition( void );
-static DATA_GET_PROTOTYPE( U32, getPublishValvesDataInterval );
+static U32  getPublishValvesDataInterval( void );
 static void publishValvesData( VALVE_T valve );
 static void setValveNextStep( VALVE_T valve, U32 stepChange );
 
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r933a18d740285e70be9d00696ed0f5a5381bc8e4 -r0b3a29a3a189b9d357d3eaa554c7baf22de30e81
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 933a18d740285e70be9d00696ed0f5a5381bc8e4)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 0b3a29a3a189b9d357d3eaa554c7baf22de30e81)
@@ -185,17 +185,14 @@
 
 // ********** private data **********
 
-/// interval (in ms) at which to publish alarm status to CAN bus
-DATA_DECL( U32, AlarmStatusPub, alarmStatusPublishInterval, ALARM_STATUS_PUBLISH_INTERVAL, ALARM_STATUS_PUBLISH_INTERVAL );
+/// interval (in ms) at which to publish alarm status to CAN bus
+static OVERRIDE_U32_T alarmStatusPublishInterval = { ALARM_STATUS_PUBLISH_INTERVAL, ALARM_STATUS_PUBLISH_INTERVAL, ALARM_STATUS_PUBLISH_INTERVAL, 0 };
+
 static U32 alarmStatusPublicationTimerCounter = 0;                  ///< Used to schedule alarm status publication to CAN bus.
 
-/// table - current state of each alarm
-static BOOL alarmIsActive[ NUM_OF_ALARM_IDS ];
-/// table - when alarm became active for each alarm (if active) or zero (if inactive)
-DATA_ARRAY_DECL( U32, AlarmStarts, NUM_OF_ALARM_IDS, alarmStartedAt );
-
+static BOOL alarmIsActive[ NUM_OF_ALARM_IDS ];                      ///< table - current state of each alarm
+static OVERRIDE_U32_T alarmStartedAt[ NUM_OF_ALARM_IDS ];           ///< table - when alarm became active for each alarm (if active) or zero (if inactive)
 static COMP_ALARM_STATUS_T alarmStatus;                             ///< Record for the current composite alarm status.
-
 static ALARM_ID_T alarmPriorityFIFO[ NUM_OF_ALARM_PRIORITIES ];     ///< FIFO - first activated alarm in each alarm priority category.
 
 // ********** private function prototypes **********
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -rc67def50892f9a7c2f1f22985b5351465a8f6773 -r0b3a29a3a189b9d357d3eaa554c7baf22de30e81
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision c67def50892f9a7c2f1f22985b5351465a8f6773)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 0b3a29a3a189b9d357d3eaa554c7baf22de30e81)
@@ -57,7 +57,7 @@
 static void resetWDTaskCheckIns( void );
 static BOOL haveAllTasksCheckedIn( void );
 static void petWatchdog( void );
-static DATA_ARRAY_GET_PROTOTYPE( BOOL, hasTaskGeneralCheckedIn, task );
+static BOOL hasTaskGeneralCheckedIn( U32 task );
 
 /*********************************************************************//**
  * @brief