From a0e5e385d7b53237a6bc8d49ea8f7300a9e2c41e Mon Sep 17 00:00:00 2001 From: Dragonpilot Date: Fri, 2 Aug 2019 09:17:14 +1000 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=87=E7=B4=8B?= =?UTF-8?q?=E6=9A=AB=E5=AD=98=20logic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- selfdrive/car/car_helpers.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/selfdrive/car/car_helpers.py b/selfdrive/car/car_helpers.py index 14154a384..8bc7bf162 100644 --- a/selfdrive/car/car_helpers.py +++ b/selfdrive/car/car_helpers.py @@ -124,9 +124,10 @@ def fingerprint(logcan, sendcan, is_panda_black): frame += 1 - params.put("DragonCachedModel", pickle.dumps(car_fingerprint)) - params.put("DragonCachedFP", pickle.dumps(finger)) - params.put("DragonCachedVIN", pickle.dumps(vin)) + if succeeded: + params.put("DragonCachedModel", pickle.dumps(car_fingerprint)) + params.put("DragonCachedFP", pickle.dumps(finger)) + params.put("DragonCachedVIN", pickle.dumps(vin)) cloudlog.warning("fingerprinted %s", car_fingerprint) return car_fingerprint, finger, vin From 06a4ca837ed55c74b2bd00654d546d47c564d250 Mon Sep 17 00:00:00 2001 From: Dragonpilot Date: Fri, 2 Aug 2019 09:18:07 +1000 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=9E=E5=82=B3=E6=8C=87=E7=B4=8B?= =?UTF-8?q?=E5=88=B0=20sentry.io?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- selfdrive/car/car_helpers.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/selfdrive/car/car_helpers.py b/selfdrive/car/car_helpers.py index 8bc7bf162..d74892993 100644 --- a/selfdrive/car/car_helpers.py +++ b/selfdrive/car/car_helpers.py @@ -7,6 +7,7 @@ from common.fingerprints import eliminate_incompatible_cars, all_known_cars from selfdrive.swaglog import cloudlog import selfdrive.messaging as messaging import pickle +import selfdrive.crash as crash def get_startup_alert(car_recognized, controller_available): @@ -140,6 +141,12 @@ def get_car(logcan, sendcan, is_panda_black=False): if candidate is None: cloudlog.warning("car doesn't match any fingerprints: %r", fingerprints) candidate = "mock" + else: + cloudlog.warning("car does match fingerprint: %r", fingerprints) + try: + crash.capture_warning("fingerprinted %s" % candidate) + except: # fixes occasional travis errors + pass CarInterface, CarController = interfaces[candidate] car_params = CarInterface.get_params(candidate, fingerprints[0], vin, is_panda_black)