Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -ra291930ba38e329e2b373f6d2b2a7564a6b7a09a -r914620537399ff9ecc4925fc56f8b8be567d184e --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision a291930ba38e329e2b373f6d2b2a7564a6b7a09a) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 914620537399ff9ecc4925fc56f8b8be567d184e) @@ -34,13 +34,11 @@ self.can_interface = can_interface self.logger = logger - if self.can_interface is not None: channel_id = DenaliChannels.fp_sync_broadcast_ch_id self.msg_id_fp_temperature_data = MsgIds.MSG_ID_FP_TEMPERATURE_DATA.value self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_temperature_data, self._handler_temperature_sensors_sync) - self.fp_temperature_sensors_timestamp = 0 self.fp_temperatures = { FPTemperaturesNames.M3_TEMP.name: 0.0, @@ -130,30 +128,31 @@ # FP Conductivity Sensors' Temperature Override if FPTemperaturesNames.FIRST_CONDUCTIVITY_SENSOR.value <= sensor_index <= FPTemperaturesNames.LAST_CONDUCTIVITY_SENSOR.value: - index = integer_to_bytearray(sensor_index - FPTemperaturesNames.FIRST_CONDUCTIVITY_SENSOR.value + BETA_IOFP_COND_SENSOR_OFFSET) + modified_index = sensor_index - FPTemperaturesNames.FIRST_CONDUCTIVITY_SENSOR.value + BETA_IOFP_COND_SENSOR_OFFSET msg_id = MsgIds.MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST # FP Flow Sensors' Temperature Override elif FPTemperaturesNames.FIRST_FLOW_SENSOR.value <= sensor_index < FPTemperaturesNames.LAST_FLOW_SENSOR.value: - index = integer_to_bytearray(sensor_index - FPTemperaturesNames.FIRST_FLOW_SENSOR.value) + modified_index = sensor_index - FPTemperaturesNames.FIRST_FLOW_SENSOR.value msg_id = MsgIds.MSG_ID_FP_FLOW_TEMP_OVERRIDE_REQUEST # FP Pressure Sensors' Temperature Override else: - index = integer_to_bytearray(sensor_index - FPTemperaturesNames.FIRST_PRESSURE_SENSOR.value + BETA_IOFP_PRES_SENSOR_OFFSET) + modified_index = sensor_index - FPTemperaturesNames.FIRST_PRESSURE_SENSOR.value + BETA_IOFP_PRES_SENSOR_OFFSET msg_id = MsgIds.MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST + index = integer_to_bytearray(modified_index) rst = integer_to_bytearray(reset) value = float_to_bytearray(sensor_value) payload = rst + value + index - valve_name = FPTemperaturesNames(sensor_index).name.split('_')[0] + sensor_name = FPTemperaturesNames(sensor_index).name.split('_')[0] return cmd_generic_override( payload = payload, reset = reset, channel_id = DenaliChannels.dialin_to_fp_ch_id, msg_id = msg_id, - entity_name = f'FP {valve_name} Temperature Sensor temperature', + entity_name = f'FP {sensor_name} Temperature Sensor temperature', override_text = str(sensor_value), logger = self.logger, can_interface = self.can_interface)