Index: leahi_dialin/dd/modules/levels.py =================================================================== diff -u -rbdc62737ef6406a2b8a0f6a6c21a93450a2b0eb1 -r87d5fc1bdc694d2adaec08a38eea47a61c056f7d --- leahi_dialin/dd/modules/levels.py (.../levels.py) (revision bdc62737ef6406a2b8a0f6a6c21a93450a2b0eb1) +++ leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 87d5fc1bdc694d2adaec08a38eea47a61c056f7d) @@ -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.