Index: leahi_dialin/td/modules/pressure_sensors.py =================================================================== diff -u -rf762fd31ac5b03734f000f9fcd671851581def8a -r03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93 --- leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision f762fd31ac5b03734f000f9fcd671851581def8a) +++ leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 03dc6c3ff80d7f76a5b6438ba067e02a37e2ce93) @@ -19,8 +19,8 @@ from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.td_defs import TDPressureSensorNames, TDPressureSensorAttributes from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override +from leahi_dialin.common.td_defs import TDPressureSensorNames, TDPressureSensorAttributes from leahi_dialin.protocols.CAN import DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -141,13 +141,12 @@ @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ - return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, channel_id = DenaliChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, - module_name = 'TD pressure sensors', + module_name = 'TD Pressure Sensors', logger = self.logger, can_interface = self.can_interface) @@ -164,7 +163,6 @@ @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ - rst = integer_to_bytearray(reset) sen = integer_to_bytearray(sensor) prs = float_to_bytearray(pressure) @@ -203,7 +201,7 @@ reset = reset, channel_id = DenaliChannels.dialin_to_td_ch_id, msg_id = MsgIds.MSG_ID_TD_TMP_PRESSURE_OVERRIDE_REQUEST, - entity_name = 'TD TMP Pressure Sensor', + entity_name = 'TD TMP Pressure Sensor pressure', override_text = str(prs) + " mmHg. ", logger = self.logger, can_interface = self.can_interface)