brianhansonxyz/oscarpilot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Your Name
2024-02-05 02:59:08 -06:00
parent a8a7c6a20c
commit 26af5117de
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
selfdrive/car/hyundai/carstate.py
View File

@@ -352,8 +352,11 @@ class CarState(CarStateBase):
return ret return ret
def calculate_speed_limit_canfd(self, CP, cp, cp_cam): def calculate_speed_limit_canfd(self, CP, cp, cp_cam):
try:
self._speed_limit_clu = cp.vl["CLUSTER_SPEED_LIMIT"]["SPEED_LIMIT_1"] 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 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): def get_can_parser(self, CP):
if CP.carFingerprint in CANFD_CAR: if CP.carFingerprint in CANFD_CAR:

3
selfdrive/ui/ui.cc
View File

@@ -327,7 +327,8 @@ void ui_update_params(UIState *s) {
scene.driver_camera = params.getBool("DriverCamera"); scene.driver_camera = params.getBool("DriverCamera");
scene.experimental_mode_via_screen = params.getBool("ExperimentalModeViaScreen") && params.getBool("ExperimentalModeActivation"); scene.experimental_mode_via_screen = params.getBool("ExperimentalModeViaScreen") && params.getBool("ExperimentalModeActivation");
scene.mute_dm = params.getBool("MuteDM") && params.getBool("FireTheBabysitter"); 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.quality_of_life_controls = params.getBool("QOLControls");
scene.reverse_cruise = params.getBool("ReverseCruise") && scene.quality_of_life_controls; scene.reverse_cruise = params.getBool("ReverseCruise") && scene.quality_of_life_controls;