Index: MsgDefs.h
===================================================================
diff -u -r65f127cc7574a46ab0cc1036d92a0b082d3aa83b -r9c2c83abdb0d088cd8c01eeb302107020c5cfeb3
--- MsgDefs.h	(.../MsgDefs.h)	(revision 65f127cc7574a46ab0cc1036d92a0b082d3aa83b)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 9c2c83abdb0d088cd8c01eeb302107020c5cfeb3)
@@ -18,7 +18,12 @@
 #ifndef __MESSAGE_DEFINITIONS_H__
 #define __MESSAGE_DEFINITIONS_H__
 
-// ********** public definitions **********
+// ********** public definitions **********
+
+/**
+ *  @addtogroup SystemMessageIDs
+ *  @{
+ */
 
 /// Enumeration of system message IDs
 enum Msg_IDs
@@ -82,6 +87,11 @@
     MSG_ID_UI_START_TREATMENT = 0x38,                                   ///< UI user request to initiate a treatment
     MSG_ID_HD_START_TREATMENT_RESPONSE = 0x39,                          ///< HD response to user request to initiate a treatment
     MSG_ID_HD_VALVES_DATA = 0x3A,                                       ///< HD broadcast of valves
+    MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS = 0x3B,                     ///< UI user confirmation of treatment parameters
+    MSG_ID_UI_TREATMENT_END_REQUEST = 0x3C,                             ///< UI user treatment end request
+    MSG_ID_HD_TREATMENT_END_RESPONSE = 0x3D,                            ///< HD response to user request to end treatment
+
+    MSG_ID_TEMP_FAST_HD_VALVES_REMOVE_LATER = 0x6D,                     ///< TODO REMOVE FOR FAST TESING ONLY
 #ifdef EMC_TEST_BUILD
     MSG_ID_CAN_ERROR_COUNT = 0x999,  // test code in support of EMC testing
 #endif
@@ -134,6 +144,10 @@
     MSG_ID_HD_ACCEL_SET_CALIBRATION = 0x802A,                           ///< HD accelerometer set calibration factors request
     MSG_ID_HD_BLOOD_FLOW_SET_CALIBRATION = 0x802B,                      ///< Blood flow set calibration factors request
     MSG_ID_HD_DIALYSATE_FLOW_SET_CALIBRATION = 0x802C,                  ///< Dialysate flow set calibration factors request
+    MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER = 0x802D,               ///< Set a treatment parameter (will change actual setting, not an override)
+    MSG_ID_HD_VALVES_HOME = 0x802E,                                     ///< Home an HD Valve
+    MSG_ID_HD_VALVES_POSITION_OVERRIDE = 0x802F,                        ///< Set an HD valve to a position in counts
+    MSG_ID_HD_VALVES_SET_BLOOD_TRAP_VALVE = 0x8030,                     ///< Set the HD blood trap valve status
 
     MSG_ID_FIRST_DG_TESTER_MESSAGE = 0xA000,                            ///< First DG test message ID
     MSG_ID_DG_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DG_TESTER_MESSAGE,    ///< DG tester log-in
@@ -169,19 +183,20 @@
     MSG_ID_HEAT_DISINFECT_R2_TO_R1_DURATION_MINS = 0xA01F,              ///< Heat disinfection reservoir 2 to reservoir 1 duration in minutes
     MSG_ID_HEAT_DISINFECT_NO_OF_CYCLES_TO_RUN = 0xA020,                 ///< Heat disinfection number of cycles to run
     MSG_ID_HEAT_DISINFECT_PUBLISH_INTERVAL_OVERRIDE = 0xA021,           ///< Heat disinfection data publish interval override request
-    MSG_ID_HD_VALVES_SEND_INTERVAL_OVERRIDE = 0xA022,                   ///< HD valves data publish interval override request
-    MSG_ID_HD_HOME_VALVE = 0xA023,                                      ///< Home an HD Valve
-    MSG_ID_HD_SET_VALVE_POSITION = 0xA024,                              ///< Set an HD valve to a position in counts
-    MSG_ID_HD_SET_BLOOD_TRAP_VALVE = 0xA025,                            ///< Set the HD blood trap valve status
-    MSG_ID_HD_VALVES_POSITION_OVERRIDE = 0xA026,                        ///< HD valves position override
 
     MSG_ID_HD_DEBUG_EVENT = 0xFFF1,                                     ///< HD debug event text to be logged in event log
     MSG_ID_DG_DEBUG_EVENT = 0xFFF2,                                     ///< DG debug event text to be logged in event log
 
     END_OF_MSG_IDS                                                      ///< End of system message IDs
-};
-
+};
 typedef enum Msg_IDs MSG_ID_T;                                          ///< Type for message IDs enumeration
+
+/**@}*/
+
+/**
+ *  @addtogroup RequestRejectReasonsID
+ *  @{
+ */
 
 /// Enumeration of settings change rejection reason codes
 enum Request_Reject_Reasons
@@ -203,9 +218,14 @@
     REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS,                            ///< Ultrafiltration is not currently in progress
     REQUEST_REJECT_REASON_UF_NOT_PAUSED,                                ///< Ultrafiltration is not currently paused
     REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS,                     ///< A saline bolus is in progress
+    REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE,                           ///< A treatment parameter is out of range
+    REQUEST_REJECT_REASON_HEPARIN_PRESTOP_EXCEEDS_DURATION,             ///< The Heparin pre-stop setting is greater than the treatment duration
+    REQUEST_REJECT_REASON_ARTERIAL_PRESSURE_LOW_VS_HIGH,                ///< Arterial pressure low and high alarm limits are not inconsistent
+    REQUEST_REJECT_REASON_VENOUS_PRESSURE_LOW_VS_HIGH,                  ///< Venous pressure low and high alarm limits are inconsistent
     NUM_OF_REQUEST_REJECT_REASONS                                       ///< Number of settings change reject codes
-};
-
+};
 typedef enum Request_Reject_Reasons REQUEST_REJECT_REASON_CODE_T;       ///< Type for settings change rejection reason codes enumeration
+
+/**@}*/
 
 #endif