Vehicles - Force Fingerprint
Added function to automatically detect the vehicle's fingerprint if it exists, or an option to force the vehicle's fingerprint if it doesn't.
This commit is contained in:
parent
c0b14e1c8d
commit
9e1968be87
@ -202,12 +202,24 @@ def get_car_interface(CP):
|
|||||||
|
|
||||||
|
|
||||||
def get_car(params, logcan, sendcan, disable_openpilot_long, experimental_long_allowed, num_pandas=1):
|
def get_car(params, logcan, sendcan, disable_openpilot_long, experimental_long_allowed, num_pandas=1):
|
||||||
|
car_brand = params.get("CarMake", encoding='utf-8')
|
||||||
|
car_model = params.get("CarModel", encoding='utf-8')
|
||||||
|
|
||||||
|
force_fingerprint = params.get_bool("ForceFingerprint")
|
||||||
|
|
||||||
candidate, fingerprints, vin, car_fw, source, exact_match = fingerprint(logcan, sendcan, num_pandas)
|
candidate, fingerprints, vin, car_fw, source, exact_match = fingerprint(logcan, sendcan, num_pandas)
|
||||||
|
|
||||||
if candidate is None:
|
if candidate is None or force_fingerprint:
|
||||||
|
if car_model is not None:
|
||||||
|
candidate = car_model
|
||||||
|
else:
|
||||||
cloudlog.event("car doesn't match any fingerprints", fingerprints=repr(fingerprints), error=True)
|
cloudlog.event("car doesn't match any fingerprints", fingerprints=repr(fingerprints), error=True)
|
||||||
candidate = "mock"
|
candidate = "mock"
|
||||||
|
|
||||||
|
if car_model is None and candidate != "mock":
|
||||||
|
params.put("CarMake", candidate.split(' ')[0].title())
|
||||||
|
params.put("CarModel", candidate)
|
||||||
|
|
||||||
if get_short_branch() == "FrogPilot-Development" and not Params("/persist/params").get_bool("FrogsGoMoo"):
|
if get_short_branch() == "FrogPilot-Development" and not Params("/persist/params").get_bool("FrogsGoMoo"):
|
||||||
cloudlog.event("Blocked user from using the 'FrogPilot-Development' branch", fingerprints=repr(fingerprints), error=True)
|
cloudlog.event("Blocked user from using the 'FrogPilot-Development' branch", fingerprints=repr(fingerprints), error=True)
|
||||||
candidate = "mock"
|
candidate = "mock"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user