Index: dialin/common/alarm_defs.py =================================================================== diff -u -r4a0c6600b52ec965a6625a428de986e7040ae2c9 -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/common/alarm_defs.py (.../alarm_defs.py) (revision 4a0c6600b52ec965a6625a428de986e7040ae2c9) +++ dialin/common/alarm_defs.py (.../alarm_defs.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -1,16 +1,16 @@ ########################################################################### # -# Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved. +# Copyright (c) 2019-2023 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. # -# @file alarm_defs.py +# @file alarm_defs.py # -# @author (last) Dara Navaei -# @date (last) 26-Apr-2023 -# @author (original) Peter Lucia -# @date (original) 07-Aug-2020 +# @author (last) Peter Lucia +# @date (last) 21-Jul-2023 +# @author (original) Peter Lucia +# @date (original) 21-Jul-2023 # ############################################################################ from enum import unique @@ -120,7 +120,7 @@ ALARM_ID_DG_FILL_CONDUCTIVITY_OUT_OF_RANGE = 97 ALARM_ID_HD_BATTERY_COMM_FAULT = 98 ALARM_ID_HD_SYRINGE_PUMP_STALL = 99 - ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT = 100 + ALARM_ID_AVAILABLE_12 = 100 ALARM_ID_UI_POST_HD_COMM = 101 ALARM_ID_DG_HEAT_DISINFECT_TEMP_GRAD_OUT_OF_RANGE = 102 ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID = 103 @@ -149,7 +149,7 @@ ALARM_ID_HD_BLOOD_LEAK_DETECTED = 126 ALARM_ID_HD_VENOUS_PRESSURE_LOW = 127 ALARM_ID_HD_VENOUS_BUBBLE_DETECTED = 128 - ALARM_ID_HD_VENOUS_BUBBLE_DETECTED_RINSEBACK = 129 + ALARM_ID_AVAILABLE_17 = 129 ALARM_ID_HD_VENOUS_PRESSURE_HIGH = 130 ALARM_ID_HD_ARTERIAL_PRESSURE_LOW = 131 ALARM_ID_HD_ARTERIAL_PRESSURE_HIGH = 132 @@ -186,17 +186,17 @@ ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_1_ALARM = 163 ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_2_ALARM = 164 ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_ALARM = 165 - ALARM_ID_AVAILABLE_3 = 166 + ALARM_ID_TEST_ALARM_NO_BLOOD_RECIRC_CLR_TOP_ONLY = 166 ALARM_ID_HD_CARTRIDGE_DOOR_OPENED = 167 - ALARM_ID__AVAILABLE_70 = 168 + ALARM_ID_TEST_ALARM_NO_DIAL_RECIRC_CLR_TOP_ONLY = 168 ALARM_ID_DG_DIALYSATE_FLOW_RATE_OUT_OF_MAX_RANGE = 169 ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY = 170 ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION = 171 ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM = 172 ALARM_ID_HD_RTC_CONFIG_ERROR = 173 ALARM_ID_HD_RTC_OR_TIMER_ACCURACY_FAILURE = 174 ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR = 175 - ALARM_ID_AVAILABLE_4 = 176 + ALARM_ID_TEST_ALARM_NO_RECIRC_CLR_TOP_ONLY = 176 ALARM_ID_DG_SOFTWARE_FAULT = 177 ALARM_ID_HD_COMM_TIMEOUT = 178 ALARM_ID_DG_FPGA_COMM_TIMEOUT = 179 @@ -257,7 +257,7 @@ ALARM_ID_DG_INLET_WATER_PRESSURE_IN_HIGH_RANGE = 234 ALARM_ID_HD_TREATMENT_STOPPED_AFTER_RINSEBACK = 235 ALARM_ID_HD_INSTALL_NEW_CARTRIDGE = 236 - ALARM_ID_HD_PRIME_SALINE_DIALYZER_TIME_OUT = 237 + ALARM_ID_AVAILABLE_13 = 237 ALARM_ID_HD_NO_CARTRIDGE_LOADED = 238 ALARM_ID_HD_CARTRIDGE_REMOVAL_FAILURE = 239 ALARM_ID_DG_BICARB_CONDUCTIVITY_OUT_OF_RANGE = 240 @@ -305,7 +305,7 @@ ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME = 282 ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE = 283 ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE = 284 - ALARM_ID_AVAILABLE_12 = 285 + ALARM_ID_HD_RO_PERMEATE_SAMPLE = 285 ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION = 286 ALARM_ID_HD_FPGA_CLOCK_SPEED_CHECK_FAILURE = 287 ALARM_ID_HD_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE = 288 @@ -314,14 +314,14 @@ ALARM_ID_HD_DISINFECT_FLUSH = 291 ALARM_ID_HD_DISINFECT_HEAT = 292 ALARM_ID_HD_DISINFECT_CHEM = 293 - ALARM_ID_AVAILABLE_13 = 294 + ALARM_ID_HD_DISINFECT_HEAT_COOL = 294 ALARM_ID_HD_UI_POST_FAILURE_CLOUDSYNC = 295 ALARM_ID_DG_TDI_SENSORS_FPGA_FAULT = 296 ALARM_ID_DG_TRO_SENSORS_FPGA_FAULT = 297 ALARM_ID_DG_BARO_SENSOR_FPGA_FAULT = 298 ALARM_ID_DG_INVALID_SERIAL_NUMBER = 299 ALARM_ID_HD_INVALID_SERIAL_NUMBER = 300 - ALARM_ID_AVAILABLE_14 = 301 + ALARM_ID_DG_RO_PERMEATE_SAMPLE_REMOVE_DIA_CAP = 301 ALARM_ID_DG_CPU_RAM_ERROR = 302 ALARM_ID_DG_DRAIN_PUMP_DIRECTION_FPGA_FAULT = 303 ALARM_ID_HD_INVALID_USAGE_RECORD_CRC = 304 @@ -342,3 +342,4 @@ ALARM_ID_DG_CHEM_DISINFECT_FLUSH_FLUSH_SAMPLE = 319 ALARM_ID_DG_CHEM_DISINFECT_FLUSH_SAMPLE_TIMEOUT = 320 ALARM_ID_DG_OUTLET_UV_REACTOR_NOT_HEALTHY = 321 + ALARM_ID_HD_UI_POST_FAILURE_INVALID_YEAR = 322 Index: dialin/common/msg_defs.py =================================================================== diff -u -rf931595765812123b9caea8803381d213a70e54d -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/common/msg_defs.py (.../msg_defs.py) (revision f931595765812123b9caea8803381d213a70e54d) +++ dialin/common/msg_defs.py (.../msg_defs.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -36,25 +36,25 @@ ACK_NOT_REQUIRED = [ - MsgIds.MSG_ID_ALARM_STATUS.value, + MsgIds.MSG_ID_ALARM_STATUS_DATA.value, MsgIds.MSG_ID_ALARM_TRIGGERED.value, MsgIds.MSG_ID_ALARM_CLEARED.value, MsgIds.MSG_ID_BLOOD_FLOW_DATA.value, MsgIds.MSG_ID_DIALYSATE_FLOW_DATA.value, MsgIds.MSG_ID_PRESSURE_OCCLUSION_DATA.value, - MsgIds.MSG_ID_RTC_EPOCH.value, + MsgIds.MSG_ID_RTC_EPOCH_DATA.value, MsgIds.MSG_ID_DIALYSATE_OUT_FLOW_DATA.value, - MsgIds.MSG_ID_LOAD_CELL_READINGS.value, - MsgIds.MSG_ID_TREATMENT_TIME.value, - MsgIds.MSG_ID_POWER_OFF_IMMINENT.value, - MsgIds.MSG_ID_TREATMENT_STATE.value, + MsgIds.MSG_ID_LOAD_CELL_READINGS_DATA.value, + MsgIds.MSG_ID_TREATMENT_TIME_DATA.value, + MsgIds.MSG_ID_POWER_OFF_WARNING.value, + MsgIds.MSG_ID_TREATMENT_STATE_DATA.value, MsgIds.MSG_ID_RO_PUMP_DATA.value, MsgIds.MSG_ID_DG_PRESSURES_DATA.value, MsgIds.MSG_ID_DRAIN_PUMP_DATA.value, - MsgIds.MSG_ID_HD_OP_MODE.value, - MsgIds.MSG_ID_DG_OP_MODE.value, + MsgIds.MSG_ID_HD_OP_MODE_DATA.value, + MsgIds.MSG_ID_DG_OP_MODE_DATA.value, MsgIds.MSG_ID_DG_RESERVOIRS_DATA.value, - MsgIds.MSG_ID_DG_VALVES_STATES.value, + MsgIds.MSG_ID_DG_VALVES_STATES_DATA.value, MsgIds.MSG_ID_DG_HEATERS_DATA.value, MsgIds.MSG_ID_DG_TEMPERATURE_DATA.value, MsgIds.MSG_ID_SALINE_BOLUS_DATA.value, @@ -71,22 +71,22 @@ MsgIds.MSG_ID_DG_THERMISTORS_DATA.value, MsgIds.MSG_ID_DG_FANS_DATA.value, MsgIds.MSG_ID_HD_TREATMENT_STOP_TIMER_DATA.value, - MsgIds.MSG_ID_HD_HEPARIN_DATA_BROADCAST.value, + MsgIds.MSG_ID_HD_HEPARIN_DATA.value, MsgIds.MSG_ID_HD_RINSEBACK_PROGRESS.value, - MsgIds.MSG_ID_HD_BLOOD_PRIME_PROGRESS.value, - MsgIds.MSG_ID_HD_RECIRC_PROGRESS.value, - MsgIds.MSG_ID_PRE_TREATMENT_STATE.value, - MsgIds.MSG_ID_DG_FILTER_FLUSH_PROGRESS.value, - MsgIds.MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS.value, - MsgIds.MSG_ID_HD_DRY_SELF_TEST_PROGRESS.value, + MsgIds.MSG_ID_HD_BLOOD_PRIME_PROGRESS_DATA.value, + MsgIds.MSG_ID_HD_RECIRC_PROGRESS_DATA.value, + MsgIds.MSG_ID_PRE_TREATMENT_STATE_DATA.value, + MsgIds.MSG_ID_DG_FILTER_FLUSH_PROGRESS_DATA.value, + MsgIds.MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS_DATA.value, + MsgIds.MSG_ID_HD_DRY_SELF_TEST_PROGRESS_DATA.value, MsgIds.MSG_ID_HD_SYRINGE_PUMP_DATA.value, - MsgIds.MSG_ID_HD_FLUID_LEAK_STATE.value, - MsgIds.MSG_ID_DG_FLUID_LEAK_STATE.value, + MsgIds.MSG_ID_HD_FLUID_LEAK_STATE_DATA.value, + MsgIds.MSG_ID_DG_FLUID_LEAK_STATE_DATA.value, MsgIds.MSG_ID_HD_BLOOD_LEAK_DATA.value, - MsgIds.MSG_ID_HD_POST_TREATMENT_STATE.value, + MsgIds.MSG_ID_HD_POST_TREATMENT_STATE_DATA.value, MsgIds.MSG_ID_DG_FLUSH_DATA.value, MsgIds.MSG_ID_HD_VOLTAGES_DATA.value, - MsgIds.MSG_ID_HD_ALARM_INFORMATION.value, + MsgIds.MSG_ID_HD_ALARM_INFORMATION_DATA.value, MsgIds.MSG_ID_DG_HEAT_DISINFECT_TIME_DATA.value, MsgIds.MSG_ID_DG_CHEM_DISINFECT_TIME_DATA.value, MsgIds.MSG_ID_DG_VOLTAGES_DATA.value, @@ -96,7 +96,7 @@ MsgIds.MSG_ID_DG_SWITCHES_DATA.value, MsgIds.MSG_ID_HD_SWITCHES_DATA.value, MsgIds.MSG_ID_HD_FANS_DATA.value, - MsgIds.MSG_ID_DG_ALARM_INFO.value, + MsgIds.MSG_ID_DG_ALARM_INFO_DATA.value, MsgIds.MSG_ID_HD_RESERVOIRS_DATA.value, MsgIds.MSG_ID_DG_CPLD_STATUS.value, MsgIds.MSG_ID_DG_DIALIN_CHECK_IN.value, Index: dialin/common/msg_ids.py =================================================================== diff -u -r84f019168b0942c94d95a4028d2d252dfc48a0df -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/common/msg_ids.py (.../msg_ids.py) (revision 84f019168b0942c94d95a4028d2d252dfc48a0df) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -1,11 +1,11 @@ ########################################################################### # -# Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved. +# Copyright (c) 2019-2023 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. +# WHOLE, WITHOUT THE ExPLICIT PERMISSION OF THE COPYRIGHT OWNER. # -# @file msg_ids.py +# @file msg_ids.py # # @author (last) Micahel Garthwaite # @date (last) 16-Aug-2023 @@ -22,69 +22,69 @@ class MsgIds(DialinEnum): MSG_ID_UNUSED = 0x0 MSG_ID_OFF_BUTTON_PRESS_REQUEST = 0x1 - MSG_ID_ALARM_STATUS = 0x2 + MSG_ID_ALARM_STATUS_DATA = 0x2 MSG_ID_ALARM_TRIGGERED = 0x3 MSG_ID_ALARM_CLEARED = 0x4 MSG_ID_BLOOD_FLOW_DATA = 0x5 MSG_ID_UI_POST_TX_NEXT_REQUEST = 0x6 MSG_ID_UI_CHECK_IN = 0x7 MSG_ID_DIALYSATE_FLOW_DATA = 0x8 MSG_ID_PRESSURE_OCCLUSION_DATA = 0x9 - MSG_ID_RTC_EPOCH = 0xA + MSG_ID_RTC_EPOCH_DATA = 0xA MSG_ID_DIALYSATE_OUT_FLOW_DATA = 0xB - MSG_ID_LOAD_CELL_READINGS = 0xC - MSG_ID_TREATMENT_TIME = 0xD - MSG_ID_POWER_OFF_IMMINENT = 0xE - MSG_ID_TREATMENT_STATE = 0xF + MSG_ID_LOAD_CELL_READINGS_DATA = 0xC + MSG_ID_TREATMENT_TIME_DATA = 0xD + MSG_ID_POWER_OFF_WARNING = 0xE + MSG_ID_TREATMENT_STATE_DATA = 0xF MSG_ID_USER_UF_PAUSE_RESUME_REQUEST = 0x10 MSG_ID_USER_UF_SETTINGS_CHANGE_REQUEST = 0x11 MSG_ID_USER_SALINE_BOLUS_REQUEST = 0x12 MSG_ID_USER_UF_SETTINGS_CHANGE_RESPONSE = 0x13 MSG_ID_USER_SALINE_BOLUS_RESPONSE = 0x14 - MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE = 0x15 + MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE_REQUEST = 0x15 MSG_ID_USER_TREATMENT_TIME_CHANGE_REQUEST = 0x16 MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_REQUEST = 0x17 MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_RESPONSE = 0x18 MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS = 0x19 - MSG_ID_TREATMENT_PARAM_CHANGE_RANGES = 0x1A + MSG_ID_TREATMENT_PARAM_CHANGE_RANGES_DATA = 0x1A MSG_ID_USER_TREATMENT_TIME_CHANGE_RESPONSE = 0x1B - MSG_ID_REQUEST_FW_VERSIONS = 0x1C - MSG_ID_HD_VERSION = 0x1D - MSG_ID_DG_VERSION = 0x1E + MSG_ID_FW_VERSIONS_REQUEST = 0x1C + MSG_ID_HD_VERSION_REPONSE = 0x1D + MSG_ID_DG_VERSION_REPONSE = 0x1E MSG_ID_RO_PUMP_DATA = 0x1F MSG_ID_DG_PRESSURES_DATA = 0x20 - MSG_ID_DG_SWITCH_RESERVOIR_CMD = 0x21 - MSG_ID_DG_FILL_CMD = 0x22 - MSG_ID_DG_DRAIN_CMD = 0x23 + MSG_ID_DG_SWITCH_RESERVOIR_CMD_REQUEST = 0x21 + MSG_ID_DG_FILL_CMD_REQUEST = 0x22 + MSG_ID_DG_DRAIN_CMD_REQUEST = 0x23 MSG_ID_DRAIN_PUMP_DATA = 0x24 - MSG_ID_HD_OP_MODE = 0x25 - MSG_ID_STARTING_STOPPING_TREATMENT_CMD = 0x26 - MSG_ID_DG_OP_MODE = 0x27 + MSG_ID_HD_OP_MODE_DATA = 0x25 + MSG_ID_STARTING_STOPPING_TREATMENT_CMD_REQUEST = 0x26 + MSG_ID_DG_OP_MODE_DATA = 0x27 MSG_ID_DG_RESERVOIRS_DATA = 0x28 - MSG_ID_DG_SAMPLE_WATER_CMD = 0x29 - MSG_ID_DG_VALVES_STATES = 0x2A - MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD = 0x2B + MSG_ID_DG_SAMPLE_WATER_CMD_REQUEST = 0x29 + MSG_ID_DG_VALVES_STATES_DATA = 0x2A + MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD_REQUEST = 0x2B MSG_ID_DG_HEATERS_DATA = 0x2C MSG_ID_DG_TEMPERATURE_DATA = 0x2D MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE = 0x2E MSG_ID_SALINE_BOLUS_DATA = 0x2F - MSG_ID_DG_START_STOP_HEAT_DISINFECT = 0x30 + MSG_ID_DG_START_STOP_HEAT_DISINFECT_CMD_REQUEST = 0x30 MSG_ID_DG_CONDUCTIVITY_DATA = 0x31 - MSG_ID_USER_REQUEST_ALARM_SILENCE = 0x32 + MSG_ID_USER_ALARM_SILENCE_REQUEST = 0x32 MSG_ID_HD_ACCELEROMETER_DATA = 0x33 MSG_ID_DG_ACCELEROMETER_DATA = 0x34 - MSG_ID_UI_NEW_TREATMENT_PARAMS = 0x35 + MSG_ID_UI_NEW_TREATMENT_PARAMS_REQUEST = 0x35 MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE = 0x36 MSG_ID_DG_HEAT_DISINFECT_DATA = 0x37 MSG_ID_UI_INITIATE_TREATMENT_REQUEST = 0x38 MSG_ID_HD_INITIATE_TREATMENT_RESPONSE = 0x39 MSG_ID_HD_VALVES_DATA = 0x3A - MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS = 0x3B + MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS_REQUEST = 0x3B MSG_ID_UI_START_PRIME_REQUEST = 0x3C MSG_ID_HD_START_PRIME_RESPONSE = 0x3D MSG_ID_HD_AIR_TRAP_DATA = 0x3E MSG_ID_ALARM_CONDITION_CLEARED = 0x3F - MSG_ID_UI_ALARM_USER_ACTION = 0x40 + MSG_ID_UI_ALARM_USER_ACTION_REQUEST = 0x40 MSG_ID_USER_UF_PAUSE_RESUME_RESPONSE = 0x41 MSG_ID_DG_CONCENTRATE_PUMP_DATA = 0x42 MSG_ID_HD_PRIMING_STATUS_DATA = 0x43 @@ -94,73 +94,73 @@ MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE = 0x47 MSG_ID_DG_FANS_DATA = 0x48 MSG_ID_HD_TREATMENT_STOP_TIMER_DATA = 0x49 - MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM = 0x4A + MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM_REQUEST = 0x4A MSG_ID_UI_HEPARIN_PAUSE_RESUME_REQUEST = 0x4B MSG_ID_HD_HEPARIN_PAUSE_RESUME_RESPONSE = 0x4C - MSG_ID_HD_HEPARIN_DATA_BROADCAST = 0x4D - MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD = 0x4E - MSG_ID_UI_SET_UF_VOLUME_PARAMETER = 0x4F + MSG_ID_HD_HEPARIN_DATA = 0x4D + MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD_REQUEST = 0x4E + MSG_ID_UI_SET_UF_VOLUME_PARAMETER_REQUEST = 0x4F MSG_ID_HD_SET_UF_VOLUME_PARAMETER_RESPONSE = 0x50 MSG_ID_DG_COMMAND_RESPONSE = 0x51 - MSG_ID_UI_RINSEBACK_CMD = 0x52 + MSG_ID_UI_RINSEBACK_CMD_REQUEST = 0x52 MSG_ID_HD_RINSEBACK_CMD_RESPONSE = 0x53 - MSG_ID_UI_RECIRC_CMD = 0x54 + MSG_ID_UI_RECIRC_CMD_REQUEST = 0x54 MSG_ID_HD_RECIRC_CMD_RESPONSE = 0x55 MSG_ID_HD_RINSEBACK_PROGRESS = 0x56 - MSG_ID_UI_TX_END_CMD = 0x57 + MSG_ID_UI_TX_END_CMD_REQUEST = 0x57 MSG_ID_HD_TX_END_CMD_RESPONSE = 0x58 - MSG_ID_HD_BLOOD_PRIME_PROGRESS = 0x59 - MSG_ID_HD_RECIRC_PROGRESS = 0x5A - MSG_ID_DG_CHANGE_VALVE_SETTING_CMD = 0x5B - MSG_ID_PRE_TREATMENT_STATE = 0x5C - MSG_ID_UI_SAMPLE_WATER_CMD = 0x5D + MSG_ID_HD_BLOOD_PRIME_PROGRESS_DATA = 0x59 + MSG_ID_HD_RECIRC_PROGRESS_DATA = 0x5A + MSG_ID_DG_CHANGE_VALVE_SETTING_CMD_REQUEST = 0x5B + MSG_ID_PRE_TREATMENT_STATE_DATA = 0x5C + MSG_ID_UI_SAMPLE_WATER_CMD_REQUEST = 0x5D MSG_ID_HD_SAMPLE_WATER_CMD_RESPONSE = 0x5E MSG_ID_UI_SAMPLE_WATER_RESULT = 0x5F - MSG_ID_DG_FILTER_FLUSH_PROGRESS = 0x60 - MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS = 0x61 - MSG_ID_UI_INSTALLATION_CONFIRM = 0x62 - MSG_ID_HD_DRY_SELF_TEST_PROGRESS = 0x63 + MSG_ID_DG_FILTER_FLUSH_PROGRESS_DATA = 0x60 + MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS_DATA = 0x61 + MSG_ID_UI_INSTALLATION_CONFIRM_REQUEST = 0x62 + MSG_ID_HD_DRY_SELF_TEST_PROGRESS_DATA = 0x63 MSG_ID_UI_PATIENT_CONNECTION_BEGIN_REQUEST = 0x64 MSG_ID_HD_PATIENT_CONNECTION_BEGIN_RESPONSE = 0x65 - MSG_ID_UI_PATIENT_CONNECTION_CONFIRM = 0x66 + MSG_ID_UI_PATIENT_CONNECTION_CONFIRM_REQUEST = 0x66 MSG_ID_HD_PATIENT_CONNECTION_CONFIRM_RESPONSE = 0x67 - MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM = 0x68 + MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM_REQUEST = 0x68 MSG_ID_HD_SYRINGE_PUMP_DATA = 0x69 - MSG_ID_HD_FLUID_LEAK_STATE = 0x6A - MSG_ID_DG_FLUID_LEAK_STATE = 0x6B + MSG_ID_HD_FLUID_LEAK_STATE_DATA = 0x6A + MSG_ID_DG_FLUID_LEAK_STATE_DATA = 0x6B MSG_ID_HD_BLOOD_LEAK_DATA = 0x6C MSG_ID_UI_HD_SET_RTC_REQUEST = 0x6D MSG_ID_HD_UI_SET_RTC_RESPONSE = 0x6E MSG_ID_UI_DG_SET_RTC_REQUEST = 0x6F MSG_ID_DG_UI_SET_RTC_RESPONSE = 0x70 MSG_ID_UI_START_TREATMENT_REQUEST = 0x71 MSG_ID_HD_START_TREATMENT_RESPONSE = 0x72 - MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM = 0x73 + MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM_REQUEST = 0x73 MSG_ID_HD_DISPOSABLE_REMOVAL_CONFIRM_RESPONSE = 0x74 MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST = 0x75 MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE = 0x76 - MSG_ID_HD_POST_TREATMENT_STATE = 0x77 + MSG_ID_HD_POST_TREATMENT_STATE_DATA = 0x77 MSG_ID_DG_START_STOP_CHEM_DISINFECT = 0x78 - MSG_ID_DG_START_STOP_FLUSH = 0x79 + MSG_ID_DG_START_STOP_FLUSH_CMD_REQUEST = 0x79 MSG_ID_DG_FLUSH_DATA = 0x7A MSG_ID_HD_VOLTAGES_DATA = 0x7B MSG_ID_HD_ALARM_AUDIO_VOLUME_SET_RESPONSE = 0x7C MSG_ID_HD_ALARM_INFORMATION = 0x7D MSG_ID_HD_POST_TX_NEXT_CMD_RESPONSE = 0x7E MSG_ID_UI_DISINFECT_REQUEST = 0x7F MSG_ID_HD_DISINFECT_RESPONSE = 0x80 - MSG_ID_UI_CHEM_DISINFECT_CONFIRM = 0x81 - MSG_ID_HD_CHEM_DISINFECT_CONFIRM_RESPONSE = 0x82 - MSG_ID_DG_FLUSH_TIME_DATA = 0x83 + MSG_ID_DG_SEND_SERVICE_SCHEDULE_DATA_TO_HD = 0x81 + MSG_ID_HD_REQUEST_SERVICE_RECORD_FROM_HD = 0x82 + MSG_ID_MSG_AVAILABLE_4 = 0x83 MSG_ID_DG_HEAT_DISINFECT_TIME_DATA = 0x84 MSG_ID_DG_CHEM_DISINFECT_TIME_DATA = 0x85 MSG_ID_DG_VOLTAGES_DATA = 0x86 MSG_ID_DG_CHEM_DISINFECT_DATA = 0x87 - MSG_ID_DG_SERIAL_NUMBER = 0x88 - MSG_ID_UI_REQUEST_SERVICE_INFO = 0x89 + MSG_ID_DG_SERIAL_NUMBER_RESPONSE = 0x88 + MSG_ID_UI_SERVICE_INFO_REQUEST = 0x89 MSG_ID_HD_SERVICE_SCHEDULE_DATA = 0x8A MSG_ID_HD_USAGE_DATA = 0x8B - MSG_ID_DG_SERVICE_SCHEDULE_DATA = 0x8C + MSG_ID_DG_SERVICE_SCHEDULE_DATA_TO_UI = 0x8C MSG_ID_DG_USAGE_DATA = 0x8D MSG_ID_HD_POST_SINGLE_TEST_RESULT = 0x8E MSG_ID_HD_POST_FINAL_TEST_RESULT = 0x8F @@ -173,43 +173,43 @@ MSG_ID_HD_TREATMENT_LOG_EVENT = 0x96 MSG_ID_UI_ACTIVE_ALARMS_LIST_REQUEST = 0x97 MSG_ID_HD_ACTIVE_ALARMS_LIST_REQUEST_RESPONSE = 0x98 - MSG_ID_HD_SERIAL_NUMBER = 0x99 + MSG_ID_HD_SERIAL_NUMBER_RESPONSE = 0x99 MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_REQUEST = 0x9A MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_RESPONSE = 0x9B MSG_ID_HD_DG_POST_RESULT_REQUEST = 0x9C MSG_ID_HD_TEMPERATURES_DATA = 0x9D MSG_ID_HD_UI_VERSION_INFO_REQUEST = 0x9E - MSG_ID_HD_UI_VERSION_INFO_RESPONSE = 0x9F - MSG_ID_REQUEST_HD_USAGE_INFO = 0xA0 + MSG_ID_UI_VERSION_INFO_RESPONSE = 0x9F + MSG_ID_HD_USAGE_INFO_REQUEST = 0xA0 MSG_ID_DG_SWITCHES_DATA = 0xA1 MSG_ID_HD_SWITCHES_DATA = 0xA2 MSG_ID_HD_FANS_DATA = 0xA3 MSG_ID_HD_EVENT = 0xA4 MSG_ID_DG_EVENT = 0xA5 - MSG_ID_HD_SET_SERVICE_TIME = 0xA6 - MSG_ID_DG_ALARM_INFO = 0xA7 + MSG_ID_HD_SET_SERVICE_TIME_REQUEST = 0xA6 + MSG_ID_DG_ALARM_INFO_DATA = 0xA7 MSG_ID_HD_RESERVOIRS_DATA = 0xA8 - MSG_ID_HD_REQUEST_DG_CONCENTRATE_MIXING_RATIOS = 0xA9 + MSG_ID_HD_DG_CONCENTRATE_MIXING_RATIOS_REQUEST = 0xA9 MSG_ID_DG_CONCENTRATE_MIXING_RATIOS_DATA = 0xAA MSG_ID_DG_SCHEDULED_RUNS_DATA = 0xAB - MSG_ID_DG_SET_SERVICE_TIME = 0xAC + MSG_ID_DG_SET_SERVICE_TIME_REQUEST = 0xAC MSG_ID_UI_INSTALLATION_CONFIRM_RESPONSE = 0xAD MSG_ID_DG_FILL_MODE_DATA = 0xAE MSG_ID_DG_GEN_IDLE_DATA = 0xAF - MSG_ID_UI_REQUEST_SERVICE_MODE = 0xB0 + MSG_ID_UI_SERVICE_MODE_REQUEST = 0xB0 MSG_ID_HD_RESPONSE_SERVICE_MODE_REQUEST = 0xB1 MSG_ID_HD_REQUEST_UI_FINAL_POST_RESULT = 0xB2 MSG_ID_DG_FLOW_SENSORS_DATA = 0xB3 MSG_ID_DG_RESPONSE_SERVICE_MODE_REQUEST = 0xB4 - MSG_ID_HD_REQUEST_DG_ALARMS = 0xB5 - MSG_ID_HD_REQUEST_DG_SERVICE_MODE = 0xB6 - MSG_ID_DG_RTC_EPOCH = 0xB7 - MSG_ID_HD_REQUEST_DG_USAGE_INFO = 0xB8 - MSG_ID_HD_REQUEST_DG_SERVICE_RECORD = 0xB9 - MSG_ID_HD_REQUEST_UI_CONFIRMATION = 0xBA - MSG_ID_UI_CONFIRMATION_RESULT = 0xBB + MSG_ID_HD_DG_ALARMS_REQUEST = 0xB5 + MSG_ID_HD_DG_SERVICE_MODE_REQUEST = 0xB6 + MSG_ID_DG_RTC_EPOCH_DATA = 0xB7 + MSG_ID_HD_DG_USAGE_INFO_REQUEST = 0xB8 + MSG_ID_MSG_AVAILABLE_9 = 0xB9 + MSG_ID_HD_UI_CONFIRMATION_REQUEST = 0xBA + MSG_ID_UI_CONFIRMATION_RESULT_RESPONSE = 0xBB MSG_ID_UI_SET_DG_RO_MODE = 0xBC - MSG_ID_DG_CPLD_STATUS = 0xBD + MSG_ID_DG_CPLD_STATUS_DATA = 0xBD MSG_ID_HD_BATTERY_MANAGEMENT_DATA = 0xBE MSG_ID_HD_BATTERY_STATUS_DATA = 0xBF MSG_ID_DG_CHEM_DISINFECT_FLUSH_DATA = 0xC0 @@ -255,7 +255,7 @@ MSG_ID_PRESSURE_ARTERIAL_OVERRIDE = 0x8017 MSG_ID_PRESSURE_VENOUS_OVERRIDE = 0x8018 MSG_ID_OCCLUSION_BLOOD_PUMP_OVERRIDE = 0x8019 - MSG_ID_BLOOD_PUMP_ROTOR_COUNT_OVERRIDE = 0x801A + MSG_ID_BLOOD_ROTOR_COUNT_OVERRIDE = 0x801A MSG_ID_HD_AIR_PUMP_SET_STATE = 0x801B MSG_ID_PRES_OCCL_SEND_INTERVAL_OVERRIDE = 0x801C MSG_ID_SET_RTC_DATE_TIME = 0x801D @@ -350,7 +350,7 @@ MSG_ID_HD_SYRINGE_PUMP_FORCE_SENSOR_DAC_CALIBRATE = 0x8077 MSG_ID_HD_STOP_RTC_CLOCK = 0x8078 MSG_ID_HD_FANS_DUTY_CYCLE_OVERRIDE = 0x8079 - MSG_ID_HD_HEPRIN_BOLUS_TARGET_RATE_OVERRIDE = 0x807A + MSG_ID_HD_SYRINGE_PUMP_HEPARIN_BOLUS_TARGET_RATE_OVERRIDE = 0x807A MSG_ID_HD_REQ_CURRENT_TREATMENT_PARAMETERS = 0x807B MSG_ID_HD_RES_CURRENT_TREATMENT_PARAMETERS = 0x807C MSG_ID_HD_SET_FANS_RPM_ALARM_START_TIME_OFFSET = 0x807D @@ -364,10 +364,8 @@ MSG_ID_HD_BLOOD_PUMP_SET_PWM = 0x8085 MSG_ID_HD_DIAL_IN_SET_PWM = 0x8086 MSG_ID_HD_DIAL_OUT_SET_PWM = 0x8087 - MSG_ID_DIALYSATE_INLET_PUMP_ROTOR_COUNT_OVERRIDE = 0x8088 + MSG_ID_HD_DIALYSATE_INLET_PUMP_ROTOR_COUNT_OVERRIDE = 0x8088 MSG_ID_HD_NV_RECORD_CRC_OVERRIDE = 0x8089 - MSD_ID_HD_RTC_CTL_REG1_STATUS_OVERRIDE = 0x808A - MSD_ID_HD_RTC_CTL_REG3_STATUS_OVERRIDE = 0x808B MSG_ID_HD_BATTERY_STATUS_OVERRIDE = 0x808C MSG_ID_HD_BATTERY_CHARGER_STATUS_OVERRIDE = 0x808D MSG_ID_HD_BATTERY_COMM_STATUS_OVERRIDE = 0x808E @@ -447,7 +445,7 @@ MSG_ID_DG_SEND_SCHEDULED_RUNS_RECORD = 0xA03E MSG_ID_DG_FLUID_LEAK_SEND_INTERVAL_OVERRIDE = 0xA03F MSG_ID_DG_FLUID_LEAK_STATE_DETECTOR_OVERRIDE = 0xA040 - MSG_ID_DG_FLUSH_PUBLISH_INTERVAL_OVERRIDE = 0xA041 + MSG_ID_MSG_AVAILABLE_11 = 0xA041 MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE = 0xA042 MSG_ID_DG_FANS_RPM_OVERRIDE = 0xA043 MSG_ID_FLOW_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA044 @@ -470,7 +468,7 @@ MSG_ID_DG_SEND_USAGE_INFO_RECORD = 0xA055 MSG_ID_DG_SET_OP_MODE_REQUEST = 0xA056 MSG_ID_DG_RESERVOIR_TARE_REQUEST = 0xA057 - MSG_ID_DG_CPLD_PUBLISH_INTERVAL_OVERRIDE = 0xA058 + MSG_ID_MSG_AVAILABLE_10 = 0xA058 MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE = 0xA059 MSG_ID_DG_DRAIN_PUMP_DIRECTION_OVERRIDE = 0xA05A MSG_ID_DG_RO_FEEDBACK_VOLTAGE_OVERRIDE = 0xA05B @@ -480,8 +478,6 @@ MSG_ID_DG_CONC_PUMP_PARK_FAULT_STATUS_OVERRIDE = 0xA05F MSG_ID_DG_CONC_PUMP_PARK_COMMAND = 0xA060 MSG_ID_DG_HEATERS_DUTY_CYCLE_OVERRIDE = 0xA061 - MSD_ID_DG_RTC_CTL_REG1_STATUS_OVERRIDE = 0xA062 - MSD_ID_DG_RTC_CTL_REG3_STATUS_OVERRIDE = 0xA063 MSG_ID_DG_NELSON_DISINFECT_SUPPORT = 0xA064 MSG_ID_DG_SET_DIALYSATE_MIXING_RATIOS = 0xA065 MSG_ID_DG_SET_TEST_CONFIGURATION = 0xA066 @@ -491,7 +487,7 @@ MSG_ID_DG_DIALIN_CHECK_IN = 0xA06A MSG_ID_DG_GET_LOAD_CELLS_TARE_VALUES = 0xA06B MSG_ID_DG_SET_LOAD_CELLS_TARE_VALUES = 0xA06C - MSG_ID_DG_SEND_LOAD_CELLS_TARE_VALUES_TO_DIALIN = 0xA06D + MSG_ID_DG_SEND_LOAD_CELLS_TARE_VALUES = 0xA06D MSG_ID_DG_SET_COND_SENSOR_CAL_TABLE = 0xA06E MSG_ID_DG_SIGNAL_RECOVER_FROM_FAULT_MODE = 0xA06F MSG_ID_DG_DRAIN_MODE_BROADCAST_INTERVAL_OVERRIDE = 0xA070 Index: dialin/dg/alarms.py =================================================================== diff -u -rb2883ad890516361d0c22919811ff1d5752c0aaf -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/dg/alarms.py (.../alarms.py) (revision b2883ad890516361d0c22919811ff1d5752c0aaf) +++ dialin/dg/alarms.py (.../alarms.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -52,7 +52,7 @@ msg_id = MsgIds.MSG_ID_ALARM_CONDITION_CLEARED.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_alarm_condition_clear) - msg_id = MsgIds.MSG_ID_DG_ALARM_INFO.value + msg_id = MsgIds.MSG_ID_DG_ALARM_INFO_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_alarm_information_sync) self.dg_alarm_triggered_timestamp = 0.0 Index: dialin/dg/cpld.py =================================================================== diff -u -r9bc00e997e91dab8b404aa877b02ae3d4100d417 -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/dg/cpld.py (.../cpld.py) (revision 9bc00e997e91dab8b404aa877b02ae3d4100d417) +++ dialin/dg/cpld.py (.../cpld.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -47,7 +47,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DG_CPLD_STATUS.value + msg_id = MsgIds.MSG_ID_DG_CPLD_STATUS_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_cpld_sync) self.cpld_wdog = 0 Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -rd2b3fbb3d2f087b815a6a74f85098e0ae57e6b85 -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision d2b3fbb3d2f087b815a6a74f85098e0ae57e6b85) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -147,11 +147,11 @@ # register handler for HD operation mode broadcast messages if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DG_OP_MODE.value + msg_id = MsgIds.MSG_ID_DG_OP_MODE_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_dg_op_mode_sync) self.can_interface.register_receiving_publication_function(DenaliChannels.dg_sync_broadcast_ch_id, - MsgIds.MSG_ID_DG_VERSION.value, + MsgIds.MSG_ID_DG_VERSION_REPONSE.value, self._handler_dg_version) self.callback_id = self.can_interface.register_transmitting_interval_message(INTERVAL_10s, @@ -372,7 +372,7 @@ payload = major + minor + micro + build + compatibility message = DenaliMessage.build_message(channel_id=DenaliChannels.ui_sync_broadcast_ch_id, - message_id=MsgIds.MSG_ID_REQUEST_FW_VERSIONS.value, + message_id=MsgIds.MSG_ID_FW_VERSIONS_REQUEST.value, payload=payload) self.logger.debug("Sending Dialin request for version to DG") Index: dialin/dg/events.py =================================================================== diff -u -r3c3528758a6d272d91937dea245c72f9e5ad18b1 -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/dg/events.py (.../events.py) (revision 3c3528758a6d272d91937dea245c72f9e5ad18b1) +++ dialin/dg/events.py (.../events.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -47,7 +47,7 @@ self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_events_sync) channel_id = DenaliChannels.dg_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DG_OP_MODE.value + msg_id = MsgIds.MSG_ID_DG_OP_MODE_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_dg_op_mode_sync) Index: dialin/dg/fluid_leak.py =================================================================== diff -u -r9bc00e997e91dab8b404aa877b02ae3d4100d417 -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/dg/fluid_leak.py (.../fluid_leak.py) (revision 9bc00e997e91dab8b404aa877b02ae3d4100d417) +++ dialin/dg/fluid_leak.py (.../fluid_leak.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -47,7 +47,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DG_FLUID_LEAK_STATE.value + msg_id = MsgIds.MSG_ID_DG_FLUID_LEAK_STATE_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_fluid_leak_sync) Index: dialin/dg/hd_proxy.py =================================================================== diff -u -r92ba68da956156e22596a1dec25bebde27beb60a -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/dg/hd_proxy.py (.../hd_proxy.py) (revision 92ba68da956156e22596a1dec25bebde27beb60a) +++ dialin/dg/hd_proxy.py (.../hd_proxy.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -60,7 +60,7 @@ payload = res + dc message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_SWITCH_RESERVOIR_CMD.value, + message_id=MsgIds.MSG_ID_DG_SWITCH_RESERVOIR_CMD_REQUEST.value, payload=payload) self.logger.debug("switch reservoirs cmd sent to DG") @@ -92,7 +92,7 @@ payload = integer_to_bytearray(volume) + integer_to_bytearray(start) + float_to_bytearray(tgt_fill_flow_lpm) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_FILL_CMD.value, + message_id=MsgIds.MSG_ID_DG_FILL_CMD_REQUEST.value, payload=payload) self.logger.debug("fill cmd sent to DG") @@ -130,7 +130,7 @@ payload = vol + tare + rinse + st message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_DRAIN_CMD.value, + message_id=MsgIds.MSG_ID_DG_DRAIN_CMD_REQUEST.value, payload=payload) self.logger.debug("drain cmd sent to DG") @@ -171,7 +171,7 @@ payload = start + act + bct message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_STARTING_STOPPING_TREATMENT_CMD.value, + message_id=MsgIds.MSG_ID_STARTING_STOPPING_TREATMENT_CMD_REQUEST.value, payload=payload) self.logger.debug(cmd_str + "DG cmd sent to DG") @@ -243,7 +243,7 @@ """ payload = integer_to_bytearray(cmd) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_SAMPLE_WATER_CMD.value, + message_id=MsgIds.MSG_ID_DG_SAMPLE_WATER_CMD_REQUEST.value, payload=payload) self.logger.debug("Sending sample water command") self.can_interface.send(message, 0) @@ -264,7 +264,7 @@ cmd_str = "Stopping" payload = integer_to_bytearray(cmd) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_START_STOP_HEAT_DISINFECT.value, + message_id=MsgIds.MSG_ID_DG_START_STOP_HEAT_DISINFECT_CMD_REQUEST.value, payload=payload) self.logger.debug(cmd_str + " DG heat disinfect") @@ -326,7 +326,7 @@ cmd_str = "Stopping" payload = integer_to_bytearray(cmd) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_START_STOP_FLUSH.value, + message_id=MsgIds.MSG_ID_DG_START_STOP_FLUSH_CMD_REQUEST.value, payload=payload) self.logger.debug(cmd_str + " DG flush") @@ -442,7 +442,7 @@ @return: non-zero integer if successful, False otherwise """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_HD_REQUEST_DG_ALARMS.value) + message_id=MsgIds.MSG_ID_HD_DG_ALARMS_REQUEST.value) self.logger.debug("Command to re-send all active DG alarms acknowledged.") Index: dialin/dg/heaters.py =================================================================== diff -u -r26c7b6057f11680681e0a25399b5e5be9b92818d -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/dg/heaters.py (.../heaters.py) (revision 26c7b6057f11680681e0a25399b5e5be9b92818d) +++ dialin/dg/heaters.py (.../heaters.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -229,7 +229,7 @@ operation = 'Turning off' message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD.value, + message_id=MsgIds.MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD_REQUEST.value, payload=payload) self.logger.debug(operation + " the Primary heater") Index: dialin/dg/load_cells.py =================================================================== diff -u -r8ac75cccb937866cb13c49a97e91bb9e1060a9d8 -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/dg/load_cells.py (.../load_cells.py) (revision 8ac75cccb937866cb13c49a97e91bb9e1060a9d8) +++ dialin/dg/load_cells.py (.../load_cells.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -63,10 +63,10 @@ if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_LOAD_CELL_READINGS.value + msg_id = MsgIds.MSG_ID_LOAD_CELL_READINGS_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_load_cells_sync) - msg_id = MsgIds.MSG_ID_DG_SEND_LOAD_CELLS_TARE_VALUES_TO_DIALIN.value + msg_id = MsgIds.MSG_ID_DG_SEND_LOAD_CELLS_TARE_VALUES.value self.can_interface.register_receiving_publication_function(DenaliChannels.dg_to_dialin_ch_id, msg_id, self._handler_load_cells_tare_values_sync) Index: dialin/dg/reservoirs.py =================================================================== diff -u -r84f019168b0942c94d95a4028d2d252dfc48a0df -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/dg/reservoirs.py (.../reservoirs.py) (revision 84f019168b0942c94d95a4028d2d252dfc48a0df) +++ dialin/dg/reservoirs.py (.../reservoirs.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -109,7 +109,7 @@ payload = r + dc message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_SWITCH_RESERVOIR_CMD.value, + message_id=MsgIds.MSG_ID_DG_SWITCH_RESERVOIR_CMD_REQUEST.value, payload=payload) self.logger.debug("Sending command to switch DG reservoir to {0} and use last trimmer heater" Index: dialin/dg/rtc.py =================================================================== diff -u -r9bc00e997e91dab8b404aa877b02ae3d4100d417 -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/dg/rtc.py (.../rtc.py) (revision 9bc00e997e91dab8b404aa877b02ae3d4100d417) +++ dialin/dg/rtc.py (.../rtc.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -44,7 +44,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DG_RTC_EPOCH.value + msg_id = MsgIds.MSG_ID_DG_RTC_EPOCH_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_rtc_epoch) self.rtc_epoch = 0 Index: dialin/dg/samplewater.py =================================================================== diff -u -r9bc00e997e91dab8b404aa877b02ae3d4100d417 -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/dg/samplewater.py (.../samplewater.py) (revision 9bc00e997e91dab8b404aa877b02ae3d4100d417) +++ dialin/dg/samplewater.py (.../samplewater.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -42,7 +42,7 @@ if self.can_interface is not None: self.can_interface.register_receiving_publication_function(DenaliChannels.dg_sync_broadcast_ch_id, - MsgIds.MSG_ID_DG_FILTER_FLUSH_PROGRESS.value, + MsgIds.MSG_ID_DG_FILTER_FLUSH_PROGRESS_DATA.value, self._handler_filter_flush_progress_sync) self.filter_flush_timeout = 0 Index: dialin/dg/valves.py =================================================================== diff -u -r966adad6e486f8af2138d16cbabf79f7d1bd7b9c -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/dg/valves.py (.../valves.py) (revision 966adad6e486f8af2138d16cbabf79f7d1bd7b9c) +++ dialin/dg/valves.py (.../valves.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -125,7 +125,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DG_VALVES_STATES.value + msg_id = MsgIds.MSG_ID_DG_VALVES_STATES_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_valves_sync) self.valve_states_all = 0x0000 Index: dialin/hd/alarms.py =================================================================== diff -u -rc496796a6359e64716a63cf586be94e7bc53f9ed -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/hd/alarms.py (.../alarms.py) (revision c496796a6359e64716a63cf586be94e7bc53f9ed) +++ dialin/hd/alarms.py (.../alarms.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -77,7 +77,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.hd_alarm_broadcast_ch_id - msg_id = MsgIds.MSG_ID_ALARM_STATUS.value + msg_id = MsgIds.MSG_ID_ALARM_STATUS_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_alarms_status_sync) @@ -92,7 +92,7 @@ self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_alarm_condition_clear) channel_id = DenaliChannels.hd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_HD_ALARM_INFORMATION.value + msg_id = MsgIds.MSG_ID_HD_ALARM_INFORMATION_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_alarm_information_sync) Index: dialin/hd/blood_flow.py =================================================================== diff -u -ra3a5b61a1c59fa44ec4c826a4c62b7a22ba2eee0 -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/hd/blood_flow.py (.../blood_flow.py) (revision a3a5b61a1c59fa44ec4c826a4c62b7a22ba2eee0) +++ dialin/hd/blood_flow.py (.../blood_flow.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -540,7 +540,7 @@ payload = rst + cnt message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_BLOOD_PUMP_ROTOR_COUNT_OVERRIDE.value, + message_id=MsgIds.MSG_ID_BLOOD_ROTOR_COUNT_OVERRIDE.value, payload=payload) self.logger.debug("override blood pump rotor count") Index: dialin/hd/dialysate_inlet_flow.py =================================================================== diff -u -ra3a5b61a1c59fa44ec4c826a4c62b7a22ba2eee0 -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/hd/dialysate_inlet_flow.py (.../dialysate_inlet_flow.py) (revision a3a5b61a1c59fa44ec4c826a4c62b7a22ba2eee0) +++ dialin/hd/dialysate_inlet_flow.py (.../dialysate_inlet_flow.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -556,7 +556,7 @@ payload = rst + cnt message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_DIALYSATE_INLET_PUMP_ROTOR_COUNT_OVERRIDE.value, + message_id=MsgIds.MSG_ID_HD_DIALYSATE_INLET_PUMP_ROTOR_COUNT_OVERRIDE.value, payload=payload) self.logger.debug("override dialysate inlet pump rotor count") Index: dialin/hd/dialysate_outlet_flow.py =================================================================== diff -u -r881c190c1e90f09fa5584231a3e93a09bfb955c8 -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision 881c190c1e90f09fa5584231a3e93a09bfb955c8) +++ dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -582,7 +582,7 @@ payload = r1pb + r1bb + r2pb + r2bb message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_LOAD_CELL_READINGS.value, + message_id=MsgIds.MSG_ID_LOAD_CELL_READINGS_DATA.value, payload=payload) self.logger.debug("measured load cell weights set.") Index: dialin/hd/fluid_leak.py =================================================================== diff -u -r9bc00e997e91dab8b404aa877b02ae3d4100d417 -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/hd/fluid_leak.py (.../fluid_leak.py) (revision 9bc00e997e91dab8b404aa877b02ae3d4100d417) +++ dialin/hd/fluid_leak.py (.../fluid_leak.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -46,7 +46,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.hd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_HD_FLUID_LEAK_STATE.value + msg_id = MsgIds.MSG_ID_HD_FLUID_LEAK_STATE_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_fluid_leak_sync) Index: dialin/hd/hd_events.py =================================================================== diff -u -r1b61bae58ead37e6dc48f7f3fde447d3382fc7df -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/hd/hd_events.py (.../hd_events.py) (revision 1b61bae58ead37e6dc48f7f3fde447d3382fc7df) +++ dialin/hd/hd_events.py (.../hd_events.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -45,7 +45,7 @@ self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_events_sync) channel_id = DenaliChannels.hd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_HD_OP_MODE.value + msg_id = MsgIds.MSG_ID_HD_OP_MODE_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_hd_op_mode_sync) Index: dialin/hd/hemodialysis_device.py =================================================================== diff -u -rf26e9473ddcf393ae7b8e1ca852067507c82b3be -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision f26e9473ddcf393ae7b8e1ca852067507c82b3be) +++ dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -110,7 +110,7 @@ # register handler for HD operation mode broadcast messages if self.can_interface is not None: channel_id = DenaliChannels.hd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_HD_OP_MODE.value + msg_id = MsgIds.MSG_ID_HD_OP_MODE_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_hd_op_mode_sync) @@ -119,7 +119,7 @@ self._handler_hd_debug_event_sync) self.can_interface.register_receiving_publication_function(DenaliChannels.ui_to_hd_ch_id, - MsgIds.MSG_ID_HD_UI_VERSION_INFO_RESPONSE.value, + MsgIds.MSG_ID_UI_VERSION_INFO_RESPONSE.value, self._handler_ui_version_response_sync) self.callback_id = self.can_interface.register_transmitting_interval_message(INTERVAL_10s, Index: dialin/hd/post_treatment.py =================================================================== diff -u -r9bc00e997e91dab8b404aa877b02ae3d4100d417 -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/hd/post_treatment.py (.../post_treatment.py) (revision 9bc00e997e91dab8b404aa877b02ae3d4100d417) +++ dialin/hd/post_treatment.py (.../post_treatment.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -49,7 +49,7 @@ if self.can_interface is not None: self.can_interface.register_receiving_publication_function(DenaliChannels.hd_sync_broadcast_ch_id, - MsgIds.MSG_ID_HD_POST_TREATMENT_STATE.value, + MsgIds.MSG_ID_HD_POST_TREATMENT_STATE_DATA.value, self._handler_post_treatment_sub_mode_sync) self.hd_post_treatment_state_timestamp = 0.0 self.post_treatment_sub_mode = 0 Index: dialin/hd/pretreatment.py =================================================================== diff -u -r428c5c0a653129867b1cb32b5e64f89f68191c4b -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/hd/pretreatment.py (.../pretreatment.py) (revision 428c5c0a653129867b1cb32b5e64f89f68191c4b) +++ dialin/hd/pretreatment.py (.../pretreatment.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -60,15 +60,15 @@ if self.can_interface is not None: self.can_interface.register_receiving_publication_function(DenaliChannels.hd_sync_broadcast_ch_id, - MsgIds.MSG_ID_PRE_TREATMENT_STATE.value, + MsgIds.MSG_ID_PRE_TREATMENT_STATE_DATA.value, self._handler_pre_treatment_state_sync) - msg_id = MsgIds.MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS.value + msg_id = MsgIds.MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS_DATA.value self.can_interface.register_receiving_publication_function(DenaliChannels.hd_sync_broadcast_ch_id, msg_id, self._handler_no_cart_self_test_progress_sync) self.can_interface.register_receiving_publication_function(DenaliChannels.hd_sync_broadcast_ch_id, - MsgIds.MSG_ID_HD_DRY_SELF_TEST_PROGRESS.value, + MsgIds.MSG_ID_HD_DRY_SELF_TEST_PROGRESS_DATA.value, self._handler_dry_self_test_progress_sync) self.can_interface.register_receiving_publication_function(DenaliChannels.hd_sync_broadcast_ch_id, Index: dialin/hd/rtc.py =================================================================== diff -u -r428c5c0a653129867b1cb32b5e64f89f68191c4b -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/hd/rtc.py (.../rtc.py) (revision 428c5c0a653129867b1cb32b5e64f89f68191c4b) +++ dialin/hd/rtc.py (.../rtc.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -43,7 +43,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.hd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_RTC_EPOCH.value + msg_id = MsgIds.MSG_ID_RTC_EPOCH_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_rtc_epoch) self.hd_rtc_timestamp = 0.0 Index: dialin/hd/syringe_pump.py =================================================================== diff -u -r9bc00e997e91dab8b404aa877b02ae3d4100d417 -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/hd/syringe_pump.py (.../syringe_pump.py) (revision 9bc00e997e91dab8b404aa877b02ae3d4100d417) +++ dialin/hd/syringe_pump.py (.../syringe_pump.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -764,7 +764,7 @@ payload = reset_value + vlu message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_HEPRIN_BOLUS_TARGET_RATE_OVERRIDE.value, + message_id=MsgIds.MSG_ID_HD_SYRINGE_PUMP_HEPARIN_BOLUS_TARGET_RATE_OVERRIDE.value, payload=payload) self.logger.debug("Overriding heprin bolus target rate value override") Index: dialin/hd/treatment.py =================================================================== diff -u -rc496796a6359e64716a63cf586be94e7bc53f9ed -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/hd/treatment.py (.../treatment.py) (revision c496796a6359e64716a63cf586be94e7bc53f9ed) +++ dialin/hd/treatment.py (.../treatment.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -97,10 +97,10 @@ if self.can_interface is not None: channel_id = DenaliChannels.hd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_TREATMENT_TIME.value + msg_id = MsgIds.MSG_ID_TREATMENT_TIME_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_treatment_time_sync) - msg_id = MsgIds.MSG_ID_TREATMENT_STATE.value + msg_id = MsgIds.MSG_ID_TREATMENT_STATE_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_treatment_state_sync) msg_id = MsgIds.MSG_ID_SALINE_BOLUS_DATA.value @@ -109,10 +109,10 @@ msg_id = MsgIds.MSG_ID_HD_RINSEBACK_PROGRESS.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_rinseback_data_sync) - msg_id = MsgIds.MSG_ID_HD_BLOOD_PRIME_PROGRESS.value + msg_id = MsgIds.MSG_ID_HD_BLOOD_PRIME_PROGRESS_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_blood_prime_data_sync) - msg_id = MsgIds.MSG_ID_HD_RECIRC_PROGRESS.value + msg_id = MsgIds.MSG_ID_HD_RECIRC_PROGRESS_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_recirculate_data_sync) msg_id = MsgIds.MSG_ID_HD_TREATMENT_STOP_TIMER_DATA.value Index: dialin/hd/ui_proxy.py =================================================================== diff -u -r1428c8a63bfcfe3b31667a9dbbf9d50d13105e63 -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 1428c8a63bfcfe3b31667a9dbbf9d50d13105e63) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -131,17 +131,17 @@ self.can_interface.register_receiving_publication_function(channel_id, MsgIds.MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_RESPONSE.value, self._handler_blood_and_dialysate_change_response) - self.can_interface.register_receiving_publication_function(channel_id, MsgIds.MSG_ID_TREATMENT_PARAM_CHANGE_RANGES.value, + self.can_interface.register_receiving_publication_function(channel_id, MsgIds.MSG_ID_TREATMENT_PARAM_CHANGE_RANGES_DATA.value, self._handler_treatment_param_ranges) - self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, MsgIds.MSG_ID_HD_VERSION.value, + self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, MsgIds.MSG_ID_HD_VERSION_REPONSE.value, self._handler_hd_version) - self.can_interface.register_receiving_publication_function(DenaliChannels.ui_to_hd_ch_id, MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS.value, + self.can_interface.register_receiving_publication_function(DenaliChannels.ui_to_hd_ch_id, MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS_REQUEST.value, self._handler_treatment_param_settings) self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, MsgIds.MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE.value, self._handler_treatment_param_settings_response) self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, MsgIds.MSG_ID_USER_SALINE_BOLUS_RESPONSE.value, self._handler_saline_bolus_response) - self.can_interface.register_receiving_publication_function(DenaliChannels.ui_to_hd_ch_id, MsgIds.MSG_ID_UI_SET_UF_VOLUME_PARAMETER.value, + self.can_interface.register_receiving_publication_function(DenaliChannels.ui_to_hd_ch_id, MsgIds.MSG_ID_UI_SET_UF_VOLUME_PARAMETER_REQUEST.value, self._handler_uf_volume_setting_response) self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, MsgIds.MSG_ID_HD_RINSEBACK_CMD_RESPONSE.value, self._handler_rinseback_cmd_response) @@ -1132,7 +1132,7 @@ payload = major + minor + micro + build + compatibility message = DenaliMessage.build_message(channel_id=DenaliChannels.ui_sync_broadcast_ch_id, - message_id=MsgIds.MSG_ID_REQUEST_FW_VERSIONS.value, + message_id=MsgIds.MSG_ID_FW_VERSIONS_REQUEST.value, payload=payload) self.logger.debug("Sending ui request for version to HD") @@ -1149,7 +1149,7 @@ payload = integer_to_bytearray(volume) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD.value, + message_id=MsgIds.MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD_REQUEST.value, payload=payload) self.logger.debug("Sending ui request to set alarm audio volume to level " + str(volume) + " to HD") @@ -1165,7 +1165,7 @@ payload = float_to_bytearray(uf_volume) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_SET_UF_VOLUME_PARAMETER.value, + message_id=MsgIds.MSG_ID_UI_SET_UF_VOLUME_PARAMETER_REQUEST.value, payload=payload) self.logger.debug("Sending ui request to set ultrafiltration volume parameter of " + str(uf_volume) + " to HD") @@ -1232,7 +1232,7 @@ adjust = integer_to_bytearray(adj) payload = volume + adjust message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE.value, + message_id=MsgIds.MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE_REQUEST.value, payload=payload) self.logger.debug("Sending UF settings change request.") @@ -1411,7 +1411,7 @@ payload = bld + dia + dur + hps + sal + acc + bic + dzr + hpr + bpi + rbf + apw + vpw + vpa + hdr + hbv + tmp message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS.value, + message_id=MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS_REQUEST.value, payload=payload) self.logger.debug("Sending treatment parameters to HD.") @@ -1433,7 +1433,7 @@ payload = integer_to_bytearray(cmd) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS.value, + message_id=MsgIds.MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS_REQUEST.value, payload=payload) self.logger.debug("Sending confirm treatment parameters message.") @@ -1495,7 +1495,7 @@ payload = cmd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_RINSEBACK_CMD.value, + message_id=MsgIds.MSG_ID_UI_RINSEBACK_CMD_REQUEST.value, payload=payload) self.logger.debug("Sending rinseback command " + str(action) + " to HD.") @@ -1522,7 +1522,7 @@ payload = cmd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_RECIRC_CMD.value, + message_id=MsgIds.MSG_ID_UI_RECIRC_CMD_REQUEST.value, payload=payload) self.logger.debug("Sending recirculate command " + str(action) + " to HD.") @@ -1546,7 +1546,7 @@ payload = cmd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_TX_END_CMD.value, + message_id=MsgIds.MSG_ID_UI_TX_END_CMD_REQUEST.value, payload=payload) self.logger.debug("Sending treatment end command " + str(action) + " to HD.") @@ -1572,7 +1572,7 @@ opt = integer_to_bytearray(option) payload = opt message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_ALARM_USER_ACTION.value, + message_id=MsgIds.MSG_ID_UI_ALARM_USER_ACTION_REQUEST.value, payload=payload) self.logger.debug("Sending user alarm response option " + str(option) + " to HD.") @@ -1593,7 +1593,7 @@ cmd = integer_to_bytearray(toggle) payload = cmd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_USER_REQUEST_ALARM_SILENCE.value, + message_id=MsgIds.MSG_ID_USER_ALARM_SILENCE_REQUEST.value, payload=payload) self.logger.debug("Sending user alarm response option " + str(toggle) + " to HD.") @@ -1613,7 +1613,7 @@ payload = integer_to_bytearray(cmd) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_SAMPLE_WATER_CMD.value, + message_id=MsgIds.MSG_ID_UI_SAMPLE_WATER_CMD_REQUEST.value, payload=payload) self.logger.debug("Sending user sample water command " + str(cmd) + " to HD.") @@ -1646,7 +1646,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM.value) + message_id=MsgIds.MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM_REQUEST.value) self.logger.debug("Sending user consumable installation confirm to HD.") self.can_interface.send(message, 0) @@ -1659,7 +1659,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_INSTALLATION_CONFIRM.value) + message_id=MsgIds.MSG_ID_UI_INSTALLATION_CONFIRM_REQUEST.value) self.logger.debug("Sending user disposable installation confirm to HD.") self.can_interface.send(message, 0) @@ -1698,7 +1698,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_PATIENT_CONNECTION_CONFIRM.value) + message_id=MsgIds.MSG_ID_UI_PATIENT_CONNECTION_CONFIRM_REQUEST.value) self.logger.debug("Sending user continue to treatment request to HD.") self.can_interface.send(message, 0) @@ -1724,7 +1724,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM.value) + message_id=MsgIds.MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM_REQUEST.value) self.logger.debug("Sending user patient disconnection confirm msg to HD.") self.can_interface.send(message, 0) @@ -1737,7 +1737,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM.value) + message_id=MsgIds.MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM_REQUEST.value) self.logger.debug("Sending user disposable removal confirm msg to HD.") self.can_interface.send(message, 0) @@ -1763,7 +1763,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_SERVICE_TIME.value) + message_id=MsgIds.MSG_ID_HD_SET_SERVICE_TIME_REQUEST.value) self.logger.debug("Setting HD service time.") self.can_interface.send(message, 0) @@ -1776,7 +1776,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_SET_SERVICE_TIME.value) + message_id=MsgIds.MSG_ID_DG_SET_SERVICE_TIME_REQUEST.value) self.logger.debug("Setting DG service time.") self.can_interface.send(message, 0) Index: dialin/ui/dg_simulator.py =================================================================== diff -u -r428c5c0a653129867b1cb32b5e64f89f68191c4b -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/ui/dg_simulator.py (.../dg_simulator.py) (revision 428c5c0a653129867b1cb32b5e64f89f68191c4b) +++ dialin/ui/dg_simulator.py (.../dg_simulator.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -52,10 +52,10 @@ MsgIds.MSG_ID_UI_DG_SET_RTC_REQUEST.value, self._handler_set_rtc_request) self.can_interface.register_receiving_publication_function(DenaliChannels.ui_sync_broadcast_ch_id, - MsgIds.MSG_ID_REQUEST_FW_VERSIONS.value, + MsgIds.MSG_ID_FW_VERSIONS_REQUEST.value, self._handler_request_dg_version) self.can_interface.register_receiving_publication_function(DenaliChannels.ui_sync_broadcast_ch_id, - MsgIds.MSG_ID_UI_REQUEST_SERVICE_INFO.value, + MsgIds.MSG_ID_UI_SERVICE_INFO_REQUEST.value, self._handler_system_usage_response) def _handler_system_usage_response(self,message,timestamp=0.0) -> None: @@ -71,7 +71,7 @@ payload += integer_to_bytearray(1619887863) message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_to_ui_ch_id, - message_id=MsgIds.MSG_ID_DG_SERVICE_SCHEDULE_DATA.value, + message_id=MsgIds.MSG_ID_DG_SERVICE_SCHEDULE_DATA_TO_UI.value, payload=payload) self.can_interface.send(message, 0) @@ -211,7 +211,7 @@ payload = integer_to_bytearray(dg_op_mode) message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_sync_broadcast_ch_id, - message_id=MsgIds.MSG_ID_DG_OP_MODE.value, + message_id=MsgIds.MSG_ID_DG_OP_MODE_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -255,7 +255,7 @@ payload = integer_to_bytearray(valves_states) message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_sync_broadcast_ch_id, - message_id=MsgIds.MSG_ID_DG_VALVES_STATES.value, + message_id=MsgIds.MSG_ID_DG_VALVES_STATES_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -303,7 +303,7 @@ payload += float_to_bytearray(reservoir2_backup) message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_sync_broadcast_ch_id, - message_id=MsgIds.MSG_ID_LOAD_CELL_READINGS.value, + message_id=MsgIds.MSG_ID_LOAD_CELL_READINGS_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -443,7 +443,7 @@ payload = b'0123456789\0' message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_to_ui_ch_id, - message_id=MsgIds.MSG_ID_DG_SERIAL_NUMBER.value, + message_id=MsgIds.MSG_ID_DG_SERIAL_NUMBER_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -488,7 +488,7 @@ payload += unsigned_integer_to_bytearray(compatibility_rev) message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_sync_broadcast_ch_id, - message_id=MsgIds.MSG_ID_DG_VERSION.value, + message_id=MsgIds.MSG_ID_DG_VERSION_REPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -503,7 +503,7 @@ payload = bytes(serial, 'ascii') + b'\x00' message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_to_ui_ch_id, - message_id=MsgIds.MSG_ID_DG_SERIAL_NUMBER.value, + message_id=MsgIds.MSG_ID_DG_SERIAL_NUMBER_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -531,7 +531,7 @@ payload += integer_to_bytearray(countdown) message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_to_ui_ch_id, - message_id=MsgIds.MSG_ID_DG_FILTER_FLUSH_PROGRESS.value, + message_id=MsgIds.MSG_ID_DG_FILTER_FLUSH_PROGRESS_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -547,7 +547,7 @@ payload += integer_to_bytearray(countdown) message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_to_ui_ch_id, - message_id=MsgIds.MSG_ID_DG_FLUSH_TIME_DATA.value, + message_id=MsgIds.MSG_ID_DG_FLUSH_DATA.value, payload=payload) self.can_interface.send(message, 0) Index: dialin/ui/hd_simulator.py =================================================================== diff -u -rf931595765812123b9caea8803381d213a70e54d -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision f931595765812123b9caea8803381d213a70e54d) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -83,31 +83,31 @@ MsgIds.MSG_ID_UI_INITIATE_TREATMENT_REQUEST.value, self._handler_ui_initiate_treatment) self.can_interface.register_receiving_publication_function(channel_id, - MsgIds.MSG_ID_UI_SET_UF_VOLUME_PARAMETER.value, + MsgIds.MSG_ID_UI_SET_UF_VOLUME_PARAMETER_REQUEST.value, self._handler_ui_pre_treatment_uf_request) self.can_interface.register_receiving_publication_function(channel_id, - MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS.value, + MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS_REQUEST.value, self._handler_ui_validate_parameters) self.can_interface.register_receiving_publication_function(channel_id, - MsgIds.MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS.value, + MsgIds.MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS_REQUEST.value, self._handler_ui_confirm_treatment) self.can_interface.register_receiving_publication_function(channel_id, - MsgIds.MSG_ID_UI_TX_END_CMD.value, + MsgIds.MSG_ID_UI_TX_END_CMD_REQUEST.value, self._handler_ui_end_treatment) self.can_interface.register_receiving_publication_function(channel_id, MsgIds.MSG_ID_UI_HD_SET_RTC_REQUEST.value, self._handler_set_rtc_request) self.can_interface.register_receiving_publication_function(DenaliChannels.ui_sync_broadcast_ch_id, - MsgIds.MSG_ID_REQUEST_FW_VERSIONS.value, + MsgIds.MSG_ID_FW_VERSIONS_REQUEST.value, self._handler_request_hd_version) self.can_interface.register_receiving_publication_function(DenaliChannels.ui_sync_broadcast_ch_id, - MsgIds.MSG_ID_UI_REQUEST_SERVICE_INFO.value, + MsgIds.MSG_ID_UI_SERVICE_INFO_REQUEST.value, self._handler_system_usage_response) self.can_interface.register_receiving_publication_function(DenaliChannels.ui_to_hd_ch_id, - MsgIds.MSG_ID_HD_UI_VERSION_INFO_RESPONSE.value, + MsgIds.MSG_ID_UI_VERSION_INFO_RESPONSE.value, self._handler_ui_post_ui_version_compatibility) self.can_interface.register_receiving_publication_function(DenaliChannels.ui_to_hd_ch_id, - MsgIds.MSG_ID_HD_UI_VERSION_INFO_RESPONSE.value, + MsgIds.MSG_ID_UI_VERSION_INFO_RESPONSE.value, self._handler_ui_version) self.treatment_parameter_rejections = TreatmentParameterRejections() @@ -311,7 +311,7 @@ @return: None """ message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, - message_id=MsgIds.MSG_ID_POWER_OFF_IMMINENT.value, + message_id=MsgIds.MSG_ID_POWER_OFF_WARNING.value, payload=None) self.can_interface.send(message, 0) @@ -416,7 +416,7 @@ payload += integer_to_bytearray(sub_mode) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, - message_id=MsgIds.MSG_ID_HD_OP_MODE.value, + message_id=MsgIds.MSG_ID_HD_OP_MODE_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -659,7 +659,7 @@ payload += integer_to_bytearray(max_dialysate_flow_rate) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, - message_id=MsgIds.MSG_ID_TREATMENT_PARAM_CHANGE_RANGES.value, + message_id=MsgIds.MSG_ID_TREATMENT_PARAM_CHANGE_RANGES_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -962,7 +962,7 @@ payload += integer_to_bytearray(sec_remain) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, - message_id=MsgIds.MSG_ID_TREATMENT_TIME.value, + message_id=MsgIds.MSG_ID_TREATMENT_TIME_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -1079,7 +1079,7 @@ payload += integer_to_bytearray(dialysis_state) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, - message_id=MsgIds.MSG_ID_TREATMENT_STATE.value, + message_id=MsgIds.MSG_ID_TREATMENT_STATE_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -1114,7 +1114,7 @@ payload += integer_to_bytearray(operation_sub_mode) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, - message_id=MsgIds.MSG_ID_HD_OP_MODE.value, + message_id=MsgIds.MSG_ID_HD_OP_MODE_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -1211,7 +1211,7 @@ payload += float_to_bytearray(required) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, - message_id=MsgIds.MSG_ID_HD_HEPARIN_DATA_BROADCAST.value, + message_id=MsgIds.MSG_ID_HD_HEPARIN_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -1334,7 +1334,7 @@ payload += integer_to_bytearray(timeout_count_down) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, - message_id=MsgIds.MSG_ID_HD_RECIRC_PROGRESS.value, + message_id=MsgIds.MSG_ID_HD_RECIRC_PROGRESS_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -1355,7 +1355,7 @@ payload += float_to_bytearray(current) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, - message_id=MsgIds.MSG_ID_HD_BLOOD_PRIME_PROGRESS.value, + message_id=MsgIds.MSG_ID_HD_BLOOD_PRIME_PROGRESS_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -1490,7 +1490,7 @@ payload = bytearray('0123456789\0', encoding="utf-8") message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, - message_id=MsgIds.MSG_ID_HD_SERIAL_NUMBER.value, + message_id=MsgIds.MSG_ID_HD_SERIAL_NUMBER_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1535,7 +1535,7 @@ payload += unsigned_integer_to_bytearray(compatibility_rev) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, - message_id=MsgIds.MSG_ID_HD_VERSION.value, + message_id=MsgIds.MSG_ID_HD_VERSION_REPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1550,7 +1550,7 @@ payload = bytes(serial, 'ascii') + b'\x00' message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, - message_id=MsgIds.MSG_ID_HD_SERIAL_NUMBER.value, + message_id=MsgIds.MSG_ID_HD_SERIAL_NUMBER_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1596,7 +1596,7 @@ payload += integer_to_bytearray(pretreatment_rsrvr_state) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, - message_id=MsgIds.MSG_ID_PRE_TREATMENT_STATE.value, + message_id=MsgIds.MSG_ID_PRE_TREATMENT_STATE_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -1628,7 +1628,7 @@ payload += integer_to_bytearray(countdown) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, - message_id=MsgIds.MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS.value, + message_id=MsgIds.MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -1644,7 +1644,7 @@ payload += integer_to_bytearray(countdown) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, - message_id=MsgIds.MSG_ID_HD_DRY_SELF_TEST_PROGRESS.value, + message_id=MsgIds.MSG_ID_HD_DRY_SELF_TEST_PROGRESS_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -1925,22 +1925,6 @@ self.can_interface.send(message, 0) - def cmd_send_hd_disinfect_chemical_confirm(self, accepted: bool, reason: int) -> None: - """ - the HD response to the UI sending the user chemical disinfection steps confirm. - @param accepted: boolean accepted or rejected - @param reason: the rejection reason - @return: None - """ - payload = integer_to_bytearray(accepted) - payload += integer_to_bytearray(reason) - - message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, - message_id=MsgIds.MSG_ID_HD_CHEM_DISINFECT_CONFIRM_RESPONSE.value, - payload=payload) - - self.can_interface.send(message, 0) - @publish(["ui_version"]) def _handler_ui_version(self, message, timestamp=0.0) -> None: """ Index: dialin/ui/hd_simulator_alarms.py =================================================================== diff -u -racd09d02879e8add4cf7f694f5db8e423a76c341 -r5cfee988b0705cf5516affc56088039e19f5d090 --- dialin/ui/hd_simulator_alarms.py (.../hd_simulator_alarms.py) (revision acd09d02879e8add4cf7f694f5db8e423a76c341) +++ dialin/ui/hd_simulator_alarms.py (.../hd_simulator_alarms.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -119,13 +119,13 @@ if self.can_interface is not None: channel_id = DenaliChannels.ui_to_hd_ch_id self.can_interface.register_receiving_publication_function(channel_id, - MsgIds.MSG_ID_USER_REQUEST_ALARM_SILENCE.value, + MsgIds.MSG_ID_USER_ALARM_SILENCE_REQUEST.value, self._handler_alarm_silence) self.can_interface.register_receiving_publication_function(channel_id, - MsgIds.MSG_ID_UI_ALARM_USER_ACTION.value, + MsgIds.MSG_ID_UI_ALARM_USER_ACTION_REQUEST.value, self._handler_user_action) self.can_interface.register_receiving_publication_function(DenaliChannels.ui_to_hd_ch_id, - MsgIds.MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD.value, + MsgIds.MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD_REQUEST.value, self._handler_request_override_alarm_volume) def _send_alarm_volume_broadcast(self): @@ -140,7 +140,7 @@ payload += float_to_bytearray(1.0) # alarm backup audio current (mA) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, - message_id=MsgIds.MSG_ID_HD_ALARM_INFORMATION.value, + message_id=MsgIds.MSG_ID_HD_ALARM_INFORMATION_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -195,7 +195,7 @@ payload = state + top + escalates_in + silence_expires + flags message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_alarm_broadcast_ch_id, - message_id=MsgIds.MSG_ID_ALARM_STATUS.value, + message_id=MsgIds.MSG_ID_ALARM_STATUS_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -239,7 +239,7 @@ payload = state + top + escalates_in + silence_expires + flags message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_alarm_broadcast_ch_id, - message_id=MsgIds.MSG_ID_ALARM_STATUS.value, + message_id=MsgIds.MSG_ID_ALARM_STATUS_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -318,7 +318,7 @@ payload = state + top + escalates_in + silence_expires + flags message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_alarm_broadcast_ch_id, - message_id=MsgIds.MSG_ID_ALARM_STATUS.value, + message_id=MsgIds.MSG_ID_ALARM_STATUS_DATA.value, payload=payload) self.can_interface.send(message, 0) Index: tests/unit_tests/test_ui_proxy.py =================================================================== diff -u -r350a114f0728459afcffd2faf0b0f04debaca36f -r5cfee988b0705cf5516affc56088039e19f5d090 --- tests/unit_tests/test_ui_proxy.py (.../test_ui_proxy.py) (revision 350a114f0728459afcffd2faf0b0f04debaca36f) +++ tests/unit_tests/test_ui_proxy.py (.../test_ui_proxy.py) (revision 5cfee988b0705cf5516affc56088039e19f5d090) @@ -102,7 +102,7 @@ payload += integer_to_bytearray(self.params.get("rb_flow", None)) message = DenaliMessage.build_message(channel_id=DenaliChannels.ui_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS.value, + message_id=MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS_REQUEST.value, payload=payload) self.assertIsNone(self.hd.ui._handler_treatment_param_settings(message, test_timestamp)) @@ -112,7 +112,7 @@ payload = bytearray() message = DenaliMessage.build_message(channel_id=DenaliChannels.ui_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS.value, + message_id=MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS_REQUEST.value, payload=payload) self.assertRaises(struct.error, self.hd.ui._handler_treatment_param_settings, message, test_timestamp)