From cbda3f7994322ed40b428ea49c5bd868ff018700 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Fri, 7 Aug 2026 18:49:27 -0700 Subject: [PATCH] Rename hardware/tici/ -> hardware/comma/ (#38580) --- .gitattributes | 2 +- Jenkinsfile | 2 +- launch_chffrplus.sh | 6 +++--- openpilot/common/hardware/__init__.py | 2 +- openpilot/common/hardware/{tici => comma}/__init__.py | 0 openpilot/common/hardware/{tici => comma}/agnos.json | 0 openpilot/common/hardware/{tici => comma}/agnos.py | 2 +- .../common/hardware/{tici => comma}/all-partitions.json | 0 openpilot/common/hardware/{tici => comma}/amplifier.py | 0 openpilot/common/hardware/{tici => comma}/hardware.h | 0 openpilot/common/hardware/{tici => comma}/hardware.py | 4 ++-- openpilot/common/hardware/{tici => comma}/id_rsa | 0 openpilot/common/hardware/{tici => comma}/modem.py | 0 openpilot/common/hardware/{tici => comma}/pins.py | 0 openpilot/common/hardware/{tici => comma}/power_monitor.py | 0 openpilot/common/hardware/{tici => comma}/tests/__init__.py | 0 .../hardware/{tici => comma}/tests/test_agnos_updater.py | 0 .../common/hardware/{tici => comma}/tests/test_amplifier.py | 2 +- openpilot/common/hardware/{tici => comma}/updater | 0 openpilot/common/hardware/hw.h | 2 +- openpilot/selfdrive/pandad/tests/test_pandad.py | 2 +- openpilot/selfdrive/test/test_onroad.py | 2 +- openpilot/selfdrive/test/test_power_draw.py | 2 +- openpilot/system/hardware/{tici => comma}/agnos.json | 0 openpilot/system/manager/process_config.py | 2 +- openpilot/system/qcomgpsd/nmeaport.py | 2 +- openpilot/system/qcomgpsd/qcomgpsd.py | 2 +- openpilot/system/ubloxd/pigeond.py | 2 +- openpilot/system/ubloxd/tests/test_pigeond.py | 2 +- openpilot/system/updated/updated.py | 4 ++-- tools/op.sh | 4 ++-- tools/scripts/ssh.py | 2 +- 32 files changed, 24 insertions(+), 24 deletions(-) rename openpilot/common/hardware/{tici => comma}/__init__.py (100%) rename openpilot/common/hardware/{tici => comma}/agnos.json (100%) rename openpilot/common/hardware/{tici => comma}/agnos.py (99%) rename openpilot/common/hardware/{tici => comma}/all-partitions.json (100%) rename openpilot/common/hardware/{tici => comma}/amplifier.py (100%) rename openpilot/common/hardware/{tici => comma}/hardware.h (100%) rename openpilot/common/hardware/{tici => comma}/hardware.py (99%) rename openpilot/common/hardware/{tici => comma}/id_rsa (100%) rename openpilot/common/hardware/{tici => comma}/modem.py (100%) rename openpilot/common/hardware/{tici => comma}/pins.py (100%) rename openpilot/common/hardware/{tici => comma}/power_monitor.py (100%) rename openpilot/common/hardware/{tici => comma}/tests/__init__.py (100%) rename openpilot/common/hardware/{tici => comma}/tests/test_agnos_updater.py (100%) rename openpilot/common/hardware/{tici => comma}/tests/test_amplifier.py (96%) rename openpilot/common/hardware/{tici => comma}/updater (100%) rename openpilot/system/hardware/{tici => comma}/agnos.json (100%) diff --git a/.gitattributes b/.gitattributes index 1cf541aa3a..5cb404146d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -11,4 +11,4 @@ *.wav filter=lfs diff=lfs merge=lfs -text openpilot/selfdrive/car/tests/test_models_segs.txt filter=lfs diff=lfs merge=lfs -text -openpilot/common/hardware/tici/updater filter=lfs diff=lfs merge=lfs -text +openpilot/common/hardware/comma/updater filter=lfs diff=lfs merge=lfs -text diff --git a/Jenkinsfile b/Jenkinsfile index 7c8d1c060e..341df8a8dd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -248,7 +248,7 @@ node { step("build openpilot", "cd openpilot/system/manager && ./build.py"), step("test pandad loopback", "./openpilot/selfdrive/pandad/tests/test_pandad_loopback.py"), step("test pandad spi", "./openpilot/selfdrive/pandad/tests/test_pandad_spi.py"), - step("test amp", "./openpilot/common/hardware/tici/tests/test_amplifier.py"), + step("test amp", "./openpilot/common/hardware/comma/tests/test_amplifier.py"), ]) }, diff --git a/launch_chffrplus.sh b/launch_chffrplus.sh index 4f767f3b19..62ebffd27b 100755 --- a/launch_chffrplus.sh +++ b/launch_chffrplus.sh @@ -19,12 +19,12 @@ function agnos_init { # Check if AGNOS update is required if [ $(< /VERSION) != "$AGNOS_VERSION" ]; then - AGNOS_PY="$DIR/openpilot/common/hardware/tici/agnos.py" - MANIFEST="$DIR/openpilot/system/hardware/tici/agnos.json" + AGNOS_PY="$DIR/openpilot/common/hardware/comma/agnos.py" + MANIFEST="$DIR/openpilot/system/hardware/comma/agnos.json" if $AGNOS_PY --verify $MANIFEST; then sudo reboot fi - $DIR/openpilot/common/hardware/tici/updater $AGNOS_PY $MANIFEST + $DIR/openpilot/common/hardware/comma/updater $AGNOS_PY $MANIFEST fi } diff --git a/openpilot/common/hardware/__init__.py b/openpilot/common/hardware/__init__.py index 3387d8a0ca..99e619b33b 100644 --- a/openpilot/common/hardware/__init__.py +++ b/openpilot/common/hardware/__init__.py @@ -2,7 +2,7 @@ import os from typing import cast from openpilot.common.hardware.base import HardwareBase -from openpilot.common.hardware.tici.hardware import Tici +from openpilot.common.hardware.comma.hardware import Tici from openpilot.common.hardware.pc.hardware import Pc TICI = os.path.isfile('/TICI') diff --git a/openpilot/common/hardware/tici/__init__.py b/openpilot/common/hardware/comma/__init__.py similarity index 100% rename from openpilot/common/hardware/tici/__init__.py rename to openpilot/common/hardware/comma/__init__.py diff --git a/openpilot/common/hardware/tici/agnos.json b/openpilot/common/hardware/comma/agnos.json similarity index 100% rename from openpilot/common/hardware/tici/agnos.json rename to openpilot/common/hardware/comma/agnos.json diff --git a/openpilot/common/hardware/tici/agnos.py b/openpilot/common/hardware/comma/agnos.py similarity index 99% rename from openpilot/common/hardware/tici/agnos.py rename to openpilot/common/hardware/comma/agnos.py index b3b5e05176..de0fb24551 100755 --- a/openpilot/common/hardware/tici/agnos.py +++ b/openpilot/common/hardware/comma/agnos.py @@ -12,7 +12,7 @@ import requests SPARSE_CHUNK_FMT = struct.Struct('H2xI4x') -AGNOS_MANIFEST_FILE = "openpilot/system/hardware/tici/agnos.json" +AGNOS_MANIFEST_FILE = "openpilot/system/hardware/comma/agnos.json" class StreamingDecompressor: diff --git a/openpilot/common/hardware/tici/all-partitions.json b/openpilot/common/hardware/comma/all-partitions.json similarity index 100% rename from openpilot/common/hardware/tici/all-partitions.json rename to openpilot/common/hardware/comma/all-partitions.json diff --git a/openpilot/common/hardware/tici/amplifier.py b/openpilot/common/hardware/comma/amplifier.py similarity index 100% rename from openpilot/common/hardware/tici/amplifier.py rename to openpilot/common/hardware/comma/amplifier.py diff --git a/openpilot/common/hardware/tici/hardware.h b/openpilot/common/hardware/comma/hardware.h similarity index 100% rename from openpilot/common/hardware/tici/hardware.h rename to openpilot/common/hardware/comma/hardware.h diff --git a/openpilot/common/hardware/tici/hardware.py b/openpilot/common/hardware/comma/hardware.py similarity index 99% rename from openpilot/common/hardware/tici/hardware.py rename to openpilot/common/hardware/comma/hardware.py index aa125ed97d..3bd1538a36 100644 --- a/openpilot/common/hardware/tici/hardware.py +++ b/openpilot/common/hardware/comma/hardware.py @@ -13,8 +13,8 @@ from openpilot.common.gpio import gpio_set, gpio_init, get_irqs_for_action from openpilot.common.esim.base import LPABase from openpilot.common.hardware.base import HardwareBase, ThermalConfig, ThermalZone from openpilot.common.esim.lpa import TiciLPA -from openpilot.common.hardware.tici.pins import GPIO -from openpilot.common.hardware.tici.amplifier import Amplifier +from openpilot.common.hardware.comma.pins import GPIO +from openpilot.common.hardware.comma.amplifier import Amplifier MODEM_STATE_PATH = "/dev/shm/modem" diff --git a/openpilot/common/hardware/tici/id_rsa b/openpilot/common/hardware/comma/id_rsa similarity index 100% rename from openpilot/common/hardware/tici/id_rsa rename to openpilot/common/hardware/comma/id_rsa diff --git a/openpilot/common/hardware/tici/modem.py b/openpilot/common/hardware/comma/modem.py similarity index 100% rename from openpilot/common/hardware/tici/modem.py rename to openpilot/common/hardware/comma/modem.py diff --git a/openpilot/common/hardware/tici/pins.py b/openpilot/common/hardware/comma/pins.py similarity index 100% rename from openpilot/common/hardware/tici/pins.py rename to openpilot/common/hardware/comma/pins.py diff --git a/openpilot/common/hardware/tici/power_monitor.py b/openpilot/common/hardware/comma/power_monitor.py similarity index 100% rename from openpilot/common/hardware/tici/power_monitor.py rename to openpilot/common/hardware/comma/power_monitor.py diff --git a/openpilot/common/hardware/tici/tests/__init__.py b/openpilot/common/hardware/comma/tests/__init__.py similarity index 100% rename from openpilot/common/hardware/tici/tests/__init__.py rename to openpilot/common/hardware/comma/tests/__init__.py diff --git a/openpilot/common/hardware/tici/tests/test_agnos_updater.py b/openpilot/common/hardware/comma/tests/test_agnos_updater.py similarity index 100% rename from openpilot/common/hardware/tici/tests/test_agnos_updater.py rename to openpilot/common/hardware/comma/tests/test_agnos_updater.py diff --git a/openpilot/common/hardware/tici/tests/test_amplifier.py b/openpilot/common/hardware/comma/tests/test_amplifier.py similarity index 96% rename from openpilot/common/hardware/tici/tests/test_amplifier.py rename to openpilot/common/hardware/comma/tests/test_amplifier.py index 2845805860..d26e2e0518 100755 --- a/openpilot/common/hardware/tici/tests/test_amplifier.py +++ b/openpilot/common/hardware/comma/tests/test_amplifier.py @@ -7,7 +7,7 @@ import unittest from panda import Panda from openpilot.common.test import OpenpilotTestCase from openpilot.common.hardware import HARDWARE -from openpilot.common.hardware.tici.amplifier import Amplifier +from openpilot.common.hardware.comma.amplifier import Amplifier class TestAmplifier(OpenpilotTestCase): diff --git a/openpilot/common/hardware/tici/updater b/openpilot/common/hardware/comma/updater similarity index 100% rename from openpilot/common/hardware/tici/updater rename to openpilot/common/hardware/comma/updater diff --git a/openpilot/common/hardware/hw.h b/openpilot/common/hardware/hw.h index 1e097d99b1..d5711de24d 100644 --- a/openpilot/common/hardware/hw.h +++ b/openpilot/common/hardware/hw.h @@ -6,7 +6,7 @@ #include "common/util.h" #if __TICI__ -#include "common/hardware/tici/hardware.h" +#include "common/hardware/comma/hardware.h" #define Hardware HardwareTici #else #include "common/hardware/pc/hardware.h" diff --git a/openpilot/selfdrive/pandad/tests/test_pandad.py b/openpilot/selfdrive/pandad/tests/test_pandad.py index 0b5ea89a9d..bead2ffa84 100755 --- a/openpilot/selfdrive/pandad/tests/test_pandad.py +++ b/openpilot/selfdrive/pandad/tests/test_pandad.py @@ -11,7 +11,7 @@ from openpilot.common.gpio import gpio_set, gpio_init from panda import Panda, PandaDFU from openpilot.system.manager.process_config import managed_processes from openpilot.common.hardware import HARDWARE -from openpilot.common.hardware.tici.pins import GPIO +from openpilot.common.hardware.comma.pins import GPIO HERE = os.path.dirname(os.path.realpath(__file__)) diff --git a/openpilot/selfdrive/test/test_onroad.py b/openpilot/selfdrive/test/test_onroad.py index 57bf48ee81..9a514139c2 100755 --- a/openpilot/selfdrive/test/test_onroad.py +++ b/openpilot/selfdrive/test/test_onroad.py @@ -69,7 +69,7 @@ PROCS = { "openpilot.system.loggerd.deleter": 1.0, "./pandad": 19.0, "openpilot.system.qcomgpsd.qcomgpsd": 1.0, - "openpilot.common.hardware.tici.modem": 10.0, + "openpilot.common.hardware.comma.modem": 10.0, } TIMINGS = { diff --git a/openpilot/selfdrive/test/test_power_draw.py b/openpilot/selfdrive/test/test_power_draw.py index 4c2a15a41f..01856f81e8 100755 --- a/openpilot/selfdrive/test/test_power_draw.py +++ b/openpilot/selfdrive/test/test_power_draw.py @@ -13,7 +13,7 @@ from openpilot.cereal.services import SERVICE_LIST from opendbc.car.car_helpers import get_demo_car_params from openpilot.common.mock import mock_messages from openpilot.common.params import Params -from openpilot.common.hardware.tici.power_monitor import get_power +from openpilot.common.hardware.comma.power_monitor import get_power from openpilot.system.manager.process_config import managed_processes from openpilot.system.manager.manager import manager_cleanup diff --git a/openpilot/system/hardware/tici/agnos.json b/openpilot/system/hardware/comma/agnos.json similarity index 100% rename from openpilot/system/hardware/tici/agnos.json rename to openpilot/system/hardware/comma/agnos.json diff --git a/openpilot/system/manager/process_config.py b/openpilot/system/manager/process_config.py index 1e9e236c97..a4326b4107 100644 --- a/openpilot/system/manager/process_config.py +++ b/openpilot/system/manager/process_config.py @@ -112,7 +112,7 @@ procs = [ PythonProcess("lateral_maneuversd", "openpilot.tools.lateral_maneuvers.lateral_maneuversd", lat_maneuver), PythonProcess("radard", "openpilot.selfdrive.controls.radard", only_onroad), PythonProcess("hardwared", "openpilot.system.hardware.hardwared", always_run), - PythonProcess("modem", "openpilot.common.hardware.tici.modem", always_run, enabled=TICI), + PythonProcess("modem", "openpilot.common.hardware.comma.modem", always_run, enabled=TICI), PythonProcess("tombstoned", "openpilot.system.tombstoned", always_run, enabled=not PC), PythonProcess("updated", "openpilot.system.updated.updated", only_offroad, enabled=not PC), PythonProcess("uploader", "openpilot.system.loggerd.uploader", always_run), diff --git a/openpilot/system/qcomgpsd/nmeaport.py b/openpilot/system/qcomgpsd/nmeaport.py index db1fe5552d..e270e23a3a 100644 --- a/openpilot/system/qcomgpsd/nmeaport.py +++ b/openpilot/system/qcomgpsd/nmeaport.py @@ -121,7 +121,7 @@ def process_nmea_port_messages(device:str="/dev/ttyUSB1") -> NoReturn: def main() -> NoReturn: from openpilot.common.gpio import gpio_init, gpio_set - from openpilot.common.hardware.tici.pins import GPIO + from openpilot.common.hardware.comma.pins import GPIO from openpilot.system.qcomgpsd.qcomgpsd import at_cmd try: diff --git a/openpilot/system/qcomgpsd/qcomgpsd.py b/openpilot/system/qcomgpsd/qcomgpsd.py index 4e52154419..6261b18d56 100755 --- a/openpilot/system/qcomgpsd/qcomgpsd.py +++ b/openpilot/system/qcomgpsd/qcomgpsd.py @@ -15,7 +15,7 @@ import openpilot.cereal.messaging as messaging from openpilot.common.gpio import gpio_init, gpio_set from openpilot.common.utils import retry from openpilot.common.time_helpers import system_time_valid -from openpilot.common.hardware.tici.pins import GPIO +from openpilot.common.hardware.comma.pins import GPIO from openpilot.common.serial import Serial from openpilot.common.swaglog import cloudlog from openpilot.system.qcomgpsd.modemdiag import ModemDiag, DIAG_LOG_F, setup_logs, send_recv diff --git a/openpilot/system/ubloxd/pigeond.py b/openpilot/system/ubloxd/pigeond.py index 9891285465..f704761e35 100755 --- a/openpilot/system/ubloxd/pigeond.py +++ b/openpilot/system/ubloxd/pigeond.py @@ -14,7 +14,7 @@ from openpilot.common.serial import Serial from openpilot.common.swaglog import cloudlog from openpilot.common.hardware import TICI from openpilot.common.gpio import gpio_init, gpio_set -from openpilot.common.hardware.tici.pins import GPIO +from openpilot.common.hardware.comma.pins import GPIO UBLOX_TTY = "/dev/ttyHS0" diff --git a/openpilot/system/ubloxd/tests/test_pigeond.py b/openpilot/system/ubloxd/tests/test_pigeond.py index b7a0cd216d..87e3f18523 100644 --- a/openpilot/system/ubloxd/tests/test_pigeond.py +++ b/openpilot/system/ubloxd/tests/test_pigeond.py @@ -6,7 +6,7 @@ from openpilot.cereal.services import SERVICE_LIST from openpilot.common.gpio import gpio_read from openpilot.selfdrive.test.helpers import with_processes from openpilot.system.manager.process_config import managed_processes -from openpilot.common.hardware.tici.pins import GPIO +from openpilot.common.hardware.comma.pins import GPIO # TODO: test TTFF when we have good A-GNSS diff --git a/openpilot/system/updated/updated.py b/openpilot/system/updated/updated.py index 9610785861..24acb2fd17 100755 --- a/openpilot/system/updated/updated.py +++ b/openpilot/system/updated/updated.py @@ -203,7 +203,7 @@ def finalize_update() -> None: def handle_agnos_update() -> None: - from openpilot.common.hardware.tici.agnos import flash_agnos_update, get_target_slot_number + from openpilot.common.hardware.comma.agnos import flash_agnos_update, get_target_slot_number cur_version = HARDWARE.get_os_version() updated_version = run(["bash", "-c", r"unset AGNOS_VERSION && source launch_env.sh && \ @@ -219,7 +219,7 @@ def handle_agnos_update() -> None: cloudlog.info(f"Beginning background installation for AGNOS {updated_version}") set_offroad_alert("Offroad_NeosUpdate", True) - manifest_path = os.path.join(OVERLAY_MERGED, "openpilot/system/hardware/tici/agnos.json") + manifest_path = os.path.join(OVERLAY_MERGED, "openpilot/system/hardware/comma/agnos.json") target_slot_number = get_target_slot_number() flash_agnos_update(manifest_path, target_slot_number, cloudlog) set_offroad_alert("Offroad_NeosUpdate", False) diff --git a/tools/op.sh b/tools/op.sh index a21b1c6ab1..3d7d17a76b 100755 --- a/tools/op.sh +++ b/tools/op.sh @@ -364,8 +364,8 @@ function op_check_agnos_update() { echo -e "${BOLD}AGNOS update available:${NC} $current_version → $target_version" if read -r -p "Install it now? [y/N] " choice && [[ "$choice" =~ ^[Yy]$ ]]; then - op_run_command "$OPENPILOT_ROOT/openpilot/common/hardware/tici/agnos.py" --swap \ - "$OPENPILOT_ROOT/openpilot/common/hardware/tici/agnos.json" + op_run_command "$OPENPILOT_ROOT/openpilot/common/hardware/comma/agnos.py" --swap \ + "$OPENPILOT_ROOT/openpilot/common/hardware/comma/agnos.json" if read -r -p "Reboot now to apply the update? [y/N] " choice && [[ "$choice" =~ ^[Yy]$ ]]; then op_run_command sudo reboot diff --git a/tools/scripts/ssh.py b/tools/scripts/ssh.py index 86e86c7eed..2d8ff46604 100755 --- a/tools/scripts/ssh.py +++ b/tools/scripts/ssh.py @@ -14,7 +14,7 @@ if __name__ == "__main__": parser.add_argument("device", help="device name or dongle id") parser.add_argument("--host", help="ssh jump server host", default="ssh.comma.ai") parser.add_argument("--port", help="ssh jump server port", default=22, type=int) - parser.add_argument("--key", help="ssh key", default=os.path.join(BASEDIR, "openpilot/common/hardware/tici/id_rsa")) + parser.add_argument("--key", help="ssh key", default=os.path.join(BASEDIR, "openpilot/common/hardware/comma/id_rsa")) parser.add_argument("--debug", help="enable debug output", action="store_true") args = parser.parse_args()