Index: leahi_dialin/fp/modules/conductivity_sensors.py =================================================================== diff -u -r5b9473d9ca6a66d4d03c509fae6051710895b498 -r1a719e5c0a00853453a57ebd7b01cc6394ebbcc5 --- leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 5b9473d9ca6a66d4d03c509fae6051710895b498) +++ leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 1a719e5c0a00853453a57ebd7b01cc6394ebbcc5) @@ -26,11 +26,11 @@ @unique -class FPConductivitySensorsEnum(DialinEnum): - P9_COND = 0 # CPi (P9) conductivity sensor value - P18_COND = 1 # CPo (P18) conductivity sensor value +class ROConductivitySensorsEnum(DialinEnum): + P9_CPI = 0 # CPi (P9) conductivity sensor value + P18_CPO = 1 # CPo (P18) conductivity sensor value -class FPConductivitySensors(AbstractSubSystem): +class ROConductivitySensors(AbstractSubSystem): """ Dialin API sub-class for conductivity sensors related commands. """ @@ -46,39 +46,39 @@ self.logger = logger if self.can_interface is not None: - channel_id = DenaliChannels.fp_sync_broadcast_ch_id + channel_id = DenaliChannels.ro_sync_broadcast_ch_id msg_id = MsgIds.MSG_ID_RO_CONDUCTIVITY_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_conductivity_sensors_sync) - self.p9_cond = 0.0 - self.p18_cond = 0.0 + self.p9_cpi_conductivity = 0.0 + self.p18_cpo_conductivity = 0.0 - self.fp_conductivity_timestamp = 0.0 + self.ro_conductivity_timestamp = 0.0 - @publish(["fp_conductivity_timestamp", - "p9_cond", "p18_cond"]) + @publish(["ro_conductivity_timestamp", + "p9_cpi_conductivity", "p18_cpo_conductivity"]) def _handler_conductivity_sensors_sync(self, message, timestamp=0.0): """ - Handles published FP conductivity sensor data messages. Conductivity sensor data are captured + Handles published RO conductivity sensor data messages. Conductivity sensor data are captured for reference. @param message: published conductivity sensor data message @return: None """ - self.p9_cond = struct.unpack('f', bytearray( + self.p9_cpi_conductivity = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.p18_cond = struct.unpack('f', bytearray( + self.p18_cpo_conductivity = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.fp_conductivity_timestamp = timestamp + self.ro_conductivity_timestamp = timestamp def cmd_conductivity_sensor_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ - Constructs and sends the FP conductivity sensor data broadcast interval override command + Constructs and sends the RO conductivity sensor data broadcast interval override command Constraints: - Must be logged into FP. + Must be logged into RO. Given interval must be non-zero and a multiple of the RO general task interval (50 ms). @param ms: integer - interval (in ms) to override with @@ -93,11 +93,11 @@ ms_byte_array = integer_to_bytearray(ms) payload = reset_byte_array + ms_byte_array - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_ro_ch_id, message_id=MsgIds.MSG_ID_RO_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, payload=payload) - self.logger.debug("override FP conductivity sensor broadcast interval") + self.logger.debug("override RO conductivity sensor broadcast interval") # Send message received_message = self.can_interface.send(message) @@ -108,7 +108,7 @@ str_res = "reset back to normal: " else: str_res = str(ms) + " ms: " - self.logger.debug("FP Conductivity sensor data broadcast interval overridden to " + str_res + + self.logger.debug("RO Conductivity sensor data broadcast interval overridden to " + str_res + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] @@ -118,9 +118,9 @@ def cmd_conductivity_sensor_readings_override(self, sensor: int, conductivity: float, reset: int = NO_RESET) -> int: """ - Constructs and sends the FP conductivity value override command. + Constructs and sends the RO conductivity value override command. Constraints: - Must be logged into FP. + Must be logged into RO. @param sensor: unsigned int - sensor ID @param conductivity: float - conductivity value to override sensor with @@ -134,15 +134,15 @@ sensor_byte_array = integer_to_bytearray(sensor) payload = reset_byte_array + cond_byte_array + sensor_byte_array - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_ro_ch_id, message_id=MsgIds.MSG_ID_RO_CONDUCTIVITY_OVERRIDE_REQUEST.value, payload=payload) if reset == RESET: str_res = "reset back to normal" else: str_res = str(conductivity) + " microsiemens/cm" - self.logger.debug("override FP conductivity sensor value for sensor " + str(sensor) + ": " + str_res) + self.logger.debug("override RO conductivity sensor value for sensor " + str(sensor) + ": " + str_res) # Send message received_message = self.can_interface.send(message) @@ -157,7 +157,7 @@ def cmd_conductivity_sensor_read_counter_override(self, sensor: int, counter: int, reset: int = NO_RESET) -> int: """ - Constructs and sends the FP conductivity sensor read override command + Constructs and sends the RO conductivity sensor read override command @param sensor: unsigned int - sensor ID @param counter: counter - count value to override sensor with @@ -171,15 +171,15 @@ sensor_byte_array = integer_to_bytearray(sensor) payload = reset_byte_array + read_byte_array + sensor_byte_array - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_ro_ch_id, message_id=MsgIds.MSG_ID_RO_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST.value, payload=payload) if reset == RESET: str_res = "reset back to normal" else: str_res = str(counter) - self.logger.debug("override FP conductivity sensor value for sensor " + str(sensor) + ": " + str_res) + self.logger.debug("override RO conductivity sensor value for sensor " + str(sensor) + ": " + str_res) # Send message received_message = self.can_interface.send(message) @@ -194,7 +194,7 @@ def cmd_conductivity_sensor_error_counter_override(self, sensor: int, counter: int, reset: int = NO_RESET) -> int: """ - Constructs and sends the FP conductivity error counter override command + Constructs and sends the RO conductivity error counter override command @param sensor: unsigned int - sensor ID @param counter: counter - count value to override error counter @@ -208,15 +208,15 @@ sensor_byte_array = integer_to_bytearray(sensor) payload = reset_byte_array + error_byte_array + sensor_byte_array - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_ro_ch_id, message_id=MsgIds.MSG_ID_RO_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST.value, payload=payload) if reset == RESET: str_res = "reset back to normal" else: str_res = str(counter) - self.logger.debug("override FP conductivity sensor value for sensor " + str(sensor) + ": " + str_res) + self.logger.debug("override RO conductivity sensor value for sensor " + str(sensor) + ": " + str_res) # Send message received_message = self.can_interface.send(message)