From c37ccd456523a14c3d12014976e5440362c03441 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Fri, 8 Sep 2023 14:03:14 -0700
Subject: [PATCH] mock car cleanup (#29835)

* mock car cleanup

* fix
old-commit-hash: fb1b1f15aaaf401b20f790e61aebeb1b6d2c9249
---
 selfdrive/car/mock/interface.py       | 36 ++++-----------------------
 selfdrive/car/mock/radar_interface.py |  1 -
 2 files changed, 5 insertions(+), 32 deletions(-)
 mode change 100755 => 100644 selfdrive/car/mock/radar_interface.py

diff --git a/selfdrive/car/mock/interface.py b/selfdrive/car/mock/interface.py
index d36f972a87..c7821bdb97 100755
--- a/selfdrive/car/mock/interface.py
+++ b/selfdrive/car/mock/interface.py
@@ -1,61 +1,35 @@
 #!/usr/bin/env python3
 from cereal import car
-from openpilot.system.swaglog import cloudlog
 import cereal.messaging as messaging
-from openpilot.selfdrive.car import get_safety_config
 from openpilot.selfdrive.car.interfaces import CarInterfaceBase
 
-
-# mocked car interface to work with chffrplus
+# mocked car interface for dashcam mode
 class CarInterface(CarInterfaceBase):
   def __init__(self, CP, CarController, CarState):
     super().__init__(CP, CarController, CarState)
 
-    cloudlog.debug("Using Mock Car Interface")
-
-    self.sm = messaging.SubMaster(['gpsLocation', 'gpsLocationExternal'])
-
     self.speed = 0.
-    self.prev_speed = 0.
+    self.sm = messaging.SubMaster(['gpsLocation', 'gpsLocationExternal'])
 
   @staticmethod
   def _get_params(ret, candidate, fingerprint, car_fw, experimental_long, docs):
     ret.carName = "mock"
-    ret.safetyConfigs = [get_safety_config(car.CarParams.SafetyModel.noOutput)]
     ret.mass = 1700.
     ret.wheelbase = 2.70
     ret.centerToFront = ret.wheelbase * 0.5
-    ret.steerRatio = 13.  # reasonable
-
+    ret.steerRatio = 13.
     return ret
 
-  # returns a car.CarState
   def _update(self, c):
     self.sm.update(0)
     gps_sock = 'gpsLocationExternal' if self.sm.rcv_frame['gpsLocationExternal'] > 1 else 'gpsLocation'
-    if self.sm.updated[gps_sock]:
-      self.prev_speed = self.speed
-      self.speed = self.sm[gps_sock].speed
 
-    # create message
     ret = car.CarState.new_message()
-
-    # speeds
-    ret.vEgo = self.speed
-    ret.vEgoRaw = self.speed
-
-    ret.aEgo = self.speed - self.prev_speed
-    ret.brakePressed = ret.aEgo < -0.5
-
-    ret.standstill = self.speed < 0.01
-    ret.wheelSpeeds.fl = self.speed
-    ret.wheelSpeeds.fr = self.speed
-    ret.wheelSpeeds.rl = self.speed
-    ret.wheelSpeeds.rr = self.speed
+    ret.vEgo = self.sm[gps_sock].speed
+    ret.vEgoRaw = self.sm[gps_sock].speed
 
     return ret
 
   def apply(self, c, now_nanos):
-    # in mock no carcontrols
     actuators = car.CarControl.Actuators.new_message()
     return actuators, []
diff --git a/selfdrive/car/mock/radar_interface.py b/selfdrive/car/mock/radar_interface.py
old mode 100755
new mode 100644
index b461fcd5f8..e654bd61fd
--- a/selfdrive/car/mock/radar_interface.py
+++ b/selfdrive/car/mock/radar_interface.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 from openpilot.selfdrive.car.interfaces import RadarInterfaceBase
 
 class RadarInterface(RadarInterfaceBase):