Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r396e5d3fdfdcdabca9cc7434de0fcee52036aaa1 -r9a97e1f14f267d899b1604a9584284d6074f9224 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 396e5d3fdfdcdabca9cc7434de0fcee52036aaa1) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 9a97e1f14f267d899b1604a9584284d6074f9224) @@ -460,13 +460,17 @@ extend_enum(created_enum, 'FIRST_PRESSURE_SENSOR', created_enum.D9_TEMP.value) extend_enum(created_enum, 'LAST_PRESSURE_SENSOR', created_enum.D87_TEMP.value if GlobalVariables().HW_BETA_1_9 == True else created_enum.D41_TEMP.value) extend_enum(created_enum, 'FIRST_CONDUCTIVITY_SENSOR', created_enum.D16_TEMP.value) - extend_enum(created_enum, 'LAST_CONDUCTIVITY_SENSOR', created_enum.D99_TEMP.value if GlobalVariables().HW_BETA_1_9 == True else created_enum.D75_TEMP.value) + extend_enum(created_enum, 'LAST_CONDUCTIVITY_SENSOR', created_enum.D75_TEMP.value) + extend_enum(created_enum, 'FIRST_AVERAGE_SENSOR', created_enum.D4_AVG_TEMP.value) + extend_enum(created_enum, 'LAST_AVR_CONDUCTIVITY_SENSOR', created_enum.D30_AVG_TEMP.value) # Add aliases to be searchable (listed when pressed TAB) created_enum._member_names_.append('FIRST_PRESSURE_SENSOR') created_enum._member_names_.append('LAST_PRESSURE_SENSOR') created_enum._member_names_.append('FIRST_CONDUCTIVITY_SENSOR') created_enum._member_names_.append('LAST_CONDUCTIVITY_SENSOR') + created_enum._member_names_.append('FIRST_AVR_CONDUCTIVITY_SENSOR') + created_enum._member_names_.append('LAST_AVR_CONDUCTIVITY_SENSOR') return created_enum Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d -r9a97e1f14f267d899b1604a9584284d6074f9224 --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 9a97e1f14f267d899b1604a9584284d6074f9224) @@ -20,7 +20,6 @@ from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.dd_defs import dd_enum_repository -from leahi_dialin.common.global_vars import GlobalVariables from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.protocols.CAN import DenaliChannels @@ -55,10 +54,9 @@ dd_enum_repository.DDConductivitySensorNames.D27_COND.name: 0.0, dd_enum_repository.DDConductivitySensorNames.D29_COND.name: 0.0, dd_enum_repository.DDConductivitySensorNames.D43_COND.name: 0.0, - dd_enum_repository.DDConductivitySensorNames.D74_COND.name: 0.0 + dd_enum_repository.DDConductivitySensorNames.D74_COND.name: 0.0, + dd_enum_repository.DDConductivitySensorNames.D98_COND.name: 0.0 } - if GlobalVariables().HW_BETA_1_9: - self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = 0.0 self.dd_conductivity_timestamp = 0.0 @@ -87,10 +85,7 @@ self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D74_COND.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - if GlobalVariables().HW_BETA_1_9: - if dd_enum_repository.DDConductivitySensorNames.D98_COND.name not in self.dd_conductivity: - self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = 0.0 - self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = struct.unpack('f', bytearray( + self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] self.dd_conductivity_timestamp = timestamp Index: leahi_dialin/dd/modules/levels.py =================================================================== diff -u -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d -r9a97e1f14f267d899b1604a9584284d6074f9224 --- leahi_dialin/dd/modules/levels.py (.../levels.py) (revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d) +++ leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 9a97e1f14f267d899b1604a9584284d6074f9224) @@ -19,7 +19,6 @@ from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.dd_defs import dd_enum_repository -from leahi_dialin.common.global_vars import GlobalVariables from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.protocols.CAN import DenaliChannels @@ -49,10 +48,9 @@ self.dd_level_sensors = { dd_enum_repository.DDLevelSensorNames.D6_LEVEL.name: 0, dd_enum_repository.DDLevelSensorNames.D63_LEVEL.name: 0, - dd_enum_repository.DDLevelSensorNames.D46_LEVEL.name: 0 + dd_enum_repository.DDLevelSensorNames.D46_LEVEL.name: 0, + dd_enum_repository.DDLevelSensorNames.D98_LEVEL.name: 0 } - if GlobalVariables().HW_BETA_1_9: - self.dd_level_sensors[dd_enum_repository.DDLevelSensorNames.D98_LEVEL.name] = 0.0 self.dd_bicarb_level = 0 self.dd_levels_timestamp = 0 @@ -68,10 +66,7 @@ sensor_list =[] sensor_list.append((dd_enum_repository.DDLevelSensorNames.D6_LEVEL, 'i')) sensor_list.append((dd_enum_repository.DDLevelSensorNames.D63_LEVEL, 'i')) - if GlobalVariables().HW_BETA_1_9: - if dd_enum_repository.DDLevelSensorNames.D98_LEVEL.name not in self.dd_level_sensors: - self.dd_level_sensors[dd_enum_repository.DDTemperatureSensorNames.D98_LEVEL.name] = 0.0 - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D98_LEVEL, 'i')) + sensor_list.append((dd_enum_repository.DDLevelSensorNames.D98_LEVEL, 'i')) sensor_list.append((dd_enum_repository.DDLevelSensorNames.D46_LEVEL, 'i')) i = 1 @@ -86,6 +81,7 @@ self.dd_levels_timestamp = timestamp + def cmd_levels_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends dd levels broadcast time interval override. Index: leahi_dialin/dd/modules/pressure_sensors.py =================================================================== diff -u -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d -r9a97e1f14f267d899b1604a9584284d6074f9224 --- leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d) +++ leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 9a97e1f14f267d899b1604a9584284d6074f9224) @@ -20,7 +20,6 @@ from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.dd_defs import dd_enum_repository -from leahi_dialin.common.global_vars import GlobalVariables from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.protocols.CAN import DenaliChannels @@ -52,10 +51,9 @@ dd_enum_repository.DDPressureSensorNames.D66_PRES.name: 0.0, dd_enum_repository.DDPressureSensorNames.D51_PRES.name: 0.0, dd_enum_repository.DDPressureSensorNames.D18_PRES.name: 0.0, - dd_enum_repository.DDPressureSensorNames.D41_PRES.name: 0.0 + dd_enum_repository.DDPressureSensorNames.D41_PRES.name: 0.0, + dd_enum_repository.DDPressureSensorNames.D87_PRES.name: 0.0 } - if GlobalVariables().HW_BETA_1_9: - self.dd_pressures[dd_enum_repository.DDPressureSensorNames.D87_PRES.name] = 0.0 self.dd_pressures_timestamp = 0 @@ -79,12 +77,7 @@ message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] self.dd_pressures[dd_enum_repository.DDPressureSensorNames.D41_PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - - if GlobalVariables().HW_BETA_1_9: - if dd_enum_repository.DDPressureSensorNames.D87_PRES.name not in self.dd_pressures: - self.dd_pressures[dd_enum_repository.DDPressureSensorNames.D87_PRES.name] = 0.0 - - self.dd_pressures[dd_enum_repository.DDPressureSensorNames.D87_PRES.name] = struct.unpack('f', bytearray( + self.dd_pressures[dd_enum_repository.DDPressureSensorNames.D87_PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] self.dd_pressures_timestamp = timestamp Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d -r9a97e1f14f267d899b1604a9584284d6074f9224 --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 9a97e1f14f267d899b1604a9584284d6074f9224) @@ -19,7 +19,6 @@ from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.dd_defs import dd_enum_repository -from leahi_dialin.common.global_vars import GlobalVariables from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.protocols.CAN import DenaliChannels @@ -34,14 +33,15 @@ super().__init__() self.can_interface = can_interface - self.logger = logger + self.logger: Logger = logger # Dictionary of the temperature sensors self.dd_temperatures_timestamp = 0.0 self.dd_temperatures = { dd_enum_repository.DDTemperatureSensorNames.D1_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D78_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D4_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D50_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D99_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.BRD_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D16_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D28_TEMP.name: 0.0, @@ -50,18 +50,15 @@ dd_enum_repository.DDTemperatureSensorNames.D75_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D4_AVG_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D50_AVG_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D28_AVG_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D30_AVG_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D66_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D51_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D18_TEMP.name: 0.0, - dd_enum_repository.DDTemperatureSensorNames.D41_TEMP.name: 0.0 - + dd_enum_repository.DDTemperatureSensorNames.D41_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D87_TEMP.name: 0.0 } - if GlobalVariables().HW_BETA_1_9: - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D99_TEMP.name] = 0.0 - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name] = 0.0 - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D87_TEMP.name] = 0.0 if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id @@ -83,10 +80,7 @@ sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D78_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D4_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D50_TEMP, 'f')) - if GlobalVariables().HW_BETA_1_9: - if dd_enum_repository.DDTemperatureSensorNames.D99_TEMP.name not in self.dd_temperatures: - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D99_TEMP.name] = 0.0 - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D99_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D99_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.BRD_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D16_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D28_TEMP, 'f')) @@ -95,21 +89,15 @@ sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D75_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D4_AVG_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D50_AVG_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D28_AVG_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D30_AVG_TEMP, 'f')) - if GlobalVariables().HW_BETA_1_9: - if dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name not in self.dd_temperatures: - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name] = 0.0 - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D9_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D66_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D51_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D18_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D41_TEMP, 'f')) - if GlobalVariables().HW_BETA_1_9: - if dd_enum_repository.DDTemperatureSensorNames.D87_TEMP.name not in self.dd_temperatures: - self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D87_TEMP.name] = 0.0 - sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D87_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D87_TEMP, 'f')) i = 1 for sensor in sensor_list: @@ -159,6 +147,13 @@ modified_index= sensor_index - dd_enum_repository.DDTemperatureSensorNames.FIRST_CONDUCTIVITY_SENSOR.value message_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST + # DD Conductivity Sensors' Average Temperature Reading Override + elif dd_enum_repository.DDTemperatureSensorNames.FIRST_AVR_CONDUCTIVITY_SENSOR.value <= sensor_index <= dd_enum_repository.DDTemperatureSensorNames.LAST_AVR_CONDUCTIVITY_SENSOR.value: + modified_index= sensor_index - dd_enum_repository.DDTemperatureSensorNames.FIRST_AVR_CONDUCTIVITY_SENSOR.value + message_id = 'Unknown' + self.logger.info('No Msg ID is present for Conductivity sensor Average override! Skipping...') + return False + # DD Pressure Sensors' Temperature Reading Override elif dd_enum_repository.DDTemperatureSensorNames.FIRST_PRESSURE_SENSOR.value <= sensor_index <= dd_enum_repository.DDTemperatureSensorNames.LAST_PRESSURE_SENSOR.value: modified_index= sensor_index - dd_enum_repository.DDTemperatureSensorNames.FIRST_PRESSURE_SENSOR.value Index: leahi_dialin/fp/modules/pressure_sensors.py =================================================================== diff -u -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d -r9a97e1f14f267d899b1604a9584284d6074f9224 --- leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d) +++ leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 9a97e1f14f267d899b1604a9584284d6074f9224) @@ -19,7 +19,6 @@ from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.fp_defs import fp_enum_repository -from leahi_dialin.common.global_vars import GlobalVariables from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.protocols.CAN import DenaliChannels @@ -50,10 +49,9 @@ fp_enum_repository.FPPressureSensorNames.M3_PRES.name: 0.0, fp_enum_repository.FPPressureSensorNames.P8_PRES.name: 0.0, fp_enum_repository.FPPressureSensorNames.P13_PRES.name: 0.0, - fp_enum_repository.FPPressureSensorNames.P17_PRES.name: 0.0 + fp_enum_repository.FPPressureSensorNames.P17_PRES.name: 0.0, + fp_enum_repository.FPPressureSensorNames.P46_PRES.name: 0.0 } - if GlobalVariables().HW_BETA_1_9: - self.fp_pressures[fp_enum_repository.FPTemperatureSensorNames.P46_PRES.name] = 0.0 self.fp_pressure_timestamp = 0.0 @@ -75,9 +73,8 @@ message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P17_PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - if GlobalVariables().HW_BETA_1_9: - self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P46_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] + self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P46_PRES.name] = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] self.fp_pressure_timestamp = timestamp Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d -r9a97e1f14f267d899b1604a9584284d6074f9224 --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 9a97e1f14f267d899b1604a9584284d6074f9224) @@ -19,7 +19,6 @@ from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.fp_defs import fp_enum_repository, BETA_IOFP_COND_SENSOR_OFFSET, BETA_IOFP_PRES_SENSOR_OFFSET -from leahi_dialin.common.global_vars import GlobalVariables from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from leahi_dialin.protocols.CAN import DenaliChannels @@ -50,6 +49,7 @@ fp_enum_repository.FPTemperatureSensorNames.P19_TEMP.name: 0.0, fp_enum_repository.FPTemperatureSensorNames.P7_TEMP.name: 0.0, fp_enum_repository.FPTemperatureSensorNames.P16_TEMP.name: 0.0, + fp_enum_repository.FPTemperatureSensorNames.P46_TEMP.name: 0.0, fp_enum_repository.FPTemperatureSensorNames.P7_INTERNAL_TEMP.name: 0.0, fp_enum_repository.FPTemperatureSensorNames.P16_INTERNAL_TEMP.name: 0.0 } @@ -87,9 +87,8 @@ self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P16_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - if GlobalVariables().HW_BETA_1_9: - self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P46_TEMP.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] + self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P46_TEMP.name] = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P7_INTERNAL_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0]