Merge remote-tracking branch 'upstream/master' into big-test-models

panda

@@ -1 +1 @@
-Subproject commit 187fdee385e59a2a19f85760f529e8e381845dff
+Subproject commit 997e328074e4b356c514e8d5e6570f151465d9e8

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"])

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)