wip

selfdrive/car/nissan/carcontroller.py

@@ -1,13 +1,14 @@
 from cereal import car
 from opendbc.can.packer import CANPacker
 from openpilot.selfdrive.car import apply_std_steer_angle_limits
+from openpilot.selfdrive.car.interfaces import CarControllerBase
 from openpilot.selfdrive.car.nissan import nissancan
 from openpilot.selfdrive.car.nissan.values import CAR, CarControllerParams
 
 VisualAlert = car.CarControl.HUDControl.VisualAlert
 
 
-class CarController:
+class CarController(CarControllerBase):
   def __init__(self, dbc_name, CP, VM):
     self.CP = CP
     self.car_fingerprint = CP.carFingerprint

selfdrive/car/nissan/carstate.py

@@ -20,9 +20,15 @@ class CarState(CarStateBase):
     self.steeringTorqueSamples = deque(TORQUE_SAMPLES*[0], TORQUE_SAMPLES)
     self.shifter_values = can_define.dv["GEARBOX"]["GEAR_SHIFTER"]
 
+    self.prev_distance_button = 0
+    self.distance_button = 0
+
   def update(self, cp, cp_adas, cp_cam, frogpilot_variables):
     ret = car.CarState.new_message()
 
+    self.prev_distance_button = self.distance_button
+    self.distance_button = cp.vl["CRUISE_THROTTLE"]["FOLLOW_DISTANCE_BUTTON"]
+
     if self.CP.carFingerprint in (CAR.ROGUE, CAR.XTRAIL, CAR.ALTIMA):
       ret.gas = cp.vl["GAS_PEDAL"]["GAS_PEDAL"]
     elif self.CP.carFingerprint in (CAR.LEAF, CAR.LEAF_IC):
@@ -101,6 +107,7 @@ class CarState(CarStateBase):
     can_gear = int(cp.vl["GEARBOX"]["GEAR_SHIFTER"])
     ret.gearShifter = self.parse_gear_shifter(self.shifter_values.get(can_gear, None))
 
+    self.lkas_previously_enabled = self.lkas_enabled
     if self.CP.carFingerprint == CAR.ALTIMA:
       self.lkas_enabled = bool(cp.vl["LKAS_SETTINGS"]["LKAS_ENABLED"])
     else:

selfdrive/car/nissan/interface.py

@@ -1,14 +1,17 @@
-from cereal import car
+from cereal import car, custom
 from panda import Panda
-from openpilot.selfdrive.car import get_safety_config
+from openpilot.selfdrive.car import create_button_events, get_safety_config
 from openpilot.selfdrive.car.interfaces import CarInterfaceBase
 from openpilot.selfdrive.car.nissan.values import CAR
 
+ButtonType = car.CarState.ButtonEvent.Type
+FrogPilotButtonType = custom.FrogPilotCarState.ButtonEvent.Type
+
 
 class CarInterface(CarInterfaceBase):
 
   @staticmethod
-  def _get_params(ret, params, candidate, fingerprint, car_fw, experimental_long, docs):
+  def _get_params(ret, params, candidate, fingerprint, car_fw, disable_openpilot_long, experimental_long, docs):
     ret.carName = "nissan"
     ret.safetyConfigs = [get_safety_config(car.CarParams.SafetyModel.nissan)]
     ret.autoResumeSng = False
@@ -16,25 +19,13 @@ class CarInterface(CarInterfaceBase):
     ret.steerLimitTimer = 1.0
 
     ret.steerActuatorDelay = 0.1
-    ret.steerRatio = 17
 
     ret.steerControlType = car.CarParams.SteerControlType.angle
     ret.radarUnavailable = True
 
-    if candidate in (CAR.ROGUE, CAR.XTRAIL):
-      ret.mass = 1610
-      ret.wheelbase = 2.705
-      ret.centerToFront = ret.wheelbase * 0.44
-    elif candidate in (CAR.LEAF, CAR.LEAF_IC):
-      ret.mass = 1610
-      ret.wheelbase = 2.705
-      ret.centerToFront = ret.wheelbase * 0.44
-    elif candidate == CAR.ALTIMA:
+    if candidate == CAR.ALTIMA:
       # Altima has EPS on C-CAN unlike the others that have it on V-CAN
       ret.safetyConfigs[0].safetyParam |= Panda.FLAG_NISSAN_ALT_EPS_BUS
-      ret.mass = 1492
-      ret.wheelbase = 2.824
-      ret.centerToFront = ret.wheelbase * 0.44
 
     return ret
 
@@ -42,12 +33,12 @@ class CarInterface(CarInterfaceBase):
   def _update(self, c, frogpilot_variables):
     ret = self.CS.update(self.cp, self.cp_adas, self.cp_cam, frogpilot_variables)
 
-    buttonEvents = []
-    be = car.CarState.ButtonEvent.new_message()
-    be.type = car.CarState.ButtonEvent.Type.accelCruise
-    buttonEvents.append(be)
+    ret.buttonEvents = [
+      *create_button_events(self.CS.distance_button, self.CS.prev_distance_button, {1: ButtonType.gapAdjustCruise}),
+      *create_button_events(self.CS.lkas_enabled, self.CS.lkas_previously_enabled, {1: FrogPilotButtonType.lkas}),
+    ]
 
-    events = self.create_common_events(ret, frogpilot_variables, extra_gears=[car.CarState.GearShifter.brake])
+    events = self.create_common_events(ret, extra_gears=[car.CarState.GearShifter.brake])
 
     if self.CS.lkas_enabled:
       events.add(car.CarEvent.EventName.invalidLkasSetting)

selfdrive/car/nissan/values.py

@@ -1,11 +1,9 @@
 from dataclasses import dataclass, field
-from enum import StrEnum
-from typing import Dict, List, Optional, Union
 
 from cereal import car
 from panda.python import uds
-from openpilot.selfdrive.car import AngleRateLimit, dbc_dict
-from openpilot.selfdrive.car.docs_definitions import CarInfo, CarHarness, CarParts
+from openpilot.selfdrive.car import AngleRateLimit, CarSpecs, DbcDict, PlatformConfig, Platforms, dbc_dict
+from openpilot.selfdrive.car.docs_definitions import CarDocs, CarHarness, CarParts
 from openpilot.selfdrive.car.fw_query_definitions import FwQueryConfig, Request, StdQueries
 
 Ecu = car.CarParams.Ecu
@@ -21,29 +19,51 @@ class CarControllerParams:
     pass
 
 
-class CAR(StrEnum):
-  XTRAIL = "NISSAN X-TRAIL 2017"
-  LEAF = "NISSAN LEAF 2018"
-  # Leaf with ADAS ECU found behind instrument cluster instead of glovebox
-  # Currently the only known difference between them is the inverted seatbelt signal.
-  LEAF_IC = "NISSAN LEAF 2018 Instrument Cluster"
-  ROGUE = "NISSAN ROGUE 2019"
-  ALTIMA = "NISSAN ALTIMA 2020"
-
-
 @dataclass
-class NissanCarInfo(CarInfo):
+class NissanCarDocs(CarDocs):
   package: str = "ProPILOT Assist"
   car_parts: CarParts = field(default_factory=CarParts.common([CarHarness.nissan_a]))
 
 
-CAR_INFO: Dict[str, Optional[Union[NissanCarInfo, List[NissanCarInfo]]]] = {
-  CAR.XTRAIL: NissanCarInfo("Nissan X-Trail 2017"),
-  CAR.LEAF: NissanCarInfo("Nissan Leaf 2018-23", video_link="https://youtu.be/vaMbtAh_0cY"),
-  CAR.LEAF_IC: None,  # same platforms
-  CAR.ROGUE: NissanCarInfo("Nissan Rogue 2018-20"),
-  CAR.ALTIMA: NissanCarInfo("Nissan Altima 2019-20", car_parts=CarParts.common([CarHarness.nissan_b])),
-}
+@dataclass(frozen=True)
+class NissanCarSpecs(CarSpecs):
+  centerToFrontRatio: float = 0.44
+  steerRatio: float = 17.
+
+
+@dataclass
+class NissanPlatformConfig(PlatformConfig):
+  dbc_dict: DbcDict = field(default_factory=lambda: dbc_dict('nissan_x_trail_2017_generated', None))
+
+
+class CAR(Platforms):
+  XTRAIL = NissanPlatformConfig(
+    "NISSAN X-TRAIL 2017",
+    [NissanCarDocs("Nissan X-Trail 2017")],
+    NissanCarSpecs(mass=1610, wheelbase=2.705)
+  )
+  LEAF = NissanPlatformConfig(
+    "NISSAN LEAF 2018",
+    [NissanCarDocs("Nissan Leaf 2018-23", video_link="https://youtu.be/vaMbtAh_0cY")],
+    NissanCarSpecs(mass=1610, wheelbase=2.705),
+    dbc_dict('nissan_leaf_2018_generated', None),
+  )
+  # Leaf with ADAS ECU found behind instrument cluster instead of glovebox
+  # Currently the only known difference between them is the inverted seatbelt signal.
+  LEAF_IC = LEAF.override(platform_str="NISSAN LEAF 2018 Instrument Cluster", car_docs=[])
+  ROGUE = NissanPlatformConfig(
+    "NISSAN ROGUE 2019",
+    [NissanCarDocs("Nissan Rogue 2018-20")],
+    NissanCarSpecs(mass=1610, wheelbase=2.705)
+  )
+  ALTIMA = NissanPlatformConfig(
+    "NISSAN ALTIMA 2020",
+    [NissanCarDocs("Nissan Altima 2019-20", car_parts=CarParts.common([CarHarness.nissan_b]))],
+    NissanCarSpecs(mass=1492, wheelbase=2.824)
+  )
+
+
+DBC = CAR.create_dbc_map()
 
 # Default diagnostic session
 NISSAN_DIAGNOSTIC_REQUEST_KWP = bytes([uds.SERVICE_TYPE.DIAGNOSTIC_SESSION_CONTROL, 0x81])
@@ -89,11 +109,3 @@ FW_QUERY_CONFIG = FwQueryConfig(
     ),
   ]],
 )
-
-DBC = {
-  CAR.XTRAIL: dbc_dict('nissan_x_trail_2017_generated', None),
-  CAR.LEAF: dbc_dict('nissan_leaf_2018_generated', None),
-  CAR.LEAF_IC: dbc_dict('nissan_leaf_2018_generated', None),
-  CAR.ROGUE: dbc_dict('nissan_x_trail_2017_generated', None),
-  CAR.ALTIMA: dbc_dict('nissan_x_trail_2017_generated', None),
-}