From d07b7fd7a832832b7f1f167b5dc60a16778d2502 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 31 Oct 2022 18:37:43 -0700 Subject: [PATCH 1/2] PJ: support internal cd:/ paths (#26302) Update juggle.py --- tools/plotjuggler/juggle.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/plotjuggler/juggle.py b/tools/plotjuggler/juggle.py index b7c32d9bf1..1e592da3b1 100755 --- a/tools/plotjuggler/juggle.py +++ b/tools/plotjuggler/juggle.py @@ -89,7 +89,7 @@ def juggle_route(route_or_segment_name, segment_count, qlog, can, layout, dbc=No query = parse_qs(urlparse(route_or_segment_name).query) route_or_segment_name = query["route"][0] - if route_or_segment_name.startswith(("http://", "https://")) or os.path.isfile(route_or_segment_name): + if route_or_segment_name.startswith(("http://", "https://", "cd:/")) or os.path.isfile(route_or_segment_name): logs = [route_or_segment_name] elif ci: route_or_segment_name = SegmentName(route_or_segment_name, allow_route_name=True) From 3160493c85cb132abf5acb5e4e22fc4a7c108ef1 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 31 Oct 2022 19:44:53 -0700 Subject: [PATCH 2/2] Nissan: match panda standstill (#26301) * move to openpilot * draft * support internal urls * not used * update seg list * regen segment list * regen seg list * fix * check both rear wheels * revert chganges * bump panda * bump padna --- panda | 2 +- selfdrive/car/nissan/carstate.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/panda b/panda index 187fdee385..997e328074 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit 187fdee385e59a2a19f85760f529e8e381845dff +Subproject commit 997e328074e4b356c514e8d5e6570f151465d9e8 diff --git a/selfdrive/car/nissan/carstate.py b/selfdrive/car/nissan/carstate.py index a5ca237110..d6b6d17d55 100644 --- a/selfdrive/car/nissan/carstate.py +++ b/selfdrive/car/nissan/carstate.py @@ -44,7 +44,7 @@ class CarState(CarStateBase): ret.vEgoRaw = (ret.wheelSpeeds.fl + ret.wheelSpeeds.fr + ret.wheelSpeeds.rl + ret.wheelSpeeds.rr) / 4. ret.vEgo, ret.aEgo = self.update_speed_kf(ret.vEgoRaw) - ret.standstill = ret.vEgoRaw < 0.01 + ret.standstill = cp.vl["WHEEL_SPEEDS_REAR"]["WHEEL_SPEED_RL"] == 0.0 and cp.vl["WHEEL_SPEEDS_REAR"]["WHEEL_SPEED_RR"] == 0.0 if self.CP.carFingerprint == CAR.ALTIMA: ret.cruiseState.enabled = bool(cp.vl["CRUISE_STATE"]["CRUISE_ENABLED"])