Merge branch 'master' into feature/slc

2026-07-23 16:32:04 +08:00 · 2025-09-14 21:34:37 -04:00
parent 3c0d16ae69 bffb2fb6fa
commit d877444264
159 changed files with 5422 additions and 6947 deletions
@@ -107,7 +107,6 @@ jobs:

  build_mac:
    name: build macOS
-    if: false  # temp disable since homebrew install is getting stuck
    runs-on: ${{ ((github.repository == 'commaai/openpilot') && ((github.event_name != 'pull_request') || (github.event.pull_request.head.repo.full_name == 'commaai/openpilot'))) && 'namespace-profile-macos-8x14' || 'macos-latest' }}
    steps:
    - uses: actions/checkout@v4
@@ -125,8 +124,8 @@ jobs:
    - name: Install dependencies
      run: ./tools/mac_setup.sh
      env:
-        # package install has DeprecationWarnings
-        PYTHONWARNINGS: default
+        PYTHONWARNINGS: default  # package install has DeprecationWarnings
+        HOMEBREW_DISPLAY_INSTALL_TIMES: 1
    - name: Save Homebrew cache
      uses: actions/cache/save@v4
      if: github.ref == 'refs/heads/master'
@@ -50,7 +50,6 @@ cereal/services.h
 cereal/gen
 cereal/messaging/bridge
 selfdrive/mapd/default_speeds_by_region.json
-system/proclogd/proclogd
 selfdrive/ui/translations/tmp
 selfdrive/test/longitudinal_maneuvers/out
 selfdrive/car/tests/cars_dump
@@ -23,6 +23,11 @@
      "id": "args",
      "description": "Arguments to pass to the process",
      "type": "promptString"
+    },
+    {
+      "id": "replayArg",
+      "type": "promptString",
+      "description": "Enter route or segment to replay."
    }
  ],
  "configurations": [
@@ -40,7 +45,41 @@
      "type": "cppdbg",
      "request": "launch",
      "program": "${workspaceFolder}/${input:cpp_process}",
-      "cwd": "${workspaceFolder}",
+      "cwd": "${workspaceFolder}"
+    },
+    {
+      "name": "Attach LLDB to Replay drive",
+      "type": "lldb",
+      "request": "attach",
+      "pid": "${command:pickMyProcess}",
+      "initCommands": [
+        "script import time; time.sleep(3)"
+      ]
+    },
+    {
+      "name": "Replay drive",
+      "type": "debugpy",
+      "request": "launch",
+      "program": "${workspaceFolder}/opendbc/safety/tests/safety_replay/replay_drive.py",
+      "args": [
+        "${input:replayArg}"
+      ],
+      "console": "integratedTerminal",
+      "justMyCode": false,
+      "env": {
+        "PYTHONPATH": "${workspaceFolder}"
+      },
+      "subProcess": true,
+      "stopOnEntry": false
+    }
+  ],
+  "compounds": [
+    {
+      "name": "Replay drive + Safety LLDB",
+      "configurations": [
+        "Replay drive",
+        "Attach LLDB to Replay drive"
+      ]
    }
  ]
 }
@@ -178,7 +178,7 @@ node {

  try {
    if (env.BRANCH_NAME == 'devel-staging') {
-      deviceStage("build release3-staging", "tici-needs-can", [], [
+      deviceStage("build release3-staging", "tizi-needs-can", [], [
        step("build release3-staging", "RELEASE_BRANCH=release3-staging $SOURCE_DIR/release/build_release.sh"),
      ])
    }
@@ -186,12 +186,12 @@ node {
    if (env.BRANCH_NAME == '__nightly') {
      parallel (
        'nightly': {
-          deviceStage("build nightly", "tici-needs-can", [], [
+          deviceStage("build nightly", "tizi-needs-can", [], [
            step("build nightly", "RELEASE_BRANCH=nightly $SOURCE_DIR/release/build_release.sh"),
          ])
        },
        'nightly-dev': {
-          deviceStage("build nightly-dev", "tici-needs-can", [], [
+          deviceStage("build nightly-dev", "tizi-needs-can", [], [
            step("build nightly-dev", "PANDA_DEBUG_BUILD=1 RELEASE_BRANCH=nightly-dev $SOURCE_DIR/release/build_release.sh"),
          ])
        },
@@ -200,39 +200,30 @@ node {

    if (!env.BRANCH_NAME.matches(excludeRegex)) {
    parallel (
-      // tici tests
      'onroad tests': {
-        deviceStage("onroad", "tici-needs-can", ["UNSAFE=1"], [
+        deviceStage("onroad", "tizi-needs-can", ["UNSAFE=1"], [
          step("build openpilot", "cd system/manager && ./build.py"),
          step("check dirty", "release/check-dirty.sh"),
          step("onroad tests", "pytest selfdrive/test/test_onroad.py -s", [timeout: 60]),
        ])
      },
      'HW + Unit Tests': {
-        deviceStage("tici-hardware", "tici-common", ["UNSAFE=1"], [
+        deviceStage("tizi-hardware", "tizi-common", ["UNSAFE=1"], [
          step("build", "cd system/manager && ./build.py"),
          step("test pandad", "pytest selfdrive/pandad/tests/test_pandad.py", [diffPaths: ["panda", "selfdrive/pandad/"]]),
          step("test power draw", "pytest -s system/hardware/tici/tests/test_power_draw.py"),
          step("test encoder", "LD_LIBRARY_PATH=/usr/local/lib pytest system/loggerd/tests/test_encoder.py", [diffPaths: ["system/loggerd/"]]),
-          step("test pigeond", "pytest system/ubloxd/tests/test_pigeond.py", [diffPaths: ["system/ubloxd/"]]),
          step("test manager", "pytest system/manager/test/test_manager.py"),
        ])
      },
      'loopback': {
-        deviceStage("loopback", "tici-loopback", ["UNSAFE=1"], [
+        deviceStage("loopback", "tizi-loopback", ["UNSAFE=1"], [
          step("build openpilot", "cd system/manager && ./build.py"),
          step("test pandad loopback", "pytest selfdrive/pandad/tests/test_pandad_loopback.py"),
        ])
      },
-      'camerad AR0231': {
-        deviceStage("AR0231", "tici-ar0231", ["UNSAFE=1"], [
-          step("build", "cd system/manager && ./build.py"),
-          step("test camerad", "pytest system/camerad/test/test_camerad.py", [timeout: 60]),
-          step("test exposure", "pytest system/camerad/test/test_exposure.py"),
-        ])
-      },
      'camerad OX03C10': {
-        deviceStage("OX03C10", "tici-ox03c10", ["UNSAFE=1"], [
+        deviceStage("OX03C10", "tizi-ox03c10", ["UNSAFE=1"], [
          step("build", "cd system/manager && ./build.py"),
          step("test camerad", "pytest system/camerad/test/test_camerad.py", [timeout: 60]),
          step("test exposure", "pytest system/camerad/test/test_exposure.py"),
@@ -246,17 +237,13 @@ node {
        ])
      },
      'sensord': {
-        deviceStage("LSM + MMC", "tici-lsmc", ["UNSAFE=1"], [
-          step("build", "cd system/manager && ./build.py"),
-          step("test sensord", "pytest system/sensord/tests/test_sensord.py"),
-        ])
-        deviceStage("BMX + LSM", "tici-bmx-lsm", ["UNSAFE=1"], [
+        deviceStage("LSM + MMC", "tizi-lsmc", ["UNSAFE=1"], [
          step("build", "cd system/manager && ./build.py"),
          step("test sensord", "pytest system/sensord/tests/test_sensord.py"),
        ])
      },
      'replay': {
-        deviceStage("model-replay", "tici-replay", ["UNSAFE=1"], [
+        deviceStage("model-replay", "tizi-replay", ["UNSAFE=1"], [
          step("build", "cd system/manager && ./build.py", [diffPaths: ["selfdrive/modeld/", "tinygrad_repo", "selfdrive/test/process_replay/model_replay.py"]]),
          step("model replay", "selfdrive/test/process_replay/model_replay.py", [diffPaths: ["selfdrive/modeld/", "tinygrad_repo", "selfdrive/test/process_replay/model_replay.py"]]),
        ])
@@ -266,7 +253,6 @@ node {
          step("build openpilot", "cd system/manager && ./build.py"),
          step("test pandad loopback", "SINGLE_PANDA=1 pytest selfdrive/pandad/tests/test_pandad_loopback.py"),
          step("test pandad spi", "pytest selfdrive/pandad/tests/test_pandad_spi.py"),
-          step("test pandad", "pytest selfdrive/pandad/tests/test_pandad.py", [diffPaths: ["panda", "selfdrive/pandad/"]]),
          step("test amp", "pytest system/hardware/tici/tests/test_amplifier.py"),
          // TODO: enable once new AGNOS is available
          // step("test esim", "pytest system/hardware/tici/tests/test_esim.py"),
@@ -1,7 +1,13 @@
 Version 0.10.1 (2025-09-08)
 ========================
-* Record driving feedback using LKAS button
-* Honda City 2023 support thanks to drFritz!
+* New driving model
+  * World Model: removed global localization inputs
+  * World Model: 2x the number of parameters
+  * World Model: trained on 4x the number of segments
+  * Driving Vision Model: trained on 4x the number of segments
+* Honda City 2023 support thanks to vanillagorillaa and drFritz!
+* Honda N-Box 2018 support thanks to miettal!
+* Honda Odyssey 2021-25 support thanks to csouers and MVL!

 Version 0.10.0 (2025-08-05)
 ========================
@@ -359,11 +359,6 @@ SConscript([
  'system/ubloxd/SConscript',
  'system/loggerd/SConscript',
 ])
-if arch != "Darwin":
-  SConscript([
-    'system/logcatd/SConscript',
-    'system/proclogd/SConscript',
-  ])

 if arch == "larch64":
  SConscript(['system/camerad/SConscript'])
@@ -234,7 +234,20 @@ struct CarControlSP @0xa5cd762cd951a455 {

  struct Param {
    key @0 :Text;
-    value @1 :Text;
+    type @2 :ParamType;
+    value @3 :Data;
+
+    valueDEPRECATED @1 :Text; # The data type change may cause issues with backwards compatibility.
+  }
+  
+  enum ParamType {
+    string @0;
+    bool @1;
+    int @2;
+    float @3;
+    time @4;
+    json @5;
+    bytes @6;
  }
 }

@@ -585,7 +585,6 @@ struct PandaState @0xa7649e2575e4591e {
  heartbeatLost @22 :Bool;
  interruptLoad @25 :Float32;
  fanPower @28 :UInt8;
-  fanStallCount @34 :UInt8;

  spiErrorCount @33 :UInt16;

@@ -714,6 +713,7 @@ struct PandaState @0xa7649e2575e4591e {
  usbPowerModeDEPRECATED @12 :PeripheralState.UsbPowerModeDEPRECATED;
  safetyParamDEPRECATED @20 :Int16;
  safetyParam2DEPRECATED @26 :UInt32;
+  fanStallCountDEPRECATED @34 :UInt8;
 }

 struct PeripheralState {
@@ -33,7 +33,7 @@ MessageContext message_context;
 struct SubMaster::SubMessage {
  std::string name;
  SubSocket *socket = nullptr;
-  int freq = 0;
+  float freq = 0.0f;
  bool updated = false, alive = false, valid = false, ignore_alive;
  uint64_t rcv_time = 0, rcv_frame = 0;
  void *allocated_msg_reader = nullptr;
@@ -121,12 +121,12 @@ def build_header():
  h += "#include <map>\n"
  h += "#include <string>\n"

-  h += "struct service { std::string name; bool should_log; int frequency; int decimation; };\n"
+  h += "struct service { std::string name; bool should_log; float frequency; int decimation; };\n"
  h += "static std::map<std::string, service> services = {\n"
  for k, v in SERVICE_LIST.items():
    should_log = "true" if v.should_log else "false"
    decimation = -1 if v.decimation is None else v.decimation
-    h += '  { "%s", {"%s", %s, %d, %d}},\n' % \
+    h += '  { "%s", {"%s", %s, %f, %d}},\n' % \
         (k, k, should_log, v.frequency, decimation)
  h += "};\n"

@@ -1 +1 @@
-#define DEFAULT_MODEL "Steam Powered (Default)"
+#define DEFAULT_MODEL "Firehose (Default)"
@@ -94,7 +94,6 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
    {"Offroad_NeosUpdate", {CLEAR_ON_MANAGER_START, JSON}},
    {"Offroad_NoFirmware", {CLEAR_ON_MANAGER_START | CLEAR_ON_ONROAD_TRANSITION, JSON}},
    {"Offroad_Recalibration", {CLEAR_ON_MANAGER_START | CLEAR_ON_ONROAD_TRANSITION, JSON}},
-    {"Offroad_StorageMissing", {CLEAR_ON_MANAGER_START, JSON}},
    {"Offroad_TemperatureTooHigh", {CLEAR_ON_MANAGER_START, JSON}},
    {"Offroad_UnregisteredHardware", {CLEAR_ON_MANAGER_START, JSON}},
    {"Offroad_UpdateFailed", {CLEAR_ON_MANAGER_START, JSON}},
@@ -146,6 +145,7 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
    {"CustomAccLongPressIncrement", {PERSISTENT | BACKUP, INT, "5"}},
    {"CustomAccShortPressIncrement", {PERSISTENT | BACKUP, INT, "1"}},
    {"DeviceBootMode", {PERSISTENT | BACKUP, INT, "0"}},
+    {"DevUIInfo", {PERSISTENT | BACKUP, INT, "0"}},
    {"EnableCopyparty", {PERSISTENT | BACKUP, BOOL}},
    {"EnableGithubRunner", {PERSISTENT | BACKUP, BOOL}},
    {"GithubRunnerSufficientVoltage", {CLEAR_ON_MANAGER_START , BOOL}},
@@ -39,7 +39,7 @@ All of these are examples of good PRs:
 ### First contribution

 [Projects / openpilot bounties](https://github.com/orgs/commaai/projects/26/views/1?pane=info) is the best place to get started and goes in-depth on what's expected when working on a bounty.
-There's lot of bounties that don't require a comma 3/3X or a car.
+There's lot of bounties that don't require a comma 3X or a car.

 ## Pull Requests

@@ -0,0 +1,30 @@
+# Debugging Panda Safety with Replay Drive + LLDB
+
+## 1. Start the debugger in VS Code
+
+* Select **Replay drive + Safety LLDB**.
+* Enter the route or segment when prompted.
+[<img src="https://github.com/user-attachments/assets/b0cc320a-083e-46a7-a9f8-ca775bbe5604">](https://github.com/user-attachments/assets/b0cc320a-083e-46a7-a9f8-ca775bbe5604)
+
+## 2. Attach LLDB
+
+* When prompted, pick the running **`replay_drive` process**.
+* ⚠️ Attach quickly, or `replay_drive` will start consuming messages.
+
+> [!TIP]
+> Add a Python breakpoint at the start of `replay_drive.py` to pause execution and give yourself time to attach LLDB.
+
+## 3. Set breakpoints in VS Code
+Breakpoints can be set directly in `modes/xxx.h` (or any C file).
+No extra LLDB commands are required — just place breakpoints in the editor.
+
+## 4. Resume execution
+Once attached, you can step through both Python (on the replay) and C safety code as CAN logs are replayed.
+
+> [!NOTE]
+> * Use short routes for quicker iteration.
+> * Pause `replay_drive` early to avoid wasting log messages.
+
+## Video
+
+View a demo of this workflow on the PR that added it: https://github.com/commaai/openpilot/pull/36055#issue-3352911578
@@ -16,7 +16,7 @@ industry standards of safety for Level 2 Driver Assistance Systems. In particula
 ISO26262 guidelines, including those from [pertinent documents](https://www.nhtsa.gov/sites/nhtsa.dot.gov/files/documents/13498a_812_573_alcsystemreport.pdf)
 released by NHTSA. In addition, we impose strict coding guidelines (like [MISRA C : 2012](https://www.misra.org.uk/what-is-misra/))
 on parts of openpilot that are safety relevant. We also perform software-in-the-loop,
-hardware-in-the-loop and in-vehicle tests before each software release.
+hardware-in-the-loop, and in-vehicle tests before each software release.

 Following Hazard and Risk Analysis and FMEA, at a very high level, we have designed openpilot
 ensuring two main safety requirements.
@@ -29,8 +29,18 @@ ensuring two main safety requirements.

 For additional safety implementation details, refer to [panda safety model](https://github.com/commaai/panda#safety-model). For vehicle specific implementation of the safety concept, refer to [opendbc/safety/safety](https://github.com/commaai/opendbc/tree/master/opendbc/safety/safety).

-**Extra note**: comma.ai strongly discourages the use of openpilot forks with safety code either missing or
-  not fully meeting the above requirements.
+[^1]: For these actuator limits we observe ISO11270 and ISO15622. Lateral limits described there translate to 0.9 seconds of maximum actuation to achieve a 1m lateral deviation.

-[^1]: For these actuator limits we observe ISO11270 and ISO15622. Lateral limits described there translate to 0.9 seconds of maximum actuation to achieve a 1m lateral deviation. 
+---

+### Forks of openpilot
+
+* Do not disable or nerf [driver monitoring](https://github.com/commaai/openpilot/tree/master/selfdrive/monitoring)
+* Do not disable or nerf [excessive actuation checks](https://github.com/commaai/openpilot/tree/master/selfdrive/selfdrived/helpers.py)
+* If your fork modifies any of the code in `opendbc/safety/`:
+   * your fork cannot use the openpilot trademark
+   * your fork must preserve the full [safety test suite](https://github.com/commaai/opendbc/tree/master/opendbc/safety/tests) and all tests must pass, including any new coverage required by the fork's changes
+
+Failure to comply with these standards will get you and your users banned from comma.ai servers.
+
+**comma.ai strongly discourages the use of openpilot forks with safety code either missing or not fully meeting the above requirements.**
@@ -1,11 +1,11 @@
-# connect to a comma 3/3X
+# connect to a comma 3X

-A comma 3/3X is a normal [Linux](https://github.com/commaai/agnos-builder) computer that exposes [SSH](https://wiki.archlinux.org/title/Secure_Shell) and a [serial console](https://wiki.archlinux.org/title/Working_with_the_serial_console).
+A comma 3X is a normal [Linux](https://github.com/commaai/agnos-builder) computer that exposes [SSH](https://wiki.archlinux.org/title/Secure_Shell) and a [serial console](https://wiki.archlinux.org/title/Working_with_the_serial_console).

 ## Serial Console

 On both the comma three and 3X, the serial console is accessible from the main OBD-C port.
-Connect the comma 3/3X to your computer with a normal USB C cable, or use a [comma serial](https://comma.ai/shop/comma-serial) for steady 12V power.
+Connect the comma 3X to your computer with a normal USB C cable, or use a [comma serial](https://comma.ai/shop/comma-serial) for steady 12V power.

 On the comma three, the serial console is exposed through a UART-to-USB chip, and `tools/scripts/serial.sh` can be used to connect.

@@ -45,7 +45,7 @@ In order to use ADB on your device, you'll need to perform the following steps u
    * Here's an example command for connecting to your device using its tethered connection: `adb connect 192.168.43.1:5555`

 > [!NOTE]
-> The default port for ADB is 5555 on the comma 3/3X.
+> The default port for ADB is 5555 on the comma 3X.

 For more info on ADB, see the [Android Debug Bridge (ADB) documentation](https://developer.android.com/tools/adb).

@@ -8,7 +8,7 @@ Replaying is a critical tool for openpilot development and debugging.
 Just run `tools/replay/replay --demo`.

 ## Replaying CAN data
-*Hardware required: jungle and comma 3/3X*
+*Hardware required: jungle and comma 3X*

 1. Connect your PC to a jungle.
 2.
@@ -3,7 +3,7 @@

 In 30 minutes, we'll get an openpilot development environment set up on your computer and make some changes to openpilot's UI.

-And if you have a comma 3/3X, we'll deploy the change to your device for testing.
+And if you have a comma 3X, we'll deploy the change to your device for testing.

 ## 1. Set up your development environment

@@ -7,7 +7,7 @@ export OPENBLAS_NUM_THREADS=1
 export VECLIB_MAXIMUM_THREADS=1

 if [ -z "$AGNOS_VERSION" ]; then
-  export AGNOS_VERSION="12.8"
+  export AGNOS_VERSION="13.1"
 fi

 export STAGING_ROOT="/data/safe_staging"
@@ -21,7 +21,7 @@ nav:
    - What is openpilot?: getting-started/what-is-openpilot.md
  - How-to:
    - Turn the speed blue: how-to/turn-the-speed-blue.md
-    - Connect to a comma 3/3X: how-to/connect-to-comma.md
+    - Connect to a comma 3X: how-to/connect-to-comma.md
    # - Make your first pull request: how-to/make-first-pr.md
    #- Replay a drive: how-to/replay-a-drive.md
  - Concepts:
@@ -36,6 +36,9 @@ dependencies = [
  "pyopenssl < 24.3.0",
  "pyaudio",

+  # ubloxd (TODO: just use struct)
+  "kaitaistruct",
+
  # panda
  "libusb1",
  "spidev; platform_system == 'Linux'",
@@ -101,8 +104,9 @@ dev = [
  "av",
  "azure-identity",
  "azure-storage-blob",
-  "dbus-next",
+  "dbus-next", # TODO: remove once we moved everything to jeepney
  "dictdiffer",
+  "jeepney",
  "matplotlib",
  "opencv-python-headless",
  "parameterized >=0.8, <0.9",
@@ -120,6 +124,7 @@ dev = [

 tools = [
  "metadrive-simulator @ https://github.com/commaai/metadrive/releases/download/MetaDrive-minimal-0.4.2.4/metadrive_simulator-0.4.2.4-py3-none-any.whl ; (platform_machine != 'aarch64')",
+  "dearpygui>=2.1.0",
 ]

 [project.urls]
@@ -157,7 +162,6 @@ testpaths = [
  "system/camerad",
  "system/hardware",
  "system/loggerd",
-  "system/proclogd",
  "system/tests",
  "system/ubloxd",
  "system/webrtc",
@@ -173,7 +177,7 @@ quiet-level = 3
 # if you've got a short variable name that's getting flagged, add it here
 ignore-words-list = "bu,ro,te,ue,alo,hda,ois,nam,nams,ned,som,parm,setts,inout,warmup,bumb,nd,sie,preints,whit,indexIn,ws,uint,grey,deque,stdio,amin,BA,LITE,atEnd,UIs,errorString,arange,FocusIn,od,tim,relA,hist,copyable,jupyter,thead,TGE,abl,lite"
 builtin = "clear,rare,informal,code,names,en-GB_to_en-US"
-skip = "./third_party/*, ./tinygrad/*, ./tinygrad_repo/*, ./msgq/*, ./panda/*, ./opendbc/*, ./opendbc_repo/*, ./rednose/*, ./rednose_repo/*, ./teleoprtc/*, ./teleoprtc_repo/*, *.ts, uv.lock, *.onnx, ./cereal/gen/*, */c_generated_code/*, docs/assets/*"
+skip = "./third_party/*, ./tinygrad/*, ./tinygrad_repo/*, ./msgq/*, ./panda/*, ./opendbc/*, ./opendbc_repo/*, ./rednose/*, ./rednose_repo/*, ./teleoprtc/*, ./teleoprtc_repo/*, *.ts, uv.lock, *.onnx, ./cereal/gen/*, */c_generated_code/*, docs/assets/*, tools/plotjuggler/layouts/*"

 [tool.mypy]
 python_version = "3.11"
@@ -247,6 +251,7 @@ exclude = [
  "teleoprtc_repo",
  "third_party",
  "*.ipynb",
+  "generated",
 ]
 lint.flake8-implicit-str-concat.allow-multiline = false

@@ -1,15 +1,12 @@
 import os
-import math
 import hypothesis.strategies as st
 from hypothesis import Phase, given, settings
 from parameterized import parameterized

 from cereal import car, custom
 from opendbc.car import DT_CTRL
-from opendbc.car.car_helpers import interfaces
 from opendbc.car.structs import CarParams
-from opendbc.car.tests.test_car_interfaces import get_fuzzy_car_interface_args
-from opendbc.car.fw_versions import FW_VERSIONS, FW_QUERY_CONFIGS
+from opendbc.car.tests.test_car_interfaces import get_fuzzy_car_interface
 from opendbc.car.mock.values import CAR as MOCK
 from opendbc.car.values import PLATFORMS
 from openpilot.selfdrive.car.helpers import convert_carControlSP
@@ -21,11 +18,6 @@ from openpilot.selfdrive.test.fuzzy_generation import FuzzyGenerator

 from openpilot.sunnypilot.selfdrive.car import interfaces as sunnypilot_interfaces

-ALL_ECUS = {ecu for ecus in FW_VERSIONS.values() for ecu in ecus.keys()}
-ALL_ECUS |= {ecu for config in FW_QUERY_CONFIGS.values() for ecu in config.extra_ecus}
-
-ALL_REQUESTS = {tuple(r.request) for config in FW_QUERY_CONFIGS.values() for r in config.requests}
-
 MAX_EXAMPLES = int(os.environ.get('MAX_EXAMPLES', '60'))


@@ -37,43 +29,10 @@ class TestCarInterfaces:
            phases=(Phase.reuse, Phase.generate, Phase.shrink))
  @given(data=st.data())
  def test_car_interfaces(self, car_name, data):
-    CarInterface = interfaces[car_name]
-
-    args = get_fuzzy_car_interface_args(data.draw)
-
-    car_params = CarInterface.get_params(car_name, args['fingerprints'], args['car_fw'],
-                                         alpha_long=args['alpha_long'], is_release=False, docs=False)
-    car_params_sp = CarInterface.get_params_sp(car_params, car_name, args['fingerprints'], args['car_fw'],
-                                               alpha_long=args['alpha_long'], docs=False)
-    car_params = car_params.as_reader()
-    car_interface = CarInterface(car_params, car_params_sp)
+    car_interface = get_fuzzy_car_interface(car_name, data.draw)
+    car_params = car_interface.CP.as_reader()
+    car_params_sp = car_interface.CP_SP
    sunnypilot_interfaces.setup_interfaces(car_interface)
-    assert car_params
-    assert car_params_sp
-    assert car_interface
-
-    assert car_params.mass > 1
-    assert car_params.wheelbase > 0
-    # centerToFront is center of gravity to front wheels, assert a reasonable range
-    assert car_params.wheelbase * 0.3 < car_params.centerToFront < car_params.wheelbase * 0.7
-    assert car_params.maxLateralAccel > 0
-
-    # Longitudinal sanity checks
-    assert len(car_params.longitudinalTuning.kpV) == len(car_params.longitudinalTuning.kpBP)
-    assert len(car_params.longitudinalTuning.kiV) == len(car_params.longitudinalTuning.kiBP)
-
-    # Lateral sanity checks
-    if car_params.steerControlType != CarParams.SteerControlType.angle:
-      tune = car_params.lateralTuning
-      if tune.which() == 'pid':
-        if car_name != MOCK.MOCK:
-          assert not math.isnan(tune.pid.kf) and tune.pid.kf > 0
-          assert len(tune.pid.kpV) > 0 and len(tune.pid.kpV) == len(tune.pid.kpBP)
-          assert len(tune.pid.kiV) > 0 and len(tune.pid.kiV) == len(tune.pid.kiBP)
-
-      elif tune.which() == 'torque':
-        assert not math.isnan(tune.torque.kf) and tune.torque.kf > 0
-        assert not math.isnan(tune.torque.friction) and tune.torque.friction > 0

    cc_msg = FuzzyGenerator.get_random_msg(data.draw, car.CarControl, real_floats=True)
    cc_sp_msg = FuzzyGenerator.get_random_msg(data.draw, custom.CarControlSP, real_floats=True)
@@ -51,6 +51,10 @@ class DesireHelper:
    self.lane_turn_controller = LaneTurnController(self)
    self.lane_turn_direction = custom.TurnDirection.none

+  @staticmethod
+  def get_lane_change_direction(CS):
+    return LaneChangeDirection.left if CS.leftBlinker else LaneChangeDirection.right
+
  def update(self, carstate, lateral_active, lane_change_prob):
    self.alc.update_params()
    self.lane_turn_controller.update_params()
@@ -71,12 +75,13 @@ class DesireHelper:
      if self.lane_change_state == LaneChangeState.off and one_blinker and not self.prev_one_blinker and not below_lane_change_speed:
        self.lane_change_state = LaneChangeState.preLaneChange
        self.lane_change_ll_prob = 1.0
+        # Initialize lane change direction to prevent UI alert flicker
+        self.lane_change_direction = self.get_lane_change_direction(carstate)

      # LaneChangeState.preLaneChange
      elif self.lane_change_state == LaneChangeState.preLaneChange:
-        # Set lane change direction
-        self.lane_change_direction = LaneChangeDirection.left if \
-          carstate.leftBlinker else LaneChangeDirection.right
+        # Update lane change direction
+        self.lane_change_direction = self.get_lane_change_direction(carstate)

        torque_applied = carstate.steeringPressed and \
                         ((carstate.steeringTorque > 0 and self.lane_change_direction == LaneChangeDirection.left) or
@@ -56,10 +56,8 @@ class LatControlTorque(LatControl):
      actual_curvature = -VM.calc_curvature(math.radians(CS.steeringAngleDeg - params.angleOffsetDeg), CS.vEgo, params.roll)
      roll_compensation = params.roll * ACCELERATION_DUE_TO_GRAVITY
      curvature_deadzone = abs(VM.calc_curvature(math.radians(self.steering_angle_deadzone_deg), CS.vEgo, 0.0))
-      desired_lateral_accel = desired_curvature * CS.vEgo ** 2

-      # desired rate is the desired rate of change in the setpoint, not the absolute desired curvature
-      # desired_lateral_jerk = desired_curvature_rate * CS.vEgo ** 2
+      desired_lateral_accel = desired_curvature * CS.vEgo ** 2
      actual_lateral_accel = actual_curvature * CS.vEgo ** 2
      lateral_accel_deadzone = curvature_deadzone * CS.vEgo ** 2

@@ -71,6 +69,8 @@ class LatControlTorque(LatControl):
      # do error correction in lateral acceleration space, convert at end to handle non-linear torque responses correctly
      pid_log.error = float(setpoint - measurement)
      ff = gravity_adjusted_lateral_accel
+      # latAccelOffset corrects roll compensation bias from device roll misalignment relative to car roll
+      ff -= self.torque_params.latAccelOffset
      ff += get_friction(desired_lateral_accel - actual_lateral_accel, lateral_accel_deadzone, FRICTION_THRESHOLD, self.torque_params)

      freeze_integrator = steer_limited_by_safety or CS.steeringPressed or CS.vEgo < 5
@@ -0,0 +1,70 @@
+import numpy as np
+from cereal import car, messaging
+from opendbc.car import ACCELERATION_DUE_TO_GRAVITY
+from opendbc.car import structs
+from opendbc.car.lateral import get_friction, FRICTION_THRESHOLD
+from openpilot.common.realtime import DT_MDL
+from openpilot.selfdrive.locationd.torqued import TorqueEstimator, MIN_BUCKET_POINTS, POINTS_PER_BUCKET, STEER_BUCKET_BOUNDS
+
+np.random.seed(0)
+
+LA_ERR_STD = 1.0
+INPUT_NOISE_STD = 0.08
+V_EGO = 30.0
+
+WARMUP_BUCKET_POINTS = (1.5*MIN_BUCKET_POINTS).astype(int)
+STRAIGHT_ROAD_LA_BOUNDS = (0.02, 0.03)
+
+ROLL_BIAS_DEG = 2.0
+ROLL_COMPENSATION_BIAS = ACCELERATION_DUE_TO_GRAVITY*float(np.sin(np.deg2rad(ROLL_BIAS_DEG)))
+TORQUE_TUNE = structs.CarParams.LateralTorqueTuning(latAccelFactor=2.0, latAccelOffset=0.0, friction=0.2)
+TORQUE_TUNE_BIASED = structs.CarParams.LateralTorqueTuning(latAccelFactor=2.0, latAccelOffset=-ROLL_COMPENSATION_BIAS, friction=0.2)
+
+def generate_inputs(torque_tune, la_err_std, input_noise_std=None):
+  rng = np.random.default_rng(0)
+  steer_torques = np.concat([rng.uniform(bnd[0], bnd[1], pts) for bnd, pts in zip(STEER_BUCKET_BOUNDS, WARMUP_BUCKET_POINTS, strict=True)])
+  la_errs = rng.normal(scale=la_err_std, size=steer_torques.size)
+  frictions = np.array([get_friction(la_err, 0.0, FRICTION_THRESHOLD, torque_tune) for la_err in la_errs])
+  lat_accels = torque_tune.latAccelFactor*steer_torques + torque_tune.latAccelOffset + frictions
+  if input_noise_std is not None:
+    steer_torques += rng.normal(scale=input_noise_std, size=steer_torques.size)
+    lat_accels += rng.normal(scale=input_noise_std, size=steer_torques.size)
+  return steer_torques, lat_accels
+
+def get_warmed_up_estimator(steer_torques, lat_accels):
+  est = TorqueEstimator(car.CarParams())
+  for steer_torque, lat_accel in zip(steer_torques, lat_accels, strict=True):
+    est.filtered_points.add_point(steer_torque, lat_accel)
+  return est
+
+def simulate_straight_road_msgs(est):
+  carControl = messaging.new_message('carControl').carControl
+  carOutput = messaging.new_message('carOutput').carOutput
+  carState = messaging.new_message('carState').carState
+  livePose = messaging.new_message('livePose').livePose
+  carControl.latActive = True
+  carState.vEgo = V_EGO
+  carState.steeringPressed = False
+  ts = DT_MDL*np.arange(2*POINTS_PER_BUCKET)
+  steer_torques = np.concat((np.linspace(-0.03, -0.02, POINTS_PER_BUCKET), np.linspace(0.02, 0.03, POINTS_PER_BUCKET)))
+  lat_accels = TORQUE_TUNE.latAccelFactor * steer_torques
+  for t, steer_torque, lat_accel in zip(ts, steer_torques, lat_accels, strict=True):
+    carOutput.actuatorsOutput.torque = float(-steer_torque)
+    livePose.orientationNED.x = float(np.deg2rad(ROLL_BIAS_DEG))
+    livePose.angularVelocityDevice.z = float(lat_accel / V_EGO)
+    for which, msg in (('carControl', carControl), ('carOutput', carOutput), ('carState', carState), ('livePose', livePose)):
+      est.handle_log(t, which, msg)
+
+def test_estimated_offset():
+  steer_torques, lat_accels = generate_inputs(TORQUE_TUNE_BIASED, la_err_std=LA_ERR_STD, input_noise_std=INPUT_NOISE_STD)
+  est = get_warmed_up_estimator(steer_torques, lat_accels)
+  msg = est.get_msg()
+  # TODO add lataccelfactor and friction check when we have more accurate estimates
+  assert abs(msg.liveTorqueParameters.latAccelOffsetRaw - TORQUE_TUNE_BIASED.latAccelOffset) < 0.1
+
+def test_straight_road_roll_bias():
+  steer_torques, lat_accels = generate_inputs(TORQUE_TUNE, la_err_std=LA_ERR_STD, input_noise_std=INPUT_NOISE_STD)
+  est = get_warmed_up_estimator(steer_torques, lat_accels)
+  simulate_straight_road_msgs(est)
+  msg = est.get_msg()
+  assert (msg.liveTorqueParameters.latAccelOffsetRaw < -0.05) and np.isfinite(msg.liveTorqueParameters.latAccelOffsetRaw)
@@ -13,12 +13,9 @@ class ModelConstants:
  META_T_IDXS = [2., 4., 6., 8., 10.]

  # model inputs constants
-  MODEL_FREQ = 20
-  HISTORY_FREQ = 5
-  HISTORY_LEN_SECONDS = 5
-  TEMPORAL_SKIP = MODEL_FREQ // HISTORY_FREQ
-  FULL_HISTORY_BUFFER_LEN = MODEL_FREQ * HISTORY_LEN_SECONDS
-  INPUT_HISTORY_BUFFER_LEN = HISTORY_FREQ * HISTORY_LEN_SECONDS
+  N_FRAMES = 2
+  MODEL_RUN_FREQ = 20
+  MODEL_CONTEXT_FREQ = 5 # "model_trained_fps"

  FEATURE_LEN = 512

@@ -149,7 +149,7 @@ def fill_model_msg(base_msg: capnp._DynamicStructBuilder, extended_msg: capnp._D
  meta.hardBrakePredicted = hard_brake_predicted.item()

  # confidence
-  if vipc_frame_id % (2*ModelConstants.MODEL_FREQ) == 0:
+  if vipc_frame_id % (2*ModelConstants.MODEL_RUN_FREQ) == 0:
    # any disengage prob
    brake_disengage_probs = net_output_data['meta'][0,Meta.BRAKE_DISENGAGE]
    gas_disengage_probs = net_output_data['meta'][0,Meta.GAS_DISENGAGE]
@@ -80,6 +80,64 @@ class FrameMeta:
    if vipc is not None:
      self.frame_id, self.timestamp_sof, self.timestamp_eof = vipc.frame_id, vipc.timestamp_sof, vipc.timestamp_eof

+class InputQueues:
+  def __init__ (self, model_fps, env_fps, n_frames_input):
+    assert env_fps % model_fps == 0
+    assert env_fps >= model_fps
+    self.model_fps = model_fps
+    self.env_fps = env_fps
+    self.n_frames_input = n_frames_input
+
+    self.dtypes = {}
+    self.shapes = {}
+    self.q = {}
+
+  def update_dtypes_and_shapes(self, input_dtypes, input_shapes) -> None:
+    self.dtypes.update(input_dtypes)
+    if self.env_fps == self.model_fps:
+      self.shapes.update(input_shapes)
+    else:
+      for k in input_shapes:
+        shape = list(input_shapes[k])
+        if 'img' in k:
+          n_channels = shape[1] // self.n_frames_input
+          shape[1] = (self.env_fps // self.model_fps + (self.n_frames_input - 1)) * n_channels
+        else:
+          shape[1] = (self.env_fps // self.model_fps) * shape[1]
+        self.shapes[k] = tuple(shape)
+
+  def reset(self) -> None:
+    self.q = {k: np.zeros(self.shapes[k], dtype=self.dtypes[k]) for k in self.dtypes.keys()}
+
+  def enqueue(self, inputs:dict[str, np.ndarray]) -> None:
+    for k in inputs.keys():
+      if inputs[k].dtype != self.dtypes[k]:
+        raise ValueError(f'supplied input <{k}({inputs[k].dtype})> has wrong dtype, expected {self.dtypes[k]}')
+      input_shape = list(self.shapes[k])
+      input_shape[1] = -1
+      single_input = inputs[k].reshape(tuple(input_shape))
+      sz = single_input.shape[1]
+      self.q[k][:,:-sz] = self.q[k][:,sz:]
+      self.q[k][:,-sz:] = single_input
+
+  def get(self, *names) -> dict[str, np.ndarray]:
+    if self.env_fps == self.model_fps:
+      return {k: self.q[k] for k in names}
+    else:
+      out = {}
+      for k in names:
+        shape = self.shapes[k]
+        if 'img' in k:
+          n_channels = shape[1] // (self.env_fps // self.model_fps + (self.n_frames_input - 1))
+          out[k] = np.concatenate([self.q[k][:, s:s+n_channels] for s in np.linspace(0, shape[1] - n_channels, self.n_frames_input, dtype=int)], axis=1)
+        elif 'pulse' in k:
+          # any pulse within interval counts
+          out[k] = self.q[k].reshape((shape[0], shape[1] * self.model_fps // self.env_fps, self.env_fps // self.model_fps, -1)).max(axis=2)
+        else:
+          idxs = np.arange(-1, -shape[1], -self.env_fps // self.model_fps)[::-1]
+          out[k] = self.q[k][:, idxs]
+      return out
+
 class ModelState(ModelStateBase):
  frames: dict[str, DrivingModelFrame]
  inputs: dict[str, np.ndarray]
@@ -102,19 +160,15 @@ class ModelState(ModelStateBase):
      self.policy_output_slices = policy_metadata['output_slices']
      policy_output_size = policy_metadata['output_shapes']['outputs'][1]

-    self.frames = {name: DrivingModelFrame(context, ModelConstants.TEMPORAL_SKIP) for name in self.vision_input_names}
+    self.frames = {name: DrivingModelFrame(context, ModelConstants.MODEL_RUN_FREQ//ModelConstants.MODEL_CONTEXT_FREQ) for name in self.vision_input_names}
    self.prev_desire = np.zeros(ModelConstants.DESIRE_LEN, dtype=np.float32)

-    self.full_features_buffer = np.zeros((1, ModelConstants.FULL_HISTORY_BUFFER_LEN,  ModelConstants.FEATURE_LEN), dtype=np.float32)
-    self.full_desire = np.zeros((1, ModelConstants.FULL_HISTORY_BUFFER_LEN, ModelConstants.DESIRE_LEN), dtype=np.float32)
-    self.temporal_idxs = slice(-1-(ModelConstants.TEMPORAL_SKIP*(ModelConstants.INPUT_HISTORY_BUFFER_LEN-1)), None, ModelConstants.TEMPORAL_SKIP)
-
    # policy inputs
-    self.numpy_inputs = {
-      'desire': np.zeros((1, ModelConstants.INPUT_HISTORY_BUFFER_LEN, ModelConstants.DESIRE_LEN), dtype=np.float32),
-      'traffic_convention': np.zeros((1, ModelConstants.TRAFFIC_CONVENTION_LEN), dtype=np.float32),
-      'features_buffer': np.zeros((1, ModelConstants.INPUT_HISTORY_BUFFER_LEN,  ModelConstants.FEATURE_LEN), dtype=np.float32),
-    }
+    self.numpy_inputs = {k: np.zeros(self.policy_input_shapes[k], dtype=np.float32) for k in self.policy_input_shapes}
+    self.full_input_queues = InputQueues(ModelConstants.MODEL_CONTEXT_FREQ, ModelConstants.MODEL_RUN_FREQ, ModelConstants.N_FRAMES)
+    for k in ['desire_pulse', 'features_buffer']:
+      self.full_input_queues.update_dtypes_and_shapes({k: self.numpy_inputs[k].dtype}, {k: self.numpy_inputs[k].shape})
+    self.full_input_queues.reset()

    # img buffers are managed in openCL transform code
    self.vision_inputs: dict[str, Tensor] = {}
@@ -136,15 +190,10 @@ class ModelState(ModelStateBase):
  def run(self, bufs: dict[str, VisionBuf], transforms: dict[str, np.ndarray],
                inputs: dict[str, np.ndarray], prepare_only: bool) -> dict[str, np.ndarray] | None:
    # Model decides when action is completed, so desire input is just a pulse triggered on rising edge
-    inputs['desire'][0] = 0
-    new_desire = np.where(inputs['desire'] - self.prev_desire > .99, inputs['desire'], 0)
-    self.prev_desire[:] = inputs['desire']
+    inputs['desire_pulse'][0] = 0
+    new_desire = np.where(inputs['desire_pulse'] - self.prev_desire > .99, inputs['desire_pulse'], 0)
+    self.prev_desire[:] = inputs['desire_pulse']

-    self.full_desire[0,:-1] = self.full_desire[0,1:]
-    self.full_desire[0,-1] = new_desire
-    self.numpy_inputs['desire'][:] = self.full_desire.reshape((1,ModelConstants.INPUT_HISTORY_BUFFER_LEN,ModelConstants.TEMPORAL_SKIP,-1)).max(axis=2)
-
-    self.numpy_inputs['traffic_convention'][:] = inputs['traffic_convention']
    imgs_cl = {name: self.frames[name].prepare(bufs[name], transforms[name].flatten()) for name in self.vision_input_names}

    if TICI and not USBGPU:
@@ -163,9 +212,10 @@ class ModelState(ModelStateBase):
    self.vision_output = self.vision_run(**self.vision_inputs).contiguous().realize().uop.base.buffer.numpy()
    vision_outputs_dict = self.parser.parse_vision_outputs(self.slice_outputs(self.vision_output, self.vision_output_slices))

-    self.full_features_buffer[0,:-1] = self.full_features_buffer[0,1:]
-    self.full_features_buffer[0,-1] = vision_outputs_dict['hidden_state'][0, :]
-    self.numpy_inputs['features_buffer'][:] = self.full_features_buffer[0, self.temporal_idxs]
+    self.full_input_queues.enqueue({'features_buffer': vision_outputs_dict['hidden_state'], 'desire_pulse': new_desire})
+    for k in ['desire_pulse', 'features_buffer']:
+      self.numpy_inputs[k][:] = self.full_input_queues.get(k)[k]
+    self.numpy_inputs['traffic_convention'][:] = inputs['traffic_convention']

    self.policy_output = self.policy_run(**self.policy_inputs).contiguous().realize().uop.base.buffer.numpy()
    policy_outputs_dict = self.parser.parse_policy_outputs(self.slice_outputs(self.policy_output, self.policy_output_slices))
@@ -223,7 +273,7 @@ def main(demo=False):
  params = Params()

  # setup filter to track dropped frames
-  frame_dropped_filter = FirstOrderFilter(0., 10., 1. / ModelConstants.MODEL_FREQ)
+  frame_dropped_filter = FirstOrderFilter(0., 10., 1. / ModelConstants.MODEL_RUN_FREQ)
  frame_id = 0
  last_vipc_frame_id = 0
  run_count = 0
@@ -320,7 +370,7 @@ def main(demo=False):
    bufs = {name: buf_extra if 'big' in name else buf_main for name in model.vision_input_names}
    transforms = {name: model_transform_extra if 'big' in name else model_transform_main for name in model.vision_input_names}
    inputs:dict[str, np.ndarray] = {
-      'desire': vec_desire,
+      'desire_pulse': vec_desire,
      'traffic_convention': traffic_convention,
    }

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04b763fb71efe57a8a4c4168a8043ecd58939015026ded0dc755ded6905ac251
-size 12343523
+oid sha256:ebb38a934d6472c061cc6010f46d9720ca132d631a47e585a893bdd41ade2419
+size 12343535
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e66bb8d53eced3786ed71a59b55ffc6810944cb217f0518621cc76303260a1ef
+oid sha256:befac016a247b7ad5dc5b55d339d127774ed7bd2b848f1583f72aa4caee37781
 size 46271991
@@ -84,12 +84,10 @@ Panda *connect(std::string serial="", uint32_t index=0) {
    panda->set_can_fd_auto(i, true);
  }

-  bool is_deprecated_panda = std::find(DEPRECATED_PANDA_TYPES.begin(),
-                                       DEPRECATED_PANDA_TYPES.end(),
-                                       panda->hw_type) != DEPRECATED_PANDA_TYPES.end();
+  bool is_supported_panda = std::find(SUPPORTED_PANDA_TYPES.begin(), SUPPORTED_PANDA_TYPES.end(), panda->hw_type) != SUPPORTED_PANDA_TYPES.end();

-  if (is_deprecated_panda) {
-    LOGW("panda %s is deprecated (hw_type: %i), skipping firmware check...", panda->hw_serial().c_str(), static_cast<uint16_t>(panda->hw_type));
+  if (!is_supported_panda) {
+    LOGW("panda %s is not supported (hw_type: %i), skipping firmware check...", panda->hw_serial().c_str(), static_cast<uint16_t>(panda->hw_type));
    return panda.release();
  }

@@ -175,7 +173,6 @@ void fill_panda_state(cereal::PandaState::Builder &ps, cereal::PandaState::Panda
  ps.setHarnessStatus(cereal::PandaState::HarnessStatus(health.car_harness_status_pkt));
  ps.setInterruptLoad(health.interrupt_load_pkt);
  ps.setFanPower(health.fan_power);
-  ps.setFanStallCount(health.fan_stall_count);
  ps.setSafetyRxChecksInvalid((bool)(health.safety_rx_checks_invalid_pkt));
  ps.setSpiErrorCount(health.spi_error_count_pkt);
  ps.setSbu1Voltage(health.sbu1_voltage_mV / 1000.0f);
@@ -9,13 +9,10 @@
 void pandad_main_thread(std::vector<std::string> serials);

 // deprecated devices
-static const std::vector<cereal::PandaState::PandaType> DEPRECATED_PANDA_TYPES = {
-  cereal::PandaState::PandaType::WHITE_PANDA,
-  cereal::PandaState::PandaType::GREY_PANDA,
-  cereal::PandaState::PandaType::BLACK_PANDA,
-  cereal::PandaState::PandaType::PEDAL,
-  cereal::PandaState::PandaType::UNO,
-  cereal::PandaState::PandaType::RED_PANDA_V2
+static const std::vector<cereal::PandaState::PandaType> SUPPORTED_PANDA_TYPES = {
+  cereal::PandaState::PandaType::RED_PANDA,
+  cereal::PandaState::PandaType::TRES,
+  cereal::PandaState::PandaType::CUATRO,
 };


@@ -36,10 +36,10 @@ def flash_panda(panda_serial: str) -> Panda:
  panda_signature = b"" if panda.bootstub else panda.get_signature()
  cloudlog.warning(f"Panda {panda_serial} connected, version: {panda_version}, signature {panda_signature.hex()[:16]}, expected {fw_signature.hex()[:16]}")

-  # skip flashing if the detected device is deprecated from upstream
+  # skip flashing if the detected device is not supported from upstream
  hw_type = panda.get_type()
-  if hw_type in Panda.DEPRECATED_DEVICES:
-    cloudlog.warning(f"Panda {panda_serial} is deprecated (hw_type: {hw_type}), skipping flash...")
+  if hw_type not in Panda.SUPPORTED_DEVICES:
+    cloudlog.warning(f"Panda {panda_serial} is not supported (hw_type: {hw_type}), skipping flash...")
    return panda

  if panda.bootstub or panda_signature != fw_signature:
@@ -91,11 +91,6 @@ def main() -> None:
      cloudlog.event("pandad.flash_and_connect", count=count)
      params.remove("PandaSignatures")

-      # TODO: remove this in the next AGNOS
-      # wait until USB is up before counting
-      if time.monotonic() < 60.:
-        no_internal_panda_count = 0
-
      # Handle missing internal panda
      if no_internal_panda_count > 0:
        if no_internal_panda_count == 3:
@@ -22,8 +22,6 @@ class TestPandad:
    if len(Panda.list()) == 0:
      self._run_test(60)

-    self.spi = HARDWARE.get_device_type() != 'tici'
-
  def teardown_method(self):
    managed_processes['pandad'].stop()

@@ -106,11 +104,9 @@ class TestPandad:
    # - 0.2s pandad -> pandad
    # - plus some buffer
    print("startup times", ts, sum(ts) / len(ts))
-    assert 0.1 < (sum(ts)/len(ts)) < (0.7 if self.spi else 5.0)
+    assert 0.1 < (sum(ts)/len(ts)) < 0.7

  def test_protocol_version_check(self):
-    if not self.spi:
-      pytest.skip("SPI test")
    # flash old fw
    fn = os.path.join(HERE, "bootstub.panda_h7_spiv0.bin")
    self._flash_bootstub_and_test(fn, expect_mismatch=True)
@@ -6,7 +6,6 @@ import random

 import cereal.messaging as messaging
 from cereal.services import SERVICE_LIST
-from openpilot.system.hardware import HARDWARE
 from openpilot.selfdrive.test.helpers import with_processes
 from openpilot.selfdrive.pandad.tests.test_pandad_loopback import setup_pandad, send_random_can_messages

@@ -16,8 +15,6 @@ JUNGLE_SPAM = "JUNGLE_SPAM" in os.environ
 class TestBoarddSpi:
  @classmethod
  def setup_class(cls):
-    if HARDWARE.get_device_type() == 'tici':
-      pytest.skip("only for spi pandas")
    os.environ['STARTED'] = '1'
    os.environ['SPI_ERR_PROB'] = '0.001'
    if not JUNGLE_SPAM:
@@ -29,10 +29,6 @@
    "text": "Device failed to register with the comma.ai backend. It will not connect or upload to comma.ai servers, and receives no support from comma.ai. If this is a device purchased at comma.ai/shop, open a ticket at https://comma.ai/support.",
    "severity": 1
  },
-  "Offroad_StorageMissing": {
-    "text": "NVMe drive not mounted.",
-    "severity": 1
-  },
  "Offroad_CarUnrecognized": {
    "text": "sunnypilot was unable to identify your car. Your car is either unsupported or its ECUs are not recognized. Please submit a pull request to add the firmware versions to the proper vehicle. Need help? Join discord.comma.ai.",
    "severity": 0
@@ -83,7 +83,7 @@ def below_steer_speed_alert(CP: car.CarParams, CS: car.CarState, sm: messaging.S
    f"Steer Unavailable Below {get_display_speed(CP.minSteerSpeed, metric)}",
    "",
    AlertStatus.userPrompt, AlertSize.small,
-    Priority.LOW, VisualAlert.steerRequired, AudibleAlert.prompt, 0.4)
+    Priority.LOW, VisualAlert.none, AudibleAlert.prompt, 0.4)


 def calibration_incomplete_alert(CP: car.CarParams, CS: car.CarState, sm: messaging.SubMaster, metric: bool, soft_disable_time: int, personality) -> Alert:
@@ -21,7 +21,6 @@ from openpilot.selfdrive.selfdrived.helpers import ExcessiveActuationCheck
 from openpilot.selfdrive.selfdrived.state import StateMachine
 from openpilot.selfdrive.selfdrived.alertmanager import AlertManager, set_offroad_alert

-from openpilot.system.hardware import HARDWARE
 from openpilot.system.version import get_build_metadata

 from openpilot.sunnypilot.mads.mads import ModularAssistiveDrivingSystem
@@ -134,13 +133,7 @@ class SelfdriveD(CruiseHelper):
    self.state_machine = StateMachine()
    self.rk = Ratekeeper(100, print_delay_threshold=None)

-    # some comma three with NVMe experience NVMe dropouts mid-drive that
-    # cause loggerd to crash on write, so ignore it only on that platform
-    self.ignored_processes = set()
-    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'})
+    self.ignored_processes = {'mapd', }

    # Determine startup event
    is_remote = build_metadata.openpilot.comma_remote or build_metadata.openpilot.sunnypilot_remote
@@ -595,7 +595,7 @@ def get_custom_params_from_lr(lr: LogIterable, initial_state: str = "first") ->
  if len(live_calibration) > 0:
    custom_params["CalibrationParams"] = live_calibration[msg_index].as_builder().to_bytes()
  if len(live_parameters) > 0:
-    custom_params["LiveParameters"] = live_parameters[msg_index].as_builder().to_bytes()
+    custom_params["LiveParametersV2"] = live_parameters[msg_index].as_builder().to_bytes()
  if len(live_torque_parameters) > 0:
    custom_params["LiveTorqueParameters"] = live_torque_parameters[msg_index].as_builder().to_bytes()

@@ -1 +1 @@
-6d3219bca9f66a229b38a5382d301a92b0147edb
+afcab1abb62b9d5678342956cced4712f44e909e
@@ -18,7 +18,6 @@ from openpilot.common.timeout import Timeout
 from openpilot.common.params import Params
 from openpilot.selfdrive.selfdrived.events import EVENTS, ET
 from openpilot.selfdrive.test.helpers import set_params_enabled, release_only
-from openpilot.system.hardware import HARDWARE
 from openpilot.system.hardware.hw import Paths
 from openpilot.tools.lib.logreader import LogReader
 from openpilot.tools.lib.log_time_series import msgs_to_time_series
@@ -33,7 +32,7 @@ CPU usage budget
 TEST_DURATION = 25
 LOG_OFFSET = 8

-MAX_TOTAL_CPU = 280.  # total for all 8 cores
+MAX_TOTAL_CPU = 300.  # total for all 8 cores
 PROCS = {
  # Baseline CPU usage by process
  "selfdrive.controls.controlsd": 16.0,
@@ -57,30 +56,20 @@ PROCS = {
  "selfdrive.ui.soundd": 3.0,
  "selfdrive.ui.feedback.feedbackd": 1.0,
  "selfdrive.monitoring.dmonitoringd": 4.0,
-  "./proclogd": 2.0,
+  "system.proclogd": 3.0,
  "system.logmessaged": 1.0,
  "system.tombstoned": 0,
-  "./logcatd": 1.0,
+  "system.journald": 1.0,
  "system.micd": 5.0,
  "system.timed": 0,
  "selfdrive.pandad.pandad": 0,
  "system.statsd": 1.0,
  "system.loggerd.uploader": 15.0,
  "system.loggerd.deleter": 1.0,
+  "./pandad": 19.0,
+  "system.qcomgpsd.qcomgpsd": 1.0,
 }

-PROCS.update({
-  "tici": {
-    "./pandad": 5.0,
-    "./ubloxd": 1.0,
-    "system.ubloxd.pigeond": 6.0,
-  },
-  "tizi": {
-     "./pandad": 19.0,
-    "system.qcomgpsd.qcomgpsd": 1.0,
-  }
-}.get(HARDWARE.get_device_type(), {}))
-
 TIMINGS = {
  # rtols: max/min, rsd
  "can": [2.5, 0.35],
@@ -63,14 +63,20 @@ class MainLayout(Widget):
      # Don't hide sidebar from interactive timeout
      if self._current_mode != MainState.ONROAD:
        self._sidebar.set_visible(False)
-      self._current_mode = MainState.ONROAD
+      self._set_current_layout(MainState.ONROAD)
    else:
-      self._current_mode = MainState.HOME
+      self._set_current_layout(MainState.HOME)
      self._sidebar.set_visible(True)

+  def _set_current_layout(self, layout: MainState):
+    if layout != self._current_mode:
+      self._layouts[self._current_mode].hide_event()
+      self._current_mode = layout
+      self._layouts[self._current_mode].show_event()
+
  def open_settings(self, panel_type: PanelType):
    self._layouts[MainState.SETTINGS].set_current_panel(panel_type)
-    self._current_mode = MainState.SETTINGS
+    self._set_current_layout(MainState.SETTINGS)
    self._sidebar.set_visible(False)

  def _on_settings_clicked(self):
@@ -1,17 +0,0 @@
-import pyray as rl
-from openpilot.system.ui.lib.wifi_manager import WifiManagerWrapper
-from openpilot.system.ui.widgets import Widget
-from openpilot.system.ui.widgets.network import WifiManagerUI
-
-
-class NetworkLayout(Widget):
-  def __init__(self):
-    super().__init__()
-    self.wifi_manager = WifiManagerWrapper()
-    self.wifi_ui = WifiManagerUI(self.wifi_manager)
-
-  def _render(self, rect: rl.Rectangle):
-    self.wifi_ui.render(rect)
-
-  def shutdown(self):
-    self.wifi_manager.shutdown()
@@ -2,7 +2,7 @@ import pyray as rl
 import time
 import threading

-from openpilot.common.api import Api, api_get
+from openpilot.common.api import api_get
 from openpilot.common.params import Params
 from openpilot.common.swaglog import cloudlog
 from openpilot.selfdrive.ui.ui_state import ui_state
@@ -11,7 +11,7 @@ from openpilot.system.ui.lib.application import gui_app, FontWeight
 from openpilot.system.ui.lib.scroll_panel import GuiScrollPanel
 from openpilot.system.ui.lib.wrap_text import wrap_text
 from openpilot.system.ui.widgets import Widget
-
+from openpilot.selfdrive.ui.lib.api_helpers import get_token

 TITLE = "Firehose Mode"
 DESCRIPTION = (
@@ -163,7 +163,7 @@ class FirehoseLayout(Widget):
      dongle_id = self.params.get("DongleId")
      if not dongle_id or dongle_id == UNREGISTERED_DONGLE_ID:
        return
-      identity_token = Api(dongle_id).get_token()
+      identity_token = get_token(dongle_id)
      response = api_get(f"v1/devices/{dongle_id}/firehose_stats", access_token=identity_token)
      if response.status_code == 200:
        data = response.json()
@@ -2,7 +2,6 @@ import pyray as rl
 from dataclasses import dataclass
 from enum import IntEnum
 from collections.abc import Callable
-from openpilot.selfdrive.ui.layouts.network import NetworkLayout
 from openpilot.selfdrive.ui.layouts.settings.developer import DeveloperLayout
 from openpilot.selfdrive.ui.layouts.settings.device import DeviceLayout
 from openpilot.selfdrive.ui.layouts.settings.firehose import FirehoseLayout
@@ -10,7 +9,9 @@ from openpilot.selfdrive.ui.layouts.settings.software import SoftwareLayout
 from openpilot.selfdrive.ui.layouts.settings.toggles import TogglesLayout
 from openpilot.system.ui.lib.application import gui_app, FontWeight, MousePos
 from openpilot.system.ui.lib.text_measure import measure_text_cached
+from openpilot.system.ui.lib.wifi_manager import WifiManager
 from openpilot.system.ui.widgets import Widget
+from openpilot.system.ui.widgets.network import WifiManagerUI

 # Settings close button
 SETTINGS_CLOSE_TEXT = "×"
@@ -43,7 +44,7 @@ class PanelType(IntEnum):
@dataclass
 class PanelInfo:
  name: str
-  instance: object
+  instance: Widget
  button_rect: rl.Rectangle = rl.Rectangle(0, 0, 0, 0)


@@ -53,9 +54,12 @@ class SettingsLayout(Widget):
    self._current_panel = PanelType.DEVICE

    # Panel configuration
+    wifi_manager = WifiManager()
+    wifi_manager.set_active(False)
+
    self._panels = {
      PanelType.DEVICE: PanelInfo("Device", DeviceLayout()),
-      PanelType.NETWORK: PanelInfo("Network", NetworkLayout()),
+      PanelType.NETWORK: PanelInfo("Network", WifiManagerUI(wifi_manager)),
      PanelType.TOGGLES: PanelInfo("Toggles", TogglesLayout()),
      PanelType.SOFTWARE: PanelInfo("Software", SoftwareLayout()),
      PanelType.FIREHOSE: PanelInfo("Firehose", FirehoseLayout()),
@@ -149,8 +153,14 @@ class SettingsLayout(Widget):

  def set_current_panel(self, panel_type: PanelType):
    if panel_type != self._current_panel:
+      self._panels[self._current_panel].instance.hide_event()
      self._current_panel = panel_type
+      self._panels[self._current_panel].instance.show_event()

-  def close_settings(self):
-    if self._close_callback:
-      self._close_callback()
+  def show_event(self):
+    super().show_event()
+    self._panels[self._current_panel].instance.show_event()
+
+  def hide_event(self):
+    super().hide_event()
+    self._panels[self._current_panel].instance.hide_event()
@@ -0,0 +1,14 @@
+import time
+from functools import lru_cache
+from openpilot.common.api import Api
+
+TOKEN_EXPIRY_HOURS = 2
+
+
+@lru_cache(maxsize=1)
+def _get_token(dongle_id: str, t: int):
+  return Api(dongle_id).get_token(expiry_hours=TOKEN_EXPIRY_HOURS)
+
+
+def get_token(dongle_id: str):
+  return _get_token(dongle_id, int(time.monotonic() / (TOKEN_EXPIRY_HOURS / 2 * 60 * 60)))
@@ -2,14 +2,12 @@ from enum import IntEnum
 import os
 import threading
 import time
-from functools import lru_cache

-from openpilot.common.api import Api, api_get
+from openpilot.common.api import api_get
 from openpilot.common.params import Params
 from openpilot.common.swaglog import cloudlog
 from openpilot.system.athena.registration import UNREGISTERED_DONGLE_ID
-
-TOKEN_EXPIRY_HOURS = 2
+from openpilot.selfdrive.ui.lib.api_helpers import get_token


 class PrimeType(IntEnum):
@@ -23,12 +21,6 @@ class PrimeType(IntEnum):
  PURPLE = 5,


-@lru_cache(maxsize=1)
-def get_token(dongle_id: str, t: int):
-  print('getting token')
-  return Api(dongle_id).get_token(expiry_hours=TOKEN_EXPIRY_HOURS)
-
-
 class PrimeState:
  FETCH_INTERVAL = 5.0  # seconds between API calls
  API_TIMEOUT = 10.0  # seconds for API requests
@@ -58,15 +50,13 @@ class PrimeState:
      return

    try:
-      identity_token = get_token(dongle_id, int(time.monotonic() / (TOKEN_EXPIRY_HOURS / 2 * 60 * 60)))
+      identity_token = get_token(dongle_id)
      response = api_get(f"v1.1/devices/{dongle_id}", timeout=self.API_TIMEOUT, access_token=identity_token)
      if response.status_code == 200:
        data = response.json()
        is_paired = data.get("is_paired", False)
        prime_type = data.get("prime_type", 0)
        self.set_type(PrimeType(prime_type) if is_paired else PrimeType.UNPAIRED)
-      elif response.status_code == 401:
-        get_token.cache_clear()
    except Exception as e:
      cloudlog.error(f"Failed to fetch prime status: {e}")

@@ -4,6 +4,9 @@
 #include <map>

 #include "selfdrive/ui/qt/util.h"
+#ifdef SUNNYPILOT
+#include "selfdrive/ui/sunnypilot/ui.h"
+#endif

 void OnroadAlerts::updateState(const UIState &s) {
  Alert a = getAlert(*(s.sm), s.scene.started_frame);
@@ -73,6 +76,12 @@ void OnroadAlerts::paintEvent(QPaintEvent *event) {
  }
  QRect r = QRect(0 + margin, height() - h + margin, width() - margin*2, h - margin*2);

+#ifdef SUNNYPILOT
+  const int dev_ui_info = uiStateSP()->scene.dev_ui_info;
+  const int adjustment = dev_ui_info > 1 && alert.size != cereal::SelfdriveState::AlertSize::FULL ? 30 : 0;
+  r = QRect(0 + margin, height() - h + margin - adjustment, width() - margin*2, h - margin*2);
+#endif
+
  QPainter p(this);

  // draw background + gradient
@@ -12,6 +12,7 @@
 #include "selfdrive/ui/sunnypilot/qt/onroad/model.h"
 #define ExperimentalButton ExperimentalButtonSP
 #define ModelRenderer ModelRendererSP
+#define HudRenderer HudRendererSP
 #else
 #include "selfdrive/ui/qt/onroad/buttons.h"
 #include "selfdrive/ui/qt/onroad/hud.h"
@@ -73,6 +73,11 @@ void DriverMonitorRenderer::draw(QPainter &painter, const QRect &surface_rect) {
  float y = surface_rect.height() - offset;
  float opacity = is_active ? 0.65f : 0.2f;

+#ifdef SUNNYPILOT
+  const int dev_ui_info = uiStateSP()->scene.dev_ui_info;
+  y -= dev_ui_info > 1 ? 50 : 0;
+#endif
+
  drawIcon(painter, QPoint(x, y), dm_img, QColor(0, 0, 0, 70), opacity);

  QPointF keypoints[std::size(DEFAULT_FACE_KPTS_3D)];
@@ -39,6 +39,7 @@ qt_src = [
  "sunnypilot/qt/offroad/settings/visuals_panel.cc",
  "sunnypilot/qt/onroad/annotated_camera.cc",
  "sunnypilot/qt/onroad/buttons.cc",
+  "sunnypilot/qt/onroad/developer_ui/developer_ui.cc",
  "sunnypilot/qt/onroad/hud.cc",
  "sunnypilot/qt/onroad/model.cc",
  "sunnypilot/qt/onroad/onroad_home.cc",
@@ -72,6 +72,15 @@ VisualsPanel::VisualsPanel(QWidget *parent) : QWidget(parent) {
  list->addItem(chevron_info_settings);
  param_watcher->addParam("ChevronInfo");

+  // Visuals: Developer UI Info (Dev UI)
+  std::vector<QString> dev_ui_settings_texts{tr("Off"), tr("Right"), tr("Right &&\nBottom")};
+  dev_ui_settings = new ButtonParamControlSP(
+    "DevUIInfo", tr("Developer UI"), tr("Display real-time parameters and metrics from various sources."),
+    "",
+    dev_ui_settings_texts,
+    380);
+  list->addItem(dev_ui_settings);
+
  sunnypilotScroller = new ScrollViewSP(list, this);
  vlayout->addWidget(sunnypilotScroller);

@@ -90,4 +99,7 @@ void VisualsPanel::paramsRefresh() {
  if (chevron_info_settings) {
    chevron_info_settings->refresh();
  }
+  if (dev_ui_settings) {
+    dev_ui_settings->refresh();
+  }
 }
@@ -28,4 +28,5 @@ protected:
 std::map<std::string, ParamControlSP*> toggles;
 ParamWatcher * param_watcher;
 ButtonParamControlSP *chevron_info_settings;
+ ButtonParamControlSP *dev_ui_settings;
 };
@@ -14,3 +14,8 @@ AnnotatedCameraWidgetSP::AnnotatedCameraWidgetSP(VisionStreamType type, QWidget
 void AnnotatedCameraWidgetSP::updateState(const UIState &s) {
  AnnotatedCameraWidget::updateState(s);
 }
+
+void AnnotatedCameraWidgetSP::showEvent(QShowEvent *event) {
+  AnnotatedCameraWidget::showEvent(event);
+  ui_update_params_sp(uiState());
+}
@@ -15,4 +15,7 @@ class AnnotatedCameraWidgetSP : public AnnotatedCameraWidget {
 public:
  explicit AnnotatedCameraWidgetSP(VisionStreamType type, QWidget *parent = nullptr);
  void updateState(const UIState &s) override;
+
+protected:
+  void showEvent(QShowEvent *event) override;
 };
@@ -0,0 +1,227 @@
+/**
+ * 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.
+ */
+#include <cmath>
+
+#include "common/util.h"
+#include "selfdrive/ui/sunnypilot/qt/onroad/developer_ui/developer_ui.h"
+
+
+// Add Relative Distance to Primary Lead Car
+// Unit: Meters
+UiElement DeveloperUi::getDRel(bool lead_status, float lead_d_rel) {
+  QString value = lead_status ? QString::number(lead_d_rel, 'f', 0) : "-";
+  QColor color = QColor(255, 255, 255, 255);
+
+  if (lead_status) {
+    // Orange if close, Red if very close
+    if (lead_d_rel < 5) {
+      color = QColor(255, 0, 0, 255);
+    } else if (lead_d_rel < 15) {
+      color = QColor(255, 188, 0, 255);
+    }
+  }
+
+  return UiElement(value, "REL DIST", "m", color);
+}
+
+// Add Relative Velocity vs Primary Lead Car
+// Unit: kph if metric, else mph
+UiElement DeveloperUi::getVRel(bool lead_status, float lead_v_rel, bool is_metric, const QString &speed_unit) {
+  QString value = lead_status ? QString::number(lead_v_rel * (is_metric ? MS_TO_KPH : MS_TO_MPH), 'f', 0) : "-";
+  QColor color = QColor(255, 255, 255, 255);
+
+  if (lead_status) {
+    // Red if approaching faster than 10mph
+    // Orange if approaching (negative)
+    if (lead_v_rel < -4.4704) {
+      color = QColor(255, 0, 0, 255);
+    } else if (lead_v_rel < 0) {
+      color = QColor(255, 188, 0, 255);
+    }
+  }
+
+  return UiElement(value, "REL SPEED", speed_unit, color);
+}
+
+// Add Real Steering Angle
+// Unit: Degrees
+UiElement DeveloperUi::getSteeringAngleDeg(float angle_steers, bool lat_active, bool steer_override) {
+  QString value = QString("%1%2%3").arg(QString::number(angle_steers, 'f', 1)).arg("°").arg("");
+  QColor color = lat_active ? (steer_override ? QColor(0x91, 0x9b, 0x95, 0xff) : QColor(0, 255, 0, 255)) : QColor(255, 255, 255, 255);
+
+  // Red if large steering angle
+  // Orange if moderate steering angle
+  if (std::fabs(angle_steers) > 180) {
+    color = QColor(255, 0, 0, 255);
+  } else if (std::fabs(angle_steers) > 90) {
+    color = QColor(255, 188, 0, 255);
+  }
+
+  return UiElement(value, "REAL STEER", "", color);
+}
+
+// Add Actual Lateral Acceleration (roll compensated) when using Torque
+// Unit: m/s²
+UiElement DeveloperUi::getActualLateralAccel(float curvature, float v_ego, float roll, bool lat_active, bool steer_override) {
+  double actualLateralAccel = (curvature * pow(v_ego, 2)) - (roll * 9.81);
+
+  QString value = QString::number(actualLateralAccel, 'f', 2);
+  QColor color = lat_active ? (steer_override ? QColor(0x91, 0x9b, 0x95, 0xff) : QColor(0, 255, 0, 255)) : QColor(255, 255, 255, 255);
+
+  return UiElement(value, "ACTUAL L.A.", "m/s²", color);
+}
+
+// Add Desired Steering Angle when using PID
+// Unit: Degrees
+UiElement DeveloperUi::getSteeringAngleDesiredDeg(bool lat_active, float steer_angle_desired, float angle_steers) {
+  QString value = lat_active ? QString("%1%2%3").arg(QString::number(steer_angle_desired, 'f', 1)).arg("°").arg("") : "-";
+  QColor color = QColor(255, 255, 255, 255);
+
+  if (lat_active) {
+    // Red if large steering angle
+    // Orange if moderate steering angle
+    if (std::fabs(angle_steers) > 180) {
+      color = QColor(255, 0, 0, 255);
+    } else if (std::fabs(angle_steers) > 90) {
+      color = QColor(255, 188, 0, 255);
+    } else {
+      color = QColor(0, 255, 0, 255);
+    }
+  }
+
+  return UiElement(value, "DESIRED STEER", "", color);
+}
+
+// Add Device Memory (RAM) Usage
+// Unit: Percent
+UiElement DeveloperUi::getMemoryUsagePercent(int memory_usage_percent) {
+  QString value = QString("%1%2").arg(QString::number(memory_usage_percent, 'd', 0)).arg("%");
+  QColor color = (memory_usage_percent > 85) ? QColor(255, 188, 0, 255) : QColor(255, 255, 255, 255);
+
+  return UiElement(value, "RAM", "", color);
+}
+
+// Add Vehicle Current Acceleration
+// Unit: m/s²
+UiElement DeveloperUi::getAEgo(float a_ego) {
+  QString value = QString::number(a_ego, 'f', 1);
+  QColor color = QColor(255, 255, 255, 255);
+
+  return UiElement(value, "ACC.", "m/s²", color);
+}
+
+// Add Relative Velocity to Primary Lead Car
+// Unit: kph if metric, else mph
+UiElement DeveloperUi::getVEgoLead(bool lead_status, float lead_v_rel, float v_ego, bool is_metric, const QString &speed_unit) {
+  QString value = lead_status ? QString::number((lead_v_rel + v_ego) * (is_metric ? MS_TO_KPH : MS_TO_MPH), 'f', 0) : "-";
+  QColor color = QColor(255, 255, 255, 255);
+
+  if (lead_status) {
+    // Red if approaching faster than 10mph
+    // Orange if approaching (negative)
+    if (lead_v_rel < -4.4704) {
+      color = QColor(255, 0, 0, 255);
+    } else if (lead_v_rel < 0) {
+      color = QColor(255, 188, 0, 255);
+    }
+  }
+
+  return UiElement(value, "L.S.", speed_unit, color);
+}
+
+// Add Friction Coefficient Raw from torqued
+// Unit: None
+UiElement DeveloperUi::getFrictionCoefficientFiltered(float friction_coefficient_filtered, bool live_valid) {
+  QString value = QString::number(friction_coefficient_filtered, 'f', 3);
+  QColor color = live_valid ? QColor(0, 255, 0, 255) : QColor(255, 255, 255, 255);
+
+  return UiElement(value, "FRIC.", "", color);
+}
+
+// Add Lateral Acceleration Factor Raw from torqued
+// Unit: m/s²
+UiElement DeveloperUi::getLatAccelFactorFiltered(float lat_accel_factor_filtered, bool live_valid) {
+  QString value = QString::number(lat_accel_factor_filtered, 'f', 3);
+  QColor color = live_valid ? QColor(0, 255, 0, 255) : QColor(255, 255, 255, 255);
+
+  return UiElement(value, "L.A.", "m/s²", color);
+}
+
+// Add Steering Torque from Car EPS
+// Unit: Newton Meters
+UiElement DeveloperUi::getSteeringTorqueEps(float steering_torque_eps) {
+  QString value = QString::number(std::fabs(steering_torque_eps), 'f', 1);
+  QColor color = QColor(255, 255, 255, 255);
+
+  return UiElement(value, "E.T.", "N·dm", color);
+}
+
+// Add Bearing Degree and Direction from Car (Compass)
+// Unit: Meters
+UiElement DeveloperUi::getBearingDeg(float bearing_accuracy_deg, float bearing_deg) {
+  QString value = (bearing_accuracy_deg != 180.00) ? QString("%1%2%3").arg(QString::number(bearing_deg, 'd', 0)).arg("°").arg("") : "-";
+  QColor color = QColor(255, 255, 255, 255);
+  QString dir_value;
+
+  if (bearing_accuracy_deg != 180.00) {
+    if (((bearing_deg >= 337.5) && (bearing_deg <= 360)) || ((bearing_deg >= 0) && (bearing_deg <= 22.5))) {
+      dir_value = "N";
+    } else if ((bearing_deg > 22.5) && (bearing_deg < 67.5)) {
+      dir_value = "NE";
+    } else if ((bearing_deg >= 67.5) && (bearing_deg <= 112.5)) {
+      dir_value = "E";
+    } else if ((bearing_deg > 112.5) && (bearing_deg < 157.5)) {
+      dir_value = "SE";
+    } else if ((bearing_deg >= 157.5) && (bearing_deg <= 202.5)) {
+      dir_value = "S";
+    } else if ((bearing_deg > 202.5) && (bearing_deg < 247.5)) {
+      dir_value = "SW";
+    } else if ((bearing_deg >= 247.5) && (bearing_deg <= 292.5)) {
+      dir_value = "W";
+    } else if ((bearing_deg > 292.5) && (bearing_deg < 337.5)) {
+      dir_value = "NW";
+    }
+  } else {
+    dir_value = "OFF";
+  }
+
+  return UiElement(QString("%1 | %2").arg(dir_value).arg(value), "B.D.", "", color);
+}
+
+// Add Altitude of Current Location
+// Unit: Meters
+UiElement DeveloperUi::getAltitude(float gps_accuracy, float altitude) {
+  QString value = (gps_accuracy != 0.00) ? QString::number(altitude, 'f', 1) : "-";
+  QColor color = QColor(255, 255, 255, 255);
+
+  return UiElement(value, "ALT.", "m", color);
+}
+
+// Add Actuators Output
+// Unit: Degree (angle) or m/s² (torque)
+UiElement DeveloperUi::getActuatorsOutputLateral(cereal::CarParams::SteerControlType steerControlType,
+                                                 cereal::CarControl::Actuators::Reader &actuators,
+                                                 float desiredCurvature, float v_ego, float roll, bool lat_active, bool steer_override) {
+  QString label;
+  QString value;
+  QString unit;
+
+  if (steerControlType == cereal::CarParams::SteerControlType::ANGLE) {
+    label = "DESIRED STEER";
+    value = QString("%1%2%3").arg(QString::number(actuators.getSteeringAngleDeg(), 'f', 1)).arg("°").arg("");
+  } else {
+    label = "DESIRED L.A.";
+    double desiredLateralAccel = (desiredCurvature * pow(v_ego, 2)) - (roll * 9.81);
+    value = QString::number(desiredLateralAccel, 'f', 2);
+    unit = "m/s²";
+  }
+
+  value = lat_active ? value : "-";
+  QColor color = lat_active ? (steer_override ? QColor(0x91, 0x9b, 0x95, 0xff) : QColor(0, 255, 0, 255)) : QColor(255, 255, 255, 255);
+
+  return UiElement(value, label, unit, color);
+}
@@ -0,0 +1,31 @@
+/**
+ * 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.
+ */
+#pragma once
+
+#include "selfdrive/ui/qt/util.h"
+#include "selfdrive/ui/sunnypilot/qt/onroad/developer_ui/ui_elements.h"
+
+class DeveloperUi {
+
+public:
+  static UiElement getDRel(bool lead_status, float lead_d_rel);
+  static UiElement getVRel(bool lead_status, float lead_v_rel, bool is_metric, const QString &speed_unit);
+  static UiElement getSteeringAngleDeg(float angle_steers, bool lat_active, bool steer_override);
+  static UiElement getActualLateralAccel(float curvature, float v_ego, float roll, bool lat_active, bool steer_override);
+  static UiElement getSteeringAngleDesiredDeg(bool lat_active, float steer_angle_desired, float angle_steers);
+  static UiElement getMemoryUsagePercent(int memory_usage_percent);
+  static UiElement getAEgo(float a_ego);
+  static UiElement getVEgoLead(bool lead_status, float lead_v_rel, float v_ego, bool is_metric, const QString &speed_unit);
+  static UiElement getFrictionCoefficientFiltered(float friction_coefficient_filtered, bool live_valid);
+  static UiElement getLatAccelFactorFiltered(float lat_accel_factor_filtered, bool live_valid);
+  static UiElement getSteeringTorqueEps(float steering_torque_eps);
+  static UiElement getBearingDeg(float bearing_accuracy_deg, float bearing_deg);
+  static UiElement getAltitude(float gps_accuracy, float altitude);
+  static UiElement getActuatorsOutputLateral(cereal::CarParams::SteerControlType steerControlType,
+                                             cereal::CarControl::Actuators::Reader &actuators,
+                                             float desiredCurvature, float v_ego, float roll, bool lat_active, bool steer_override);
+};
@@ -0,0 +1,19 @@
+/**
+ * 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.
+ */
+#pragma once
+
+#include <QColor>
+
+struct UiElement {
+  QString value{};
+  QString label{};
+  QString units{};
+  QColor color{};
+
+  explicit UiElement(const QString &value = "", const QString &label = "", const QString &units = "", const QColor &color = QColor(255, 255, 255, 255))
+    : value(value), label(label), units(units), color(color) {}
+};
@@ -7,12 +7,202 @@

 #include "selfdrive/ui/sunnypilot/qt/onroad/hud.h"

+#include "selfdrive/ui/qt/util.h"
+
+
 HudRendererSP::HudRendererSP() {}

 void HudRendererSP::updateState(const UIState &s) {
  HudRenderer::updateState(s);
+
+  const SubMaster &sm = *(s.sm);
+  const bool cs_alive = sm.alive("controlsState");
+  const auto cs = sm["controlsState"].getControlsState();
+  const auto car_state = sm["carState"].getCarState();
+  const auto car_control = sm["carControl"].getCarControl();
+  const auto radar_state = sm["radarState"].getRadarState();
+  const auto is_gps_location_external = sm.rcv_frame("gpsLocationExternal") > 1;
+  const auto gpsLocation = is_gps_location_external ? sm["gpsLocationExternal"].getGpsLocationExternal() : sm["gpsLocation"].getGpsLocation();
+  const auto ltp = sm["liveTorqueParameters"].getLiveTorqueParameters();
+  const auto car_params = sm["carParams"].getCarParams();
+
+  static int reverse_delay = 0;
+  bool reverse_allowed = false;
+  if (int(car_state.getGearShifter()) != 4) {
+    reverse_delay = 0;
+    reverse_allowed = false;
+  } else {
+    reverse_delay += 50;
+    if (reverse_delay >= 1000) {
+      reverse_allowed = true;
+    }
+  }
+
+  reversing = reverse_allowed;
+  is_metric = s.scene.is_metric;
+
+  // Handle older routes where vEgoCluster is not set
+  v_ego_cluster_seen = v_ego_cluster_seen || car_state.getVEgoCluster() != 0.0;
+  float v_ego = v_ego_cluster_seen ? car_state.getVEgoCluster() : car_state.getVEgo();
+  speed = cs_alive ? std::max<float>(0.0, v_ego) : 0.0;
+  speed *= is_metric ? MS_TO_KPH : MS_TO_MPH;
+
+  latActive = car_control.getLatActive();
+  steerOverride = car_state.getSteeringPressed();
+
+  devUiInfo = s.scene.dev_ui_info;
+
+  speedUnit = is_metric ? tr("km/h") : tr("mph");
+  lead_d_rel = radar_state.getLeadOne().getDRel();
+  lead_v_rel = radar_state.getLeadOne().getVRel();
+  lead_status = radar_state.getLeadOne().getStatus();
+  steerControlType = car_params.getSteerControlType();
+  actuators = car_control.getActuators();
+  torqueLateral = steerControlType == cereal::CarParams::SteerControlType::TORQUE;
+  angleSteers = car_state.getSteeringAngleDeg();
+  desiredCurvature = cs.getDesiredCurvature();
+  curvature = cs.getCurvature();
+  roll = sm["liveParameters"].getLiveParameters().getRoll();
+  memoryUsagePercent = sm["deviceState"].getDeviceState().getMemoryUsagePercent();
+  gpsAccuracy = is_gps_location_external ? gpsLocation.getHorizontalAccuracy() : 1.0;  // External reports accuracy, internal does not.
+  altitude = gpsLocation.getAltitude();
+  vEgo = car_state.getVEgo();
+  aEgo = car_state.getAEgo();
+  steeringTorqueEps = car_state.getSteeringTorqueEps();
+  bearingAccuracyDeg = gpsLocation.getBearingAccuracyDeg();
+  bearingDeg = gpsLocation.getBearingDeg();
+  torquedUseParams = ltp.getUseParams();
+  latAccelFactorFiltered = ltp.getLatAccelFactorFiltered();
+  frictionCoefficientFiltered = ltp.getFrictionCoefficientFiltered();
+  liveValid = ltp.getLiveValid();
 }

 void HudRendererSP::draw(QPainter &p, const QRect &surface_rect) {
  HudRenderer::draw(p, surface_rect);
+  if (!reversing) {
+    // Bottom Dev UI
+    if (devUiInfo == 2) {
+      QRect rect_bottom(surface_rect.left(), surface_rect.bottom() - 60, surface_rect.width(), 61);
+      p.setPen(Qt::NoPen);
+      p.setBrush(QColor(0, 0, 0, 100));
+      p.drawRect(rect_bottom);
+      drawBottomDevUI(p, rect_bottom.left(), rect_bottom.center().y());
+    }
+
+    // Right Dev UI
+    if (devUiInfo != 0) {
+      QRect rect_right(surface_rect.right() - (UI_BORDER_SIZE * 2), UI_BORDER_SIZE * 1.5, 184, 170);
+      drawRightDevUI(p, surface_rect.right() - 184 - UI_BORDER_SIZE * 2, UI_BORDER_SIZE * 2 + rect_right.height());
+    }
+  }
+}
+
+void HudRendererSP::drawText(QPainter &p, int x, int y, const QString &text, QColor color) {
+  QRect real_rect = p.fontMetrics().boundingRect(text);
+  real_rect.moveCenter({x, y - real_rect.height() / 2});
+  p.setPen(color);
+  p.drawText(real_rect.x(), real_rect.bottom(), text);
+}
+
+int HudRendererSP::drawRightDevUIElement(QPainter &p, int x, int y, const QString &value, const QString &label, const QString &units, QColor &color) {
+
+  p.setFont(InterFont(28, QFont::Bold));
+  x += 92;
+  y += 80;
+  drawText(p, x, y, label);
+
+  p.setFont(InterFont(30 * 2, QFont::Bold));
+  y += 65;
+  drawText(p, x, y, value, color);
+
+  p.setFont(InterFont(28, QFont::Bold));
+
+  if (units.length() > 0) {
+    p.save();
+    x += 120;
+    y -= 25;
+    p.translate(x, y);
+    p.rotate(-90);
+    drawText(p, 0, 0, units);
+    p.restore();
+  }
+
+  return 130;
+}
+
+void HudRendererSP::drawRightDevUI(QPainter &p, int x, int y) {
+  int rh = 5;
+  int ry = y;
+
+  UiElement dRelElement = DeveloperUi::getDRel(lead_status, lead_d_rel);
+  rh += drawRightDevUIElement(p, x, ry, dRelElement.value, dRelElement.label, dRelElement.units, dRelElement.color);
+  ry = y + rh;
+
+  UiElement vRelElement = DeveloperUi::getVRel(lead_status, lead_v_rel, is_metric, speedUnit);
+  rh += drawRightDevUIElement(p, x, ry, vRelElement.value, vRelElement.label, vRelElement.units, vRelElement.color);
+  ry = y + rh;
+
+  UiElement steeringAngleDegElement = DeveloperUi::getSteeringAngleDeg(angleSteers, latActive, steerOverride);
+  rh += drawRightDevUIElement(p, x, ry, steeringAngleDegElement.value, steeringAngleDegElement.label, steeringAngleDegElement.units, steeringAngleDegElement.color);
+  ry = y + rh;
+
+  UiElement actuatorsOutputLateralElement = DeveloperUi::getActuatorsOutputLateral(steerControlType, actuators, desiredCurvature, vEgo, roll, latActive, steerOverride);
+  rh += drawRightDevUIElement(p, x, ry, actuatorsOutputLateralElement.value, actuatorsOutputLateralElement.label, actuatorsOutputLateralElement.units, actuatorsOutputLateralElement.color);
+  ry = y + rh;
+
+  UiElement actualLateralAccelElement = DeveloperUi::getActualLateralAccel(curvature, vEgo, roll, latActive, steerOverride);
+  rh += drawRightDevUIElement(p, x, ry, actualLateralAccelElement.value, actualLateralAccelElement.label, actualLateralAccelElement.units, actualLateralAccelElement.color);
+}
+
+int HudRendererSP::drawBottomDevUIElement(QPainter &p, int x, int y, const QString &value, const QString &label, const QString &units, QColor &color) {
+  p.setFont(InterFont(38, QFont::Bold));
+  QFontMetrics fm(p.font());
+  QRect init_rect = fm.boundingRect(label + " ");
+  QRect real_rect = fm.boundingRect(init_rect, 0, label + " ");
+  real_rect.moveCenter({x, y});
+
+  QRect init_rect2 = fm.boundingRect(value);
+  QRect real_rect2 = fm.boundingRect(init_rect2, 0, value);
+  real_rect2.moveTop(real_rect.top());
+  real_rect2.moveLeft(real_rect.right() + 10);
+
+  QRect init_rect3 = fm.boundingRect(units);
+  QRect real_rect3 = fm.boundingRect(init_rect3, 0, units);
+  real_rect3.moveTop(real_rect.top());
+  real_rect3.moveLeft(real_rect2.right() + 10);
+
+  p.setPen(Qt::white);
+  p.drawText(real_rect, Qt::AlignLeft | Qt::AlignVCenter, label);
+
+  p.setPen(color);
+  p.drawText(real_rect2, Qt::AlignRight | Qt::AlignVCenter, value);
+  p.drawText(real_rect3, Qt::AlignLeft | Qt::AlignVCenter, units);
+  return 430;
+}
+
+void HudRendererSP::drawBottomDevUI(QPainter &p, int x, int y) {
+  int rw = 90;
+
+  UiElement aEgoElement = DeveloperUi::getAEgo(aEgo);
+  rw += drawBottomDevUIElement(p, rw, y, aEgoElement.value, aEgoElement.label, aEgoElement.units, aEgoElement.color);
+
+  UiElement vEgoLeadElement = DeveloperUi::getVEgoLead(lead_status, lead_v_rel, vEgo, is_metric, speedUnit);
+  rw += drawBottomDevUIElement(p, rw, y, vEgoLeadElement.value, vEgoLeadElement.label, vEgoLeadElement.units, vEgoLeadElement.color);
+
+  if (torqueLateral && torquedUseParams) {
+    UiElement frictionCoefficientFilteredElement = DeveloperUi::getFrictionCoefficientFiltered(frictionCoefficientFiltered, liveValid);
+    rw += drawBottomDevUIElement(p, rw, y, frictionCoefficientFilteredElement.value, frictionCoefficientFilteredElement.label, frictionCoefficientFilteredElement.units, frictionCoefficientFilteredElement.color);
+
+    UiElement latAccelFactorFilteredElement = DeveloperUi::getLatAccelFactorFiltered(latAccelFactorFiltered, liveValid);
+    rw += drawBottomDevUIElement(p, rw, y, latAccelFactorFilteredElement.value, latAccelFactorFilteredElement.label, latAccelFactorFilteredElement.units, latAccelFactorFilteredElement.color);
+  } else {
+    UiElement steeringTorqueEpsElement = DeveloperUi::getSteeringTorqueEps(steeringTorqueEps);
+    rw += drawBottomDevUIElement(p, rw, y, steeringTorqueEpsElement.value, steeringTorqueEpsElement.label, steeringTorqueEpsElement.units, steeringTorqueEpsElement.color);
+
+    UiElement bearingDegElement = DeveloperUi::getBearingDeg(bearingAccuracyDeg, bearingDeg);
+    rw += drawBottomDevUIElement(p, rw, y, bearingDegElement.value, bearingDegElement.label, bearingDegElement.units, bearingDegElement.color);
+  }
+
+  UiElement altitudeElement = DeveloperUi::getAltitude(gpsAccuracy, altitude);
+  rw += drawBottomDevUIElement(p, rw, y, altitudeElement.value, altitudeElement.label, altitudeElement.units, altitudeElement.color);
 }
@@ -7,9 +7,8 @@

 #pragma once

-#include <QPainter>
-
 #include "selfdrive/ui/qt/onroad/hud.h"
+#include "selfdrive/ui/sunnypilot/qt/onroad/developer_ui/developer_ui.h"

 class HudRendererSP : public HudRenderer {
  Q_OBJECT
@@ -18,4 +17,40 @@ public:
  HudRendererSP();
  void updateState(const UIState &s) override;
  void draw(QPainter &p, const QRect &surface_rect) override;
+
+private:
+  Params params;
+  void drawText(QPainter &p, int x, int y, const QString &text, QColor color = Qt::white);
+  void drawRightDevUI(QPainter &p, int x, int y);
+  int drawRightDevUIElement(QPainter &p, int x, int y, const QString &value, const QString &label, const QString &units, QColor &color);
+  int drawBottomDevUIElement(QPainter &p, int x, int y, const QString &value, const QString &label, const QString &units, QColor &color);
+  void drawBottomDevUI(QPainter &p, int x, int y);
+
+  bool lead_status;
+  float lead_d_rel;
+  float lead_v_rel;
+  bool torqueLateral;
+  float angleSteers;
+  float desiredCurvature;
+  float curvature;
+  float roll;
+  int memoryUsagePercent;
+  int devUiInfo;
+  float gpsAccuracy;
+  float altitude;
+  float vEgo;
+  float aEgo;
+  float steeringTorqueEps;
+  float bearingAccuracyDeg;
+  float bearingDeg;
+  bool torquedUseParams;
+  float latAccelFactorFiltered;
+  float frictionCoefficientFiltered;
+  bool liveValid;
+  QString speedUnit;
+  bool latActive;
+  bool steerOverride;
+  bool reversing;
+  cereal::CarParams::SteerControlType steerControlType;
+  cereal::CarControl::Actuators::Reader actuators;
 };
@@ -18,13 +18,22 @@ UIStateSP::UIStateSP(QObject *parent) : UIState(parent) {
    "modelV2", "controlsState", "liveCalibration", "radarState", "deviceState",
    "pandaStates", "carParams", "driverMonitoringState", "carState", "driverStateV2",
    "wideRoadCameraState", "managerState", "selfdriveState", "longitudinalPlan",
-    "modelManagerSP", "selfdriveStateSP", "longitudinalPlanSP", "backupManagerSP"
+    "modelManagerSP", "selfdriveStateSP", "longitudinalPlanSP", "backupManagerSP",
+    "carControl", "gpsLocationExternal", "gpsLocation", "liveTorqueParameters",
+    "carStateSP", "liveParameters"
  });

  // update timer
  timer = new QTimer(this);
  QObject::connect(timer, &QTimer::timeout, this, &UIStateSP::update);
  timer->start(1000 / UI_FREQ);
+
+  // Param watcher for UIScene param updates
+  param_watcher = new ParamWatcher(this);
+  connect(param_watcher, &ParamWatcher::paramChanged, [=](const QString &param_name, const QString &param_value) {
+    ui_update_params_sp(this);
+  });
+  param_watcher->addParam("DevUIInfo");
 }

 // This method overrides completely the update method from the parent class intentionally.
@@ -39,6 +48,11 @@ void UIStateSP::update() {
  emit uiUpdate(*this);
 }

+void ui_update_params_sp(UIStateSP *s) {
+  auto params = Params();
+  s->scene.dev_ui_info = std::atoi(params.get("DevUIInfo").c_str());
+}
+
 DeviceSP::DeviceSP(QObject *parent) : Device(parent) {
  QObject::connect(uiStateSP(), &UIStateSP::uiUpdate, this, &DeviceSP::update);
  QObject::connect(this, &Device::displayPowerChanged, this, &DeviceSP::handleDisplayPowerChanged);
@@ -13,6 +13,7 @@
 #include "selfdrive/ui/sunnypilot/qt/network/sunnylink/models/role_model.h"
 #include "selfdrive/ui/sunnypilot/qt/network/sunnylink/models/sponsor_role_model.h"
 #include "selfdrive/ui/ui.h"
+#include "selfdrive/ui/qt/util.h"

 class UIStateSP : public UIState {
  Q_OBJECT
@@ -73,6 +74,7 @@ private slots:
 private:
  std::vector<RoleModel> sunnylinkRoles = {};
  std::vector<UserModel> sunnylinkUsers = {};
+  ParamWatcher *param_watcher;
 };

 UIStateSP *uiStateSP();
@@ -92,3 +94,5 @@ private:

 DeviceSP *deviceSP();
 inline DeviceSP *device() { return deviceSP(); }
+
+void ui_update_params_sp(UIStateSP *s);
@@ -0,0 +1,12 @@
+/**
+  * 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.
+ */
+
+#pragma once
+
+typedef struct UISceneSP : UIScene {
+  int dev_ui_info = 0;
+} UISceneSP;
@@ -29,7 +29,7 @@ UI_DELAY = 0.5 # may be slower on CI?
 TEST_ROUTE = "a2a0ccea32023010|2023-07-27--13-01-19"

 STREAMS: list[tuple[VisionStreamType, CameraConfig, bytes]] = []
-OFFROAD_ALERTS = ['Offroad_StorageMissing', 'Offroad_IsTakingSnapshot']
+OFFROAD_ALERTS = ['Offroad_IsTakingSnapshot', ]
 DATA: dict[str, capnp.lib.capnp._DynamicStructBuilder] = dict.fromkeys(
  ["carParams", "deviceState", "pandaStates", "controlsState", "selfdriveState",
  "liveCalibration", "modelV2", "radarState", "driverMonitoringState", "carState",
@@ -55,8 +55,7 @@ void update_state(UIState *s) {
  }
  if (sm.updated("wideRoadCameraState")) {
    auto cam_state = sm["wideRoadCameraState"].getWideRoadCameraState();
-    float scale = (cam_state.getSensor() == cereal::FrameData::ImageSensor::AR0231) ? 6.0f : 1.0f;
-    scene.light_sensor = std::max(100.0f - scale * cam_state.getExposureValPercent(), 0.0f);
+    scene.light_sensor = std::max(100.0f - cam_state.getExposureValPercent(), 0.0f);
  } else if (!sm.allAliveAndValid({"wideRoadCameraState"})) {
    scene.light_sensor = -1;
  }
@@ -66,6 +66,11 @@ typedef struct UIScene {
  uint64_t started_frame;
 } UIScene;

+#ifdef SUNNYPILOT
+#include "sunnypilot/ui_scene.h"
+#define UIScene UISceneSP
+#endif
+
 class UIState : public QObject {
  Q_OBJECT

@@ -105,10 +105,7 @@ class UIState:
    # Handle wide road camera state updates
    if self.sm.updated["wideRoadCameraState"]:
      cam_state = self.sm["wideRoadCameraState"]
-
-      # Scale factor based on sensor type
-      scale = 6.0 if cam_state.sensor == 'ar0231' else 1.0
-      self.light_sensor = max(100.0 - scale * cam_state.exposureValPercent, 0.0)
+      self.light_sensor = max(100.0 - cam_state.exposureValPercent, 0.0)
    elif not self.sm.alive["wideRoadCameraState"] or not self.sm.valid["wideRoadCameraState"]:
      self.light_sensor = -1

@@ -1 +1 @@
-2ff2f49176a13bc7f856645d785b3b838a5c7ecf7f6cb37699fa0459ebf12453
+70406ab4dd66d0e384734a8a56632ae4a62bc9670c2e630a0f71588c4e212cd8
@@ -73,7 +73,7 @@ class ControlsExt:
    # MADS state
    CC_SP.mads = sm['selfdriveStateSP'].mads

-    CC_SP.params = self.param_store.publish()
+    CC_SP.params = self.param_store.param_list

    return CC_SP

@@ -4,39 +4,41 @@ 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.
 """
-import capnp
-
 from cereal import custom
-
 from opendbc.car import structs
 from openpilot.common.params import Params

+from sunnypilot.sunnylink.utils import get_param_as_byte
+

 class ParamStore:
  keys: list[str]
-  values: dict[str, str]
+  _params: dict[str, custom.CarControlSP.Param]

  def __init__(self, CP: structs.CarParams):
    universal_params: list[str] = []
    brand_params: list[str] = []

    self.keys = universal_params + brand_params
-    self.values = {}
-    self.cached_params_list: list[capnp.lib.capnp._DynamicStructBuilder] | None = None
+    self._params = {}

    self.frame = 0

  def update(self, params: Params) -> None:
-    if self.frame % 300 == 0:
-      old_values = dict(self.values)
-      self.values = {k: params.get(k) or "0" for k in self.keys}
-      if old_values != self.values:
-        self.cached_params_list = None
-
    self.frame += 1
+    if self.frame % 300 != 0:
+      return

-  def publish(self) -> list[capnp.lib.capnp._DynamicStructBuilder]:
-    if self.cached_params_list is None:
-      # TODO-SP: Why are we doing a list instead of a dictionary here?
-      self.cached_params_list = [custom.CarControlSP.Param(key=k, value=self.values[k]) for k in self.keys]
-    return self.cached_params_list
+    for key in self.keys:
+      param_type = params.get_type(key).name.lower()  # Using string instead of number because its "loose" dependency, and could change by OP at anytime.
+
+      # Over engineering opportunity: It's possible this conversion is slow, we may check the value as params returns it for cache purposes. Not today.
+      param_value = get_param_as_byte(key, params)
+      if (existing_param := self._params.get(key)) is not None and existing_param.value == param_value:
+        continue
+
+      self._params[key] = custom.CarControlSP.Param(key=key, value=param_value, type=param_type)
+
+  @property
+  def param_list(self) -> list[custom.CarControlSP.Param]:
+    return [v for k,v in self._params.items()]
@@ -23,7 +23,7 @@ from websocket import (ABNF, WebSocket, WebSocketException, WebSocketTimeoutExce

 import cereal.messaging as messaging
 from sunnypilot.sunnylink.api import SunnylinkApi
-from sunnypilot.sunnylink.utils import sunnylink_need_register, sunnylink_ready, get_param_as_byte
+from sunnypilot.sunnylink.utils import sunnylink_need_register, sunnylink_ready, get_param_as_byte, save_param_from_base64_encoded_string

 SUNNYLINK_ATHENA_HOST = os.getenv('SUNNYLINK_ATHENA_HOST', 'wss://ws.stg.api.sunnypilot.ai')
 HANDLER_THREADS = int(os.getenv('HANDLER_THREADS', "4"))
@@ -184,14 +184,18 @@ def getParams(params_keys: list[str], compression: bool = False) -> str | dict[s

  try:
    param_keys_validated = [key for key in params_keys if key in getParamsAllKeys()]
-    params_dict:  dict[str, list[dict[str, str | bool | int ]]] = {"params": [
-      {
+    params_dict: dict[str, list[dict[str, str | bool | int]]] = {"params": []}
+    for key in param_keys_validated:
+      value = get_param_as_byte(key)
+      if value is None:
+        continue
+
+      params_dict["params"].append({
        "key": key,
-        "value": base64.b64encode(gzip.compress(get_param_as_byte(key)) if compression else get_param_as_byte(key)).decode('utf-8'),
+        "value": base64.b64encode(gzip.compress(value) if compression else value).decode('utf-8'),
        "type": int(params.get_type(key).value),
        "is_compressed": compression
-      } for key in param_keys_validated
-    ]}
+      })

    response = {str(param.get('key')): str(param.get('value')) for param in params_dict.get("params", [])}
    response |= {"params": json.dumps(params_dict.get("params", []))} # Upcoming for settings v1
@@ -204,15 +208,9 @@ def getParams(params_keys: list[str], compression: bool = False) -> str | dict[s

@dispatcher.add_method
 def saveParams(params_to_update: dict[str, str], compression: bool = False) -> None:
-  params = Params()
-  params_dict = {key: base64.b64decode(value) for key, value in params_to_update.items()}
-
-  if compression:
-    params_dict = {key: gzip.decompress(value) for key, value in params_dict.items()}
-
-  for key, value in params_dict.items():
+  for key, value in params_to_update.items():
    try:
-      params.put(key, value)
+      save_param_from_base64_encoded_string(key, value, compression)
    except Exception as e:
      cloudlog.error(f"sunnylinkd.saveParams.exception {e}")

@@ -12,7 +12,7 @@ from enum import Enum
 from typing import Any

 from openpilot.common.git import get_branch
-from openpilot.common.params import Params, ParamKeyType, ParamKeyFlag
+from openpilot.common.params import Params, ParamKeyFlag
 from openpilot.common.realtime import Ratekeeper
 from openpilot.common.swaglog import cloudlog
 from openpilot.system.version import get_version
@@ -20,7 +20,7 @@ from openpilot.system.version import get_version
 from cereal import messaging, custom
 from sunnypilot.sunnylink.api import SunnylinkApi
 from sunnypilot.sunnylink.backups.utils import decrypt_compressed_data, encrypt_compress_data, SnakeCaseEncoder
-from sunnypilot.sunnylink.utils import get_param_as_byte
+from sunnypilot.sunnylink.utils import get_param_as_byte, save_param_from_base64_encoded_string


 class OperationType(Enum):
@@ -173,8 +173,7 @@ class BackupManagerSP:
      self._update_progress(75.0, OperationType.RESTORE)

      # Apply configuration
-      all_values_encoded = self._get_metadata_value(backup_metadata, "all_values_encoded", "false")
-      self._apply_config(config_data, str(all_values_encoded).lower() == "true")
+      self._apply_config(config_data)

      self.restore_status = custom.BackupManagerSP.Status.completed
      self._update_progress(100.0, OperationType.RESTORE)
@@ -187,7 +186,7 @@ class BackupManagerSP:
      self._report_status()
      return False

-  def _apply_config(self, config_data: dict[str, str], all_values_encoded: bool = False) -> None:
+  def _apply_config(self, config_data: dict[str, str]) -> None:
    """Applies configuration data from a backup, but only for parameters marked as backupable."""
    backupable_params = [k.decode('utf-8') for k in self.params.all_keys(ParamKeyFlag.BACKUP)]
    backupable_set_lower = {p.lower() for p in backupable_params}
@@ -199,26 +198,8 @@ class BackupManagerSP:
      if param.lower() in backupable_set_lower:
        # Find real param name (with correct casing)
        real_param = next(p for p in backupable_params if p.lower() == param.lower())
-        param_type = self.params.get_type(real_param)
        try:
-          value = base64.b64decode(encoded_value) if all_values_encoded else encoded_value
-
-          if param_type != ParamKeyType.BYTES:
-            value = value.decode('utf-8')  # type: ignore
-
-          if param_type == ParamKeyType.STRING:
-            value = value
-          elif param_type == ParamKeyType.BOOL:
-            value = value.lower() in ('true', '1', 'yes')  # type: ignore
-          elif param_type == ParamKeyType.INT:
-            value = int(value)  # type: ignore
-          elif param_type == ParamKeyType.FLOAT:
-            value = float(value)  # type: ignore
-          elif param_type == ParamKeyType.TIME:
-            value = str(value)
-          elif param_type == ParamKeyType.JSON:
-            value = json.loads(value)
-          self.params.put(real_param, value)
+          save_param_from_base64_encoded_string(real_param, encoded_value)
          restored_count += 1
        except Exception as e:
          cloudlog.error(f"Failed to restore param {param}: {str(e)}")
@@ -1,3 +1,5 @@
+import base64
+import gzip
 import json
 from sunnypilot.sunnylink.api import SunnylinkApi, UNREGISTERED_SUNNYLINK_DONGLE_ID
 from openpilot.common.params import Params, ParamKeyType
@@ -58,13 +60,57 @@ def get_api_token():
  print(f"API Token: {token}")


-def get_param_as_byte(param_name: str) -> bytes:
-  params = Params()
+def get_param_as_byte(param_name: str, params=None) -> bytes | None:
+  """Get a parameter as bytes. Returns None if the parameter does not exist."""
+  params = params or Params() # Use existing Params instance if provided
  param = params.get(param_name)
-  param_type = params.get_type(param_name)
+  if param is None:
+    return None

+  param_type = params.get_type(param_name)
  if param_type == ParamKeyType.BYTES:
    return bytes(param)
  elif param_type == ParamKeyType.JSON:
    return json.dumps(param).encode('utf-8')
  return str(param).encode('utf-8')
+
+
+def save_param_from_base64_encoded_string(param_name: str, base64_encoded_data: str, is_compressed=False) -> None:
+  """Save a parameter from bytes. Overwrites the parameter if it already exists."""
+  params = Params()
+  # Find real param name (with correct casing)
+  param_type = params.get_type(param_name)
+  value = base64.b64decode(base64_encoded_data)
+
+  if is_compressed:
+    value = gzip.decompress(value)
+
+  # We convert to string anything that isn't bytes first. We later transform further.
+  param_value = _convert_param_to_type(value, param_type)
+  params.put(param_name, param_value)
+
+
+def _convert_param_to_type(value: bytes, param_type: ParamKeyType) -> bytes | str | int | float | bool | dict | None:
+  """
+  Convert a byte value to the specified param type. Used internally when getting a Param to convert it to the right type.
+  If this method looks familiar, it's because on SP we have a similar one in openpilot/sunnypilot/car/__init__.py.
+  """
+
+  # We convert to string anything that isn't bytes first. We later transform further.
+  if param_type != ParamKeyType.BYTES:
+    value = value.decode('utf-8')  # type: ignore
+
+  if param_type == ParamKeyType.STRING:
+    value = value
+  elif param_type == ParamKeyType.BOOL:
+    value = value.lower() in ('true', '1', 'yes')  # type: ignore
+  elif param_type == ParamKeyType.INT:
+    value = int(value)  # type: ignore
+  elif param_type == ParamKeyType.FLOAT:
+    value = float(value)  # type: ignore
+  elif param_type == ParamKeyType.TIME:
+    value = str(value)  # type: ignore
+  elif param_type == ParamKeyType.JSON:
+    value = json.loads(value)
+
+  return value
@@ -4,7 +4,7 @@ libs = [common, 'OpenCL', messaging, visionipc, gpucommon]

 if arch != "Darwin":
  camera_obj = env.Object(['cameras/camera_qcom2.cc', 'cameras/camera_common.cc', 'cameras/spectra.cc',
-                           'cameras/cdm.cc', 'sensors/ar0231.cc', 'sensors/ox03c10.cc', 'sensors/os04c10.cc'])
+                           'cameras/cdm.cc', 'sensors/ox03c10.cc', 'sensors/os04c10.cc'])
  env.Program('camerad', ['main.cc', camera_obj], LIBS=libs)

 if GetOption("extras") and arch == "x86_64":
@@ -13,7 +13,7 @@ typedef enum {
  ISP_BPS_PROCESSED,  // fully processed image through the BPS
 } SpectraOutputType;

-// For the comma 3/3X three camera platform
+// For the comma 3X three camera platform

 struct CameraConfig {
  int camera_num;
@@ -1004,8 +1004,7 @@ bool SpectraCamera::openSensor() {
  };

  // Figure out which sensor we have
-  if (!init_sensor_lambda(new AR0231) &&
-      !init_sensor_lambda(new OX03C10) &&
+  if (!init_sensor_lambda(new OX03C10) &&
      !init_sensor_lambda(new OS04C10)) {
    LOGE("** sensor %d FAILED bringup, disabling", cc.camera_num);
    enabled = false;
@@ -1,136 +0,0 @@
-#include <cassert>
-#include <cmath>
-
-#include "system/camerad/sensors/sensor.h"
-
-namespace {
-
-const size_t AR0231_REGISTERS_HEIGHT = 2;
-// TODO: this extra height is universal and doesn't apply per camera
-const size_t AR0231_STATS_HEIGHT = 2 + 8;
-
-const float sensor_analog_gains_AR0231[] = {
-    1.0 / 8.0, 2.0 / 8.0, 2.0 / 7.0, 3.0 / 7.0,  // 0, 1, 2, 3
-    3.0 / 6.0, 4.0 / 6.0, 4.0 / 5.0, 5.0 / 5.0,  // 4, 5, 6, 7
-    5.0 / 4.0, 6.0 / 4.0, 6.0 / 3.0, 7.0 / 3.0,  // 8, 9, 10, 11
-    7.0 / 2.0, 8.0 / 2.0, 8.0 / 1.0};            // 12, 13, 14, 15 = bypass
-
-}  // namespace
-
-AR0231::AR0231() {
-  image_sensor = cereal::FrameData::ImageSensor::AR0231;
-  bayer_pattern = CAM_ISP_PATTERN_BAYER_GRGRGR;
-  pixel_size_mm = 0.003;
-  data_word = true;
-  frame_width = 1928;
-  frame_height = 1208;
-  frame_stride = (frame_width * 12 / 8) + 4;
-  extra_height = AR0231_REGISTERS_HEIGHT + AR0231_STATS_HEIGHT;
-
-  registers_offset = 0;
-  frame_offset = AR0231_REGISTERS_HEIGHT;
-  stats_offset = AR0231_REGISTERS_HEIGHT + frame_height;
-
-  start_reg_array.assign(std::begin(start_reg_array_ar0231), std::end(start_reg_array_ar0231));
-  init_reg_array.assign(std::begin(init_array_ar0231), std::end(init_array_ar0231));
-  probe_reg_addr = 0x3000;
-  probe_expected_data = 0x354;
-  bits_per_pixel = 12;
-  mipi_format = CAM_FORMAT_MIPI_RAW_12;
-  frame_data_type = 0x12;  // Changing stats to 0x2C doesn't work, so change pixels to 0x12 instead
-  mclk_frequency = 19200000; //Hz
-
-  readout_time_ns = 22850000;
-
-  dc_gain_factor = 2.5;
-  dc_gain_min_weight = 0;
-  dc_gain_max_weight = 1;
-  dc_gain_on_grey = 0.2;
-  dc_gain_off_grey = 0.3;
-  exposure_time_min = 2;       // with HDR, fastest ss
-  exposure_time_max = 0x0855;  // with HDR, slowest ss, 40ms
-  analog_gain_min_idx = 0x1;   // 0.25x
-  analog_gain_rec_idx = 0x6;   // 0.8x
-  analog_gain_max_idx = 0xD;   // 4.0x
-  analog_gain_cost_delta = 0;
-  analog_gain_cost_low = 0.1;
-  analog_gain_cost_high = 5.0;
-  for (int i = 0; i <= analog_gain_max_idx; i++) {
-    sensor_analog_gains[i] = sensor_analog_gains_AR0231[i];
-  }
-  min_ev = exposure_time_min * sensor_analog_gains[analog_gain_min_idx];
-  max_ev = exposure_time_max * dc_gain_factor * sensor_analog_gains[analog_gain_max_idx];
-  target_grey_factor = 1.0;
-
-  black_level = 168;
-  color_correct_matrix = {
-    0x000000af, 0x00000ff9, 0x00000fd8,
-    0x00000fbc, 0x000000bb, 0x00000009,
-    0x00000fb6, 0x00000fe0, 0x000000ea,
-  };
-  for (int i = 0; i < 65; i++) {
-    float fx = i / 64.0;
-    const float gamma_k = 0.75;
-    const float gamma_b = 0.125;
-    const float mp = 0.01; // ideally midpoint should be adaptive
-    const float rk = 9 - 100*mp;
-    // poly approximation for s curve
-    fx = (fx > mp) ?
-      ((rk * (fx-mp) * (1-(gamma_k*mp+gamma_b)) * (1+1/(rk*(1-mp))) / (1+rk*(fx-mp))) + gamma_k*mp + gamma_b) :
-      ((rk * (fx-mp) * (gamma_k*mp+gamma_b) * (1+1/(rk*mp)) / (1-rk*(fx-mp))) + gamma_k*mp + gamma_b);
-    gamma_lut_rgb.push_back((uint32_t)(fx*1023.0 + 0.5));
-  }
-  prepare_gamma_lut();
-  linearization_lut = {
-    0x02000000, 0x02000000, 0x02000000, 0x02000000,
-    0x020007ff, 0x020007ff, 0x020007ff, 0x020007ff,
-    0x02000bff, 0x02000bff, 0x02000bff, 0x02000bff,
-    0x020017ff, 0x020017ff, 0x020017ff, 0x020017ff,
-    0x02001bff, 0x02001bff, 0x02001bff, 0x02001bff,
-    0x020023ff, 0x020023ff, 0x020023ff, 0x020023ff,
-    0x00003fff, 0x00003fff, 0x00003fff, 0x00003fff,
-    0x00003fff, 0x00003fff, 0x00003fff, 0x00003fff,
-    0x00003fff, 0x00003fff, 0x00003fff, 0x00003fff,
-  };
-  linearization_pts = {0x07ff0bff, 0x17ff1bff, 0x23ff3fff, 0x3fff3fff};
-  vignetting_lut = {
-    0x00eaa755, 0x00cf2679, 0x00bc05e0, 0x00acc566, 0x00a1450a, 0x009984cc, 0x0095a4ad, 0x009584ac, 0x009944ca, 0x00a0c506, 0x00ac0560, 0x00bb25d9, 0x00ce2671, 0x00e90748, 0x01112889, 0x014a2a51, 0x01984cc2,
-    0x00db06d8, 0x00c30618, 0x00afe57f, 0x00a0a505, 0x009524a9, 0x008d646b, 0x0089844c, 0x0089644b, 0x008d2469, 0x0094a4a5, 0x009fe4ff, 0x00af0578, 0x00c20610, 0x00d986cc, 0x00fda7ed, 0x01320990, 0x017aebd7,
-    0x00d1868c, 0x00baa5d5, 0x00a7853c, 0x009844c2, 0x008cc466, 0x0085a42d, 0x0083641b, 0x0083641b, 0x0085842c, 0x008c4462, 0x0097a4bd, 0x00a6c536, 0x00b9a5cd, 0x00d06683, 0x00f1678b, 0x01226913, 0x0167ab3d,
-    0x00cd0668, 0x00b625b1, 0x00a30518, 0x0093c49e, 0x00884442, 0x00830418, 0x0080e407, 0x0080c406, 0x0082e417, 0x0087c43e, 0x00932499, 0x00a22511, 0x00b525a9, 0x00cbe65f, 0x00eb0758, 0x011a68d3, 0x015daaed,
-    0x00cc4662, 0x00b565ab, 0x00a24512, 0x00930498, 0x0087843c, 0x0082a415, 0x00806403, 0x00806403, 0x00828414, 0x00870438, 0x00926493, 0x00a1850c, 0x00b465a3, 0x00cb2659, 0x00ea2751, 0x011928c9, 0x015c2ae1,
-    0x00cf667b, 0x00b885c4, 0x00a5652b, 0x009624b1, 0x008aa455, 0x00846423, 0x00822411, 0x00822411, 0x00844422, 0x008a2451, 0x009564ab, 0x00a48524, 0x00b785bc, 0x00ce4672, 0x00ee6773, 0x011e88f4, 0x0162eb17,
-    0x00d6c6b6, 0x00bf65fb, 0x00ac4562, 0x009d04e8, 0x0091848c, 0x0089c44e, 0x00862431, 0x00860430, 0x0089844c, 0x00910488, 0x009c64e3, 0x00ab655b, 0x00be65f3, 0x00d566ab, 0x00f847c2, 0x012b2959, 0x01726b93,
-    0x00e3e71f, 0x00ca0650, 0x00b705b8, 0x00a7a53d, 0x009c24e1, 0x009484a4, 0x00908484, 0x00908484, 0x009424a1, 0x009bc4de, 0x00a70538, 0x00b625b1, 0x00c90648, 0x00e26713, 0x0108e847, 0x013fe9ff, 0x018bcc5e,
-    0x00f807c0, 0x00d966cb, 0x00c5862c, 0x00b625b1, 0x00aaa555, 0x00a30518, 0x009f04f8, 0x009f04f8, 0x00a2a515, 0x00aa2551, 0x00b585ac, 0x00c4a625, 0x00d846c2, 0x00f647b2, 0x0121a90d, 0x015e4af2, 0x01b8cdc6,
-    0x011548aa, 0x00f1678b, 0x00d886c4, 0x00c86643, 0x00bce5e7, 0x00b545aa, 0x00b1658b, 0x00b1458a, 0x00b505a8, 0x00bc85e4, 0x00c7c63e, 0x00d786bc, 0x00efe77f, 0x0113489a, 0x0144ea27, 0x01888c44, 0x01fdcfee,
-    0x013e49f2, 0x0113e89f, 0x00f5a7ad, 0x00e0c706, 0x00d30698, 0x00cb665b, 0x00c7663b, 0x00c7663b, 0x00cb0658, 0x00d2a695, 0x00dfe6ff, 0x00f467a3, 0x01122891, 0x013be9df, 0x01750ba8, 0x01cfae7d, 0x025912c8,
-    0x01766bb3, 0x01446a23, 0x011fc8fe, 0x0105e82f, 0x00f467a3, 0x00e9874c, 0x00e46723, 0x00e44722, 0x00e92749, 0x00f3a79d, 0x0104c826, 0x011e48f2, 0x01424a12, 0x01738b9c, 0x01bf6dfb, 0x023611b0, 0x02ced676,
-    0x01cf8e7c, 0x01866c33, 0x015aaad5, 0x013ae9d7, 0x01250928, 0x011768bb, 0x0110a885, 0x01108884, 0x0116e8b7, 0x01242921, 0x0139a9cd, 0x0158eac7, 0x01840c20, 0x01cb0e58, 0x0233719b, 0x02b9d5ce, 0x03645b22,
-  };
-}
-
-std::vector<i2c_random_wr_payload> AR0231::getExposureRegisters(int exposure_time, int new_exp_g, bool dc_gain_enabled) const {
-  uint16_t analog_gain_reg = 0xFF00 | (new_exp_g << 4) | new_exp_g;
-  return {
-    {0x3366, analog_gain_reg},
-    {0x3362, (uint16_t)(dc_gain_enabled ? 0x1 : 0x0)},
-    {0x3012, (uint16_t)exposure_time},
-  };
-}
-
-int AR0231::getSlaveAddress(int port) const {
-  assert(port >= 0 && port <= 2);
-  return (int[]){0x20, 0x30, 0x20}[port];
-}
-
-float AR0231::getExposureScore(float desired_ev, int exp_t, int exp_g_idx, float exp_gain, int gain_idx) const {
-  // Cost of ev diff
-  float score = std::abs(desired_ev - (exp_t * exp_gain)) * 10;
-  // Cost of absolute gain
-  float m = exp_g_idx > analog_gain_rec_idx ? analog_gain_cost_high : analog_gain_cost_low;
-  score += std::abs(exp_g_idx - (int)analog_gain_rec_idx) * m;
-  // Cost of changing gain
-  score += std::abs(exp_g_idx - gain_idx) * (score + 1.0) / 10.0;
-  return score;
-}
@@ -1,121 +0,0 @@
-#pragma once
-
-const struct i2c_random_wr_payload start_reg_array_ar0231[] = {{0x301A, 0x91C}};
-const struct i2c_random_wr_payload stop_reg_array_ar0231[] = {{0x301A, 0x918}};
-
-const struct i2c_random_wr_payload init_array_ar0231[] = {
-  {0x301A, 0x0018}, // RESET_REGISTER
-
-  // **NOTE**: if this is changed, readout_time_ns must be updated in the Sensor config
-
-  // CLOCK Settings
-  // input clock is 19.2 / 2 * 0x37 = 528 MHz
-  // pixclk is 528 / 6 = 88 MHz
-  // full roll time is 1000/(PIXCLK/(LINE_LENGTH_PCK*FRAME_LENGTH_LINES)) = 39.99 ms
-  // img  roll time is 1000/(PIXCLK/(LINE_LENGTH_PCK*Y_OUTPUT_CONTROL))   = 22.85 ms
-  {0x302A, 0x0006}, // VT_PIX_CLK_DIV
-  {0x302C, 0x0001}, // VT_SYS_CLK_DIV
-  {0x302E, 0x0002}, // PRE_PLL_CLK_DIV
-  {0x3030, 0x0037}, // PLL_MULTIPLIER
-  {0x3036, 0x000C}, // OP_PIX_CLK_DIV
-  {0x3038, 0x0001}, // OP_SYS_CLK_DIV
-
-  // FORMAT
-  {0x3040, 0xC000}, // READ_MODE
-  {0x3004, 0x0000}, // X_ADDR_START_
-  {0x3008, 0x0787}, // X_ADDR_END_
-  {0x3002, 0x0000}, // Y_ADDR_START_
-  {0x3006, 0x04B7}, // Y_ADDR_END_
-  {0x3032, 0x0000}, // SCALING_MODE
-  {0x30A2, 0x0001}, // X_ODD_INC_
-  {0x30A6, 0x0001}, // Y_ODD_INC_
-  {0x3402, 0x0788}, // X_OUTPUT_CONTROL
-  {0x3404, 0x04B8}, // Y_OUTPUT_CONTROL
-  {0x3064, 0x1982}, // SMIA_TEST
-  {0x30BA, 0x11F2}, // DIGITAL_CTRL
-
-  // Enable external trigger and disable GPIO outputs
-  {0x30CE, 0x0120}, // SLAVE_SH_SYNC_MODE | FRAME_START_MODE
-  {0x340A, 0xE0},   // GPIO3_INPUT_DISABLE | GPIO2_INPUT_DISABLE | GPIO1_INPUT_DISABLE
-  {0x340C, 0x802},  // GPIO_HIDRV_EN | GPIO0_ISEL=2
-
-  // Readout timing
-  {0x300C, 0x0672}, // LINE_LENGTH_PCK (valid for 3-exposure HDR)
-  {0x300A, 0x0855}, // FRAME_LENGTH_LINES
-  {0x3042, 0x0000}, // EXTRA_DELAY
-
-  // Readout Settings
-  {0x31AE, 0x0204}, // SERIAL_FORMAT, 4-lane MIPI
-  {0x31AC, 0x0C0C}, // DATA_FORMAT_BITS, 12 -> 12
-  {0x3342, 0x1212}, // MIPI_F1_PDT_EDT
-  {0x3346, 0x1212}, // MIPI_F2_PDT_EDT
-  {0x334A, 0x1212}, // MIPI_F3_PDT_EDT
-  {0x334E, 0x1212}, // MIPI_F4_PDT_EDT
-  {0x3344, 0x0011}, // MIPI_F1_VDT_VC
-  {0x3348, 0x0111}, // MIPI_F2_VDT_VC
-  {0x334C, 0x0211}, // MIPI_F3_VDT_VC
-  {0x3350, 0x0311}, // MIPI_F4_VDT_VC
-  {0x31B0, 0x0053}, // FRAME_PREAMBLE
-  {0x31B2, 0x003B}, // LINE_PREAMBLE
-  {0x301A, 0x001C}, // RESET_REGISTER
-
-  // Noise Corrections
-  {0x3092, 0x0C24}, // ROW_NOISE_CONTROL
-  {0x337A, 0x0C80}, // DBLC_SCALE0
-  {0x3370, 0x03B1}, // DBLC
-  {0x3044, 0x0400}, // DARK_CONTROL
-
-  // Enable temperature sensor
-  {0x30B4, 0x0007}, // TEMPSENS0_CTRL_REG
-  {0x30B8, 0x0007}, // TEMPSENS1_CTRL_REG
-
-  // Enable dead pixel correction using
-  // the 1D line correction scheme
-  {0x31E0, 0x0003},
-
-  // HDR Settings
-  {0x3082, 0x0004}, // OPERATION_MODE_CTRL
-  {0x3238, 0x0444}, // EXPOSURE_RATIO
-
-  {0x1008, 0x0361}, // FINE_INTEGRATION_TIME_MIN
-  {0x100C, 0x0589}, // FINE_INTEGRATION_TIME2_MIN
-  {0x100E, 0x07B1}, // FINE_INTEGRATION_TIME3_MIN
-  {0x1010, 0x0139}, // FINE_INTEGRATION_TIME4_MIN
-
-  // TODO: do these have to be lower than LINE_LENGTH_PCK?
-  {0x3014, 0x08CB}, // FINE_INTEGRATION_TIME_
-  {0x321E, 0x0894}, // FINE_INTEGRATION_TIME2
-
-  {0x31D0, 0x0000}, // COMPANDING, no good in 10 bit?
-  {0x33DA, 0x0000}, // COMPANDING
-  {0x318E, 0x0200}, // PRE_HDR_GAIN_EN
-
-  // DLO Settings
-  {0x3100, 0x4000}, // DLO_CONTROL0
-  {0x3280, 0x0CCC}, // T1 G1
-  {0x3282, 0x0CCC}, // T1 R
-  {0x3284, 0x0CCC}, // T1 B
-  {0x3286, 0x0CCC}, // T1 G2
-  {0x3288, 0x0FA0}, // T2 G1
-  {0x328A, 0x0FA0}, // T2 R
-  {0x328C, 0x0FA0}, // T2 B
-  {0x328E, 0x0FA0}, // T2 G2
-
-   // Initial Gains
-  {0x3022, 0x0001}, // GROUPED_PARAMETER_HOLD_
-  {0x3366, 0xFF77}, // ANALOG_GAIN (1x)
-
-  {0x3060, 0x3333}, // ANALOG_COLOR_GAIN
-
-  {0x3362, 0x0000}, // DC GAIN
-
-  {0x305A, 0x00F8}, // red gain
-  {0x3058, 0x0122}, // blue gain
-  {0x3056, 0x009A}, // g1 gain
-  {0x305C, 0x009A}, // g2 gain
-
-  {0x3022, 0x0000}, // GROUPED_PARAMETER_HOLD_
-
-  // Initial Integration Time
-  {0x3012, 0x0005},
-};
@@ -10,7 +10,6 @@
 #include "media/cam_sensor.h"

 #include "cereal/gen/cpp/log.capnp.h"
-#include "system/camerad/sensors/ar0231_registers.h"
 #include "system/camerad/sensors/ox03c10_registers.h"
 #include "system/camerad/sensors/os04c10_registers.h"

@@ -88,17 +87,6 @@ public:
  };
 };

-class AR0231 : public SensorInfo {
-public:
-  AR0231();
-  std::vector<i2c_random_wr_payload> getExposureRegisters(int exposure_time, int new_exp_g, bool dc_gain_enabled) const override;
-  float getExposureScore(float desired_ev, int exp_t, int exp_g_idx, float exp_gain, int gain_idx) const override;
-  int getSlaveAddress(int port) const override;
-
-private:
-  mutable std::map<uint16_t, std::pair<int, int>> ar0231_register_lut;
-};
-
 class OX03C10 : public SensorInfo {
 public:
  OX03C10();
@@ -65,6 +65,10 @@ class ThermalConfig:
    return ret

 class LPABase(ABC):
+  @abstractmethod
+  def bootstrap(self) -> None:
+    pass
+
  @abstractmethod
  def list_profiles(self) -> list[Profile]:
    pass
@@ -89,6 +93,9 @@ class LPABase(ABC):
  def switch_profile(self, iccid: str) -> None:
    pass

+  def is_comma_profile(self, iccid: str) -> bool:
+    return any(iccid.startswith(prefix) for prefix in ('8985235',))
+
 class HardwareBase(ABC):
  @staticmethod
  def get_cmdline() -> dict[str, str]:
@@ -3,10 +3,32 @@
 import argparse
 import time
 from openpilot.system.hardware import HARDWARE
+from openpilot.system.hardware.base import LPABase
+
+
+def bootstrap(lpa: LPABase) -> None:
+  print('┌──────────────────────────────────────────────────────────────────────────────┐')
+  print('│ WARNING, PLEASE READ BEFORE PROCEEDING                                       │')
+  print('│                                                                              │')
+  print('│ this is an irreversible operation that will remove the comma-provisioned     │')
+  print('│ profile.                                                                     │')
+  print('│                                                                              │')
+  print('│ after this operation, you must purchase a new eSIM from comma in order to    │')
+  print('│ use the comma prime subscription again.                                      │')
+  print('└──────────────────────────────────────────────────────────────────────────────┘')
+  print()
+  for severity in ('sure', '100% sure'):
+    print(f'are you {severity} you want to proceed? (y/N) ', end='')
+    confirm = input()
+    if confirm != 'y':
+      print('aborting')
+      exit(0)
+  lpa.bootstrap()


 if __name__ == '__main__':
  parser = argparse.ArgumentParser(prog='esim.py', description='manage eSIM profiles on your comma device', epilog='comma.ai')
+  parser.add_argument('--bootstrap', action='store_true', help='bootstrap the eUICC (required before downloading profiles)')
  parser.add_argument('--backend', choices=['qmi', 'at'], default='qmi', help='use the specified backend, defaults to qmi')
  parser.add_argument('--switch', metavar='iccid', help='switch to profile')
  parser.add_argument('--delete', metavar='iccid', help='delete profile (warning: this cannot be undone)')
@@ -16,7 +38,10 @@ if __name__ == '__main__':

  mutated = False
  lpa = HARDWARE.get_sim_lpa()
-  if args.switch:
+  if args.bootstrap:
+    bootstrap(lpa)
+    mutated = True
+  elif args.switch:
    lpa.switch_profile(args.switch)
    mutated = True
  elif args.delete:
@@ -6,7 +6,6 @@ import struct
 import threading
 import time
 from collections import OrderedDict, namedtuple
-from pathlib import Path

 import psutil

@@ -342,12 +341,6 @@ def hardware_thread(end_event, hw_queue) -> None:
    show_alert = (not onroad_conditions["device_temp_good"] or not startup_conditions["device_temp_engageable"]) and onroad_conditions["ignition"]
    set_offroad_alert_if_changed("Offroad_TemperatureTooHigh", show_alert, extra_text=extra_text)

-    # TODO: this should move to TICI.initialize_hardware, but we currently can't import params there
-    if TICI and HARDWARE.get_device_type() == "tici":
-      if not os.path.isfile("/persist/comma/living-in-the-moment"):
-        if not Path("/data/media").is_mount():
-          set_offroad_alert_if_changed("Offroad_StorageMissing", True)
-
    # Handle offroad/onroad transition
    should_start = all(onroad_conditions.values())
    if started_ts is None:
@@ -23,14 +23,14 @@
  },
  {
    "name": "abl",
-    "url": "https://commadist.azureedge.net/agnosupdate/abl-32a2174b5f764e95dfc54cf358ba01752943b1b3b90e626149c3da7d5f1830b6.img.xz",
-    "hash": "32a2174b5f764e95dfc54cf358ba01752943b1b3b90e626149c3da7d5f1830b6",
-    "hash_raw": "32a2174b5f764e95dfc54cf358ba01752943b1b3b90e626149c3da7d5f1830b6",
+    "url": "https://commadist.azureedge.net/agnosupdate/abl-556bbb4ed1c671402b217bd2f3c07edce4f88b0bbd64e92241b82e396aa9ebee.img.xz",
+    "hash": "556bbb4ed1c671402b217bd2f3c07edce4f88b0bbd64e92241b82e396aa9ebee",
+    "hash_raw": "556bbb4ed1c671402b217bd2f3c07edce4f88b0bbd64e92241b82e396aa9ebee",
    "size": 274432,
    "sparse": false,
    "full_check": true,
    "has_ab": true,
-    "ondevice_hash": "32a2174b5f764e95dfc54cf358ba01752943b1b3b90e626149c3da7d5f1830b6"
+    "ondevice_hash": "556bbb4ed1c671402b217bd2f3c07edce4f88b0bbd64e92241b82e396aa9ebee"
  },
  {
    "name": "aop",
@@ -56,29 +56,29 @@
  },
  {
    "name": "boot",
-    "url": "https://commadist.azureedge.net/agnosupdate/boot-0191529aa97d90d1fa04b472d80230b777606459e1e1e9e2323c9519839827b4.img.xz",
-    "hash": "0191529aa97d90d1fa04b472d80230b777606459e1e1e9e2323c9519839827b4",
-    "hash_raw": "0191529aa97d90d1fa04b472d80230b777606459e1e1e9e2323c9519839827b4",
-    "size": 18515968,
+    "url": "https://commadist.azureedge.net/agnosupdate/boot-b96882012ab6cddda04f440009c798a6cff65977f984b12072e89afa592d86cb.img.xz",
+    "hash": "b96882012ab6cddda04f440009c798a6cff65977f984b12072e89afa592d86cb",
+    "hash_raw": "b96882012ab6cddda04f440009c798a6cff65977f984b12072e89afa592d86cb",
+    "size": 17442816,
    "sparse": false,
    "full_check": true,
    "has_ab": true,
-    "ondevice_hash": "492ae27f569e8db457c79d0e358a7a6297d1a1c685c2b1ae6deba7315d3a6cb0"
+    "ondevice_hash": "8ed6c2796be5c5b29d64e6413b8e878d5bd1a3981d15216d2b5e84140cc4ea2a"
  },
  {
    "name": "system",
-    "url": "https://commadist.azureedge.net/agnosupdate/system-e0007afa5d1026671c1943d44bb7f7ad26259f673392dd00a03073a2870df087.img.xz",
-    "hash": "1468d50b7ad0fda0f04074755d21e786e3b1b6ca5dd5b17eb2608202025e6126",
-    "hash_raw": "e0007afa5d1026671c1943d44bb7f7ad26259f673392dd00a03073a2870df087",
-    "size": 5368709120,
+    "url": "https://commadist.azureedge.net/agnosupdate/system-2b1bb223bf2100376ad5d543bfa4a483f33327b3478ec20ab36048388472c4bc.img.xz",
+    "hash": "325414e5c9f7516b2bf0fedb6abe6682f717897a6d84ab70d5afe91a59f244e9",
+    "hash_raw": "2b1bb223bf2100376ad5d543bfa4a483f33327b3478ec20ab36048388472c4bc",
+    "size": 4718592000,
    "sparse": true,
    "full_check": false,
    "has_ab": true,
-    "ondevice_hash": "242aa5adad1c04e1398e00e2440d1babf962022eb12b89adf2e60ee3068946e7",
+    "ondevice_hash": "79f4f6d0b5b4a416f0f31261b430943a78e37c26d0e226e0ef412fe0eae3c727",
    "alt": {
-      "hash": "e0007afa5d1026671c1943d44bb7f7ad26259f673392dd00a03073a2870df087",
-      "url": "https://commadist.azureedge.net/agnosupdate/system-e0007afa5d1026671c1943d44bb7f7ad26259f673392dd00a03073a2870df087.img",
-      "size": 5368709120
+      "hash": "2b1bb223bf2100376ad5d543bfa4a483f33327b3478ec20ab36048388472c4bc",
+      "url": "https://commadist.azureedge.net/agnosupdate/system-2b1bb223bf2100376ad5d543bfa4a483f33327b3478ec20ab36048388472c4bc.img",
+      "size": 4718592000
    }
  }
 ]
@@ -152,14 +152,14 @@
  },
  {
    "name": "abl",
-    "url": "https://commadist.azureedge.net/agnosupdate/abl-32a2174b5f764e95dfc54cf358ba01752943b1b3b90e626149c3da7d5f1830b6.img.xz",
-    "hash": "32a2174b5f764e95dfc54cf358ba01752943b1b3b90e626149c3da7d5f1830b6",
-    "hash_raw": "32a2174b5f764e95dfc54cf358ba01752943b1b3b90e626149c3da7d5f1830b6",
+    "url": "https://commadist.azureedge.net/agnosupdate/abl-556bbb4ed1c671402b217bd2f3c07edce4f88b0bbd64e92241b82e396aa9ebee.img.xz",
+    "hash": "556bbb4ed1c671402b217bd2f3c07edce4f88b0bbd64e92241b82e396aa9ebee",
+    "hash_raw": "556bbb4ed1c671402b217bd2f3c07edce4f88b0bbd64e92241b82e396aa9ebee",
    "size": 274432,
    "sparse": false,
    "full_check": true,
    "has_ab": true,
-    "ondevice_hash": "32a2174b5f764e95dfc54cf358ba01752943b1b3b90e626149c3da7d5f1830b6"
+    "ondevice_hash": "556bbb4ed1c671402b217bd2f3c07edce4f88b0bbd64e92241b82e396aa9ebee"
  },
  {
    "name": "aop",
@@ -339,62 +339,62 @@
  },
  {
    "name": "boot",
-    "url": "https://commadist.azureedge.net/agnosupdate/boot-0191529aa97d90d1fa04b472d80230b777606459e1e1e9e2323c9519839827b4.img.xz",
-    "hash": "0191529aa97d90d1fa04b472d80230b777606459e1e1e9e2323c9519839827b4",
-    "hash_raw": "0191529aa97d90d1fa04b472d80230b777606459e1e1e9e2323c9519839827b4",
-    "size": 18515968,
+    "url": "https://commadist.azureedge.net/agnosupdate/boot-b96882012ab6cddda04f440009c798a6cff65977f984b12072e89afa592d86cb.img.xz",
+    "hash": "b96882012ab6cddda04f440009c798a6cff65977f984b12072e89afa592d86cb",
+    "hash_raw": "b96882012ab6cddda04f440009c798a6cff65977f984b12072e89afa592d86cb",
+    "size": 17442816,
    "sparse": false,
    "full_check": true,
    "has_ab": true,
-    "ondevice_hash": "492ae27f569e8db457c79d0e358a7a6297d1a1c685c2b1ae6deba7315d3a6cb0"
+    "ondevice_hash": "8ed6c2796be5c5b29d64e6413b8e878d5bd1a3981d15216d2b5e84140cc4ea2a"
  },
  {
    "name": "system",
-    "url": "https://commadist.azureedge.net/agnosupdate/system-e0007afa5d1026671c1943d44bb7f7ad26259f673392dd00a03073a2870df087.img.xz",
-    "hash": "1468d50b7ad0fda0f04074755d21e786e3b1b6ca5dd5b17eb2608202025e6126",
-    "hash_raw": "e0007afa5d1026671c1943d44bb7f7ad26259f673392dd00a03073a2870df087",
-    "size": 5368709120,
+    "url": "https://commadist.azureedge.net/agnosupdate/system-2b1bb223bf2100376ad5d543bfa4a483f33327b3478ec20ab36048388472c4bc.img.xz",
+    "hash": "325414e5c9f7516b2bf0fedb6abe6682f717897a6d84ab70d5afe91a59f244e9",
+    "hash_raw": "2b1bb223bf2100376ad5d543bfa4a483f33327b3478ec20ab36048388472c4bc",
+    "size": 4718592000,
    "sparse": true,
    "full_check": false,
    "has_ab": true,
-    "ondevice_hash": "242aa5adad1c04e1398e00e2440d1babf962022eb12b89adf2e60ee3068946e7",
+    "ondevice_hash": "79f4f6d0b5b4a416f0f31261b430943a78e37c26d0e226e0ef412fe0eae3c727",
    "alt": {
-      "hash": "e0007afa5d1026671c1943d44bb7f7ad26259f673392dd00a03073a2870df087",
-      "url": "https://commadist.azureedge.net/agnosupdate/system-e0007afa5d1026671c1943d44bb7f7ad26259f673392dd00a03073a2870df087.img",
-      "size": 5368709120
+      "hash": "2b1bb223bf2100376ad5d543bfa4a483f33327b3478ec20ab36048388472c4bc",
+      "url": "https://commadist.azureedge.net/agnosupdate/system-2b1bb223bf2100376ad5d543bfa4a483f33327b3478ec20ab36048388472c4bc.img",
+      "size": 4718592000
    }
  },
  {
    "name": "userdata_90",
-    "url": "https://commadist.azureedge.net/agnosupdate/userdata_90-602d5103cba97e1b07f76508d5febb47cfc4463a7e31bd20e461b55c801feb0a.img.xz",
-    "hash": "6a11d448bac50467791809339051eed2894aae971c37bf6284b3b972a99ba3ac",
-    "hash_raw": "602d5103cba97e1b07f76508d5febb47cfc4463a7e31bd20e461b55c801feb0a",
+    "url": "https://commadist.azureedge.net/agnosupdate/userdata_90-b3112984d2a8534a83d2ce43d35efdd10c7d163d9699f611f0f72ad9e9cb5af9.img.xz",
+    "hash": "bea163e6fb6ac6224c7f32619affb5afb834cd859971b0cab6d8297dd0098f0a",
+    "hash_raw": "b3112984d2a8534a83d2ce43d35efdd10c7d163d9699f611f0f72ad9e9cb5af9",
    "size": 96636764160,
    "sparse": true,
    "full_check": true,
    "has_ab": false,
-    "ondevice_hash": "e014d92940a696bf8582807259820ab73948b950656ed83a45da738f26083705"
+    "ondevice_hash": "f4841c6ae3207197886e5efbd50f44cc24822680d7b785fa2d2743c657f23287"
  },
  {
    "name": "userdata_89",
-    "url": "https://commadist.azureedge.net/agnosupdate/userdata_89-4d7f6d12a5557eb6e3cbff9a4cd595677456fdfddcc879eddcea96a43a9d8b48.img.xz",
-    "hash": "748e31a5fc01fc256c012e359c3382d1f98cce98feafe8ecc0fca3e47caef116",
-    "hash_raw": "4d7f6d12a5557eb6e3cbff9a4cd595677456fdfddcc879eddcea96a43a9d8b48",
+    "url": "https://commadist.azureedge.net/agnosupdate/userdata_89-3e63f670e4270474cec96f4da9250ee4e87e3106b0b043b7e82371e1c761e167.img.xz",
+    "hash": "b5458a29dd7d4a4c9b7ad77b8baa5f804142ac78d97c6668839bf2a650e32518",
+    "hash_raw": "3e63f670e4270474cec96f4da9250ee4e87e3106b0b043b7e82371e1c761e167",
    "size": 95563022336,
    "sparse": true,
    "full_check": true,
    "has_ab": false,
-    "ondevice_hash": "c181b93050787adcfef730c086bcb780f28508d84e6376d9b80d37e5dc02b55e"
+    "ondevice_hash": "1dc10c542d3b019258fc08dc7dfdb49d9abad065e46d030b89bc1a2e0197f526"
  },
  {
    "name": "userdata_30",
-    "url": "https://commadist.azureedge.net/agnosupdate/userdata_30-80a76c8e56bbd7536fd5e87e8daa12984e2960db4edeb1f83229b2baeecc4668.img.xz",
-    "hash": "09ff390e639e4373d772e1688d05a5ac77a573463ed1deeff86390686fa686f9",
-    "hash_raw": "80a76c8e56bbd7536fd5e87e8daa12984e2960db4edeb1f83229b2baeecc4668",
+    "url": "https://commadist.azureedge.net/agnosupdate/userdata_30-1d3885d4370974e55f0c6f567fd0344fc5ee10db067aa5810fbaf402eadb032c.img.xz",
+    "hash": "687d178cfc91be5d7e8aa1333405b610fdce01775b8333bd0985b81642b94eea",
+    "hash_raw": "1d3885d4370974e55f0c6f567fd0344fc5ee10db067aa5810fbaf402eadb032c",
    "size": 32212254720,
    "sparse": true,
    "full_check": true,
    "has_ab": false,
-    "ondevice_hash": "2c01ab470c02121c721ff6afc25582437e821686207f3afef659387afb69c507"
+    "ondevice_hash": "9ddbd1dae6ee7dc919f018364cf2f29dad138c9203c5a49aea0cbb9bf2e137e5"
  }
 ]
@@ -61,18 +61,6 @@ BASE_CONFIG = [
 ]

 CONFIGS = {
-  "tici": [
-    AmpConfig("Right speaker output from right DAC", 0b1, 0x2C, 0, 0b11111111),
-    AmpConfig("Right Speaker Mixer Gain", 0b00, 0x2D, 2, 0b00001100),
-    AmpConfig("Right speaker output volume", 0x1c, 0x3E, 0, 0b00011111),
-    AmpConfig("DAI2 EQ enable", 0b1, 0x49, 1, 0b00000010),
-
-    *configs_from_eq_params(0x84, EQParams(0x274F, 0xC0FF, 0x3BF9, 0x0B3C, 0x1656)),
-    *configs_from_eq_params(0x8E, EQParams(0x1009, 0xC6BF, 0x2952, 0x1C97, 0x30DF)),
-    *configs_from_eq_params(0x98, EQParams(0x0F75, 0xCBE5, 0x0ED2, 0x2528, 0x3E42)),
-    *configs_from_eq_params(0xA2, EQParams(0x091F, 0x3D4C, 0xCE11, 0x1266, 0x2807)),
-    *configs_from_eq_params(0xAC, EQParams(0x0A9E, 0x3F20, 0xE573, 0x0A8B, 0x3A3B)),
-  ],
  "tizi": [
    AmpConfig("Left speaker output from left DAC", 0b1, 0x2B, 0, 0b11111111),
    AmpConfig("Right speaker output from right DAC", 0b1, 0x2C, 0, 0b11111111),
@@ -40,6 +40,7 @@ class TiciLPA(LPABase):
    self._process_notifications()

  def download_profile(self, qr: str, nickname: str | None = None) -> None:
+    self._check_bootstrapped()
    msgs = self._invoke('profile', 'download', '-a', qr)
    self._validate_successful(msgs)
    new_profile = next((m for m in msgs if m['payload']['message'] == 'es8p_meatadata_parse'), None)
@@ -54,6 +55,7 @@ class TiciLPA(LPABase):
    self._validate_successful(self._invoke('profile', 'nickname', iccid, nickname))

  def switch_profile(self, iccid: str) -> None:
+    self._check_bootstrapped()
    self._validate_profile_exists(iccid)
    latest = self.get_active_profile()
    if latest and latest.iccid == iccid:
@@ -61,6 +63,33 @@ class TiciLPA(LPABase):
    self._validate_successful(self._invoke('profile', 'enable', iccid))
    self._process_notifications()

+  def bootstrap(self) -> None:
+    """
+    find all comma-provisioned profiles and delete them. they conflict with user-provisioned profiles
+    and must be deleted.
+
+    **note**: this is a **very** destructive operation. you **must** purchase a new comma SIM in order
+              to use comma prime again.
+    """
+    if self._is_bootstrapped():
+      return
+
+    for p in self.list_profiles():
+      if self.is_comma_profile(p.iccid):
+        self._disable_profile(p.iccid)
+        self.delete_profile(p.iccid)
+
+  def _disable_profile(self, iccid: str) -> None:
+    self._validate_successful(self._invoke('profile', 'disable', iccid))
+    self._process_notifications()
+
+  def _check_bootstrapped(self) -> None:
+    assert self._is_bootstrapped(), 'eUICC is not bootstrapped, please bootstrap before performing this operation'
+
+  def _is_bootstrapped(self) -> bool:
+    """ check if any comma provisioned profiles are on the eUICC """
+    return not any(self.is_comma_profile(iccid) for iccid in (p.iccid for p in self.list_profiles()))
+
  def _invoke(self, *cmd: str):
    proc = subprocess.Popen(['sudo', '-E', 'lpac'] + list(cmd), stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=self.env)
    try:
@@ -425,9 +425,6 @@ class Tici(HardwareBase):

    # pandad core
    affine_irq(3, "spi_geni")         # SPI
-    if "tici" in self.get_device_type():
-      affine_irq(3, "xhci-hcd:usb3")  # aux panda USB (or potentially anything else on USB)
-      affine_irq(3, "xhci-hcd:usb1")  # internal panda USB (also modem)
    try:
      pid = subprocess.check_output(["pgrep", "-f", "spi0"], encoding='utf8').strip()
      subprocess.call(["sudo", "chrt", "-f", "-p", "1", pid])
@@ -446,22 +443,20 @@ class Tici(HardwareBase):

    cmds = []

-    if self.get_device_type() in ("tici", "tizi"):
+    if self.get_device_type() in ("tizi", ):
      # clear out old blue prime initial APN
      os.system('mmcli -m any --3gpp-set-initial-eps-bearer-settings="apn="')

      cmds += [
+        # SIM hot swap
+        'AT+QSIMDET=1,0',
+        'AT+QSIMSTAT=1',
+
        # configure modem as data-centric
        'AT+QNVW=5280,0,"0102000000000000"',
        'AT+QNVFW="/nv/item_files/ims/IMS_enable",00',
        'AT+QNVFW="/nv/item_files/modem/mmode/ue_usage_setting",01',
      ]
-      if self.get_device_type() == "tizi":
-        # SIM hot swap, not routed on tici
-        cmds += [
-          'AT+QSIMDET=1,0',
-          'AT+QSIMSTAT=1',
-        ]
    elif manufacturer == 'Cavli Inc.':
      cmds += [
        'AT^SIMSWAP=1',     # use SIM slot, instead of internal eSIM
@@ -492,7 +487,7 @@ class Tici(HardwareBase):

    # eSIM prime
    dest = "/etc/NetworkManager/system-connections/esim.nmconnection"
-    if sim_id.startswith('8985235') and not os.path.exists(dest):
+    if self.get_sim_lpa().is_comma_profile(sim_id) and not os.path.exists(dest):
      with open(Path(__file__).parent/'esim.nmconnection') as f, tempfile.NamedTemporaryFile(mode='w') as tf:
        dat = f.read()
        dat = dat.replace("sim-id=", f"sim-id={sim_id}")
@@ -503,6 +498,14 @@ class Tici(HardwareBase):
        os.system(f"sudo cp {tf.name} {dest}")
      os.system(f"sudo nmcli con load {dest}")

+  def reboot_modem(self):
+    modem = self.get_modem()
+    for state in (0, 1):
+      try:
+        modem.Command(f'AT+CFUN={state}', math.ceil(TIMEOUT), dbus_interface=MM_MODEM, timeout=TIMEOUT)
+      except Exception:
+        pass
+
  def get_networks(self):
    r = {}

@@ -1,5 +1,3 @@
-# TODO: these are also defined in a header
-
 # GPIO pin definitions
 class GPIO:
  # both GPIO_STM_RST_N and GPIO_LTE_RST_N are misnamed, they are high to reset
@@ -26,7 +24,4 @@ class GPIO:
  CAM2_RSTN = 12

  # Sensor interrupts
-  BMX055_ACCEL_INT = 21
-  BMX055_GYRO_INT = 23
-  BMX055_MAGN_INT = 87
  LSM_INT = 84
@@ -31,9 +31,9 @@ class Proc:


 PROCS = [
-  Proc(['camerad'], 1.75, msgs=['roadCameraState', 'wideRoadCameraState', 'driverCameraState']),
-  Proc(['modeld'], 1.12, atol=0.2, msgs=['modelV2']),
-  Proc(['dmonitoringmodeld'], 0.6, msgs=['driverStateV2']),
+  Proc(['camerad'], 1.65, atol=0.4, msgs=['roadCameraState', 'wideRoadCameraState', 'driverCameraState']),
+  Proc(['modeld'], 1.24, atol=0.2, msgs=['modelV2']),
+  Proc(['dmonitoringmodeld'], 0.65, atol=0.35, msgs=['driverStateV2']),
  Proc(['encoderd'], 0.23, msgs=[]),
 ]

@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+import json
+import subprocess
+
+import cereal.messaging as messaging
+from openpilot.common.swaglog import cloudlog
+
+
+def main():
+  pm = messaging.PubMaster(['androidLog'])
+  cmd = ['journalctl', '-f', '-o', 'json']
+  proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, text=True)
+  assert proc.stdout is not None
+  try:
+    for line in proc.stdout:
+      line = line.strip()
+      if not line:
+        continue
+      try:
+        kv = json.loads(line)
+      except json.JSONDecodeError:
+        cloudlog.exception("failed to parse journalctl output")
+        continue
+
+      msg = messaging.new_message('androidLog')
+      entry = msg.androidLog
+      entry.ts = int(kv.get('__REALTIME_TIMESTAMP', 0))
+      entry.message = json.dumps(kv)
+      if '_PID' in kv:
+        entry.pid = int(kv['_PID'])
+      if 'PRIORITY' in kv:
+        entry.priority = int(kv['PRIORITY'])
+      if 'SYSLOG_IDENTIFIER' in kv:
+        entry.tag = kv['SYSLOG_IDENTIFIER']
+
+      pm.send('androidLog', msg)
+  finally:
+    proc.terminate()
+    proc.wait()
+
+
+if __name__ == '__main__':
+  main()
@@ -1 +0,0 @@
-logcatd
@@ -1,3 +0,0 @@
-Import('env', 'messaging', 'common')
-
-env.Program('logcatd', 'logcatd_systemd.cc', LIBS=[messaging, common, 'systemd'])
@@ -1,75 +0,0 @@
-#include <systemd/sd-journal.h>
-
-#include <cassert>
-#include <csignal>
-#include <map>
-#include <string>
-
-#include "third_party/json11/json11.hpp"
-
-#include "cereal/messaging/messaging.h"
-#include "common/timing.h"
-#include "common/util.h"
-
-ExitHandler do_exit;
-int main(int argc, char *argv[]) {
-
-  PubMaster pm({"androidLog"});
-
-  sd_journal *journal;
-  int err = sd_journal_open(&journal, 0);
-  assert(err >= 0);
-  err = sd_journal_get_fd(journal); // needed so sd_journal_wait() works properly if files rotate
-  assert(err >= 0);
-  err = sd_journal_seek_tail(journal);
-  assert(err >= 0);
-
-  // workaround for bug https://github.com/systemd/systemd/issues/9934
-  // call sd_journal_previous_skip after sd_journal_seek_tail (like journalctl -f does) to makes things work.
-  sd_journal_previous_skip(journal, 1);
-
-  while (!do_exit) {
-    err = sd_journal_next(journal);
-    assert(err >= 0);
-
-    // Wait for new message if we didn't receive anything
-    if (err == 0) {
-      err = sd_journal_wait(journal, 1000 * 1000);
-      assert(err >= 0);
-      continue; // Try again
-    }
-
-    uint64_t timestamp = 0;
-    err = sd_journal_get_realtime_usec(journal, &timestamp);
-    assert(err >= 0);
-
-    const void *data;
-    size_t length;
-    std::map<std::string, std::string> kv;
-
-    SD_JOURNAL_FOREACH_DATA(journal, data, length) {
-      std::string str((char*)data, length);
-
-      // Split "KEY=VALUE"" on "=" and put in map
-      std::size_t found = str.find("=");
-      if (found != std::string::npos) {
-        kv[str.substr(0, found)] = str.substr(found + 1, std::string::npos);
-      }
-    }
-
-    MessageBuilder msg;
-
-    // Build message
-    auto androidEntry = msg.initEvent().initAndroidLog();
-    androidEntry.setTs(timestamp);
-    androidEntry.setMessage(json11::Json(kv).dump());
-    if (kv.count("_PID")) androidEntry.setPid(std::atoi(kv["_PID"].c_str()));
-    if (kv.count("PRIORITY")) androidEntry.setPriority(std::atoi(kv["PRIORITY"].c_str()));
-    if (kv.count("SYSLOG_IDENTIFIER")) androidEntry.setTag(kv["SYSLOG_IDENTIFIER"]);
-
-    pm.send("androidLog", msg);
-  }
-
-  sd_journal_close(journal);
-  return 0;
-}
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -e
+
+cd /sys/kernel/debug/tracing
+echo "" > trace
+echo 1 > tracing_on
+echo 1 > /sys/kernel/debug/tracing/events/msm_vidc/enable
+
+echo 0xff > /sys/module/videobuf2_core/parameters/debug
+echo 0x7fffffff > /sys/kernel/debug/msm_vidc/debug_level
+echo 0xff > /sys/devices/platform/soc/aa00000.qcom,vidc/video4linux/video33/dev_debug
+
+cat /sys/kernel/debug/tracing/trace_pipe
@@ -111,8 +111,8 @@ procs = [

  NativeProcess("camerad", "system/camerad", ["./camerad"], driverview, enabled=not WEBCAM),
  PythonProcess("webcamerad", "tools.webcam.camerad", driverview, enabled=WEBCAM),
-  NativeProcess("logcatd", "system/logcatd", ["./logcatd"], only_onroad, platform.system() != "Darwin"),
-  NativeProcess("proclogd", "system/proclogd", ["./proclogd"], only_onroad, platform.system() != "Darwin"),
+  PythonProcess("proclogd", "system.proclogd", only_onroad, enabled=platform.system() != "Darwin"),
+  PythonProcess("journald", "system.journald", only_onroad, platform.system() != "Darwin"),
  PythonProcess("micd", "system.micd", iscar),
  PythonProcess("timed", "system.timed", always_run, enabled=not PC),

@@ -137,7 +137,7 @@ procs = [
  PythonProcess("pandad", "selfdrive.pandad.pandad", always_run),
  PythonProcess("paramsd", "selfdrive.locationd.paramsd", only_onroad),
  PythonProcess("lagd", "selfdrive.locationd.lagd", only_onroad),
-  NativeProcess("ubloxd", "system/ubloxd", ["./ubloxd"], ublox, enabled=TICI),
+  PythonProcess("ubloxd", "system.ubloxd.ubloxd", ublox, enabled=TICI),
  PythonProcess("pigeond", "system.ubloxd.pigeond", ublox, enabled=TICI),
  PythonProcess("plannerd", "selfdrive.controls.plannerd", not_long_maneuver),
  PythonProcess("maneuversd", "tools.longitudinal_maneuvers.maneuversd", long_maneuver),
@@ -0,0 +1,227 @@
+#!/usr/bin/env python3
+import os
+from typing import NoReturn, TypedDict
+
+from cereal import messaging
+from openpilot.common.realtime import Ratekeeper
+from openpilot.common.swaglog import cloudlog
+
+JIFFY = os.sysconf(os.sysconf_names['SC_CLK_TCK'])
+PAGE_SIZE = os.sysconf(os.sysconf_names['SC_PAGE_SIZE'])
+
+
+def _cpu_times() -> list[dict[str, float]]:
+  cpu_times: list[dict[str, float]] = []
+  try:
+    with open('/proc/stat') as f:
+      lines = f.readlines()[1:]
+    for line in lines:
+      if not line.startswith('cpu') or len(line) < 4 or not line[3].isdigit():
+        break
+      parts = line.split()
+      cpu_times.append({
+        'cpuNum': int(parts[0][3:]),
+        'user': float(parts[1]) / JIFFY,
+        'nice': float(parts[2]) / JIFFY,
+        'system': float(parts[3]) / JIFFY,
+        'idle': float(parts[4]) / JIFFY,
+        'iowait': float(parts[5]) / JIFFY,
+        'irq': float(parts[6]) / JIFFY,
+        'softirq': float(parts[7]) / JIFFY,
+      })
+  except Exception:
+    cloudlog.exception("failed to read /proc/stat")
+  return cpu_times
+
+
+def _mem_info() -> dict[str, int]:
+  keys = ["MemTotal:", "MemFree:", "MemAvailable:", "Buffers:", "Cached:", "Active:", "Inactive:", "Shmem:"]
+  info: dict[str, int] = dict.fromkeys(keys, 0)
+  try:
+    with open('/proc/meminfo') as f:
+      for line in f:
+        parts = line.split()
+        if parts and parts[0] in info:
+          info[parts[0]] = int(parts[1]) * 1024
+  except Exception:
+    cloudlog.exception("failed to read /proc/meminfo")
+  return info
+
+
+_STAT_POS = {
+  'pid': 1,
+  'state': 3,
+  'ppid': 4,
+  'utime': 14,
+  'stime': 15,
+  'cutime': 16,
+  'cstime': 17,
+  'priority': 18,
+  'nice': 19,
+  'num_threads': 20,
+  'starttime': 22,
+  'vsize': 23,
+  'rss': 24,
+  'processor': 39,
+}
+
+class ProcStat(TypedDict):
+  name: str
+  pid: int
+  state: str
+  ppid: int
+  utime: int
+  stime: int
+  cutime: int
+  cstime: int
+  priority: int
+  nice: int
+  num_threads: int
+  starttime: int
+  vms: int
+  rss: int
+  processor: int
+
+
+def _parse_proc_stat(stat: str) -> ProcStat | None:
+  open_paren = stat.find('(')
+  close_paren = stat.rfind(')')
+  if open_paren == -1 or close_paren == -1 or open_paren > close_paren:
+    return None
+  name = stat[open_paren + 1:close_paren]
+  stat = stat[:open_paren] + stat[open_paren:close_paren].replace(' ', '_') + stat[close_paren:]
+  parts = stat.split()
+  if len(parts) < 52:
+    return None
+  try:
+    return {
+      'name': name,
+      'pid': int(parts[_STAT_POS['pid'] - 1]),
+      'state': parts[_STAT_POS['state'] - 1][0],
+      'ppid': int(parts[_STAT_POS['ppid'] - 1]),
+      'utime': int(parts[_STAT_POS['utime'] - 1]),
+      'stime': int(parts[_STAT_POS['stime'] - 1]),
+      'cutime': int(parts[_STAT_POS['cutime'] - 1]),
+      'cstime': int(parts[_STAT_POS['cstime'] - 1]),
+      'priority': int(parts[_STAT_POS['priority'] - 1]),
+      'nice': int(parts[_STAT_POS['nice'] - 1]),
+      'num_threads': int(parts[_STAT_POS['num_threads'] - 1]),
+      'starttime': int(parts[_STAT_POS['starttime'] - 1]),
+      'vms': int(parts[_STAT_POS['vsize'] - 1]),
+      'rss': int(parts[_STAT_POS['rss'] - 1]),
+      'processor': int(parts[_STAT_POS['processor'] - 1]),
+    }
+  except Exception:
+    cloudlog.exception("failed to parse /proc/<pid>/stat")
+    return None
+
+class ProcExtra(TypedDict):
+  pid: int
+  name: str
+  exe: str
+  cmdline: list[str]
+
+
+_proc_cache: dict[int, ProcExtra] = {}
+
+
+def _get_proc_extra(pid: int, name: str) -> ProcExtra:
+  cache: ProcExtra | None = _proc_cache.get(pid)
+  if cache is None or cache.get('name') != name:
+    exe = ''
+    cmdline: list[str] = []
+    try:
+      exe = os.readlink(f'/proc/{pid}/exe')
+    except OSError:
+      pass
+    try:
+      with open(f'/proc/{pid}/cmdline', 'rb') as f:
+        cmdline = [c.decode('utf-8', errors='replace') for c in f.read().split(b'\0') if c]
+    except OSError:
+      pass
+    cache = {'pid': pid, 'name': name, 'exe': exe, 'cmdline': cmdline}
+    _proc_cache[pid] = cache
+  return cache
+
+
+def _procs() -> list[ProcStat]:
+  stats: list[ProcStat] = []
+  for pid_str in os.listdir('/proc'):
+    if not pid_str.isdigit():
+      continue
+    try:
+      with open(f'/proc/{pid_str}/stat') as f:
+        stat = f.read()
+      parsed = _parse_proc_stat(stat)
+      if parsed is not None:
+        stats.append(parsed)
+    except OSError:
+      continue
+  return stats
+
+
+def build_proc_log_message(msg) -> None:
+  pl = msg.procLog
+
+  procs = _procs()
+  l = pl.init('procs', len(procs))
+  for i, r in enumerate(procs):
+    proc = l[i]
+    proc.pid = r['pid']
+    proc.state = ord(r['state'][0])
+    proc.ppid = r['ppid']
+    proc.cpuUser = r['utime'] / JIFFY
+    proc.cpuSystem = r['stime'] / JIFFY
+    proc.cpuChildrenUser = r['cutime'] / JIFFY
+    proc.cpuChildrenSystem = r['cstime'] / JIFFY
+    proc.priority = r['priority']
+    proc.nice = r['nice']
+    proc.numThreads = r['num_threads']
+    proc.startTime = r['starttime'] / JIFFY
+    proc.memVms = r['vms']
+    proc.memRss = r['rss'] * PAGE_SIZE
+    proc.processor = r['processor']
+    proc.name = r['name']
+
+    extra = _get_proc_extra(r['pid'], r['name'])
+    proc.exe = extra['exe']
+    cmdline = proc.init('cmdline', len(extra['cmdline']))
+    for j, arg in enumerate(extra['cmdline']):
+      cmdline[j] = arg
+
+  cpu_times = _cpu_times()
+  cpu_list = pl.init('cpuTimes', len(cpu_times))
+  for i, ct in enumerate(cpu_times):
+    cpu = cpu_list[i]
+    cpu.cpuNum = ct['cpuNum']
+    cpu.user = ct['user']
+    cpu.nice = ct['nice']
+    cpu.system = ct['system']
+    cpu.idle = ct['idle']
+    cpu.iowait = ct['iowait']
+    cpu.irq = ct['irq']
+    cpu.softirq = ct['softirq']
+
+  mem_info = _mem_info()
+  pl.mem.total = mem_info["MemTotal:"]
+  pl.mem.free = mem_info["MemFree:"]
+  pl.mem.available = mem_info["MemAvailable:"]
+  pl.mem.buffers = mem_info["Buffers:"]
+  pl.mem.cached = mem_info["Cached:"]
+  pl.mem.active = mem_info["Active:"]
+  pl.mem.inactive = mem_info["Inactive:"]
+  pl.mem.shared = mem_info["Shmem:"]
+
+
+def main() -> NoReturn:
+  pm = messaging.PubMaster(['procLog'])
+  rk = Ratekeeper(0.5)
+  while True:
+    msg = messaging.new_message('procLog', valid=True)
+    build_proc_log_message(msg)
+    pm.send('procLog', msg)
+    rk.keep_time()
+
+
+if __name__ == '__main__':
+  main()
@@ -1,6 +0,0 @@
-Import('env', 'messaging', 'common')
-libs = [messaging, 'pthread', common]
-env.Program('proclogd', ['main.cc', 'proclog.cc'], LIBS=libs)
-
-if GetOption('extras'):
-  env.Program('tests/test_proclog', ['tests/test_proclog.cc', 'proclog.cc'], LIBS=libs)
--- a/Show More
+++ b/Show More