From 49cad4c22e66d7042d574f4d30b5fd3eddda55ab Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Sat, 7 Jun 2025 17:38:09 -0400 Subject: [PATCH 1/2] Update Python packages (#991) * Update Python packages * bump --- opendbc_repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc_repo b/opendbc_repo index 202a26d94..3bd2bba8a 160000 --- a/opendbc_repo +++ b/opendbc_repo @@ -1 +1 @@ -Subproject commit 202a26d94315edaa981ce80ed73c6022d2d66997 +Subproject commit 3bd2bba8a752738a1d0065f8c9dc1d3bbf471b56 From f12d181d3b6e4a7ca5fc0621ed991e8e0885affc Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Sun, 8 Jun 2025 18:13:24 -0400 Subject: [PATCH 2/2] mapd: add to ignored processes list (#993) * mapd: add to ignored processes list * executable --- selfdrive/selfdrived/selfdrived.py | 1 + sunnypilot/mapd/mapd_installer.py | 2 +- sunnypilot/mapd/mapd_manager.py | 1 + system/hardware/hw.py | 1 - 4 files changed, 3 insertions(+), 2 deletions(-) mode change 100644 => 100755 sunnypilot/mapd/mapd_manager.py diff --git a/selfdrive/selfdrived/selfdrived.py b/selfdrive/selfdrived/selfdrived.py index 3ea396774..edd0ae7d7 100755 --- a/selfdrive/selfdrived/selfdrived.py +++ b/selfdrive/selfdrived/selfdrived.py @@ -132,6 +132,7 @@ class SelfdriveD(CruiseHelper): nvme_expected = os.path.exists('/dev/nvme0n1') or (not os.path.isfile("/persist/comma/living-in-the-moment")) if HARDWARE.get_device_type() == 'tici' and nvme_expected: self.ignored_processes = {'loggerd', } + self.ignored_processes.update({'mapd'}) # Determine startup event self.startup_event = EventName.startup if build_metadata.openpilot.comma_remote and build_metadata.tested_channel else EventName.startupMaster diff --git a/sunnypilot/mapd/mapd_installer.py b/sunnypilot/mapd/mapd_installer.py index ef7a3389e..0be30b5b6 100755 --- a/sunnypilot/mapd/mapd_installer.py +++ b/sunnypilot/mapd/mapd_installer.py @@ -1,10 +1,10 @@ +#!/usr/bin/env python3 """ Copyright (c) 2021-, Haibin Wen, sunnypilot, and a number of other contributors. This file is part of sunnypilot and is licensed under the MIT License. See the LICENSE.md file in the root directory for more details. """ -#!/usr/bin/env python3 import logging import os import stat diff --git a/sunnypilot/mapd/mapd_manager.py b/sunnypilot/mapd/mapd_manager.py old mode 100644 new mode 100755 index e5f43f5d4..342ba3fe7 --- a/sunnypilot/mapd/mapd_manager.py +++ b/sunnypilot/mapd/mapd_manager.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 """ Copyright (c) 2021-, Haibin Wen, sunnypilot, and a number of other contributors. diff --git a/system/hardware/hw.py b/system/hardware/hw.py index f582def48..5e40fff13 100644 --- a/system/hardware/hw.py +++ b/system/hardware/hw.py @@ -78,7 +78,6 @@ class Paths: else: return "/data/community/crashes" - @staticmethod def mapd_root() -> str: if PC: