mirror of
https://github.com/sunnypilot/sunnypilot.git
synced 2026-08-19 20:13:49 +08:00
Rename hardware/tici/ -> hardware/comma/ (#38580)
This commit is contained in:
+1
-1
@@ -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
|
||||
|
||||
Vendored
+1
-1
@@ -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"),
|
||||
])
|
||||
},
|
||||
|
||||
|
||||
+3
-3
@@ -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
|
||||
}
|
||||
|
||||
|
||||
@@ -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')
|
||||
|
||||
@@ -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:
|
||||
+2
-2
@@ -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"
|
||||
|
||||
+1
-1
@@ -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):
|
||||
@@ -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"
|
||||
|
||||
@@ -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__))
|
||||
|
||||
|
||||
@@ -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 = {
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
@@ -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()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user