Force recognition

pull/22455/head
sunnyhaibin 4 years ago
parent 32539293a7
commit 6283b7f4c2
  1. 7
      selfdrive/car/car_helpers.py
  2. 1
      selfdrive/common/params.cc
  3. 2
      selfdrive/controls/controlsd.py
  4. 1
      selfdrive/manager/manager.py

@ -180,6 +180,11 @@ def get_car(logcan, sendcan):
cloudlog.warning("car doesn't match any fingerprints: %r", fingerprints)
candidate = "mock"
if Params().get("CarModel", encoding="utf8") is not None:
car_name = Params().get("CarModel", encoding="utf8")
car_name = car_name.rstrip('\n')
candidate = car_name
CarInterface, CarController, CarState = interfaces[candidate]
car_params = CarInterface.get_params(candidate, fingerprints, car_fw)
car_params.carVin = vin
@ -187,4 +192,4 @@ def get_car(logcan, sendcan):
car_params.fingerprintSource = source
car_params.fuzzyFingerprint = not exact_match
return CarInterface(car_params, CarController, CarState), car_params
return CarInterface(car_params, CarController, CarState), car_params, candidate

@ -208,6 +208,7 @@ std::unordered_map<std::string, uint32_t> keys = {
{"Offroad_TemperatureTooHigh", CLEAR_ON_MANAGER_START},
{"Offroad_UnofficialHardware", CLEAR_ON_MANAGER_START},
{"Offroad_UpdateFailed", CLEAR_ON_MANAGER_START},
{"CarModel", PERSISTENT},
};
} // namespace

@ -89,7 +89,7 @@ class Controls:
print("Waiting for CAN messages...")
get_one_can(self.can_sock)
self.CI, self.CP = get_car(self.can_sock, self.pm.sock['sendcan'])
self.CI, self.CP, candidate = get_car(self.can_sock, self.pm.sock['sendcan'])
# read params
self.is_metric = params.get_bool("IsMetric")

@ -36,6 +36,7 @@ def manager_init():
("CompletedTrainingVersion", "0"),
("HasAcceptedTerms", "0"),
("OpenpilotEnabledToggle", "1"),
("CarModel", "HYUNDAI IONIQ PHEV 2020"),
]
if not PC:
default_params.append(("LastUpdateTime", datetime.datetime.utcnow().isoformat().encode('utf8')))

Loading…
Cancel
Save