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: 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