GM: check radarOffCan in radar_interface (#26885)

Remove hardcoded vehicle list, replace with radarOffCan check
old-commit-hash: b994b93b164bb9dc2a8689dff0f271d2d68ced55
This commit is contained in:
Eric Brown
2023-01-06 17:46:21 -07:00
committed by GitHub
parent d5be52936a
commit 8267e0dcdc
+3 -5
View File
@@ -3,7 +3,7 @@ import math
from cereal import car
from common.conversions import Conversions as CV
from opendbc.can.parser import CANParser
from selfdrive.car.gm.values import DBC, CAR, CanBus
from selfdrive.car.gm.values import DBC, CanBus
from selfdrive.car.interfaces import RadarInterfaceBase
RADAR_HEADER_MSG = 1120
@@ -16,9 +16,6 @@ LAST_RADAR_MSG = RADAR_HEADER_MSG + NUM_SLOTS
def create_radar_can_parser(car_fingerprint):
if car_fingerprint not in (CAR.VOLT, CAR.MALIBU, CAR.HOLDEN_ASTRA, CAR.ACADIA, CAR.CADILLAC_ATS, CAR.ESCALADE_ESV):
return None
# C1A-ARS3-A by Continental
radar_targets = list(range(SLOT_1_MSG, SLOT_1_MSG + NUM_SLOTS))
signals = list(zip(['FLRRNumValidTargets',
@@ -34,11 +31,12 @@ def create_radar_can_parser(car_fingerprint):
return CANParser(DBC[car_fingerprint]['radar'], signals, checks, CanBus.OBSTACLE)
class RadarInterface(RadarInterfaceBase):
def __init__(self, CP):
super().__init__(CP)
self.rcp = create_radar_can_parser(CP.carFingerprint)
self.rcp = None if CP.radarOffCan else create_radar_can_parser(CP.carFingerprint)
self.trigger_msg = LAST_RADAR_MSG
self.updated_messages = set()