From 87270952c491aa80743f88f57e9e73e4657fcf95 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Mon, 21 Jul 2025 14:41:53 -0700
Subject: [PATCH] Revert "Save onroad/offroad uptime to param (#35769)"

This reverts commit 8ca0b821818d1caddf0d2cc7885fce2e16c24da9.
---
 common/params_keys.h         |  2 --
 system/hardware/hardwared.py | 20 --------------------
 system/manager/manager.py    |  2 --
 3 files changed, 24 deletions(-)

diff --git a/common/params_keys.h b/common/params_keys.h
index b250f38090..834afec13a 100644
--- a/common/params_keys.h
+++ b/common/params_keys.h
@@ -120,7 +120,5 @@ inline static std::unordered_map<std::string, uint32_t> keys = {
     {"UpdaterState", CLEAR_ON_MANAGER_START},
     {"UpdaterTargetBranch", CLEAR_ON_MANAGER_START},
     {"UpdaterLastFetchTime", PERSISTENT},
-    {"UptimeOffroad", PERSISTENT},
-    {"UptimeOnroad", PERSISTENT},
     {"Version", PERSISTENT},
 };
diff --git a/system/hardware/hardwared.py b/system/hardware/hardwared.py
index 947129142e..a5b50a38de 100755
--- a/system/hardware/hardwared.py
+++ b/system/hardware/hardwared.py
@@ -56,11 +56,6 @@ OFFROAD_DANGER_TEMP = 75
 prev_offroad_states: dict[str, tuple[bool, str | None]] = {}
 
 
-def read_uptime_from_param(params, param: str) -> float:
-  try:
-    return float(params.get(param))
-  except (TypeError, ValueError):
-    return 0.0
 
 def set_offroad_alert_if_changed(offroad_alert: str, show_alert: bool, extra_text: str | None=None):
   if prev_offroad_states.get(offroad_alert, None) == (show_alert, extra_text):
@@ -206,10 +201,6 @@ def hardware_thread(end_event, hw_queue) -> None:
   params = Params()
   power_monitor = PowerMonitoring()
 
-  uptime_offroad: float = read_uptime_from_param(params, "UptimeOffroad")
-  uptime_onroad: float = read_uptime_from_param(params, "UptimeOnroad")
-  last_uptime_ts: float = time.monotonic()
-
   HARDWARE.initialize_hardware()
   thermal_config = HARDWARE.get_thermal_config()
 
@@ -453,17 +444,6 @@ def hardware_thread(end_event, hw_queue) -> None:
 
     params.put_bool_nonblocking("NetworkMetered", msg.deviceState.networkMetered)
 
-    now_ts = time.monotonic()
-    if off_ts:
-      uptime_offroad += now_ts - max(last_uptime_ts, off_ts)
-    elif started_ts:
-      uptime_onroad += now_ts - max(last_uptime_ts, started_ts)
-    last_uptime_ts = now_ts
-
-    if (count % int(60. / DT_HW)) == 0:
-      params.put("UptimeOffroad", str(uptime_offroad))
-      params.put("UptimeOnroad", str(uptime_onroad))
-
     count += 1
     should_start_prev = should_start
 
diff --git a/system/manager/manager.py b/system/manager/manager.py
index ddb7638a76..01e02bf720 100755
--- a/system/manager/manager.py
+++ b/system/manager/manager.py
@@ -40,8 +40,6 @@ def manager_init() -> None:
     ("HasAcceptedTerms", "0"),
     ("LanguageSetting", "main_en"),
     ("OpenpilotEnabledToggle", "1"),
-    ("UptimeOffroad", "0.0"),
-    ("UptimeOnroad", "0.0"),
     ("LongitudinalPersonality", str(log.LongitudinalPersonality.standard)),
   ]