Sync: sunnypilot/sunnypilot:master into sunnypilot/openpilot-special:master-priv

system/loggerd/deleter.py

@@ -37,9 +37,9 @@ def get_preserved_segments(dirs_by_creation: list[str]) -> list[str]:
     except ValueError:
       continue
 
-    # preserve segment and its prior
-    preserved.append(d)
-    preserved.append(f"{date_str}--{seg_num - 1}")
+    # preserve segment and two prior
+    for _seg_num in range(max(0, seg_num - 2), seg_num + 1):
+      preserved.append(f"{date_str}--{_seg_num}")
 
   return preserved
 

system/logmessaged.py

@@ -31,7 +31,7 @@ def main() -> NoReturn:
 
       if len(record) > 2*1024*1024:
         print("WARNING: log too big to publish", len(record))
-        print(print(record[:100]))
+        print(record[:100])
         continue
 
       # then we publish them

system/timed.py

@@ -1,36 +1,12 @@
 #!/usr/bin/env python3
 import datetime
-import os
 import subprocess
 import time
 from typing import NoReturn
 
-from timezonefinder import TimezoneFinder
-
 import cereal.messaging as messaging
 from openpilot.common.time import system_time_valid
-from openpilot.common.params import Params
 from openpilot.common.swaglog import cloudlog
-from openpilot.system.hardware import AGNOS
-
-
-def set_timezone(timezone):
-  valid_timezones = subprocess.check_output('timedatectl list-timezones', shell=True, encoding='utf8').strip().split('\n')
-  if timezone not in valid_timezones:
-    cloudlog.error(f"Timezone not supported {timezone}")
-    return
-
-  cloudlog.debug(f"Setting timezone to {timezone}")
-  try:
-    if AGNOS:
-      tzpath = os.path.join("/usr/share/zoneinfo/", timezone)
-      subprocess.check_call(f'sudo su -c "ln -snf {tzpath} /data/etc/tmptime && \
-                              mv /data/etc/tmptime /data/etc/localtime"', shell=True)
-      subprocess.check_call(f'sudo su -c "echo \"{timezone}\" > /data/etc/timezone"', shell=True)
-    else:
-      subprocess.check_call(f'sudo timedatectl set-timezone {timezone}', shell=True)
-  except subprocess.CalledProcessError:
-    cloudlog.exception(f"Error setting timezone to {timezone}")
 
 
 def set_time(new_time):
@@ -48,23 +24,13 @@ def set_time(new_time):
 
 def main() -> NoReturn:
   """
-    timed has two responsibilities:
+    timed has one responsibility:
     - getting the current time
-    - getting the current timezone
 
-    GPS directly gives time, and timezone is looked up from GPS position.
+    GPS directly gives time.
     AGNOS will also use NTP to update the time.
   """
 
-  params = Params()
-
-  # Restore timezone from param
-  tz = params.get("Timezone", encoding='utf8')
-  tf = TimezoneFinder()
-  if tz is not None:
-    cloudlog.debug("Restoring timezone from param")
-    set_timezone(tz)
-
   pm = messaging.PubMaster(['clocks'])
   sm = messaging.SubMaster(['liveLocationKalman'])
   while True:
@@ -84,16 +50,6 @@ def main() -> NoReturn:
     gps_time = datetime.datetime.fromtimestamp(llk.unixTimestampMillis / 1000.)
     set_time(gps_time)
 
-    # set timezone
-    pos = llk.positionGeodetic.value
-    if len(pos) == 3:
-      gps_timezone = tf.timezone_at(lat=pos[0], lng=pos[1])
-      if gps_timezone is None:
-        cloudlog.critical(f"No timezone found based on {pos=}")
-      else:
-        set_timezone(gps_timezone)
-        params.put_nonblocking("Timezone", gps_timezone)
-
     time.sleep(10)
 
 if __name__ == "__main__":

system/updated/tests/test_base.py

@@ -133,7 +133,7 @@ class TestBaseUpdate:
 class ParamsBaseUpdateTest(TestBaseUpdate):
   def _test_finalized_update(self, branch, version, agnos_version, release_notes):
     assert self.params.get("UpdaterNewDescription", encoding="utf-8").startswith(f"{version} / {branch}")
-    assert self.params.get("UpdaterNewReleaseNotes", encoding="utf-8") == f"<p>{release_notes}</p>\n"
+    assert self.params.get("UpdaterNewReleaseNotes", encoding="utf-8") == f"{release_notes}\n"
     super()._test_finalized_update(branch, version, agnos_version, release_notes)
 
   def send_check_for_updates_signal(self, updated: ManagerProcess):