From 032b660fedbb5cf305be1a713830460a86620383 Mon Sep 17 00:00:00 2001
From: FrogAi <91348155+FrogAi@users.noreply.github.com>
Date: Sat, 11 May 2024 16:30:00 -0700
Subject: [PATCH] Controls - Device Management - Disable Uploads - Only Onroad

---
 selfdrive/manager/process_config.py | 2 +-
 system/loggerd/uploader.py          | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/selfdrive/manager/process_config.py b/selfdrive/manager/process_config.py
index fdd9900..04e2693 100644
--- a/selfdrive/manager/process_config.py
+++ b/selfdrive/manager/process_config.py
@@ -47,7 +47,7 @@ def allow_logging(started, params, CP: car.CarParams) -> bool:
   return allow_logging and logging(started, params, CP)
 
 def allow_uploads(started, params, CP: car.CarParams) -> bool:
-  allow_uploads = not (params.get_bool("DeviceManagement") and params.get_bool("NoUploads"))
+  allow_uploads = not (params.get_bool("DeviceManagement") and params.get_bool("NoUploads") and not params.get_bool("DisableOnroadUploads"))
   return allow_uploads
 
 procs = [
diff --git a/system/loggerd/uploader.py b/system/loggerd/uploader.py
index 832a227..e73a7b4 100755
--- a/system/loggerd/uploader.py
+++ b/system/loggerd/uploader.py
@@ -248,9 +248,11 @@ def main(exit_event: threading.Event = None) -> None:
   backoff = 0.1
   while not exit_event.is_set():
     sm.update(0)
+    disable_onroad_uploads = params.get_bool("DeviceManagement") and params.get_bool("NoUploads") and params.get_bool("DisableOnroadUploads")
     offroad = params.get_bool("IsOffroad")
     network_type = sm['deviceState'].networkType if not force_wifi else NetworkType.wifi
-    if network_type == NetworkType.none:
+    at_home = not disable_onroad_uploads or offroad and network_type in (NetworkType.ethernet, NetworkType.wifi)
+    if network_type == NetworkType.none or not at_home:
       if allow_sleep:
         time.sleep(60 if offroad else 5)
       continue