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 **********