mirror of
https://github.com/infiniteCable2/openpilot.git
synced 2026-07-26 03:42:05 +08:00
adaptions after sync
This commit is contained in:
@@ -120,7 +120,7 @@ class SteeringLayout(Widget):
|
||||
def _update_state(self):
|
||||
super()._update_state()
|
||||
|
||||
torque_allowed = ui_state.CP is not None and ui_state.CP.steerControlType not in (car.CarParams.SteerControlType.angle, car.CarParams.SteerControlType.curvatureDEPRECATED)
|
||||
torque_allowed = ui_state.CP is not None and ui_state.CP.steerControlType not in (car.CarParams.SteerControlType.angle, car.CarParams.SteerControlType.curvature)
|
||||
if ui_state.CP is not None:
|
||||
mads_main_desc = self._mads_limited_desc if self._mads_settings_layout._mads_limited_settings() else self._mads_full_desc
|
||||
self._mads_toggle.set_description(f"<b>{mads_main_desc}</b><br><br>{self._mads_base_desc}")
|
||||
|
||||
@@ -186,7 +186,7 @@ class UIStateSP:
|
||||
|
||||
# Angle steering: no torque-based lateral controls
|
||||
if (CP.steerControlType == car.CarParams.SteerControlType.angle or
|
||||
CP.steerControlType == car.CarParams.SteerControlType.curvatureDEPRECATED):
|
||||
CP.steerControlType == car.CarParams.SteerControlType.curvature):
|
||||
self.params.remove("EnforceTorqueControl")
|
||||
self.params.remove("NeuralNetworkLateralControl")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user