Index: dialin/dg/alarms.py =================================================================== diff -u -r7536c3e8660b31ca142b2eb9cd0a76fba81d29fe -rf8387df23789b74fba26df353fb88a14b99de199 --- dialin/dg/alarms.py (.../alarms.py) (revision 7536c3e8660b31ca142b2eb9cd0a76fba81d29fe) +++ dialin/dg/alarms.py (.../alarms.py) (revision f8387df23789b74fba26df353fb88a14b99de199) @@ -53,12 +53,6 @@ # alarm states based on received DG alarm activation and alarm clear messages self.alarm_states = [False] * 500 - self.ids = OrderedDict() - for attr in dir(AlarmList): - if not callable(getattr(AlarmList, attr)) and attr.startswith("ALARM_ID"): - self.ids[attr] = getattr(AlarmList, attr) - self.ids = OrderedDict(sorted(self.ids.items(), key=lambda key: key[1].value)) - def get_alarm_states(self): """ Gets all states for all alarms @@ -75,14 +69,6 @@ """ return self.alarm_states[alarm_id] - def get_alarm_ids(self): - """ - Returns a dictionary of the alarm short name and the corresponding id - - @return: OrderedDict of the alarm ids - """ - return self.ids - @_publish(["alarm_states"]) def _handler_alarm_activate(self, message): """ Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r505662d5788dd84187626842552d58247de7a429 -rf8387df23789b74fba26df353fb88a14b99de199 --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 505662d5788dd84187626842552d58247de7a429) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision f8387df23789b74fba26df353fb88a14b99de199) @@ -111,11 +111,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.value + msg_id = MsgIds.MSG_ID_DG_OP_MODE.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.value, + MsgIds.MSG_ID_DG_VERSION.value, self._handler_dg_version) # initialize variables that will be populated by DG version response @@ -234,7 +234,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_LOGIN_TO_DG.value, + message_id=MsgIds.MSG_ID_DG_TESTER_LOGIN_REQUEST.value, payload=list(map(int, map(ord, self.DG_LOGIN_PASSWORD)))) self.logger.info("Logging in to the DG...") Index: dialin/dg/drain_pump.py =================================================================== diff -u -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -rf8387df23789b74fba26df353fb88a14b99de199 --- dialin/dg/drain_pump.py (.../drain_pump.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) +++ dialin/dg/drain_pump.py (.../drain_pump.py) (revision f8387df23789b74fba26df353fb88a14b99de199) @@ -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.value + msg_id = MsgIds.MSG_ID_DRAIN_PUMP_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.value, + message_id=MsgIds.MSG_ID_DRAIN_PUMP_SET_RPM_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.value, + message_id=MsgIds.MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE.value, payload=payload) self.logger.debug("override drain pump data broadcast interval") Index: dialin/dg/hd_proxy.py =================================================================== diff -u -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -rf8387df23789b74fba26df353fb88a14b99de199 --- dialin/dg/hd_proxy.py (.../hd_proxy.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) +++ dialin/dg/hd_proxy.py (.../hd_proxy.py) (revision f8387df23789b74fba26df353fb88a14b99de199) @@ -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.value, + message_id=MsgIds.MSG_ID_DG_SWITCH_RESERVOIR_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.value, + message_id=MsgIds.MSG_ID_DG_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.value, + message_id=MsgIds.MSG_ID_DG_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.value, + message_id=MsgIds.MSG_ID_STARTING_STOPPING_TREATMENT_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.value, + message_id=MsgIds.MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD.value, payload=payload) self.logger.debug(str+"DG trimmer heater cmd sent to DG") @@ -251,4 +251,4 @@ 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 + self.can_interface.send(message, 0) Index: dialin/dg/load_cells.py =================================================================== diff -u -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -rf8387df23789b74fba26df353fb88a14b99de199 --- dialin/dg/load_cells.py (.../load_cells.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) +++ dialin/dg/load_cells.py (.../load_cells.py) (revision f8387df23789b74fba26df353fb88a14b99de199) @@ -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.value + msg_id = MsgIds.MSG_ID_LOAD_CELL_READINGS.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.value, + message_id=MsgIds.MSG_ID_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.value, + message_id=MsgIds.MSG_ID_LOAD_CELLL_SEND_INTERVAL_OVERRIDE.value, payload=payload) self.logger.debug("override DG load cell broadcast interval") Index: dialin/dg/pressures.py =================================================================== diff -u -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -rf8387df23789b74fba26df353fb88a14b99de199 --- dialin/dg/pressures.py (.../pressures.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) +++ dialin/dg/pressures.py (.../pressures.py) (revision f8387df23789b74fba26df353fb88a14b99de199) @@ -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.value, + message_id=MsgIds.MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE.value, payload=payload) self.logger.debug("override pressure data broadcast interval") Index: dialin/dg/ro_pump.py =================================================================== diff -u -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -rf8387df23789b74fba26df353fb88a14b99de199 --- dialin/dg/ro_pump.py (.../ro_pump.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) +++ dialin/dg/ro_pump.py (.../ro_pump.py) (revision f8387df23789b74fba26df353fb88a14b99de199) @@ -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.value + msg_id = MsgIds.MSG_ID_RO_PUMP_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_ro_pump_sync) @@ -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.value, + message_id=MsgIds.MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE.value, payload=payload) self.logger.debug("override RO pump data broadcast interval") Index: dialin/dg/valves.py =================================================================== diff -u -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -rf8387df23789b74fba26df353fb88a14b99de199 --- dialin/dg/valves.py (.../valves.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) +++ dialin/dg/valves.py (.../valves.py) (revision f8387df23789b74fba26df353fb88a14b99de199) @@ -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.value, + message_id=MsgIds.MSG_ID_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE.value, payload=payload) self.logger.debug("override valves states publish interval")