GM: check radarOffCan in radar_interface (#26885)

Remove hardcoded vehicle list, replace with radarOffCan check
pull/26896/head
Eric Brown 2 years ago committed by GitHub
parent 18b011636e
commit b994b93b16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      selfdrive/car/gm/radar_interface.py

@ -3,7 +3,7 @@ import math
from cereal import car from cereal import car
from common.conversions import Conversions as CV from common.conversions import Conversions as CV
from opendbc.can.parser import CANParser 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 from selfdrive.car.interfaces import RadarInterfaceBase
RADAR_HEADER_MSG = 1120 RADAR_HEADER_MSG = 1120
@ -16,9 +16,6 @@ LAST_RADAR_MSG = RADAR_HEADER_MSG + NUM_SLOTS
def create_radar_can_parser(car_fingerprint): 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 # C1A-ARS3-A by Continental
radar_targets = list(range(SLOT_1_MSG, SLOT_1_MSG + NUM_SLOTS)) radar_targets = list(range(SLOT_1_MSG, SLOT_1_MSG + NUM_SLOTS))
signals = list(zip(['FLRRNumValidTargets', 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) return CANParser(DBC[car_fingerprint]['radar'], signals, checks, CanBus.OBSTACLE)
class RadarInterface(RadarInterfaceBase): class RadarInterface(RadarInterfaceBase):
def __init__(self, CP): def __init__(self, CP):
super().__init__(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.trigger_msg = LAST_RADAR_MSG
self.updated_messages = set() self.updated_messages = set()

Loading…
Cancel
Save