Revert "NOO without Prime"

This reverts commit ccc34ea. remove selfdrive/navd/otisserv.py update translations
Edison-CBS · Oct 8, 2023 · 26506bd · 26506bd
1 parent 54fc8de
commit 26506bd
Show file tree

Hide file tree

Showing 37 changed files with 4 additions and 935 deletions.
diff --git a/Brewfile b/Brewfile
diff --git a/common/i18n.py b/common/i18n.py
diff --git a/common/params.cc b/common/params.cc
@@ -115,7 +115,6 @@ std::unordered_map<std::string, uint32_t> keys = {
     {"DoShutdown", CLEAR_ON_MANAGER_START},
     {"DoUninstall", CLEAR_ON_MANAGER_START},
     {"DrivingPersonalitiesUIWheel", PERSISTENT},
-    {"EnableGmap", PERSISTENT},
     {"ExperimentalLongitudinalEnabled", PERSISTENT},
     {"ExperimentalMode", PERSISTENT},
     {"ExperimentalModeConfirmed", PERSISTENT},
@@ -127,7 +126,6 @@ std::unordered_map<std::string, uint32_t> keys = {
     {"GithubSshKeys", PERSISTENT},
     {"GithubUsername", PERSISTENT},
     {"GitRemote", PERSISTENT},
-    {"GmapKey", PERSISTENT },
     {"GsmApn", PERSISTENT},
     {"GsmMetered", PERSISTENT},
     {"GsmRoaming", PERSISTENT},
@@ -161,11 +159,8 @@ std::unordered_map<std::string, uint32_t> keys = {
     {"LiveTorqueCarParams", PERSISTENT},
     {"LiveTorqueParameters", PERSISTENT | DONT_LOG},
     {"LongitudinalPersonality", PERSISTENT},
-    {"MapboxPublicKey", PERSISTENT},
-    {"MapboxSecretKey", PERSISTENT},
     {"NavDestination", CLEAR_ON_MANAGER_START | CLEAR_ON_OFFROAD_TRANSITION},
     {"NavDestinationWaypoints", CLEAR_ON_MANAGER_START | CLEAR_ON_OFFROAD_TRANSITION},
-    {"NavEnable", PERSISTENT},
     {"NavPastDestinations", PERSISTENT},
     {"NavSettingLeftSide", PERSISTENT},
     {"NavSettingTime24h", PERSISTENT},

diff --git a/selfdrive/assets/images/both_keys_set.png b/selfdrive/assets/images/both_keys_set.png
diff --git a/selfdrive/assets/images/no_keys_set.png b/selfdrive/assets/images/no_keys_set.png
diff --git a/selfdrive/assets/images/offline.png b/selfdrive/assets/images/offline.png
diff --git a/selfdrive/assets/images/public_key_set.png b/selfdrive/assets/images/public_key_set.png
diff --git a/selfdrive/assets/images/setup_completed.png b/selfdrive/assets/images/setup_completed.png
diff --git a/selfdrive/manager/process_config.py b/selfdrive/manager/process_config.py
@@ -5,10 +5,6 @@
 from openpilot.system.hardware import PC, TICI
 from openpilot.selfdrive.manager.process import PythonProcess, NativeProcess, DaemonProcess
 
-# FrogPilot variables
-params = Params()
-not_prime = params.get_int("PrimeType") == 0
-
 WEBCAM = os.getenv("USE_WEBCAM") is not None
 
 def driverview(started: bool, params: Params, CP: car.CarParams) -> bool:
@@ -91,9 +87,6 @@ def only_offroad(started, params, CP: car.CarParams) -> bool:
   # debug procs
   NativeProcess("bridge", "cereal/messaging", ["./bridge"], notcar),
   PythonProcess("webjoystick", "tools.bodyteleop.web", notcar),
-
-  # FrogPilot procs
-  PythonProcess("otisserv", "selfdrive.navd.otisserv", always_run, enabled=not_prime),
 ]
 
 managed_processes = {p.name: p for p in procs}
diff --git a/selfdrive/navd/navd.py b/selfdrive/navd/navd.py
@@ -48,12 +48,7 @@ def __init__(self, sm, pm):
 
     self.reroute_counter = 0
 
-    if self.params.get_int("PrimeType") == 0:
-      self.mapbox_token = self.params.get("MapboxPublicKey", encoding='utf8')
-      self.mapbox_host = "https://api.mapbox.com"
-    elif "MAPBOX_TOKEN" in os.environ:
-      self.params.put("MapboxPublicKey", "")
-      self.params.put("MapboxSecretKey", "")
+    if "MAPBOX_TOKEN" in os.environ:
       self.mapbox_token = os.environ["MAPBOX_TOKEN"]
       self.mapbox_host = "https://api.mapbox.com"
     else: