Index: MsgDefs.h =================================================================== diff -u -r789dc146333360f6882276dc702c326fd68db12c -r4a54c70f6bb275a32a43c483f52222583c73f7a1 --- MsgDefs.h (.../MsgDefs.h) (revision 789dc146333360f6882276dc702c326fd68db12c) +++ MsgDefs.h (.../MsgDefs.h) (revision 4a54c70f6bb275a32a43c483f52222583c73f7a1) @@ -8,8 +8,8 @@ * * @file MsgDefs.h * -* @author (last) Sean Nash -* @date (last) 26-Sep-2022 +* @author (last) Dara Navaei +* @date (last) 09-Nov-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 @@ -168,9 +168,9 @@ MSG_ID_DG_SERIAL_NUMBER = 0x88, ///< DG serial number MSG_ID_UI_REQUEST_SERVICE_INFO = 0x89, ///< UI request for service schedule information MSG_ID_HD_SERVICE_SCHEDULE_DATA = 0x8A, ///< HD service schedule data - MSG_ID_HD_USAGE_DATA = 0x8B, ///< HD usage data TODO is this needed? + MSG_ID_HD_USAGE_DATA = 0x8B, ///< HD usage data MSG_ID_DG_SERVICE_SCHEDULE_DATA = 0x8C, ///< DG service schedule data - MSG_ID_DG_USAGE_DATA = 0x8D, ///< DG usage data TODO is this needed? + MSG_ID_DG_USAGE_DATA = 0x8D, ///< DG usage data MSG_ID_HD_POST_SINGLE_TEST_RESULT = 0x8E, ///< HD POST single test result MSG_ID_HD_POST_FINAL_TEST_RESULT = 0x8F, ///< HD POST final test result MSG_ID_DG_POST_SINGLE_TEST_RESULT = 0x90, ///< DG POST single test result @@ -195,13 +195,13 @@ MSG_ID_HD_FANS_DATA = 0xA3, ///< HD fans data publish MSG_ID_HD_EVENT = 0xA4, ///< HD general event MSG_ID_DG_EVENT = 0xA5, ///< DG general event - MSG_ID_DG_DIALYSATE_FLOW_METER_DATA = 0xA6, // TODO remove when DEN-13460 merged ///< DG dialysate flow meter data (liter/minute) + MSG_ID____AVAILABLE_4 = 0xA6, ///< This message is available for use MSG_ID_DG_ALARM_INFO = 0xA7, ///< DG alarm information data publish MSG_ID_HD_RESERVOIRS_DATA = 0xA8, ///< HD reservoirs data publish MSG_ID_HD_REQUEST_DG_CONCENTRATE_MIXING_RATIOS = 0xA9, ///< HD request DG concentrate ratios MSG_ID_DG_CONCENTRATE_MIXING_RATIOS_DATA = 0xAA, ///< DG concentrate mixing ratios data MSG_ID_DG_SCHEDULED_RUNS_DATA = 0xAB, ///< DG scheduled runs data - MSG_ID_DG_SCHEDULED_RUNS_INFO = 0xAC, ///< DG scheduled runs info to be sent to the UI and Dialin + 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 @@ -214,6 +214,13 @@ MSG_ID_HD_REQUEST_DG_SERVICE_MODE = 0xB6, ///< HD request for DG to to go to service mode MSG_ID_DG_RTC_EPOCH = 0xB7, ///< DG RTC epoch broadcast message MSG_ID_HD_REQUEST_DG_USAGE_INFO = 0xB8, ///< HD request DG usage info + MSG_ID_HD_REQUEST_DG_SERVICE_RECORD = 0xB9, ///< HD request DG service record + MSG_ID_HD_REQUEST_UI_CONFIRMATION = 0xBA, ///< HD request UI confirmation + MSG_ID_UI_CONFIRMATION_RESULT = 0xBB, ///< UI confirmation result response + MSG_ID_REQUEST_CPLD_STATUS = 0xBC, ///< Dialin request for CPLD Status + MSG_ID_DG_CPLD_STATUS = 0xBD, ///< DG CPLD Status + MSG_ID_HD_BATTERY_MANAGEMENT_DATA = 0xBE, ///< HD battery management logging data + MSG_ID_HD_BATTERY_STATUS_DATA = 0xBF, ///< HD battery status logging data #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing @@ -248,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 @@ -320,7 +327,7 @@ MSG_ID____AVAILABLE_2 = 0x8061, ///< Unused - this message ID is available for use MSG_ID_HD_SWITCHES_STATUS_OVERRIDE = 0x8062, ///< HD switches status override request MSG_ID_HD_SWITCHES_PUBLISH_INTERVAL_OVERRIDE = 0x8063, ///< HD switches data publish override request - MSG_ID_HD_BATTERY_REMAINING_PERCENT_OVERRIDE = 0x8064, ///< HD battery remaining percent override request + MSG_ID_HD_BATTERY_REMAINING_CAP_MWH_OVERRIDE = 0x8064, ///< HD battery remaining capacity (in mWh) override request MSG_ID_HD_TEMPERATURES_VALUE_OVERRIDE = 0x8065, ///< HD temperatures value override request MSG_ID_HD_TEMPERATURES_PUBLISH_INTERVAL_OVERRIDE = 0x8066, ///< HD temperatures data publish override request MSG_ID_HD_FANS_PUBLISH_INTERVAL_OVERRIDE = 0x8067, ///< HD fans data publish override request @@ -367,7 +374,7 @@ MSG_ID_PRESSURE_OVERRIDE = 0xA006, ///< Pressure sensor override request MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE = 0xA007, ///< Pressure data broadcast interval override request MSG_ID_DG_HD_COMMUNICATION_STATUS_OVERRIDE = 0xA008, ///< DG HD Communication Status override - MSG_ID_RO_MEASURED_FLOW_OVERRIDE = 0xA009, ///< RO measured flow rate override request + MSG_ID_DG_SET_PRIMARY_AND_TRIMMER_HEATERS_TARGET_TEMP = 0xA009, ///< DG set primary and trimmer heater target temperature MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE = 0xA00A, ///< RO pump data broadcast interval override request MSG_ID_DRAIN_PUMP_SET_RPM = 0xA00B, ///< Drain pump set RPM override request MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE = 0xA00C, ///< Drain pump data broadcast interval override request @@ -391,7 +398,7 @@ MSG_ID_DG_SWITCHES_PUBLISH_INTERVAL_OVERRIDE = 0xA01E, ///< DG switches data publish interval override MSG_ID_DG_OP_MODE_PUBLISH_INTERVAL_OVERRIDE = 0xA01F, ///< DG operation mode publish interval override MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION = 0xA020, ///< HD prevent transmission of given message(s) - MSG_ID_DIALYSATE_MEASURED_FLOW_OVERRIDE = 0xA021, ///< DG dialysate measured flow rate override request + MSG_ID_MEASURED_FLOW_SENSORS_OVERRIDE = 0xA021, ///< DG measured flow rate override request MSG_ID_DG_SOFTWARE_RESET_REQUEST = 0xA022, ///< DG reset request MSG_ID_DG_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE = 0xA023, ///< DG concentrate pump measured speed override request MSG_ID_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE = 0xA024, ///< Concentrate pumps' target speed override request @@ -405,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_DG_RO_FLOW_RATE_OVERRIDE = 0xA030, ///< DG RO flow rate override + MSG_ID_DG_VALVES_SENSED_STATE_OVERRIDE = 0xA030, ///< DG valves sensed state 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 @@ -425,12 +432,12 @@ MSG_ID_DG_FLUSH_PUBLISH_INTERVAL_OVERRIDE = 0xA041, ///< DG flush mode data publish interval override MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE = 0xA042, ///< DG filter flush time period override MSG_ID_DG_FANS_RPM_OVERRIDE = 0xA043, ///< DG fans RPM override - MSG_ID_DIALYSATE_FLOW_SEND_INTERVAL_OVERRIDE = 0xA044, ///< Dialysate flow data broadcast interval override request + MSG_ID_FLOW_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA044, ///< Flow data broadcast interval override request MSG_ID_DG_STOP_RTC_CLOCK = 0xA045, ///< DG stop RTC clock 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,6 +452,9 @@ MSG_ID_DG_SEND_USAGE_INFO_RECORD = 0xA055, ///< DG send usage information record MSG_ID_DG_SET_OP_MODE_REQUEST = 0xA056, ///< DG set operation mode request MSG_ID_DG_RESERVOIR_TARE_REQUEST = 0xA057, ///< DG reservoir tare request + MSG_ID_DG_CPLD_PUBLISH_INTERVAL_OVERRIDE = 0xA058, ///< DG CPLD publish interval override + MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE = 0xA059, ///< DG drain pump current override request + MSG_ID_DG_DRAIN_PUMP_DIRECTION_OVERRIDE = 0xA05A, ///< DG drain pump direction override request 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 @@ -504,6 +514,9 @@ REQUEST_REJECT_REASON_SYRINGE_NOT_PRESENT = 43, ///< Syringe is not present REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN = 44, ///< Dialysate cap open REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN = 45, ///< Concentrate cap open + REQUEST_REJECT_REASON_DG_DISINFECT_HAS_BEEN_EXPIRED = 46, ///< DG disinfect has been expired + REQUEST_REJECT_REASON_DG_SERVICE_IS_DUE = 47, ///< DG service is due + REQUEST_REJECT_REASON_HD_SERVICE_IS_DUE = 48, ///< HD service is due 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