Index: dialin/common/msg_defs.py =================================================================== diff -u -rd3a22e97fad0b715b1e9fba138236334ae7dbb6d -rbea9ebd2e6dd6ba909a7431044059a9aeb4ea0b5 --- dialin/common/msg_defs.py (.../msg_defs.py) (revision d3a22e97fad0b715b1e9fba138236334ae7dbb6d) +++ dialin/common/msg_defs.py (.../msg_defs.py) (revision bea9ebd2e6dd6ba909a7431044059a9aeb4ea0b5) @@ -7,8 +7,8 @@ # # @file msg_defs.py # -# @author (last) Dara Navaei -# @date (last) 22-Dec-2022 +# @author (last) Micahel Garthwaite +# @date (last) 17-Aug-2023 # @author (original) Peter Lucia # @date (original) 07-Aug-2020 # @@ -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,23 +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_DISINFECT_STANDBY_DATA.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, @@ -97,9 +96,11 @@ 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_CPLD_STATUS_DATA.value, + MsgIds.MSG_ID_DG_DIALIN_CHECK_IN.value, + MsgIds.MSG_ID_HD_DIALIN_CHECK_IN.value ] @@ -133,13 +134,37 @@ REQUEST_REJECT_REASON_INVALID_COMMAND = 25 REQUEST_REJECT_REASON_TREATMENT_IS_COMPLETED = 26 REQUEST_REJECT_REASON_RINSEBACK_MAX_VOLUME_REACHED = 27 - REQUEST_REJECT_REASON_UF_VOLUME_NOT_SET = 28 + REQUEST_REJECT_REASON_DIALYZER_NOT_INVERTED = 28 REQUEST_REJECT_REASON_NO_PATIENT_CONNECTION_CONFIRM = 29 REQUEST_REJECT_REASON_HEPARIN_PAUSE_INVALID_IN_THIS_STATE = 30 REQUEST_REJECT_REASON_HEPARIN_NOT_PAUSED = 31 REQUEST_REJECT_REASON_DG_COMM_LOST = 32 REQUEST_REJECT_REASON_DRAIN_NOT_COMPLETE = 33 - NUM_OF_REQUEST_REJECT_REASONS = 34 + REQUEST_REJECT_REASON_DG_NOT_IN_STANDBY_IDLE_STATE = 34 + REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT = 35 + REQUEST_REJECT_REASON_INVALID_DATE_OR_TIME = 36 + REQUEST_REJECT_REASON_TREATMENT_IN_PROGRESS = 37 + REQUEST_REJECT_REASON_BATTERY_IS_NOT_CHARGED = 38 + REQUEST_REJECT_REASON_RINSEBACK_NOT_COMPLETED = 39 + REQUEST_REJECT_REASON_RESERVOIR_ONE_IS_NOT_READY = 40 + REQUEST_REJECT_REASON_PUMP_TRACK_NOT_CLOSED = 41 + REQUEST_REJECT_REASON_DOOR_NOT_CLOSED = 42 + REQUEST_REJECT_REASON_SYRINGE_NOT_PRESENT = 43 + REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN = 44 + REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN = 45 + REQUEST_REJECT_REASON_DG_DISINFECT_HAS_BEEN_EXPIRED = 46 + REQUEST_REJECT_REASON_DG_SERVICE_IS_DUE = 47 + REQUEST_REJECT_REASON_HD_SERVICE_IS_DUE = 48 + REQUEST_REJECT_REASON_DG_CHEM_FLUSH_NOT_COMPLETED = 49 + REQUEST_REJECT_REASON_DG_RO_FILTER_TEMPERATURE_OUT_OF_RANGE = 50 + REQUEST_REJECT_REASON_DG_INCOMPATIBLE = 51 + REQUEST_REJECT_REASON_HEPARIN_PRESTOP_WITH_NO_DISPENSE = 52 + REQUEST_REJECT_REASON_DIALYZER_REPRIME_IN_PROGRESS = 53 + REQUEST_REJECT_REASON_DG_RO_ONLY_MODE_DG_BUSY = 54 + REQUEST_REJECT_REASON_DG_RO_ONLY_MODE_INVALID_PARAMETER = 55 + REQUEST_REJECT_REASON_DG_RO_ONLY_MODE_INVALID_PAYLOAD_LENGTH = 56 + REQUEST_REJECT_REASON_TREATMENT_CANNOT_BE_RESUMED = 57 + NUM_OF_REQUEST_REJECT_REASONS = 58 class MsgFieldPositions: