Index: leahi_dialin/ro/modules/boost_pump.py =================================================================== diff -u -r9941beb9ed54d596b3c5b44d53f48be4b0340bb9 -r249bfa9ec36c4a35604cc6466c33eaf60c3ff6d8 --- leahi_dialin/ro/modules/boost_pump.py (.../boost_pump.py) (revision 9941beb9ed54d596b3c5b44d53f48be4b0340bb9) +++ leahi_dialin/ro/modules/boost_pump.py (.../boost_pump.py) (revision 249bfa9ec36c4a35604cc6466c33eaf60c3ff6d8) @@ -17,11 +17,11 @@ from logging import Logger from .constants import RESET, NO_RESET -from ..common.msg_defs import MsgIds, MsgFieldPositions -from ..protocols.CAN import DenaliMessage, DenaliChannels -from ..utils.base import AbstractSubSystem, publish -from ..utils.checks import check_broadcast_interval_override_ms -from ..utils.conversions import integer_to_bytearray, float_to_bytearray +from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels +from leahi_dialin.utils.base import AbstractSubSystem, publish +from leahi_dialin.utils.checks import check_broadcast_interval_override_ms +from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray class ROPumps(AbstractSubSystem): @@ -41,7 +41,7 @@ channel_id = DenaliChannels.ro_sync_broadcast_ch_id msg_id = MsgIds.MSG_ID_RO_PUMP_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self._handler_blood_flow_sync) + self._handler_boost_pump_sync) self.ro_pump_timestamp = 0.0 self.ro_pump_state = 0 self.ro_pump_duty_cycle = 0.0 Index: leahi_dialin/ro/modules/levels.py =================================================================== diff -u -rbba41bff351f24b5665d1120b2cfb53fbe04dbd7 -r249bfa9ec36c4a35604cc6466c33eaf60c3ff6d8 --- leahi_dialin/ro/modules/levels.py (.../levels.py) (revision bba41bff351f24b5665d1120b2cfb53fbe04dbd7) +++ leahi_dialin/ro/modules/levels.py (.../levels.py) (revision 249bfa9ec36c4a35604cc6466c33eaf60c3ff6d8) @@ -19,11 +19,11 @@ from logging import Logger from .constants import NO_RESET -from ..common.msg_defs import MsgIds, MsgFieldPositions -from ..protocols.CAN import DenaliMessage, DenaliChannels -from ..utils.base import AbstractSubSystem, publish, DialinEnum -from ..utils.checks import check_broadcast_interval_override_ms -from ..utils.conversions import integer_to_bytearray, float_to_bytearray +from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels +from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum +from leahi_dialin.utils.checks import check_broadcast_interval_override_ms +from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray class ROLevels(AbstractSubSystem): """ @@ -48,7 +48,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.ro_sync_broadcast_ch_id msg_id = MsgIds.MSG_ID_RO_LEVEL_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_heaters_sync) + self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_levels_sync) @publish(["ro_levels_timestamp", "floater",]) Index: leahi_dialin/ro/modules/pressure_sensors.py =================================================================== diff -u -rbba41bff351f24b5665d1120b2cfb53fbe04dbd7 -r249bfa9ec36c4a35604cc6466c33eaf60c3ff6d8 --- leahi_dialin/ro/modules/pressure_sensors.py (.../pressure_sensors.py) (revision bba41bff351f24b5665d1120b2cfb53fbe04dbd7) +++ leahi_dialin/ro/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 249bfa9ec36c4a35604cc6466c33eaf60c3ff6d8) @@ -17,11 +17,11 @@ from logging import Logger from .constants import RESET, NO_RESET -from ..common.msg_defs import MsgIds, MsgFieldPositions -from ..protocols.CAN import DenaliMessage, DenaliChannels -from ..utils.base import AbstractSubSystem, publish -from ..utils.checks import check_broadcast_interval_override_ms -from ..utils.conversions import integer_to_bytearray, float_to_bytearray +from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels +from leahi_dialin.utils.base import AbstractSubSystem, publish +from leahi_dialin.utils.checks import check_broadcast_interval_override_ms +from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray class ROPressureSensors(AbstractSubSystem): @@ -113,7 +113,7 @@ # Send message received_message = self.can_interface.send(message) - # If there is content...S + # If there is contentleahi_dialin.. if received_message is not None: if reset == RESET: str_res = "reset back to normal. " Index: leahi_dialin/ro/modules/valves.py =================================================================== diff -u -r9941beb9ed54d596b3c5b44d53f48be4b0340bb9 -r249bfa9ec36c4a35604cc6466c33eaf60c3ff6d8 --- leahi_dialin/ro/modules/valves.py (.../valves.py) (revision 9941beb9ed54d596b3c5b44d53f48be4b0340bb9) +++ leahi_dialin/ro/modules/valves.py (.../valves.py) (revision 249bfa9ec36c4a35604cc6466c33eaf60c3ff6d8) @@ -222,7 +222,7 @@ """ Constructs and sends the valve state override command. Constraints: - Must be logged into DG. + Must be logged into RO. Given valve ID must be one of the valve IDs listed below. @param valve: unsigned int - valve ID