From adf8e823b9a54812011e9a338755e4e51cb886a9 Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Fri, 11 Oct 2019 09:47:26 +1000 Subject: [PATCH 1/4] Fixing up fp cache --- selfdrive/car/car_helpers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/selfdrive/car/car_helpers.py b/selfdrive/car/car_helpers.py index 09dc7fa85..bf3a6026d 100644 --- a/selfdrive/car/car_helpers.py +++ b/selfdrive/car/car_helpers.py @@ -134,9 +134,9 @@ def fingerprint(logcan, sendcan, has_relay): frame += 1 if succeeded: - put_nonblocking("DragonCachedModel", pickle.dumps(car_fingerprint)) - put_nonblocking("DragonCachedFP", pickle.dumps(finger)) - put_nonblocking("DragonCachedVIN", pickle.dumps(vin)) + put_nonblocking("DragonCachedModel", pickle.dumps(car_fingerprint.encode('utf8'))) + put_nonblocking("DragonCachedFP", pickle.dumps(finger.encode('utf8'))) + put_nonblocking("DragonCachedVIN", pickle.dumps(vin.encode('utf8'))) cloudlog.warning("fingerprinted %s", car_fingerprint) return car_fingerprint, finger, vin From a7602eae5ee3be9c987a2b4ed55aabb3d075ff55 Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Fri, 11 Oct 2019 09:57:07 +1000 Subject: [PATCH 2/4] Improve honda dp_allow_gas logic --- selfdrive/car/honda/carcontroller.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/selfdrive/car/honda/carcontroller.py b/selfdrive/car/honda/carcontroller.py index 76f4fbbe7..59ae644ce 100644 --- a/selfdrive/car/honda/carcontroller.py +++ b/selfdrive/car/honda/carcontroller.py @@ -194,10 +194,11 @@ class CarController(): gasPressed = CS.pedal_gas > 0 else: gasPressed = CS.user_gas_pressed + dragon_apply_brake = apply_brake if self.dragon_allow_gas and gasPressed: - apply_brake = 0 + dragon_apply_brake = 0 apply_gas = 0 - can_sends.append(hondacan.create_brake_command(self.packer, apply_brake, pump_on, + can_sends.append(hondacan.create_brake_command(self.packer, dragon_apply_brake, pump_on, pcm_override, pcm_cancel_cmd, hud.fcw, idx, CS.CP.carFingerprint, CS.CP.isPandaBlack)) self.apply_brake_last = apply_brake From 38a9cf948943860a437031191b9e57573d8efbc9 Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Fri, 11 Oct 2019 09:47:26 +1000 Subject: [PATCH 3/4] Revert "Fixing up fp cache" This reverts commit adf8e823b9a54812011e9a338755e4e51cb886a9. --- selfdrive/car/car_helpers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/selfdrive/car/car_helpers.py b/selfdrive/car/car_helpers.py index bf3a6026d..09dc7fa85 100644 --- a/selfdrive/car/car_helpers.py +++ b/selfdrive/car/car_helpers.py @@ -134,9 +134,9 @@ def fingerprint(logcan, sendcan, has_relay): frame += 1 if succeeded: - put_nonblocking("DragonCachedModel", pickle.dumps(car_fingerprint.encode('utf8'))) - put_nonblocking("DragonCachedFP", pickle.dumps(finger.encode('utf8'))) - put_nonblocking("DragonCachedVIN", pickle.dumps(vin.encode('utf8'))) + put_nonblocking("DragonCachedModel", pickle.dumps(car_fingerprint)) + put_nonblocking("DragonCachedFP", pickle.dumps(finger)) + put_nonblocking("DragonCachedVIN", pickle.dumps(vin)) cloudlog.warning("fingerprinted %s", car_fingerprint) return car_fingerprint, finger, vin From be1376ecd2a96ec1d406025b5c14f6de5e0d3d70 Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Fri, 11 Oct 2019 12:16:18 +1000 Subject: [PATCH 4/4] Fix FP cache --- selfdrive/car/car_helpers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/selfdrive/car/car_helpers.py b/selfdrive/car/car_helpers.py index 09dc7fa85..fadf60c93 100644 --- a/selfdrive/car/car_helpers.py +++ b/selfdrive/car/car_helpers.py @@ -94,9 +94,9 @@ def fingerprint(logcan, sendcan, has_relay): done = False if params.get("DragonCacheCar", encoding='utf8') == "1" and params.get("DragonCachedFP", encoding='utf8') != "" and params.get("DragonCachedModel", encoding='utf8') != "": - car_fingerprint = pickle.loads(params.get("DragonCachedModel", encoding='utf8')) - finger = pickle.loads(params.get("DragonCachedFP", encoding='utf8')) - vin = pickle.loads(params.get("DragonCachedVIN", encoding='utf8')) + car_fingerprint = pickle.loads(params.get("DragonCachedModel")) + finger = pickle.loads(params.get("DragonCachedFP")) + vin = pickle.loads(params.get("DragonCachedVIN")) done = True while not done: