Index: leahi_dialin/fp/filtration_purification.py =================================================================== diff -u -rbac0a2d09d57dc27cfa2f2a596d57fdcbed392ee -r79697500614904bafb56f3d33e368b954ba78f7d --- leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision bac0a2d09d57dc27cfa2f2a596d57fdcbed392ee) +++ leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision 79697500614904bafb56f3d33e368b954ba78f7d) @@ -22,6 +22,7 @@ from .modules.events import FPEvents from .modules.flow_sensors import FPFlowSensors from .modules.levels import FPLevels +from .modules.permeate_tank import FPPermeateTank from .modules.pressure_sensors import FPPressureSensors from .modules.ro_pump import FPROPump from .modules.temperatures import FPTemperatureSensors @@ -78,16 +79,18 @@ # register handler for FP operation mode broadcast messages if self.can_interface is not None: channel_id = DenaliChannels.fp_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_FP_OP_MODE_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_fp_op_mode_data = MsgIds.MSG_ID_FP_OP_MODE_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_op_mode_data, self._handler_fp_op_mode_sync) + self.msg_id_fp_version_response = MsgIds.MSG_ID_FP_VERSION_RESPONSE.value self.can_interface.register_receiving_publication_function(channel_id, - MsgIds.MSG_ID_FP_VERSION_RESPONSE.value, + self.msg_id_fp_version_response, self._handler_fp_version_response_sync) + self.msg_id_fp_debug_event = MsgIds.MSG_ID_FP_DEBUG_EVENT.value self.can_interface.register_receiving_publication_function(channel_id, - MsgIds.MSG_ID_FP_DEBUG_EVENT.value, + self.msg_id_fp_debug_event, self._handler_fp_debug_event_sync) # create properties @@ -112,14 +115,15 @@ self.flows = FPFlowSensors(self.can_interface, self.logger) self.fluid_pumps = FPPumps(self.can_interface, self.logger) self.levels = FPLevels(self.can_interface, self.logger) + self.permeate_tank = FPPermeateTank(self.can_interface, self.logger) self.pressures = FPPressureSensors(self.can_interface, self.logger) self.ro_pump = FPROPump(self.can_interface, self.logger) self.temperatures = FPTemperatureSensors(self.can_interface, self.logger) self.test_configs = FPTestConfig(self.can_interface, self.logger) self.valves = FPValves(self.can_interface, self.logger) self.dd_proxy = DDProxy(self.can_interface, self.logger) - @publish(["fp_debug_events_timestamp","fp_debug_events"]) + @publish(["msg_id_fp_debug_event", "fp_debug_events_timestamp","fp_debug_events"]) def _handler_fp_debug_event_sync(self, message, timestamp = 0.0): """ Callback for fp debug event messages @@ -155,7 +159,7 @@ """ self.fp_logged_in = logged_in - @publish(["fp_version, fp_fpga_version"]) + @publish(["msg_id_fp_version_response", "fp_version, fp_fpga_version"]) def _handler_fp_version_response_sync(self,message, timestamp = 0.0): """ Handler for response from FP regarding its version. @@ -193,7 +197,7 @@ self.fp_version_response_timestamp = timestamp - @publish(["fp_op_mode_timestamp","fp_operation_mode", "fp_operation_sub_mode"]) + @publish(["msg_id_fp_op_mode_data", "fp_op_mode_timestamp","fp_operation_mode", "fp_operation_sub_mode"]) def _handler_fp_op_mode_sync(self, message, timestamp = 0.0): """ Handles published FP operation mode messages. Current FP operation mode