From 26af5117defb3058a5acccbbf94393cc120df810 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 5 Feb 2024 02:59:08 -0600 Subject: [PATCH] wip --- selfdrive/car/hyundai/carstate.py | 7 +++++-- selfdrive/ui/ui.cc | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/selfdrive/car/hyundai/carstate.py b/selfdrive/car/hyundai/carstate.py index 67495ad..d3f79f1 100644 --- a/selfdrive/car/hyundai/carstate.py +++ b/selfdrive/car/hyundai/carstate.py @@ -352,8 +352,11 @@ class CarState(CarStateBase): return ret def calculate_speed_limit_canfd(self, CP, cp, cp_cam): - self._speed_limit_clu = cp.vl["CLUSTER_SPEED_LIMIT"]["SPEED_LIMIT_1"] - return self._speed_limit_clu if self._speed_limit_clu not in (0, 255) else 0 + try: + self._speed_limit_clu = cp.vl["CLUSTER_SPEED_LIMIT"]["SPEED_LIMIT_1"] + return self._speed_limit_clu if self._speed_limit_clu not in (0, 255) else 0 + catch: + return 0 def get_can_parser(self, CP): if CP.carFingerprint in CANFD_CAR: diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index 687acd0..fca3833 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -327,7 +327,8 @@ void ui_update_params(UIState *s) { scene.driver_camera = params.getBool("DriverCamera"); scene.experimental_mode_via_screen = params.getBool("ExperimentalModeViaScreen") && params.getBool("ExperimentalModeActivation"); scene.mute_dm = params.getBool("MuteDM") && params.getBool("FireTheBabysitter"); - scene.personalities_via_screen = (params.getInt("AdjustablePersonalities") == 2 || params.getInt("AdjustablePersonalities") == 3); + // scene.personalities_via_screen = (params.getInt("AdjustablePersonalities") == 2 || params.getInt("AdjustablePersonalities") == 3); + scene.personalities_via_screen = false; scene.quality_of_life_controls = params.getBool("QOLControls"); scene.reverse_cruise = params.getBool("ReverseCruise") && scene.quality_of_life_controls;