Index: MsgDefs.h
===================================================================
diff -u -r86a8d915dbacdcf2a1ece823bf4b3adf83e49396 -r87d2e5e349cd03a7914d8ca2d8b0ccfce89698d7
--- MsgDefs.h	(.../MsgDefs.h)	(revision 86a8d915dbacdcf2a1ece823bf4b3adf83e49396)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 87d2e5e349cd03a7914d8ca2d8b0ccfce89698d7)
@@ -43,8 +43,8 @@
     MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD_REQUEST = 0xB,                       ///< UI command to set alarm audio volume level
     MSG_ID_TD_ALARM_AUDIO_VOLUME_SET_RESPONSE = 0xC,                                ///< TD response to UI set alarm audio volume request
     MSG_ID_FW_VERSIONS_REQUEST = 0xD,                                               ///< UI request for f/w versions
-    MSG_ID_TD_VERSION_REPONSE = 0xE,                                                ///< TD f/w version response
-    MSG_ID_DD_VERSION_REPONSE = 0xF,                                                ///< DD f/w version response
+    MSG_ID_TD_VERSION_RESPONSE = 0xE,                                               ///< TD f/w version response
+    MSG_ID_DD_VERSION_RESPONSE = 0xF,                                               ///< DD f/w version response
     MSG_ID_UI_CHECK_IN = 0x10,                                                      ///< UI check-in with TD
     MSG_ID_TD_BLOOD_PUMP_DATA = 0x11,                                               ///< TD broadcast blood pump data
     MSG_ID_TD_OP_MODE_DATA = 0x12,                                                  ///< TD broadcast current operating mode
@@ -102,11 +102,14 @@
     MSG_ID_TD_RESP_INITIATE_TREATMENT_WORKFLOW = 0x46,                              ///< TD response to initiate/cancel treatment workflow request
     MSG_ID_UI_UF_PAUSE_RESUME_REQUEST = 0x47,                                       ///< UI ultrafiltration pause/resume request
     MSG_ID_TD_UF_PAUSE_RESUME_RESPONSE = 0x48,                                      ///< TD response to ultrafiltration pause/resume request
-    MSG_ID_RO_GEN_WATER_MODE_DATA = 0x49,                                        ///< RO Gen Permeate data broadcast
+    MSG_ID_RO_GEN_WATER_MODE_DATA = 0x49,                                           ///< RO Gen Permeate data broadcast
     MSG_ID_DD_PRE_GEN_DIALYSATE_STATE_DATA = 0x4A,                                  ///< DD Pre-gen dialysate mode data
     MSG_ID_DD_POST_GEN_DIALYSATE_STATE_DATA = 0x4B,                                 ///< DD Post-gen dialysate mode data
     MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA = 0x4C,                                ///< DD Pre Generate dialysate request data coming from TD.
     MSG_ID_RO_PRE_GEN_WATER_MODE_DATA = 0x4D,                                       ///< RO Pre Generate water mode data.
+    MSG_ID_TD_EJECTOR_DATA = 0x4E,                                                  ///< TD ejector data broadcast
+    MSG_ID_TD_TREATMENT_SET_POINTS = 0x4F,                                          ///< TD treatment user set points.
+
 #ifdef __PUMPTEST__
     MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0,                                      ///< DD piston pump data
 #endif
@@ -159,8 +162,11 @@
     MSG_ID_TD_TMP_PRESSURE_OVERRIDE_REQUEST = 0x802C,                               ///< TD override request for TMP pressure
     MSG_ID_TD_REQ_CURRENT_TREATMENT_PARAMETERS = 0x802D,                            ///< TD request for current treatment parameters
     MSG_ID_TD_RSP_CURRENT_TREATMENT_PARAMETERS = 0x802E,                            ///< TD response to request for current treatment parameters
-    MSG_ID_TD_OP_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x802F,                   ///< TD override request for operation mode data publish interval
-    MSG_ID_TD_OP_MODE_OVERRIDE_REQUEST = 0x8030,                                    ///< TD set operation mode request
+    MSG_ID_TD_SET_TREATMENT_PARAMETER = 0x802F,                                     ///< TD set a specific treatment parameter
+    MSG_ID_TD_OP_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8030,                   ///< TD override request for operation mode data publish interval
+    MSG_ID_TD_OP_MODE_OVERRIDE_REQUEST = 0x8031,                                    ///< TD set operation mode request
+    MSG_ID_TD_EJECTOR_MOTOR_SET_SPEED_REQUEST = 0x8032,                             ///< TD set ejector motor speed request
+    MSG_ID_TD_EJECTOR_COMMAND = 0x8033,                                             ///< TD ejector command
 
     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
@@ -327,6 +333,11 @@
     REQUEST_REJECT_REASON_RO_ONLY_MODE_INVALID_PARAMETER = 45,                      ///< RO only mode invalid parameter
     REQUEST_REJECT_REASON_RO_ONLY_MODE_INVALID_PAYLOAD_LENGTH = 46,                 ///< RO only mode invalid payload length
     REQUEST_REJECT_REASON_TREATMENT_CANNOT_BE_RESUMED = 47,                         ///< Cannot resume treatment per alarm
+    REQUEST_REJECT_REASON_HEPARIN_STOP_TIME_EXCEEDS_DURATION = 48,                  ///< The Heparin stop time setting is greater than the treatment duration
+    REQUEST_REJECT_REASON_HEPARIN_STOP_TIME_WITH_NO_DISPENSE = 49,                  ///< Heparin settings are zero but stop time setting is non-zero
+    REQUEST_REJECT_REASON_HEPARIN_PAUSE_INVALID_IN_THIS_STATE = 50,                 ///< Heparin cannot be paused if not currently deliverying Heparin
+    REQUEST_REJECT_REASON_HEPARIN_NOT_PAUSED = 51,                                  ///< Heparin cannot be resumed if not paused
+    REQUEST_REJECT_REASON_HEPARIN_VOLUME_EXCEEDS_10_ML = 52,                        ///< Heparin volume needed for treatment exceeds 10 mL maximum.
     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