Index: MsgDefs.h
===================================================================
diff -u -r73ef0c58ea2b67ec0115fbd1504eb72d2a635737 -rf141c4b3acce90dcaa9e192914f3550bec646004
--- MsgDefs.h	(.../MsgDefs.h)	(revision 73ef0c58ea2b67ec0115fbd1504eb72d2a635737)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision f141c4b3acce90dcaa9e192914f3550bec646004)
@@ -1,6 +1,6 @@
 /**********************************************************************//**
  *
- *  Copyright (c) 2020 Diality Inc. - All Rights Reserved.
+ *  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.
@@ -20,7 +20,7 @@
 // ********** public definitions **********
 
 /// Enumeration of system message IDs.
-typedef enum Msg_IDs
+enum Msg_IDs
 {   // normal CAN messages
     MSG_ID_UNUSED = 0,                                                  ///< Zero is an undefined (un-used) message ID).
     MSG_ID_OFF_BUTTON_PRESS = 1,                                        ///< HD/UI off button interactions.
@@ -45,6 +45,14 @@
     MSG_ID_USER_SALINE_BOLUS_RESPONSE = 0x14,                           ///< HD response to user saline bolus request.
     MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE = 0x15,                      ///< User confirmation of ultrafiltration settings change.
     MSG_ID_USER_TREATMENT_TIME_CHANGE_REQUEST = 0x16,                   ///< User request to change treatment duration.
+    MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_REQUEST = 0x17,                  ///< User request to change blood and dialysate rates.
+    MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_RESPONSE = 0x18,                 ///< HD response to user request to change blood and dialysate rates.
+    MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS = 0x19,                        ///< HD provides DG with dialysate temperature set points.
+    MSG_ID_TREATMENT_PARAM_CHANGE_RANGES = 0x1A,                        ///< HD provides several parameter change ranges as they evolve over treatment duration
+    MSG_ID_USER_TREATMENT_TIME_CHANGE_RESPONSE = 0x1B,                  ///< HD response to user request to change treatment duration.
+    MSG_ID_REQUEST_FW_VERSIONS = 0x1C,                                  ///< UI request for f/w versions.
+    MSG_ID_HD_VERSION = 0x1D,                                           ///< HD f/w version.
+    MSG_ID_DG_VERSION = 0x1E,                                           ///< DG f/w version.
 
     // service/test CAN messages
 
@@ -93,12 +101,31 @@
     MSG_ID_DG_MESSAGE = 0xA001,
     MSG_ID_DG_WATCHDOG_TASK_CHECKIN_OVERRIDE = 0xA002,
     MSG_ID_DG_SET_RTC_DATE_TIME = 0xA004,
-    MSG_ID_LOAD_CELL_A1_OVERRIDE = 0xA005,
-    MSG_ID_LOAD_CELL_A2_OVERRIDE = 0xA006,
-    MSG_ID_LOAD_CELL_B1_OVERRIDE = 0xA007,
-    MSG_ID_LOAD_CELL_B2_OVERRIDE = 0xA008,
-
+    MSG_ID_LOAD_CELL_OVERRIDE = 0xA005,
     END_OF_MSG_IDS                                                      ///< # of system message IDs.
-} MSG_ID_T;
+};
+/// Type for message IDs enumeration.
+typedef enum Msg_IDs MSG_ID_T;
 
+/// Enumeration of settings change rejection reason codes.
+enum Request_Reject_Reasons
+{
+    REQUEST_REJECT_REASON_NONE = 0,                                     ///< Used when there is no rejection.
+    REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE,                  ///< Request is not allowed in the current operating mode.
+    REQUEST_REJECT_REASON_TIMEOUT_WAITING_FOR_USER_CONFIRM,             ///< Validated request was not confirmed by user in reasonable time.
+    REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,                        ///< Request is not allowed if not in treatment mode.
+    REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE,                      ///< Request is not allowed in current treatment state.
+    REQUEST_REJECT_REASON_TREATMENT_TOO_CLOSE_TO_FINISHED,              ///< Request is not allowed so near end of treatment.
+    REQUEST_REJECT_REASON_TREATMENT_TIME_OUT_OF_RANGE,                  ///< Treatment duration is out of range.
+    REQUEST_REJECT_REASON_TREATMENT_TIME_LESS_THAN_CURRENT,             ///< Treatment time change is less than currently elapsed treatment time.
+    REQUEST_REJECT_REASON_BLOOD_FLOW_OUT_OF_RANGE,                      ///< Blood flow is out of range.
+    REQUEST_REJECT_REASON_DIAL_FLOW_OUT_OF_RANGE,                       ///< Dialysate flow is out of range.
+    REQUEST_REJECT_REASON_DIAL_VOLUME_OUT_OF_RANGE,                     ///< Dialysate flow rate or treatment duration causes dialysate volume to exceed limit.
+    REQUEST_REJECT_REASON_UF_VOLUME_OUT_OF_RANGE,                       ///< Ultrafiltration volume is out of range.
+    REQUEST_REJECT_REASON_UF_RATE_OUT_OF_RANGE,                         ///< Ultrafiltration rate is out of range.
+    NUM_OF_REQUEST_REJECT_REASONS                                       ///< Number of settings change reject codes.
+};
+/// Type for settings change rejection reason codes enumeration.
+typedef enum Request_Reject_Reasons REQUEST_REJECT_REASON_CODE_T;
+
 #endif