Index: firmware/.cproject
===================================================================
diff -u -r1de053c0d8204cbfd194eea6463cb4b2e3094607 -r7138d8ca7496d3ee0f788ea1d9a34bb47e45da6e
--- firmware/.cproject	(.../.cproject)	(revision 1de053c0d8204cbfd194eea6463cb4b2e3094607)
+++ firmware/.cproject	(.../.cproject)	(revision 7138d8ca7496d3ee0f788ea1d9a34bb47e45da6e)
@@ -50,6 +50,7 @@
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEFINE.1286433369" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.DEFINE" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="__TI_VIM_128CH__"/>
+									<listOptionValue builtIn="false" value="DEBUG_ENABLED"/>
 									<listOptionValue builtIn="false" value="_HD_"/>
 									<listOptionValue builtIn="false" value="__TI_VFPV3D16_SUPPORT__"/>
 								</option>
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r94895e32fe18e78b98fe3bb7786838cf00afdbfa -r7138d8ca7496d3ee0f788ea1d9a34bb47e45da6e
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 94895e32fe18e78b98fe3bb7786838cf00afdbfa)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 7138d8ca7496d3ee0f788ea1d9a34bb47e45da6e)
@@ -896,9 +896,6 @@
 }
 
 
-/**@}*/
-
-
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
@@ -1144,7 +1141,7 @@
 /*********************************************************************//**
  * @brief
  * The testSetMeasuredDialOutPumpMCSpeedOverride function overrides the measured \n
- * dialIn pump motor speed. \n
+ * dialIn pump motor speed.
  * @details
  * Inputs : dialOutPumpMCSpeedRPM
  * Outputs : dialOutPumpMCSpeedRPM
@@ -1191,7 +1188,7 @@
 /*********************************************************************//**
  * @brief
  * The testSetMeasuredDialOutPumpMCCurrentOverride function overrides the measured \n
- * dialIn pump motor current. \n
+ * dialIn pump motor current.
  * @details
  * Inputs : dialOutPumpMCCurrentmA
  * Outputs : dialOutPumpMCCurrentmA
@@ -1238,7 +1235,7 @@
 /*********************************************************************//**
  * @brief
  * The testSetDialOutLoadCellWeightOverride function overrides the value of the \n
- * load cell sensor with a given weight (in grams). \n
+ * load cell sensor with a given weight (in grams).
  * @details
  * Inputs : loadCellWeightInGrams[]
  * Outputs : loadCellWeightInGrams[]
@@ -1290,4 +1287,4 @@
     return result;
 }
 
-
+/**@}*/
Index: firmware/App/HDCommon.h
===================================================================
diff -u -r94895e32fe18e78b98fe3bb7786838cf00afdbfa -r7138d8ca7496d3ee0f788ea1d9a34bb47e45da6e
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 94895e32fe18e78b98fe3bb7786838cf00afdbfa)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 7138d8ca7496d3ee0f788ea1d9a34bb47e45da6e)
@@ -25,7 +25,6 @@
 //    #define RM46_EVAL_BOARD_TARGET          1
     #define BREADBOARD_TARGET               1
 //    #define SIMULATE_UI                     1
-    #define DEBUG_ENABLED                   1
     #define DISABLE_CRC_ERROR               1
     #define DISABLE_MOTOR_CURRENT_ERRORS    1
     #define SHOW_LOAD_CELL_IN_ROTOR_RPM     1
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r8ecacdf946ecec11c2f65000876d767279cdd33a -r7138d8ca7496d3ee0f788ea1d9a34bb47e45da6e
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 8ecacdf946ecec11c2f65000876d767279cdd33a)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 7138d8ca7496d3ee0f788ea1d9a34bb47e45da6e)
@@ -97,6 +97,14 @@
     { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_VENOUS_PRESSURE_HIGH
     { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_UF_RATE_TOO_HIGH_ERROR
     { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_UF_VOLUME_ACCURACY_ERROR
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            FALSE, FALSE, FALSE, TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_RTC_BATTERY_LOW
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_RTC_OR_TIMER_ACCURACY_FAILURE
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_RTC_RAM_OPS_ERROR
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_NVDATA_EEPROM_OPS_FAILURE
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            FALSE, FALSE, TRUE,  TRUE,  FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_NVDATA_MFG_RECORD_CRC_ERROR
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_NVDATA_SRVC_RECORD_CRC_ERROR
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_NVDATA_CAL_RECORD_CRC_ERROR
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR
 };
 
 /// A blank alarm data record for alarms that do not include alarm data when triggered.