Index: MsgDefs.h =================================================================== diff -u -r79282b9e48ca094e682e4185569ecc075dcd3f40 -rb1f2b311d88eade9e516e595e381da9bc11f9ba6 --- MsgDefs.h (.../MsgDefs.h) (revision 79282b9e48ca094e682e4185569ecc075dcd3f40) +++ MsgDefs.h (.../MsgDefs.h) (revision b1f2b311d88eade9e516e595e381da9bc11f9ba6) @@ -8,8 +8,8 @@ * * @file MsgDefs.h * -* @author (last) Sean Nash -* @date (last) 26-Sep-2022 +* @author (last) Dara Navaei +* @date (last) 19-Oct-2022 * * @author (original) Sean * @date (original) 27-Feb-2020 @@ -72,7 +72,7 @@ MSG_ID_DG_RESERVOIRS_DATA = 0x28, ///< DG broadcast reservoirs data MSG_ID_DG_SAMPLE_WATER_CMD = 0x29, ///< HD request to DG to allow user to get a water sample MSG_ID_DG_VALVES_STATES = 0x2A, ///< DG broadcast valve states - MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD = 0x2B, ///< HD request to DG to start/stop trimmer heater + MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD = 0x2B, ///< HD request to DG to start/stop trimmer heater MSG_ID_DG_HEATERS_DATA = 0x2C, ///< DG broadcast of the heaters data MSG_ID_DG_TEMPERATURE_DATA = 0x2D, ///< DG broadcast of the temperature sensors data MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE = 0x2E, ///< HD response to user selection of ultrafiltration settings change option selection @@ -204,7 +204,7 @@ MSG_ID____AVAILABLE_10 = 0xAC, ///< This message is available for use MSG_ID_UI_INSTALLATION_CONFIRM_RESPONSE = 0xAD, ///< HD Confirm installation response MSG_ID_DG_FILL_MODE_DATA = 0xAE, ///< DG broadcast of fill mode data such as used acid & bicarb volume - MSG_ID_DG_BAD_FILL_SUB_STATE = 0xAF, ///< DG broadcast of idle mode bad fill sub-state + MSG_ID_DG_GEN_IDLE_DATA = 0xAF, ///< DG broadcast of Gen idle mode sub-state MSG_ID_UI_REQUEST_SERVICE_MODE = 0xB0, ///< UI request to HD to go to service mode MSG_ID_HD_RESPONSE_SERVICE_MODE_REQUEST = 0xB1, ///< HD response to UI request to go to service mode MSG_ID_HD_REQUEST_UI_FINAL_POST_RESULT = 0xB2, ///< HD request to UI for final POST result @@ -255,7 +255,7 @@ MSG_ID_PRESSURE_VENOUS_OVERRIDE = 0x8018, ///< Venous pressure measured override request MSG_ID_OCCLUSION_BLOOD_PUMP_OVERRIDE = 0x8019, ///< Blood pump occlusion pressure measured override request MSG_ID_BLOOD_ROTOR_COUNT_OVERRIDE = 0x801A, ///< Blood pump rotor count override request - MSG_ID____AVAILABLE_1 = 0x801B, ///< Unused - this message ID is available for use + MSG_ID____AVAILABLE_11 = 0x801B, ///< Message ID available MSG_ID_PRES_OCCL_SEND_INTERVAL_OVERRIDE = 0x801C, ///< Pressure and occlusion broadcast interval override request MSG_ID_SET_RTC_DATE_TIME = 0x801D, ///< RTC set date/time request MSG_ID_DIAL_OUT_FLOW_SEND_INTERVAL_OVERRIDE = 0x801E, ///< Dialysate outlet flow broadcast interval override request @@ -363,6 +363,7 @@ MSG_ID_HD_BLOOD_PUMP_SET_PWM = 0x8085, ///< HD set blood pump to specific PWM duty cycle request MSG_ID_HD_DIAL_IN_SET_PWM = 0x8086, ///< HD set dialysate inlet pump to specific PWM duty cycle request MSG_ID_HD_DIAL_OUT_SET_PWM = 0x8087, ///< HD set dialysate outlet pump to specific PWM duty cycle request + MSG_ID_DIALYSATE_INLET_PUMP_ROTOR_COUNT_OVERRIDE = 0x8088, ///< HD dialysate inlet pump rotor count override request 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 @@ -411,7 +412,7 @@ MSG_ID_DG_THERMISTORS_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA02D, ///< DG thermistors data publish interval override MSG_ID_DG_THERMISTORS_VALUE_OVERRIDE = 0xA02E, ///< DG thermistors value override MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE = 0xA02F, ///< DG RO pump duty cycle override - MSG_ID____AVAILABLE_5 = 0xA030, ///< Message available for use + MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE = 0xA030, ///< DG Drain pump measured current override MSG_ID_DG_SET_RO_PUMP_TARGET_FLOW = 0xA031, ///< DG set RO pump target flow rate MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE = 0xA032, ///< DG RO pump target pressure override MSG_ID_DG_SET_CALIBRATION_RECORD = 0xA033, ///< DG set calibration record that is received from Dialin @@ -436,7 +437,7 @@ MSG_ID_DG_DRAIN_PUMP_MEASURED_RPM_OVERRIDE = 0xA046, ///< DG drain pump measured RPM override MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD = 0xA047, ///< Clears all DG alarms (even if non-recoverable or fault) MSG_ID_DG_ALARM_INFO_SEND_INTERVAL_OVERRIDE = 0xA048, ///< DG alarm information broadcast interval override request - MSG_ID____AVAILABLE_3 = 0xA049, ///< Unused - this message ID is available for use + MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD = 0xA049, ///< DG start/stop trimmer heater command MSG_ID_DG_GET_SW_CONFIG_RECORD = 0xA04A, ///< DG get software configuration record request MSG_ID_DG_SET_SW_CONFIG_RECORD = 0xA04B, ///< DG set software configuration record MSG_ID_DG_SEND_SW_CONFIG_RECORD = 0xA04C, ///< DG send software configuration record @@ -445,7 +446,7 @@ MSG_ID_DG_SET_FANS_RPM_ALARM_START_TIME_OFFSET = 0xA04F, ///< DG set fans RPM alarm start time offset MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE = 0xA050, ///< DG used bicarb volume override in mL MSG_ID_FILL_MODE_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA051, ///< DG used concentrate publish interval override request - MSG_ID_BAD_FILL_STATES_PUBLISH_INTERVAL_OVERRIDE = 0xA052, ///< DG bad fill sub-states publish interval override request + MSG_ID_DG_GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE = 0xA052, ///< DG gen idle sub-states publish interval override request MSG_ID_DG_GET_USAGE_INFO_RECORD = 0xA053, ///< DG get usage information record MSG_ID_DG_SET_USAGE_INFO_RECORD = 0xA054, ///< DG set usage information record MSG_ID_DG_SEND_USAGE_INFO_RECORD = 0xA055, ///< DG send usage information record