now alpha long

pull/35011/head
Shane Smiskol 2 weeks ago
parent 24c2d9a68a
commit 2bfb564206
  1. 2
      opendbc_repo
  2. 4
      selfdrive/car/card.py
  3. 2
      selfdrive/debug/set_car_params.py
  4. 2
      selfdrive/selfdrived/selfdrived.py
  5. 2
      selfdrive/ui/tests/test_ui/run.py

@ -1 +1 @@
Subproject commit 81820502a038b64e97caae81377ac65a3b86703e
Subproject commit 60cf9e33bee6eb598fc55c867eeb484f285b7ea7

@ -89,7 +89,7 @@ class Car:
if len(can.can) > 0:
break
experimental_long_allowed = self.params.get_bool("ExperimentalLongitudinalEnabled")
alpha_long_allowed = self.params.get_bool("ExperimentalLongitudinalEnabled")
num_pandas = len(messaging.recv_one_retry(self.sm.sock['pandaStates']).pandaStates)
cached_params = None
@ -98,7 +98,7 @@ class Car:
with car.CarParams.from_bytes(cached_params_raw) as _cached_params:
cached_params = _cached_params
self.CI = get_car(*self.can_callbacks, obd_callback(self.params), experimental_long_allowed, num_pandas, cached_params)
self.CI = get_car(*self.can_callbacks, obd_callback(self.params), alpha_long_allowed, num_pandas, cached_params)
self.RI = interfaces[self.CI.CP.carFingerprint].RadarInterface(self.CI.CP)
self.CP = self.CI.CP

@ -15,7 +15,7 @@ if __name__ == "__main__":
else:
CP = car.CarParams.new_message()
CP.openpilotLongitudinalControl = True
CP.experimentalLongitudinalAvailable = False
CP.alphaLongitudinalAvailable = False
cp_bytes = CP.to_bytes()
for p in ("CarParams", "CarParamsCache", "CarParamsPersistent"):

@ -89,7 +89,7 @@ class SelfdriveD:
car_recognized = self.CP.brand != 'mock'
# cleanup old params
if not self.CP.experimentalLongitudinalAvailable:
if not self.CP.alphaLongitudinalAvailable:
self.params.remove("ExperimentalLongitudinalEnabled")
if not self.CP.openpilotLongitudinalControl:
self.params.remove("ExperimentalMode")

@ -56,7 +56,7 @@ def setup_settings_firehose(click, pm: PubMaster):
def setup_settings_developer(click, pm: PubMaster):
CP = car.CarParams()
CP.experimentalLongitudinalAvailable = True
CP.alphaLongitudinalAvailable = True
Params().put("CarParamsPersistent", CP.to_bytes())
setup_settings_device(click, pm)

Loading…
Cancel
Save