wip

selfdrive/car/body/carcontroller.py

@@ -4,6 +4,7 @@ from openpilot.common.realtime import DT_CTRL
 from opendbc.can.packer import CANPacker
 from openpilot.selfdrive.car.body import bodycan
 from openpilot.selfdrive.car.body.values import SPEED_FROM_RPM
+from openpilot.selfdrive.car.interfaces import CarControllerBase
 from openpilot.selfdrive.controls.lib.pid import PIDController
 
 
@@ -14,7 +15,7 @@ MAX_POS_INTEGRATOR = 0.2   # meters
 MAX_TURN_INTEGRATOR = 0.1  # meters
 
 
-class CarController:
+class CarController(CarControllerBase):
   def __init__(self, dbc_name, CP, VM):
     self.frame = 0
     self.packer = CANPacker(dbc_name)

selfdrive/car/body/interface.py

@@ -7,21 +7,17 @@ from openpilot.selfdrive.car.body.values import SPEED_FROM_RPM
 
 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.notCar = True
     ret.carName = "body"
     ret.safetyConfigs = [get_safety_config(car.CarParams.SafetyModel.body)]
 
     ret.minSteerSpeed = -math.inf
     ret.maxLateralAccel = math.inf  # TODO: set to a reasonable value
-    ret.steerRatio = 0.5
     ret.steerLimitTimer = 1.0
     ret.steerActuatorDelay = 0.
 
-    ret.mass = 9
-    ret.wheelbase = 0.406
     ret.wheelSpeedFactor = SPEED_FROM_RPM
-    ret.centerToFront = ret.wheelbase * 0.44
 
     ret.radarUnavailable = True
     ret.openpilotLongitudinalControl = True

selfdrive/car/body/values.py

@@ -1,9 +1,6 @@
-from enum import StrEnum
-from typing import Dict
-
 from cereal import car
-from openpilot.selfdrive.car import dbc_dict
-from openpilot.selfdrive.car.docs_definitions import CarInfo
+from openpilot.selfdrive.car import CarSpecs, PlatformConfig, Platforms, dbc_dict
+from openpilot.selfdrive.car.docs_definitions import CarDocs
 from openpilot.selfdrive.car.fw_query_definitions import FwQueryConfig, Request, StdQueries
 
 Ecu = car.CarParams.Ecu
@@ -22,13 +19,13 @@ class CarControllerParams:
     pass
 
 
-class CAR(StrEnum):
-  BODY = "COMMA BODY"
-
-
-CAR_INFO: Dict[str, CarInfo] = {
-  CAR.BODY: CarInfo("comma body", package="All"),
-}
+class CAR(Platforms):
+  BODY = PlatformConfig(
+    "COMMA BODY",
+    [CarDocs("comma body", package="All")],
+    CarSpecs(mass=9, wheelbase=0.406, steerRatio=0.5, centerToFrontRatio=0.44),
+    dbc_dict('comma_body', None),
+  )
 
 
 FW_QUERY_CONFIG = FwQueryConfig(
@@ -41,7 +38,4 @@ FW_QUERY_CONFIG = FwQueryConfig(
   ],
 )
 
-
-DBC = {
-  CAR.BODY: dbc_dict('comma_body', None),
-}
+DBC = CAR.create_dbc_map()