Index: dialin/common/msg_ids.py =================================================================== diff -u -re06884d51e6508a6cafc47673a1a9908459d6b6d -rc931cb057c2a599fbcb665f71efb8a2bbeb56144 --- dialin/common/msg_ids.py (.../msg_ids.py) (revision e06884d51e6508a6cafc47673a1a9908459d6b6d) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision c931cb057c2a599fbcb665f71efb8a2bbeb56144) @@ -7,8 +7,8 @@ # # @file msg_ids.py # -# @author (last) Sean Nash -# @date (last) 29-Jul-2022 +# @author (last) Dara Navaei +# @date (last) 14-Nov-2022 # @author (original) Peter Lucia # @date (original) 06-Apr-2021 # @@ -21,7 +21,7 @@ @unique class MsgIds(DialinEnum): MSG_ID_UNUSED = 0x0 - MSG_ID_OFF_BUTTON_PRESS = 0x1 + MSG_ID_POWER_OFF = 0x1 MSG_ID_ALARM_STATUS = 0x2 MSG_ID_ALARM_TRIGGERED = 0x3 MSG_ID_ALARM_CLEARED = 0x4 @@ -34,7 +34,7 @@ MSG_ID_DIALYSATE_OUT_FLOW_DATA = 0xB MSG_ID_LOAD_CELL_READINGS = 0xC MSG_ID_TREATMENT_TIME = 0xD - MSG_ID_POWER_OFF_WARNING = 0xE + MSG_ID_POWER_OFF_IMMINENT = 0xE MSG_ID_TREATMENT_STATE = 0xF MSG_ID_USER_UF_PAUSE_RESUME_REQUEST = 0x10 MSG_ID_USER_UF_SETTINGS_CHANGE_REQUEST = 0x11 @@ -63,7 +63,7 @@ MSG_ID_DG_RESERVOIRS_DATA = 0x28 MSG_ID_DG_SAMPLE_WATER_CMD = 0x29 MSG_ID_DG_VALVES_STATES = 0x2A - MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD = 0x2B + MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD = 0x2B MSG_ID_DG_HEATERS_DATA = 0x2C MSG_ID_DG_TEMPERATURE_DATA = 0x2D MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE = 0x2E @@ -202,6 +202,8 @@ 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_SERVICE_RECORD = 0xB9 MSG_ID_HD_REQUEST_UI_CONFIRMATION = 0xBA MSG_ID_UI_CONFIRMATION_RESULT = 0xBB @@ -239,7 +241,7 @@ MSG_ID_PRESSURE_VENOUS_OVERRIDE = 0x8018 MSG_ID_OCCLUSION_BLOOD_PUMP_OVERRIDE = 0x8019 MSG_ID_BLOOD_PUMP_ROTOR_COUNT_OVERRIDE = 0x801A - MSG_ID_SET_ARTERIAL_PRESSURE_OFFSET = 0x801B + MSG_ID____AVAILABLE_11 = 0x801B MSG_ID_PRES_OCCL_SEND_INTERVAL_OVERRIDE = 0x801C MSG_ID_SET_RTC_DATE_TIME = 0x801D MSG_ID_DIAL_OUT_FLOW_SEND_INTERVAL_OVERRIDE = 0x801E @@ -344,6 +346,10 @@ MSG_ID_HD_SET_BLOOD_LEAK_EMB_MODE_COMMAND = 0x8082 MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE = 0x8083 MSG_ID_HD_SEND_ALARMS_COMMAND = 0x8084 + 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_DG_TESTER_LOGIN_REQUEST = 0xA000 MSG_ID_DG_ALARM_STATE_OVERRIDE = 0xA001 @@ -353,7 +359,7 @@ MSG_ID_PRESSURE_OVERRIDE = 0xA006 MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE = 0xA007 MSG_ID_DG_HD_COMMUNICATION_STATUS_OVERRIDE = 0xA008 - MSG_ID_RO_MEASURED_FLOW_OVERRIDE = 0xA009 + MSG_ID_DG_SET_PRIMARY_AND_TRIMMER_HEATERS_TARGET_TEMP = 0xA009 MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE = 0xA00A MSG_ID_DRAIN_PUMP_SET_RPM = 0xA00B MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE = 0xA00C @@ -377,7 +383,7 @@ MSG_ID_DG_SWITCHES_PUBLISH_INTERVAL_OVERRIDE = 0xA01E MSG_ID_DG_OP_MODE_PUBLISH_INTERVAL_OVERRIDE = 0xA01F MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION = 0xA020 - MSG_ID_DIALYSATE_MEASURED_FLOW_OVERRIDE = 0xA021 + MSG_ID_MEASURED_FLOW_SENSORS_OVERRIDE = 0xA021 MSG_ID_DG_SOFTWARE_RESET_REQUEST = 0xA022 MSG_ID_DG_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE = 0xA023 MSG_ID_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE = 0xA024 @@ -391,7 +397,7 @@ MSG_ID_DG_THERMISTORS_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA02D MSG_ID_DG_THERMISTORS_VALUE_OVERRIDE = 0xA02E MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE = 0xA02F - MSG_ID_DG_RO_FLOW_RATE_OVERRIDE = 0xA030 + MSG_ID_DG_VALVES_SENSED_STATE_OVERRIDE = 0xA030 MSG_ID_DG_SET_RO_PUMP_TARGET_FLOW = 0xA031 MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE = 0xA032 MSG_ID_DG_SET_CALIBRATION_RECORD = 0xA033 @@ -411,12 +417,12 @@ MSG_ID_DG_FLUSH_PUBLISH_INTERVAL_OVERRIDE = 0xA041 MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE = 0xA042 MSG_ID_DG_FANS_RPM_OVERRIDE = 0xA043 - MSG_ID_DIALYSATE_FLOW_SEND_INTERVAL_OVERRIDE = 0xA044 + MSG_ID_FLOW_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA044 MSG_ID_DG_STOP_RTC_CLOCK = 0xA045 MSG_ID_DG_DRAIN_PUMP_MEASURED_RPM_OVERRIDE = 0xA046 MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD = 0xA047 MSG_ID_DG_ALARM_INFO_SEND_INTERVAL_OVERRIDE = 0xA048 - MSG_ID_DG_FAN_RPM_ALARM_START_TIME_OFFSET_OVERRIDE = 0xA049 + MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD = 0xA049 MSG_ID_DG_GET_SW_CONFIG_RECORD = 0xA04A MSG_ID_DG_SET_SW_CONFIG_RECORD = 0xA04B MSG_ID_DG_SEND_SW_CONFIG_RECORD = 0xA04C @@ -431,6 +437,9 @@ 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_DG_DRAIN_PUMP_CURRENT_OVERRIDE = 0xA059 + MSG_ID_DG_DRAIN_PUMP_DIRECTION_OVERRIDE = 0xA05A MSG_ID_HD_DEBUG_EVENT = 0xFFF1 MSG_ID_DG_DEBUG_EVENT = 0xFFF2 Index: dialin/hd/hemodialysis_device.py =================================================================== diff -u -rc3a1b7c1f4aa0e08000c891207891a6fbe016350 -rc931cb057c2a599fbcb665f71efb8a2bbeb56144 --- dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision c3a1b7c1f4aa0e08000c891207891a6fbe016350) +++ dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision c931cb057c2a599fbcb665f71efb8a2bbeb56144) @@ -7,8 +7,8 @@ # # @file hemodialysis_device.py # -# @author (last) Dara Navaei -# @date (last) 15-Jun-2022 +# @author (last) Micahel Garthwaite +# @date (last) 08-Sep-2022 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # @@ -161,7 +161,7 @@ self.temperatures = HDTemperatures(self.can_interface, self.logger) self.fans = HDFans(self.can_interface, self.logger) self.watchdog = HDWatchdog(self.can_interface, self.logger) - self.hd_events = HDEvents(self.can_interface, self.logger) + self.events = HDEvents(self.can_interface, self.logger) self.hd_reservoirs = HDReservoirs(self.can_interface, self.logger) self.sw_configs = HDSoftwareConfigs(self.can_interface, self.logger) self.post_treatment = HDPostTreatment(self.can_interface, self.logger) @@ -349,9 +349,9 @@ HD_OP_MODE_INIT_POST = 2 HD_OP_MODE_STANDBY = 3 HD_OP_MODE_TREATMENT_PARAMS = 4 - HD_OP_MODE_PRE_TREATMENT = 6 - HD_OP_MODE_TREATMENT = 7 - HD_OP_MODE_POST_TREATMENT = 8 + HD_OP_MODE_PRE_TREATMENT = 5 + HD_OP_MODE_TREATMENT = 6 + HD_OP_MODE_POST_TREATMENT = 7 @return: 1 if successful, zero otherwise