Merge branch 'upstream/openpilot/master' into sync-20250809

# Conflicts: # common/params_keys.h # opendbc_repo # panda # selfdrive/car/cruise.py # selfdrive/controls/controlsd.py # selfdrive/selfdrived/selfdrived.py # selfdrive/test/process_replay/process_replay.py # selfdrive/ui/qt/setup/setup.cc # tinygrad_repo
2026-08-05 16:26:10 +08:00 · 2025-08-10 01:37:10 -04:00
parent 1bc12f1e21 1c46640ea6
commit 97c2d7e655
140 changed files with 2147 additions and 2053 deletions
@@ -1,6 +1,6 @@
 ci:
  - changed-files:
-    - any-glob-to-all-files: "{.github/**,**/test_*,Jenkinsfile}"
+    - any-glob-to-all-files: "{.github/**,**/test_*,**/test/**,Jenkinsfile}"

 chore:
  - changed-files:
@@ -9,6 +9,9 @@ jobs:
  scan-comments:
    runs-on: ubuntu-latest
    if: ${{ github.event.issue.pull_request }}
+    permissions:
+      contents: write
+      issues: write
    steps:
    - name: Check for trigger phrase
      id: check_comment
@@ -43,3 +46,14 @@ jobs:
        git config --global user.email "github-actions[bot]@users.noreply.github.com"
        git checkout -b tmp-jenkins-${{ github.event.issue.number }}
        GIT_LFS_SKIP_PUSH=1 git push -f origin tmp-jenkins-${{ github.event.issue.number }}
+
+    - name: Delete trigger comment
+      if: steps.check_comment.outputs.result == 'true' && always()
+      uses: actions/github-script@v7
+      with:
+        script: |
+          await github.rest.issues.deleteComment({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            comment_id: context.payload.comment.id,
+          });
@@ -189,7 +189,8 @@ jobs:
    - name: Run unit tests
      timeout-minutes: ${{ contains(runner.name, 'nsc') && ((steps.setup-step.outputs.duration < 18) && 1 || 2) || 999 }}
      run: |
-        ${{ env.RUN }} "$PYTEST --collect-only -m 'not slow' &> /dev/null && \
+        ${{ env.RUN }} "source selfdrive/test/setup_xvfb.sh && \
+                        $PYTEST --collect-only -m 'not slow' &> /dev/null && \
                        MAX_EXAMPLES=1 $PYTEST -m 'not slow' && \
                        ./selfdrive/ui/tests/create_test_translations.sh && \
                        QT_QPA_PLATFORM=offscreen ./selfdrive/ui/tests/test_translations && \
@@ -13,9 +13,11 @@ venv/
 model2.png
 a.out
 .hypothesis
+.cache/

 /docs_site/

+*.mp4
 *.dylib
 *.DSYM
 *.d
@@ -1,10 +1,14 @@
-Version 0.10.0 (2025-07-07)
+Version 0.10.0 (2025-08-05)
 ========================
 * New driving model
-  * Lead car ground-truth fixes
-  * Ported over VAE from the MLSIM stack
-  * New training architecture described in CVPR paper
+  * New training architecture
+     * Architecture outlined in CVPR paper: "Learning to Drive from a World Model"
+     * Longitudinal MPC replaced by E2E planning from worldmodel in experimental mode
+     * Action from lateral MPC as training objective replaced by E2E planning from worldmodel
+  * Low-speed lead car ground-truth fixes
+
 * Enable live-learned steering actuation delay
+* Record driving feedback using LKAS button
 * Opt-in audio recording for dashcam video

 Version 0.9.9 (2025-05-23)
@@ -17,7 +17,7 @@ AGNOS = TICI

 Decider('MD5-timestamp')

-SetOption('num_jobs', int(os.cpu_count()/2))
+SetOption('num_jobs', max(1, int(os.cpu_count()/2)))

 AddOption('--kaitai',
          action='store_true',
@@ -127,8 +127,9 @@ struct OnroadEvent @0xc4fa6047f024e718 {
    espActive @90;
    personalityChanged @91;
    aeb @92;
-    userFlag @95;
+    userBookmark @95;
    excessiveActuation @96;
+    audioFeedback @97;

    soundsUnavailableDEPRECATED @47;
  }
@@ -2468,7 +2469,7 @@ struct DebugAlert {
  alertText2 @1 :Text;
 }

-struct UserFlag {
+struct UserBookmark @0xfe346a9de48d9b50 {
 }

 struct SoundPressure @0xdc24138990726023 {
@@ -2486,6 +2487,11 @@ struct AudioData {
  sampleRate @1 :UInt32;
 }

+struct AudioFeedback {
+  audio @0 :AudioData;
+  blockNum @1 :UInt16;
+}
+
 struct Touch {
  sec @0 :Int64;
  usec @1 :Int64;
@@ -2586,9 +2592,13 @@ struct Event {
    mapRenderState @105: MapRenderState;

    # UI services
-    userFlag @93 :UserFlag;
    uiDebug @102 :UIDebug;

+    # driving feedback
+    userBookmark @93 :UserBookmark;
+    bookmarkButton @148 :UserBookmark;
+    audioFeedback @149 :AudioFeedback;
+
    # *********** debug ***********
    testJoystick @52 :Joystick;
    roadEncodeData @86 :EncodeData;
@@ -177,8 +177,8 @@ class TestMessaging:

    # wait 5 socket timeouts before sending
    msg = random_carstate()
-    delayed_send(sock_timeout*5, pub_sock, msg.to_bytes())
    start_time = time.monotonic()
+    delayed_send(sock_timeout*5, pub_sock, msg.to_bytes())
    recvd = messaging.recv_one_retry(sub_sock)
    assert (time.monotonic() - start_time) >= sock_timeout*5
    assert isinstance(recvd, capnp._DynamicStructReader)
@@ -86,7 +86,7 @@ class TestSubMaster:
        "cameraOdometry": (20, 10),
        "liveCalibration": (4, 4),
        "carParams": (None, None),
-        "userFlag": (None, None),
+        "userBookmark": (None, None),
      }

      for service, (max_freq, min_freq) in checks.items():
@@ -72,9 +72,11 @@ _services: dict[str, tuple] = {
  "navRoute": (True, 0.),
  "navThumbnail": (True, 0.),
  "qRoadEncodeIdx": (False, 20.),
-  "userFlag": (True, 0., 1),
+  "userBookmark": (True, 0., 1),
  "soundPressure": (True, 10., 10),
  "rawAudioData": (False, 20.),
+  "bookmarkButton": (True, 0., 1),
+  "audioFeedback": (True, 0., 1),

  # sunnypilot
  "modelManagerSP": (False, 1., 1),
@@ -1,6 +1,7 @@
 import numpy as np

-class Conversions:
+# conversions
+class CV:
  # Speed
  MPH_TO_KPH = 1.609344
  KPH_TO_MPH = 1. / MPH_TO_KPH
@@ -17,3 +18,6 @@ class Conversions:

  # Mass
  LB_TO_KG = 0.453592
+
+
+ACCELERATION_DUE_TO_GRAVITY = 9.81  # m/s^2
@@ -12,7 +12,7 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
    {"ApiCache_Device", {PERSISTENT, STRING}},
    {"ApiCache_FirehoseStats", {PERSISTENT, JSON}},
    {"AssistNowToken", {PERSISTENT, STRING}},
-    {"AthenadPid", {PERSISTENT, STRING}},
+    {"AthenadPid", {PERSISTENT, INT}},
    {"AthenadUploadQueue", {PERSISTENT, JSON}},
    {"AthenadRecentlyViewedRoutes", {PERSISTENT, STRING}},
    {"BootCount", {PERSISTENT, INT}},
@@ -105,6 +105,7 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
    {"PandaSignatures", {CLEAR_ON_MANAGER_START, BYTES}},
    {"PrimeType", {PERSISTENT, INT}},
    {"RecordAudio", {PERSISTENT | BACKUP, BOOL}},
+    {"RecordAudioFeedback", {PERSISTENT | BACKUP, BOOL, "0"}},
    {"RecordFront", {PERSISTENT | BACKUP, BOOL}},
    {"RecordFrontLock", {PERSISTENT, BOOL}},  // for the internal fleet
    {"SecOCKey", {PERSISTENT | DONT_LOG | BACKUP, STRING}},
@@ -177,7 +178,7 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
    {"SunnylinkCache_Roles", {PERSISTENT, STRING}},
    {"SunnylinkCache_Users", {PERSISTENT, STRING}},
    {"SunnylinkDongleId", {PERSISTENT, STRING}},
-    {"SunnylinkdPid", {PERSISTENT, STRING}},
+    {"SunnylinkdPid", {PERSISTENT, INT}},
    {"SunnylinkEnabled", {PERSISTENT, BOOL}},

    // Backup Manager params
@@ -103,14 +103,14 @@ cdef class Params:
      return cast(value)
    raise TypeError(f"Type mismatch while writing param {key}: {proposed_type=} {expected_type=} {value=}")

-  def cpp2python(self, t, value, default, key):
+  def _cpp2python(self, t, value, default, key):
    if value is None:
      return None
    try:
      return CPP_2_PYTHON[t](value)
    except (KeyError, TypeError, ValueError):
      cloudlog.warning(f"Failed to cast param {key} with {value=} from type {t=}")
-      return self.cpp2python(t, default, None, key)
+      return self._cpp2python(t, default, None, key)

  def get(self, key, bool block=False, bool return_default=False):
    cdef string k = self.check_key(key)
@@ -127,8 +127,8 @@ cdef class Params:
        # it means we got an interrupt while waiting
        raise KeyboardInterrupt
      else:
-        return self.cpp2python(t, default_val, None, key)
-    return self.cpp2python(t, val, default_val, key)
+        return self._cpp2python(t, default_val, None, key)
+    return self._cpp2python(t, val, default_val, key)

  def get_bool(self, key, bool block=False):
    cdef string k = self.check_key(key)
@@ -189,4 +189,9 @@ cdef class Params:
    cdef string k = self.check_key(key)
    cdef ParamKeyType t = self.p.getKeyType(k)
    cdef optional[string] default = self.p.getKeyDefaultValue(k)
-    return self.cpp2python(t, default.value(), None, key) if default.has_value() else None
+    return self._cpp2python(t, default.value(), None, key) if default.has_value() else None
+
+  def cpp2python(self, key, value):
+    cdef string k = self.check_key(key)
+    cdef ParamKeyType t = self.p.getKeyType(k)
+    return self._cpp2python(t, value, None, key)
@@ -9,20 +9,19 @@ from openpilot.system.hardware.hw import Paths
 from openpilot.system.hardware.hw import DEFAULT_DOWNLOAD_CACHE_ROOT

 class OpenpilotPrefix:
-  def __init__(self, prefix: str = None, clean_dirs_on_exit: bool = True, shared_download_cache: bool = False):
+  def __init__(self, prefix: str = None, create_dirs_on_enter: bool = True, clean_dirs_on_exit: bool = True, shared_download_cache: bool = False):
    self.prefix = prefix if prefix else str(uuid.uuid4().hex[0:15])
    self.msgq_path = os.path.join(Paths.shm_path(), self.prefix)
+    self.create_dirs_on_enter = create_dirs_on_enter
    self.clean_dirs_on_exit = clean_dirs_on_exit
    self.shared_download_cache = shared_download_cache

  def __enter__(self):
    self.original_prefix = os.environ.get('OPENPILOT_PREFIX', None)
    os.environ['OPENPILOT_PREFIX'] = self.prefix
-    try:
-      os.mkdir(self.msgq_path)
-    except FileExistsError:
-      pass
-    os.makedirs(Paths.log_root(), exist_ok=True)
+
+    if self.create_dirs_on_enter:
+      self.create_dirs()

    if self.shared_download_cache:
      os.environ["COMMA_CACHE"] = DEFAULT_DOWNLOAD_CACHE_ROOT
@@ -40,6 +39,13 @@ class OpenpilotPrefix:
      pass
    return False

+  def create_dirs(self):
+    try:
+      os.mkdir(self.msgq_path)
+    except FileExistsError:
+      pass
+    os.makedirs(Paths.log_root(), exist_ok=True)
+
  def clean_dirs(self):
    symlink_path = Params().get_param_path()
    if os.path.exists(symlink_path):
@@ -37,9 +37,9 @@ class TestParams:

  def test_params_two_things(self):
    self.params.put("DongleId", "bob")
-    self.params.put("AthenadPid", "123")
+    self.params.put("AthenadPid", 123)
    assert self.params.get("DongleId") == "bob"
-    assert self.params.get("AthenadPid") == "123"
+    assert self.params.get("AthenadPid") == 123

  def test_params_get_block(self):
    def _delayed_writer():
@@ -1,4 +1,5 @@
 #include "common/util.h"
+#include "common/swaglog.h"

 #include <sys/ioctl.h>
 #include <sys/stat.h>
@@ -151,11 +152,16 @@ int safe_fflush(FILE *stream) {
  return ret;
 }

-int safe_ioctl(int fd, unsigned long request, void *argp) {
+int safe_ioctl(int fd, unsigned long request, void *argp, const char* exception_msg) {
  int ret;
  do {
    ret = ioctl(fd, request, argp);
  } while ((ret == -1) && (errno == EINTR));
+
+  if (ret == -1 && exception_msg) {
+    LOGE("safe_ioctl error: %s %s(%d) (fd: %d request: %lx argp: %p)", exception_msg, strerror(errno), errno, fd, request, argp);
+    throw std::runtime_error(exception_msg);
+  }
  return ret;
 }

@@ -88,7 +88,7 @@ int write_file(const char* path, const void* data, size_t size, int flags = O_WR
 FILE* safe_fopen(const char* filename, const char* mode);
 size_t safe_fwrite(const void * ptr, size_t size, size_t count, FILE * stream);
 int safe_fflush(FILE *stream);
-int safe_ioctl(int fd, unsigned long request, void *argp);
+int safe_ioctl(int fd, unsigned long request, void *argp, const char* exception_msg = nullptr);

 std::string readlink(const std::string& path);
 bool file_exists(const std::string& fn);
@@ -4,7 +4,7 @@

 A supported vehicle is one that just works when you install a comma device. All supported cars provide a better experience than any stock system. Supported vehicles reference the US market unless otherwise specified.

-# 313 Supported Cars
+# 314 Supported Cars

 |Make|Model|Supported Package|ACC|No ACC accel below|No ALC below|Steering Torque|Resume from stop|<a href="##"><img width=2000></a>Hardware Needed<br>&nbsp;|Video|Setup Video|
 |---|---|---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
@@ -72,6 +72,7 @@ A supported vehicle is one that just works when you install a comma device. All
 |Genesis|GV80 2023[<sup>6</sup>](#footnotes)|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Hyundai M connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Genesis GV80 2023">Buy Here</a></sub></details>|||
 |GMC|Sierra 1500 2020-21|Driver Alert Package II|openpilot available[<sup>1</sup>](#footnotes)|0 mph|6 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 GM connector<br>- 1 comma 3X<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=GMC Sierra 1500 2020-21">Buy Here</a></sub></details>|<a href="https://youtu.be/5HbNoBLzRwE" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>||
 |Honda|Accord 2018-22|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|3 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Accord 2018-22">Buy Here</a></sub></details>|<a href="https://www.youtube.com/watch?v=mrUwlj3Mi58" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>||
+|Honda|Accord 2023|All|openpilot|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch C connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Accord 2023">Buy Here</a></sub></details>|||
 |Honda|Accord Hybrid 2018-22|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|3 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Accord Hybrid 2018-22">Buy Here</a></sub></details>|||
 |Honda|Civic 2016-18|Honda Sensing|openpilot|0 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Civic 2016-18">Buy Here</a></sub></details>|<a href="https://youtu.be/-IkImTe1NYE" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>||
 |Honda|Civic 2019-21|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|2 mph[<sup>5</sup>](#footnotes)|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Civic 2019-21">Buy Here</a></sub></details>|<a href="https://www.youtube.com/watch?v=4Iz1Mz5LGF8" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>||
@@ -179,7 +180,7 @@ A supported vehicle is one that just works when you install a comma device. All
 |Kia|Sportage Hybrid 2023[<sup>6</sup>](#footnotes)|Smart Cruise Control (SCC)|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Hyundai N connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Kia Sportage Hybrid 2023">Buy Here</a></sub></details>|||
 |Kia|Stinger 2018-20|Smart Cruise Control (SCC)|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Hyundai C connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Kia Stinger 2018-20">Buy Here</a></sub></details>|<a href="https://www.youtube.com/watch?v=MJ94qoofYw0" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>||
 |Kia|Stinger 2022-23|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Hyundai K connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Kia Stinger 2022-23">Buy Here</a></sub></details>|||
-|Kia|Telluride 2020-22|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Hyundai H connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Kia Telluride 2020-22">Buy Here</a></sub></details>|||
+|Kia|Telluride 2020-22|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Hyundai H connector<br>- 1 angled mount (8 degrees)<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Kia Telluride 2020-22">Buy Here</a></sub></details>|||
 |Lexus|CT Hybrid 2017-18|Lexus Safety System+|openpilot available[<sup>2</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Lexus CT Hybrid 2017-18">Buy Here</a></sub></details>|||
 |Lexus|ES 2017-18|All|openpilot available[<sup>2</sup>](#footnotes)|19 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Lexus ES 2017-18">Buy Here</a></sub></details>|||
 |Lexus|ES 2019-25|All|openpilot|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Toyota A connector<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Lexus ES 2019-25">Buy Here</a></sub></details>|||
@@ -7,7 +7,7 @@ export OPENBLAS_NUM_THREADS=1
 export VECLIB_MAXIMUM_THREADS=1

 if [ -z "$AGNOS_VERSION" ]; then
-  export AGNOS_VERSION="12.4"
+  export AGNOS_VERSION="12.6"
 fi

 export STAGING_ROOT="/data/safe_staging"
@@ -120,7 +120,6 @@ 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')",
-  #"rerun-sdk >= 0.18",  # this is pretty big, so only enable once we use it
 ]

 [project.urls]
@@ -152,6 +151,7 @@ markers = [
 testpaths = [
  "common",
  "selfdrive",
+  "system/manager",
  "system/updated",
  "system/athena",
  "system/camerad",
@@ -4,20 +4,24 @@
 ## release checklist

 **Go to `devel-staging`**
+- [ ] make issue to track release
 - [ ] update RELEASES.md
- [ ] update `devel-staging`: `git reset --hard origin/master-ci`
+- [ ] trigger new nightly build: https://github.com/commaai/openpilot/actions/workflows/release.yaml
+- [ ] update `devel-staging`: `git reset --hard origin/__nightly`
+- [ ] build new userdata partition from `release3-staging`
 - [ ] open a pull request from `devel-staging` to `devel`
- [ ] post on Discord
+- [ ] post on Discord, tag `@release crew`

 **Go to `devel`**
 - [ ] bump version on master: `common/version.h` and `RELEASES.md`
- [ ] before merging the pull request
+- [ ] before merging the pull request, test the following:
  - [ ] update from previous release -> new release
  - [ ] update from new release -> previous release
  - [ ] fresh install with `openpilot-test.comma.ai`
  - [ ] drive on fresh install
  - [ ] no submodules or LFS
  - [ ] check sentry, MTBF, etc.
+  - [ ] stress test in production

 **Go to `release3`**
 - [ ] publish the blog post
@@ -57,7 +57,7 @@ class CarSpecificEvents:
        events.add(EventName.belowSteerSpeed)

    elif self.CP.brand == 'honda':
-      events = self.create_common_events(CS, CS_prev, pcm_enable=False)
+      events = self.create_common_events(CS, CS_prev, extra_gears=[GearShifter.sport], pcm_enable=False)

      if self.CP.pcmCruise and CS.vEgo < self.CP.minEnableSpeed:
        events.add(EventName.belowEngageSpeed)
@@ -2,7 +2,7 @@ import math
 import numpy as np

 from cereal import car
-from openpilot.common.conversions import Conversions as CV
+from openpilot.common.constants import CV
 from openpilot.sunnypilot.selfdrive.car.cruise_ext import VCruiseHelperSP


@@ -6,7 +6,7 @@ from parameterized import parameterized_class
 from cereal import log
 from openpilot.selfdrive.car.cruise import VCruiseHelper, V_CRUISE_MIN, V_CRUISE_MAX, V_CRUISE_INITIAL, IMPERIAL_INCREMENT
 from cereal import car
-from openpilot.common.conversions import Conversions as CV
+from openpilot.common.constants import CV
 from openpilot.selfdrive.test.longitudinal_maneuvers.maneuver import Maneuver

 ButtonEvent = car.CarState.ButtonEvent
@@ -439,7 +439,9 @@ class TestCarModelBase(unittest.TestCase):
        if self.CP.carFingerprint in (HONDA.HONDA_PILOT, HONDA.HONDA_RIDGELINE) and CS.brake > 0.05:
          brake_pressed = False
      checks['brakePressed'] += brake_pressed != self.safety.get_brake_pressed_prev()
-      checks['regenBraking'] += CS.regenBraking != self.safety.get_regen_braking_prev()
+      # TODO: remove this exception before closing commaai/opendbc#1100
+      if not (self.CP.brand == "honda" and self.CP.flags & HondaFlags.BOSCH):
+        checks['regenBraking'] += CS.regenBraking != self.safety.get_regen_braking_prev()
      checks['steeringDisengage'] += CS.steeringDisengage != self.safety.get_steering_disengage_prev()

      if self.CP.pcmCruise:
@@ -2,11 +2,11 @@
 import math
 import threading
 import time
-from typing import SupportsFloat
+from numbers import Number

 from cereal import car, log
 import cereal.messaging as messaging
-from openpilot.common.conversions import Conversions as CV
+from openpilot.common.constants import CV
 from openpilot.common.params import Params
 from openpilot.common.realtime import config_realtime_process, Priority, Ratekeeper
 from openpilot.common.swaglog import cloudlog
@@ -147,7 +147,7 @@ class Controls(ControlsExt, ModelStateBase):
    # Ensure no NaNs/Infs
    for p in ACTUATOR_FIELDS:
      attr = getattr(actuators, p)
-      if not isinstance(attr, SupportsFloat):
+      if not isinstance(attr, Number):
        continue

      if not math.isfinite(attr):
@@ -1,5 +1,5 @@
 from cereal import log
-from openpilot.common.conversions import Conversions as CV
+from openpilot.common.constants import CV
 from openpilot.common.realtime import DT_MDL
 from openpilot.sunnypilot.selfdrive.controls.lib.auto_lane_change import AutoLaneChangeController, AutoLaneChangeMode

@@ -1,5 +1,5 @@
 import numpy as np
-from opendbc.car.vehicle_model import ACCELERATION_DUE_TO_GRAVITY
+from openpilot.common.constants import ACCELERATION_DUE_TO_GRAVITY
 from openpilot.common.realtime import DT_CTRL, DT_MDL

 MIN_SPEED = 1.0
@@ -2,9 +2,9 @@ import math
 import numpy as np

 from cereal import log
-from opendbc.car import FRICTION_THRESHOLD, get_friction
+from opendbc.car.lateral import FRICTION_THRESHOLD, get_friction
 from opendbc.car.interfaces import LatControlInputs
-from opendbc.car.vehicle_model import ACCELERATION_DUE_TO_GRAVITY
+from openpilot.common.constants import ACCELERATION_DUE_TO_GRAVITY
 from openpilot.selfdrive.controls.lib.latcontrol import LatControl
 from openpilot.common.pid import PIDController

@@ -1,6 +1,6 @@
 from cereal import log
 from openpilot.common.realtime import DT_CTRL
-from openpilot.common.conversions import Conversions as CV
+from openpilot.common.constants import CV


 CAMERA_OFFSET = 0.04
@@ -4,7 +4,7 @@ import numpy as np

 import cereal.messaging as messaging
 from opendbc.car.interfaces import ACCEL_MIN, ACCEL_MAX
-from openpilot.common.conversions import Conversions as CV
+from openpilot.common.constants import CV
 from openpilot.common.filter_simple import FirstOrderFilter
 from openpilot.common.realtime import DT_MDL
 from openpilot.selfdrive.modeld.constants import ModelConstants
@@ -21,7 +21,7 @@ LON_MPC_STEP = 0.2  # first step is 0.2s
 A_CRUISE_MAX_VALS = [1.6, 1.2, 0.8, 0.6]
 A_CRUISE_MAX_BP = [0., 10.0, 25., 40.]
 CONTROL_N_T_IDX = ModelConstants.T_IDXS[:CONTROL_N]
-ALLOW_THROTTLE_THRESHOLD = 0.5
+ALLOW_THROTTLE_THRESHOLD = 0.4
 MIN_ALLOW_THROTTLE_SPEED = 2.5

 # Lookup table for turns
@@ -188,7 +188,7 @@ class LongitudinalPlanner(LongitudinalPlannerSP):
  def publish(self, sm, pm):
    plan_send = messaging.new_message('longitudinalPlan')

-    plan_send.valid = sm.all_checks(service_list=['carState', 'controlsState', 'selfdriveState'])
+    plan_send.valid = sm.all_checks(service_list=['carState', 'controlsState', 'selfdriveState', 'radarState'])

    longitudinalPlan = plan_send.longitudinalPlan
    longitudinalPlan.modelMonoTime = sm.logMonoTime['modelV2']
@@ -1,23 +1,25 @@
 #!/usr/bin/env python3
-
 import argparse

 from openpilot.selfdrive.test.process_replay.process_replay import CONFIGS, replay_process
+from openpilot.selfdrive.test.process_replay.test_processes import EXCLUDED_PROCS
 from openpilot.tools.lib.logreader import LogReader, save_log

+ALLOW_PROCS = {c.proc_name for c in CONFIGS}
+
 if __name__ == "__main__":
  parser = argparse.ArgumentParser(description="Run process on route and create new logs",
                                   formatter_class=argparse.ArgumentDefaultsHelpFormatter)
-  parser.add_argument("--fingerprint", help="The fingerprint to use")
  parser.add_argument("route", help="The route name to use")
-  parser.add_argument("process", nargs='+', help="The process(s) to run")
+  parser.add_argument("--fingerprint", help="The fingerprint to use")
+  parser.add_argument("--whitelist-procs", nargs='*', default=ALLOW_PROCS, help="Whitelist given processes (e.g. controlsd)")
+  parser.add_argument("--blacklist-procs", nargs='*', default=EXCLUDED_PROCS, help="Blacklist given processes (e.g. controlsd)")
  args = parser.parse_args()

-  cfgs = [c for c in CONFIGS if c.proc_name in args.process]
-
-  lr = LogReader(args.route)
-  inputs = list(lr)
+  allowed_procs = set(args.whitelist_procs) - set(args.blacklist_procs)
+  cfgs = [c for c in CONFIGS if c.proc_name in allowed_procs]

+  inputs = list(LogReader(args.route))
  outputs = replay_process(cfgs, inputs, fingerprint=args.fingerprint)

  # Remove message generated by the process under test and merge in the new messages
@@ -25,6 +27,6 @@ if __name__ == "__main__":
  inputs = [i for i in inputs if i.which() not in produces]
  outputs = sorted(inputs + outputs, key=lambda x: x.logMonoTime)

-  fn = f"{args.route.replace('/', '_')}_{'_'.join(args.process)}.zst"
+  fn = f"{args.route.replace('/', '_')}_{'_'.join(allowed_procs)}.zst"
  print(f"Saving log to {fn}")
  save_log(fn, outputs)
@@ -14,7 +14,7 @@ from typing import NoReturn
 from cereal import log, car
 import cereal.messaging as messaging
 from openpilot.system.hardware import HARDWARE
-from openpilot.common.conversions import Conversions as CV
+from openpilot.common.constants import CV
 from openpilot.common.params import Params
 from openpilot.common.realtime import config_realtime_process
 from openpilot.common.transformations.orientation import rot_from_euler, euler_from_rot
@@ -5,7 +5,7 @@ from typing import Any

 import numpy as np

-from opendbc.car.vehicle_model import ACCELERATION_DUE_TO_GRAVITY
+from openpilot.common.constants import ACCELERATION_DUE_TO_GRAVITY
 from openpilot.selfdrive.locationd.models.constants import ObservationKind
 from openpilot.common.swaglog import cloudlog

@@ -4,7 +4,7 @@ from collections import deque, defaultdict

 import cereal.messaging as messaging
 from cereal import car, log
-from opendbc.car.vehicle_model import ACCELERATION_DUE_TO_GRAVITY
+from openpilot.common.constants import ACCELERATION_DUE_TO_GRAVITY
 from openpilot.common.params import Params
 from openpilot.common.realtime import config_realtime_process, DT_MDL
 from openpilot.common.filter_simple import FirstOrderFilter
@@ -33,7 +33,7 @@ MIN_BUCKET_POINTS = np.array([100, 300, 500, 500, 500, 500, 300, 100])
 MIN_ENGAGE_BUFFER = 2  # secs

 VERSION = 1  # bump this to invalidate old parameter caches
-ALLOWED_CARS = ['toyota', 'hyundai', 'rivian']
+ALLOWED_CARS = ['toyota', 'hyundai', 'rivian', 'honda']


 def slope2rot(slope):
@@ -66,58 +66,44 @@ PandaSpiHandle::PandaSpiHandle(std::string serial) : PandaCommsHandle(serial) {
  // 50MHz is the max of the 845. note that some older
  // revs of the comma three may not support this speed
  uint32_t spi_speed = 50000000;
-
-  if (!util::file_exists(SPI_DEVICE)) {
-    goto fail;
-  }
-
-  spi_fd = open(SPI_DEVICE.c_str(), O_RDWR);
-  if (spi_fd < 0) {
-    LOGE("failed opening SPI device %d", spi_fd);
-    goto fail;
-  }
-
-  // SPI settings
-  ret = util::safe_ioctl(spi_fd, SPI_IOC_WR_MODE, &spi_mode);
-  if (ret < 0) {
-    LOGE("failed setting SPI mode %d", ret);
-    goto fail;
-  }
-
-  ret = util::safe_ioctl(spi_fd, SPI_IOC_WR_MAX_SPEED_HZ, &spi_speed);
-  if (ret < 0) {
-    LOGE("failed setting SPI speed");
-    goto fail;
-  }
-
-  ret = util::safe_ioctl(spi_fd, SPI_IOC_WR_BITS_PER_WORD, &spi_bits_per_word);
-  if (ret < 0) {
-    LOGE("failed setting SPI bits per word");
-    goto fail;
-  }
-
-  // get hw UID/serial
-  ret = control_read(0xc3, 0, 0, uid, uid_len, 100);
-  if (ret == uid_len) {
-    std::stringstream stream;
-    for (int i = 0; i < uid_len; i++) {
-      stream << std::hex << std::setw(2) << std::setfill('0') << int(uid[i]);
+  try {
+    if (!util::file_exists(SPI_DEVICE)) {
+      throw std::runtime_error("Error connecting to panda: SPI device not found");
    }
-    hw_serial = stream.str();
-  } else {
-    LOGD("failed to get serial %d", ret);
-    goto fail;
-  }

-  if (!serial.empty() && (serial != hw_serial)) {
-    goto fail;
-  }
+    spi_fd = open(SPI_DEVICE.c_str(), O_RDWR);
+    if (spi_fd < 0) {
+      LOGE("failed opening SPI device %d", spi_fd);
+      throw std::runtime_error("Error connecting to panda: failed to open SPI device");
+    }

+    // SPI settings
+    util::safe_ioctl(spi_fd, SPI_IOC_WR_MODE, &spi_mode, "failed setting SPI mode");
+    util::safe_ioctl(spi_fd, SPI_IOC_WR_MAX_SPEED_HZ, &spi_speed, "failed setting SPI speed");
+    util::safe_ioctl(spi_fd, SPI_IOC_WR_BITS_PER_WORD, &spi_bits_per_word, "failed setting SPI bits per word");
+
+    // get hw UID/serial
+    ret = control_read(0xc3, 0, 0, uid, uid_len, 100);
+    if (ret == uid_len) {
+      std::stringstream stream;
+      for (int i = 0; i < uid_len; i++) {
+        stream << std::hex << std::setw(2) << std::setfill('0') << int(uid[i]);
+      }
+      hw_serial = stream.str();
+    } else {
+      LOGD("failed to get serial %d", ret);
+      throw std::runtime_error("Error connecting to panda: failed to get serial");
+    }
+
+    if (!serial.empty() && (serial != hw_serial)) {
+      throw std::runtime_error("Error connecting to panda: serial mismatch");
+    }
+
+  } catch (...) {
+    cleanup();
+    throw;
+  }
  return;
-
-fail:
-  cleanup();
-  throw std::runtime_error("Error connecting to panda");
 }

 PandaSpiHandle::~PandaSpiHandle() {
@@ -46,7 +46,7 @@
    "severity": 0
  },
  "Offroad_ExcessiveActuation": {
-    "text": "openpilot has detected excessive %1 actuation. This may be due to a software bug. Please contact support at https://comma.ai/support.",
+    "text": "openpilot detected excessive %1 actuation on your last drive. Please contact support at https://comma.ai/support and share your device's Dongle ID for troubleshooting.",
    "severity": 1,
    "_comment": "Set extra field to lateral or longitudinal."
  }
@@ -4,10 +4,12 @@ import os

 from cereal import log, car
 import cereal.messaging as messaging
-from openpilot.common.conversions import Conversions as CV
+from openpilot.common.constants import CV
 from openpilot.common.git import get_short_branch
 from openpilot.common.realtime import DT_CTRL
 from openpilot.selfdrive.locationd.calibrationd import MIN_SPEED_FILTER
+from openpilot.system.micd import SAMPLE_RATE, SAMPLE_BUFFER
+from openpilot.selfdrive.ui.feedback.feedbackd import FEEDBACK_MAX_DURATION

 from openpilot.sunnypilot.selfdrive.selfdrived.events_base import EventsBase, Priority, ET, Alert, \
  NoEntryAlert, SoftDisableAlert, UserSoftDisableAlert, ImmediateDisableAlert, EngagementAlert, NormalPermanentAlert, \
@@ -40,6 +42,7 @@ class Events(EventsBase):
    return log.OnroadEvent


+
 # ********** helper functions **********
 def get_display_speed(speed_ms: float, metric: bool) -> str:
  speed = int(round(speed_ms * (CV.MS_TO_KPH if metric else CV.MS_TO_MPH)))
@@ -92,6 +95,14 @@ def calibration_incomplete_alert(CP: car.CarParams, CS: car.CarState, sm: messag
    Priority.LOWEST, VisualAlert.none, AudibleAlert.none, .2)


+def audio_feedback_alert(CP: car.CarParams, CS: car.CarState, sm: messaging.SubMaster, metric: bool, soft_disable_time: int, personality) -> Alert:
+  duration = FEEDBACK_MAX_DURATION - ((sm['audioFeedback'].blockNum + 1) * SAMPLE_BUFFER / SAMPLE_RATE)
+  return NormalPermanentAlert(
+    "Recording Audio Feedback",
+    f"{round(duration)} second{'s' if round(duration) != 1 else ''} remaining. Press again to save early.",
+    priority=Priority.LOW)
+
+
 # *** debug alerts ***

 def out_of_space_alert(CP: car.CarParams, CS: car.CarState, sm: messaging.SubMaster, metric: bool, soft_disable_time: int, personality) -> Alert:
@@ -203,6 +214,7 @@ def invalid_lkas_setting_alert(CP: car.CarParams, CS: car.CarState, sm: messagin
  return NormalPermanentAlert("Invalid LKAS setting", text)


+
 EVENTS: dict[int, dict[str, Alert | AlertCallbackType]] = {
  # ********** events with no alerts **********

@@ -824,9 +836,13 @@ EVENTS: dict[int, dict[str, Alert | AlertCallbackType]] = {
    ET.WARNING: personality_changed_alert,
  },

-  EventName.userFlag: {
+  EventName.userBookmark: {
    ET.PERMANENT: NormalPermanentAlert("Bookmark Saved", duration=1.5),
  },
+
+  EventName.audioFeedback: {
+    ET.PERMANENT: audio_feedback_alert,
+  },
 }


@@ -0,0 +1,54 @@
+import math
+from enum import StrEnum, auto
+
+from cereal import car, messaging
+from openpilot.common.realtime import DT_CTRL
+from openpilot.selfdrive.locationd.helpers import Pose
+from opendbc.car import ACCELERATION_DUE_TO_GRAVITY
+from opendbc.car.lateral import ISO_LATERAL_ACCEL
+from opendbc.car.interfaces import ACCEL_MIN, ACCEL_MAX
+
+MIN_EXCESSIVE_ACTUATION_COUNT = int(0.25 / DT_CTRL)
+MIN_LATERAL_ENGAGE_BUFFER = int(1 / DT_CTRL)
+
+
+class ExcessiveActuationType(StrEnum):
+  LONGITUDINAL = auto()
+  LATERAL = auto()
+
+
+class ExcessiveActuationCheck:
+  def __init__(self):
+    self._excessive_counter = 0
+    self._engaged_counter = 0
+
+  def update(self, sm: messaging.SubMaster, CS: car.CarState, calibrated_pose: Pose) -> ExcessiveActuationType | None:
+    # CS.aEgo can be noisy to bumps in the road, transitioning from standstill, losing traction, etc.
+    # longitudinal
+    accel_calibrated = calibrated_pose.acceleration.x
+    excessive_long_actuation = sm['carControl'].longActive and (accel_calibrated > ACCEL_MAX * 2 or accel_calibrated < ACCEL_MIN * 2)
+
+    # lateral
+    yaw_rate = calibrated_pose.angular_velocity.yaw
+    roll = sm['liveParameters'].roll
+    roll_compensated_lateral_accel = (CS.vEgo * yaw_rate) - (math.sin(roll) * ACCELERATION_DUE_TO_GRAVITY)
+
+    # Prevent false positives after overriding
+    excessive_lat_actuation = False
+    self._engaged_counter = self._engaged_counter + 1 if sm['carControl'].latActive and not CS.steeringPressed else 0
+    if self._engaged_counter > MIN_LATERAL_ENGAGE_BUFFER:
+      if abs(roll_compensated_lateral_accel) > ISO_LATERAL_ACCEL * 2:
+        excessive_lat_actuation = True
+
+    # livePose acceleration can be noisy due to bad mounting or aliased livePose measurements
+    livepose_valid = abs(CS.aEgo - accel_calibrated) < 2
+    self._excessive_counter = self._excessive_counter + 1 if livepose_valid and (excessive_long_actuation or excessive_lat_actuation) else 0
+
+    excessive_type = None
+    if self._excessive_counter > MIN_EXCESSIVE_ACTUATION_COUNT:
+      if excessive_long_actuation:
+        excessive_type = ExcessiveActuationType.LONGITUDINAL
+      else:
+        excessive_type = ExcessiveActuationType.LATERAL
+
+    return excessive_type
@@ -7,7 +7,6 @@ import cereal.messaging as messaging

 from cereal import car, log, custom
 from msgq.visionipc import VisionIpcClient, VisionStreamType
-from opendbc.car.interfaces import ACCEL_MIN, ACCEL_MAX


 from openpilot.common.params import Params
@@ -18,6 +17,7 @@ from openpilot.common.gps import get_gps_location_service
 from openpilot.selfdrive.car.car_specific import CarSpecificEvents
 from openpilot.selfdrive.locationd.helpers import PoseCalibrator, Pose
 from openpilot.selfdrive.selfdrived.events import Events, ET
+from openpilot.selfdrive.selfdrived.helpers import ExcessiveActuationCheck
 from openpilot.selfdrive.selfdrived.state import StateMachine
 from openpilot.selfdrive.selfdrived.alertmanager import AlertManager, set_offroad_alert

@@ -34,7 +34,6 @@ SIMULATION = "SIMULATION" in os.environ
 TESTING_CLOSET = "TESTING_CLOSET" in os.environ

 LONGITUDINAL_PERSONALITY_MAP = {v: k for k, v in log.LongitudinalPersonality.schema.enumerants.items()}
-MIN_EXCESSIVE_ACTUATION_COUNT = int(0.25 / DT_CTRL)

 ThermalStatus = log.DeviceState.ThermalStatus
 State = log.SelfdriveState.OpenpilotState
@@ -48,21 +47,6 @@ SafetyModel = car.CarParams.SafetyModel
 IGNORED_SAFETY_MODES = (SafetyModel.silent, SafetyModel.noOutput)


-def check_excessive_actuation(sm: messaging.SubMaster, CS: car.CarState, calibrator: PoseCalibrator, counter: int) -> tuple[int, bool]:
-  # CS.aEgo can be noisy to bumps in the road, transitioning from standstill, losing traction, etc.
-  device_pose = Pose.from_live_pose(sm['livePose'])
-  calibrated_pose = calibrator.build_calibrated_pose(device_pose)
-  accel_calibrated = calibrated_pose.acceleration.x
-
-  # livePose acceleration can be noisy due to bad mounting or aliased livePose measurements
-  accel_valid = abs(CS.aEgo - accel_calibrated) < 2
-
-  excessive_actuation = accel_calibrated > ACCEL_MAX * 2 or accel_calibrated < ACCEL_MIN * 2
-  counter = counter + 1 if sm['carControl'].longActive and excessive_actuation and accel_valid else 0
-
-  return counter, counter > MIN_EXCESSIVE_ACTUATION_COUNT
-
-
 class SelfdriveD(CruiseHelper):
  def __init__(self, CP=None, CP_SP=None):
    self.params = Params()
@@ -85,7 +69,11 @@ class SelfdriveD(CruiseHelper):
      self.CP_SP = CP_SP

    self.car_events = CarSpecificEvents(self.CP)
-    self.calibrator = PoseCalibrator()
+
+    self.pose_calibrator = PoseCalibrator()
+    self.calibrated_pose: Pose | None = None
+    self.excessive_actuation_check = ExcessiveActuationCheck()
+    self.excessive_actuation = self.params.get("Offroad_ExcessiveActuation") is not None

    # Setup sockets
    self.pm = messaging.PubMaster(['selfdriveState', 'onroadEvents'] + ['selfdriveStateSP', 'onroadEventsSP'])
@@ -107,7 +95,7 @@ class SelfdriveD(CruiseHelper):
    self.sm = messaging.SubMaster(['deviceState', 'pandaStates', 'peripheralState', 'modelV2', 'liveCalibration',
                                   'carOutput', 'driverMonitoringState', 'longitudinalPlan', 'livePose', 'liveDelay',
                                   'managerState', 'liveParameters', 'radarState', 'liveTorqueParameters',
-                                   'controlsState', 'carControl', 'driverAssistance', 'alertDebug', 'userFlag'] + \
+                                   'controlsState', 'carControl', 'driverAssistance', 'alertDebug', 'userBookmark', 'audioFeedback'] + \
                                   self.camera_packets + self.sensor_packets + self.gps_packets,
                                  ignore_alive=ignore, ignore_avg_freq=ignore,
                                  ignore_valid=ignore, frequency=int(1/DT_CTRL))
@@ -143,8 +131,6 @@ class SelfdriveD(CruiseHelper):
    self.experimental_mode = False
    self.personality = self.params.get("LongitudinalPersonality", return_default=True)
    self.recalibrating_seen = False
-    self.excessive_actuation = self.params.get("Offroad_ExcessiveActuation") is not None
-    self.excessive_actuation_counter = 0
    self.state_machine = StateMachine()
    self.rk = Ratekeeper(100, print_delay_threshold=None)

@@ -205,9 +191,12 @@ class SelfdriveD(CruiseHelper):
      self.events.add(EventName.selfdriveInitializing)
      return

-    # Check for user flag (bookmark) press
-    if self.sm.updated['userFlag']:
-      self.events.add(EventName.userFlag)
+    # Check for user bookmark press (bookmark button or end of LKAS button feedback)
+    if self.sm.updated['userBookmark']:
+      self.events.add(EventName.userBookmark)
+
+    if self.sm.updated['audioFeedback']:
+      self.events.add(EventName.audioFeedback)

    # Don't add any more events while in dashcam mode
    if self.CP.passive:
@@ -276,14 +265,18 @@ class SelfdriveD(CruiseHelper):
      if self.sm['driverAssistance'].leftLaneDeparture or self.sm['driverAssistance'].rightLaneDeparture:
        self.events.add(EventName.ldw)

-    # Check for excessive (longitudinal) actuation
+    # Check for excessive actuation
    if self.sm.updated['liveCalibration']:
-      self.calibrator.feed_live_calib(self.sm['liveCalibration'])
+      self.pose_calibrator.feed_live_calib(self.sm['liveCalibration'])
+    if self.sm.updated['livePose']:
+      device_pose = Pose.from_live_pose(self.sm['livePose'])
+      self.calibrated_pose = self.pose_calibrator.build_calibrated_pose(device_pose)

-    self.excessive_actuation_counter, excessive_actuation = check_excessive_actuation(self.sm, CS, self.calibrator, self.excessive_actuation_counter)
-    if not self.excessive_actuation and excessive_actuation:
-      set_offroad_alert("Offroad_ExcessiveActuation", True, extra_text="longitudinal")
-      self.excessive_actuation = True
+    if self.calibrated_pose is not None:
+      excessive_actuation = self.excessive_actuation_check.update(self.sm, CS, self.calibrated_pose)
+      if not self.excessive_actuation and excessive_actuation is not None:
+        set_offroad_alert("Offroad_ExcessiveActuation", True, extra_text=str(excessive_actuation))
+        self.excessive_actuation = True

    if self.excessive_actuation:
      self.events.add(EventName.excessiveActuation)
@@ -339,13 +332,12 @@ class SelfdriveD(CruiseHelper):
          self.events.add(EventName.cameraFrameRate)
    if not REPLAY and self.rk.lagging:
      self.events.add(EventName.selfdrivedLagging)
-    if not self.sm.valid['radarState']:
-      if self.sm['radarState'].radarErrors.canError:
-        self.events.add(EventName.canError)
-      elif self.sm['radarState'].radarErrors.radarUnavailableTemporary:
-        self.events.add(EventName.radarTempUnavailable)
-      else:
-        self.events.add(EventName.radarFault)
+    if self.sm['radarState'].radarErrors.canError:
+      self.events.add(EventName.canError)
+    elif self.sm['radarState'].radarErrors.radarUnavailableTemporary:
+      self.events.add(EventName.radarTempUnavailable)
+    elif any(self.sm['radarState'].radarErrors.to_dict().values()):
+      self.events.add(EventName.radarFault)
    if not self.sm.valid['pandaStates']:
      self.events.add(EventName.usbError)
    if CS.canTimeout:
@@ -4,8 +4,9 @@ import time
 import copy
 import heapq
 import signal
-from collections import Counter, OrderedDict
+from collections import Counter
 from dataclasses import dataclass, field
+from itertools import islice
 from typing import Any
 from collections.abc import Callable, Iterable
 from tqdm import tqdm
@@ -16,12 +17,13 @@ import cereal.messaging as messaging
 from cereal import car
 from cereal.services import SERVICE_LIST
 from msgq.visionipc import VisionIpcServer, get_endpoint_name as vipc_get_endpoint_name
+from opendbc.car.can_definitions import CanData
 from opendbc.car.car_helpers import get_car, interfaces
 from openpilot.common.params import Params
 from openpilot.common.prefix import OpenpilotPrefix
 from openpilot.common.timeout import Timeout
 from openpilot.common.realtime import DT_CTRL
-from openpilot.selfdrive.car.card import can_comm_callbacks, convert_to_capnp
+from openpilot.selfdrive.car.card import convert_to_capnp
 from openpilot.system.manager.process_config import managed_processes
 from openpilot.selfdrive.test.process_replay.vision_meta import meta_from_camera_state, available_streams
 from openpilot.selfdrive.test.process_replay.migration import migrate_all
@@ -30,22 +32,10 @@ from openpilot.tools.lib.logreader import LogIterable
 from openpilot.tools.lib.framereader import FrameReader

 # Numpy gives different results based on CPU features after version 19
-NUMPY_TOLERANCE = 1e-7
+NUMPY_TOLERANCE = 1e-2
 PROC_REPLAY_DIR = os.path.dirname(os.path.abspath(__file__))
 FAKEDATA = os.path.join(PROC_REPLAY_DIR, "fakedata/")

-class DummySocket:
-  def __init__(self):
-    self.data: list[bytes] = []
-
-  def receive(self, non_blocking: bool = False) -> bytes | None:
-    if non_blocking:
-      return None
-
-    return self.data.pop()
-
-  def send(self, data: bytes):
-    self.data.append(data)

 class LauncherWithCapture:
  def __init__(self, capture: ProcessOutputCapture, launcher: Callable):
@@ -63,8 +53,7 @@ class ReplayContext:
    self.pubs = cfg.pubs
    self.main_pub = cfg.main_pub
    self.main_pub_drained = cfg.main_pub_drained
-    self.unlocked_pubs = cfg.unlocked_pubs
-    assert(len(self.pubs) != 0 or self.main_pub is not None)
+    assert len(self.pubs) != 0 or self.main_pub is not None

  def __enter__(self):
    self.open_context()
@@ -79,9 +68,8 @@ class ReplayContext:
    messaging.set_fake_prefix(self.proc_name)

    if self.main_pub is None:
-      self.events = OrderedDict()
-      pubs_with_events = [pub for pub in self.pubs if pub not in self.unlocked_pubs]
-      for pub in pubs_with_events:
+      self.events = {}
+      for pub in self.pubs:
        self.events[pub] = messaging.fake_event_handle(pub, enable=True)
    else:
      self.events = {self.main_pub: messaging.fake_event_handle(self.main_pub, enable=True)}
@@ -138,16 +126,21 @@ class ProcessConfig:
  processing_time: float = 0.001
  timeout: int = 30
  simulation: bool = True
+  # Set to service process receives on first
  main_pub: str | None = None
-  main_pub_drained: bool = True
+  main_pub_drained: bool = False
  vision_pubs: list[str] = field(default_factory=list)
  ignore_alive_pubs: list[str] = field(default_factory=list)
-  unlocked_pubs: list[str] = field(default_factory=list)
+
+  def __post_init__(self):
+    # If the process is polling a service, we can just lock that one to speed up replay
+    if self.main_pub is None and isinstance(self.should_recv_callback, MessageBasedRcvCallback):
+      self.main_pub = self.should_recv_callback.trigger_msg_type


 class ProcessContainer:
  def __init__(self, cfg: ProcessConfig):
-    self.prefix = OpenpilotPrefix(clean_dirs_on_exit=False)
+    self.prefix = OpenpilotPrefix(create_dirs_on_enter=False, clean_dirs_on_exit=False)
    self.cfg = copy.deepcopy(cfg)
    self.process = copy.deepcopy(managed_processes[cfg.proc_name])
    self.msg_queue: list[capnp._DynamicStructReader] = []
@@ -229,6 +222,7 @@ class ProcessContainer:
    fingerprint: str | None, capture_output: bool
  ):
    with self.prefix as p:
+      self.prefix.create_dirs()
      self._setup_env(params_config, environ_config)

      if self.cfg.config_callback is not None:
@@ -254,11 +248,6 @@ class ProcessContainer:
      if self.cfg.init_callback is not None:
        self.cfg.init_callback(self.rc, self.pm, all_msgs, fingerprint)

-      # wait for process to startup
-      with Timeout(10, error_msg=f"timed out waiting for process to start: {repr(self.cfg.proc_name)}"):
-        while not all(self.pm.all_readers_updated(s) for s in self.cfg.pubs if s not in self.cfg.ignore_alive_pubs):
-          time.sleep(0)
-
  def stop(self):
    with self.prefix:
      self.process.signal(signal.SIGKILL)
@@ -267,28 +256,42 @@ class ProcessContainer:
      self.prefix.clean_dirs()
      self._clean_env()

+  def get_output_msgs(self, start_time: int):
+    assert self.rc and self.sockets
+
+    output_msgs = []
+    self.rc.wait_for_recv_called()
+    for socket in self.sockets:
+      ms = messaging.drain_sock(socket)
+      for m in ms:
+        m = m.as_builder()
+        m.logMonoTime = start_time + int(self.cfg.processing_time * 1e9)
+        output_msgs.append(m.as_reader())
+    return output_msgs
+
  def run_step(self, msg: capnp._DynamicStructReader, frs: dict[str, FrameReader] | None) -> list[capnp._DynamicStructReader]:
    assert self.rc and self.pm and self.sockets and self.process.proc

    output_msgs = []
-    with self.prefix, Timeout(self.cfg.timeout, error_msg=f"timed out testing process {repr(self.cfg.proc_name)}"):
-      end_of_cycle = True
-      if self.cfg.should_recv_callback is not None:
-        end_of_cycle = self.cfg.should_recv_callback(msg, self.cfg, self.cnt)
-
-      self.msg_queue.append(msg)
-      if end_of_cycle:
-        self.rc.wait_for_recv_called()
+    end_of_cycle = True
+    if self.cfg.should_recv_callback is not None:
+      end_of_cycle = self.cfg.should_recv_callback(msg, self.cfg, self.cnt)

+    self.msg_queue.append(msg)
+    if end_of_cycle:
+      with self.prefix, Timeout(self.cfg.timeout, error_msg=f"timed out testing process {repr(self.cfg.proc_name)}"):
        # call recv to let sub-sockets reconnect, after we know the process is ready
        if self.cnt == 0:
          for s in self.sockets:
            messaging.recv_one_or_none(s)

-        # empty recv on drained pub indicates the end of messages, only do that if there're any
+        # certain processes use drain_sock. need to cause empty recv to break from this loop
        trigger_empty_recv = False
        if self.cfg.main_pub and self.cfg.main_pub_drained:
-          trigger_empty_recv = next((True for m in self.msg_queue if m.which() == self.cfg.main_pub), False)
+          trigger_empty_recv = any(m.which() == self.cfg.main_pub for m in self.msg_queue)
+
+        # get output msgs from previous inputs
+        output_msgs = self.get_output_msgs(msg.logMonoTime)

        for m in self.msg_queue:
          self.pm.send(m.which(), m.as_builder())
@@ -303,14 +306,8 @@ class ProcessContainer:
        self.msg_queue = []

        self.rc.unlock_sockets()
-        self.rc.wait_for_next_recv(trigger_empty_recv)
-
-        for socket in self.sockets:
-          ms = messaging.drain_sock(socket)
-          for m in ms:
-            m = m.as_builder()
-            m.logMonoTime = msg.logMonoTime + int(self.cfg.processing_time * 1e9)
-            output_msgs.append(m.as_reader())
+        if trigger_empty_recv:
+          self.rc.unlock_sockets()
        self.cnt += 1
    assert self.process.proc.is_alive()

@@ -320,7 +317,7 @@ class ProcessContainer:
 def card_fingerprint_callback(rc, pm, msgs, fingerprint):
  print("start fingerprinting")
  params = Params()
-  canmsgs = [msg for msg in msgs if msg.which() == "can"][:300]
+  canmsgs = list(islice((m for m in msgs if m.which() == "can"), 300))

  # card expects one arbitrary can and pandaState
  rc.send_sync(pm, "can", messaging.new_message("can", 1))
@@ -345,36 +342,27 @@ def get_car_params_callback(rc, pm, msgs, fingerprint):
    CP = CarInterface.get_non_essential_params(fingerprint)
    CP_SP = CarInterface.get_non_essential_params_sp(CP, fingerprint)
  else:
-    can = DummySocket()
-    sendcan = DummySocket()
-
-    canmsgs = [msg for msg in msgs if msg.which() == "can"]
+    can_msgs = ([CanData(can.address, can.dat, can.src) for can in m.can] for m in msgs if m.which() == "can")
    cached_params_raw = params.get("CarParamsCache")
-    has_cached_cp = cached_params_raw is not None
-    assert len(canmsgs) != 0, "CAN messages are required for fingerprinting"
-    assert os.environ.get("SKIP_FW_QUERY", False) or has_cached_cp, \
+    assert next(can_msgs, None), "CAN messages are required for fingerprinting"
+    assert os.environ.get("SKIP_FW_QUERY", False) or cached_params_raw is not None, \
            "CarParamsCache is required for fingerprinting. Make sure to keep carParams msgs in the logs."

-    for m in canmsgs[:300]:
-      can.send(m.as_builder().to_bytes())
-    can_callbacks = can_comm_callbacks(can, sendcan)
+    def can_recv(wait_for_one: bool = False) -> list[list[CanData]]:
+      return [next(can_msgs, [])]

    cached_params = None
-    if has_cached_cp:
+    if cached_params_raw is not None:
      with car.CarParams.from_bytes(cached_params_raw) as _cached_params:
        cached_params = _cached_params

-    _CI = get_car(*can_callbacks, lambda obd: None, Params().get_bool("AlphaLongitudinalEnabled"), False, cached_params=cached_params)
+    _CI = get_car(can_recv, lambda _msgs: None, lambda obd: None, params.get_bool("AlphaLongitudinalEnabled"), False, cached_params=cached_params)
    CP, CP_SP = _CI.CP, _CI.CP_SP

  params.put("CarParams", CP.to_bytes())
  params.put("CarParamsSP", convert_to_capnp(CP_SP).to_bytes())


-def selfdrived_rcv_callback(msg, cfg, frame):
-  return (frame - 1) == 0 or msg.which() == 'carState'
-
-
 def card_rcv_callback(msg, cfg, frame):
  # no sendcan until card is initialized
  if msg.which() != "can":
@@ -389,21 +377,6 @@ def card_rcv_callback(msg, cfg, frame):
  return len(socks) > 0


-def calibration_rcv_callback(msg, cfg, frame):
-  # calibrationd publishes 1 calibrationData every 5 cameraOdometry packets.
-  # should_recv always true to increment frame
-  return (frame - 1) == 0 or msg.which() == 'cameraOdometry'
-
-
-def torqued_rcv_callback(msg, cfg, frame):
-  # should_recv always true to increment frame
-  return (frame - 1) == 0 or msg.which() == 'livePose'
-
-
-def dmonitoringmodeld_rcv_callback(msg, cfg, frame):
-  return msg.which() == "driverCameraState"
-
-
 class ModeldCameraSyncRcvCallback:
  def __init__(self):
    self.road_present = False
@@ -428,26 +401,13 @@ class ModeldCameraSyncRcvCallback:


 class MessageBasedRcvCallback:
-  def __init__(self, trigger_msg_type):
+  def __init__(self, trigger_msg_type: str, first_frame: bool = False):
    self.trigger_msg_type = trigger_msg_type
+    self.first_frame = first_frame

  def __call__(self, msg, cfg, frame):
-    return msg.which() == self.trigger_msg_type
-
-
-class FrequencyBasedRcvCallback:
-  def __init__(self, trigger_msg_type):
-    self.trigger_msg_type = trigger_msg_type
-
-  def __call__(self, msg, cfg, frame):
-    if msg.which() != self.trigger_msg_type:
-      return False
-
-    resp_sockets = [
-      s for s in cfg.subs
-      if frame % max(1, int(SERVICE_LIST[msg.which()].frequency / SERVICE_LIST[s].frequency)) == 0
-    ]
-    return bool(len(resp_sockets))
+    # publish on first frame or trigger msg
+    return ((frame - 1) == 0 and self.first_frame) or msg.which() == self.trigger_msg_type


 def selfdrived_config_callback(params, cfg, lr):
@@ -462,16 +422,16 @@ CONFIGS = [
    proc_name="selfdrived",
    pubs=[
      "carState", "deviceState", "pandaStates", "peripheralState", "liveCalibration", "driverMonitoringState",
-      "longitudinalPlan", "livePose", "liveDelay", "liveParameters", "radarState",
-      "modelV2", "driverCameraState", "roadCameraState", "wideRoadCameraState", "managerState",
-      "liveTorqueParameters", "accelerometer", "gyroscope", "carOutput",
-      "gpsLocationExternal", "gpsLocation", "controlsState", "carControl", "driverAssistance", "alertDebug",
+      "longitudinalPlan", "livePose", "liveDelay", "liveParameters", "radarState", "modelV2",
+      "driverCameraState", "roadCameraState", "wideRoadCameraState", "managerState", "liveTorqueParameters",
+      "accelerometer", "gyroscope", "carOutput", "gpsLocationExternal", "gpsLocation", "controlsState",
+      "carControl", "driverAssistance", "alertDebug", "audioFeedback",
    ],
    subs=["selfdriveState", "onroadEvents"],
    ignore=["logMonoTime"],
    config_callback=selfdrived_config_callback,
    init_callback=get_car_params_callback,
-    should_recv_callback=selfdrived_rcv_callback,
+    should_recv_callback=MessageBasedRcvCallback("carState", True),
    tolerance=NUMPY_TOLERANCE,
    processing_time=0.004,
  ),
@@ -496,6 +456,7 @@ CONFIGS = [
    tolerance=NUMPY_TOLERANCE,
    processing_time=0.004,
    main_pub="can",
+    main_pub_drained=True,
  ),
  ProcessConfig(
    proc_name="radard",
@@ -503,7 +464,7 @@ CONFIGS = [
    subs=["radarState"],
    ignore=["logMonoTime"],
    init_callback=get_car_params_callback,
-    should_recv_callback=FrequencyBasedRcvCallback("modelV2"),
+    should_recv_callback=MessageBasedRcvCallback("modelV2"),
  ),
  ProcessConfig(
    proc_name="plannerd",
@@ -511,7 +472,7 @@ CONFIGS = [
    subs=["longitudinalPlan", "driverAssistance"],
    ignore=["logMonoTime", "longitudinalPlan.processingDelay", "longitudinalPlan.solverExecutionTime"],
    init_callback=get_car_params_callback,
-    should_recv_callback=FrequencyBasedRcvCallback("modelV2"),
+    should_recv_callback=MessageBasedRcvCallback("modelV2"),
    tolerance=NUMPY_TOLERANCE,
  ),
  ProcessConfig(
@@ -520,14 +481,14 @@ CONFIGS = [
    subs=["liveCalibration"],
    ignore=["logMonoTime"],
    init_callback=get_car_params_callback,
-    should_recv_callback=calibration_rcv_callback,
+    should_recv_callback=MessageBasedRcvCallback("cameraOdometry", True),
  ),
  ProcessConfig(
    proc_name="dmonitoringd",
    pubs=["driverStateV2", "liveCalibration", "carState", "modelV2", "selfdriveState"],
    subs=["driverMonitoringState"],
    ignore=["logMonoTime"],
-    should_recv_callback=FrequencyBasedRcvCallback("driverStateV2"),
+    should_recv_callback=MessageBasedRcvCallback("driverStateV2"),
    tolerance=NUMPY_TOLERANCE,
  ),
  ProcessConfig(
@@ -539,7 +500,6 @@ CONFIGS = [
    ignore=["logMonoTime"],
    should_recv_callback=MessageBasedRcvCallback("cameraOdometry"),
    tolerance=NUMPY_TOLERANCE,
-    unlocked_pubs=["accelerometer", "gyroscope"],
  ),
  ProcessConfig(
    proc_name="paramsd",
@@ -547,7 +507,7 @@ CONFIGS = [
    subs=["liveParameters"],
    ignore=["logMonoTime"],
    init_callback=get_car_params_callback,
-    should_recv_callback=FrequencyBasedRcvCallback("livePose"),
+    should_recv_callback=MessageBasedRcvCallback("livePose"),
    tolerance=NUMPY_TOLERANCE,
    processing_time=0.004,
  ),
@@ -572,7 +532,7 @@ CONFIGS = [
    subs=["liveTorqueParameters"],
    ignore=["logMonoTime"],
    init_callback=get_car_params_callback,
-    should_recv_callback=torqued_rcv_callback,
+    should_recv_callback=MessageBasedRcvCallback("livePose", True),
    tolerance=NUMPY_TOLERANCE,
  ),
  ProcessConfig(
@@ -584,7 +544,6 @@ CONFIGS = [
    tolerance=NUMPY_TOLERANCE,
    processing_time=0.020,
    main_pub=vipc_get_endpoint_name("camerad", meta_from_camera_state("roadCameraState").stream),
-    main_pub_drained=False,
    vision_pubs=["roadCameraState", "wideRoadCameraState"],
    ignore_alive_pubs=["wideRoadCameraState"],
    init_callback=get_car_params_callback,
@@ -594,11 +553,10 @@ CONFIGS = [
    pubs=["liveCalibration", "driverCameraState"],
    subs=["driverStateV2"],
    ignore=["logMonoTime", "driverStateV2.modelExecutionTime", "driverStateV2.gpuExecutionTime"],
-    should_recv_callback=dmonitoringmodeld_rcv_callback,
+    should_recv_callback=MessageBasedRcvCallback("driverCameraState"),
    tolerance=NUMPY_TOLERANCE,
    processing_time=0.020,
    main_pub=vipc_get_endpoint_name("camerad", meta_from_camera_state("driverCameraState").stream),
-    main_pub_drained=False,
    vision_pubs=["driverCameraState"],
    ignore_alive_pubs=["driverCameraState"],
  ),
@@ -706,8 +664,8 @@ def _replay_multi_process(

  all_msgs = sorted(lr, key=lambda msg: msg.logMonoTime)
  log_msgs = []
+  containers = []
  try:
-    containers = []
    for cfg in cfgs:
      container = ProcessContainer(cfg)
      containers.append(container)
@@ -742,6 +700,11 @@ def _replay_multi_process(
            internal_pub_queue.append(m)
            heapq.heappush(internal_pub_index_heap, (m.logMonoTime, len(internal_pub_queue) - 1))
        log_msgs.extend(output_msgs)
+
+    # flush last set of messages from each process
+    for container in containers:
+      last_time = log_msgs[-1].logMonoTime if len(log_msgs) > 0 else int(time.monotonic() * 1e9)
+      log_msgs.extend(container.get_output_msgs(last_time))
  finally:
    for container in containers:
      container.stop()
@@ -1 +1 @@
-c289a0359d1b1f26cf4d9e73a2c04b2bbfec840f
+62b3e8590fe85f87494517b3177a0ccaad1e17e5
@@ -54,6 +54,7 @@ while true; do
  #  /data/ciui.py &
  #fi

+  awk '{print \$1}' /proc/uptime > /var/tmp/power_watchdog
  sleep 5s
 done

@@ -55,6 +55,7 @@ PROCS = {
  "selfdrive.locationd.paramsd": 9.0,
  "selfdrive.locationd.lagd": 11.0,
  "selfdrive.ui.soundd": 3.0,
+  "selfdrive.ui.feedback.feedbackd": 1.0,
  "selfdrive.monitoring.dmonitoringd": 4.0,
  "./proclogd": 2.0,
  "system.logmessaged": 1.0,
@@ -70,14 +70,8 @@ if GetOption('extras'):
  qt_src.remove("main.cc")  # replaced by test_runner
  qt_env.Program('tests/test_translations', [asset_obj, 'tests/test_runner.cc', 'tests/test_translations.cc'] + qt_src, LIBS=qt_libs)

-  qt_env.SharedLibrary("qt/python_helpers", ["qt/qt_window.cc"], LIBS=qt_libs)
-
-  # setup
-  qt_env.Program("qt/setup/setup", ["qt/setup/setup.cc", asset_obj],
-                 LIBS=qt_libs + ['curl', 'common'])
-
+  # build installers
  if arch != "Darwin":
-    # build installers
    raylib_env = env.Clone()
    raylib_env['LIBPATH'] += [f'#third_party/raylib/{arch}/']
    raylib_env['LINKFLAGS'].append('-Wl,-strip-debug')
@@ -109,7 +103,3 @@ if GetOption('extras'):
      f = raylib_env.Program(f"installer/installers/installer_{name}", [obj, cont, inter], LIBS=raylib_libs)
      # keep installers small
      assert f[0].get_size() < 1900*1e3, f[0].get_size()
-
-# build watch3
-if arch in ['x86_64', 'aarch64', 'Darwin'] or GetOption('extras'):
-  qt_env.Program("watch3", ["watch3.cc"], LIBS=qt_libs + ['common', 'msgq', 'visionipc'])
@@ -0,0 +1,70 @@
+#!/usr/bin/env python3
+import cereal.messaging as messaging
+from openpilot.common.params import Params
+from openpilot.common.swaglog import cloudlog
+from cereal import car
+from openpilot.system.micd import SAMPLE_RATE, SAMPLE_BUFFER
+
+FEEDBACK_MAX_DURATION = 10.0
+ButtonType = car.CarState.ButtonEvent.Type
+
+
+def main():
+  params = Params()
+  pm = messaging.PubMaster(['userBookmark', 'audioFeedback'])
+  sm = messaging.SubMaster(['rawAudioData', 'bookmarkButton', 'carState'])
+  should_record_audio = False
+  block_num = 0
+  waiting_for_release = False
+  early_stop_triggered = False
+
+  while True:
+    sm.update()
+    should_send_bookmark = False
+
+    if sm.updated['carState'] and sm['carState'].canValid:
+      for be in sm['carState'].buttonEvents:
+        if be.type == ButtonType.lkas:
+          if be.pressed:
+            if not should_record_audio:
+              if params.get_bool("RecordAudioFeedback"):  # Start recording on first press if toggle set
+                should_record_audio = True
+                block_num = 0
+                waiting_for_release = False
+                early_stop_triggered = False
+                cloudlog.info("LKAS button pressed - starting 10-second audio feedback")
+              else:
+                should_send_bookmark = True  # immediately send bookmark if toggle false
+                cloudlog.info("LKAS button pressed - bookmarking")
+            elif should_record_audio and not waiting_for_release:  # Wait for release of second press to stop recording early
+              waiting_for_release = True
+          elif waiting_for_release:  # Second press released
+            waiting_for_release = False
+            early_stop_triggered = True
+            cloudlog.info("LKAS button released - ending recording early")
+
+    if should_record_audio and sm.updated['rawAudioData']:
+      raw_audio = sm['rawAudioData']
+      msg = messaging.new_message('audioFeedback', valid=True)
+      msg.audioFeedback.audio.data = raw_audio.data
+      msg.audioFeedback.audio.sampleRate = raw_audio.sampleRate
+      msg.audioFeedback.blockNum = block_num
+      block_num += 1
+      if (block_num * SAMPLE_BUFFER / SAMPLE_RATE) >= FEEDBACK_MAX_DURATION or early_stop_triggered:  # Check for timeout or early stop
+        should_send_bookmark = True  # send bookmark at end of audio segment
+        should_record_audio = False
+        early_stop_triggered = False
+        cloudlog.info("10-second recording completed or second button press - stopping audio feedback")
+      pm.send('audioFeedback', msg)
+
+    if sm.updated['bookmarkButton']:
+      cloudlog.info("Bookmark button pressed!")
+      should_send_bookmark = True
+
+    if should_send_bookmark:
+      msg = messaging.new_message('userBookmark', valid=True)
+      pm.send('userBookmark', msg)
+
+
+if __name__ == '__main__':
+  main()
@@ -19,7 +19,7 @@ class MainLayout(Widget):
  def __init__(self):
    super().__init__()

-    self._pm = messaging.PubMaster(['userFlag'])
+    self._pm = messaging.PubMaster(['bookmarkButton'])

    self._sidebar = Sidebar()
    self._current_mode = MainState.HOME
@@ -40,7 +40,7 @@ class MainLayout(Widget):

  def _setup_callbacks(self):
    self._sidebar.set_callbacks(on_settings=self._on_settings_clicked,
-                                on_flag=self._on_flag_clicked)
+                                on_flag=self._on_bookmark_clicked)
    self._layouts[MainState.HOME]._setup_widget.set_open_settings_callback(lambda: self.open_settings(PanelType.FIREHOSE))
    self._layouts[MainState.SETTINGS].set_callbacks(on_close=self._set_mode_for_state)
    self._layouts[MainState.ONROAD].set_callbacks(on_click=self._on_onroad_clicked)
@@ -76,10 +76,10 @@ class MainLayout(Widget):
  def _on_settings_clicked(self):
    self.open_settings(PanelType.DEVICE)

-  def _on_flag_clicked(self):
-    user_flag = messaging.new_message('userFlag')
-    user_flag.valid = True
-    self._pm.send('userFlag', user_flag)
+  def _on_bookmark_clicked(self):
+    user_bookmark = messaging.new_message('bookmarkButton')
+    user_bookmark.valid = True
+    self._pm.send('bookmarkButton', user_bookmark)

  def _on_onroad_clicked(self):
    self._sidebar.set_visible(not self._sidebar.is_visible)
@@ -23,6 +23,10 @@ DESCRIPTIONS = {
  'RecordFront': "Upload data from the driver facing camera and help improve the driver monitoring algorithm.",
  "IsMetric": "Display speed in km/h instead of mph.",
  "RecordAudio": "Record and store microphone audio while driving. The audio will be included in the dashcam video in comma connect.",
+  "RecordAudioFeedback": (
+    "Press the LKAS button to record audio feedback about openpilot. When this toggle is disabled, the button acts as a bookmark button. " +
+    "The event will be highlighted in comma connect and the segment will be preserved on your device's storage."
+  ),
 }


@@ -81,6 +85,12 @@ class TogglesLayout(Widget):
        self._params.get_bool("RecordAudio"),
        icon="microphone.png",
      ),
+      toggle_item(
+        "Record Audio Feedback with LKAS button",
+        DESCRIPTIONS["RecordAudioFeedback"],
+        self._params.get_bool("RecordAudioFeedback"),
+        icon="microphone.png",
+      ),
      toggle_item(
        "Use Metric System", DESCRIPTIONS["IsMetric"], self._params.get_bool("IsMetric"), icon="metric.png"
      ),
@@ -146,7 +146,7 @@ class Sidebar(Widget):

  def _draw_buttons(self, rect: rl.Rectangle):
    mouse_pos = rl.get_mouse_position()
-    mouse_down = self._is_pressed and rl.is_mouse_button_down(rl.MouseButton.MOUSE_BUTTON_LEFT)
+    mouse_down = self.is_pressed and rl.is_mouse_button_down(rl.MouseButton.MOUSE_BUTTON_LEFT)

    # Settings button
    settings_down = mouse_down and rl.check_collision_point_rec(mouse_pos, SETTINGS_BTN)
@@ -141,6 +141,9 @@ class CameraView(Widget):

    self.client = None

+  def __del__(self):
+    self.close()
+
  def _calc_frame_matrix(self, rect: rl.Rectangle) -> np.ndarray:
    if not self.frame:
      return np.eye(3)
@@ -337,16 +340,7 @@ class CameraView(Widget):


 if __name__ == "__main__":
-  gui_app.init_window("watch3")
-  road_camera_view = CameraView("camerad", VisionStreamType.VISION_STREAM_ROAD)
-  driver_camera_view = CameraView("camerad", VisionStreamType.VISION_STREAM_DRIVER)
-  wide_road_camera_view = CameraView("camerad", VisionStreamType.VISION_STREAM_WIDE_ROAD)
-  try:
-    for _ in gui_app.render():
-      road_camera_view.render(rl.Rectangle(gui_app.width // 4, 0, gui_app.width // 2, gui_app.height // 2))
-      driver_camera_view.render(rl.Rectangle(0, gui_app.height // 2, gui_app.width // 2, gui_app.height // 2))
-      wide_road_camera_view.render(rl.Rectangle(gui_app.width // 2, gui_app.height // 2, gui_app.width // 2, gui_app.height // 2))
-  finally:
-    road_camera_view.close()
-    driver_camera_view.close()
-    wide_road_camera_view.close()
+  gui_app.init_window("camera view")
+  road = CameraView("camerad", VisionStreamType.VISION_STREAM_ROAD)
+  for _ in gui_app.render():
+    road.render(rl.Rectangle(0, 0, gui_app.width, gui_app.height))
@@ -50,7 +50,7 @@ class ExpButton(Widget):
    center_y = int(self._rect.y + self._rect.height // 2)

    mouse_over = rl.check_collision_point_rec(rl.get_mouse_position(), self._rect)
-    mouse_down = rl.is_mouse_button_down(rl.MouseButton.MOUSE_BUTTON_LEFT) and self._is_pressed
+    mouse_down = rl.is_mouse_button_down(rl.MouseButton.MOUSE_BUTTON_LEFT) and self.is_pressed
    self._white_color.a = 180 if (mouse_down and mouse_over) or not self._engageable else 255

    texture = self._txt_exp if self._held_or_actual_mode() else self._txt_wheel
@@ -1,6 +1,6 @@
 import pyray as rl
 from dataclasses import dataclass
-from openpilot.common.conversions import Conversions as CV
+from openpilot.common.constants import CV
 from openpilot.selfdrive.ui.onroad.exp_button import ExpButton
 from openpilot.selfdrive.ui.ui_state import ui_state, UIStatus
 from openpilot.system.ui.lib.application import gui_app, FontWeight
@@ -75,6 +75,13 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) {
      "../assets/icons/microphone.png",
      true,
    },
+    {
+      "RecordAudioFeedback",
+      tr("Record Audio Feedback with LKAS button"),
+      tr("Press the LKAS button to record and share driving feedback with the openpilot team. When this toggle is disabled, the button acts as a bookmark button. The event will be highlighted in comma connect and the segment will be preserved on your device's storage.\n\nNote that this feature is only compatible with select cars."),
+      "../assets/icons/microphone.png",
+      false,
+    },
    {
      "IsMetric",
      tr("Use Metric System"),
@@ -1,23 +0,0 @@
-import os
-import platform
-from cffi import FFI
-
-import sip
-
-from openpilot.common.basedir import BASEDIR
-
-def suffix():
-  return ".dylib" if platform.system() == "Darwin" else ".so"
-
-
-def get_ffi():
-  lib = os.path.join(BASEDIR, "selfdrive", "ui", "qt", "libpython_helpers" + suffix())
-
-  ffi = FFI()
-  ffi.cdef("void set_main_window(void *w);")
-  return ffi, ffi.dlopen(lib)
-
-
-def set_main_window(widget):
-  ffi, lib = get_ffi()
-  lib.set_main_window(ffi.cast('void*', sip.unwrapinstance(widget)))
@@ -1,541 +0,0 @@
-#include "selfdrive/ui/qt/setup/setup.h"
-
-#include <cstdio>
-#include <cstdlib>
-#include <sstream>
-#include <string>
-
-#include <QApplication>
-#include <QLabel>
-#include <QVBoxLayout>
-
-#include <curl/curl.h>
-
-#include "common/util.h"
-#include "system/hardware/hw.h"
-#include "selfdrive/ui/qt/api.h"
-#include "selfdrive/ui/qt/qt_window.h"
-#include "selfdrive/ui/qt/network/networking.h"
-#include "selfdrive/ui/qt/util.h"
-#include "selfdrive/ui/qt/widgets/input.h"
-
-const std::string USER_AGENT = "AGNOSSetup-";
-const QString OPENPILOT_URL = "https://openpilot.comma.ai";
-
-bool is_elf(char *fname) {
-  FILE *fp = fopen(fname, "rb");
-  if (fp == NULL) {
-    return false;
-  }
-  char buf[4];
-  size_t n = fread(buf, 1, 4, fp);
-  fclose(fp);
-  return n == 4 && buf[0] == 0x7f && buf[1] == 'E' && buf[2] == 'L' && buf[3] == 'F';
-}
-
-void Setup::download(QString url) {
-  // autocomplete incomplete urls
-  if (QRegularExpression("^([^/.]+)/([^/]+)$").match(url).hasMatch()) {
-    url.prepend("https://installer.comma.ai/");
-  }
-
-  CURL *curl = curl_easy_init();
-  if (!curl) {
-    emit finished(url, tr("Something went wrong. Reboot the device."));
-    return;
-  }
-
-  auto version = util::read_file("/VERSION");
-
-  struct curl_slist *list = NULL;
-  std::string header = "X-openpilot-serial: " + Hardware::get_serial();
-  list = curl_slist_append(list, header.c_str());
-
-  char tmpfile[] = "/tmp/installer_XXXXXX";
-  FILE *fp = fdopen(mkstemp(tmpfile), "wb");
-
-  curl_easy_setopt(curl, CURLOPT_URL, url.toStdString().c_str());
-  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, NULL);
-  curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp);
-  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
-  curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
-  curl_easy_setopt(curl, CURLOPT_USERAGENT, (USER_AGENT + version).c_str());
-  curl_easy_setopt(curl, CURLOPT_HTTPHEADER, list);
-  curl_easy_setopt(curl, CURLOPT_TIMEOUT, 30L);
-
-  int ret = curl_easy_perform(curl);
-  long res_status = 0;
-  curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &res_status);
-
-  if (ret != CURLE_OK || res_status != 200) {
-    emit finished(url, tr("Ensure the entered URL is valid, and the device’s internet connection is good."));
-  } else if (!is_elf(tmpfile)) {
-    emit finished(url, tr("No custom software found at this URL."));
-  } else {
-    rename(tmpfile, "/tmp/installer");
-
-    FILE *fp_url = fopen("/tmp/installer_url", "w");
-    fprintf(fp_url, "%s", url.toStdString().c_str());
-    fclose(fp_url);
-
-    emit finished(url);
-  }
-
-  curl_slist_free_all(list);
-  curl_easy_cleanup(curl);
-  fclose(fp);
-}
-
-QWidget * Setup::low_voltage() {
-  QWidget *widget = new QWidget();
-  QVBoxLayout *main_layout = new QVBoxLayout(widget);
-  main_layout->setContentsMargins(55, 0, 55, 55);
-  main_layout->setSpacing(0);
-
-  // inner text layout: warning icon, title, and body
-  QVBoxLayout *inner_layout = new QVBoxLayout();
-  inner_layout->setContentsMargins(110, 144, 365, 0);
-  main_layout->addLayout(inner_layout);
-
-  QLabel *triangle = new QLabel();
-  triangle->setPixmap(QPixmap(ASSET_PATH + "icons/warning.png"));
-  inner_layout->addWidget(triangle, 0, Qt::AlignTop | Qt::AlignLeft);
-  inner_layout->addSpacing(80);
-
-  QLabel *title = new QLabel(tr("WARNING: Low Voltage"));
-  title->setStyleSheet("font-size: 90px; font-weight: 500; color: #FF594F;");
-  inner_layout->addWidget(title, 0, Qt::AlignTop | Qt::AlignLeft);
-
-  inner_layout->addSpacing(25);
-
-  QLabel *body = new QLabel(tr("Power your device in a car with a harness or proceed at your own risk."));
-  body->setWordWrap(true);
-  body->setAlignment(Qt::AlignTop | Qt::AlignLeft);
-  body->setStyleSheet("font-size: 80px; font-weight: 300;");
-  inner_layout->addWidget(body);
-
-  inner_layout->addStretch();
-
-  // power off + continue buttons
-  QHBoxLayout *blayout = new QHBoxLayout();
-  blayout->setSpacing(50);
-  main_layout->addLayout(blayout, 0);
-
-  QPushButton *poweroff = new QPushButton(tr("Power off"));
-  poweroff->setObjectName("navBtn");
-  blayout->addWidget(poweroff);
-  QObject::connect(poweroff, &QPushButton::clicked, this, [=]() {
-    Hardware::poweroff();
-  });
-
-  QPushButton *cont = new QPushButton(tr("Continue"));
-  cont->setObjectName("navBtn");
-  blayout->addWidget(cont);
-  QObject::connect(cont, &QPushButton::clicked, this, &Setup::nextPage);
-
-  return widget;
-}
-
-QWidget * Setup::custom_software_warning() {
-  QWidget *widget = new QWidget();
-  QVBoxLayout *main_layout = new QVBoxLayout(widget);
-  main_layout->setContentsMargins(55, 0, 55, 55);
-  main_layout->setSpacing(0);
-
-  QVBoxLayout *inner_layout = new QVBoxLayout();
-  inner_layout->setContentsMargins(110, 110, 300, 0);
-  main_layout->addLayout(inner_layout);
-
-  QLabel *title = new QLabel(tr("WARNING: Custom Software"));
-  title->setStyleSheet("font-size: 90px; font-weight: 500; color: #FF594F;");
-  inner_layout->addWidget(title, 0, Qt::AlignTop | Qt::AlignLeft);
-
-  inner_layout->addSpacing(25);
-
-  QLabel *body = new QLabel(tr("Use caution when installing third-party software. Third-party software has not been tested by comma, and may cause damage to your device and/or vehicle.\n\nIf you'd like to proceed, use https://flash.comma.ai to restore your device to a factory state later."));
-  body->setWordWrap(true);
-  body->setAlignment(Qt::AlignTop | Qt::AlignLeft);
-  body->setStyleSheet("font-size: 65px; font-weight: 300;");
-  inner_layout->addWidget(body);
-
-  inner_layout->addStretch();
-
-  QHBoxLayout *blayout = new QHBoxLayout();
-  blayout->setSpacing(50);
-  main_layout->addLayout(blayout, 0);
-
-  QPushButton *back = new QPushButton(tr("Back"));
-  back->setObjectName("navBtn");
-  blayout->addWidget(back);
-  QObject::connect(back, &QPushButton::clicked, this, &Setup::prevPage);
-
-  QPushButton *cont = new QPushButton(tr("Continue"));
-  cont->setObjectName("navBtn");
-  blayout->addWidget(cont);
-  QObject::connect(cont, &QPushButton::clicked, this, [=]() {
-    QTimer::singleShot(0, [=]() {
-      setCurrentWidget(downloading_widget);
-    });
-    QString url = InputDialog::getText(tr("Enter URL"), this, tr("for Custom Software"));
-    if (!url.isEmpty()) {
-      QTimer::singleShot(1000, this, [=]() {
-        download(url);
-      });
-    } else {
-      setCurrentWidget(software_selection_widget);
-    }
-  });
-
-  return widget;
-}
-
-QWidget * Setup::getting_started() {
-  QWidget *widget = new QWidget();
-
-  QHBoxLayout *main_layout = new QHBoxLayout(widget);
-  main_layout->setMargin(0);
-
-  QVBoxLayout *vlayout = new QVBoxLayout();
-  vlayout->setContentsMargins(165, 280, 100, 0);
-  main_layout->addLayout(vlayout);
-
-  QLabel *title = new QLabel(tr("Getting Started"));
-  title->setStyleSheet("font-size: 90px; font-weight: 500;");
-  vlayout->addWidget(title, 0, Qt::AlignTop | Qt::AlignLeft);
-
-  vlayout->addSpacing(90);
-  QLabel *desc = new QLabel(tr("Before we get on the road, let’s finish installation and cover some details."));
-  desc->setWordWrap(true);
-  desc->setStyleSheet("font-size: 80px; font-weight: 300;");
-  vlayout->addWidget(desc, 0, Qt::AlignTop | Qt::AlignLeft);
-
-  vlayout->addStretch();
-
-  QPushButton *btn = new QPushButton();
-  btn->setIcon(QIcon(":/images/button_continue_triangle.svg"));
-  btn->setIconSize(QSize(54, 106));
-  btn->setFixedSize(310, 1080);
-  btn->setProperty("primary", true);
-  btn->setStyleSheet("border: none;");
-  main_layout->addWidget(btn, 0, Qt::AlignRight);
-  QObject::connect(btn, &QPushButton::clicked, this, &Setup::nextPage);
-
-  return widget;
-}
-
-QWidget * Setup::network_setup() {
-  QWidget *widget = new QWidget();
-  QVBoxLayout *main_layout = new QVBoxLayout(widget);
-  main_layout->setContentsMargins(55, 50, 55, 50);
-
-  // title
-  QLabel *title = new QLabel(tr("Connect to Wi-Fi"));
-  title->setStyleSheet("font-size: 90px; font-weight: 500;");
-  main_layout->addWidget(title, 0, Qt::AlignLeft | Qt::AlignTop);
-
-  main_layout->addSpacing(25);
-
-  // wifi widget
-  Networking *networking = new Networking(this, false);
-  networking->setStyleSheet("Networking {background-color: #292929; border-radius: 13px;}");
-  main_layout->addWidget(networking, 1);
-
-  main_layout->addSpacing(35);
-
-  // back + continue buttons
-  QHBoxLayout *blayout = new QHBoxLayout;
-  main_layout->addLayout(blayout);
-  blayout->setSpacing(50);
-
-  QPushButton *back = new QPushButton(tr("Back"));
-  back->setObjectName("navBtn");
-  QObject::connect(back, &QPushButton::clicked, this, &Setup::prevPage);
-  blayout->addWidget(back);
-
-  QPushButton *cont = new QPushButton();
-  cont->setObjectName("navBtn");
-  cont->setProperty("primary", true);
-  cont->setEnabled(false);
-  QObject::connect(cont, &QPushButton::clicked, this, &Setup::nextPage);
-  blayout->addWidget(cont);
-
-  // setup timer for testing internet connection
-  HttpRequest *request = new HttpRequest(this, false, 2500);
-  QObject::connect(request, &HttpRequest::requestDone, [=](const QString &, bool success) {
-    cont->setEnabled(success);
-    if (success) {
-      const bool wifi = networking->wifi->currentNetworkType() == NetworkType::WIFI;
-      cont->setText(wifi ? tr("Continue") : tr("Continue without Wi-Fi"));
-    } else {
-      cont->setText(tr("Waiting for internet"));
-    }
-    repaint();
-  });
-  request->sendRequest(OPENPILOT_URL);
-  QTimer *timer = new QTimer(this);
-  QObject::connect(timer, &QTimer::timeout, [=]() {
-    if (!request->active() && cont->isVisible()) {
-      request->sendRequest(OPENPILOT_URL);
-    }
-  });
-  timer->start(1000);
-
-  return widget;
-}
-
-QWidget * radio_button(QString title, QButtonGroup *group) {
-  QPushButton *btn = new QPushButton(title);
-  btn->setCheckable(true);
-  group->addButton(btn);
-  btn->setStyleSheet(R"(
-    QPushButton {
-      height: 230;
-      padding-left: 100px;
-      padding-right: 100px;
-      text-align: left;
-      font-size: 80px;
-      font-weight: 400;
-      border-radius: 10px;
-      background-color: #4F4F4F;
-    }
-    QPushButton:checked {
-      background-color: #465BEA;
-    }
-  )");
-
-  // checkmark icon
-  QPixmap pix(":/icons/circled_check.svg");
-  btn->setIcon(pix);
-  btn->setIconSize(QSize(0, 0));
-  btn->setLayoutDirection(Qt::RightToLeft);
-  QObject::connect(btn, &QPushButton::toggled, [=](bool checked) {
-    btn->setIconSize(checked ? QSize(104, 104) : QSize(0, 0));
-  });
-  return btn;
-}
-
-QWidget * Setup::software_selection() {
-  QWidget *widget = new QWidget();
-  QVBoxLayout *main_layout = new QVBoxLayout(widget);
-  main_layout->setContentsMargins(55, 50, 55, 50);
-  main_layout->setSpacing(0);
-
-  // title
-  QLabel *title = new QLabel(tr("Choose Software to Install"));
-  title->setStyleSheet("font-size: 90px; font-weight: 500;");
-  main_layout->addWidget(title, 0, Qt::AlignLeft | Qt::AlignTop);
-
-  main_layout->addSpacing(50);
-
-  // sunnypilot + custom radio buttons
-  QButtonGroup *group = new QButtonGroup(widget);
-  group->setExclusive(true);
-
-  QWidget *openpilot = radio_button(tr("sunnypilot"), group);
-  main_layout->addWidget(openpilot);
-
-  main_layout->addSpacing(30);
-
-  QWidget *custom = radio_button(tr("Custom Software"), group);
-  main_layout->addWidget(custom);
-
-  main_layout->addStretch();
-
-  // back + continue buttons
-  QHBoxLayout *blayout = new QHBoxLayout;
-  main_layout->addLayout(blayout);
-  blayout->setSpacing(50);
-
-  QPushButton *back = new QPushButton(tr("Back"));
-  back->setObjectName("navBtn");
-  QObject::connect(back, &QPushButton::clicked, this, &Setup::prevPage);
-  blayout->addWidget(back);
-
-  QPushButton *cont = new QPushButton(tr("Continue"));
-  cont->setObjectName("navBtn");
-  cont->setEnabled(false);
-  cont->setProperty("primary", true);
-  blayout->addWidget(cont);
-
-  QObject::connect(cont, &QPushButton::clicked, [=]() {
-    if (group->checkedButton() != openpilot) {
-      QTimer::singleShot(0, [=]() {
-        setCurrentWidget(custom_software_warning_widget);
-      });
-    } else {
-      QTimer::singleShot(0, [=]() {
-        setCurrentWidget(downloading_widget);
-      });
-      QTimer::singleShot(1000, this, [=]() {
-        download(OPENPILOT_URL);
-      });
-    }
-  });
-
-  connect(group, QOverload<QAbstractButton *>::of(&QButtonGroup::buttonClicked), [=](QAbstractButton *btn) {
-    btn->setChecked(true);
-    cont->setEnabled(true);
-  });
-
-  return widget;
-}
-
-QWidget * Setup::downloading() {
-  QWidget *widget = new QWidget();
-  QVBoxLayout *main_layout = new QVBoxLayout(widget);
-  QLabel *txt = new QLabel(tr("Downloading..."));
-  txt->setStyleSheet("font-size: 90px; font-weight: 500;");
-  main_layout->addWidget(txt, 0, Qt::AlignCenter);
-  return widget;
-}
-
-QWidget * Setup::download_failed(QLabel *url, QLabel *body) {
-  QWidget *widget = new QWidget();
-  QVBoxLayout *main_layout = new QVBoxLayout(widget);
-  main_layout->setContentsMargins(55, 185, 55, 55);
-  main_layout->setSpacing(0);
-
-  QLabel *title = new QLabel(tr("Download Failed"));
-  title->setStyleSheet("font-size: 90px; font-weight: 500;");
-  main_layout->addWidget(title, 0, Qt::AlignTop | Qt::AlignLeft);
-
-  main_layout->addSpacing(67);
-
-  url->setWordWrap(true);
-  url->setAlignment(Qt::AlignTop | Qt::AlignLeft);
-  url->setStyleSheet("font-family: \"JetBrains Mono\"; font-size: 64px; font-weight: 400; margin-right: 100px;");
-  main_layout->addWidget(url);
-
-  main_layout->addSpacing(48);
-
-  body->setWordWrap(true);
-  body->setAlignment(Qt::AlignTop | Qt::AlignLeft);
-  body->setStyleSheet("font-size: 80px; font-weight: 300; margin-right: 100px;");
-  main_layout->addWidget(body);
-
-  main_layout->addStretch();
-
-  // reboot + start over buttons
-  QHBoxLayout *blayout = new QHBoxLayout();
-  blayout->setSpacing(50);
-  main_layout->addLayout(blayout, 0);
-
-  QPushButton *reboot = new QPushButton(tr("Reboot device"));
-  reboot->setObjectName("navBtn");
-  blayout->addWidget(reboot);
-  QObject::connect(reboot, &QPushButton::clicked, this, [=]() {
-    Hardware::reboot();
-  });
-
-  QPushButton *restart = new QPushButton(tr("Start over"));
-  restart->setObjectName("navBtn");
-  restart->setProperty("primary", true);
-  blayout->addWidget(restart);
-  QObject::connect(restart, &QPushButton::clicked, this, [=]() {
-    setCurrentIndex(1);
-  });
-
-  widget->setStyleSheet(R"(
-    QLabel {
-      margin-left: 117;
-    }
-  )");
-  return widget;
-}
-
-void Setup::prevPage() {
-  setCurrentIndex(currentIndex() - 1);
-}
-
-void Setup::nextPage() {
-  setCurrentIndex(currentIndex() + 1);
-}
-
-Setup::Setup(QWidget *parent) : QStackedWidget(parent) {
-  if (std::getenv("MULTILANG")) {
-    selectLanguage();
-  }
-
-  std::stringstream buffer;
-  buffer << std::ifstream("/sys/class/hwmon/hwmon1/in1_input").rdbuf();
-  float voltage = (float)std::atoi(buffer.str().c_str()) / 1000.;
-  if (voltage < 7) {
-    addWidget(low_voltage());
-  }
-
-  addWidget(getting_started());
-  addWidget(network_setup());
-  software_selection_widget = software_selection();
-  addWidget(software_selection_widget);
-  custom_software_warning_widget = custom_software_warning();
-  addWidget(custom_software_warning_widget);
-  downloading_widget = downloading();
-  addWidget(downloading_widget);
-
-  QLabel *url_label = new QLabel();
-  QLabel *body_label = new QLabel();
-  failed_widget = download_failed(url_label, body_label);
-  addWidget(failed_widget);
-
-  QObject::connect(this, &Setup::finished, [=](const QString &url, const QString &error) {
-    qDebug() << "finished" << url << error;
-    if (error.isEmpty()) {
-      // hide setup on success
-      QTimer::singleShot(3000, this, &QWidget::hide);
-    } else {
-      url_label->setText(url);
-      body_label->setText(error);
-      setCurrentWidget(failed_widget);
-    }
-  });
-
-  // TODO: revisit pressed bg color
-  setStyleSheet(R"(
-    * {
-      color: white;
-      font-family: Inter;
-    }
-    Setup {
-      background-color: black;
-    }
-    QPushButton#navBtn {
-      height: 160;
-      font-size: 55px;
-      font-weight: 400;
-      border-radius: 10px;
-      background-color: #333333;
-    }
-    QPushButton#navBtn:disabled, QPushButton[primary='true']:disabled {
-      color: #808080;
-      background-color: #333333;
-    }
-    QPushButton#navBtn:pressed {
-      background-color: #444444;
-    }
-    QPushButton[primary='true'], #navBtn[primary='true'] {
-      background-color: #465BEA;
-    }
-    QPushButton[primary='true']:pressed, #navBtn:pressed[primary='true'] {
-      background-color: #3049F4;
-    }
-  )");
-}
-
-void Setup::selectLanguage() {
-  QMap<QString, QString> langs = getSupportedLanguages();
-  QString selection = MultiOptionDialog::getSelection(tr("Select a language"), langs.keys(), "", this);
-  if (!selection.isEmpty()) {
-    QString selectedLang = langs[selection];
-    Params().put("LanguageSetting", selectedLang.toStdString());
-    if (translator.load(":/" + selectedLang)) {
-      qApp->installTranslator(&translator);
-    }
-  }
-}
-
-int main(int argc, char *argv[]) {
-  QApplication a(argc, argv);
-  Setup setup;
-  setMainWindow(&setup);
-  return a.exec();
-}
@@ -1,38 +0,0 @@
-#pragma once
-
-#include <QLabel>
-#include <QStackedWidget>
-#include <QString>
-#include <QTranslator>
-#include <QWidget>
-
-class Setup : public QStackedWidget {
-  Q_OBJECT
-
-public:
-  explicit Setup(QWidget *parent = 0);
-
-private:
-  void selectLanguage();
-  QWidget *low_voltage();
-  QWidget *custom_software_warning();
-  QWidget *getting_started();
-  QWidget *network_setup();
-  QWidget *software_selection();
-  QWidget *downloading();
-  QWidget *download_failed(QLabel *url, QLabel *body);
-
-  QWidget *failed_widget;
-  QWidget *downloading_widget;
-  QWidget *custom_software_warning_widget;
-  QWidget *software_selection_widget;
-  QTranslator translator;
-
-signals:
-  void finished(const QString &url, const QString &error = "");
-
-public slots:
-  void nextPage();
-  void prevPage();
-  void download(QString url);
-};
@@ -38,7 +38,7 @@ Sidebar::Sidebar(QWidget *parent) : QFrame(parent), onroad(false), flag_pressed(

  QObject::connect(uiState(), &UIState::uiUpdate, this, &Sidebar::updateState);

-  pm = std::make_unique<PubMaster>(std::vector<const char*>{"userFlag"});
+  pm = std::make_unique<PubMaster>(std::vector<const char*>{"bookmarkButton"});
 }

 void Sidebar::mousePressEvent(QMouseEvent *event) {
@@ -61,8 +61,8 @@ void Sidebar::mouseReleaseEvent(QMouseEvent *event) {
  }
  if (onroad && home_btn.contains(event->pos())) {
    MessageBuilder msg;
-    msg.initEvent().initUserFlag();
-    pm->send("userFlag", msg);
+    msg.initEvent().initBookmarkButton();
+    pm->send("bookmarkButton", msg);
  } else if (settings_btn.contains(event->pos())) {
    emit openSettings();
  } else if (recording_audio && mic_indicator_btn.contains(event->pos())) {
@@ -0,0 +1,52 @@
+import pytest
+import cereal.messaging as messaging
+from cereal import car
+from openpilot.common.params import Params
+from openpilot.system.manager.process_config import managed_processes
+
+
+class TestFeedbackd:
+  def setup_method(self):
+    self.pm = messaging.PubMaster(['carState', 'rawAudioData'])
+    self.sm = messaging.SubMaster(['audioFeedback'])
+
+  def _send_lkas_button(self, pressed: bool):
+    msg = messaging.new_message('carState')
+    msg.carState.canValid = True
+    msg.carState.buttonEvents = [{'type': car.CarState.ButtonEvent.Type.lkas, 'pressed': pressed}]
+    self.pm.send('carState', msg)
+
+  def _send_audio_data(self, count: int = 5):
+    for _ in range(count):
+      audio_msg = messaging.new_message('rawAudioData')
+      audio_msg.rawAudioData.data = bytes(1600)  # 800 samples of int16
+      audio_msg.rawAudioData.sampleRate = 16000
+      self.pm.send('rawAudioData', audio_msg)
+      self.sm.update(timeout=100)
+
+  @pytest.mark.parametrize("record_feedback", [False, True])
+  def test_audio_feedback(self, record_feedback):
+    Params().put_bool("RecordAudioFeedback", record_feedback)
+
+    managed_processes["feedbackd"].start()
+    assert self.pm.wait_for_readers_to_update('carState', timeout=5)
+    assert self.pm.wait_for_readers_to_update('rawAudioData', timeout=5)
+
+    self._send_lkas_button(pressed=True)
+    self._send_audio_data()
+    self._send_lkas_button(pressed=False)
+    self._send_audio_data()
+
+    if record_feedback:
+      assert self.sm.updated['audioFeedback'], "audioFeedback should be published when enabled"
+    else:
+      assert not self.sm.updated['audioFeedback'], "audioFeedback should not be published when disabled"
+
+    self._send_lkas_button(pressed=True)
+    self._send_audio_data()
+    self._send_lkas_button(pressed=False)
+    self._send_audio_data()
+
+    assert not self.sm.updated['audioFeedback'], "audioFeedback should not be published after second press"
+
+    managed_processes["feedbackd"].stop()
@@ -0,0 +1,8 @@
+import time
+from openpilot.selfdrive.test.helpers import with_processes
+
+
+@with_processes(["raylib_ui"])
+def test_raylib_ui():
+  """Test initialization of the UI widgets is successful."""
+  time.sleep(1)
@@ -507,7 +507,7 @@ Firehose Mode allows you to maximize your training data uploads to improve openp
        <translation type="unfinished">تأخير التحديث</translation>
    </message>
    <message>
-        <source>openpilot has detected excessive %1 actuation. This may be due to a software bug. Please contact support at https://comma.ai/support.</source>
+        <source>openpilot detected excessive %1 actuation on your last drive. Please contact support at https://comma.ai/support and share your device&apos;s Dongle ID for troubleshooting.</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
@@ -1157,6 +1157,16 @@ If you&apos;d like to proceed, use https://flash.comma.ai to restore your device
        <source>Record and store microphone audio while driving. The audio will be included in the dashcam video in comma connect.</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Record Audio Feedback with LKAS button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press the LKAS button to record and share driving feedback with the openpilot team. When this toggle is disabled, the button acts as a bookmark button. The event will be highlighted in comma connect and the segment will be preserved on your device&apos;s storage.
+
+Note that this feature is only compatible with select cars.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>WiFiPromptWidget</name>
@@ -499,7 +499,7 @@ Der Firehose-Modus ermöglicht es dir, deine Trainingsdaten-Uploads zu maximiere
        <translation type="unfinished">Update pausieren</translation>
    </message>
    <message>
-        <source>openpilot has detected excessive %1 actuation. This may be due to a software bug. Please contact support at https://comma.ai/support.</source>
+        <source>openpilot detected excessive %1 actuation on your last drive. Please contact support at https://comma.ai/support and share your device&apos;s Dongle ID for troubleshooting.</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
@@ -1139,6 +1139,16 @@ If you&apos;d like to proceed, use https://flash.comma.ai to restore your device
        <source>Record and store microphone audio while driving. The audio will be included in the dashcam video in comma connect.</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Record Audio Feedback with LKAS button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press the LKAS button to record and share driving feedback with the openpilot team. When this toggle is disabled, the button acts as a bookmark button. The event will be highlighted in comma connect and the segment will be preserved on your device&apos;s storage.
+
+Note that this feature is only compatible with select cars.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>WiFiPromptWidget</name>
@@ -503,7 +503,7 @@ El Modo Firehose te permite maximizar las subidas de datos de entrenamiento para
        <translation type="unfinished">Posponer Actualización</translation>
    </message>
    <message>
-        <source>openpilot has detected excessive %1 actuation. This may be due to a software bug. Please contact support at https://comma.ai/support.</source>
+        <source>openpilot detected excessive %1 actuation on your last drive. Please contact support at https://comma.ai/support and share your device&apos;s Dongle ID for troubleshooting.</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
@@ -1143,6 +1143,16 @@ Si desea continuar, utilice https://flash.comma.ai para restaurar su dispositivo
        <source>Record and store microphone audio while driving. The audio will be included in the dashcam video in comma connect.</source>
        <translation>Graba y almacena el audio del micrófono mientras conduces. El audio se incluirá en el video de la cámara del tablero en comma connect.</translation>
    </message>
+    <message>
+        <source>Record Audio Feedback with LKAS button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press the LKAS button to record and share driving feedback with the openpilot team. When this toggle is disabled, the button acts as a bookmark button. The event will be highlighted in comma connect and the segment will be preserved on your device&apos;s storage.
+
+Note that this feature is only compatible with select cars.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>WiFiPromptWidget</name>
@@ -497,7 +497,7 @@ Firehose Mode allows you to maximize your training data uploads to improve openp
        <translation type="unfinished">Reporter la mise à jour</translation>
    </message>
    <message>
-        <source>openpilot has detected excessive %1 actuation. This may be due to a software bug. Please contact support at https://comma.ai/support.</source>
+        <source>openpilot detected excessive %1 actuation on your last drive. Please contact support at https://comma.ai/support and share your device&apos;s Dongle ID for troubleshooting.</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
@@ -1135,6 +1135,16 @@ If you&apos;d like to proceed, use https://flash.comma.ai to restore your device
        <source>Record and store microphone audio while driving. The audio will be included in the dashcam video in comma connect.</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Record Audio Feedback with LKAS button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press the LKAS button to record and share driving feedback with the openpilot team. When this toggle is disabled, the button acts as a bookmark button. The event will be highlighted in comma connect and the segment will be preserved on your device&apos;s storage.
+
+Note that this feature is only compatible with select cars.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>WiFiPromptWidget</name>
@@ -501,8 +501,8 @@ Firehoseモードを有効にすると学習データを最大限アップロー
        <translation>また後で更新する</translation>
    </message>
    <message>
-        <source>openpilot has detected excessive %1 actuation. This may be due to a software bug. Please contact support at https://comma.ai/support.</source>
-        <translation>openpilotが過剰な%1の作動を検出しました。ソフトウェアの不具合の可能性があります。https://comma.ai/support からサポートへご連絡下さい。</translation>
+        <source>openpilot detected excessive %1 actuation on your last drive. Please contact support at https://comma.ai/support and share your device&apos;s Dongle ID for troubleshooting.</source>
+        <translation type="unfinished"></translation>
    </message>
 </context>
 <context>
@@ -1138,6 +1138,16 @@ If you&apos;d like to proceed, use https://flash.comma.ai to restore your device
        <source>Record and store microphone audio while driving. The audio will be included in the dashcam video in comma connect.</source>
        <translation>運転中にマイク音声を録音・保存します。音声は comma connect のドライブレコーダー映像に含まれます。</translation>
    </message>
+    <message>
+        <source>Record Audio Feedback with LKAS button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press the LKAS button to record and share driving feedback with the openpilot team. When this toggle is disabled, the button acts as a bookmark button. The event will be highlighted in comma connect and the segment will be preserved on your device&apos;s storage.
+
+Note that this feature is only compatible with select cars.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>WiFiPromptWidget</name>
@@ -501,8 +501,8 @@ Firehose Mode allows you to maximize your training data uploads to improve openp
        <translation>업데이트 일시 중지</translation>
    </message>
    <message>
-        <source>openpilot has detected excessive %1 actuation. This may be due to a software bug. Please contact support at https://comma.ai/support.</source>
-        <translation>오픈파일럿은 과도한 %1 작동을 감지했습니다. 소프트웨어 버그 때문일 수 있습니다. https://comma.ai/support 에 문의하여 지원받으세요.</translation>
+        <source>openpilot detected excessive %1 actuation on your last drive. Please contact support at https://comma.ai/support and share your device&apos;s Dongle ID for troubleshooting.</source>
+        <translation type="unfinished"></translation>
    </message>
 </context>
 <context>
@@ -1138,6 +1138,16 @@ If you&apos;d like to proceed, use https://flash.comma.ai to restore your device
        <source>Record and store microphone audio while driving. The audio will be included in the dashcam video in comma connect.</source>
        <translation>운전 중에 마이크 오디오를 녹음하고 저장하십시오. 오디오는 comma connect의 대시캠 비디오에 포함됩니다.</translation>
    </message>
+    <message>
+        <source>Record Audio Feedback with LKAS button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press the LKAS button to record and share driving feedback with the openpilot team. When this toggle is disabled, the button acts as a bookmark button. The event will be highlighted in comma connect and the segment will be preserved on your device&apos;s storage.
+
+Note that this feature is only compatible with select cars.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>WiFiPromptWidget</name>
@@ -503,8 +503,8 @@ O Modo Firehose permite maximizar o envio de dados de treinamento para melhorar
        <translation>Adiar Atualização</translation>
    </message>
    <message>
-        <source>openpilot has detected excessive %1 actuation. This may be due to a software bug. Please contact support at https://comma.ai/support.</source>
-        <translation>O openpilot detectou uma atuação excessiva de %1. Isso pode ser causado por uma falha no software. Por favor, entre em contato com o suporte em https://comma.ai/support.</translation>
+        <source>openpilot detected excessive %1 actuation on your last drive. Please contact support at https://comma.ai/support and share your device&apos;s Dongle ID for troubleshooting.</source>
+        <translation type="unfinished"></translation>
    </message>
 </context>
 <context>
@@ -1143,6 +1143,16 @@ Se quiser continuar, use https://flash.comma.ai para restaurar seu dispositivo a
        <source>Record and store microphone audio while driving. The audio will be included in the dashcam video in comma connect.</source>
        <translation>Grave e armazene o áudio do microfone enquanto estiver dirigindo. O áudio será incluído ao vídeo dashcam no comma connect.</translation>
    </message>
+    <message>
+        <source>Record Audio Feedback with LKAS button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press the LKAS button to record and share driving feedback with the openpilot team. When this toggle is disabled, the button acts as a bookmark button. The event will be highlighted in comma connect and the segment will be preserved on your device&apos;s storage.
+
+Note that this feature is only compatible with select cars.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>WiFiPromptWidget</name>
@@ -497,7 +497,7 @@ Firehose Mode allows you to maximize your training data uploads to improve openp
        <translation type="unfinished">เลื่อนการอัปเดต</translation>
    </message>
    <message>
-        <source>openpilot has detected excessive %1 actuation. This may be due to a software bug. Please contact support at https://comma.ai/support.</source>
+        <source>openpilot detected excessive %1 actuation on your last drive. Please contact support at https://comma.ai/support and share your device&apos;s Dongle ID for troubleshooting.</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
@@ -1132,6 +1132,16 @@ If you&apos;d like to proceed, use https://flash.comma.ai to restore your device
        <source>Record and store microphone audio while driving. The audio will be included in the dashcam video in comma connect.</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Record Audio Feedback with LKAS button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press the LKAS button to record and share driving feedback with the openpilot team. When this toggle is disabled, the button acts as a bookmark button. The event will be highlighted in comma connect and the segment will be preserved on your device&apos;s storage.
+
+Note that this feature is only compatible with select cars.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>WiFiPromptWidget</name>
@@ -494,7 +494,7 @@ Firehose Mode allows you to maximize your training data uploads to improve openp
        <translation type="unfinished">Güncellemeyi sessize al</translation>
    </message>
    <message>
-        <source>openpilot has detected excessive %1 actuation. This may be due to a software bug. Please contact support at https://comma.ai/support.</source>
+        <source>openpilot detected excessive %1 actuation on your last drive. Please contact support at https://comma.ai/support and share your device&apos;s Dongle ID for troubleshooting.</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
@@ -1129,6 +1129,16 @@ If you&apos;d like to proceed, use https://flash.comma.ai to restore your device
        <source>Record and store microphone audio while driving. The audio will be included in the dashcam video in comma connect.</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Record Audio Feedback with LKAS button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press the LKAS button to record and share driving feedback with the openpilot team. When this toggle is disabled, the button acts as a bookmark button. The event will be highlighted in comma connect and the segment will be preserved on your device&apos;s storage.
+
+Note that this feature is only compatible with select cars.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>WiFiPromptWidget</name>
@@ -501,7 +501,7 @@ Firehose Mode allows you to maximize your training data uploads to improve openp
        <translation type="unfinished">暂停更新</translation>
    </message>
    <message>
-        <source>openpilot has detected excessive %1 actuation. This may be due to a software bug. Please contact support at https://comma.ai/support.</source>
+        <source>openpilot detected excessive %1 actuation on your last drive. Please contact support at https://comma.ai/support and share your device&apos;s Dongle ID for troubleshooting.</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
@@ -1138,6 +1138,16 @@ If you&apos;d like to proceed, use https://flash.comma.ai to restore your device
        <source>Record and store microphone audio while driving. The audio will be included in the dashcam video in comma connect.</source>
        <translation>在驾驶时录制并存储麦克风音频。该音频将会包含在 comma connect 的行车记录仪视频中。</translation>
    </message>
+    <message>
+        <source>Record Audio Feedback with LKAS button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press the LKAS button to record and share driving feedback with the openpilot team. When this toggle is disabled, the button acts as a bookmark button. The event will be highlighted in comma connect and the segment will be preserved on your device&apos;s storage.
+
+Note that this feature is only compatible with select cars.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>WiFiPromptWidget</name>
@@ -501,7 +501,7 @@ Firehose Mode allows you to maximize your training data uploads to improve openp
        <translation type="unfinished">暫停更新</translation>
    </message>
    <message>
-        <source>openpilot has detected excessive %1 actuation. This may be due to a software bug. Please contact support at https://comma.ai/support.</source>
+        <source>openpilot detected excessive %1 actuation on your last drive. Please contact support at https://comma.ai/support and share your device&apos;s Dongle ID for troubleshooting.</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
@@ -1138,6 +1138,16 @@ If you&apos;d like to proceed, use https://flash.comma.ai to restore your device
        <source>Record and store microphone audio while driving. The audio will be included in the dashcam video in comma connect.</source>
        <translation>在駕駛時錄製並儲存麥克風音訊。此音訊將會收錄在 comma connect 的行車記錄器影片中。</translation>
    </message>
+    <message>
+        <source>Record Audio Feedback with LKAS button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press the LKAS button to record and share driving feedback with the openpilot team. When this toggle is disabled, the button acts as a bookmark button. The event will be highlighted in comma connect and the segment will be preserved on your device&apos;s storage.
+
+Note that this feature is only compatible with select cars.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>WiFiPromptWidget</name>
@@ -1,33 +0,0 @@
-#include <QApplication>
-#include <QtWidgets>
-
-#include "selfdrive/ui/qt/qt_window.h"
-#include "selfdrive/ui/qt/util.h"
-#include "selfdrive/ui/qt/widgets/cameraview.h"
-
-int main(int argc, char *argv[]) {
-  initApp(argc, argv);
-
-  QApplication a(argc, argv);
-  QWidget w;
-  setMainWindow(&w);
-
-  QVBoxLayout *layout = new QVBoxLayout(&w);
-  layout->setMargin(0);
-  layout->setSpacing(0);
-
-  {
-    QHBoxLayout *hlayout = new QHBoxLayout();
-    layout->addLayout(hlayout);
-    hlayout->addWidget(new CameraWidget("camerad", VISION_STREAM_ROAD));
-  }
-
-  {
-    QHBoxLayout *hlayout = new QHBoxLayout();
-    layout->addLayout(hlayout);
-    hlayout->addWidget(new CameraWidget("camerad", VISION_STREAM_DRIVER));
-    hlayout->addWidget(new CameraWidget("camerad", VISION_STREAM_WIDE_ROAD));
-  }
-
-  return a.exec();
-}
@@ -0,0 +1,17 @@
+#!/usr/bin/env python3
+import pyray as rl
+
+from msgq.visionipc import VisionStreamType
+from openpilot.system.ui.lib.application import gui_app
+from openpilot.selfdrive.ui.onroad.cameraview import CameraView
+
+
+if __name__ == "__main__":
+  gui_app.init_window("watch3")
+  road = CameraView("camerad", VisionStreamType.VISION_STREAM_ROAD)
+  driver = CameraView("camerad", VisionStreamType.VISION_STREAM_DRIVER)
+  wide = CameraView("camerad", VisionStreamType.VISION_STREAM_WIDE_ROAD)
+  for _ in gui_app.render():
+    road.render(rl.Rectangle(gui_app.width // 4, 0, gui_app.width // 2, gui_app.height // 2))
+    driver.render(rl.Rectangle(0, gui_app.height // 2, gui_app.width // 2, gui_app.height // 2))
+    wide.render(rl.Rectangle(gui_app.width // 2, gui_app.height // 2, gui_app.width // 2, gui_app.height // 2))
@@ -14,7 +14,6 @@ class ExperimentalModeButton(Widget):

    self.params = Params()
    self.experimental_mode = self.params.get_bool("ExperimentalMode")
-    self.is_pressed = False

    self.chill_pixmap = gui_app.texture("icons/couch.png", self.img_width, self.img_width)
    self.experimental_pixmap = gui_app.texture("icons/experimental_grey.png", self.img_width, self.img_width)
@@ -32,19 +31,12 @@ class ExperimentalModeButton(Widget):
    rl.draw_rectangle_gradient_h(int(rect.x), int(rect.y), int(rect.width), int(rect.height),
                                 start_color, end_color)

-  def _handle_interaction(self, rect):
-    mouse_pos = rl.get_mouse_position()
-    mouse_in_rect = rl.check_collision_point_rec(mouse_pos, rect)
-
-    self.is_pressed = mouse_in_rect and rl.is_mouse_button_down(rl.MOUSE_BUTTON_LEFT)
-    return mouse_in_rect and rl.is_mouse_button_released(rl.MOUSE_BUTTON_LEFT)
+  def _handle_mouse_release(self, mouse_pos):
+    self.experimental_mode = not self.experimental_mode
+    # TODO: Opening settings for ExperimentalMode
+    self.params.put_bool("ExperimentalMode", self.experimental_mode)

  def _render(self, rect):
-    if self._handle_interaction(rect):
-      self.experimental_mode = not self.experimental_mode
-      # TODO: Opening settings for ExperimentalMode
-      self.params.put_bool("ExperimentalMode", self.experimental_mode)
-
    rl.draw_rectangle_rounded(rect, 0.08, 20, rl.Color(255, 255, 255, 255))

    rl.begin_scissor_mode(int(rect.x), int(rect.y), int(rect.width), int(rect.height))
@@ -5,7 +5,7 @@ import math
 import numpy as np
 from typing import Any, cast

-from openpilot.common.conversions import Conversions
+from openpilot.common.constants import CV
 from openpilot.common.params import Params

 DIRECTIONS = ('left', 'right', 'straight')
@@ -13,8 +13,8 @@ MODIFIABLE_DIRECTIONS = ('left', 'right')

 EARTH_MEAN_RADIUS = 6371007.2
 SPEED_CONVERSIONS = {
-  'km/h': Conversions.KPH_TO_MS,
-  'mph': Conversions.MPH_TO_MS,
+  'km/h': CV.KPH_TO_MS,
+  'mph': CV.MPH_TO_MS,
 }


@@ -133,7 +133,7 @@ def string_to_direction(direction: str) -> str:
 def maxspeed_to_ms(maxspeed: dict[str, str | float]) -> float:
  unit = cast(str, maxspeed['unit'])
  speed = cast(float, maxspeed['speed'])
-  return SPEED_CONVERSIONS[unit] * speed
+  return float(SPEED_CONVERSIONS[unit] * speed)


 def field_valid(dat: dict, field: str) -> bool:
@@ -2,7 +2,7 @@ import pytest
 from parameterized import parameterized_class

 from cereal import car
-from openpilot.common.conversions import Conversions as CV
+from openpilot.common.constants import CV
 from openpilot.common.params import Params
 from openpilot.selfdrive.car.cruise import V_CRUISE_INITIAL
 from openpilot.selfdrive.car.tests.test_cruise_speed import TestVCruiseHelper
@@ -6,7 +6,7 @@ See the LICENSE.md file in the root directory for more details.
 """
 from cereal import car

-from openpilot.common.conversions import Conversions as CV
+from openpilot.common.constants import CV
 from openpilot.common.params import Params


@@ -8,7 +8,7 @@ from collections import deque
 import math
 import numpy as np

-from opendbc.car import FRICTION_THRESHOLD, get_friction
+from opendbc.car.lateral import FRICTION_THRESHOLD, get_friction
 from openpilot.common.filter_simple import FirstOrderFilter
 from openpilot.common.params import Params
 from openpilot.selfdrive.modeld.constants import ModelConstants
@@ -6,7 +6,7 @@ See the LICENSE.md file in the root directory for more details.
 """
 from cereal import car

-from openpilot.common.conversions import Conversions as CV
+from openpilot.common.constants import CV
 from openpilot.sunnypilot.selfdrive.controls.lib.blinker_pause_lateral import BlinkerPauseLateral


@@ -10,9 +10,6 @@
 // no-op base hw class
 class HardwareNone {
 public:
-  static constexpr float MAX_VOLUME = 0.7;
-  static constexpr float MIN_VOLUME = 0.2;
-
  static std::string get_os_version() { return ""; }
  static std::string get_name() { return ""; }
  static cereal::InitData::DeviceType get_device_type() { return cereal::InitData::DeviceType::UNKNOWN; }
@@ -1,25 +1,25 @@
 [
  {
    "name": "xbl",
-    "url": "https://commadist.azureedge.net/agnosupdate/xbl-6710967ca9701f205d7ab19c3a9b0dd2f547e65b3d96048b7c2b03755aafa0f1.img.xz",
-    "hash": "6710967ca9701f205d7ab19c3a9b0dd2f547e65b3d96048b7c2b03755aafa0f1",
-    "hash_raw": "6710967ca9701f205d7ab19c3a9b0dd2f547e65b3d96048b7c2b03755aafa0f1",
+    "url": "https://commadist.azureedge.net/agnosupdate/xbl-effa23294138e2297b85a5b482a885184c437b5ab25d74f2a62d4fce4e68f63b.img.xz",
+    "hash": "effa23294138e2297b85a5b482a885184c437b5ab25d74f2a62d4fce4e68f63b",
+    "hash_raw": "effa23294138e2297b85a5b482a885184c437b5ab25d74f2a62d4fce4e68f63b",
    "size": 3282256,
    "sparse": false,
    "full_check": true,
    "has_ab": true,
-    "ondevice_hash": "003a17ab1be68a696f7efe4c9938e8be511d4aacfc2f3211fc896bdc1681d089"
+    "ondevice_hash": "ed61a650bea0c56652dd0fc68465d8fc722a4e6489dc8f257630c42c6adcdc89"
  },
  {
    "name": "xbl_config",
-    "url": "https://commadist.azureedge.net/agnosupdate/xbl_config-63922cfbfdf4ab87986c4ba8f3a4df5bf28414b3f71a29ec5947336722215535.img.xz",
-    "hash": "63922cfbfdf4ab87986c4ba8f3a4df5bf28414b3f71a29ec5947336722215535",
-    "hash_raw": "63922cfbfdf4ab87986c4ba8f3a4df5bf28414b3f71a29ec5947336722215535",
+    "url": "https://commadist.azureedge.net/agnosupdate/xbl_config-63d019efed684601f145ef37628e62c8da73f5053a8e51d7de09e72b8b11f97c.img.xz",
+    "hash": "63d019efed684601f145ef37628e62c8da73f5053a8e51d7de09e72b8b11f97c",
+    "hash_raw": "63d019efed684601f145ef37628e62c8da73f5053a8e51d7de09e72b8b11f97c",
    "size": 98124,
    "sparse": false,
    "full_check": true,
    "has_ab": true,
-    "ondevice_hash": "2a855dd636cc94718b64bea83a44d0a31741ecaa8f72a63613ff348ec7404091"
+    "ondevice_hash": "b12801ffaa81e58e3cef914488d3b447e35483ba549b28c6cd9deb4814c3265f"
  },
  {
    "name": "abl",
@@ -56,28 +56,28 @@
  },
  {
    "name": "boot",
-    "url": "https://commadist.azureedge.net/agnosupdate/boot-4de8f892dbac3fa3fee1efe68ca76e23e75812e81a6577d00d52e2da1ef624ef.img.xz",
-    "hash": "4de8f892dbac3fa3fee1efe68ca76e23e75812e81a6577d00d52e2da1ef624ef",
-    "hash_raw": "4de8f892dbac3fa3fee1efe68ca76e23e75812e81a6577d00d52e2da1ef624ef",
-    "size": 18479104,
+    "url": "https://commadist.azureedge.net/agnosupdate/boot-0191529aa97d90d1fa04b472d80230b777606459e1e1e9e2323c9519839827b4.img.xz",
+    "hash": "0191529aa97d90d1fa04b472d80230b777606459e1e1e9e2323c9519839827b4",
+    "hash_raw": "0191529aa97d90d1fa04b472d80230b777606459e1e1e9e2323c9519839827b4",
+    "size": 18515968,
    "sparse": false,
    "full_check": true,
    "has_ab": true,
-    "ondevice_hash": "8d7094d774faa4e801e36b403a31b53b913b31d086f4dc682d2f64710c557e8a"
+    "ondevice_hash": "492ae27f569e8db457c79d0e358a7a6297d1a1c685c2b1ae6deba7315d3a6cb0"
  },
  {
    "name": "system",
-    "url": "https://commadist.azureedge.net/agnosupdate/system-4bc3951f4aa3f70c53837dc2542d8b0666d37103b353fd81417cc7de1bbebe39.img.xz",
-    "hash": "cccd7073d067027396f2afd49874729757db0bbbc79853a0bf2938bd356fe164",
-    "hash_raw": "4bc3951f4aa3f70c53837dc2542d8b0666d37103b353fd81417cc7de1bbebe39",
+    "url": "https://commadist.azureedge.net/agnosupdate/system-18100d9065bb44a315262041b9fb6bfd9e59179981876e442200cc1284d43643.img.xz",
+    "hash": "49faee0e9b084abf0ea46f87722e3366bbd0435fb6b25cce189295c1ff368da1",
+    "hash_raw": "18100d9065bb44a315262041b9fb6bfd9e59179981876e442200cc1284d43643",
    "size": 5368709120,
    "sparse": true,
    "full_check": false,
    "has_ab": true,
-    "ondevice_hash": "c7707f16ce7d977748677cc354e250943b4ff6c21b9a19a492053d32397cf9ec",
+    "ondevice_hash": "db07761be0130e35a9d3ea6bec8df231260d3e767ae770850f18f10e14d0ab3f",
    "alt": {
-      "hash": "4bc3951f4aa3f70c53837dc2542d8b0666d37103b353fd81417cc7de1bbebe39",
-      "url": "https://commadist.azureedge.net/agnosupdate/system-4bc3951f4aa3f70c53837dc2542d8b0666d37103b353fd81417cc7de1bbebe39.img",
+      "hash": "18100d9065bb44a315262041b9fb6bfd9e59179981876e442200cc1284d43643",
+      "url": "https://commadist.azureedge.net/agnosupdate/system-18100d9065bb44a315262041b9fb6bfd9e59179981876e442200cc1284d43643.img",
      "size": 5368709120
    }
  }
@@ -97,14 +97,14 @@
  },
  {
    "name": "persist",
-    "url": "https://commadist.azureedge.net/agnosupdate/persist-9814b07851292f510f3794b767489f38ab379a99f0ea75dc620ad2d3a496d54d.img.xz",
-    "hash": "9814b07851292f510f3794b767489f38ab379a99f0ea75dc620ad2d3a496d54d",
-    "hash_raw": "9814b07851292f510f3794b767489f38ab379a99f0ea75dc620ad2d3a496d54d",
-    "size": 33554432,
+    "url": "https://commadist.azureedge.net/agnosupdate/persist-d6af4ec18df180c7417353b52a9e05e43a6480b29425f087874136436cefe786.img.xz",
+    "hash": "d6af4ec18df180c7417353b52a9e05e43a6480b29425f087874136436cefe786",
+    "hash_raw": "d6af4ec18df180c7417353b52a9e05e43a6480b29425f087874136436cefe786",
+    "size": 4096,
    "sparse": false,
    "full_check": true,
    "has_ab": false,
-    "ondevice_hash": "9814b07851292f510f3794b767489f38ab379a99f0ea75dc620ad2d3a496d54d"
+    "ondevice_hash": "d6af4ec18df180c7417353b52a9e05e43a6480b29425f087874136436cefe786"
  },
  {
    "name": "systemrw",
@@ -130,25 +130,25 @@
  },
  {
    "name": "xbl",
-    "url": "https://commadist.azureedge.net/agnosupdate/xbl-6710967ca9701f205d7ab19c3a9b0dd2f547e65b3d96048b7c2b03755aafa0f1.img.xz",
-    "hash": "6710967ca9701f205d7ab19c3a9b0dd2f547e65b3d96048b7c2b03755aafa0f1",
-    "hash_raw": "6710967ca9701f205d7ab19c3a9b0dd2f547e65b3d96048b7c2b03755aafa0f1",
+    "url": "https://commadist.azureedge.net/agnosupdate/xbl-effa23294138e2297b85a5b482a885184c437b5ab25d74f2a62d4fce4e68f63b.img.xz",
+    "hash": "effa23294138e2297b85a5b482a885184c437b5ab25d74f2a62d4fce4e68f63b",
+    "hash_raw": "effa23294138e2297b85a5b482a885184c437b5ab25d74f2a62d4fce4e68f63b",
    "size": 3282256,
    "sparse": false,
    "full_check": true,
    "has_ab": true,
-    "ondevice_hash": "003a17ab1be68a696f7efe4c9938e8be511d4aacfc2f3211fc896bdc1681d089"
+    "ondevice_hash": "ed61a650bea0c56652dd0fc68465d8fc722a4e6489dc8f257630c42c6adcdc89"
  },
  {
    "name": "xbl_config",
-    "url": "https://commadist.azureedge.net/agnosupdate/xbl_config-63922cfbfdf4ab87986c4ba8f3a4df5bf28414b3f71a29ec5947336722215535.img.xz",
-    "hash": "63922cfbfdf4ab87986c4ba8f3a4df5bf28414b3f71a29ec5947336722215535",
-    "hash_raw": "63922cfbfdf4ab87986c4ba8f3a4df5bf28414b3f71a29ec5947336722215535",
+    "url": "https://commadist.azureedge.net/agnosupdate/xbl_config-63d019efed684601f145ef37628e62c8da73f5053a8e51d7de09e72b8b11f97c.img.xz",
+    "hash": "63d019efed684601f145ef37628e62c8da73f5053a8e51d7de09e72b8b11f97c",
+    "hash_raw": "63d019efed684601f145ef37628e62c8da73f5053a8e51d7de09e72b8b11f97c",
    "size": 98124,
    "sparse": false,
    "full_check": true,
    "has_ab": true,
-    "ondevice_hash": "2a855dd636cc94718b64bea83a44d0a31741ecaa8f72a63613ff348ec7404091"
+    "ondevice_hash": "b12801ffaa81e58e3cef914488d3b447e35483ba549b28c6cd9deb4814c3265f"
  },
  {
    "name": "abl",
@@ -339,62 +339,62 @@
  },
  {
    "name": "boot",
-    "url": "https://commadist.azureedge.net/agnosupdate/boot-4de8f892dbac3fa3fee1efe68ca76e23e75812e81a6577d00d52e2da1ef624ef.img.xz",
-    "hash": "4de8f892dbac3fa3fee1efe68ca76e23e75812e81a6577d00d52e2da1ef624ef",
-    "hash_raw": "4de8f892dbac3fa3fee1efe68ca76e23e75812e81a6577d00d52e2da1ef624ef",
-    "size": 18479104,
+    "url": "https://commadist.azureedge.net/agnosupdate/boot-0191529aa97d90d1fa04b472d80230b777606459e1e1e9e2323c9519839827b4.img.xz",
+    "hash": "0191529aa97d90d1fa04b472d80230b777606459e1e1e9e2323c9519839827b4",
+    "hash_raw": "0191529aa97d90d1fa04b472d80230b777606459e1e1e9e2323c9519839827b4",
+    "size": 18515968,
    "sparse": false,
    "full_check": true,
    "has_ab": true,
-    "ondevice_hash": "8d7094d774faa4e801e36b403a31b53b913b31d086f4dc682d2f64710c557e8a"
+    "ondevice_hash": "492ae27f569e8db457c79d0e358a7a6297d1a1c685c2b1ae6deba7315d3a6cb0"
  },
  {
    "name": "system",
-    "url": "https://commadist.azureedge.net/agnosupdate/system-4bc3951f4aa3f70c53837dc2542d8b0666d37103b353fd81417cc7de1bbebe39.img.xz",
-    "hash": "cccd7073d067027396f2afd49874729757db0bbbc79853a0bf2938bd356fe164",
-    "hash_raw": "4bc3951f4aa3f70c53837dc2542d8b0666d37103b353fd81417cc7de1bbebe39",
+    "url": "https://commadist.azureedge.net/agnosupdate/system-18100d9065bb44a315262041b9fb6bfd9e59179981876e442200cc1284d43643.img.xz",
+    "hash": "49faee0e9b084abf0ea46f87722e3366bbd0435fb6b25cce189295c1ff368da1",
+    "hash_raw": "18100d9065bb44a315262041b9fb6bfd9e59179981876e442200cc1284d43643",
    "size": 5368709120,
    "sparse": true,
    "full_check": false,
    "has_ab": true,
-    "ondevice_hash": "c7707f16ce7d977748677cc354e250943b4ff6c21b9a19a492053d32397cf9ec",
+    "ondevice_hash": "db07761be0130e35a9d3ea6bec8df231260d3e767ae770850f18f10e14d0ab3f",
    "alt": {
-      "hash": "4bc3951f4aa3f70c53837dc2542d8b0666d37103b353fd81417cc7de1bbebe39",
-      "url": "https://commadist.azureedge.net/agnosupdate/system-4bc3951f4aa3f70c53837dc2542d8b0666d37103b353fd81417cc7de1bbebe39.img",
+      "hash": "18100d9065bb44a315262041b9fb6bfd9e59179981876e442200cc1284d43643",
+      "url": "https://commadist.azureedge.net/agnosupdate/system-18100d9065bb44a315262041b9fb6bfd9e59179981876e442200cc1284d43643.img",
      "size": 5368709120
    }
  },
  {
    "name": "userdata_90",
-    "url": "https://commadist.azureedge.net/agnosupdate/userdata_90-f0c675e0fae420870c9ba8979fa246b170f4f1a7a04b49609b55b6bdfa8c1b21.img.xz",
-    "hash": "3d8a007bae088c5959eb9b82454013f91868946d78380fecea2b1afdfb575c02",
-    "hash_raw": "f0c675e0fae420870c9ba8979fa246b170f4f1a7a04b49609b55b6bdfa8c1b21",
+    "url": "https://commadist.azureedge.net/agnosupdate/userdata_90-02f7abb4b667c04043c0c6950145aaebd704851261f32256d0f7e84a52059dda.img.xz",
+    "hash": "1eda66d4e31222fc2e792a62ae8e7d322fc643f0b23785e7527bb51a9fee97c7",
+    "hash_raw": "02f7abb4b667c04043c0c6950145aaebd704851261f32256d0f7e84a52059dda",
    "size": 96636764160,
    "sparse": true,
    "full_check": true,
    "has_ab": false,
-    "ondevice_hash": "5bfbabb8ff96b149056aa75d5b7e66a7cdd9cb4bcefe23b922c292f7f3a43462"
+    "ondevice_hash": "679b650ee04b7b1ef610b63fde9b43569fded39ceacf88789b564de99c221ea1"
  },
  {
    "name": "userdata_89",
-    "url": "https://commadist.azureedge.net/agnosupdate/userdata_89-06fc52be37b42690ed7b4f8c66c4611309a2dea9fca37dd9d27d1eff302eb1bf.img.xz",
-    "hash": "443f136484294b210318842d09fb618d5411c8bdbab9f7421d8c89eb291a8d3f",
-    "hash_raw": "06fc52be37b42690ed7b4f8c66c4611309a2dea9fca37dd9d27d1eff302eb1bf",
+    "url": "https://commadist.azureedge.net/agnosupdate/userdata_89-bab8399bbe3968f3c496f7bc83c2541b33acc1f47814c4ad95801bf5cb7e7588.img.xz",
+    "hash": "e63d3277285aae1f04fd7f4f48429ce35010f4843ab755f10d360c3aa788e484",
+    "hash_raw": "bab8399bbe3968f3c496f7bc83c2541b33acc1f47814c4ad95801bf5cb7e7588",
    "size": 95563022336,
    "sparse": true,
    "full_check": true,
    "has_ab": false,
-    "ondevice_hash": "67db02b29a7e4435951c64cc962a474d048ed444aa912f3494391417cd51a074"
+    "ondevice_hash": "2947374fc5980ffe3c5b94b61cc1c81bc55214f494153ed234164801731f5dc0"
  },
  {
    "name": "userdata_30",
-    "url": "https://commadist.azureedge.net/agnosupdate/userdata_30-06679488f0c5c3fcfd5f351133050751cd189f705e478a979c45fc4a166d18a6.img.xz",
-    "hash": "875b580cb786f290a842e9187fd945657561886123eb3075a26f7995a18068f6",
-    "hash_raw": "06679488f0c5c3fcfd5f351133050751cd189f705e478a979c45fc4a166d18a6",
+    "url": "https://commadist.azureedge.net/agnosupdate/userdata_30-22c874b4b66bbc000f3219abede8d62cb307f5786fd526a8473c61422765dea0.img.xz",
+    "hash": "12d9245711e8c49c51ff2c7b82d7301f2fcb1911edcddb35a105a80911859113",
+    "hash_raw": "22c874b4b66bbc000f3219abede8d62cb307f5786fd526a8473c61422765dea0",
    "size": 32212254720,
    "sparse": true,
    "full_check": true,
    "has_ab": false,
-    "ondevice_hash": "16e27ba3c5cf9f0394ce6235ba6021b8a2de293fdb08399f8ca832fa5e4d0b9d"
+    "ondevice_hash": "03c8b65c945207f887ed6c52d38b53d53d71c8597dcb0b63dfbb11f7cfff8d2b"
  }
 ]
@@ -13,8 +13,6 @@

 class HardwareTici : public HardwareNone {
 public:
-  static constexpr float MAX_VOLUME = 0.9;
-  static constexpr float MIN_VOLUME = 0.1;
  static bool TICI() { return true; }
  static bool AGNOS() { return true; }
  static std::string get_os_version() {
@@ -21,7 +21,7 @@ void VideoEncoder::publisher_publish(int segment_num, uint32_t idx, VisionIpcBuf
  edata.setFrameId(extra.frame_id);
  edata.setTimestampSof(extra.timestamp_sof);
  edata.setTimestampEof(extra.timestamp_eof);
-  edata.setType(encoder_info.encode_type);
+  edata.setType(encoder_info.get_settings(in_width).encode_type);
  edata.setEncodeId(cnt++);
  edata.setSegmentNum(segment_num);
  edata.setSegmentId(idx);
@@ -46,7 +46,7 @@ FfmpegEncoder::~FfmpegEncoder() {
 }

 void FfmpegEncoder::encoder_open() {
-  auto codec_id = encoder_info.encode_type == cereal::EncodeIndex::Type::QCAMERA_H264
+  auto codec_id = encoder_info.get_settings(in_width).encode_type == cereal::EncodeIndex::Type::QCAMERA_H264
                      ? AV_CODEC_ID_H264
                      : AV_CODEC_ID_FFVHUFF;
  const AVCodec *codec = avcodec_find_encoder(codec_id);
@@ -24,14 +24,6 @@
 */
 const int env_debug_encoder = (getenv("DEBUG_ENCODER") != NULL) ? atoi(getenv("DEBUG_ENCODER")) : 0;

-static void checked_ioctl(int fd, unsigned long request, void *argp) {
-  int ret = util::safe_ioctl(fd, request, argp);
-  if (ret != 0) {
-    LOGE("checked_ioctl failed with error %d (%d %lx %p)", errno, fd, request, argp);
-    assert(0);
-  }
-}
-
 static void dequeue_buffer(int fd, v4l2_buf_type buf_type, unsigned int *index=NULL, unsigned int *bytesused=NULL, unsigned int *flags=NULL, struct timeval *timestamp=NULL) {
  v4l2_plane plane = {0};
  v4l2_buffer v4l_buf = {
@@ -40,7 +32,7 @@ static void dequeue_buffer(int fd, v4l2_buf_type buf_type, unsigned int *index=N
    .m = { .planes = &plane, },
    .length = 1,
  };
-  checked_ioctl(fd, VIDIOC_DQBUF, &v4l_buf);
+  util::safe_ioctl(fd, VIDIOC_DQBUF, &v4l_buf, "VIDIOC_DQBUF failed");

  if (index) *index = v4l_buf.index;
  if (bytesused) *bytesused = v4l_buf.m.planes[0].bytesused;
@@ -66,8 +58,7 @@ static void queue_buffer(int fd, v4l2_buf_type buf_type, unsigned int index, Vis
    .flags = V4L2_BUF_FLAG_TIMESTAMP_COPY,
    .timestamp = timestamp
  };
-
-  checked_ioctl(fd, VIDIOC_QBUF, &v4l_buf);
+  util::safe_ioctl(fd, VIDIOC_QBUF, &v4l_buf, "VIDIOC_QBUF failed");
 }

 static void request_buffers(int fd, v4l2_buf_type buf_type, unsigned int count) {
@@ -76,7 +67,7 @@ static void request_buffers(int fd, v4l2_buf_type buf_type, unsigned int count)
    .memory = V4L2_MEMORY_USERPTR,
    .count = count
  };
-  checked_ioctl(fd, VIDIOC_REQBUFS, &reqbuf);
+  util::safe_ioctl(fd, VIDIOC_REQBUFS, &reqbuf, "VIDIOC_REQBUFS failed");
 }

 void V4LEncoder::dequeue_handler(V4LEncoder *e) {
@@ -159,11 +150,14 @@ V4LEncoder::V4LEncoder(const EncoderInfo &encoder_info, int in_width, int in_hei
  assert(fd >= 0);

  struct v4l2_capability cap;
-  checked_ioctl(fd, VIDIOC_QUERYCAP, &cap);
+  util::safe_ioctl(fd, VIDIOC_QUERYCAP, &cap, "VIDIOC_QUERYCAP failed");
  LOGD("opened encoder device %s %s = %d", cap.driver, cap.card, fd);
  assert(strcmp((const char *)cap.driver, "msm_vidc_driver") == 0);
  assert(strcmp((const char *)cap.card, "msm_vidc_venc") == 0);

+  EncoderSettings encoder_settings = encoder_info.get_settings(in_width);
+  bool is_h265 = encoder_settings.encode_type == cereal::EncodeIndex::Type::FULL_H_E_V_C;
+
  struct v4l2_format fmt_out = {
    .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
    .fmt = {
@@ -171,13 +165,13 @@ V4LEncoder::V4LEncoder(const EncoderInfo &encoder_info, int in_width, int in_hei
        // downscales are free with v4l
        .width = (unsigned int)(out_width),
        .height = (unsigned int)(out_height),
-        .pixelformat = (encoder_info.encode_type == cereal::EncodeIndex::Type::FULL_H_E_V_C) ? V4L2_PIX_FMT_HEVC : V4L2_PIX_FMT_H264,
+        .pixelformat = is_h265 ? V4L2_PIX_FMT_HEVC : V4L2_PIX_FMT_H264,
        .field = V4L2_FIELD_ANY,
        .colorspace = V4L2_COLORSPACE_DEFAULT,
      }
    }
  };
-  checked_ioctl(fd, VIDIOC_S_FMT, &fmt_out);
+  util::safe_ioctl(fd, VIDIOC_S_FMT, &fmt_out, "VIDIOC_S_FMT failed");

  v4l2_streamparm streamparm = {
    .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
@@ -191,7 +185,7 @@ V4LEncoder::V4LEncoder(const EncoderInfo &encoder_info, int in_width, int in_hei
      }
    }
  };
-  checked_ioctl(fd, VIDIOC_S_PARM, &streamparm);
+  util::safe_ioctl(fd, VIDIOC_S_PARM, &streamparm, "VIDIOC_S_PARM failed");

  struct v4l2_format fmt_in = {
    .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
@@ -205,7 +199,7 @@ V4LEncoder::V4LEncoder(const EncoderInfo &encoder_info, int in_width, int in_hei
      }
    }
  };
-  checked_ioctl(fd, VIDIOC_S_FMT, &fmt_in);
+  util::safe_ioctl(fd, VIDIOC_S_FMT, &fmt_in, "VIDIOC_S_FMT failed");

  LOGD("in buffer size %d, out buffer size %d",
    fmt_in.fmt.pix_mp.plane_fmt[0].sizeimage,
@@ -214,34 +208,32 @@ V4LEncoder::V4LEncoder(const EncoderInfo &encoder_info, int in_width, int in_hei
  // shared ctrls
  {
    struct v4l2_control ctrls[] = {
+      { .id = V4L2_CID_MPEG_VIDEO_BITRATE, .value = encoder_settings.bitrate},
+      { .id = V4L2_CID_MPEG_VIDC_VIDEO_NUM_P_FRAMES, .value = encoder_settings.gop_size - encoder_settings.b_frames - 1},
+      { .id = V4L2_CID_MPEG_VIDC_VIDEO_NUM_B_FRAMES, .value = encoder_settings.b_frames},
      { .id = V4L2_CID_MPEG_VIDEO_HEADER_MODE, .value = V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE},
-      { .id = V4L2_CID_MPEG_VIDEO_BITRATE, .value = encoder_info.bitrate},
      { .id = V4L2_CID_MPEG_VIDC_VIDEO_RATE_CONTROL, .value = V4L2_CID_MPEG_VIDC_VIDEO_RATE_CONTROL_VBR_CFR},
      { .id = V4L2_CID_MPEG_VIDC_VIDEO_PRIORITY, .value = V4L2_MPEG_VIDC_VIDEO_PRIORITY_REALTIME_DISABLE},
      { .id = V4L2_CID_MPEG_VIDC_VIDEO_IDR_PERIOD, .value = 1},
    };
    for (auto ctrl : ctrls) {
-      checked_ioctl(fd, VIDIOC_S_CTRL, &ctrl);
+      util::safe_ioctl(fd, VIDIOC_S_CTRL, &ctrl, "VIDIOC_S_CTRL failed");
    }
  }

-  if (encoder_info.encode_type == cereal::EncodeIndex::Type::FULL_H_E_V_C) {
+  if (is_h265) {
    struct v4l2_control ctrls[] = {
      { .id = V4L2_CID_MPEG_VIDC_VIDEO_HEVC_PROFILE, .value = V4L2_MPEG_VIDC_VIDEO_HEVC_PROFILE_MAIN},
      { .id = V4L2_CID_MPEG_VIDC_VIDEO_HEVC_TIER_LEVEL, .value = V4L2_MPEG_VIDC_VIDEO_HEVC_LEVEL_HIGH_TIER_LEVEL_5},
      { .id = V4L2_CID_MPEG_VIDC_VIDEO_VUI_TIMING_INFO, .value = V4L2_MPEG_VIDC_VIDEO_VUI_TIMING_INFO_ENABLED},
-      { .id = V4L2_CID_MPEG_VIDC_VIDEO_NUM_P_FRAMES, .value = 29},
-      { .id = V4L2_CID_MPEG_VIDC_VIDEO_NUM_B_FRAMES, .value = 0},
    };
    for (auto ctrl : ctrls) {
-      checked_ioctl(fd, VIDIOC_S_CTRL, &ctrl);
+      util::safe_ioctl(fd, VIDIOC_S_CTRL, &ctrl, "VIDIOC_S_CTRL failed");
    }
  } else {
    struct v4l2_control ctrls[] = {
      { .id = V4L2_CID_MPEG_VIDEO_H264_PROFILE, .value = V4L2_MPEG_VIDEO_H264_PROFILE_HIGH},
      { .id = V4L2_CID_MPEG_VIDEO_H264_LEVEL, .value = V4L2_MPEG_VIDEO_H264_LEVEL_UNKNOWN},
-      { .id = V4L2_CID_MPEG_VIDC_VIDEO_NUM_P_FRAMES, .value = 14},
-      { .id = V4L2_CID_MPEG_VIDC_VIDEO_NUM_B_FRAMES, .value = 0},
      { .id = V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE, .value = V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CABAC},
      { .id = V4L2_CID_MPEG_VIDC_VIDEO_H264_CABAC_MODEL, .value = V4L2_CID_MPEG_VIDC_VIDEO_H264_CABAC_MODEL_0},
      { .id = V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE, .value = 0},
@@ -250,7 +242,7 @@ V4LEncoder::V4LEncoder(const EncoderInfo &encoder_info, int in_width, int in_hei
      { .id = V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE, .value = 0},
    };
    for (auto ctrl : ctrls) {
-      checked_ioctl(fd, VIDIOC_S_CTRL, &ctrl);
+      util::safe_ioctl(fd, VIDIOC_S_CTRL, &ctrl, "VIDIOC_S_CTRL failed");
    }
  }

@@ -260,9 +252,9 @@ V4LEncoder::V4LEncoder(const EncoderInfo &encoder_info, int in_width, int in_hei

  // start encoder
  v4l2_buf_type buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-  checked_ioctl(fd, VIDIOC_STREAMON, &buf_type);
+  util::safe_ioctl(fd, VIDIOC_STREAMON, &buf_type, "VIDIOC_STREAMON failed");
  buf_type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
-  checked_ioctl(fd, VIDIOC_STREAMON, &buf_type);
+  util::safe_ioctl(fd, VIDIOC_STREAMON, &buf_type, "VIDIOC_STREAMON failed");

  // queue up output buffers
  for (unsigned int i = 0; i < BUF_OUT_COUNT; i++) {
@@ -305,7 +297,7 @@ void V4LEncoder::encoder_close() {
    for (int i = 0; i < BUF_IN_COUNT; i++) free_buf_in.push(i);
    // no frames, stop the encoder
    struct v4l2_encoder_cmd encoder_cmd = { .cmd = V4L2_ENC_CMD_STOP };
-    checked_ioctl(fd, VIDIOC_ENCODER_CMD, &encoder_cmd);
+    util::safe_ioctl(fd, VIDIOC_ENCODER_CMD, &encoder_cmd, "VIDIOC_ENCODER_CMD failed");
    // join waits for V4L2_QCOM_BUF_FLAG_EOS
    dequeue_handler_thread.join();
    assert(extras.empty());
@@ -316,10 +308,10 @@ void V4LEncoder::encoder_close() {
 V4LEncoder::~V4LEncoder() {
  encoder_close();
  v4l2_buf_type buf_type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
-  checked_ioctl(fd, VIDIOC_STREAMOFF, &buf_type);
+  util::safe_ioctl(fd, VIDIOC_STREAMOFF, &buf_type, "VIDIOC_STREAMOFF failed");
  request_buffers(fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, 0);
  buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-  checked_ioctl(fd, VIDIOC_STREAMOFF, &buf_type);
+  util::safe_ioctl(fd, VIDIOC_STREAMOFF, &buf_type, "VIDIOC_STREAMOFF failed");
  request_buffers(fd, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, 0);
  close(fd);

@@ -194,7 +194,7 @@ int handle_encoder_msg(LoggerdState *s, Message *msg, std::string &name, struct
  return bytes_count;
 }

-void handle_user_flag(LoggerdState *s) {
+void handle_preserve_segment(LoggerdState *s) {
  static int prev_segment = -1;
  if (s->logger.segment() == prev_segment) return;

@@ -222,7 +222,7 @@ void loggerd_thread() {
  typedef struct ServiceState {
    std::string name;
    int counter, freq;
-    bool encoder, user_flag, record_audio;
+    bool encoder, preserve_segment, record_audio;
  } ServiceState;
  std::unordered_map<SubSocket*, ServiceState> service_state;
  std::unordered_map<SubSocket*, struct RemoteEncoder> remote_encoders;
@@ -246,7 +246,7 @@ void loggerd_thread() {
        .counter = 0,
        .freq = it.decimation,
        .encoder = encoder,
-        .user_flag = it.name == "userFlag",
+        .preserve_segment = (it.name == "userBookmark") || (it.name == "audioFeedback"),
        .record_audio = record_audio,
      };
    }
@@ -281,8 +281,8 @@ void loggerd_thread() {
      if (do_exit) break;

      ServiceState &service = service_state[sock];
-      if (service.user_flag) {
-        handle_user_flag(&s);
+      if (service.preserve_segment) {
+        handle_preserve_segment(&s);
      }

      // drain socket
@@ -13,10 +13,7 @@
 #include "system/loggerd/logger.h"

 constexpr int MAIN_FPS = 20;
-const int MAIN_BITRATE = 1e7;
-const int LIVESTREAM_BITRATE = 1e6;
-const int QCAM_BITRATE = 256000;
-
+const auto MAIN_ENCODE_TYPE = Hardware::PC() ? cereal::EncodeIndex::Type::BIG_BOX_LOSSLESS : cereal::EncodeIndex::Type::FULL_H_E_V_C;
 #define NO_CAMERA_PATIENCE 500  // fall back to time-based rotation if all cameras are dead

 #define INIT_ENCODE_FUNCTIONS(encode_type)                                \
@@ -29,6 +26,30 @@ const int SEGMENT_LENGTH = LOGGERD_TEST ? atoi(getenv("LOGGERD_SEGMENT_LENGTH"))

 constexpr char PRESERVE_ATTR_NAME[] = "user.preserve";
 constexpr char PRESERVE_ATTR_VALUE = '1';
+
+struct EncoderSettings {
+  cereal::EncodeIndex::Type encode_type;
+  int bitrate;
+  int gop_size;
+  int b_frames = 0; // we don't use b frames
+
+  static EncoderSettings MainEncoderSettings(int in_width) {
+    if (in_width <= 1344) {
+      return EncoderSettings{.encode_type = MAIN_ENCODE_TYPE, .bitrate = 5'000'000, .gop_size = 20};
+    } else {
+      return EncoderSettings{.encode_type = MAIN_ENCODE_TYPE, .bitrate = 10'000'000, .gop_size = 30};
+    }
+  }
+
+  static EncoderSettings QcamEncoderSettings() {
+    return EncoderSettings{.encode_type = cereal::EncodeIndex::Type::QCAMERA_H264, .bitrate = 256'000, .gop_size = 15};
+  }
+
+  static EncoderSettings StreamEncoderSettings() {
+    return EncoderSettings{.encode_type = cereal::EncodeIndex::Type::QCAMERA_H264, .bitrate = 1'000'000, .gop_size = 15};
+  }
+};
+
 class EncoderInfo {
 public:
  const char *publish_name;
@@ -39,9 +60,8 @@ public:
  int frame_width = -1;
  int frame_height = -1;
  int fps = MAIN_FPS;
-  int bitrate = MAIN_BITRATE;
-  cereal::EncodeIndex::Type encode_type = Hardware::PC() ? cereal::EncodeIndex::Type::BIG_BOX_LOSSLESS
-                                                         : cereal::EncodeIndex::Type::FULL_H_E_V_C;
+  std::function<EncoderSettings(int)> get_settings;
+
  ::cereal::EncodeData::Reader (cereal::Event::Reader::*get_encode_data_func)() const;
  void (cereal::Event::Builder::*set_encode_idx_func)(::cereal::EncodeIndex::Reader);
  cereal::EncodeData::Builder (cereal::Event::Builder::*init_encode_data_func)();
@@ -59,12 +79,14 @@ const EncoderInfo main_road_encoder_info = {
  .publish_name = "roadEncodeData",
  .thumbnail_name = "thumbnail",
  .filename = "fcamera.hevc",
+  .get_settings = [](int in_width){return EncoderSettings::MainEncoderSettings(in_width);},
  INIT_ENCODE_FUNCTIONS(RoadEncode),
 };

 const EncoderInfo main_wide_road_encoder_info = {
  .publish_name = "wideRoadEncodeData",
  .filename = "ecamera.hevc",
+  .get_settings = [](int in_width){return EncoderSettings::MainEncoderSettings(in_width);},
  INIT_ENCODE_FUNCTIONS(WideRoadEncode),
 };

@@ -72,39 +94,36 @@ const EncoderInfo main_driver_encoder_info = {
  .publish_name = "driverEncodeData",
  .filename = "dcamera.hevc",
  .record = Params().getBool("RecordFront"),
+  .get_settings = [](int in_width){return EncoderSettings::MainEncoderSettings(in_width);},
  INIT_ENCODE_FUNCTIONS(DriverEncode),
 };

 const EncoderInfo stream_road_encoder_info = {
  .publish_name = "livestreamRoadEncodeData",
  //.thumbnail_name = "thumbnail",
-  .encode_type = cereal::EncodeIndex::Type::QCAMERA_H264,
  .record = false,
-  .bitrate = LIVESTREAM_BITRATE,
+  .get_settings = [](int){return EncoderSettings::StreamEncoderSettings();},
  INIT_ENCODE_FUNCTIONS(LivestreamRoadEncode),
 };

 const EncoderInfo stream_wide_road_encoder_info = {
  .publish_name = "livestreamWideRoadEncodeData",
-  .encode_type = cereal::EncodeIndex::Type::QCAMERA_H264,
  .record = false,
-  .bitrate = LIVESTREAM_BITRATE,
+  .get_settings = [](int){return EncoderSettings::StreamEncoderSettings();},
  INIT_ENCODE_FUNCTIONS(LivestreamWideRoadEncode),
 };

 const EncoderInfo stream_driver_encoder_info = {
  .publish_name = "livestreamDriverEncodeData",
-  .encode_type = cereal::EncodeIndex::Type::QCAMERA_H264,
  .record = false,
-  .bitrate = LIVESTREAM_BITRATE,
+  .get_settings = [](int){return EncoderSettings::StreamEncoderSettings();},
  INIT_ENCODE_FUNCTIONS(LivestreamDriverEncode),
 };

 const EncoderInfo qcam_encoder_info = {
  .publish_name = "qRoadEncodeData",
  .filename = "qcamera.ts",
-  .bitrate = QCAM_BITRATE,
-  .encode_type = cereal::EncodeIndex::Type::QCAMERA_H264,
+  .get_settings = [](int){return EncoderSettings::QcamEncoderSettings();},
  .frame_width = 526,
  .frame_height = 330,
  .include_audio = Params().getBool("RecordAudio"),
@@ -19,11 +19,12 @@ from openpilot.system.hardware.hw import Paths

 SEGMENT_LENGTH = 2
 FULL_SIZE = 2507572
+def hevc_size(w): return FULL_SIZE // 2 if w <= 1344 else FULL_SIZE
 CAMERAS = [
-  ("fcamera.hevc", 20, FULL_SIZE, "roadEncodeIdx"),
-  ("dcamera.hevc", 20, FULL_SIZE, "driverEncodeIdx"),
-  ("ecamera.hevc", 20, FULL_SIZE, "wideRoadEncodeIdx"),
-  ("qcamera.ts", 20, 130000, None),
+  ("fcamera.hevc", 20, hevc_size, "roadEncodeIdx"),
+  ("dcamera.hevc", 20, hevc_size, "driverEncodeIdx"),
+  ("ecamera.hevc", 20, hevc_size, "wideRoadEncodeIdx"),
+  ("qcamera.ts", 20, lambda x: 130000, None),
 ]

 # we check frame count, so we don't have to be too strict on size
@@ -76,7 +77,7 @@ class TestEncoder:
      # check each camera file size
      counts = []
      first_frames = []
-      for camera, fps, size, encode_idx_name in CAMERAS:
+      for camera, fps, size_lambda, encode_idx_name in CAMERAS:
        if not record_front and "dcamera" in camera:
          continue

@@ -86,14 +87,14 @@ class TestEncoder:
        assert os.path.exists(file_path), f"segment #{i}: '{file_path}' missing"

        # TODO: this ffprobe call is really slow
-        # check frame count
-        cmd = f"ffprobe -v error -select_streams v:0 -count_packets -show_entries stream=nb_read_packets -of csv=p=0 {file_path}"
+        # get width and check frame count
+        cmd = f"ffprobe -v error -select_streams v:0 -count_packets -show_entries stream=nb_read_packets,width -of csv=p=0 {file_path}"
        if TICI:
          cmd = "LD_LIBRARY_PATH=/usr/local/lib " + cmd

        expected_frames = fps * SEGMENT_LENGTH
-        probe = subprocess.check_output(cmd, shell=True, encoding='utf8')
-        frame_count = int(probe.split('\n')[0].strip())
+        probe = subprocess.check_output(cmd, shell=True, encoding='utf8').split('\n')[0].strip().split(',')
+        frame_width, frame_count = int(probe[0]), int(probe[1])
        counts.append(frame_count)

        assert frame_count == expected_frames, \
@@ -101,8 +102,9 @@ class TestEncoder:

        # sanity check file size
        file_size = os.path.getsize(file_path)
-        assert math.isclose(file_size, size, rel_tol=FILE_SIZE_TOLERANCE), \
-                        f"{file_path} size {file_size} isn't close to target size {size}"
+        target_size = size_lambda(frame_width)
+        assert math.isclose(file_size, target_size, rel_tol=FILE_SIZE_TOLERANCE), \
+                        f"{file_path} size {file_size} isn't close to target size {target_size}"

        # Check encodeIdx
        if encode_idx_name is not None:
@@ -282,15 +282,15 @@ class TestLoggerd:
      sent.clear_write_flag()
      assert sent.to_bytes() == m.as_builder().to_bytes()

-  def test_preserving_flagged_segments(self):
-    services = set(random.sample(CEREAL_SERVICES, random.randint(5, 10))) | {"userFlag"}
+  def test_preserving_bookmarked_segments(self):
+    services = set(random.sample(CEREAL_SERVICES, random.randint(5, 10))) | {"userBookmark"}
    self._publish_random_messages(services)

    segment_dir = self._get_latest_log_dir()
    assert getxattr(segment_dir, PRESERVE_ATTR_NAME) == PRESERVE_ATTR_VALUE

-  def test_not_preserving_unflagged_segments(self):
-    services = set(random.sample(CEREAL_SERVICES, random.randint(5, 10))) - {"userFlag"}
+  def test_not_preserving_nonbookmarked_segments(self):
+    services = set(random.sample(CEREAL_SERVICES, random.randint(5, 10))) - {"userBookmark", "audioFeedback"}
    self._publish_random_messages(services)

    segment_dir = self._get_latest_log_dir()
@@ -3,6 +3,7 @@ import datetime
 import os
 import signal
 import sys
+import time
 import traceback

 from cereal import log
@@ -165,6 +166,14 @@ def manager_thread() -> None:
    msg.managerState.processes = [p.get_process_state_msg() for p in managed_processes.values()]
    pm.send('managerState', msg)

+    # kick AGNOS power monitoring watchdog
+    try:
+      if sm.all_checks(['deviceState']):
+        with open("/var/tmp/power_watchdog", "w") as f:
+          f.write(str(time.monotonic()))
+    except Exception:
+      pass
+
    # Exit main loop when uninstall/shutdown/reboot is needed
    shutdown = False
    for param in ("DoUninstall", "DoShutdown", "DoReboot"):
@@ -270,7 +270,7 @@ class DaemonProcess(ManagerProcess):
                               stderr=open('/dev/null', 'w'),
                               preexec_fn=os.setpgrp)

-    self.params.put(self.param_name, str(proc.pid))
+    self.params.put(self.param_name, proc.pid)

  def stop(self, retry=True, block=True, sig=None) -> None:
    pass
@@ -117,6 +117,7 @@ procs = [

  PythonProcess("sensord", "system.sensord.sensord", only_onroad, enabled=not PC),
  NativeProcess("ui", "selfdrive/ui", ["./ui"], always_run, watchdog_max_dt=(5 if not PC else None)),
+  PythonProcess("raylib_ui", "selfdrive.ui.ui", always_run, enabled=False, watchdog_max_dt=(5 if not PC else None)),
  PythonProcess("soundd", "selfdrive.ui.soundd", only_onroad),
  PythonProcess("locationd", "selfdrive.locationd.locationd", only_onroad),
  NativeProcess("_pandad", "selfdrive/pandad", ["./pandad"], always_run, enabled=False),
@@ -142,6 +143,7 @@ procs = [
  PythonProcess("updated", "system.updated.updated", only_offroad, enabled=not PC),
  PythonProcess("uploader", "system.loggerd.uploader", always_run),
  PythonProcess("statsd", "system.statsd", always_run),
+  PythonProcess("feedbackd", "selfdrive.ui.feedback.feedbackd", only_onroad),

  # debug procs
  NativeProcess("bridge", "cereal/messaging", ["./bridge"], notcar),
@@ -98,6 +98,13 @@ def main() -> None:
    (MMC5603NJ_Magn(I2C_BUS_IMU), "magnetometer", False),
  ]

+  # Reset sensors
+  for sensor, _, _ in sensors_cfg:
+    try:
+      sensor.reset()
+    except Exception:
+      cloudlog.exception(f"Error initializing {sensor} sensor")
+
  # Initialize sensors
  exit_event = threading.Event()
  threads = [
@@ -40,6 +40,11 @@ class Sensor:
  def device_address(self) -> int:
    raise NotImplementedError

+  def reset(self) -> None:
+    # optional.
+    # not part of init due to shared registers
+    pass
+
  def init(self) -> None:
    raise NotImplementedError

@@ -31,6 +31,10 @@ class LSM6DS3_Accel(Sensor):
  def device_address(self) -> int:
    return 0x6A

+  def reset(self):
+    self.write(0x12, 0x1)
+    time.sleep(0.1)
+
  def init(self):
    chip_id = self.verify_chip_id(0x0F, [0x69, 0x6A])
    if chip_id == 0x6A:
@@ -29,6 +29,10 @@ class LSM6DS3_Gyro(Sensor):
  def device_address(self) -> int:
    return 0x6A

+  def reset(self):
+    self.write(0x12, 0x1)
+    time.sleep(0.1)
+
  def init(self):
    chip_id = self.verify_chip_id(0x0F, [0x69, 0x6A])
    if chip_id == 0x6A:
@@ -19,6 +19,7 @@ FPS_LOG_INTERVAL = 5  # Seconds between logging FPS drops
 FPS_DROP_THRESHOLD = 0.9  # FPS drop threshold for triggering a warning
 FPS_CRITICAL_THRESHOLD = 0.5  # Critical threshold for triggering strict actions
 MOUSE_THREAD_RATE = 140  # touch controller runs at 140Hz
+MAX_TOUCH_SLOTS = 2

 ENABLE_VSYNC = os.getenv("ENABLE_VSYNC", "0") == "1"
 SHOW_FPS = os.getenv("SHOW_FPS") == "1"
@@ -58,6 +59,7 @@ class MousePos(NamedTuple):

 class MouseEvent(NamedTuple):
  pos: MousePos
+  slot: int
  left_pressed: bool
  left_released: bool
  left_down: bool
@@ -67,7 +69,7 @@ class MouseEvent(NamedTuple):
 class MouseState:
  def __init__(self):
    self._events: deque[MouseEvent] = deque(maxlen=MOUSE_THREAD_RATE)  # bound event list
-    self._prev_mouse_event: MouseEvent | None = None
+    self._prev_mouse_event: list[MouseEvent | None] = [None] * MAX_TOUCH_SLOTS

    self._rk = Ratekeeper(MOUSE_THREAD_RATE)
    self._lock = threading.Lock()
@@ -98,19 +100,21 @@ class MouseState:
      self._rk.keep_time()

  def _handle_mouse_event(self):
-    mouse_pos = rl.get_mouse_position()
-    ev = MouseEvent(
-      MousePos(mouse_pos.x, mouse_pos.y),
-      rl.is_mouse_button_pressed(rl.MouseButton.MOUSE_BUTTON_LEFT),
-      rl.is_mouse_button_released(rl.MouseButton.MOUSE_BUTTON_LEFT),
-      rl.is_mouse_button_down(rl.MouseButton.MOUSE_BUTTON_LEFT),
-      time.monotonic(),
-    )
-    # Only add changes
-    if self._prev_mouse_event is None or ev[:-1] != self._prev_mouse_event[:-1]:
-      with self._lock:
-        self._events.append(ev)
-      self._prev_mouse_event = ev
+    for slot in range(MAX_TOUCH_SLOTS):
+      mouse_pos = rl.get_touch_position(slot)
+      ev = MouseEvent(
+        MousePos(mouse_pos.x, mouse_pos.y),
+        slot,
+        rl.is_mouse_button_pressed(slot),
+        rl.is_mouse_button_released(slot),
+        rl.is_mouse_button_down(slot),
+        time.monotonic(),
+      )
+      # Only add changes
+      if self._prev_mouse_event[slot] is None or ev[:-1] != self._prev_mouse_event[slot][:-1]:
+        with self._lock:
+          self._events.append(ev)
+        self._prev_mouse_event[slot] = ev


 class GuiApplication:
@@ -0,0 +1,47 @@
+import io
+import re
+
+from PIL import Image, ImageDraw, ImageFont
+import pyray as rl
+
+_cache: dict[str, rl.Texture] = {}
+
+EMOJI_REGEX = re.compile(
+"""[\U0001F600-\U0001F64F
+\U0001F300-\U0001F5FF
+\U0001F680-\U0001F6FF
+\U0001F1E0-\U0001F1FF
+\U00002700-\U000027BF
+\U0001F900-\U0001F9FF
+\U00002600-\U000026FF
+\U00002300-\U000023FF
+\U00002B00-\U00002BFF
+\U0001FA70-\U0001FAFF
+\U0001F700-\U0001F77F
+\u2640-\u2642
+\u2600-\u2B55
+\u200d
+\u23cf
+\u23e9
+\u231a
+\ufe0f
+\u3030
+]+""",
+  flags=re.UNICODE
+)
+
+def find_emoji(text):
+  return [(m.start(), m.end(), m.group()) for m in EMOJI_REGEX.finditer(text)]
+
+def emoji_tex(emoji):
+  if emoji not in _cache:
+    img = Image.new("RGBA", (128, 128), (0, 0, 0, 0))
+    draw = ImageDraw.Draw(img)
+    font = ImageFont.truetype("NotoColorEmoji", 109)
+    draw.text((0, 0), emoji, font=font, embedded_color=True)
+    buffer = io.BytesIO()
+    img.save(buffer, format="PNG")
+    l = buffer.tell()
+    buffer.seek(0)
+    _cache[emoji] = rl.load_texture_from_image(rl.load_image_from_memory(".png", buffer.getvalue(), l))
+  return _cache[emoji]
--- a/Show More
+++ b/Show More