more cleanup

This commit is contained in:
Jason Wen
2025-01-12 16:48:44 -05:00
parent e7d27f0bb9
commit c3fde45000
2 changed files with 5 additions and 5 deletions
@@ -1,5 +1,6 @@
from cereal import messaging, custom
from openpilot.sunnypilot.selfdrive.controls.lib.dynamic_experimental_controller import DynamicExperimentalController
MpcSource = custom.LongitudinalPlanSP.MpcSource
@@ -29,9 +30,7 @@ class DecLongitudinalPlanner:
# DEC
longitudinalPlanSP.mpcSource = MpcSource.blended if self.mpc.mode == 'blended' else MpcSource.acc
print(f"mpcSource: {longitudinalPlanSP.mpcSource}")
longitudinalPlanSP.dynamicExperimentalControl = self.dynamic_experimental_controller.is_enabled()
print(f"dynamicExperimentalControl: {longitudinalPlanSP.dynamicExperimentalControl}")
pm.send('longitudinalPlanSP', plan_sp_send)
@@ -185,7 +185,7 @@ class DynamicExperimentalController:
return LEAD_PROB + 0.1 # Increase the threshold on highways
return LEAD_PROB
def _update(self, car_state, lead_one, md, controls_state): # , maneuver_distance):
def _update(self, car_state, lead_one, md):
self._v_ego_kph = car_state.vEgo * 3.6
self._v_cruise_kph = car_state.vCruise
self._has_lead = lead_one.status
@@ -371,13 +371,14 @@ class DynamicExperimentalController:
car_state = sm['carState']
lead_one = sm['radarState'].leadOne
md = sm['modelV2']
controls_state = sm['controlsState']
if self._is_enabled:
self._update(car_state, lead_one, md, controls_state)
self._update(car_state, lead_one, md)
if radar_unavailable:
self._radarless_mode()
else:
self._radar_mode()
self._mode_changed = self._mode != self._mode_prev
self._mode_prev = self._mode