mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-09-15 03:53:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel-en' into devel-zhs

Browse Source
This commit is contained in:
dragonpilot
2019-10-11 13:14:08 +10:00
parent 30a17d23cc be1376ecd2
commit b0e1df656b
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/car/car_helpers.py
+3 -3
View File
@@ -94,9 +94,9 @@ def fingerprint(logcan, sendcan, has_relay):
done = False done = False
if params.get("DragonCacheCar", encoding='utf8') == "1" and params.get("DragonCachedFP", encoding='utf8') != "" and params.get("DragonCachedModel", encoding='utf8') != "": 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')) car_fingerprint = pickle.loads(params.get("DragonCachedModel"))
finger = pickle.loads(params.get("DragonCachedFP", encoding='utf8')) finger = pickle.loads(params.get("DragonCachedFP"))
vin = pickle.loads(params.get("DragonCachedVIN", encoding='utf8')) vin = pickle.loads(params.get("DragonCachedVIN"))
done = True done = True
while not done: while not done:
selfdrive/car/honda/carcontroller.py
+3 -2
View File
@@ -194,10 +194,11 @@ class CarController():
gasPressed = CS.pedal_gas > 0 gasPressed = CS.pedal_gas > 0
else: else:
gasPressed = CS.user_gas_pressed gasPressed = CS.user_gas_pressed
dragon_apply_brake = apply_brake
if self.dragon_allow_gas and gasPressed: if self.dragon_allow_gas and gasPressed:
apply_brake = 0 dragon_apply_brake = 0
apply_gas = 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)) pcm_override, pcm_cancel_cmd, hud.fcw, idx, CS.CP.carFingerprint, CS.CP.isPandaBlack))
self.apply_brake_last = apply_brake self.apply_brake_last = apply_brake