Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r1760616331f8dbf20f80bd9ec1cfaba01134b8f7 -rd5c5b1d2bc42b166f1ccff1aa4b2441db8f06d4b
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 1760616331f8dbf20f80bd9ec1cfaba01134b8f7)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision d5c5b1d2bc42b166f1ccff1aa4b2441db8f06d4b)
@@ -1,18 +1,19 @@
-/**********************************************************************//**
- *
- *  Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
- *
- *  THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
- *  WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
- *
- *  @file AlarmMgmt.h
- *
- *  @date 07-Nov-2019
- *  @author S. Nash
- *
- *  @brief header file for Alarm Management service module.
- *
- **************************************************************************/
+/**************************************************************************
+*
+* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+*
+* THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+* WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+*
+* @file AlarmMgmt.h
+*
+* @author (last) Dara Navaei
+* @date (last) 30-Sep-2020
+*
+* @author (original) Sean Nash
+* @date (original) 07-Nov-2019
+*
+***************************************************************************/
 
 #ifndef __ALARM_MGMT_H__
 #define __ALARM_MGMT_H__
@@ -21,8 +22,8 @@
 
 /**
  *  @defgroup AlarmManagement AlarmManagement
- *  @brief Alarm Management service module.  Provides general alarm management \n
- *  functionality including support functions for triggering and clearing \n
+ *  @brief Alarm Management service module.  Provides general alarm management
+ *  functionality including support functions for triggering and clearing
  *  specific alarms.
  *
  *  @addtogroup AlarmManagement
@@ -106,7 +107,7 @@
 } ALARM_DATA_T;
 #pragma pack(pop)
 
-// Listing of specific software faults for logging purposes.
+/// Listing of specific software faults for logging purposes.
 typedef enum
 {
     SW_FAULT_ID_NONE = 0,
@@ -168,6 +169,36 @@
     SW_FAULT_ID_DIALYSIS_INVALID_UF_STATE,
     SW_FAULT_ID_NVDATAMGMT_INVALID_SELF_TEST_STATE,
     SW_FAULT_ID_NVDATAMGMT_EXEC_INVALID_STATE,
+    SW_FAULT_ID_MODE_TREATMENT_INVALID_STATE,
+    SW_FAULT_ID_INTERRUPTS_INVALID_EDGE_DETECTED,                       // 60
+    SW_FAULT_ID_INVALID_DG_PRESSURE_ID,
+    SW_FAULT_ID_CAN_PARITY_ERROR,
+    SW_FAULT_ID_CAN_PASSIVE_WARNING,
+    SW_FAULT_ID_CAN_OFF_ERROR,
+    SW_FAULT_ID_FPGA_UART_FRAME_ERROR,                                  // 65
+    SW_FAULT_ID_FPGA_UART_OVERRUN_ERROR,
+    SW_FAULT_ID_UTIL_TIME_WINDOWED_COUNT_ERROR,
+    SW_FAULT_ID_ACCEL_INVALID_STATE,
+    SW_FAULT_ID_ACCEL_GET_INVALID_AXIS,
+    SW_FAULT_ID_ACCEL_GET_MAX_INVALID_AXIS,                             // 70
+    SW_FAULT_ID_ACCEL_INVALID_SELF_TEST_STATE,
+    SW_FAULT_ID_UTIL_INVALID_WIN_COUNT,
+    SW_FAULT_ID_UTIL_INVALID_WIN_MAX_COUNT,
+    SW_FAULT_ID_MODE_TREATMENT_PARAMS_INVALID_STATE,
+    SW_FAULT_ID_MODE_TREATMENT_PARAMS_INVALID_PARAM,                    // 75
+    SW_FAULT_ID_MODE_TREATMENT_PARAMS_INVALID_SET_U32_PARAM,
+    SW_FAULT_ID_MODE_TREATMENT_PARAMS_INVALID_SET_S32_PARAM,
+    SW_FAULT_ID_MODE_TREATMENT_PARAMS_INVALID_SET_F32_PARAM,
+    SW_FAULT_ID_MODE_TREATMENT_PARAMS_INVALID_GET_U32_PARAM,
+    SW_FAULT_ID_MODE_TREATMENT_PARAMS_INVALID_GET_S32_PARAM,            // 80
+    SW_FAULT_ID_MODE_TREATMENT_PARAMS_INVALID_GET_F32_PARAM,
+    SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX,
+    SW_FAULT_ID_HD_VALVES_INVALID_SELF_TEST_STATE,
+    SW_FAULT_ID_HD_VALVES_INVALID_EXEC_STATE,
+    SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED,                       // 85
+    SW_FAULT_ID_HD_VALVES_INVALID_AIR_TRAP_REQUEST,
+    SW_FAULT_ID_HD_VALVES_INVALID_CONTROL_MODE_SELECTED,
+    SW_FAULT_ID_HD_VAVLES_INVALID_POSITION_SELECTED,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;
 
@@ -182,13 +213,13 @@
 void clearAlarm( ALARM_ID_T alarm );
 BOOL isAlarmActive( ALARM_ID_T alarm );
 
-/**@}*/
-
 BOOL testSetAlarmStatusPublishIntervalOverride( U32 value );
 BOOL testResetAlarmStatusPublishIntervalOverride( void );
 BOOL testSetAlarmStateOverride( U32 alarmID, BOOL value );
 BOOL testResetAlarmStateOverride( U32 alarmID );
 BOOL testSetAlarmStartOverride( U32 alarmID, U32 value );
 BOOL testResetAlarmStartOverride( U32 alarmID );
 
+/**@}*/
+
 #endif