Index: AlarmDefs.h
===================================================================
diff -u -r322672840ce746f53390148bd721fd5e1635cf49 -r971a6403f186c78d7453f2517bf56737a283a7ab
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 322672840ce746f53390148bd721fd5e1635cf49)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 971a6403f186c78d7453f2517bf56737a283a7ab)
@@ -25,13 +25,6 @@
  *  @{
  */
 
-#define ALM_ESC_1_MIN                           (1 * 60000)         ///< Number of ms in 1 minute.
-#define ALM_ESC_4_MIN                           (4 * 60000)         ///< Number of ms in 4 minutes.
-#define ALM_ESC_5_MIN                           (5 * 60000)         ///< Number of ms in 5 minutes.
-#define ALM_ESC_10_MIN                          (10 * 60000)        ///< Number of ms in 10 minutes.
-#define ALM_ESC_30_MIN                          (30 * 60000)        ///< Number of ms in 30 minutes.
-#define ALM_ESC_90_MIN                          (90 * 60000)        ///< Number of ms in 90 minutes.
-
 /// Enumeration of alarm IDs.
 enum Alarm_List
 {
@@ -81,6 +74,24 @@
 };
 typedef enum Alarm_Data_Types ALARM_DATA_TYPES_T;                   ///< Type for data type of triggered alarm.
 
+/// Enumeration of alarm sources.
+enum Alarm_Sources
+{
+    ALARM_SOURCE_UI = 0,                                            ///< User interface alarm source
+    ALARM_SOURCE_TD,                                                ///< TD firmware alarm source
+    ALARM_SOURCE_DD,                                                ///< DD firmware alarm source
+    ALARM_SOURCE_RO,                                                ///< RO firmware alarm source
+    NUMBER_OF_ALARM_SOURCES                                         ///< Number of alarm sources
+};
+typedef enum Alarm_Sources ALARM_SOURCE_T;                          ///< Type for alarm sources enumeration
+
+/**@}*/
+
+/**
+ *  @addtogroup AlarmManagementTD
+ *  @{
+ */
+
 /// Enumeration of alarm silence commands.
 enum Alarm_Silence_Commands
 {
@@ -90,16 +101,6 @@
 };
 typedef enum Alarm_Silence_Commands ALARM_SILENCE_CMD_T;            ///< Type for alarm silence commands
 
-/// Enumeration of alarm sources.
-enum Alarm_Sources
-{
-    ALARM_SOURCE_UI = 0,                                            ///< User interface alarm source
-    ALARM_SOURCE_HD,                                                ///< HD firmware alarm source
-    ALARM_SOURCE_DG,                                                ///< DG firmware alarm source
-    NUMBER_OF_ALARM_SOURCES                                         ///< Number of alarm sources
-};
-typedef enum Alarm_Sources ALARM_SOURCE_T;                          ///< Type for alarm sources enumeration
-
 /// Enumeration of alarm user actions.
 enum Alarm_User_Actions
 {
@@ -134,6 +135,13 @@
 };
 typedef enum Alarm_State_Flag_Bit_Positions ALARM_STATE_FLAG_BIT_POSITIONS_T;
 
+/**@}*/
+
+/**
+ *  @addtogroup AlarmManagement
+ *  @{
+ */
+
 /// Record defining the properties of each individual alarm.
 struct AlarmsStateRecord
 {
@@ -149,8 +157,6 @@
     BOOL                alarmNoEndTreatment;        ///< Alarm prevents ending treatment
     BOOL                alarmBlockRinseback;        ///< Alarm should not trigger while in rinseback states
     BOOL                alarmBlockEndTx;            ///< Alarm should not trigger while in post-treatment mode
-    BOOL                alarmNoRetrigOnRB;          ///< Alarm prevents re-trigger of alarm upon user selecting rinseback until return to treatment or back to standby
-    BOOL                alarmNoRetrigOnEndTx;       ///< Alarm prevents re-trigger of alarm upon user selecting end tx until back to standby
     BOOL                alarmNoBloodRecirc;         ///< Alarm prevents blood re-circulation
     BOOL                alarmNoDialysateRecirc;     ///< Alarm prevents dialysate re-circulation
     BOOL                alarmClearOnly;             ///< Clear only this alarm on user acknowledgment
@@ -217,6 +223,8 @@
 
 #endif // included by AlarmMgmt.c
 
+/**@}*/
+
 #ifdef __MANUAL_ALARMS__
 // Manual alarm table. These fields must be filled by a user even if we have to get the data from other departments
 // This part is only compiled when the checkAlarms.sh creates a .c file to check the alarm tables. This code is not used in the firmware.
@@ -256,6 +264,4 @@
 
 #endif  // manual alarms
 
-/**@}*/
-
 #endif
Index: MsgDefs.h
===================================================================
diff -u -r322672840ce746f53390148bd721fd5e1635cf49 -r971a6403f186c78d7453f2517bf56737a283a7ab
--- MsgDefs.h	(.../MsgDefs.h)	(revision 322672840ce746f53390148bd721fd5e1635cf49)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 971a6403f186c78d7453f2517bf56737a283a7ab)
@@ -22,7 +22,7 @@
 // ********** public definitions **********
 
 /**
- *  @addtogroup SystemCommMessages
+ *  @addtogroup Messages
  *  @{
  */
 
@@ -61,10 +61,12 @@
     MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000,                            ///< First TD test message ID
     MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TD_TESTER_MESSAGE,       ///< TD tester log-in
     MSG_ID_TD_SOFTWARE_RESET_REQUEST = 0x8001,                          ///< TD reset request
+    MSG_ID_TD_SEND_TEST_CONFIGURATION = 0x8002,                         ///< TD send test configuration to Dialin
 
     MSG_ID_FIRST_DD_TESTER_MESSAGE = 0xA000,                            ///< First DD test message ID
     MSG_ID_DD_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DD_TESTER_MESSAGE,    ///< DD tester log-in
-    MSG_ID_DD_SOFTWARE_RESET_REQUEST = 0xA022,                          ///< DD reset request
+    MSG_ID_DD_SOFTWARE_RESET_REQUEST = 0xA001,                          ///< DD reset request
+    MSG_ID_DD_SEND_TEST_CONFIGURATION = 0xA002,                         ///< DD send test configuration to Dialin
 
     MSG_ID_TD_DEBUG_EVENT = 0xFFF1,                                     ///< TD debug event text to be logged in event log
     MSG_ID_DD_DEBUG_EVENT = 0xFFF2,                                     ///< DD debug event text to be logged in event log