Index: dialin/common/msg_defs.py =================================================================== diff -u -r527decd42c3e6730a33ff6b7635787d13f9400e5 -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/common/msg_defs.py (.../msg_defs.py) (revision 527decd42c3e6730a33ff6b7635787d13f9400e5) +++ dialin/common/msg_defs.py (.../msg_defs.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -188,7 +188,11 @@ END_OF_MSG_IDS = 0xFFF3 # End of system message IDs + @classmethod + def has_value(cls, value): + return value in cls._value2member_map_ + class RequestRejectReasons(enum.Enum): REQUEST_REJECT_REASON_NONE = 0 @@ -216,6 +220,10 @@ REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_IN_PROGRESS = 22 NUM_OF_REQUEST_REJECT_REASONS = 23 + @classmethod + def has_value(cls, value): + return value in cls._value2member_map_ + class MsgFldPositions(): # Generic response msg field byte positions (where 32-bit data fields are used) START_POS_FIELD_1 = DenaliMessage.PAYLOAD_START_INDEX Index: dialin/dg/accelerometer.py =================================================================== diff -u -r65277463eda63686c6132b6716aaa997b6df1861 -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/dg/accelerometer.py (.../accelerometer.py) (revision 65277463eda63686c6132b6716aaa997b6df1861) +++ dialin/dg/accelerometer.py (.../accelerometer.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -56,7 +56,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DG_ACCELEROMETER_DATA + msg_id = MsgIds.MSG_ID_DG_ACCELEROMETER_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_accelerometer_sync) @@ -141,7 +141,7 @@ payload = rst + sta + idx message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_ACCEL_OVERRIDE, + message_id=MsgIds.MSG_ID_DG_ACCEL_OVERRIDE.value, payload=payload) self.logger.debug("override DG accelerometer axis magnitude") @@ -181,7 +181,7 @@ payload = rst + sta + idx message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_ACCEL_MAX_OVERRIDE, + message_id=MsgIds.MSG_ID_DG_ACCEL_MAX_OVERRIDE.value, payload=payload) self.logger.debug("override DG accelerometer axis maximum magnitude") @@ -220,7 +220,7 @@ payload = rst + mis message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_ACCEL_SEND_INTERVAL_OVERRIDE, + message_id=MsgIds.MSG_ID_DG_ACCEL_SEND_INTERVAL_OVERRIDE.value, payload=payload) self.logger.debug("override DG accelerometer broadcast interval") @@ -258,7 +258,7 @@ payload = x + y + z message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_ACCEL_SET_CALIBRATION, + message_id=MsgIds.MSG_ID_DG_ACCEL_SET_CALIBRATION.value, payload=payload) self.logger.debug("Setting DG accelerometer axis calibration offsets") Index: dialin/dg/conductivity_sensors.py =================================================================== diff -u -r9fed7e633ffc4cf92a93e22ccff7d5aa078801ce -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/dg/conductivity_sensors.py (.../conductivity_sensors.py) (revision 9fed7e633ffc4cf92a93e22ccff7d5aa078801ce) +++ dialin/dg/conductivity_sensors.py (.../conductivity_sensors.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -41,7 +41,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DG_CONDUCTIVITY_DATA + msg_id = MsgIds.MSG_ID_DG_CONDUCTIVITY_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_conductivity_sensors_sync) @@ -103,7 +103,7 @@ payload = reset_byte_array + cond_byte_array + sensor_byte_array message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_CONDUCTIVITY_OVERRIDE, + message_id=MsgIds.MSG_ID_CONDUCTIVITY_OVERRIDE.value, payload=payload) if reset == RESET: @@ -137,7 +137,7 @@ payload = reset_byte_array + ms_byte_array message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE, + message_id=MsgIds.MSG_ID_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE.value, payload=payload) self.logger.debug("override DG conductivity sensor broadcast interval") Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r9fed7e633ffc4cf92a93e22ccff7d5aa078801ce -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 9fed7e633ffc4cf92a93e22ccff7d5aa078801ce) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -110,11 +110,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_OPERATION_MODE_BROADCAST + msg_id = MsgIds.MSG_ID_DG_OPERATION_MODE_BROADCAST.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_DG_VERSION_RESPONSE, + MsgIds.MSG_ID_DG_DG_VERSION_RESPONSE.value, self._handler_dg_version) # initialize variables that will be populated by DG version response @@ -232,7 +232,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_LOGIN_TO_DG, + message_id=MsgIds.MSG_ID_LOGIN_TO_DG.value, payload=list(map(int, map(ord, self.DG_LOGIN_PASSWORD)))) self.logger.info("Logging in to the DG...") @@ -257,7 +257,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_REQUEST_DG_VERSION) + message_id=MsgIds.MSG_ID_DG_REQUEST_DG_VERSION.value) self.logger.debug("Sending Dialin request for version to DG") @@ -273,7 +273,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE) + message_id=MsgIds.MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE.value) self.logger.debug("overriding DG safety shutdown") @@ -303,7 +303,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=self.MSG_ID_DG_SOFTWARE_RESET_REQUEST) + message_id=MsgIds.MSG_ID_DG_SOFTWARE_RESET_REQUEST.value) self.logger.debug("requesting DG software reset") Index: dialin/dg/drain_pump.py =================================================================== diff -u -r9fed7e633ffc4cf92a93e22ccff7d5aa078801ce -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/dg/drain_pump.py (.../drain_pump.py) (revision 9fed7e633ffc4cf92a93e22ccff7d5aa078801ce) +++ dialin/dg/drain_pump.py (.../drain_pump.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -39,7 +39,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DG_DRAIN_PUMP_PUBLISHED_DATA + msg_id = MsgIds.MSG_ID_DG_DRAIN_PUMP_PUBLISHED_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_drain_pump_sync) @@ -95,7 +95,7 @@ payload = rst + spd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_DRAIN_PUMP_SET_SPEED_OVERRIDE, + message_id=MsgIds.MSG_ID_DG_DRAIN_PUMP_SET_SPEED_OVERRIDE.value, payload=payload) self.logger.debug("override drain pump speed set point") @@ -135,7 +135,7 @@ payload = rst + mis message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_DRAIN_PUMP_BROADAST_INTERVAL_OVERRIDE, + message_id=MsgIds.MSG_ID_DG_DRAIN_PUMP_BROADAST_INTERVAL_OVERRIDE.value, payload=payload) self.logger.debug("override drain pump data broadcast interval") Index: dialin/dg/hd_proxy.py =================================================================== diff -u -r9fed7e633ffc4cf92a93e22ccff7d5aa078801ce -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/dg/hd_proxy.py (.../hd_proxy.py) (revision 9fed7e633ffc4cf92a93e22ccff7d5aa078801ce) +++ dialin/dg/hd_proxy.py (.../hd_proxy.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -60,7 +60,7 @@ payload = res message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_HD_SWITCH_RESERVOIRS_CMD, + message_id=MsgIds.MSG_ID_HD_SWITCH_RESERVOIRS_CMD.value, payload=payload) self.logger.debug("switch reservoirs cmd sent to DG") @@ -91,7 +91,7 @@ payload = vol message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_HD_FILL_CMD, + message_id=MsgIds.MSG_ID_HD_FILL_CMD.value, payload=payload) self.logger.debug("fill cmd sent to DG") @@ -122,7 +122,7 @@ payload = vol message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_HD_DRAIN_CMD, + message_id=MsgIds.MSG_ID_HD_DRAIN_CMD.value, payload=payload) self.logger.debug("drain cmd sent to DG") @@ -158,7 +158,7 @@ payload = integer_to_bytearray(cmd) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_HD_START_STOP_DG_CMD, + message_id=MsgIds.MSG_ID_HD_START_STOP_DG_CMD.value, payload=payload) self.logger.debug(str+"DG cmd sent to DG") @@ -191,7 +191,7 @@ payload = integer_to_bytearray(cmd) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_HD_START_STOP_DG_TRIMMER_HEATER, + message_id=MsgIds.MSG_ID_HD_START_STOP_DG_TRIMMER_HEATER.value, payload=payload) self.logger.debug(str+"DG trimmer heater cmd sent to DG") @@ -218,7 +218,7 @@ # 1 is to start payload = integer_to_bytearray(1) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_START_STOP_HEAT_DISINFECT, + message_id=MsgIds.MSG_ID_DG_START_STOP_HEAT_DISINFECT.value, payload=payload) print("Starting heat disinfection process") received_message = self.can_interface.send(message) @@ -234,7 +234,7 @@ # 1 is to start payload = integer_to_bytearray(0) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_START_STOP_HEAT_DISINFECT, + message_id=MsgIds.MSG_ID_DG_START_STOP_HEAT_DISINFECT.value, payload=payload) print("Stopping heat disinfection process") received_message = self.can_interface.send(message) @@ -248,7 +248,7 @@ # 0 is to stop payload = integer_to_bytearray(0) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_HD_START_STOP_DG_TRIMMER_HEATER, + message_id=MsgIds.MSG_ID_HD_START_STOP_DG_TRIMMER_HEATER.value, payload=payload) print("Stopping heat disinfection process") self.can_interface.send(message, 0) \ No newline at end of file Index: dialin/dg/heaters.py =================================================================== diff -u -r9fed7e633ffc4cf92a93e22ccff7d5aa078801ce -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/dg/heaters.py (.../heaters.py) (revision 9fed7e633ffc4cf92a93e22ccff7d5aa078801ce) +++ dialin/dg/heaters.py (.../heaters.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -38,7 +38,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DG_HEATERS_DATA + msg_id = MsgIds.MSG_ID_DG_HEATERS_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_heaters_sync) @_publish(["main_primary_heater_pwm", "small_primary_heater_pwm", "trimmer_heater_pwm"]) @@ -72,7 +72,7 @@ # 1 is to start the primary heater payload = integer_to_bytearray(1) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_START_STOP_PRIMARY_HEATER, + message_id=MsgIds.MSG_ID_START_STOP_PRIMARY_HEATER.value, payload=payload) self.logger.debug("Starting the Primary heater") self.can_interface.send(message, 0) @@ -86,7 +86,7 @@ # 0 is to stop the primary heater payload = integer_to_bytearray(0) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_START_STOP_PRIMARY_HEATER, + message_id=MsgIds.MSG_ID_START_STOP_PRIMARY_HEATER.value, payload=payload) self.logger.debug("Stopping the Primary heater") self.can_interface.send(message, 0) @@ -102,7 +102,7 @@ # 1 is to start the primary heater payload = integer_to_bytearray(1) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD, + message_id=MsgIds.MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD.value, payload=payload) self.logger.debug("Starting the Trimmer heater") self.can_interface.send(message, 0) @@ -116,7 +116,7 @@ # 1 is to start the primary heater payload = integer_to_bytearray(0) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD, + message_id=MsgIds.MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD.value, payload=payload) self.logger.debug("Stopping the Trimmer heater") self.can_interface.send(message, 0) @@ -133,7 +133,7 @@ trimmer_target = float_to_bytearray(trimmer_target_temp) payload = primary_target + trimmer_target message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS, + message_id=MsgIds.MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS.value, payload=payload) self.logger.debug("Setting Primary Heater to {} C and Trimmer Heater to {} C".format(pirmary_target_temp, trimmer_target_temp)) self.can_interface.send(message, 0) @@ -154,7 +154,7 @@ payload = resetValue + intervalValue message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_HEATERS_PUBLISH_INTERVAL_ORVERRIDE, + message_id=MsgIds.MSG_ID_HEATERS_PUBLISH_INTERVAL_ORVERRIDE.value, payload=payload) self.logger.debug("Sending {} ms publish interval to the Heaters module".format(ms)) Index: dialin/dg/load_cells.py =================================================================== diff -u -r9fed7e633ffc4cf92a93e22ccff7d5aa078801ce -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/dg/load_cells.py (.../load_cells.py) (revision 9fed7e633ffc4cf92a93e22ccff7d5aa078801ce) +++ dialin/dg/load_cells.py (.../load_cells.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -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_LOAD_CELL_DATA + msg_id = MsgIds.MSG_ID_DG_LOAD_CELL_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_load_cells_sync) @@ -113,7 +113,7 @@ payload = rst + grm + idx message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_LOAD_CELL_OVERRIDE, + message_id=MsgIds.MSG_ID_DG_LOAD_CELL_OVERRIDE.value, payload=payload) self.logger.debug("override load cell weight value for sensor " + str(sensor)) @@ -146,7 +146,7 @@ payload = rst + mis message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_LOAD_CELL_DATA_BROADCAST_INTERVAL_OVERRIDE, + message_id=MsgIds.MSG_ID_DG_LOAD_CELL_DATA_BROADCAST_INTERVAL_OVERRIDE.value, payload=payload) self.logger.debug("override DG load cell broadcast interval") Index: dialin/dg/pressures.py =================================================================== diff -u -r9fed7e633ffc4cf92a93e22ccff7d5aa078801ce -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/dg/pressures.py (.../pressures.py) (revision 9fed7e633ffc4cf92a93e22ccff7d5aa078801ce) +++ dialin/dg/pressures.py (.../pressures.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -46,7 +46,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DG_PRESSURES_DATA + msg_id = MsgIds.MSG_ID_DG_PRESSURES_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_pressures_sync) @@ -120,7 +120,7 @@ payload = rst + prs + idx message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_PRESSURE_OVERRIDE, + message_id=MsgIds.MSG_ID_DG_PRESSURE_OVERRIDE.value, payload=payload) self.logger.debug("override pressure sensor") @@ -154,7 +154,7 @@ payload = rst + ivl message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_PRESSURE_DATA_BROADCAST_INTERVAL_OVERRIDE, + message_id=MsgIds.MSG_ID_DG_PRESSURE_DATA_BROADCAST_INTERVAL_OVERRIDE.value, payload=payload) self.logger.debug("override pressure data broadcast interval") Index: dialin/dg/reservoirs.py =================================================================== diff -u -r9fed7e633ffc4cf92a93e22ccff7d5aa078801ce -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/dg/reservoirs.py (.../reservoirs.py) (revision 9fed7e633ffc4cf92a93e22ccff7d5aa078801ce) +++ dialin/dg/reservoirs.py (.../reservoirs.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -42,7 +42,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DG_RESERVOIR_DATA + msg_id = MsgIds.MSG_ID_DG_RESERVOIR_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_reservoirs_sync) Index: dialin/dg/ro_pump.py =================================================================== diff -u -r9fed7e633ffc4cf92a93e22ccff7d5aa078801ce -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/dg/ro_pump.py (.../ro_pump.py) (revision 9fed7e633ffc4cf92a93e22ccff7d5aa078801ce) +++ dialin/dg/ro_pump.py (.../ro_pump.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -45,7 +45,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DG_RO_PUMP_PUBLISHED_DATA + msg_id = MsgIds.MSG_ID_DG_RO_PUMP_PUBLISHED_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_ro_pump_sync) @@ -133,7 +133,7 @@ payload = rst + prs message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_RO_PUMP_SET_PT_OVERRIDE, + message_id=MsgIds.MSG_ID_RO_PUMP_SET_PT_OVERRIDE.value, payload=payload) self.logger.debug("override RO pump pressure set point") @@ -173,7 +173,7 @@ payload = rst + flo message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_RO_PUMP_SET_PT_OVERRIDE, + message_id=MsgIds.MSG_ID_RO_PUMP_SET_PT_OVERRIDE.value, payload=payload) self.logger.debug("override RO pump pressure set point") @@ -214,7 +214,7 @@ payload = rst + mis message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_RO_PUMP_BROADCAST_INTERVAL_OVERRIDE, + message_id=MsgIds.MSG_ID_DG_RO_PUMP_BROADCAST_INTERVAL_OVERRIDE.value, payload=payload) self.logger.debug("override RO pump data broadcast interval") Index: dialin/dg/temperature_sensors.py =================================================================== diff -u -r9fed7e633ffc4cf92a93e22ccff7d5aa078801ce -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/dg/temperature_sensors.py (.../temperature_sensors.py) (revision 9fed7e633ffc4cf92a93e22ccff7d5aa078801ce) +++ dialin/dg/temperature_sensors.py (.../temperature_sensors.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -62,7 +62,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DG_TEMPERATURE_DATA + msg_id = MsgIds.MSG_ID_DG_TEMPERATURE_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_temperature_sensors_sync) @_publish(["inlet_primary", "outlet_primary", "cd1", "cd2","outlet_redundancy", "inlet_dialysate", "primary_tc", @@ -138,7 +138,7 @@ payload = reset_value + interval_value message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_TEMPERATURE_SENSORS_PUBLISH_INTERVAL_OVERRIDE, + message_id=MsgIds.MSG_ID_TEMPERATURE_SENSORS_PUBLISH_INTERVAL_OVERRIDE.value, payload=payload) self.logger.debug("Sending {} ms publish interval to the Temperature Sensors module".format(ms)) @@ -185,7 +185,7 @@ payload = rst + value + index message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_TEMPERATURE_SENSORS_VALUE_OVERRIDE, + message_id=MsgIds.MSG_ID_TEMPERATURE_SENSORS_VALUE_OVERRIDE.value, payload=payload) self.logger.debug("Setting sensor {} to {} C".format(sensor_index, sensor_value)) Index: dialin/dg/valves.py =================================================================== diff -u -r9fed7e633ffc4cf92a93e22ccff7d5aa078801ce -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/dg/valves.py (.../valves.py) (revision 9fed7e633ffc4cf92a93e22ccff7d5aa078801ce) +++ dialin/dg/valves.py (.../valves.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -63,7 +63,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DG_VALVES_STATES + msg_id = MsgIds.MSG_ID_DG_VALVES_STATES.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_valves_sync) self.valve_states_all = 0x0000 @@ -254,7 +254,7 @@ payload = rst + ste + vlv message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_VALVE_STATE_OVERRIDE, + message_id=MsgIds.MSG_ID_DG_VALVE_STATE_OVERRIDE.value, payload=payload) self.logger.debug("override valve state") @@ -288,7 +288,7 @@ payload = rst + ivl message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE, + message_id=MsgIds.MSG_ID_DG_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE.value, payload=payload) self.logger.debug("override valves states publish interval") Index: dialin/hd/accelerometer.py =================================================================== diff -u -r65277463eda63686c6132b6716aaa997b6df1861 -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/hd/accelerometer.py (.../accelerometer.py) (revision 65277463eda63686c6132b6716aaa997b6df1861) +++ dialin/hd/accelerometer.py (.../accelerometer.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -56,7 +56,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.hd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_HD_ACCELEROMETER_DATA + msg_id = MsgIds.MSG_ID_HD_ACCELEROMETER_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_accelerometer_sync) @@ -141,7 +141,7 @@ payload = rst + sta + idx message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_ACCEL_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_ACCEL_OVERRIDE.value, payload=payload) self.logger.debug("override HD accelerometer axis magnitude") @@ -181,7 +181,7 @@ payload = rst + sta + idx message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_ACCEL_MAX_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_ACCEL_MAX_OVERRIDE.value, payload=payload) self.logger.debug("override HD accelerometer axis maximum magnitude") @@ -220,7 +220,7 @@ payload = rst + mis message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_ACCEL_SEND_INTERVAL_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_ACCEL_SEND_INTERVAL_OVERRIDE.value, payload=payload) self.logger.debug("override HD accelerometer broadcast interval") @@ -258,7 +258,7 @@ payload = x + y + z message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_ACCEL_SET_CALIBRATION, + message_id=MsgIds.MSG_ID_HD_ACCEL_SET_CALIBRATION.value, payload=payload) self.logger.debug("Setting HD accelerometer axis calibration offsets") Index: dialin/hd/alarms.py =================================================================== diff -u -r9fed7e633ffc4cf92a93e22ccff7d5aa078801ce -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/hd/alarms.py (.../alarms.py) (revision 9fed7e633ffc4cf92a93e22ccff7d5aa078801ce) +++ dialin/hd/alarms.py (.../alarms.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -70,16 +70,16 @@ if self.can_interface is not None: channel_id = DenaliChannels.hd_alarm_broadcast_ch_id - msg_id = MsgIds.MSG_ID_ALARM_STATUS + msg_id = MsgIds.MSG_ID_ALARM_STATUS.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_alarms_status_sync) channel_id = DenaliChannels.hd_alarm_broadcast_ch_id - msg_id = MsgIds.MSG_ID_ALARM_TRIGGERED + msg_id = MsgIds.MSG_ID_ALARM_TRIGGERED.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_alarm_activate) channel_id = DenaliChannels.hd_alarm_broadcast_ch_id - msg_id = MsgIds.MSG_ID_ALARM_CLEARED + msg_id = MsgIds.MSG_ID_ALARM_CLEARED.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_alarm_clear) @@ -237,7 +237,7 @@ payload = rst + sta + alm message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_ALARM_STATE_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_ALARM_STATE_OVERRIDE.value, payload=payload) # Send message @@ -273,7 +273,7 @@ payload = rst + ms + alm message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_ALARM_TIME_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_ALARM_TIME_OVERRIDE.value, payload=payload) self.logger.debug("override alarm time since activated") @@ -321,7 +321,7 @@ payload = rst + pat message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_ALARM_LAMP_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_ALARM_LAMP_OVERRIDE.value, payload=payload) self.logger.debug("Override Alarm Lamp Pattern") Index: dialin/hd/blood_flow.py =================================================================== diff -u -rd2024aeddcff9b4ac0040fd92a9c95d65708c643 -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/hd/blood_flow.py (.../blood_flow.py) (revision d2024aeddcff9b4ac0040fd92a9c95d65708c643) +++ dialin/hd/blood_flow.py (.../blood_flow.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -176,7 +176,7 @@ payload = rst + flo + mod message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_BLOOD_FLOW_SET_RATE_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_BLOOD_FLOW_SET_RATE_OVERRIDE.value, payload=payload) self.logger.debug("override blood flow set point") @@ -220,7 +220,7 @@ payload = rst + flo message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_BLOOD_FLOW_MEAS_RATE_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_BLOOD_FLOW_MEAS_RATE_OVERRIDE.value, payload=payload) self.logger.debug("override measured blood flow") @@ -260,7 +260,7 @@ payload = rst + spd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE.value, payload=payload) self.logger.debug("override measured blood pump motor controller speed") @@ -299,7 +299,7 @@ payload = rst + cur message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_BLOOD_PUMP_MC_MEAS_CURRENT_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_BLOOD_PUMP_MC_MEAS_CURRENT_OVERRIDE.value, payload=payload) self.logger.debug("override measured blood pump motor controller current") @@ -339,7 +339,7 @@ payload = rst + spd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_BLOOD_PUMP_MEAS_SPEED_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_BLOOD_PUMP_MEAS_SPEED_OVERRIDE.value, payload=payload) self.logger.debug("override measured blood pump speed") @@ -379,7 +379,7 @@ payload = rst + spd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_BLOOD_PUMP_ROTOR_MEAS_SPEED_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_BLOOD_PUMP_ROTOR_MEAS_SPEED_OVERRIDE.value, payload=payload) self.logger.debug("override measured blood pump rotor speed") @@ -419,7 +419,7 @@ payload = rst + sig message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_BLOOD_FLOW_SIG_STRENGTH_OVERRIDE, + message_id=MsgIds.MSG_ID_BLOOD_FLOW_SIG_STRENGTH_OVERRIDE.value, payload=payload) self.logger.debug("override measured blood flow signal strength") @@ -459,7 +459,7 @@ payload = rst + mis message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_BLOOD_FLOW_PUBLISH_INTERVAL_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_BLOOD_FLOW_PUBLISH_INTERVAL_OVERRIDE.value, payload=payload) self.logger.debug("override blood flow broadcast interval") @@ -493,7 +493,7 @@ payload = gan + off message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_BLOOD_FLOW_SET_CALIBRATION, + message_id=MsgIds.MSG_ID_HD_BLOOD_FLOW_SET_CALIBRATION.value, payload=payload) self.logger.debug("Setting blood flow calibration factors") @@ -521,7 +521,7 @@ @return: 1 if successful, zero otherwise """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_BLOOD_PUMP_HOME_CMD) + message_id=MsgIds.MSG_ID_BLOOD_PUMP_HOME_CMD.value) self.logger.debug("Homing blood pump") Index: dialin/hd/buttons.py =================================================================== diff -u -r9fed7e633ffc4cf92a93e22ccff7d5aa078801ce -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/hd/buttons.py (.../buttons.py) (revision 9fed7e633ffc4cf92a93e22ccff7d5aa078801ce) +++ dialin/hd/buttons.py (.../buttons.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -49,7 +49,7 @@ if self.can_interface is not None: self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, - MsgIds.MSG_ID_OFF_BUTTON_PRESS, + MsgIds.MSG_ID_OFF_BUTTON_PRESS.value, self._handler_poweroff_timeout_occurred) def get_power_timeout_expired(self): @@ -106,7 +106,7 @@ payload = rst + sta message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_OFF_BUTTON_STATE_OVERRIDE, + message_id=MsgIds.MSG_ID_OFF_BUTTON_STATE_OVERRIDE.value, payload=payload) self.logger.debug("override off button") @@ -147,7 +147,7 @@ payload = rst + sta message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_STOP_BUTTON_STATE_OVERRIDE, + message_id=MsgIds.MSG_ID_STOP_BUTTON_STATE_OVERRIDE.value, payload=payload) self.logger.debug("override stop button") Index: dialin/hd/dialysate_inlet_flow.py =================================================================== diff -u -rb62ee933b0d480b0066778fac516abfb81e0739f -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/hd/dialysate_inlet_flow.py (.../dialysate_inlet_flow.py) (revision b62ee933b0d480b0066778fac516abfb81e0739f) +++ dialin/hd/dialysate_inlet_flow.py (.../dialysate_inlet_flow.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -183,7 +183,7 @@ payload = rst + flo + mod message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_DIAL_IN_FLOW_SET_RATE_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_DIAL_IN_FLOW_SET_RATE_OVERRIDE.value, payload=payload) self.logger.debug("override dialysate flow set point") @@ -227,7 +227,7 @@ payload = rst + flo message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_DIAL_IN_FLOW_MEAS_RATE_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_DIAL_IN_FLOW_MEAS_RATE_OVERRIDE.value, payload=payload) self.logger.debug("override measured dialysate flow") @@ -267,7 +267,7 @@ payload = rst + spd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_DIAL_IN_PUMP_MC_MEAS_SPEED_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_DIAL_IN_PUMP_MC_MEAS_SPEED_OVERRIDE.value, payload=payload) self.logger.debug("override measured dialysate inlet pump motor controller speed") @@ -306,7 +306,7 @@ payload = rst + cur message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_DIAL_IN_PUMP_MC_MEAS_CURRENT_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_DIAL_IN_PUMP_MC_MEAS_CURRENT_OVERRIDE.value, payload=payload) self.logger.debug("override measured dialysate inlet pump motor controller current") @@ -346,7 +346,7 @@ payload = rst + spd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_DIAL_IN_PUMP_MEAS_SPEED_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_DIAL_IN_PUMP_MEAS_SPEED_OVERRIDE.value, payload=payload) self.logger.debug("override measured dialysate inlet pump speed") @@ -386,7 +386,7 @@ payload = rst + spd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_DIAL_IN_PUMP_ROTOR_MEAS_SPEED_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_DIAL_IN_PUMP_ROTOR_MEAS_SPEED_OVERRIDE.value, payload=payload) self.logger.debug("override measured dialysate inlet pump rotor speed") @@ -426,7 +426,7 @@ payload = rst + sig message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_DIAL_IN_FLOW_SIG_STRENGTH_OVERRIDE, + message_id=MsgIds.MSG_ID_DIAL_IN_FLOW_SIG_STRENGTH_OVERRIDE.value, payload=payload) self.logger.debug("override measured dialysate flow signal strength") @@ -466,7 +466,7 @@ payload = rst + mis message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_DIAL_IN_FLOW_PUBLISH_INTERVAL_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_DIAL_IN_FLOW_PUBLISH_INTERVAL_OVERRIDE.value, payload=payload) self.logger.debug("override dialysate inlet flow broadcast interval") @@ -499,7 +499,7 @@ payload = gan + off message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_DIAL_IN_FLOW_SET_CALIBRATION, + message_id=MsgIds.MSG_ID_HD_DIAL_IN_FLOW_SET_CALIBRATION.value, payload=payload) self.logger.debug("Setting dialysate flow calibration factors") @@ -528,7 +528,7 @@ @return: 1 if successful, zero otherwise """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_BLOOD_PUMP_HOME_CMD) + message_id=MsgIds.MSG_ID_BLOOD_PUMP_HOME_CMD.value) self.logger.debug("Homing dialysate inlet pump") Index: dialin/hd/dialysate_outlet_flow.py =================================================================== diff -u -rd2024aeddcff9b4ac0040fd92a9c95d65708c643 -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision d2024aeddcff9b4ac0040fd92a9c95d65708c643) +++ dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -166,7 +166,7 @@ payload = rst + flo + mod message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_DIAL_OUT_FLOW_SET_RATE_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_DIAL_OUT_FLOW_SET_RATE_OVERRIDE.value, payload=payload) print("override dialysate outlet pump set point") @@ -210,7 +210,7 @@ payload = rst + vol message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_DIAL_OUT_UF_REF_VOLUME_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_DIAL_OUT_UF_REF_VOLUME_OVERRIDE.value, payload=payload) self.logger.debug("override UF reference volume with " + str(refvol) + "mL.") @@ -250,7 +250,7 @@ payload = rst + vol message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_DIAL_OUT_UF_MEAS_VOLUME_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_DIAL_OUT_UF_MEAS_VOLUME_OVERRIDE.value, payload=payload) self.logger.debug("override measured UF volume with " + str(measvol) + " mL.") @@ -290,7 +290,7 @@ payload = rst + spd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_DIAL_OUT_PUMP_MC_MEAS_SPEED_OVERRIDE, + message_id=MsgIds.MSG_ID_DIAL_OUT_PUMP_MC_MEAS_SPEED_OVERRIDE.value, payload=payload) self.logger.debug("override measured dialysate outlet pump motor controller speed to " + str(spd) + " RPM.") @@ -329,7 +329,7 @@ payload = rst + cur message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_DIAL_OUT_PUMP_MC_MEAS_CURRENT_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_DIAL_OUT_PUMP_MC_MEAS_CURRENT_OVERRIDE.value, payload=payload) self.logger.debug("override measured dialysate outlet pump motor controller current") @@ -369,7 +369,7 @@ payload = rst + spd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_DIAL_OUT_PUMP_MEAS_SPEED_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_DIAL_OUT_PUMP_MEAS_SPEED_OVERRIDE.value, payload=payload) self.logger.debug("override measured dialysate outlet pump speed to " + str(speed) + " RPM.") @@ -409,7 +409,7 @@ payload = rst + spd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_DIAL_OUT_PUMP_ROTOR_MEAS_SPEED_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_DIAL_OUT_PUMP_ROTOR_MEAS_SPEED_OVERRIDE.value, payload=payload) self.logger.debug("override measured dialysate outlet pump rotor speed to " + str(speed) + " RPM.") @@ -449,7 +449,7 @@ payload = rst + mis message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_DIAL_OUT_FLOW_PUBLISH_INTERVAL_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_DIAL_OUT_FLOW_PUBLISH_INTERVAL_OVERRIDE.value, payload=payload) self.logger.debug("override dialysate outlet flow broadcast interval to " + str(ms) + " ms.") @@ -497,7 +497,7 @@ payload = rst + spd + sen message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_DIAL_OUT_LOAD_CELL_WEIGHT_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_DIAL_OUT_LOAD_CELL_WEIGHT_OVERRIDE.value, payload=payload) self.logger.debug("override measured load cell weight to " + str(weight) + " grams for load cell # " + str(sensor)) @@ -538,7 +538,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, + message_id=MsgIds.MSG_ID_LOAD_CELL_READINGS.value, payload=payload) self.logger.debug("measured load cell weights set.") @@ -558,7 +558,7 @@ @return: 1 if successful, zero otherwise """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_BLOOD_PUMP_HOME_CMD) + message_id=MsgIds.MSG_ID_BLOOD_PUMP_HOME_CMD.value) self.logger.debug("Homing dialysate outlet pump") Index: dialin/hd/pressure_occlusion.py =================================================================== diff -u -r9fed7e633ffc4cf92a93e22ccff7d5aa078801ce -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision 9fed7e633ffc4cf92a93e22ccff7d5aa078801ce) +++ dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -137,7 +137,7 @@ payload = rst + prs message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_PRESSURE_ARTERIAL_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_PRESSURE_ARTERIAL_OVERRIDE.value, payload=payload) self.logger.debug("override measured arterial pressure") @@ -176,7 +176,7 @@ payload = rst + prs message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_PRESSURE_VENOUS_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_PRESSURE_VENOUS_OVERRIDE.value, payload=payload) self.logger.debug("override measured venous pressure") @@ -214,7 +214,7 @@ payload = rst + occ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_OCCLUSION_BLOOD_PUMP_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_OCCLUSION_BLOOD_PUMP_OVERRIDE.value, payload=payload) self.logger.debug("override measured blood pump occlusion pressure") @@ -253,7 +253,7 @@ payload = rst + occ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_OCCLUSION_DIAL_IN_PUMP_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_OCCLUSION_DIAL_IN_PUMP_OVERRIDE.value, payload=payload) self.logger.debug("override measured dialysate inlet pump occlusion pressure") @@ -292,7 +292,7 @@ payload = rst + occ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_OCCLUSION_DIAL_OUT_PUMP_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_OCCLUSION_DIAL_OUT_PUMP_OVERRIDE.value, payload=payload) self.logger.debug("override measured dialysate outlet pump occlusion pressure") @@ -331,7 +331,7 @@ payload = rst + mis message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_PRES_OCCL_SEND_INTERVAL_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_PRES_OCCL_SEND_INTERVAL_OVERRIDE.value, payload=payload) self.logger.debug("override pressure/occlusion broadcast interval") Index: dialin/hd/treatment.py =================================================================== diff -u -r9fed7e633ffc4cf92a93e22ccff7d5aa078801ce -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/hd/treatment.py (.../treatment.py) (revision 9fed7e633ffc4cf92a93e22ccff7d5aa078801ce) +++ dialin/hd/treatment.py (.../treatment.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -273,7 +273,7 @@ payload = par + flo message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER, + message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, payload=payload) print("setting blood flow rate") @@ -311,7 +311,7 @@ payload = par + flo message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER, + message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, payload=payload) print("setting dialysate flow rate") @@ -347,7 +347,7 @@ payload = par + dur message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER, + message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, payload=payload) print("setting treatment duration") @@ -383,7 +383,7 @@ payload = par + sto message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER, + message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, payload=payload) print("setting Heparin pre-stop time") @@ -419,7 +419,7 @@ payload = par + vol message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER, + message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, payload=payload) print("setting saline bolus volume") @@ -458,7 +458,7 @@ payload = par + acd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER, + message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, payload=payload) print("setting acid concentrate parameter") @@ -495,7 +495,7 @@ payload = par + bic message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER, + message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, payload=payload) print("setting bicarbonate concentrate parameter") @@ -535,7 +535,7 @@ payload = par + dia message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER, + message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, payload=payload) print("setting dialyzer type parameter") @@ -571,7 +571,7 @@ payload = par + bpi message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER, + message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, payload=payload) print("setting BP measurement interval parameter") @@ -607,7 +607,7 @@ payload = par + flo message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER, + message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, payload=payload) print("setting rinseback flow rate parameter") @@ -643,7 +643,7 @@ payload = par + pre message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER, + message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, payload=payload) print("setting arterial pressure lower alarm limit parameter") @@ -679,7 +679,7 @@ payload = par + pre message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER, + message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, payload=payload) print("setting arterial pressure upper alarm limit parameter") @@ -715,7 +715,7 @@ payload = par + pre message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER, + message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, payload=payload) print("setting venous pressure lower alarm limit parameter") @@ -751,7 +751,7 @@ payload = par + pre message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER, + message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, payload=payload) print("setting venous pressure upper alarm limit parameter") @@ -787,7 +787,7 @@ payload = par + rat message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER, + message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, payload=payload) print("setting Heparin dispense rate parameter") @@ -823,7 +823,7 @@ payload = par + vol message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER, + message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, payload=payload) print("setting Heparin bolus volume parameter") @@ -859,7 +859,7 @@ payload = par + tmp message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER, + message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, payload=payload) print("setting dialysate temperature parameter") @@ -895,7 +895,7 @@ payload = par + vol message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER, + message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, payload=payload) print("setting ultrafiltration volume parameter") Index: dialin/hd/ui_proxy.py =================================================================== diff -u -r9fed7e633ffc4cf92a93e22ccff7d5aa078801ce -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 9fed7e633ffc4cf92a93e22ccff7d5aa078801ce) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) @@ -81,24 +81,24 @@ if self.can_interface is not None: channel_id = DenaliChannels.hd_to_ui_ch_id self.can_interface.register_receiving_publication_function(channel_id, - MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_RESPONSE, + MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_RESPONSE.value, self._handler_uf_change_response) self.can_interface.register_receiving_publication_function(channel_id, - MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE, + MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE.value, self._handler_uf_change_confirm_response) self.can_interface.register_receiving_publication_function(channel_id, - MsgIds.MSG_ID_USER_TREATMENT_TIME_CHANGE_RESPONSE, + MsgIds.MSG_ID_USER_TREATMENT_TIME_CHANGE_RESPONSE.value, self._handler_treatment_duration_change_response) self.can_interface.register_receiving_publication_function(channel_id, - MsgIds.MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_RESPONSE, + 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, + self.can_interface.register_receiving_publication_function(channel_id, MsgIds.MSG_ID_TREATMENT_PARAM_CHANGE_RANGES.value, self._handler_treatment_param_ranges) - self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, MsgIds.MSG_ID_HD_VERSION, + self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, MsgIds.MSG_ID_HD_VERSION.value, self._handler_hd_version) - self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, MsgIds.MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE, + 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) - self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, MsgIds.MSG_ID_USER_SALINE_BOLUS_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) # initialize variables that will be populated by HD version response @@ -762,7 +762,8 @@ self.saline_bolus_request_succeeded = True else: self.saline_bolus_request_succeeded = False - self.saline_bolus_request_reject_reason = rea[0] + if RequestRejectReasons.has_value(rea[0]): + self.saline_bolus_request_reject_reason = RequestRejectReasons(rea[0]) self.saline_bolus_request_bolus_volume = vol[0] @_publish([ @@ -793,7 +794,8 @@ message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4])) self.duration_change_succeeded = rsp[0] - self.duration_change_reject_reason = rea[0] + if RequestRejectReasons.has_value(rea[0]): + self.duration_change_reject_reason = RequestRejectReasons(rea[0]) self.duration_change_time_min = tim[0] self.duration_change_uf_vol_ml = vol[0] @@ -829,7 +831,8 @@ else: resp = True self.blood_and_dialysate_flow_rate_change_succeeded = resp - self.blood_and_dialysate_flow_rate_change_reject_reason = rea[0] + if RequestRejectReasons.has_value(rea[0]): + self.blood_and_dialysate_flow_rate_change_reject_reason = RequestRejectReasons(rea[0]) self.target_blood_flow_rate = bld[0] self.target_dialysate_flow_rate = dil[0] @@ -879,7 +882,8 @@ else: resp = True self.uf_change_succeeded = resp - self.uf_change_reject_reason = rea[0] + if RequestRejectReasons.has_value(rea[0]): + self.uf_change_reject_reason = RequestRejectReasons(rea[0]) self.uf_change_volume_ml = vol[0] #/ self.LITER_TO_ML_CONVERSION_FACTOR @@ -924,7 +928,8 @@ else: resp = True self.uf_change_succeeded = resp - self.uf_change_reject_reason = rea[0] + if RequestRejectReasons.has_value(rea[0]): + self.uf_change_reject_reason = RequestRejectReasons(rea[0]) self.uf_change_volume_ml = vol[0] / self.LITER_TO_ML_CONVERSION_FACTOR self.uf_change_time_min = tim[0] self.uf_change_rate_ml_min = rat[0] @@ -937,7 +942,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_CHECK_IN) + message_id=MsgIds.MSG_ID_UI_CHECK_IN.value) self.logger.debug("Sending ui checkin w/ HD") @@ -952,7 +957,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_REQUEST_FW_VERSIONS) + message_id=MsgIds.MSG_ID_REQUEST_FW_VERSIONS.value) self.logger.debug("Sending ui request for version to HD") @@ -969,7 +974,7 @@ payload = integer_to_bytearray(cmd) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_USER_UF_PAUSE_RESUME_REQUEST, + message_id=MsgIds.MSG_ID_USER_UF_PAUSE_RESUME_REQUEST.value, payload=payload) if cmd == self.UF_CMD_PAUSE: @@ -996,7 +1001,7 @@ # build command message volume = float_to_bytearray(vol * self.LITER_TO_ML_CONVERSION_FACTOR) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_REQUEST, + message_id=MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_REQUEST.value, payload=volume) self.logger.debug("Sending UF settings change request.") @@ -1023,7 +1028,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, + message_id=MsgIds.MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE.value, payload=payload) self.logger.debug("Sending UF settings change request.") @@ -1043,7 +1048,7 @@ payload = integer_to_bytearray(time_min) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_USER_TREATMENT_TIME_CHANGE_REQUEST, + message_id=MsgIds.MSG_ID_USER_TREATMENT_TIME_CHANGE_REQUEST.value, payload=payload) self.logger.debug("Sending treatment duration setting change request.") @@ -1067,7 +1072,7 @@ dial = integer_to_bytearray(dial_flow) payload = bld + dial message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_REQUEST, + message_id=MsgIds.MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_REQUEST.value, payload=payload) self.logger.debug("Sending blood & dialysate flow rate settings change request.") @@ -1093,7 +1098,7 @@ cmd = integer_to_bytearray(cmnd) payload = cmd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_START_TREATMENT, + message_id=MsgIds.MSG_ID_UI_START_TREATMENT.value, payload=payload) self.logger.debug("Sending start treatment command request.") @@ -1168,7 +1173,7 @@ payload = bld+dia+dur+hps+sal+acc+bic+dzr+bpi+rbf+apl+aph+vpl+vph+hdr+hbv+tmp message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS, + message_id=MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS.value, payload=payload) self.logger.debug("Sending treatment parameters to HD.") @@ -1185,7 +1190,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS) + message_id=MsgIds.MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS.value) self.logger.debug("Sending confirm treatment parameters messge.")