Merge branch 'feature/slc' into ui-sla-control-only

# Conflicts:
#	selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.h
#	sunnypilot/selfdrive/controls/lib/speed_limit_controller/speed_limit_controller.py
#	sunnypilot/selfdrive/controls/lib/speed_limit_controller/speed_limit_resolver.py
#	sunnypilot/selfdrive/controls/lib/speed_limit_controller/state.py

.github/workflows/forum-docs.yml

@@ -1,46 +0,0 @@
-name: Publish Docs
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-  workflow_dispatch:
-    inputs:
-      publish:
-        description: 'Set to true to publish to forum'
-        required: false
-        type: boolean
-
-env:
-  DOCS_CATEGORY_ID: 114
-  DOCS_DATA_EXPLORER_QUERY_ID: 2
-  DOCS_TARGET: https://forum.sunnypilot.ai
-  DOCS_API_KEY: ${{ secrets.DISCOURSE_API_KEY }}
-  GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
-
-jobs:
-#  dry_run:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - uses: actions/checkout@v4
-#      - uses: ruby/setup-ruby@v1
-#        with:
-#          ruby-version: "3.3"
-#          bundler-cache: true
-#          working-directory: ./release/ci
-#      - run: bundle exec ./sync_docs.rb --dry-run
-#        working-directory: ./release/ci
-
-  publish:
-#    if: github.ref == 'refs/heads/main' || (github.event_name == 'workflow_dispatch' && github.event.inputs.publish == 'true')
-#    needs: dry_run
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: "3.3"
-          bundler-cache: true
-          working-directory: ./release/ci
-      - run: bundle exec ./sync_docs.rb
-        working-directory: ./release/ci

.github/workflows/selfdrive_tests.yaml

@@ -115,9 +115,7 @@ jobs:
     - run: echo "CACHE_COMMIT_DATE=$(git log -1 --pretty='format:%cd' --date=format:'%Y-%m-%d-%H:%M')" >> $GITHUB_ENV
     - name: Homebrew cache
       uses: ./.github/workflows/auto-cache
-      if: false # disabling the cache for now because it is breaking macos builds...
       with:
-        save: false # No need save here if we manually save it later conditionally
         path: ~/Library/Caches/Homebrew
         key: brew-macos-${{ env.CACHE_COMMIT_DATE }}-${{ github.sha }}
         restore-keys: |
@@ -138,7 +136,6 @@ jobs:
     - name: Getting scons cache
       uses: ./.github/workflows/auto-cache
       with:
-        save: false # No need save here if we manually save it later conditionally
         path: /tmp/scons_cache
         key: scons-${{ runner.arch }}-macos-${{ env.CACHE_COMMIT_DATE }}-${{ github.sha }}
         restore-keys: |

.github/workflows/sunnypilot-master-dev-prep.yaml

@@ -118,8 +118,8 @@ jobs:
         run: |
           # Use GitHub API to get PRs with specific label, ordered by creation date
           PR_LIST=$(gh api graphql -f query='
-            query($search_query:String!) {
-              search(query: $search_query, type:ISSUE, first:100) {
+            query($label:String!) {
+              search(query: $label, type:ISSUE, first:100) {
                 nodes {
                   ... on PullRequest {
                     number
@@ -149,7 +149,7 @@ jobs:
                   }
                 }
               }
-            }' -F search_query="repo:${{ github.repository }} is:pr is:open label:${PR_LABEL},${PR_LABEL}-c3 draft:false sort:created-asc")
+            }' -F label="is:pr is:open label:${PR_LABEL} draft:false sort:created-asc")
 
           PR_LIST=${PR_LIST//\'/}
           echo "PR_LIST=${PR_LIST}" >> $GITHUB_OUTPUT

.gitignore

@@ -16,7 +16,6 @@ a.out
 .cache/
 
 /docs_site/
-/docs_sp_site/
 
 *.mp4
 *.dylib

cereal/custom.capnp

@@ -69,48 +69,6 @@ struct LeadData {
 struct SelfdriveStateSP @0x81c2f05a394cf4af {
   mads @0 :ModularAssistiveDrivingSystem;
   intelligentCruiseButtonManagement @1 :IntelligentCruiseButtonManagement;
-
-  enum AudibleAlert {
-    none @0;
-
-    engage @1;
-    disengage @2;
-    refuse @3;
-
-    warningSoft @4;
-    warningImmediate @5;
-
-    prompt @6;
-    promptRepeat @7;
-    promptDistracted @8;
-
-    # unused, these are reserved for upstream events so we don't collide
-    reserved9 @9;
-    reserved10 @10;
-    reserved11 @11;
-    reserved12 @12;
-    reserved13 @13;
-    reserved14 @14;
-    reserved15 @15;
-    reserved16 @16;
-    reserved17 @17;
-    reserved18 @18;
-    reserved19 @19;
-    reserved20 @20;
-    reserved21 @21;
-    reserved22 @22;
-    reserved23 @23;
-    reserved24 @24;
-    reserved25 @25;
-    reserved26 @26;
-    reserved27 @27;
-    reserved28 @28;
-    reserved29 @29;
-    reserved30 @30;
-
-    promptSingleLow @31;
-    promptSingleHigh @32;
-  }
 }
 
 struct ModelManagerSP @0xaedffd8f31e7b55d {
@@ -187,11 +145,8 @@ struct LongitudinalPlanSP @0xf35cc4560bbf6ec2 {
   dec @0 :DynamicExperimentalControl;
   longitudinalPlanSource @1 :LongitudinalPlanSource;
   smartCruiseControl @2 :SmartCruiseControl;
-  speedLimit @3 :SpeedLimit;
-  vTarget @4 :Float32;
-  aTarget @5 :Float32;
-  events @6 :List(OnroadEventSP.Event);
-  e2eAlerts @7 :E2eAlerts;
+  speedLimitAssist @3 :SpeedLimitAssist;
+  events @4 :List(OnroadEventSP.Event);
 
   struct DynamicExperimentalControl {
     state @0 :DynamicExperimentalControlState;
@@ -206,7 +161,6 @@ struct LongitudinalPlanSP @0xf35cc4560bbf6ec2 {
 
   struct SmartCruiseControl {
     vision @0 :Vision;
-    map @1 :Map;
 
     struct Vision {
       state @0 :VisionState;
@@ -218,14 +172,6 @@ struct LongitudinalPlanSP @0xf35cc4560bbf6ec2 {
       active @6 :Bool;
     }
 
-    struct Map {
-      state @0 :MapState;
-      vTarget @1 :Float32;
-      aTarget @2 :Float32;
-      enabled @3 :Bool;
-      active @4 :Bool;
-    }
-
     enum VisionState {
       disabled @0; # System disabled or inactive.
       enabled @1; # No predicted substantial turn on vision range.
@@ -234,65 +180,38 @@ struct LongitudinalPlanSP @0xf35cc4560bbf6ec2 {
       leaving @4; # Road ahead straightens. Start to allow positive acceleration.
       overriding @5; # System overriding with manual control.
     }
-
-    enum MapState {
-      disabled @0; # System disabled or inactive.
-      enabled @1; # No predicted substantial turn on map range.
-      turning @2; # Actively turning. Managing acceleration to provide a roll on turn feeling.
-      overriding @3; # System overriding with manual control.
-    }
   }
 
-  struct SpeedLimit {
-    resolver @0 :Resolver;
-    assist @1 :Assist;
-
-    struct Resolver {
-      speedLimit @0 :Float32;
-      distToSpeedLimit @1 :Float32;
-      source @2 :Source;
-      speedLimitOffset @3 :Float32;
-      speedLimitLast @4 :Float32;
-      speedLimitFinal @5 :Float32;
-      speedLimitFinalLast @6 :Float32;
-      speedLimitValid @7 :Bool;
-      speedLimitLastValid @8 :Bool;
-    }
-
-    struct Assist {
-      state @0 :AssistState;
-      enabled @1 :Bool;
-      active @2 :Bool;
-      vTarget @3 :Float32;
-      aTarget @4 :Float32;
-    }
-
-    enum Source {
-      none @0;
-      car @1;
-      map @2;
-    }
-
-    enum AssistState {
-      disabled @0;
-      inactive @1; # No speed limit set or not enabled by parameter.
-      preActive @2;
-      pending @3; # Awaiting new speed limit.
-      adapting @4; # Reducing speed to match new speed limit.
-      active @5; # Cruising at speed limit.
-    }
+  struct SpeedLimitAssist {
+    state @0 :SpeedLimitAssistState;
+    enabled @1 :Bool;
+    active @2 :Bool;
+    speedLimit @3 :Float32;
+    speedLimitOffset @4 :Float32;
+    distToSpeedLimit @5 :Float32;
+    source @6 :SpeedLimitSource;
   }
 
   enum LongitudinalPlanSource {
     cruise @0;
     sccVision @1;
-    sccMap @2;
-    speedLimitAssist @3;
+    speedLimitAssist @2;
   }
 
-  struct E2eAlerts {
-    greenLightAlert @0 :Bool;
-    leadDepartAlert @1 :Bool;
+  enum SpeedLimitAssistState {
+    disabled @0;
+    inactive @1; # No speed limit set or not enabled by parameter.
+    preActive @2;
+    pending @3; # Awaiting new speed limit.
+    adapting @4; # Reducing speed to match new speed limit.
+    active @5; # Cruising at speed limit.
+    overriding @6; # System overriding with manual control.
+  }
+
+  enum SpeedLimitSource {
+    none @0;
+    car @1;
+    map @2;
   }
 }
 
@@ -337,18 +256,16 @@ struct OnroadEventSP @0xda96579883444c35 {
     laneTurnRight @18;
     speedLimitPreActive @19;
     speedLimitActive @20;
-    speedLimitChanged @21;
-    speedLimitPending @22;
-    e2eChime @23;
+    speedLimitConfirmed @21;
+    speedLimitChanged @22;
   }
 }
 
 struct CarParamsSP @0x80ae746ee2596b11 {
   flags @0 :UInt32;        # flags for car specific quirks in sunnypilot
   safetyParam @1 : Int16;  # flags for sunnypilot's custom safety flags
-  pcmCruiseSpeed @3 :Bool;
+  pcmCruiseSpeed @3 :Bool = true;
   intelligentCruiseButtonManagementAvailable @4 :Bool;
-  enableGasInterceptor @5 :Bool;
 
   neuralNetworkLateralControl @2 :NeuralNetworkLateralControl;
 
@@ -377,7 +294,7 @@ struct CarControlSP @0xa5cd762cd951a455 {
 
     valueDEPRECATED @1 :Text; # The data type change may cause issues with backwards compatibility.
   }
-
+  
   enum ParamType {
     string @0;
     bool @1;
@@ -432,7 +349,7 @@ struct BackupManagerSP @0xf98d843bfd7004a3 {
 }
 
 struct CarStateSP @0xb86e6369214c01c8 {
-  speedLimit @0 :Float32;
+  speedLimit @0 :Float32;  # m/s
 }
 
 struct LiveMapDataSP @0xf416ec09499d9d19 {
@@ -446,13 +363,13 @@ struct LiveMapDataSP @0xf416ec09499d9d19 {
 
 struct ModelDataV2SP @0xa1680744031fdb2d {
   laneTurnDirection @0 :TurnDirection;
+}
 
   enum TurnDirection {
     none @0;
     turnLeft @1;
     turnRight @2;
   }
-}
 
 struct CustomReserved10 @0xcb9fd56c7057593a {
 }

cereal/log.capnp

@@ -2684,7 +2684,7 @@ struct Event {
     lateralPlanDEPRECATED @64 :LateralPlan;
     navModelDEPRECATED @104 :NavModelData;
     uiPlanDEPRECATED @106 :UiPlan;
-    liveLocationKalman @72 :LiveLocationKalman;
+    liveLocationKalmanDEPRECATED @72 :LiveLocationKalman;
     liveTracksDEPRECATED @16 :List(LiveTracksDEPRECATED);
     onroadEventsDEPRECATED @68: List(Car.OnroadEventDEPRECATED);
   }

cereal/services.py

@@ -89,7 +89,6 @@ _services: dict[str, tuple] = {
   "carStateSP": (True, 100., 10),
   "liveMapDataSP": (True, 1., 1),
   "modelDataV2SP": (True, 20.),
-  "liveLocationKalman": (True, 20.),
 
   # debug
   "uiDebug": (True, 0., 1),

common/params_keys.h

@@ -148,29 +148,20 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
     {"DevUIInfo", {PERSISTENT | BACKUP, INT, "0"}},
     {"EnableCopyparty", {PERSISTENT | BACKUP, BOOL}},
     {"EnableGithubRunner", {PERSISTENT | BACKUP, BOOL}},
-    {"GreenLightAlert", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"GithubRunnerSufficientVoltage", {CLEAR_ON_MANAGER_START , BOOL}},
-    {"HideVEgoUI", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"IntelligentCruiseButtonManagement", {PERSISTENT | BACKUP , BOOL}},
     {"InteractivityTimeout", {PERSISTENT | BACKUP, INT, "0"}},
     {"IsDevelopmentBranch", {CLEAR_ON_MANAGER_START, BOOL}},
-    {"LastGPSPositionLLK", {PERSISTENT, STRING}},
-    {"LeadDepartAlert", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"MaxTimeOffroad", {PERSISTENT | BACKUP, INT, "1800"}},
     {"ModelRunnerTypeCache", {CLEAR_ON_ONROAD_TRANSITION, INT}},
     {"OffroadMode", {CLEAR_ON_MANAGER_START, BOOL}},
     {"Offroad_TiciSupport", {CLEAR_ON_MANAGER_START, JSON}},
-    {"OnroadScreenOffBrightness", {PERSISTENT | BACKUP, INT, "0"}},
-    {"OnroadScreenOffControl", {PERSISTENT | BACKUP, BOOL}},
-    {"OnroadScreenOffTimer", {PERSISTENT | BACKUP, INT, "15"}},
-    {"OnroadUploads", {PERSISTENT | BACKUP, BOOL, "1"}},
     {"QuickBootToggle", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"QuietMode", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"RainbowMode", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"ShowAdvancedControls", {PERSISTENT | BACKUP, BOOL, "0"}},
-    {"ShowTurnSignals", {PERSISTENT | BACKUP, BOOL, "0"}},
+    {"SmartCruiseControlVision", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"StandstillTimer", {PERSISTENT | BACKUP, BOOL, "0"}},
-    {"TrueVEgoUI", {PERSISTENT | BACKUP, BOOL, "0"}},
 
     // MADS params
     {"Mads", {PERSISTENT | BACKUP, BOOL, "1"}},
@@ -196,8 +187,7 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
     {"SunnylinkCache_Users", {PERSISTENT, STRING}},
     {"SunnylinkDongleId", {PERSISTENT, STRING}},
     {"SunnylinkdPid", {PERSISTENT, INT}},
-    {"SunnylinkEnabled", {PERSISTENT, BOOL, "1"}},
-    {"SunnylinkTempFault", {CLEAR_ON_MANAGER_START | CLEAR_ON_OFFROAD_TRANSITION, BOOL, "0"}},
+    {"SunnylinkEnabled", {PERSISTENT, BOOL}},
 
     // Backup Manager params
     {"BackupManager_CreateBackup", {PERSISTENT, BOOL}},
@@ -205,8 +195,6 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
 
     // sunnypilot car specific params
     {"HyundaiLongitudinalTuning", {PERSISTENT | BACKUP, INT, "0"}},
-    {"SubaruStopAndGo", {PERSISTENT | BACKUP, BOOL, "0"}},
-    {"SubaruStopAndGoManualParkingBrake", {PERSISTENT | BACKUP, BOOL, "0"}},
 
     {"DynamicExperimentalControl", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"BlindSpot", {PERSISTENT | BACKUP, BOOL, "0"}},
@@ -237,25 +225,14 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
     {"OsmStateTitle", {PERSISTENT, STRING}},
     {"OsmWayTest", {PERSISTENT, STRING}},
     {"RoadName", {CLEAR_ON_ONROAD_TRANSITION, STRING}},
-    {"RoadNameToggle", {PERSISTENT, STRING}},
 
-    // Speed Limit
-    {"SpeedLimitMode", {PERSISTENT | BACKUP, INT, "1"}},
-    {"SpeedLimitOffsetType", {PERSISTENT | BACKUP, INT, "0"}},
+    // Speed Limit Control
+    {"SpeedLimitAssist", {PERSISTENT | BACKUP, BOOL, "0"}},
     {"SpeedLimitPolicy", {PERSISTENT | BACKUP, INT, "3"}},
+    {"SpeedLimitEngageType", {PERSISTENT | BACKUP, INT, "0"}},
+    {"SpeedLimitOffsetType", {PERSISTENT | BACKUP, INT, "0"}},
     {"SpeedLimitValueOffset", {PERSISTENT | BACKUP, INT, "0"}},
-
-    // Smart Cruise Control
-    {"MapTargetVelocities", {CLEAR_ON_ONROAD_TRANSITION, STRING}},
-    {"SmartCruiseControlMap", {PERSISTENT | BACKUP, BOOL, "0"}},
-    {"SmartCruiseControlVision", {PERSISTENT | BACKUP, BOOL, "0"}},
-
-    // Torque lateral control custom params
-    {"CustomTorqueParams", {PERSISTENT | BACKUP , BOOL}},
-    {"EnforceTorqueControl", {PERSISTENT | BACKUP, BOOL}},
-    {"LiveTorqueParamsToggle", {PERSISTENT | BACKUP , BOOL}},
-    {"LiveTorqueParamsRelaxedToggle", {PERSISTENT | BACKUP , BOOL}},
-    {"TorqueParamsOverrideEnabled", {PERSISTENT | BACKUP, BOOL, "0"}},
-    {"TorqueParamsOverrideFriction", {PERSISTENT | BACKUP, FLOAT, "0.1"}},
-    {"TorqueParamsOverrideLatAccelFactor", {PERSISTENT | BACKUP, FLOAT, "2.5"}},
+    {"SpeedLimitWarningType", {PERSISTENT | BACKUP, INT, "0"}},
+    {"SpeedLimitWarningOffsetType", {PERSISTENT | BACKUP, INT, "0"}},
+    {"SpeedLimitWarningValueOffset", {PERSISTENT | BACKUP, INT, "0"}},
 };

common/util.h

@@ -36,7 +36,6 @@ const double MS_TO_KPH = 3.6;
 const double MS_TO_MPH = MS_TO_KPH * KM_TO_MILE;
 const double METER_TO_MILE = KM_TO_MILE / 1000.0;
 const double METER_TO_FOOT = 3.28084;
-const double METER_TO_KM = 1. / 1000.0;
 
 #define ALIGNED_SIZE(x, align) (((x) + (align)-1) & ~((align)-1))
 

docs/CARS.md

@@ -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.
 
-# 337 Supported Cars
+# 334 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|
 |---|---|---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
@@ -83,7 +83,7 @@ A supported vehicle is one that just works when you install a comma device. All
 |Honda|Civic Hatchback 2017-18|Honda Sensing|openpilot available[<sup>1</sup>](#footnotes)|0 mph|12 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 Civic Hatchback 2017-18">Buy Here</a></sub></details>|||
 |Honda|Civic Hatchback 2019-21|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|12 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 Civic Hatchback 2019-21">Buy Here</a></sub></details>|||
 |Honda|Civic Hatchback 2022-24|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 Honda Bosch B 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 Hatchback 2022-24">Buy Here</a></sub></details>|<a href="https://youtu.be/ytiOT5lcp6Q" target="_blank"><img height="18px" src="assets/icon-youtube.svg"></img></a>||
-|Honda|Civic Hatchback Hybrid 2025-26|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 Honda Bosch B 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 Hatchback Hybrid 2025-26">Buy Here</a></sub></details>|||
+|Honda|Civic Hatchback Hybrid 2025|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 Honda Bosch B 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 Hatchback Hybrid 2025">Buy Here</a></sub></details>|||
 |Honda|Civic Hatchback Hybrid (Europe only) 2023|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 Honda Bosch B 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 Hatchback Hybrid (Europe only) 2023">Buy Here</a></sub></details>|||
 |Honda|Civic Hybrid 2025|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 Honda Bosch B 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 Hybrid 2025">Buy Here</a></sub></details>|||
 |Honda|Clarity 2018-21|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 + Honda Clarity Proxy Board<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://shop.retropilot.org/product/honda-clarity-proxy-board-kit">Buy Here</a></sub></details>|||
@@ -99,9 +99,7 @@ A supported vehicle is one that just works when you install a comma device. All
 |Honda|HR-V 2023-25|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 Honda Bosch B 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 HR-V 2023-25">Buy Here</a></sub></details>|||
 |Honda|Insight 2019-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 Insight 2019-22">Buy Here</a></sub></details>|||
 |Honda|Inspire 2018|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 Inspire 2018">Buy Here</a></sub></details>|||
-|Honda|N-Box 2018|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|11 mph|[![star](assets/icon-star-full.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 N-Box 2018">Buy Here</a></sub></details>|||
 |Honda|Odyssey 2018-20|Honda Sensing|openpilot|26 mph|0 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.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 Odyssey 2018-20">Buy Here</a></sub></details>|||
-|Honda|Odyssey 2021-25|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|43 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 Odyssey 2021-25">Buy Here</a></sub></details>|||
 |Honda|Passport 2019-25|All|openpilot|26 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.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 Passport 2019-25">Buy Here</a></sub></details>|||
 |Honda|Pilot 2016-22|Honda Sensing|openpilot|26 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.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 Pilot 2016-22">Buy Here</a></sub></details>|||
 |Honda|Pilot 2023-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 Honda Bosch C 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=Honda Pilot 2023-25">Buy Here</a></sub></details>|||
@@ -165,7 +163,6 @@ A supported vehicle is one that just works when you install a comma device. All
 |Kia|EV6 (without HDA II) 2022-24[<sup>6</sup>](#footnotes)|Highway Driving Assist|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 L 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 EV6 (without HDA II) 2022-24">Buy Here</a></sub></details>|||
 |Kia|Forte 2019-21|Smart Cruise Control (SCC)|openpilot available[<sup>1</sup>](#footnotes)|6 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Hyundai G 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 Forte 2019-21">Buy Here</a></sub></details>|||
 |Kia|Forte 2022-23|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 E 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 Forte 2022-23">Buy Here</a></sub></details>|||
-|Kia|Forte Non-SCC 2019|No Smart Cruise Control (Non-SCC)|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Hyundai G 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 Forte Non-SCC 2019">Buy Here</a></sub></details>|||
 |Kia|K5 2021-24|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 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=Kia K5 2021-24">Buy Here</a></sub></details>|||
 |Kia|K5 Hybrid 2020-22|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 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=Kia K5 Hybrid 2020-22">Buy Here</a></sub></details>|||
 |Kia|K8 Hybrid (with HDA II) 2023[<sup>6</sup>](#footnotes)|Highway Driving Assist II|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 Q 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 K8 Hybrid (with HDA II) 2023">Buy Here</a></sub></details>|||
@@ -262,7 +259,7 @@ A supported vehicle is one that just works when you install a comma device. All
 |Tesla[<sup>11</sup>](#footnotes)|Model 3 (with HW3) 2019-23[<sup>10</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 Tesla A connector<br>- 1 USB-C coupler<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Tesla Model 3 (with HW3) 2019-23">Buy Here</a></sub></details>|||
 |Tesla[<sup>11</sup>](#footnotes)|Model 3 (with HW4) 2024-25[<sup>10</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 Tesla B connector<br>- 1 USB-C coupler<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Tesla Model 3 (with HW4) 2024-25">Buy Here</a></sub></details>|||
 |Tesla[<sup>11</sup>](#footnotes)|Model Y (with HW3) 2020-23[<sup>10</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 Tesla A connector<br>- 1 USB-C coupler<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Tesla Model Y (with HW3) 2020-23">Buy Here</a></sub></details>|||
-|Tesla[<sup>11</sup>](#footnotes)|Model Y (with HW4) 2024-25[<sup>10</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 Tesla B connector<br>- 1 USB-C coupler<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Tesla Model Y (with HW4) 2024-25">Buy Here</a></sub></details>|||
+|Tesla[<sup>11</sup>](#footnotes)|Model Y (with HW4) 2024[<sup>10</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 Tesla B connector<br>- 1 USB-C coupler<br>- 1 comma 3X<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x?harness=Tesla Model Y (with HW4) 2024">Buy Here</a></sub></details>|||
 |Toyota|Alphard 2019-20|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=Toyota Alphard 2019-20">Buy Here</a></sub></details>|||
 |Toyota|Alphard Hybrid 2021|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=Toyota Alphard Hybrid 2021">Buy Here</a></sub></details>|||
 |Toyota|Avalon 2016|Toyota Safety Sense P|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=Toyota Avalon 2016">Buy Here</a></sub></details>|||

docs_sp/SAFETY.md

@@ -1,36 +0,0 @@
-# Safety
-
-openpilot is an Adaptive Cruise Control (ACC) and Automated Lane Centering (ALC) system.
-Like other ACC and ALC systems, openpilot is a failsafe passive system and it requires the
-driver to be alert and to pay attention at all times.
-
-In order to enforce driver alertness, openpilot includes a driver monitoring feature
-that alerts the driver when distracted.
-
-However, even with an attentive driver, we must make further efforts for the system to be
-safe. We repeat, **driver alertness is necessary, but not sufficient, for openpilot to be
-used safely** and openpilot is provided with no warranty of fitness for any purpose.
-
-openpilot is developed in good faith to be compliant with FMVSS requirements and to follow
-industry standards of safety for Level 2 Driver Assistance Systems. In particular, we observe
-ISO26262 guidelines, including those from [pertinent documents](https://www.nhtsa.gov/sites/nhtsa.dot.gov/files/documents/13498a_812_573_alcsystemreport.pdf)
-released by NHTSA. In addition, we impose strict coding guidelines (like [MISRA C : 2012](https://www.misra.org.uk/what-is-misra/))
-on parts of openpilot that are safety relevant. We also perform software-in-the-loop,
-hardware-in-the-loop and in-vehicle tests before each software release.
-
-Following Hazard and Risk Analysis and FMEA, at a very high level, we have designed openpilot
-ensuring two main safety requirements.
-
-1. The driver must always be capable to immediately retake manual control of the vehicle,
-   by stepping on the brake pedal or by pressing the cancel button.
-2. The vehicle must not alter its trajectory too quickly for the driver to safely
-   react. This means that while the system is engaged, the actuators are constrained
-   to operate within reasonable limits[^1]. 
-
-For additional safety implementation details, refer to [panda safety model](https://github.com/commaai/panda#safety-model). For vehicle specific implementation of the safety concept, refer to [panda/board/safety/](https://github.com/commaai/panda/tree/master/board/safety).
-
-**Extra note**: comma.ai strongly discourages the use of openpilot forks with safety code either missing or
-  not fully meeting the above requirements.
-
-[^1]: For these actuator limits we observe ISO11270 and ISO15622. Lateral limits described there translate to 0.9 seconds of maximum actuation to achieve a 1m lateral deviation. 
-

docs_sp/assets/sp_logo.svg

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:675116a9b50eb713b2266396aff1460eed8263738455b1d49365f48168b4d4f9
-size 1698

docs_sp/branches/definitions.md

@@ -1,13 +0,0 @@
-# Definitions
-
-|     Branch     | Definition | Supported Devices                                                                                                                                                                                                                                 | Description                                                                                                                                                                                                                   | Stability/Readiness |
-|:--------------:|------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---|
-|   `release`    | Release branch | Comma 3X                                                                                                                                                                                                                                          | Stable release branch. After testing on `staging`, updates are pushed here and published publicly.                                                                                                                            | **Ready to Use:** Highly stable, recommended for most users.                                                                                                                                                             |
-|   `staging`    | Staging branch | Comma 3X                                                                                                                                                                                                                                          | Pre-release testing branch. Community feedback is essential to identify issues before public release.                                                                                                                         | **Varied Stability:** Generally stable, but intended for testing before public release.                 |
-|     `dev`      | Development branches | Comma 3X                                                                                                                                                                                                                                          | Experimental branch with the latest features and bug fixes brought in manually. Expect bugs and braking changes.                                                                                                              | **Experimental:** Least stable, suitable for testers and developers.                                    |
-|    `master`    | Primary development branch | Comma 3X | All Pull Requests are merged here for future releases. CI automatically strips, minifies, and pushes changes to `staging`. Running the `master` branch is suitable for development purposes but not recommended for non-development use. | **For Development Use:** Suitable for developers, may be unstable for general use.                                 |
-| `release-tici` | Release branch | Comma 3                                                                                                                                                                                                                                           | Stable release branch. After testing on `staging-tici`, updates are pushed here and published publicly.                                                                                                                       | **Ready to Use:** Highly stable, recommended for most users.                                                                                                                                                             |
-| `staging-tici` | Staging branch | Comma 3                                                                                                                                                                                                                                           | Pre-release testing branch. Community feedback is essential to identify issues before public release.                                                                                                                         | **Varied Stability:** Generally stable, but intended for testing before public release.                 |
-
-!!! tip
-    Your feedback is invaluable. Testers, even without software development experience, are encourage to run `dev` or `staging` and report issues.

docs_sp/branches/recommended-branches.md

@@ -1,17 +0,0 @@
-# Recommended Branches
-
-=== "Comma 3X"
-    
-    |  Branch   | Installation URL                      | Change Logs                                                                     |
-    |:---------:|-----------------------------------    |---------------------------------------------------------------------------------|
-    | `release` | **Coming Soon**                       | **Coming Soon**                                                                 |
-    | `staging` | [install.sunnypilot.ai/staging]()     | [CHANGELOG](https://github.com/sunnyhaibin/sunnypilot/blob/staging/RELEASES.md) |
-    |   `dev`   | [install.sunnypilot.ai/dev]()         | [CHANGELOG](https://github.com/sunnyhaibin/sunnypilot/blob/dev/RELEASES.md)     |
-
-=== "Comma 3"
-    
-    |  Branch   | Installation URL                              | Change Logs                                                                     |
-    |:---------:|---------------------------------------        |---------------------------------------------------------------------------------|
-    | `release-tici` | **Coming Soon**                          | **Coming Soon**                                                                 |
-    | `staging-tici` | [install.sunnypilot.ai/staging-tici]()   | [CHANGELOG](https://github.com/sunnyhaibin/sunnypilot/blob/staging/RELEASES.md) |
-

docs_sp/community/CONTRIBUTING.md

@@ -1,68 +0,0 @@
-# How to contribute
-
-Our software is open source so you can solve your own problems without needing help from others. And if you solve a problem and are so kind, you can upstream it for the rest of the world to use. Check out our [post about open-sourcing and externalization](https://www.sunnypilot.ai/blog/july/a-new-chapter-transparency/). Development activity is coordinated through our [GitHub Issues](https://github.com/sunnypilot/sunnypilot/issues), [GitHub Discussions](https://github.com/sunnypilot/sunnypilot/discussions), and [Discord](https://discord.sunnypilot.ai).
-
-### Getting Started
-
-* Setup your [development environment](https://github.com/sunnypilot/sunnypilot/tree/master/tools)
-* Read about the [development workflow](WORKFLOW.md)
-* Join our [Discord](https://discord.sunnypilot.ai)
-* Docs are at [https://docs.sunnypilot.ai](https://docs.sunnypilot.ai) and [https://www.sunnypilot.ai/blog](https://www.sunnypilot.ai/blog)
-
-## What contributions are we looking for?
-
-**sunnypilot's priorities are [safety](../SAFETY.md), stability, quality, and features, in that order.** Aligning with comma's ideals, part of sunnypilot's mission is to *solve self-driving cars while delivering shippable intermediaries*, and **all** development is towards that goal.
-
-### What gets merged?
-
-The probability of a pull request being merged is a function of its value to the project and the effort it will take us to get it merged.
-If a PR offers *some* value but will take lots of time to get merged, it will be closed.
-Simple, well-tested bug fixes are the easiest to merge, and new features are the hardest to get merged. 
-
-All of these are examples of good PRs:
-
-* [typo fix](https://github.com/commaai/openpilot/pull/30678)
-* [removing unused code](https://github.com/commaai/openpilot/pull/30573)
-* [simple car model port](https://github.com/commaai/openpilot/pull/30245)
-* [car brand port](https://github.com/commaai/openpilot/pull/23331)
-* [UI design changes](https://github.com/sunnypilot/sunnypilot/commit/84f6fce90639135611ec568c4d39a352a300bede)
-* [new features](https://github.com/sunnypilot/sunnypilot/commit/68e1379003bfdb599921cf9cd5684bfb762fd676)
-
-### What doesn't get merged?
-
-* **arbitrary style changes**: code is art, and it's up to the author to make it beautiful
-* **500+ line PRs**: clean it up, break it up into smaller PRs, or both
-* **PRs without a clear goal**: every PR must have a singular and clear goal
-
-### First contribution
-
-Check out any [good first issue from commaai's openpilot](https://github.com/commaai/openpilot/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) to get started.
-
-### What do I need to contribute?
-
-A lot of sunnypilot work requires only a PC, and some requires a comma device.
-Most car-related contributions require access to that car, plus a comma device installed in the car.
-
-## Pull Requests
-
-Pull requests should be against the [`master`](https://github.com/sunnypilot/sunnypilot) branch. If you're unsure about a contribution, feel free to open a discussion, issue, or draft PR to discuss the problem you're trying to solve.
-
-A good pull request has all of the following:
-
-- a clearly stated purpose
-- every line changed directly contributes to the stated purpose
-- verification, i.e. how did you test your PR?
-- justification
-
-    * if you've optimized something, post benchmarks to prove it's better
-    * if you've improved your car's tuning, post before and after plots
-
-- passes the CI tests
-
-## Contributing without Code
-
-* Report bugs in [GitHub issues](https://github.com/sunnypilot/sunnypilot/issues).
-* Report driving issues in the `#general` Discord channel.
-* Consider opting into driver camera uploads to improve the driver monitoring model.
-* Connect your device to Wi-Fi regularly, so that comma can pull data for training better driving models.
-* Run the `staging-c3` branch and report issues. This branch is like `master` but it's built just like a release.

docs_sp/community/WORKFLOW.md

@@ -1,43 +0,0 @@
-# sunnypilot development workflow
-
-Aside from the ML models, most tools used for sunnypilot development are in this repo.
-
-Most development happens on normal Ubuntu workstations, and not in cars or directly on comma devices. See the [setup guide](https://github.com/sunnypilot/sunnypilot/tree/master/tools) for getting your PC setup for sunnypilot development.
-
-## Quick start
-
-```bash
-# get the latest stuff
-git pull
-git lfs pull
-git submodule update --init --recursive
-
-# update dependencies
-tools/ubuntu_setup.sh
-
-# build everything
-scons -j$(nproc)
-
-# build just the ui with either of these
-scons -j8 selfdrive/ui/
-cd selfdrive/ui/ && scons -u -j8
-
-# test everything
-pytest
-
-# test just logging services
-cd system/loggerd && pytest .
-
-# run the linter
-op lint
-```
-
-## Testing
-
-### Automated Testing
-
-All PRs and commits are automatically checked by GitHub Actions. Check out `.github/workflows/` for what GitHub Actions runs. Any new tests should be added to GitHub Actions.
-
-### Code Style and Linting
-
-Code is automatically checked for style by GitHub Actions as part of the automated tests. You can also run these tests yourself by running `pre-commit run --all`.

docs_sp/community/reporting-a-bug.md

@@ -1,274 +0,0 @@
-# Bug Reports
-
-sunnypilot is an actively maintained project that we constantly strive to improve. With project of this size and complexity, 
-bugs may occur. If you think you have discovered a bug, you can help us by submitting an issue 
-in [comma's public issue tracker][comma's issue tracker], 
-[sunnypilot's public issue tracker][sunnypilot's issue tracker] or on our [Discord][discord], following this guide.
-
-  [comma's issue tracker]: https://github.com/commaai/openpilot/issues
-  [sunnypilot's issue tracker]: https://github.com/sunnypilot/sunnypilot/issues
-  [discord]: https://discord.sunnypilot.ai
-
-## Before creating an issue
-
-With more than 2,500 users, issues are created frequently. The maintainers of this project are trying very hard to keep 
-the number of open issues and reports down by fixing bugs as fast as possible. By following this guide, you will know 
-exactly what information we need to help you quickly.
-
-**But first, please do the following things before creating an issue.**
-
-### Upgrade to the latest version
-
-Chances are that the bug you discovered was already fixed in a subsequent version. Thus, before reporting an issue, 
-ensure that you're running the [latest release version](https://github.com/sunnypilot/sunnypilot/releases) of sunnypilot. 
-Please consult our [installation guide](../setup/read-before-installing.md) to learn how to upgrade to the latest version.
-
-!!! warning "Bug fixes are not backported"
-    Please understand that only bugs that occur in the latest version of sunnypilot will be addressed. Also, to reduce 
-    duplicate efforts, fixes cannot be backported to earlier versions.
-
-### Remove customizations
-
-If you're using customized features, such as your own tweaks of the features, please remove them from the branch 
-you are testing from before reporting a bug. We can't offer official support for bugs that might hide in your implementations, 
-so make sure to omit any customizations from the version being tested.
-
-If, after removing the customizations, the bug is gone, the bug is likely caused by your customizations. A good idea is 
-to add them back gradually to narrow down the root cause of the problem If you did a major version upgrade, make sure 
-you adjusted all customizations you have implemented.
-
-!!! tip
-    If you are an advanced user, you could also utilize `git bisect` 
-    to perform a binary search in the history to find a particular regression.
-
-!!! warning "Customizations mentioned in our documentation"
-    A handful of the features sunnypilot offers can only be implemented with customizations. if you find a bug in any of 
-    the customizations that our documentations explicitly mentioned, you are, of course, encouraged to report it.
-
-**Don't be shy to ask on our [Discord][discord] for help if you run into problems.**
-
-### Search for solutions
-
-At this stage, we know that the problem persists in the latest version and is not caused by any of your customizations. 
-However, the problem might result from a small typo or a syntactical error in the source code, e.g., `selfdrive/car/interfaces.py`.
-
-Now, before you go through the trouble of creating a bug report that is answered and closed right away with a link to
-the relevant documentation section or another already reported or closed issue or discussion, you can save time for us 
-and yourself by doing some research:
-
-1. [Search our documentation] and look for the relevant sections that could be related to your problem. If found, make
-    sure that the settings are configured correctly.
-2. [Search our Discord][discord] to learn if other users are struggling with similar problems and work together with 
-   our 
-   great community towards a solution. Many problems are solved there.
-3. [Search comma's openpilot issue tracker][comma's issue tracker], as another user might 
-   already have reported the same problem that may exist in
-   stock openpilot, and there might even be a known workaround or fix for it. Thus, no need to create a new issue.
-4. [Search sunnypilot's issue tracker][sunnypilot's issue tracker], as another user might already have 
-   reported the same problem, and there
-   might even be a known workaround or fix for it. Thus, no need to create a new issue.
-
-[Search our documentation]: ?q=
-
-**Keep track of all <u>search terms</u> and <u>relevant links</u>, you'll need them in the bug report.**[^1]
-
-  [^1]:
-    We might be using terminology in our documentation different from yours, but we mean the same. When you include the 
-    search terms and related links in your bug report, you help us to adjust and improve the documentation. 
-
----
-
-At this point, when you still haven't found a solution to your problem, we encourage you to report the issue on our 
-[Discord][discord] because it's now very likely that you stumbled over something we don't know 
-yet. Read the following section 
-to learn how to create a complete and helpful bug report.
-
-## Issue template
-
-We have created an issue template to make the bug reporting process as simple as possible, and more efficient for our
-community and us.
-
-- [Title]
-- [Context]<small>optional</small>
-- [Bug description]
-- [Related links]
-- [Reproduction]
-- [Steps to reproduce]
-- [Checklist]
-
-  [Title]: #title
-  [Context]: #context
-  [Bug description]: #bug-description
-  [Related links]: #related-links
-  [Reproduction]: #reproduction
-  [Steps to reproduce]: #steps-to-reproduce
-  [Checklist]: #checklist
-
-### Title
-
-A good title is short and descriptive. It should be a one-sentence executive summary of the issue, so the impact and
-severity of the bug you want to report can be inferred from the title.
-
-| <!-- --> | Example                                                                                                      |
-| -------- |--------------------------------------------------------------------------------------------------------------|
-| :material-check:{ style="color: #4DB6AC" } __Clear__ | Speed Limit Control (SLC) stuck in `preActive` when engaged                                                  |
-| :material-close:{ style="color: #EF5350" } __Wordy__ | The Speed Limit Control (SLC) remains in the `preActive` state when longitudinal it's supposed to be engaged |
-| :material-close:{ style="color: #EF5350" } __Unclear__ | SLC does not work                                                                                            |
-| :material-close:{ style="color: #EF5350" } __Useless__ | Help                                                                                                         |
-
-### Context <small>optional</small> { #context }
-
-Before describing the bug, you can provide additional context for us to understand what you were trying to achieve.
-Explain the circumstances in which you're using sunnypilot, and what you _think_ might be relevant. Don't write 
-about the bug here.
-
-!!! note "__Why this might be helpful__"
-    Some errors only manifest in specific settings, environments or edge cases, for example, when the feature is not available
-    to certain cars.
-
-### Bug description
-
-Now, to the bug you want to report. Provide a clear, focused, specific, and concise summary of the bug you encountered. 
-Explain why you think this is a bug that should be reported to sunnypilot, and not to one of its dependencies.[^3]
-Adhere to the following principles:
-
-  [^3]:
-    Sometimes, users report bugs on our [sunnypilot's issue tracker] or [Discord][discord] 
-    that are caused by one of our upstream dependencies, including [comma's openpilot], [comma's panda],
-    or other openpilot forks' dependencies. A good rule of thumb is
-    to reproduce the issue with stock openpilot in the same conditions and
-    check if the problem persists. If it does, the problem is likely not
-    related to sunnypilot and should be reported upstream. When in
-    doubt, use our [Discord][discord] to ask for help.
-
-  [comma's openpilot]: https://github.com/commaai/openpilot
-  [comma's panda]: https://github.com/commaai/panda
-
--   __Explain the <u>what</u>, not the <u>how</u>__ – don't explain
-    [how to reproduce the bug][Steps to reproduce] here, we're getting there.
-    Focus on articulating the problem and its impact as clearly as possible.
-
--   __Keep it short and concise__ – if the bug can be precisely explained in one
-    or two sentences, perfect. Don't inflate it – maintainers and future users
-    will be grateful for having to read less.
-
--   __One bug at a time__ – if you encounter several unrelated bugs, please
-    create separate issues for them. Don't report them in the same issue, as
-    this makes attribution difficult.
-
----
-
-:material-run-fast: __Stretch goal__ – if you found a workaround or a way to fix
-the bug, you can help other users temporarily mitigate the problem before
-we maintainers can fix the bug in our code base.
-
-!!! note "__Why we need this__"
-    In order for us to understand the problem, we need a clear description of it and quantify its impact, which is 
-    essential for triage and prioritization.
-
-### Related links
-
-Of course, prior to reporting a bug, you have read our documentation and
-[could not find a working solution][search for solutions]. Please share links
-to all sections of our documentation that might be relevant to the bug, as it
-helps us gradually improve it.
-
-Additionally, since you have searched [comma's issue tracker], [sunnypilot's issue tracker] or [Discord][discord]
-before reporting an issue, and have possibly found several issues or
-discussions, include those as well. Every link to an issue or discussion creates
-a backlink, guiding us maintainers and other users in the future.
-
----
-
-:material-run-fast: __Stretch goal__ – if you also include the search terms you
-used when [searching for a solution][search for solutions] to your problem, you
-make it easier for us maintainers to improve the documentation.
-
-  [search for solutions]: #search-for-solutions
-
-### Reproduction
-
-A minimal reproduction is at the heart of every well-written bug report, as
-it allows us maintainers to instantly recreate the necessary conditions to
-inspect the bug to quickly find its root cause. It's a proven fact that issues
-with concise and small reproductions can be fixed much faster.
-
-After you have created the reproduction, take note of your <u>__comma Dongle ID__</u>. It will be used during the bug 
-report.
-
-!!! note "__Why we need this__"
-    If an issue contains no minimal reproduction or just a link to a repository with thousands of files, the 
-    maintainers would need to invest a lot of time into trying to recreate the right conditions to even inspect the 
-    bug, let alone fix it.
-
-!!! warning "Don't share links to repositories"
-    While we know that it is a good practice among developers to include a link
-    to a repository with the bug report, we currently don't support those in our
-    process. The reason is that the reproduction, which is automatically
-    produced by the <u>__route ID__</u> contains all the necessary
-    environment information that is often forgotten to be included.
-
-    Additionally, there are many non-technical users of sunnypilot that
-    have trouble creating repositories.
-
-### Steps to reproduce
-
-At this point, you provided us with enough information to understand the bug
-and provided us with a reproduction that we could run and inspect. However, when
-we check your reproduction, it might not be immediately apparent how we can see
-the bug in action.
-
-Thus, please list the specific steps we should follow when running your
-reproduction to observe the bug. Keep the steps short and concise, and make sure
-not to leave anything out. Use simple language as you would explain it to a
-five-year-old, and focus on continuity.
-
-!!! note "__Why we need this__"
-    We must know how to navigate your reproduction in order
-    to observe the bug, as some bugs only occur at certain viewports or in
-    specific conditions.
-
-### Uploading logs and preserving routes
-
-After reproducing the bug, please follow these steps to upload the necessary logs and preserve the routes.
-
-1. Ensure the route is fully uploaded at [comma Connect]. We cannot look 
-  into issues without routes, or at least a comma Dongle ID.
-
-    1. Visit [comma Connect], select the route with the issue reproduced.
-    2. Under the "Files" button, locate "All logs". Click "Upload x files".
-    3. View the upload queue, and confirm that all raw logs are uploaded.
-
-    !!! note
-        Sometimes when the qlogs of the route are still being uploaded, some raw logs may not be available to 
-        request for upload. Refresh the page a few times once you have confirmed all qlogs have been uploaded, 
-        then try to upload all raw logs again if available.
-
-2. Share your Dongle ID with sunnypilot on [comma Connect].
-
-    1. Visit [comma Connect], navigate to the gear icon.
-    2. Select "Share by email", and enter `support@sunnypilot.ai`.
-    3. Confirm the sharing by clicking the share icon again.
-    4. Set the device name to your vehicle's year/make/model and your Discord username, so it can be easily identified.
-
-3. Once all raw logs are uploaded, click "More info" and enable the "Preserved" option to preserve the route.
-4. Attach the route ID in your issue submission.
-
-  [comma Connect]: https://connect.comma.ai
-
-### Checklist
-
-Thanks for following the guide and creating a high-quality and complete bug
-report – you are almost done. The checklist ensures that you have read this guide
-and have worked to your best knowledge to provide us with everything we need to
-know to help you.
-
-- [ ] I have upgraded to the latest release version of sunnypilot.
-- [ ] I have removed or disable any customizations and confirmed the bug persists.
-- [ ] I have searched the documentation, issue trackers, and Discord for similar issues.
-- [ ] I have created a minimal reproduction and noted my comma Dongle ID.
-- [ ] I have shared my Dongle ID with sunnypilot at `support@sunnypilot.ai`.
-- [ ] I have filled out all required sections of the issue template.
-- [ ] I have followed this guide and ensured all necessary information is included.
-
-__We'll take it from here.__

docs_sp/community/reporting-a-docs-issue.md

@@ -1,97 +0,0 @@
-# Documentation issues
-
-Our documentation is composed of many pages and includes extensive
-information on features, configurations, customizations, and much more. If you
-have found an inconsistency or see room for improvement, please follow this
-guide to submit an issue on our [issue tracker].
-
-  [issue tracker]: https://github.com/sunnypilot/sunnypilot/issues
-
-## Issue template
-
-Reporting a documentation issue is usually less involved than reporting a bug.
-Please thoroughly read this guide before creating a new documentation issue,
-and provide the following information as part of the issue:
-
-- [Title]
-- [Description]
-- [Related links]
-- [Proposed change] <small>optional</small>
-- [Checklist]
-
-  [Title]: #title
-  [Description]: #description
-  [Related links]: #related-links
-  [Proposed change]: #proposed-change
-  [Checklist]: #checklist
-
-### Title
-
-A good title should be a short, one-sentence description of the issue, contain
-all relevant information and, in particular, keywords to simplify the search in
-our issue tracker.
-
-| <!-- --> | Example  |
-| -------- | -------- |
-| :material-check:{ style="color: #4DB6AC" } __Clear__ | Clarify Speed Limit Control engagement
-| :material-close:{ style="color: #EF5350" } __Unclear__ | Missing information in the docs
-| :material-close:{ style="color: #EF5350" } __Useless__ | Help
-
-### Description
-
-Provide a clear and concise summary of the inconsistency or issue you
-encountered in the documentation or the documentation section that needs
-improvement. Explain why you think the documentation should be adjusted and
-describe the severity of the issue:
-
--   __Keep it short and concise__ – if the inconsistency or issue can be
-    precisely explained in one or two sentences, perfect. Maintainers and future
-    users will be grateful for having to read less.
-
--   __One issue at a time__ – if you encounter several unrelated inconsistencies,
-    please create separate issues for them. Don't report them in the same issue
-    – it makes attribution difficult.
-
-!!! note "__Why we need this__"
-    Describing the problem clearly and concisely is a prerequisite for improving
-    our documentation – we need to understand what's wrong, so we can fix it.
-
-### Related links
-
-After you described the documentation section that needs to be adjusted above,
-we now ask you to share the link to this specific documentation section and
-other possibly related sections. Make sure to use anchor links (permanent links)
-where possible, as it simplifies discovery.
-
-!!! note "__Why we need this__"
-    Providing the links to the documentation help us understand which sections
-    of our documentation need to be adjusted, extended, or overhauled.
-
-### Proposed change <small>optional</small> { #proposed-change }
-
-Now that you have provided us with the description and links to the
-documentation sections, you can help us, maintainers, and the community by
-proposing an improvement. You can sketch out rough ideas or write a concrete
-proposal. This field is optional but very helpful.
-
-!!! note "__Why we need this__"
-    An improvement proposal can be beneficial for other users who encounter
-    the same issue, as they offer solutions before we maintainers can update
-    the documentation.
-
-### Checklist
-
-Thanks for following the guide and providing valuable feedback for our
-documentation – you are almost done. The checklist ensures that you have read
-this guide and have worked to your best knowledge to provide us with every piece
-of information we need to improve it.
-
-- [ ] I have provided a clear and descriptive title for the documentation issue.
-- [ ] I have summarized the inconsistency or issue concisely in the description.
-- [ ] I have included links to the specific documentation section(s) that need
-      adjustments.
-- [ ] (Optional) I have proposed a change or improvement to the documentation.
-- [ ] I have followed this guide and ensured all necessary information is included.
-
-__We'll take it from here.__
-

docs_sp/features/auto-lane-change.md

@@ -1,24 +0,0 @@
----
-title: Auto Lane Change
-description: Detailed documentation on the Auto Lane Change feature in sunnypilot.
----
-
-# Auto Lane Change
-
-sunnypilot's Auto Lane Change feature allows the vehicle to automatically change lanes.
-
-## Key Setting and How to Use
-
-- **Nudge to Confirm:** This is the default method. To perform a lane change, activate the turn signal in the desired direction and then gently turn the steering wheel (nudges) in the same direction to confirm the maneuver.
-- **Nudge-less Lane Change:** For a more automated experience, users can enable a "nudge-less" option. With this setting, you only need to activate the turn signal to initiate a lane-change.
-- **Nudge-less with Delay** This is same as Nudge-less mode, but with a fixed delay. Once the turn-indicator is activated, sunnypilot will wait for the selected delay before initiating the lane change.
-
-### Additional Related Settings
-- **Delay with Blind Spot:** This crucial safety feature adds a delay to the lane change if the vehicle's blind spot monitoring (BSM) system detects an object. The lane change will only proceed after the blind spot is clear.
-
-## Important Considerations
-
-- **Manual Override:** The driver can regain control at any time by taking control of the steering wheel.
-- **Driver Monitoring:** sunnypilot utilizes driver monitoring to ensure the driver remains attentive.
-- **Object Detection:** The system is primarily designed to follow lane lines and may not detect all objects. The driver must always be prepared to take control.
-- **Lane Markings:** The feature's performance is dependent on clear and visible lane markings.

docs_sp/features/custom-acc-increments.md

@@ -1,13 +0,0 @@
----
-title: Custom ACC Increments
-description: Detailed documentation on the Custom ACC Increments feature in sunnypilot.
----
-
-# Custom ACC Increments
-
-sunnypilot offers customization to the set speed increments for Adaptive Cruise Control (ACC) when sunnypilot is controlling the vehicle's longitudinal control. This allows for more precise speed adjustments compared to the default behavior of many vehicles.
-
-- **Short press**: This controls the speed adjustment when the "RES+" or "SET-" button is pressed for a short period of time.
-  - Allowed values: 1 through 10
-- **Long press**: This controls the speed adjustment when the "RES+" or "SET-" button is pressed for a longer duration.
-  - Allowed values: 1, 5, 10

docs_sp/features/dynamic-experimental-control.md

@@ -1,14 +0,0 @@
----
-title: Dynamic Experimental Control
-description: Detailed documentation on the Dynamic Experimental Control feature in sunnypilot.
----
-
-# Dynamic Experimental Control (DEC)
-
-Dynamic Experimental Control (DEC) intelligently switches between the standard adaptive cruise control (ACC) and the end-to-end longitudinal control of Experimental Mode based on the driving conditions.
-
-**Chill Mode** is the standard adaptive cruise control method. It is designed to provide a smooth, predictable driving experience. However, it does not provide advanced driving capabilities like stopping at red lights and stop signs.
-
-**Experimental Mode** allows the system to control the vehicle's speed and tries to drive like a human, enabling it to slow down for turns, stop at red lights, and stop signs. While capable and experimental, this mode can sometimes be overly cautious, especially on highways.
-
-***Dynamic Experimental Control*** aims to provide the best of both worlds: the advanced capabilities of Experimental Mode when needed, and the smooth, predictable behavior of the standard system for less complex driving scenarios. This allows for a more natural driving experience by using Experimental Mode in situations where it excels, such as city driving and tight turns, while reverting to the default behavior for highway driving.

docs_sp/features/hyundai-longitudinal-tuning.md

@@ -1,97 +0,0 @@
-
-# **How custom longitudinal tuning works for Hyundai/Kia/Genesis vehicles in sunnypilot.**
-
-To begin this documentation, I would like to first present the safety guidelines followed to create the tune:
-
-Our main safety guideline considered is [ISO 15622:2018](https://www.iso.org/obp/ui/en/#iso:std:iso:15622:ed-3:v1:en)
-This provides the groundwork of safety limits this tune must adhere too, and therefore, must be followed.
-For example, in our jerk calculations throughout this tune, you will see how maximum jerk is clipped using the equation provided.
-
-In the tuning you will see a set of equations, the first being jerk, **but what exactly is jerk?**
-Jerk is calculated by taking current acceleration (in the form of m/s^2), subtracting that by previous acceleration, and
-dividing that by time. In our tune you will see the following equation:
-
-    planned_accel = CC.actuators.accel
-    current_accel = CS.out.aEgo
-    blended_value = 0.67 * planned_accel + 0.33 * current_accel
-    delta = blended_value - self.state.accel_last_jerk
-
-    self.state.jerk = math.copysign(delta * delta, delta)
-    self.state.accel_last_jerk = blended_value
-
-Instead of using a hardcoded time, we are focused on making jerk parabolic. First we have our planned acceleration from longitudinal_planner.
-Then we have our current carstate acceleration. These are then blended together 67:33 = 100% to form our blended value.
-Following this, we have our delta which subtracts our blended_value from our previous acceleration `self.state.accel_last_jerk`
-Lastly, we have our finalized jerk calculation, which squares the delta to create a parabolic response while retaining the original sign,
-which could be positive or negative (e.g., 5.0 or -5.0). This then goes through our minimum and maximum clipping
-which forces a value between our set min and max, which I discuss later in this readme.
-
-Moving on, the accel_last_jerk, stores current accel after each iteration and uses that in the calculation as previous accel for
-our jerk calculations. Now we see the calculation of jerk max and jerk min. 
-
-### Let's dive into how jerk lower limit max is calculated:
-
-     velocity = CS.out.vEgo
-    if velocity < 5.0:
-      decel_jerk_max = self.car_config.jerk_limits[1]
-    elif velocity > 20.0:
-      decel_jerk_max = 2.5
-    else:
-      decel_jerk_max = 3.64284 - 0.05714 * velocity
-
-This equation above is set by ISO 15622, and dictates that jerk lower limit can only be five when below 5 m/s. In our equation,
-
-    self.car_config.jerk_limits[1] 
-
-Jerk_limits[1] represents a jerk value of 3.3 m/s^3, which is the maximum analyzed lower jerk rate seen on stock SCC CAN.
-Between 5 m/s and 20 m/s jerk is capped using the calculation:
-
-    decel_jerk_max = 3.64284 - 0.05714 * velocity
-
-This equation calculates the linear jerk from 6m/s to 19m/s, scaling down from 3.3 to 2.5 m/s^3.
-This means that if current velocity is say, 15 m/s the final jerk max value would be capped at 2.78 m/s^3.
-Anything above 20 m/s is capped to a lower jerk max of 2.5 m/s^3. This allows for a smoother jerk range, while complying to ISO standards to a tee.
-The current jerk Lower Limit you will see in openpilot before this tune, is 5.0 m/s^3; Which as you can see from using the above calculation,
-the 5.0 m/s^3 technically does not comply with ISO standards at any speed above 5.0 m/s^3.
-Having our jerk max be clipped to these values not only allows for better consistency with ISO standards, 
-but also enables us to have a much smoother braking experience.
-
-### Getting into our next topic, I would like to explain how our minimum jerk was chosen.
-
-Minimum jerk was chosen based off of the following guideline proposed by Handbook of Intellegent Vehicles (2012):
-`Ride comfort may be sacrificed only under emergency conditions when vehicle and occupant safety consideration may preclude comfort.`
-
-### What the value of 0.53 m/s^3 of the jerk lower limit was chosen based off of
-
-[Carlowitz et al. (2024).](https://www.researchgate.net/publication/382274551_User_evaluation_of_comfortable_deceleration_profiles_for_highly_automated_driving_Findings_from_a_test_track_study)
-This research study identified the average lower jerk used in comfortable driving settings, which is 0.53 m/s^3.
-This is then inputted to jerk_limits[0] as 0.53 m/s^3 represents the value used in upper jerk absolute minimum.
-
-     min_lower_jerk = self.car_config.jerk_limits[0]
-
-As shown above, lower jerk minimum of 0.53 is used for our lower_jerk minimum bounds.
-
-### Why our minimum upper jerk is conditional
-
-Our minimum upper band jerk is conditional as well and is denoted below:
-
-    min_upper_jerk = self.car_config.jerk_limits[0] if (velocity > 3.611) else 0.60
-
-This means that for speeds under 3.611 m/s (8.077 mph/ 13 kph) we have a minimum jerk of 0.60. This allows for smooth
-takeoffs while not causing lag. For all other speeds, we use our normal jerk_limit for minimum, which is 0.53.
-
-### Next, we have our acceleration limiting
-
-For acceleration limiting, we use TCS signal brakeLightsDEPRECATED to measure when to enact the standstill delay 
-which stock SCC uses to allow smoother transitions in acceleration.
-
-### Lastly, we have our accel value calculations for hyundaican.py
-
-For our accel value calculations we have the following:
-
-   `self.accel_value = np.clip(self.accel_raw, self.state.accel_last - jerk_number, self.state.accel_last + jerk_number)`
-
-This essentially means that we have our accel_raw, which is acceleration (m/s^2), followed by our clipping variables. 
-jerk_number in this equation represents exactly `0.1`, which is subtracted or added by self.state.accel_last, which is 
-previous calculated accel_value. Furthermore, we have `self.state.accel_last`, which is calculated as the stored accel from
-the above calculations.

docs_sp/features/icbm.md

@@ -1,17 +0,0 @@
----
-title: ICBM (Intelligent Cruise Button Management)
-description: Detailed documentation on the ICBM feature in sunnypilot.
----
-
-# ICBM (Intelligent Cruise Button Management)
-
-Intelligent Cruise Button Management (ICBM) is a system designed to manage the vehicle's cruise control set speed by sending cruise control button commands via CAN bus to the car.
-
-ICBM is particularly useful in vehicles openpilot Longitudinal Control is not available or not desirable to use. By simulating button presses to adjust the stock cruise control set speed, sunnypilot's ICBM can manage the car's speed while keeping native safety features active, such as Forward Collision Warning (FCA) and Automatic Emergency Braking (AEB).
-
-ICBM also allows the vehicle to use the following features:
-
-- **[Smart Cruise Control - Vision (SCC-V)]()**
-- **[Smart Cruise Control - Map (SCC-M)]()**
-- **[Speed Limit Assist (SLA)]()**
-- **[Custom ACC Increments]()**

docs_sp/features/mads.md

@@ -1,17 +0,0 @@
-# Modular Assistive Driving System (M.A.D.S.)
-
-Modular Assistive Driving System (MADS) aims to elevate the user's driving experience by modifying the behaviors of 
-driving assist engagements.
-
-!!! note
-    This feature aligns closely with comma.ai's safety rules.
-
-## Independent Engagement
-
-MADS allows users to engage sunnypilot Automatic Lane Centering (ALC) for lateral control and Adaptive Cruise Control 
-(ACC) or Smart Cruise Control (SCC) for longitudinal control independently.
-
-!!! note "Why This Feature Exists"
-    While newer car models allow for independent engagement of lateral (steering) and longitudinal (speed) control, 
-    many older vehicle models and stock openpilot enforce engaging both controls together. MADS introduces this modern 
-    convenience to older vehicle models, effectively backporting a feature found in newer cars and providing users more flexibility.

docs_sp/features/nnlc.md

@@ -1,15 +0,0 @@
----
-title: Neural Network Lateral Control (NNLC)
-description: Detailed documentation on the NNLC feature in sunnypilot.
----
-
-# Neural Network Lateral Control (NNLC)
-
-sunnypilot's Neural Network Lateral Control (NNLC) is a feature that enhances the system's ability to steer a vehicle. It enhances the standard lateral controller with one based on a neural network trained on the vehicle's torque data, aiming for smoother and more precise steering adjustments.
-
-## Key Aspects of NNLC
-
-- **Improved Accuracy:** The neural network is trained using driving data specific to each vehicle, which allows for more accurate control.
-- **Smoother Turns:** NNLC inputs past curvature data into its driving model to achieve smoother and more precise lateral control, especially noticeable when taking curves on a highway. Users report that it reduces the oversteering and understeering corrections.
-
-Formerly known as "NNFF" (Neural Network Feedforward), NNLC aims to make the driving experience feel more natural and less "jittery" in turns.

docs_sp/features/scc-m.md

@@ -1,9 +0,0 @@
-# Smart Cruise Control - Map (SCC-M)
-
-Smart Cruise Control - Map (SCC-M) leverages map data to proactively adjust your vehicle's speed by calculating curvature in the road ahead.
-
-!!! note
-    This feature is only available when sunnypilot is actively controlling the vehicle's longitudinal control.
-
-!!! note
-    This feature requires OpenStreetMap data for the current location to be downloaded.

docs_sp/features/scc-v.md

@@ -1,6 +0,0 @@
-# Smart Cruise Control - Vision (SCC-V)
-
-Smart Cruise Control - Vision (SCC-V) leverages camera vision data to proactively adjust your vehicle's speed by calculating curvature in the road ahead.
-
-!!! note
-    This feature is only available when sunnypilot is actively controlling the vehicle's longitudinal control.

docs_sp/features/speed-limit-assist.md

@@ -1,26 +0,0 @@
----
-title: Speed Limit Assist
-description: Detailed documentation on the Speed Limit Assist feature in sunnypilot.
----
-
-# Speed Limit Assist (SLA)
-
-Speed Limit Assist (SLA) is a comprehensive framework in sunnypilot that adjusts the vehicle's set cruise speed according to detected speed limits. It reconciles data from multiple sources to determine the current speed limit.
-
-## Core Functionality
-
-SLA utilizes various data sources to determine the speed limit for the current road:
-
-- **OpenStreetMap (OSM):** Utilizes map data to fetch speed limits. sunnypilot has a refactored OSM implementation for lower resource usage and provides weekly updates.
-- **Car's Stock System:** On some compatible vehicles, it can pull speed limit data directly from the car's native system.
-
-## Key Features and Customization
-
-sunnypilot offers extensive customization for its speed control features:
-
-- **Selectable Speed Limit Source:** Users can define the priority of data sources (e.g., OSM, Navigation, Vision) for determining the speed limit.
-- **Configurable Offsets:** You can set an offset above the detected speed limit, either as a fixed value (e.g., +5 mph) or a percentage.
-- **Engagement Modes:**
-    - **Auto:** Automatically adjusts the cruise speed when a new speed limit is detected.
-    - **User Confirm:** Informs the driver of the new speed limit and waits for them to confirm the change before adjusting the speed.
-- **Alerts and Warnings:** The system provides alerts to inform the driver before a speed adjustment occurs.

docs_sp/getting-started/develop-sunnypilot.md

@@ -1,9 +0,0 @@
-# To start developing sunnypilot
-
-sunnypilot is a fork of [commaai's openpilot](https://github.com/commaai/openpilot), developed by [sunnypilot](https://sunnypilot.ai) and by users like you. 
-We welcome both pull requests and issues on [GitHub](http://github.com/sunnypilot/sunnypilot).
-
-* Join the [community Discord](https://discord.sunnypilot.ai)
-* Check out [the contributing docs](../community/CONTRIBUTING.md)
-* Check out the [openpilot tools](https://github.com/sunnypilot/sunnypilot/tree/master/tools)
-* Read about the [development workflow](../community/WORKFLOW.md)

docs_sp/getting-started/use-sunnypilot-in-a-car.md

@@ -1,16 +0,0 @@
-# To start using sunnypilot in a car
-
-To use sunnypilot in a car, you need four things:
-
-1. **Supported Device:** a comma 3/3X, available at [comma.ai/shop](https://comma.ai/shop/comma-3x).
-
-2. **Software:** The setup procedure for the comma 3/3X allows users to enter a URL for custom software. Use the URL `release-c3.sunnypilot.ai` to install the release version.
-
-3. **Supported Car:** Ensure that you have one of [the 275+ supported cars](https://github.com/sunnypilot/sunnypilot/blob/master/docs/CARS.md).
-
-4. **Car Harness:** You will also need a [car harness](https://comma.ai/shop/car-harness) to connect your comma 3/3X to your car.
-
-[comma.ai](https://comma.ai) have detailed instructions for [how to install the harness and device in a car](https://comma.ai/setup).
-
-!!! note
-    It's possible to run sunnypilot on [other hardware](https://blog.comma.ai/self-driving-car-for-free/), although it's not plug-and-play.

docs_sp/getting-started/what-is-sunnypilot.md

@@ -1,11 +0,0 @@
-# What is sunnypilot?
-
-sunnypilot is a fork of [comma.ai's openpilot](https://github.com/commaai/openpilot), an open source driver assistance system. sunnypilot offers the user a unique driving experience for over 250+ supported car makes and models with modified behaviors of driving assist engagements. sunnypilot complies with comma.ai's safety rules as accurately as possible.
-
-## How do I use it?
-
-sunnypilot is designed to be used on the comma 3/3X.
-
-## How does it work?
-
-In short, sunnypilot uses the car's existing APIs for the built-in [ADAS](https://en.wikipedia.org/wiki/Advanced_driver-assistance_system) system and simply provides better acceleration, braking, and steering inputs than the stock system.

docs_sp/index.md

@@ -1,3 +0,0 @@
-The documentation here is as best-effort sync from the official https://sunnypilot.github.io/ for ease of access and for AI enhancement when users asks on the forum.
-
-

docs_sp/safety-information/prohibited-safety-modifications.md

@@ -1,14 +0,0 @@
-# Prohibited Safety Modifications
-
-All [official sunnypilot branches](https://github.com/sunnyhaibin/sunnypilot/branches) strictly adhere to [comma.ai's safety policy](https://github.com/commaai/openpilot/blob/master/docs/SAFETY.md). Any changes that go against 
-this policy will result in your fork and your device being banned from both comma.ai and sunnypilot channels.
-
-The following changes are **VIOLATIONS** of the safety policy and **ARE NOT** supported in any official sunnypilot branches:
-
-!!! danger "Driver Monitoring"
-    - "Nerfing" or reducing monitoring parameters.
-
-!!! danger "Panda Safety"
-    - No preventing disengaging of <ins>**longitudinal control**</ins> (positive/negative acceleration) on brake pedal press.
-    - No auto re-engaging of <ins>**longitudinal control**</ins> (positive/negative acceleration) on brake pedal release.
-    - No disengaging on `CRUISE MAIN` in `OFF` state.

docs_sp/setup/read-before-installing.md

@@ -1,20 +0,0 @@
-# 🚨 Read Before Installing
-
-It is recommended to read the <u>**entire documentation**</u> before proceeding. This will ensure that you fully understand each added feature in sunnypilot. This also ensures that you are choosing the correct settings and branch for your car to have the best driving experience.
-
-!!! warning
-    By installing this software, you accept all responsibility for anything that might occur while you use it. sunnypilot and all contributors to sunnypilot are not liable.
-
-    **Use at your own risk.**
-
-## Installation
-
-Please refer to the [Recommended Branches](../branches/recommended-branches.md) to find your preferred/supported branch. This guide will assume you want to install the latest `release-c3` branch.
-
-You can install sunnypilot on your comma 3/3X using one of the following methods:
-
-- ### [URL Method (Directly on Device)](url-method.md)
-This method allows you to install sunnypilot directly from your device's screen using a provided URL. It's simple and user-friendly, requiring no additional tools or external devices.
-
-- ### [SSH Method (Command Line)](ssh-method.md)
-This method is for advanced users who prefer to use SSH to clone the sunnypilot repository and install it manually via the command line. It offeres greater control over the installation process.

docs_sp/setup/ssh-method.md

@@ -1,28 +0,0 @@
-# SSH Method
-
-If you are looking to install sunnypilot via SSH, run the following commands in an SSH terminal after connecting to your comma 3/3X:
-
-1. Navigate to `data` directory
-    ```sh 
-    cd /data
-    rm -rf openpilot
-    ```
-
-2. Clone sunnypilot
-
-    !!! example ""
-        `staging` branch is used in this step as an example.
-    ```sh
-    git clone -b staging --recurse-submodules https://github.com/sunnypilot/sunnypilot.git openpilot
-    ```
-
-3. Git LFS
-    ```sh
-    cd openpilot
-    git lfs pull
-    ```
-
-4. Reboot
-    ```sh
-    sudo reboot
-    ```

docs_sp/setup/url-method.md

@@ -1,18 +0,0 @@
-# URL Method
-
-The URL installation method can be done in two ways, depending on your device & if you already have sunnypilot installed.
-
-=== "sunnypilot not installed"
-
-    1. [Factory reset/uninstall](https://github.com/commaai/openpilot/wiki/FAQ#how-can-i-reset-the-device) the previous software if you have another software/fork installed.
-    2. After factory reset/uninstall, upon reboot, select `Custom Software` when given the option.
-    3. Input the **Installation URL** per [Recommended Branches](../branches/recommended-branches.md).
-    4. Complete the rest of the installation by following the onscreen instructions.
-
-
-=== "sunnypilot already installed"
-
-    1. On the comma 3/3X, go to `Settings` → `Software`.
-    2. At the `Download` option, press `CHECK`. This will fetch the list of latest branches from the sunnypilot repository on GitHub.
-    3. At the `Target Branch` option, press `SELECT` to open the `Target Branch` selector.
-    4. Scroll and select the **Desired Branch** per Recommended Branches.

docs_sp/stylesheets/style.css

@@ -1,6 +0,0 @@
-/**
- * Copyright (c) 2021-, Haibin Wen, sunnypilot, and a number of other contributors.
- *
- * This file is part of sunnypilot and is licensed under the MIT License.
- * See the LICENSE.md file in the root directory for more details.
- */

mkdocs-sp.yml

@@ -1,150 +0,0 @@
-site_name: sunnypilot docs
-repo_name: sunnypilot/sunnypilot
-repo_url: https://github.com/sunnypilot/sunnypilot/
-site_description: sunnypilot Documentation
-site_url: https://docs.sunnypilot.ai
-edit_uri: blob/new-docs/docs_sp
-
-exclude_docs: README.md
-
-strict: true
-docs_dir: docs_sp
-site_dir: docs_sp_site/
-
-theme:
-  name: material
-  palette:
-    - media: "(prefers-color-scheme)"
-      toggle:
-        icon: material/brightness-auto
-        name: Switch to light mode
-    - scheme: default
-      media: "(prefers-color-scheme: light)"
-      primary: deep purple
-      accent: teal
-      toggle:
-        icon: material/brightness-7
-        name: Switch to dark mode
-    - scheme: slate
-      media: "(prefers-color-scheme: dark)"
-      primary: deep purple
-      accent: teal
-      toggle:
-        icon: material/brightness-4
-        name: Switch to system preference
-  font:
-    text: Open Sans
-    code: Fira Code
-  logo: assets/sp_logo.svg
-  favicon: assets/sp_logo.svg
-  features:
-    - content.code.copy
-    - navigation.tabs
-    - navigation.tabs.sticky
-
-extra_css:
-  - stylesheets/style.css
-
-markdown_extensions:
-  - admonition
-  - attr_list
-  - def_list
-  - footnotes
-  - md_in_html
-  - tables
-  - pymdownx.details
-  - pymdownx.emoji:
-      emoji_index: !!python/name:material.extensions.emoji.twemoji
-      emoji_generator: !!python/name:material.extensions.emoji.to_svg
-  - pymdownx.highlight:
-      anchor_linenums: true
-      line_spans: __span
-      pygments_lang_class: true
-  - pymdownx.inlinehilite
-  - pymdownx.magiclink:
-      normalize_issue_symbols: true
-      repo_url_shorthand: true
-      user: sunnypilot
-      repo: sunnypilot
-  - pymdownx.snippets
-  - pymdownx.superfences
-  - pymdownx.tabbed:
-      alternate_style: true
-  - pymdownx.tasklist:
-      custom_checkbox: true
-      clickable_checkbox: true
-  - toc:
-      permalink: true
-
-plugins:
-  - git-authors:
-      show_email_address: false
-  - git-committers:
-      repository: sunnypilot/sunnypilot
-      branch: master
-      enabled: !ENV [CI, false]
-  - git-revision-date-localized:
-      enable_creation_date: true
-  - search
-  - redirects:
-      redirect_maps:
-        'index.md': 'getting-started/what-is-sunnypilot.md'
-
-extra:
-  social:
-    - icon: fontawesome/brands/github
-      link: https://github.com/sunnypilot/sunnypilot
-    - icon: fontawesome/brands/discord
-      link: https://discord.sunnypilot.ai
-#  analytics:
-#    provider: google
-#    property: !ENV GOOGLE_ANALYTICS_KEY
-#    feedback:
-#      title: Was this page helpful?
-#      ratings:
-#        - icon: material/emoticon-happy-outline
-#          name: This page was helpful
-#          data: 1
-#          note: >-
-#            Thanks for your feedback!
-#        - icon: material/emoticon-sad-outline
-#          name: This page could be improved
-#          data: 0
-#          note: >-
-#            Thanks for your feedback! Help us improve this page by
-#            using our <a href="..." target="_blank" rel="noopener">feedback form</a>.
-
-nav:
-  - Getting Started:
-      - What is sunnypilot?: getting-started/what-is-sunnypilot.md
-      - Use sunnypilot in a car: getting-started/use-sunnypilot-in-a-car.md
-      - Develop sunnypilot: getting-started/develop-sunnypilot.md
-      - Setup:
-          - 🚨 Read before installing 🚨: setup/read-before-installing.md
-          - Installation:
-              - URL Method: setup/url-method.md
-              - SSH Method: setup/ssh-method.md
-  - Features:
-      - Auto Lane Change: features/auto-lane-change.md
-      - Custom ACC Increments: features/custom-acc-increments.md
-      - Dynamic Experimental Control: features/dynamic-experimental-control.md
-      - Hyundai Longitudinal Tuning: features/hyundai-longitudinal-tuning.md
-      - Intelligent Cruise Button Management: features/icbm.md
-      - Modular Assistive Driving System: features/mads.md
-      - Neutral Network Lateral Control: features/nnlc.md
-      - Smart Cruise Control - Map: features/scc-m.md
-      - Smart Cruise Control - Vision: features/scc-v.md
-      - Speed Limit - Assist: features/speed-limit-assist.md
-  - Community:
-      - Contributing: community/CONTRIBUTING.md
-      - Workflow: community/WORKFLOW.md
-      - Reporting a bug: community/reporting-a-bug.md
-      - Reporting a docs issue: community/reporting-a-docs-issue.md
-      - Discord Community: https://discord.sunnypilot.ai
-  - Safety Information:
-      - Safety: SAFETY.md
-      - Prohibited safety modifications: safety-information/prohibited-safety-modifications.md
-  - References:
-      - Branches:
-          - Recommended Branches: branches/recommended-branches.md
-          - Branch Definitions: branches/definitions.md

pyproject.toml

@@ -80,13 +80,6 @@ docs = [
   "Jinja2",
   "natsort",
   "mkdocs",
-  "mkdocs-material",
-  "mkdocs-material-extensions",
-  "mkdocs-git-revision-date-localized-plugin",
-  "mkdocs-git-committers-plugin-2",
-  "mkdocs-git-authors-plugin",
-  "mkdocs-glightbox",
-  "mkdocs-redirects",
 ]
 
 testing = [

release/ci/Gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-gem "faraday"
-gem "faraday-retry"
-gem "faraday-multipart"
-gem "listen"

release/ci/lib/api.rb

@@ -1,112 +0,0 @@
-# frozen_string_literal: true
-
-module API
-  def self.client
-    @client ||=
-      Faraday.new(url: DOCS_TARGET) do |conn|
-        conn.request :multipart
-        conn.request :url_encoded
-        conn.request :retry,
-                     {
-                       methods: %i[get post delete put],
-                       retry_statuses: [429],
-                       max: 3,
-                       retry_block: ->(env:, options:, retry_count:, exception:, will_retry_in:) do
-                         puts "Rate limited... will retry in #{will_retry_in}s"
-                       end,
-                       exceptions: [Faraday::TooManyRequestsError]
-                     }
-        conn.response :json, content_type: "application/json"
-        conn.response :raise_error
-        conn.adapter Faraday.default_adapter
-        conn.headers["Api-Key"] = DOCS_API_KEY
-      end
-  end
-
-  def self.edit_post(post_id:, raw:, title: nil, category: nil)
-    if dry_run?
-      puts "  DRY RUN: skipping PUT /posts/#{post_id}"
-      return
-    end
-
-    params = {
-      post: {
-        raw: raw,
-        edit_reason: "Synced from github.com/discourse/discourse-developer-docs"
-      }
-    }
-    params[:title] = title if title
-    params[:category] = category if category
-    client.put("/posts/#{post_id}", params)
-  end
-
-  def self.create_topic(external_id:, raw:, category:, title:)
-    if dry_run?
-      puts "  DRY RUN: skipping POST /posts"
-      return
-    end
-    client.post("/posts", { title: title, raw: raw, external_id: external_id, category: category })
-  end
-
-  def self.trash_topic(topic_id:)
-    if dry_run?
-      puts "  DRY RUN: skipping DELETE /t/#{topic_id}.json"
-      return
-    end
-
-    client.delete("/t/#{topic_id}.json")
-  end
-
-  def self.fetch_current_state
-    result =
-      client.post(
-        "/admin/plugins/explorer/queries/#{DATA_EXPLORER_QUERY_ID}/run",
-        { params: { category_id: CATEGORY_ID.to_s }.to_json }
-      ).body
-
-    raise "Data explorer query failed" if result["success"] != true
-
-    if result["columns"] != %w[t_id first_p_id external_id title raw deleted_at is_index_topic]
-      raise "Data explorer query returned unexpected columns: #{result["columns"].inspect}"
-    end
-
-    result["rows"].map do |row|
-      {
-        topic_id: row[0],
-        first_post_id: row[1],
-        external_id: row[2],
-        title: row[3],
-        raw: row[4],
-        deleted_at: row[5],
-        is_index_topic: row[6]
-      }
-    end
-  end
-
-  def self.restore_topic(topic_id:)
-    path = "/t/#{topic_id}/recover.json"
-
-    if dry_run?
-      puts "  DRY RUN: skipping PUT #{path}"
-      return
-    end
-
-    client.put(path)
-  end
-
-  def self.upload_file(path)
-    if dry_run?
-      puts "  DRY RUN: skipping POST /uploads.json"
-      return { "short_url" => "upload://placeholder" }
-    end
-
-    client.post(
-      "/uploads.json",
-      { type: "composer", synchronous: true, file: Faraday::UploadIO.new(path, "image/png") }
-    ).body
-  end
-
-  def self.dry_run?
-    [nil, true].include?(DRY_RUN)
-  end
-end

release/ci/lib/local_doc.rb

@@ -1,108 +0,0 @@
-# frozen_string_literal: true
-
-Asset = Struct.new(:local_path, :local_sha1, :remote_short_url, keyword_init: true)
-
-class LocalDoc
-  attr_accessor :path,
-                :frontmatter,
-                :content,
-                :topic_id,
-                :first_post_id,
-                :remote_content,
-                :remote_title,
-                :remote_deleted,
-                :assets
-
-  def initialize(**kwargs)
-    kwargs.each { |k, v| send("#{k}=", v) }
-    self.assets ||= []
-  end
-
-  def external_id
-    "DOC-#{frontmatter["id"]}"
-  end
-
-  def section
-    path_segments = path.split("/")
-    path_segments[0] if path_segments.size > 1
-  end
-
-  def content_with_uploads
-    unused_assets = assets.dup
-
-    result =
-      content.gsub(/![^\]]+\]\(([^)]+)\)/) do |match|
-        path = $1
-        next match if !path.start_with?("/")
-
-        resolved = File.expand_path("#{__dir__}/../#{path}")
-        assets_dir = File.expand_path("#{__dir__}/../assets/")
-        raise "Invalid path: #{resolved}" if !resolved.start_with?(assets_dir)
-
-        digest = Digest::SHA1.file(resolved).hexdigest
-
-        asset = assets.find { |a| a.local_sha1 == digest }
-        unused_assets.delete(asset)
-        if !asset
-          puts "  Uploading #{path}..."
-          result = API.upload_file(resolved)
-          raise "File upload failed: #{result.inspect}" if !result["short_url"]
-          asset =
-            Asset.new(local_path: path, local_sha1: digest, remote_short_url: result["short_url"])
-          assets.push(asset)
-        end
-
-        short_url = asset.remote_short_url
-
-        match.gsub(path, short_url)
-      end
-
-    unused_assets.each { |asset| assets.delete(asset) }
-
-    result = <<~MD
-      #{result}
-
-      ---
-
-      <small>This document is version controlled - suggest changes [on github](https://github.com/sunnypilot/sunnypilot/blob/master/docs_sp/#{path}).</small>
-    MD
-
-    if assets.size == 0
-      result
-    else
-      <<~MD
-        #{result}
-        <!-- START DOCS ASSET MAP
-        #{serialized_assets}
-        END DOCS ASSET MAP -->
-      MD
-    end
-  end
-
-  def serialized_assets
-    JSON.pretty_generate(
-      assets.map do |asset|
-        {
-          local_path: asset.local_path,
-          local_sha1: asset.local_sha1,
-          remote_short_url: asset.remote_short_url
-        }
-      end
-    )
-  end
-
-  def remote_content=(value)
-    if value.match(/<!-- START DOCS ASSET MAP\n(.+?)\nEND DOCS ASSET MAP -->/m)
-      self.assets = JSON.parse($1).map { |raw_asset| Asset.new(**raw_asset) }
-    end
-
-    value.gsub!(/![^\]]+\]\(([^)]+)\)/) do |match|
-      url = $1
-      found_asset = assets.find { |a| a.remote_short_url == url }
-      match.sub!(path, found_asset.local_path) if found_asset
-      match
-    end
-
-    @remote_content = value
-  end
-end

release/ci/lib/util.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Util
-  def self.parse_md(raw)
-    if match = raw.match(/\A---\s*\n(.+?)\n---\n?(.*)\z/m)
-      raw_frontmatter, content = match.captures
-      frontmatter = YAML.safe_load(raw_frontmatter)
-    else
-      content = raw
-      frontmatter = {}
-    end
-
-    [frontmatter, content]
-  end
-end

release/ci/sync_docs.rb

@@ -1,762 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require "yaml"
-require "faraday"
-require "faraday/retry"
-require "faraday/multipart"
-require "listen"
-require "json"
-require "digest"
-
-CATEGORY_ID = ENV["DOCS_CATEGORY_ID"].to_i
-DATA_EXPLORER_QUERY_ID = ENV["DOCS_DATA_EXPLORER_QUERY_ID"].to_i
-DOCS_TARGET = ENV["DOCS_TARGET"]
-DOCS_API_KEY = ENV["DOCS_API_KEY"]
-GEMINI_API_KEY = ENV["GEMINI_API_KEY"]
-
-VERBOSE = ARGV.include?("-v")
-WATCH = ARGV.include?("--watch")
-DRY_RUN = ARGV.include?("--dry-run")
-
-require_relative "lib/local_doc"
-require_relative "lib/api"
-require_relative "lib/util"
-
-# Gemini API client for title generation
-class GeminiClient
-  GEMINI_API_URL = "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.5-flash-lite:generateContent"
-  #GEMINI_API_URL = "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.5-flash:generateContent"  
-#   MAX_REQUESTS_PER_MINUTE = 15
-  MAX_REQUESTS_PER_MINUTE = 9
-  RATE_LIMIT_WINDOW = 60 # seconds
-
-  def initialize(api_key)
-    @api_key = api_key
-    @request_timestamps = []
-    @mutex = Mutex.new
-  end
-
-  def generate_titles(file_path, content)
-    return nil unless @api_key
-
-    wait_for_rate_limit
-
-    prompt = build_prompt(file_path, content)
-    
-    response = Faraday.post(
-      "#{GEMINI_API_URL}?key=#{@api_key}",
-      { contents: [{ parts: [{ text: prompt }] }] }.to_json,
-      "Content-Type" => "application/json"
-    )
-
-    parse_response(response)
-  rescue => e
-    puts "Error calling Gemini API: #{e.message}"
-    nil
-  end
-
-  private
-
-  def wait_for_rate_limit
-    @mutex.synchronize do
-      now = Time.now
-      
-      # Remove timestamps older than the rate limit window
-      @request_timestamps.reject! { |ts| now - ts > RATE_LIMIT_WINDOW }
-      
-      # If we've hit the limit, wait until the oldest request expires
-      if @request_timestamps.length >= MAX_REQUESTS_PER_MINUTE
-        oldest_request = @request_timestamps.first
-        sleep_time = RATE_LIMIT_WINDOW - (now - oldest_request) + 0.1 # Add small buffer
-        
-        if sleep_time > 0
-          puts "Rate limit reached (#{MAX_REQUESTS_PER_MINUTE}/min). Waiting #{sleep_time.round(1)}s..."
-          sleep(sleep_time)
-          
-          # Clean up again after waiting
-          now = Time.now
-          @request_timestamps.reject! { |ts| now - ts > RATE_LIMIT_WINDOW }
-        end
-      end
-      
-      # Record this request
-      @request_timestamps << Time.now
-    end
-  end
-
-  def build_prompt(file_path, content)
-    <<~PROMPT
-      You are helping to generate documentation metadata. Given a markdown file path and its content, generate appropriate titles.
-
-      File path: #{file_path}
-      
-      Content preview:
-      #{content[0..500]}
-
-      Please analyze the file path and content, then provide:
-      1. A full title (3-8 words, descriptive and professional, MUST be at least 15 characters long)
-      2. A short title (1-3 words, concise, MUST be at least 15 characters long)
-
-      CRITICAL: Both titles MUST be at least 15 characters long. If a title would be shorter, expand it with relevant context.
-
-      Respond ONLY with valid JSON in this exact format:
-      {
-        "title": "Your Full Title Here",
-        "short_title": "Short Title Here"
-      }
-
-      Do not include any other text, explanation, or markdown formatting.
-    PROMPT
-  end
-
-  def parse_response(response)
-    body = JSON.parse(response.body)
-    text = body.dig("candidates", 0, "content", "parts", 0, "text")
-    
-    return nil unless text
-
-    # Extract JSON from potential markdown code blocks
-    json_text = text.strip.gsub(/^```json\n/, "").gsub(/\n```$/, "").strip
-    
-    parsed = JSON.parse(json_text)
-    
-    # Validate minimum length
-    if parsed["title"] && parsed["title"].length < 15
-      parsed["title"] = parsed["title"].ljust(15)
-    end
-    
-    if parsed["short_title"] && parsed["short_title"].length < 15
-      parsed["short_title"] = parsed["short_title"].ljust(15)
-    end
-    
-    parsed
-  rescue => e
-    puts "Error parsing Gemini response: #{e.message}"
-    nil
-  end
-end
-
-# Convert MkDocs "=== Tabs" sections to Obsidian callouts
-def convert_mkdocs_tabs_to_callouts(content, debug: false)
-  lines = content.lines
-  result = []
-  i = 0
-  match_count = 0
-
-  while i < lines.length
-    line = lines[i]
-
-    # Detect a MkDocs tab start, e.g., === "sunnypilot not installed"
-    if line =~ /^===\s+"([^"]+)"\s*$/
-      match_count += 1
-      tab_title = $1.strip
-
-      # Collect all indented lines following the tab
-      body_lines = []
-      i += 1
-      while i < lines.length
-        current_line = lines[i]
-        
-        # Check if line is indented (4+ spaces or tab)
-        if current_line =~ /^(?:    |\t)/
-          body_lines << current_line
-          i += 1
-        # Check if it's a blank line - peek ahead like we do for callouts
-        elsif current_line =~ /^\s*$/
-          peek_index = i + 1
-          has_more_indented = false
-          while peek_index < lines.length
-            if lines[peek_index] =~ /^(?:    |\t)/
-              has_more_indented = true
-              break
-            elsif lines[peek_index] =~ /^\s*$/
-              peek_index += 1
-            else
-              break
-            end
-          end
-          
-          if has_more_indented
-            body_lines << current_line
-            i += 1
-          else
-            break
-          end
-        else
-          # Non-indented, non-blank line (could be next tab!) - stop
-          break
-        end
-      end
-
-      puts "DEBUG: Tab '#{tab_title}', lines: #{body_lines.length}" if debug
-
-      # Convert the tab section to a callout
-      result << "> [!note] #{tab_title}\n"
-      body_lines.each do |body_line|
-        # Remove the first level of indentation (4 spaces or 1 tab) and add > prefix
-        stripped = body_line.sub(/^(?:    |\t)/, '')
-        if stripped.strip.empty?
-          result << ">\n"
-        else
-          result << ">#{stripped}"
-        end
-      end
-    else
-      result << line
-      i += 1
-    end
-  end
-
-  puts "DEBUG: Total tab matches: #{match_count}" if debug
-  result.join
-end
-
-
-# New implementation of MkDocs Material callout to Obsidian converter
-def convert_mkdocs_to_obsidian_callouts(content, debug: false)
-  # Map of MkDocs callout types to Obsidian equivalents
-  callout_map = {
-    'note' => 'note',
-    'tip' => 'tip',
-    'important' => 'important',
-    'warning' => 'warning',
-    'caution' => 'caution',
-    'info' => 'info',
-    'success' => 'success',
-    'question' => 'question',
-    'failure' => 'failure',
-    'danger' => 'danger',
-    'bug' => 'bug',
-    'example' => 'example',
-    'quote' => 'quote',
-    'abstract' => 'abstract',
-    'summary' => 'summary',
-    'tldr' => 'tldr'
-  }
-  
-  lines = content.lines
-  result = []
-  i = 0
-  match_count = 0
-  
-  while i < lines.length
-    line = lines[i]
-    
-    # Check if this line starts a callout (can be indented or not)
-    # Capture any leading indentation
-    if line =~ /^(\s*)!!!\s+(#{callout_map.keys.map { |k| Regexp.escape(k) }.join('|')})(?:\s+"([^"]*)")?\s*$/
-      leading_indent = $1
-      mkdocs_type = $2
-      custom_title = $3
-      match_count += 1
-      obsidian_type = callout_map[mkdocs_type]
-      
-      # Determine the base indentation level (number of spaces/tabs before !!!)
-      base_indent_size = leading_indent.length
-      
-      # Collect all lines that have MORE indentation than the base
-      body_lines = []
-      i += 1
-      while i < lines.length
-        current_line = lines[i]
-        
-        # Check if line has the required base indentation plus more (for body content)
-        # Body content should be indented relative to the !!! line
-        required_indent = leading_indent + "    " # base + 4 more spaces
-        alt_required_indent = leading_indent + "\t" # base + 1 tab
-        
-        if current_line.start_with?(required_indent) || current_line.start_with?(alt_required_indent)
-          body_lines << current_line
-          i += 1
-        # Check if line is blank - might be between paragraphs
-        elsif current_line =~ /^\s*$/
-          peek_index = i + 1
-          has_more_indented = false
-          while peek_index < lines.length
-            peek_line = lines[peek_index]
-            if peek_line.start_with?(required_indent) || peek_line.start_with?(alt_required_indent)
-              has_more_indented = true
-              break
-            elsif peek_line =~ /^\s*$/
-              peek_index += 1
-            else
-              break
-            end
-          end
-          
-          if has_more_indented
-            body_lines << current_line
-            i += 1
-          else
-            break
-          end
-        else
-          # Line doesn't have required indentation - stop
-          break
-        end
-      end
-      
-      puts "DEBUG: Match #{match_count} - indent: #{base_indent_size} spaces, type: #{mkdocs_type}, title: #{custom_title.inspect}, body lines: #{body_lines.length}" if debug
-      
-      # Build the converted callout, preserving the base indentation
-      if body_lines.empty?
-        if custom_title && !custom_title.empty?
-          result << "#{leading_indent}> [!#{obsidian_type}] \"#{custom_title}\"\n"
-        else
-          result << "#{leading_indent}> [!#{obsidian_type}]\n"
-        end
-      else
-        if custom_title && !custom_title.empty?
-          result << "#{leading_indent}> [!#{obsidian_type}] \"#{custom_title}\"\n"
-        else
-          result << "#{leading_indent}> [!#{obsidian_type}]\n"
-        end
-        # Add > prefix to each body line, removing the extra level of indentation
-        body_lines.each do |body_line|
-          # Remove the base indent + one level (4 spaces or tab)
-          stripped = body_line.sub(/^#{Regexp.escape(leading_indent)}(?:    |\t)/, '')
-          result << "#{leading_indent}>#{stripped}"
-        end
-      end
-    else
-      result << line
-      i += 1
-    end
-  end
-  
-  puts "DEBUG: Total matches found: #{match_count}" if debug
-  
-  result.join
-end
-
-# Convert MkDocs Material icons to standard emojis
-def convert_material_icons_to_emojis(content)
-  # Map of common Material icons to emoji equivalents
-  icon_map = {
-    # Check/success icons
-    ':material-check:' => '✅',
-    ':material-check-circle:' => '✅',
-    ':material-check-bold:' => '✅',
-    
-    # Close/error icons
-    ':material-close:' => '❌',
-    ':material-close-circle:' => '❌',
-    ':material-alert-circle:' => '⚠️',
-    
-    # Info icons
-    ':material-information:' => 'ℹ️',
-    ':material-information-outline:' => 'ℹ️',
-    ':material-help-circle:' => '❓',
-    
-    # Arrow icons
-    ':material-arrow-right:' => '→',
-    ':material-arrow-left:' => '←',
-    ':material-arrow-up:' => '↑',
-    ':material-arrow-down:' => '↓',
-    
-    # Other common icons
-    ':material-lightbulb:' => '💡',
-    ':material-star:' => '⭐',
-    ':material-heart:' => '❤️',
-    ':material-fire:' => '🔥',
-    ':material-flag:' => '🚩',
-    ':material-link:' => '🔗',
-    ':material-pencil:' => '✏️',
-    ':material-delete:' => '🗑️',
-    ':material-calendar:' => '📅',
-    ':material-clock:' => '🕐',
-    ':material-email:' => '📧',
-    ':material-phone:' => '📞',
-  }
-  
-  # Replace material icons with emojis, ignoring any style attributes
-  icon_map.each do |material_icon, emoji|
-    # Match the icon with optional style attributes like { style="color: #EF5350" }
-    content.gsub!(/#{Regexp.escape(material_icon)}\{\s*style="[^"]*"\s*\}/, emoji)
-    # Also match without style attributes
-    content.gsub!(material_icon, emoji)
-  end
-  
-  content
-end
-
-# Helper method to generate frontmatter from file path
-def generate_frontmatter_from_path(path, content = nil, gemini_client = nil)
-  # Remove .md extension and get the base name
-  base_name = File.basename(path, ".md")
-  
-  # Generate id from the full path (without extension)
-  # Replace / with -
-  # IMPORTANT: The LocalDoc#external_id method adds "DOC-" prefix (4 chars)
-  # So we need to limit the base ID to 46 chars to stay under the 50 char API limit
-  full_id = path.sub(/\.md$/, "").gsub("/", "-")
-  
-  # Maximum length for the base ID (50 char API limit - 4 char "DOC-" prefix)
-  max_base_id_length = 46
-  
-  if full_id.length > max_base_id_length
-    # Take first 37 chars and append an 8-char hash for uniqueness (37 + 1 dash + 8 = 46)
-    hash_suffix = Digest::MD5.hexdigest(path)[0..7]
-    id = "#{full_id[0..36]}-#{hash_suffix}"
-  else
-    id = full_id
-  end
-  
-  # Try to use Gemini for title generation
-  if gemini_client && content
-    gemini_titles = gemini_client.generate_titles(path, content)
-    
-    if gemini_titles
-      return {
-        "id" => id,
-        "title" => gemini_titles["title"],
-        "short_title" => gemini_titles["short_title"]
-      }
-    end
-  end
-  
-  # Fallback to original logic if Gemini fails or is not available
-  title = base_name.split(/[-_]/).map(&:capitalize).join(" ")
-  short_title = base_name.split(/[-_]/).map(&:capitalize).join(" ")
-  
-  # Ensure minimum length
-  title = title.ljust(15) if title.length < 15
-  short_title = short_title.ljust(15) if short_title.length < 15
-  
-  {
-    "id" => id,
-    "title" => title,
-    "short_title" => short_title
-  }
-end
-
-# Helper method to generate index.md content for a folder
-def generate_folder_index(folder_name)
-  # Convert folder name to a nice title (e.g., "my-folder" -> "My Folder")
-  title = folder_name.split(/[-_]/).map(&:capitalize).join(" ")
-  
-  "---\ntitle: #{title}\n---\n"
-end
-
-# Convert internal markdown links (.md) to Discourse topic links
-def rewrite_internal_links(content, docs)
-  require "uri"
-
-  content.gsub(/\]\(([^)]+\.md)(#[^)]+)?\)/) do |match|
-    raw_link = $1
-    anchor = $2 || ""
-    # Strip any ./ or ../ from the beginning, but preserve subfolders
-    normalized = raw_link.gsub(%r{^\./}, "").gsub(%r{^\.\./}, "")
-    # Remove trailing .md
-    normalized = normalized.gsub(/\.md$/, "")
-
-    # Try percent-decoding (handles %20 etc)
-    begin
-      normalized_decoded = URI.decode_www_form_component(normalized)
-    rescue
-      normalized_decoded = normalized
-    end
-
-    candidates = []
-
-    # Strategy 1: exact match against doc.path without .md
-    candidates += docs.select { |d| d.path.sub(/\.md$/, "") == normalized_decoded }
-
-    # Strategy 2: ends_with (useful if docs have a different root)
-    if candidates.empty?
-      candidates += docs.select { |d| d.path.end_with?("#{normalized_decoded}.md") }
-    end
-
-    # Strategy 3: match by basename (e.g., linking to index.md or same-named file in subfolder)
-    if candidates.empty?
-      basename = File.basename(normalized_decoded)
-      candidates += docs.select { |d| File.basename(d.path, ".md") == basename }
-    end
-
-    # Strategy 4: index.md handling — if link pointed to a folder/index.md, allow folder match
-    if candidates.empty? && normalized_decoded.end_with?("/index")
-      folder = normalized_decoded.sub(/\/index$/, "")
-      candidates += docs.select { |d| File.dirname(d.path) == folder && File.basename(d.path, ".md") == "index" }
-    end
-
-    # Pick the best candidate (prefer exact match)
-    target_doc =
-      if candidates.any?
-        # prefer exact equality if present
-        exact = candidates.find { |d| d.path.sub(/\.md$/, "") == normalized_decoded }
-        exact || candidates.first
-      else
-        nil
-      end
-
-    if target_doc && target_doc.topic_id
-      # Return a Discourse link preserving the anchor
-      "](/t/-/#{target_doc.topic_id}?silent=true#{anchor})"
-    else
-      if VERBOSE
-        puts "⚠️ rewrite_internal_links: unresolved '#{raw_link}' -> normalized='#{normalized_decoded}'"
-        # show up to 10 possible docs to help debugging
-        sample = docs.first(10).map(&:path).join(", ")
-        puts "  sample docs: #{sample}"
-      end
-      # Return original match unchanged so the link doesn't become invalid text
-      match
-    end
-  end
-end
-
-# Initialize Gemini client if API key is available
-gemini_client = GEMINI_API_KEY ? GeminiClient.new(GEMINI_API_KEY) : nil
-
-if gemini_client
-  puts "✓ Gemini API configured for title generation"
-else
-  puts "⚠ GEMINI_API_KEY not set - using fallback title generation"
-end
-
-docs = []
-
-puts "Reading local docs..."
-BASE = "#{__dir__}/../../docs_sp/"
-
-# Generate index.md for each folder that doesn't have one
-folders_needing_index = Set.new
-Dir.glob("**/", base: BASE).each do |folder|
-  next if folder == "./" || folder.empty?
-  
-  folder_path = folder.chomp("/")
-  index_path = File.join(BASE, folder_path, "index.md")
-  
-  unless File.exist?(index_path)
-    folders_needing_index.add(folder_path)
-    
-    # Get the folder name (last component of the path)
-    folder_name = File.basename(folder_path)
-    
-    # Generate the index.md content
-    index_content = generate_folder_index(folder_name)
-    
-    # Write the index.md file
-    File.write(index_path, index_content)
-    puts "Generated index.md for folder: #{folder_path}" if VERBOSE
-  end
-end
-
-puts "Generated #{folders_needing_index.size} index.md files" if folders_needing_index.any?
-
-Dir
-  .glob("**/*.md", base: BASE)
-  .each do |path|
-    next if path.end_with?("index.md")
-    next if path.include?("SAFETY")
-
-    content = File.read(File.join(BASE, path))
-
-    frontmatter, content = Util.parse_md(content)
-    
-    # Convert MkDocs Material callouts to Obsidian format
-    content = convert_mkdocs_tabs_to_callouts(content)
-    content = convert_mkdocs_to_obsidian_callouts(content)
-    content = convert_material_icons_to_emojis(content)
-
-    # Generate missing frontmatter fields dynamically
-    generated = generate_frontmatter_from_path(path, content, gemini_client)
-    
-    # Apply the generated values, ensuring ID is limited to 50 chars
-    frontmatter["id"] = generated["id"]
-    frontmatter["title"] ||= generated["title"]
-    frontmatter["short_title"] ||= generated["short_title"]
-
-    puts "Generated frontmatter for '#{path}': id='#{frontmatter["id"]}', title='#{frontmatter["title"]}'" if VERBOSE
-
-    docs.push(LocalDoc.new(frontmatter:, path:, content:))
-  end
-
-puts "Rewriting internal links..."
-docs.each do |doc|
-  doc.content = rewrite_internal_links(doc.content, docs)
-end
-
-puts "Validating local docs..."
-docs
-  .group_by { |doc| doc.external_id }
-  .each do |id, docs|
-    if docs.size > 1
-      puts "- duplicate external_id '#{id}' found in:"
-      docs.each { |doc| puts "- #{doc.path}" }
-      exit 1
-    end
-  end
-
-exit 0 if !DOCS_API_KEY
-
-puts "Fetching remote info via data-explorer..."
-remote_topics = API.fetch_current_state
-
-puts "Mapping to existing topics..."
-map_to_remote =
-  lambda do
-    docs.each do |doc|
-      puts "- checking '#{doc.external_id}'..." if VERBOSE
-      if topic_info = remote_topics.find { |t| t[:external_id] == doc.external_id }
-        doc.topic_id = topic_info[:topic_id]
-        doc.first_post_id = topic_info[:first_post_id]
-        doc.remote_title = topic_info[:title]
-        doc.remote_content = topic_info[:raw]
-        doc.remote_deleted = topic_info[:deleted_at]
-        puts "  found topic_id: #{doc.topic_id}" if VERBOSE
-      else
-        puts " not found" if VERBOSE
-      end
-    end
-  end
-map_to_remote.call
-
-puts "Deleting topics if necessary..."
-
-cat_desc_topic = remote_topics.find { |t| t[:is_index_topic] }
-if cat_desc_topic.nil?
-  puts "Docs category is missing an index topic"
-  exit 1
-end
-cat_desc_topic_id = cat_desc_topic[:topic_id]
-
-remote_topics
-  .reject { |remote_doc| remote_doc[:deleted_at] }
-  .reject { |remote_doc| docs.any? { |doc| doc.topic_id == remote_doc[:topic_id] } }
-  .reject { |remote_doc| remote_doc[:topic_id] == cat_desc_topic_id }
-  .each do |remote_doc|
-    id = remote_doc[:topic_id]
-    puts "- deleting topic #{id}..."
-    API.trash_topic(topic_id: id)
-  end
-
-puts "Restoring topics if necessary..."
-docs
-  .filter(&:remote_deleted)
-  .each do |doc|
-    puts "- restoring '#{doc.external_id}'..."
-    API.restore_topic(topic_id: doc.topic_id)
-  end
-
-puts "Creating missing topics..."
-created_any = false
-docs.each do |doc|
-  next if doc.topic_id
-
-  created_any = true
-  puts "- creating '#{doc.external_id} with title '#{doc.frontmatter["title"]}'..."
-  converted_content = convert_mkdocs_to_obsidian_callouts(doc.content_with_uploads)
-  API.create_topic(
-    external_id: doc.external_id,
-    raw: converted_content,
-    category: CATEGORY_ID,
-    title: doc.frontmatter["title"]
-  )
-rescue Faraday::UnprocessableEntityError => e
-  puts " 422 error: #{e.response[:body]}"
-  raise e
-end
-
-if created_any
-  puts "Re-fetching remote info..."
-  remote_topics = API.fetch_current_state
-  map_to_remote.call
-end
-
-puts "Updating content..."
-docs.each do |doc|
-  if doc.topic_id.nil?
-    next if DRY_RUN
-    raise "Topic ID not found for '#{doc.external_id}'. Something went wrong with creating it?"
-  end
-
-  # Convert callouts in the content before comparison and upload
-  converted_content = convert_mkdocs_to_obsidian_callouts(doc.content_with_uploads)
-
-  if converted_content.strip == doc.remote_content.strip &&
-       doc.frontmatter["title"] == doc.remote_title
-    puts "- no changes required for '#{doc.external_id}' (topic_id: #{doc.topic_id})" if VERBOSE
-    next
-  end
-
-  puts "- updating '#{doc.external_id}' (topic_id: #{doc.topic_id})... new title: '#{doc.frontmatter["title"]}'"
-  API.edit_post(
-    post_id: doc.first_post_id,
-    raw: converted_content,
-    title: doc.frontmatter["title"],
-    category: CATEGORY_ID
-  )
-rescue Faraday::UnprocessableEntityError => e
-  puts " 422 error: #{e.response[:body]}"
-  raise e
-end
-
-puts "Building index..."
-_, index_content = Util.parse_md(File.read("#{BASE}index.md"))
-index_content += "\n\n"
-docs
-  .group_by { |doc| doc.section }
-  .each do |section, section_docs|
-    if section
-      section_frontmatter, _ = Util.parse_md(File.read("#{BASE}#{section}/index.md"))
-      index_content += "## #{section_frontmatter["title"]}\n\n"
-    end
-
-    section_docs.each do |doc|
-      index_content +=
-        "- #{doc.frontmatter["short_title"]}: [#{doc.frontmatter["title"]}](/t/-/#{doc.topic_id}?silent=true)\n"
-    end
-    index_content += "\n"
-  end
-
-index_post_info = remote_topics.find { |t| t[:topic_id] == cat_desc_topic_id }
-
-if index_post_info[:raw].strip == index_content.strip
-  puts "- no changes required for index"
-else
-  puts "- updating index..."
-  API.edit_post(post_id: index_post_info[:first_post_id], raw: index_content)
-end
-
-if WATCH
-  puts "Watching for changes to files..."
-
-  Listen
-    .to("#{__dir__}/docs") do |modified, added, removed|
-      if added.size > 0 || removed.size > 0
-        puts "Files added/removed. Restarting sync..."
-        exec("ruby", "#{__dir__}/sync_docs", *ARGV)
-      end
-
-      modified.each do |path|
-        relative = path.sub(BASE, "")
-        doc = docs.find { |d| d.path == relative }
-        raise "Modified file not recognized: #{relative}" if doc.nil?
-
-        print "- updating '#{doc.external_id}' (topic_id: #{doc.topic_id})..."
-        new_frontmatter, new_content = Util.parse_md(File.read(path))
-        if %w[id short_title].any? { |key| doc.frontmatter[key] != new_frontmatter[key] }
-          puts "Frontmatter changed. Restarting sync..."
-          exec("ruby", "#{__dir__}/sync_docs", *ARGV)
-        end
-        doc.content, doc.frontmatter = new_content, new_frontmatter
-
-        # Convert callouts before uploading
-        converted_content = convert_mkdocs_to_obsidian_callouts(doc.content_with_uploads)
-
-        API.edit_post(
-          post_id: doc.first_post_id,
-          raw: converted_content,
-          title: doc.frontmatter["title"]
-        )
-        puts " done"
-      end
-    end
-    .start
-
-  sleep
-else
-  puts "Done."
-end

selfdrive/car/card.py

@@ -71,7 +71,7 @@ class Car:
 
   def __init__(self, CI=None, RI=None) -> None:
     self.can_sock = messaging.sub_sock('can', timeout=20)
-    self.sm = messaging.SubMaster(['pandaStates', 'carControl', 'onroadEvents'] + ['carControlSP', 'longitudinalPlanSP'])
+    self.sm = messaging.SubMaster(['pandaStates', 'carControl', 'onroadEvents'] + ['carControlSP'])
     self.pm = messaging.PubMaster(['sendcan', 'carState', 'carParams', 'carOutput', 'liveTracks'] + ['carParamsSP', 'carStateSP'])
 
     self.can_rcv_cum_timeout_counter = 0
@@ -124,7 +124,7 @@ class Car:
 
     self.CP.alternativeExperience = 0
     # mads
-    set_alternative_experience(self.CP, self.CP_SP, self.params)
+    set_alternative_experience(self.CP, self.params)
     set_car_specific_params(self.CP, self.CP_SP, self.params)
 
     # Dynamic Experimental Control
@@ -216,7 +216,6 @@ class Car:
     if can_rcv_valid and REPLAY:
       self.can_log_mono_time = messaging.log_from_bytes(can_strs[0]).logMonoTime
 
-    self.v_cruise_helper.update_speed_limit_assist(self.is_metric, self.sm['longitudinalPlanSP'])
     self.v_cruise_helper.update_v_cruise(CS, self.sm['carControl'].enabled, self.is_metric)
     if self.sm['carControl'].enabled and not self.CC_prev.enabled:
       # Use CarState w/ buttons from the step selfdrived enables on

selfdrive/car/cruise.py

@@ -53,7 +53,6 @@ class VCruiseHelper(VCruiseHelperSP):
       if not self.CP.pcmCruise or (not self.CP_SP.pcmCruiseSpeed and _enabled):
         # if stock cruise is completely disabled, then we can use our own set speed logic
         self._update_v_cruise_non_pcm(CS, _enabled, is_metric)
-        self.update_speed_limit_assist_v_cruise_non_pcm()
         self.v_cruise_cluster_kph = self.v_cruise_kph
         self.update_button_timers(CS, enabled)
       else:
@@ -105,12 +104,6 @@ class VCruiseHelper(VCruiseHelperSP):
     if not self.button_change_states[button_type]["enabled"]:
       return
 
-    # Speed Limit Assist for Non PCM long cars.
-    # True: Disallow set speed changes when user confirmed the target set speed during preActive state
-    # False: Allow set speed changes as SLA is not requesting user confirmation
-    if self.update_speed_limit_assist_pre_active_confirmed(button_type):
-      return
-
     long_press, v_cruise_delta = VCruiseHelperSP.update_v_cruise_delta(self, long_press, v_cruise_delta)
     if long_press and self.v_cruise_kph % v_cruise_delta != 0:  # partial interval
       self.v_cruise_kph = CRUISE_NEAREST_FUNC[button_type](self.v_cruise_kph / v_cruise_delta) * v_cruise_delta

selfdrive/car/helpers.py

@@ -57,7 +57,7 @@ def convert_carControlSP(struct: capnp.lib.capnp._DynamicStructReader) -> struct
   struct_dataclass = structs.CarControlSP(**remove_deprecated({k: v for k, v in struct_dict.items() if not isinstance(k, dict)}))
 
   struct_dataclass.mads = structs.ModularAssistiveDrivingSystem(**remove_deprecated(struct_dict.get('mads', {})))
-  # struct_dataclass.params = [structs.CarControlSP.Param(**remove_deprecated(p)) for p in struct_dict.get('params', [])]
+  struct_dataclass.params = [structs.CarControlSP.Param(**remove_deprecated(p)) for p in struct_dict.get('params', [])]
   struct_dataclass.leadOne = structs.LeadData(**remove_deprecated(struct_dict.get('leadOne', {})))
   struct_dataclass.leadTwo = structs.LeadData(**remove_deprecated(struct_dict.get('leadTwo', {})))
   struct_dataclass.intelligentCruiseButtonManagement = structs.IntelligentCruiseButtonManagement(

selfdrive/car/tests/test_car_interfaces.py

@@ -60,7 +60,7 @@ class TestCarInterfaces:
     # Test controller initialization
     # TODO: wait until card refactor is merged to run controller a few times,
     #  hypothesis also slows down significantly with just one more message draw
-    LongControl(car_params, car_params_sp)
+    LongControl(car_params)
     if car_params.steerControlType == CarParams.SteerControlType.angle:
       LatControlAngle(car_params, car_params_sp, car_interface)
     elif car_params.lateralTuning.which() == 'pid':

selfdrive/car/tests/test_cruise_speed.py

@@ -44,12 +44,12 @@ class TestCruiseSpeed:
     assert simulation_steady_state == pytest.approx(cruise_speed, abs=.01), f'Did not reach {self.speed} m/s'
 
 
-# TODO: test pcmCruise and pcmCruiseSpeed
-@parameterized_class(('pcm_cruise', 'pcm_cruise_speed'), [(False, True)])
+# TODO: test pcmCruise
+@parameterized_class(('pcm_cruise',), [(False,)])
 class TestVCruiseHelper:
   def setup_method(self):
     self.CP = car.CarParams(pcmCruise=self.pcm_cruise)
-    self.CP_SP = custom.CarParamsSP(pcmCruiseSpeed=self.pcm_cruise_speed)
+    self.CP_SP = custom.CarParamsSP()
     self.v_cruise_helper = VCruiseHelper(self.CP, self.CP_SP)
     self.reset_cruise_speed_state()
 

selfdrive/controls/controlsd.py

@@ -58,7 +58,7 @@ class Controls(ControlsExt, ModelStateBase):
     self.pose_calibrator = PoseCalibrator()
     self.calibrated_pose: Pose | None = None
 
-    self.LoC = LongControl(self.CP, self.CP_SP)
+    self.LoC = LongControl(self.CP)
     self.VM = VehicleModel(self.CP)
     self.LaC: LatControl
     if self.CP.steerControlType == car.CarParams.SteerControlType.angle:

selfdrive/controls/lib/desire_helper.py

@@ -6,7 +6,6 @@ from openpilot.sunnypilot.selfdrive.controls.lib.lane_turn_desire import LaneTur
 
 LaneChangeState = log.LaneChangeState
 LaneChangeDirection = log.LaneChangeDirection
-TurnDirection = custom.ModelDataV2SP.TurnDirection
 
 LANE_CHANGE_SPEED_MIN = 20 * CV.MPH_TO_MS
 LANE_CHANGE_TIME_MAX = 10.
@@ -33,9 +32,9 @@ DESIRES = {
 }
 
 TURN_DESIRES = {
-  TurnDirection.none: log.Desire.none,
-  TurnDirection.turnLeft: log.Desire.turnLeft,
-  TurnDirection.turnRight: log.Desire.turnRight,
+  custom.TurnDirection.none: log.Desire.none,
+  custom.TurnDirection.turnLeft: log.Desire.turnLeft,
+  custom.TurnDirection.turnRight: log.Desire.turnRight,
 }
 
 
@@ -50,7 +49,7 @@ class DesireHelper:
     self.desire = log.Desire.none
     self.alc = AutoLaneChangeController(self)
     self.lane_turn_controller = LaneTurnController(self)
-    self.lane_turn_direction = TurnDirection.none
+    self.lane_turn_direction = custom.TurnDirection.none
 
   @staticmethod
   def get_lane_change_direction(CS):
@@ -127,7 +126,7 @@ class DesireHelper:
 
     self.prev_one_blinker = one_blinker
 
-    if self.lane_turn_direction != TurnDirection.none:
+    if self.lane_turn_direction != custom.TurnDirection.none:
       self.desire = TURN_DESIRES[self.lane_turn_direction]
     else:
       self.desire = DESIRES[self.lane_change_direction][self.lane_change_state]

selfdrive/controls/lib/latcontrol_torque.py

@@ -48,10 +48,6 @@ class LatControlTorque(LatControl):
                         self.lateral_accel_from_torque(-self.steer_max, self.torque_params))
 
   def update(self, active, CS, VM, params, steer_limited_by_safety, desired_curvature, calibrated_pose, curvature_limited):
-    # Override torque params from extension
-    if self.extension.update_override_torque_params(self.torque_params):
-      self.update_limits()
-
     pid_log = log.ControlsState.LateralTorqueState.new_message()
     if not active:
       output_torque = 0.0

selfdrive/controls/lib/longcontrol.py

@@ -10,11 +10,8 @@ CONTROL_N_T_IDX = ModelConstants.T_IDXS[:CONTROL_N]
 LongCtrlState = car.CarControl.Actuators.LongControlState
 
 
-def long_control_state_trans(CP, CP_SP, active, long_control_state, v_ego,
+def long_control_state_trans(CP, active, long_control_state, v_ego,
                              should_stop, brake_pressed, cruise_standstill):
-  # Gas Interceptor
-  cruise_standstill = cruise_standstill and not CP_SP.enableGasInterceptor
-
   stopping_condition = should_stop
   starting_condition = (not should_stop and
                         not cruise_standstill and
@@ -48,9 +45,8 @@ def long_control_state_trans(CP, CP_SP, active, long_control_state, v_ego,
   return long_control_state
 
 class LongControl:
-  def __init__(self, CP, CP_SP):
+  def __init__(self, CP):
     self.CP = CP
-    self.CP_SP = CP_SP
     self.long_control_state = LongCtrlState.off
     self.pid = PIDController((CP.longitudinalTuning.kpBP, CP.longitudinalTuning.kpV),
                              (CP.longitudinalTuning.kiBP, CP.longitudinalTuning.kiV),
@@ -65,7 +61,7 @@ class LongControl:
     self.pid.neg_limit = accel_limits[0]
     self.pid.pos_limit = accel_limits[1]
 
-    self.long_control_state = long_control_state_trans(self.CP, self.CP_SP, active, self.long_control_state, CS.vEgo,
+    self.long_control_state = long_control_state_trans(self.CP, active, self.long_control_state, CS.vEgo,
                                                        should_stop, CS.brakePressed,
                                                        CS.cruiseState.standstill)
     if self.long_control_state == LongCtrlState.off:

selfdrive/controls/plannerd.py

@@ -24,11 +24,10 @@ def main():
   pm = messaging.PubMaster(['longitudinalPlan', 'driverAssistance', 'longitudinalPlanSP'])
   sm = messaging.SubMaster(['carControl', 'carState', 'controlsState', 'liveParameters', 'radarState', 'modelV2', 'selfdriveState',
                             'liveMapDataSP', 'carStateSP', gps_location_service],
-                           poll='carState')
+                           poll='modelV2')
 
   while True:
     sm.update()
-    longitudinal_planner.sla.update_car_state(sm['carState'])
     if sm.updated['modelV2']:
       longitudinal_planner.update(sm)
       longitudinal_planner.publish(sm, pm)

selfdrive/controls/tests/test_longcontrol.py

@@ -1,4 +1,4 @@
-from cereal import car, custom
+from cereal import car
 from openpilot.selfdrive.controls.lib.longcontrol import LongCtrlState, long_control_state_trans
 
 
@@ -8,52 +8,49 @@ class TestLongControlStateTransition:
 
   def test_stay_stopped(self):
     CP = car.CarParams.new_message()
-    CP_SP = custom.CarParamsSP.new_message()
     active = True
     current_state = LongCtrlState.stopping
-    next_state = long_control_state_trans(CP, CP_SP, active, current_state, v_ego=0.1,
+    next_state = long_control_state_trans(CP, active, current_state, v_ego=0.1,
                              should_stop=True, brake_pressed=False, cruise_standstill=False)
     assert next_state == LongCtrlState.stopping
-    next_state = long_control_state_trans(CP, CP_SP, active, current_state, v_ego=0.1,
+    next_state = long_control_state_trans(CP, active, current_state, v_ego=0.1,
                              should_stop=False, brake_pressed=True, cruise_standstill=False)
     assert next_state == LongCtrlState.stopping
-    next_state = long_control_state_trans(CP, CP_SP, active, current_state, v_ego=0.1,
+    next_state = long_control_state_trans(CP, active, current_state, v_ego=0.1,
                              should_stop=False, brake_pressed=False, cruise_standstill=True)
     assert next_state == LongCtrlState.stopping
-    next_state = long_control_state_trans(CP, CP_SP, active, current_state, v_ego=1.0,
+    next_state = long_control_state_trans(CP, active, current_state, v_ego=1.0,
                              should_stop=False, brake_pressed=False, cruise_standstill=False)
     assert next_state == LongCtrlState.pid
     active = False
-    next_state = long_control_state_trans(CP, CP_SP, active, current_state, v_ego=1.0,
+    next_state = long_control_state_trans(CP, active, current_state, v_ego=1.0,
                              should_stop=False, brake_pressed=False, cruise_standstill=False)
     assert next_state == LongCtrlState.off
 
 def test_engage():
   CP = car.CarParams.new_message()
-  CP_SP = custom.CarParamsSP.new_message()
   active = True
   current_state = LongCtrlState.off
-  next_state = long_control_state_trans(CP, CP_SP, active, current_state, v_ego=0.1,
+  next_state = long_control_state_trans(CP, active, current_state, v_ego=0.1,
                              should_stop=True, brake_pressed=False, cruise_standstill=False)
   assert next_state == LongCtrlState.stopping
-  next_state = long_control_state_trans(CP, CP_SP, active, current_state, v_ego=0.1,
+  next_state = long_control_state_trans(CP, active, current_state, v_ego=0.1,
                              should_stop=False, brake_pressed=True, cruise_standstill=False)
   assert next_state == LongCtrlState.stopping
-  next_state = long_control_state_trans(CP, CP_SP, active, current_state, v_ego=0.1,
+  next_state = long_control_state_trans(CP, active, current_state, v_ego=0.1,
                              should_stop=False, brake_pressed=False, cruise_standstill=True)
   assert next_state == LongCtrlState.stopping
-  next_state = long_control_state_trans(CP, CP_SP, active, current_state, v_ego=0.1,
+  next_state = long_control_state_trans(CP, active, current_state, v_ego=0.1,
                              should_stop=False, brake_pressed=False, cruise_standstill=False)
   assert next_state == LongCtrlState.pid
 
 def test_starting():
   CP = car.CarParams.new_message(startingState=True, vEgoStarting=0.5)
-  CP_SP = custom.CarParamsSP.new_message()
   active = True
   current_state = LongCtrlState.starting
-  next_state = long_control_state_trans(CP, CP_SP, active, current_state, v_ego=0.1,
+  next_state = long_control_state_trans(CP, active, current_state, v_ego=0.1,
                              should_stop=False, brake_pressed=False, cruise_standstill=False)
   assert next_state == LongCtrlState.starting
-  next_state = long_control_state_trans(CP, CP_SP, active, current_state, v_ego=1.0,
+  next_state = long_control_state_trans(CP, active, current_state, v_ego=1.0,
                              should_stop=False, brake_pressed=False, cruise_standstill=False)
   assert next_state == LongCtrlState.pid

selfdrive/locationd/torqued.py

@@ -11,7 +11,6 @@ from openpilot.common.filter_simple import FirstOrderFilter
 from openpilot.common.swaglog import cloudlog
 from openpilot.selfdrive.locationd.helpers import PointBuckets, ParameterEstimator, PoseCalibrator, Pose
 from openpilot.sunnypilot.livedelay.helpers import get_lat_delay
-from openpilot.sunnypilot.selfdrive.locationd.torqued_ext import TorqueEstimatorExt
 
 HISTORY = 5  # secs
 POINTS_PER_BUCKET = 1500
@@ -51,10 +50,9 @@ class TorqueBuckets(PointBuckets):
         break
 
 
-class TorqueEstimator(ParameterEstimator, TorqueEstimatorExt):
+class TorqueEstimator(ParameterEstimator):
   def __init__(self, CP, decimated=False, track_all_points=False):
-    ParameterEstimator.__init__(self)
-    TorqueEstimatorExt.__init__(self, CP)
+    super().__init__()
     self.CP = CP
     self.hist_len = int(HISTORY / DT_MDL)
     self.lag = 0.0
@@ -84,8 +82,6 @@ class TorqueEstimator(ParameterEstimator, TorqueEstimatorExt):
 
     self.calibrator = PoseCalibrator()
 
-    TorqueEstimatorExt.initialize_custom_params(self, decimated)
-
     self.reset()
 
     initial_params = {
@@ -264,8 +260,6 @@ def main(demo=False):
           t = sm.logMonoTime[which] * 1e-9
           estimator.handle_log(t, which, sm[which])
 
-    TorqueEstimatorExt.update_use_params(estimator)
-
     # 4Hz driven by livePose
     if sm.frame % 5 == 0:
       pm.send('liveTorqueParameters', estimator.get_msg(valid=sm.all_checks()))

selfdrive/selfdrived/selfdrived.py

@@ -24,7 +24,6 @@ from openpilot.selfdrive.selfdrived.alertmanager import AlertManager, set_offroa
 from openpilot.system.version import get_build_metadata
 
 from openpilot.sunnypilot.mads.mads import ModularAssistiveDrivingSystem
-from openpilot.sunnypilot import get_sanitize_int_param
 from openpilot.sunnypilot.selfdrive.car.car_specific import CarSpecificEventsSP
 from openpilot.sunnypilot.selfdrive.car.cruise_helpers import CruiseHelper
 from openpilot.sunnypilot.selfdrive.car.intelligent_cruise_button_management.controller import IntelligentCruiseButtonManagement
@@ -44,7 +43,6 @@ LaneChangeDirection = log.LaneChangeDirection
 EventName = log.OnroadEvent.EventName
 ButtonType = car.CarState.ButtonEvent.Type
 SafetyModel = car.CarParams.SafetyModel
-TurnDirection = custom.ModelDataV2SP.TurnDirection
 
 IGNORED_SAFETY_MODES = (SafetyModel.silent, SafetyModel.noOutput)
 
@@ -97,9 +95,8 @@ 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', 'userBookmark', 'audioFeedback',
-                                   'modelDataV2SP', 'longitudinalPlanSP'] + \
-                                   self.camera_packets + self.sensor_packets + self.gps_packets,
+                                   'controlsState', 'carControl', 'driverAssistance', 'alertDebug', 'userBookmark', 'audioFeedback'] + \
+                                   self.camera_packets + self.sensor_packets + self.gps_packets + ['modelDataV2SP', 'longitudinalPlanSP'],
                                   ignore_alive=ignore, ignore_avg_freq=ignore,
                                   ignore_valid=ignore, frequency=int(1/DT_CTRL))
 
@@ -132,12 +129,7 @@ class SelfdriveD(CruiseHelper):
     self.logged_comm_issue = None
     self.not_running_prev = None
     self.experimental_mode = False
-    self.personality = get_sanitize_int_param(
-      "LongitudinalPersonality",
-      min(log.LongitudinalPersonality.schema.enumerants.values()),
-      max(log.LongitudinalPersonality.schema.enumerants.values()),
-      self.params
-    )
+    self.personality = self.params.get("LongitudinalPersonality", return_default=True)
     self.recalibrating_seen = False
     self.state_machine = StateMachine()
     self.rk = Ratekeeper(100, print_delay_threshold=None)
@@ -166,7 +158,7 @@ class SelfdriveD(CruiseHelper):
     self.mads = ModularAssistiveDrivingSystem(self)
     self.icbm = IntelligentCruiseButtonManagement(self.CP, self.CP_SP)
 
-    self.car_events_sp = CarSpecificEventsSP(self.CP, self.CP_SP)
+    self.car_events_sp = CarSpecificEventsSP(self.CP, self.params)
 
     CruiseHelper.__init__(self, self.CP)
 
@@ -306,9 +298,9 @@ class SelfdriveD(CruiseHelper):
 
     # Handle lane turn
     lane_turn_direction = self.sm['modelDataV2SP'].laneTurnDirection
-    if lane_turn_direction == TurnDirection.turnLeft:
+    if lane_turn_direction == custom.TurnDirection.turnLeft:
       self.events_sp.add(custom.OnroadEventSP.EventName.laneTurnLeft)
-    elif lane_turn_direction == TurnDirection.turnRight:
+    elif lane_turn_direction == custom.TurnDirection.turnRight:
       self.events_sp.add(custom.OnroadEventSP.EventName.laneTurnRight)
 
     for i, pandaState in enumerate(self.sm['pandaStates']):
@@ -452,7 +444,7 @@ class SelfdriveD(CruiseHelper):
           self.events.add(EventName.personalityChanged)
         self.experimental_mode_switched = False
 
-    self.icbm.run(CS, self.sm['carControl'], self.sm['longitudinalPlanSP'], self.is_metric)
+    self.icbm.run(CS, self.sm['carControl'], self.is_metric)
 
   def data_sample(self):
     _car_state = messaging.recv_one(self.car_state_sock)

selfdrive/test/process_replay/migration.py

@@ -28,8 +28,7 @@ MigrationFunc = Callable[[list[MessageWithIndex]], MigrationOps]
 # 3. product is the message type created by the migration function, and the function will be skipped if product type already exists in lr
 # 4. it must return a list of operations to be applied to the logreader (replace, add, delete)
 # 5. all migration functions must be independent of each other
-def migrate_all(lr: LogIterable, manager_states: bool = False, panda_states: bool = False, camera_states: bool = False,
-                live_location_kalman: bool = True):
+def migrate_all(lr: LogIterable, manager_states: bool = False, panda_states: bool = False, camera_states: bool = False):
   migrations = [
     migrate_sensorEvents,
     migrate_carParams,
@@ -38,6 +37,7 @@ def migrate_all(lr: LogIterable, manager_states: bool = False, panda_states: boo
     migrate_carOutput,
     migrate_controlsState,
     migrate_carState,
+    migrate_liveLocationKalman,
     migrate_liveTracks,
     migrate_driverAssistance,
     migrate_drivingModelData,
@@ -51,8 +51,6 @@ def migrate_all(lr: LogIterable, manager_states: bool = False, panda_states: boo
     migrations.extend([migrate_pandaStates, migrate_peripheralState])
   if camera_states:
     migrations.append(migrate_cameraStates)
-  if live_location_kalman:
-    migrations.append(migrate_liveLocationKalman)
 
   return migrate(lr, migrations)
 

selfdrive/test/process_replay/process_replay.py

@@ -496,7 +496,7 @@ CONFIGS = [
     pubs=[
       "cameraOdometry", "accelerometer", "gyroscope", "liveCalibration", "carState"
     ],
-    subs=["liveLocationKalman", "livePose"],
+    subs=["livePose"],
     ignore=["logMonoTime"],
     should_recv_callback=MessageBasedRcvCallback("cameraOdometry"),
     tolerance=NUMPY_TOLERANCE,

selfdrive/ui/qt/offroad/settings.cc

@@ -33,6 +33,13 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) {
       "../assets/icons/experimental_white.svg",
       false,
     },
+    {
+      "DynamicExperimentalControl",
+      tr("Enable Dynamic Experimental Control"),
+      tr("Enable toggle to allow the model to determine when to use sunnypilot ACC or sunnypilot End to End Longitudinal."),
+      "../assets/offroad/icon_blank.png",
+      false,
+    },
     {
       "DisengageOnAccelerator",
       tr("Disengage on Accelerator Pedal"),

selfdrive/ui/qt/onroad/alerts.cc

@@ -4,6 +4,9 @@
 #include <map>
 
 #include "selfdrive/ui/qt/util.h"
+#ifdef SUNNYPILOT
+#include "selfdrive/ui/sunnypilot/ui.h"
+#endif
 
 void OnroadAlerts::updateState(const UIState &s) {
   Alert a = getAlert(*(s.sm), s.scene.started_frame);
@@ -73,6 +76,12 @@ void OnroadAlerts::paintEvent(QPaintEvent *event) {
   }
   QRect r = QRect(0 + margin, height() - h + margin, width() - margin*2, h - margin*2);
 
+#ifdef SUNNYPILOT
+  const int dev_ui_info = uiStateSP()->scene.dev_ui_info;
+  const int adjustment = dev_ui_info > 1 && alert.size != cereal::SelfdriveState::AlertSize::FULL ? 30 : 0;
+  r = QRect(0 + margin, height() - h + margin - adjustment, width() - margin*2, h - margin*2);
+#endif
+
   QPainter p(this);
 
   // draw background + gradient

selfdrive/ui/qt/onroad/hud.cc

@@ -47,12 +47,11 @@ void HudRenderer::draw(QPainter &p, const QRect &surface_rect) {
   bg.setColorAt(1, QColor::fromRgbF(0, 0, 0, 0));
   p.fillRect(0, 0, surface_rect.width(), UI_HEADER_HEIGHT, bg);
 
-#ifndef SUNNYPILOT
+
   if (is_cruise_available) {
     drawSetSpeed(p, surface_rect);
   }
   drawCurrentSpeed(p, surface_rect);
-#endif
 
   p.restore();
 }

selfdrive/ui/qt/onroad/model.cc

@@ -22,7 +22,7 @@ void ModelRenderer::draw(QPainter &painter, const QRect &surface_rect) {
 
   update_model(model, lead_one);
   drawLaneLines(painter);
-  drawPath(painter, model, surface_rect.height());
+  drawPath(painter, model, surface_rect);
 
   if (longitudinal_control && sm.alive("radarState")) {
     update_leads(radar_state, model.getPosition());
@@ -34,6 +34,7 @@ void ModelRenderer::draw(QPainter &painter, const QRect &surface_rect) {
       drawLead(painter, lead_two, lead_vertices[1], surface_rect);
     }
   }
+  drawLeadStatus(painter, surface_rect.height(), surface_rect.width());
 
   painter.restore();
 }
@@ -173,6 +174,173 @@ QColor ModelRenderer::blendColors(const QColor &start, const QColor &end, float
       (1 - t) * start.alphaF() + t * end.alphaF());
 }
 
+
+void ModelRenderer::drawLeadStatus(QPainter &painter, int height, int width) {
+    auto *s = uiState();
+    auto &sm = *(s->sm);
+
+    if (!sm.alive("radarState")) return;
+
+    const auto &radar_state = sm["radarState"].getRadarState();
+    const auto &lead_one = radar_state.getLeadOne();
+    const auto &lead_two = radar_state.getLeadTwo();
+
+    // Check if we have any active leads
+    bool has_lead_one = lead_one.getStatus();
+    bool has_lead_two = lead_two.getStatus();
+
+    if (!has_lead_one && !has_lead_two) {
+        // Fade out status display
+        lead_status_alpha = std::max(0.0f, lead_status_alpha - 0.05f);
+        if (lead_status_alpha <= 0.0f) return;
+    } else {
+        // Fade in status display
+        lead_status_alpha = std::min(1.0f, lead_status_alpha + 0.1f);
+    }
+
+    // Draw status for each lead vehicle under its chevron
+    if (true) {
+        drawLeadStatusAtPosition(painter, lead_one, lead_vertices[0], height, width, "L1");
+    }
+
+    if (has_lead_two && std::abs(lead_one.getDRel() - lead_two.getDRel()) > 3.0) {
+        drawLeadStatusAtPosition(painter, lead_two, lead_vertices[1], height, width, "L2");
+    }
+}
+
+void ModelRenderer::drawLeadStatusAtPosition(QPainter &painter,
+                                           const cereal::RadarState::LeadData::Reader &lead_data,
+                                           const QPointF &chevron_pos,
+                                           int height, int width,
+                                           const QString &label) {
+
+    float d_rel = lead_data.getDRel();
+    float v_rel = lead_data.getVRel();
+    auto *s = uiState();
+    auto &sm = *(s->sm);
+    float v_ego = sm["carState"].getCarState().getVEgo();
+
+    int chevron_data = std::atoi(Params().get("ChevronInfo").c_str());
+
+    // Calculate chevron size (same logic as drawLead)
+    float sz = std::clamp((25 * 30) / (d_rel / 3 + 30), 15.0f, 30.0f) * 2.35;
+
+    QFont content_font = painter.font();
+    content_font.setPixelSize(35);
+    content_font.setBold(true);
+    painter.setFont(content_font);
+
+    QFontMetrics fm(content_font);
+    bool is_metric = s->scene.is_metric;
+
+    QStringList text_lines;
+
+    const int chevron_types = 3;
+    const int chevron_all = chevron_types + 1;  // All metrics (value 4)
+    QStringList chevron_text[chevron_types];
+    int position;
+    float val;
+
+    // Distance display (chevron_data == 1 or all)
+    if (chevron_data == 1 || chevron_data == chevron_all) {
+        position = 0;
+        val = std::max(0.0f, d_rel);
+        QString distance_unit = is_metric ? "m" : "ft";
+        if (!is_metric) {
+            val *= 3.28084f; // Convert meters to feet
+        }
+        chevron_text[position].append(QString::number(val, 'f', 0) + " " + distance_unit);
+    }
+
+    // Absolute velocity display (chevron_data == 2 or all)
+    if (chevron_data == 2 || chevron_data == chevron_all) {
+        position = (chevron_data == 2) ? 0 : 1;
+        val = std::max(0.0f, (v_rel + v_ego) * (is_metric ? static_cast<float>(MS_TO_KPH) : static_cast<float>(MS_TO_MPH)));
+        chevron_text[position].append(QString::number(val, 'f', 0) + " " + (is_metric ? "km/h" : "mph"));
+    }
+
+    // Time-to-contact display (chevron_data == 3 or all)
+    if (chevron_data == 3 || chevron_data == chevron_all) {
+        position = (chevron_data == 3) ? 0 : 2;
+        val = (d_rel > 0 && v_ego > 0) ? std::max(0.0f, d_rel / v_ego) : 0.0f;
+        QString ttc_str = (val > 0 && val < 200) ? QString::number(val, 'f', 1) + "s" : "---";
+        chevron_text[position].append(ttc_str);
+    }
+
+    // Collect all non-empty text lines
+    for (int i = 0; i < chevron_types; ++i) {
+        if (!chevron_text[i].isEmpty()) {
+            text_lines.append(chevron_text[i]);
+        }
+    }
+
+    // If no text to display, return early
+    if (text_lines.isEmpty()) {
+        return;
+    }
+
+    // Text box dimensions
+    float str_w = 150;  // Width of text area
+    float str_h = 45;   // Height per line
+
+    // Position text below chevron, centered horizontally
+    float text_x = chevron_pos.x() - str_w / 2;
+    float text_y = chevron_pos.y() + sz + 15;
+
+    // Clamp to screen bounds
+    text_x = std::clamp(text_x, 10.0f, (float)width - str_w - 10);
+
+    // Shadow offset
+    QPoint shadow_offset(2, 2);
+
+    // Draw each line of text with shadow
+    for (int i = 0; i < text_lines.size(); ++i) {
+        if (!text_lines[i].isEmpty()) {
+            QRect textRect(text_x, text_y + (i * str_h), str_w, str_h);
+
+            // Draw shadow
+            painter.setPen(QColor(0x0, 0x0, 0x0, (int)(200 * lead_status_alpha)));
+            painter.drawText(textRect.translated(shadow_offset.x(), shadow_offset.y()),
+                           Qt::AlignBottom | Qt::AlignHCenter, text_lines[i]);
+
+            // Determine text color based on content and danger level
+            QColor text_color;
+
+            // Check if this is a distance line (contains 'm' or 'ft')
+            if (text_lines[i].contains("m") || text_lines[i].contains("ft")) {
+                if (d_rel < 20.0f) {
+                    text_color = QColor(255, 80, 80, (int)(255 * lead_status_alpha)); // Red - danger
+                } else if (d_rel < 40.0f) {
+                    text_color = QColor(255, 200, 80, (int)(255 * lead_status_alpha)); // Yellow - caution
+                } else {
+                    text_color = QColor(80, 255, 120, (int)(255 * lead_status_alpha)); // Green - safe
+                }
+            }
+            // Enhanced color coding for time-to-contact
+            else if (text_lines[i].contains("s") && !text_lines[i].contains("---")) {
+                float ttc_val = text_lines[i].left(text_lines[i].length() - 1).toFloat();
+                if (ttc_val < 3.0f) {
+                    text_color = QColor(255, 80, 80, (int)(255 * lead_status_alpha)); // Red - urgent
+                } else if (ttc_val < 6.0f) {
+                    text_color = QColor(255, 200, 80, (int)(255 * lead_status_alpha)); // Yellow - caution
+                } else {
+                    text_color = QColor(0xff, 0xff, 0xff, (int)(255 * lead_status_alpha)); // White - safe
+                }
+            }
+            else {
+                text_color = QColor(0xff, 0xff, 0xff, (int)(255 * lead_status_alpha)); // White for other lines
+            }
+
+            // Draw main text
+            painter.setPen(text_color);
+            painter.drawText(textRect, Qt::AlignBottom | Qt::AlignHCenter, text_lines[i]);
+        }
+    }
+
+    // Reset pen
+    painter.setPen(Qt::NoPen);
+}
+
 void ModelRenderer::drawLead(QPainter &painter, const cereal::RadarState::LeadData::Reader &lead_data,
                              const QPointF &vd, const QRect &surface_rect) {
   const float speedBuff = 10.;

selfdrive/ui/qt/onroad/model.h

@@ -34,11 +34,20 @@ protected:
   bool mapToScreen(float in_x, float in_y, float in_z, QPointF *out);
   void mapLineToPolygon(const cereal::XYZTData::Reader &line, float y_off, float z_off,
                         QPolygonF *pvd, int max_idx, bool allow_invert = true);
+  void drawLeadStatus(QPainter &painter, int height, int width);
+  void drawLeadStatusAtPosition(QPainter &painter,
+                             const cereal::RadarState::LeadData::Reader &lead_data,
+                             const QPointF &chevron_pos,
+                             int height, int width,
+                             const QString &label);
   void drawLead(QPainter &painter, const cereal::RadarState::LeadData::Reader &lead_data, const QPointF &vd, const QRect &surface_rect);
   void update_leads(const cereal::RadarState::Reader &radar_state, const cereal::XYZTData::Reader &line);
   virtual void update_model(const cereal::ModelDataV2::Reader &model, const cereal::RadarState::LeadData::Reader &lead);
   void drawLaneLines(QPainter &painter);
   void drawPath(QPainter &painter, const cereal::ModelDataV2::Reader &model, int height);
+  virtual void drawPath(QPainter &painter, const cereal::ModelDataV2::Reader &model, const QRect &surface_rect) {;
+    drawPath(painter, model, surface_rect.height());
+  }
   void updatePathGradient(QLinearGradient &bg);
   QColor blendColors(const QColor &start, const QColor &end, float t);
 
@@ -55,4 +64,9 @@ protected:
   QPointF lead_vertices[2] = {};
   Eigen::Matrix3f car_space_transform = Eigen::Matrix3f::Zero();
   QRectF clip_region;
+
+  float lead_status_alpha = 0.0f;
+  QPointF lead_status_pos;
+  QString lead_status_text;
+  QColor lead_status_color;
 };

selfdrive/ui/qt/onroad/onroad_home.h

@@ -4,10 +4,8 @@
 
 #ifdef SUNNYPILOT
 #include "selfdrive/ui/sunnypilot/qt/onroad/annotated_camera.h"
-#include "selfdrive/ui/sunnypilot/qt/onroad/alerts.h"
 #define UIState UIStateSP
 #define AnnotatedCameraWidget AnnotatedCameraWidgetSP
-#define OnroadAlerts OnroadAlertsSP
 #else
 #include "selfdrive/ui/qt/onroad/annotated_camera.h"
 #endif

selfdrive/ui/qt/window.cc

@@ -92,16 +92,6 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event) {
       // ignore events when device is awakened by resetInteractiveTimeout
       ignore = !device()->isAwake();
       device()->resetInteractiveTimeout();
-
-#ifdef SUNNYPILOT
-      auto *s_sp = uiStateSP();
-      bool onroadScreenControl = s_sp->scene.onroadScreenOffControl;
-      bool started = s_sp->scene.started;
-      bool timerExpired = (s_sp->scene.onroadScreenOffTimer == 0);
-      ignore |= (onroadScreenControl and started and timerExpired);
-      s_sp->reset_onroad_sleep_timer();
-#endif
-
       break;
     }
     default:

selfdrive/ui/qt/window.h

@@ -7,10 +7,6 @@
 #include "selfdrive/ui/qt/offroad/onboarding.h"
 #include "selfdrive/ui/qt/offroad/settings.h"
 
-#ifdef SUNNYPILOT
-#include "selfdrive/ui/sunnypilot/ui.h"
-#endif
-
 class MainWindow : public QWidget {
   Q_OBJECT
 

selfdrive/ui/soundd.py

@@ -4,7 +4,7 @@ import time
 import wave
 
 
-from cereal import car, messaging, custom
+from cereal import car, messaging
 from openpilot.common.basedir import BASEDIR
 from openpilot.common.filter_simple import FirstOrderFilter
 from openpilot.common.realtime import Ratekeeper
@@ -26,15 +26,8 @@ AMBIENT_DB = 30 # DB where MIN_VOLUME is applied
 DB_SCALE = 30 # AMBIENT_DB + DB_SCALE is where MAX_VOLUME is applied
 
 AudibleAlert = car.CarControl.HUDControl.AudibleAlert
-AudibleAlertSP = custom.SelfdriveStateSP.AudibleAlert
 
 
-sound_list_sp: dict[int, tuple[str, int | None, float]] = {
-  # AudibleAlertSP, file name, play count (none for infinite)
-  AudibleAlertSP.promptSingleLow: ("prompt_single_low.wav", 1, MAX_VOLUME),
-  AudibleAlertSP.promptSingleHigh: ("prompt_single_high.wav", 1, MAX_VOLUME),
-}
-
 sound_list: dict[int, tuple[str, int | None, float]] = {
   # AudibleAlert, file name, play count (none for infinite)
   AudibleAlert.engage: ("engage.wav", 1, MAX_VOLUME),
@@ -47,8 +40,6 @@ sound_list: dict[int, tuple[str, int | None, float]] = {
 
   AudibleAlert.warningSoft: ("warning_soft.wav", None, MAX_VOLUME),
   AudibleAlert.warningImmediate: ("warning_immediate.wav", None, MAX_VOLUME),
-
-  **sound_list_sp,
 }
 
 def check_selfdrive_timeout_alert(sm):

selfdrive/ui/sunnypilot/SConscript

@@ -24,7 +24,6 @@ qt_src = [
   "sunnypilot/qt/offroad/offroad_home.cc",
   "sunnypilot/qt/offroad/settings/developer_panel.cc",
   "sunnypilot/qt/offroad/settings/device_panel.cc",
-  "sunnypilot/qt/offroad/settings/display_panel.cc",
   "sunnypilot/qt/offroad/settings/lateral_panel.cc",
   "sunnypilot/qt/offroad/settings/longitudinal_panel.cc",
   "sunnypilot/qt/offroad/settings/max_time_offroad.cc",
@@ -38,7 +37,6 @@ qt_src = [
   "sunnypilot/qt/offroad/settings/trips_panel.cc",
   "sunnypilot/qt/offroad/settings/vehicle_panel.cc",
   "sunnypilot/qt/offroad/settings/visuals_panel.cc",
-  "sunnypilot/qt/onroad/alerts.cc",
   "sunnypilot/qt/onroad/annotated_camera.cc",
   "sunnypilot/qt/onroad/buttons.cc",
   "sunnypilot/qt/onroad/developer_ui/developer_ui.cc",
@@ -52,8 +50,6 @@ lateral_panel_qt_src = [
   "sunnypilot/qt/offroad/settings/lateral/lane_change_settings.cc",
   "sunnypilot/qt/offroad/settings/lateral/mads_settings.cc",
   "sunnypilot/qt/offroad/settings/lateral/neural_network_lateral_control.cc",
-  "sunnypilot/qt/offroad/settings/lateral/torque_lateral_control_custom_params.cc",
-  "sunnypilot/qt/offroad/settings/lateral/torque_lateral_control_settings.cc",
 ]
 
 longitudinal_panel_qt_src = [
@@ -94,13 +90,9 @@ brand_settings_qt_src = [
   "sunnypilot/qt/offroad/settings/vehicle/volkswagen_settings.cc",
 ]
 
-display_panel_qt_src = [
-  "sunnypilot/qt/offroad/settings/display/onroad_screen_brightness.cc",
-]
 
 sp_widgets_src = widgets_src + network_src
-sp_qt_src = qt_src + lateral_panel_qt_src + vehicle_panel_qt_src + brand_settings_qt_src + \
-            longitudinal_panel_qt_src + osm_panel_qt_src + display_panel_qt_src
+sp_qt_src = qt_src + lateral_panel_qt_src + vehicle_panel_qt_src + brand_settings_qt_src + longitudinal_panel_qt_src + osm_panel_qt_src
 sp_qt_util = qt_util
 
 Export('sp_widgets_src', 'sp_qt_src', "sp_qt_util")

selfdrive/ui/sunnypilot/qt/offroad/settings/brightness.cc

@@ -25,8 +25,8 @@ const QMap<QString, QString> Brightness::brightness_options = {
 
 Brightness::Brightness() : OptionControlSP(
   "Brightness",
-  tr("Global Brightness"),
-  tr("Overrides the brightness of the device. This applies to both onroad and offroad screens. "),
+  tr("Brightness"),
+  tr("Overrides the brightness of the device."),
   "../assets/offroad/icon_blank.png",
   {0, 11}, 1, true, &brightness_options) {
 

selfdrive/ui/sunnypilot/qt/offroad/settings/developer_panel.cc

@@ -56,13 +56,14 @@ DeveloperPanelSP::DeveloperPanelSP(SettingsWindow *parent) : DeveloperPanel(pare
   addItem(errorLogBtn);
 
   QObject::connect(uiState(), &UIState::offroadTransition, this, &DeveloperPanelSP::updateToggles);
+
+  is_release = params.getBool("IsReleaseBranch");
+  is_tested = params.getBool("IsTestedBranch");
+  is_development = params.getBool("IsDevelopmentBranch");
 }
 
 void DeveloperPanelSP::updateToggles(bool offroad) {
   bool disable_updates = params.getBool("DisableUpdates");
-  bool is_release = params.getBool("IsReleaseBranch");
-  bool is_tested = params.getBool("IsTestedBranch");
-  bool is_development = params.getBool("IsDevelopmentBranch");
 
   prebuiltToggle->setVisible(!is_release && !is_tested && !is_development);
   prebuiltToggle->setEnabled(disable_updates);

selfdrive/ui/sunnypilot/qt/offroad/settings/developer_panel.h

@@ -22,6 +22,9 @@ private:
   ParamControlSP *prebuiltToggle;
   Params params;
   ParamControlSP *showAdvancedControls;
+  bool is_development;
+  bool is_release;
+  bool is_tested;
 
 private slots:
   void updateToggles(bool offroad);

selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.cc

@@ -23,7 +23,6 @@ DevicePanelSP::DevicePanelSP(SettingsWindowSP *parent) : DevicePanel(parent) {
     {"regulatoryBtn", tr("Regulatory"), ""},
     {"translateBtn", tr("Language"), ""},
     {"resetParams", tr("Reset Settings"), ""},
-    {"onroadUploadsBtn", tr("Onroad Uploads"), "OnroadUploads"}
   };
 
   int row = 0, col = 0;
@@ -76,21 +75,35 @@ DevicePanelSP::DevicePanelSP(SettingsWindowSP *parent) : DevicePanel(parent) {
 
   connect(buttons["resetParams"], &PushButtonSP::clicked, this, &DevicePanelSP::resetSettings);
 
-  connect(buttons["onroadUploadsBtn"], &PushButtonSP::clicked, buttons["onroadUploadsBtn"], &PushButtonSP::updateButton);
-
   // Max Time Offroad
   maxTimeOffroad = new MaxTimeOffroad();
   connect(maxTimeOffroad, &OptionControlSP::updateLabels, maxTimeOffroad, &MaxTimeOffroad::refresh);
   addItem(maxTimeOffroad);
 
-  toggleDeviceBootMode = new ButtonParamControlSP("DeviceBootMode", tr("Wake-Up Behavior"), "", "", {"Default", "Offroad"}, 375, true);
+    toggleDeviceBootMode = new ButtonParamControlSP("DeviceBootMode", tr("Wake-Up Behavior"), "", "", {"Default", "Offroad"}, 375, true);
   addItem(toggleDeviceBootMode);
 
   connect(toggleDeviceBootMode, &ButtonParamControlSP::buttonClicked, this, [=](int index) {
     params.put("DeviceBootMode", QString::number(index).toStdString());
-    updateState(offroad);
+    updateState();
   });
 
+  interactivityTimeout =  new OptionControlSP("InteractivityTimeout", tr("Interactivity Timeout"),
+                                     tr("Apply a custom timeout for settings UI."
+                                        "\nThis is the time after which settings UI closes automatically if user is not interacting with the screen."),
+                                     "", {0, 120}, 10, true, nullptr, false);
+
+  connect(interactivityTimeout, &OptionControlSP::updateLabels, [=]() {
+    updateState();
+  });
+
+  addItem(interactivityTimeout);
+  
+  // Brightness
+  brightness = new Brightness();
+  connect(brightness, &OptionControlSP::updateLabels, brightness, &Brightness::refresh);
+  addItem(brightness);
+
   addItem(device_grid_layout);
 
   // offroad mode and power buttons
@@ -116,21 +129,29 @@ DevicePanelSP::DevicePanelSP(SettingsWindowSP *parent) : DevicePanel(parent) {
   offroadBtn->setFixedWidth(power_layout->sizeHint().width());
   QObject::connect(offroadBtn, &PushButtonSP::clicked, this, &DevicePanelSP::setOffroadMode);
 
-  power_group_layout = new QVBoxLayout();
+  QVBoxLayout *power_group_layout = new QVBoxLayout();
   power_group_layout->setSpacing(25);
+  power_group_layout->addWidget(offroadBtn, 0, Qt::AlignHCenter);
   power_group_layout->addLayout(power_layout);
 
   addItem(power_group_layout);
 
-  always_enabled_btns = {
+  std::vector always_enabled_btns = {
     rebootBtn,
     poweroffBtn,
     offroadBtn,
     buttons["quietModeBtn"],
-    buttons["onroadUploadsBtn"],
   };
 
-  QObject::connect(uiState(), &UIState::offroadTransition, this, &DevicePanelSP::updateState);
+  QObject::connect(uiState(), &UIState::offroadTransition, [=](bool offroad) {
+    for (auto btn : findChildren<PushButtonSP*>()) {
+      bool always_enabled = std::find(always_enabled_btns.begin(), always_enabled_btns.end(), btn) != always_enabled_btns.end();
+
+      if (!always_enabled) {
+        btn->setEnabled(offroad);
+      }
+    }
+  });
 }
 
 void DevicePanelSP::setOffroadMode() {
@@ -154,7 +175,7 @@ void DevicePanelSP::setOffroadMode() {
     ConfirmationDialog::alert(tr("Disengage to Enter Always Offroad Mode"), this);
   }
 
-  updateState(offroad);
+  updateState();
 }
 
 void DevicePanelSP::resetSettings() {
@@ -171,20 +192,16 @@ void DevicePanelSP::resetSettings() {
 }
 
 void DevicePanelSP::showEvent(QShowEvent *event) {
-  updateState(offroad);
+  updateState();
 }
 
-void DevicePanelSP::updateState(bool _offroad) {
-  for (auto btn : findChildren<PushButtonSP*>()) {
-    bool always_enabled = std::find(always_enabled_btns.begin(), always_enabled_btns.end(), btn) != always_enabled_btns.end();
-
-    if (!always_enabled) {
-      btn->setEnabled(_offroad);
-    }
+void DevicePanelSP::updateState() {
+  if (!isVisible()) {
+    return;
   }
 
   bool offroad_mode_param = params.getBool("OffroadMode");
-  offroadBtn->setText(offroad_mode_param ? tr("Exit Always Offroad") : tr("Enable Always Offroad"));
+  offroadBtn->setText(offroad_mode_param ? tr("Exit Always Offroad") : tr("Always Offroad"));
   offroadBtn->setStyleSheet(offroad_mode_param ? alwaysOffroadStyle : autoOffroadStyle);
 
   DeviceSleepModeStatus currStatus = DeviceSleepModeStatus::DEFAULT;
@@ -193,11 +210,10 @@ void DevicePanelSP::updateState(bool _offroad) {
   }
   toggleDeviceBootMode->setDescription(deviceSleepModeDescription(currStatus));
 
-  if (offroad and not offroad_mode_param) {
-    power_group_layout->insertWidget(0, offroadBtn, 0, Qt::AlignHCenter);
+  QString timeoutValue = QString::fromStdString(params.get("InteractivityTimeout"));
+  if (timeoutValue == "0" || timeoutValue.isEmpty()) {
+    interactivityTimeout->setLabel("Default");
   } else {
-    AddWidgetAt(0, offroadBtn);
+    interactivityTimeout->setLabel(timeoutValue + "s");
   }
-
-  offroad = _offroad;
 }

selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/max_time_offroad.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/brightness.h"
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/settings.h"
 #include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
 
@@ -23,7 +24,7 @@ public:
   explicit DevicePanelSP(SettingsWindowSP *parent = 0);
   void showEvent(QShowEvent *event) override;
   void setOffroadMode();
-  void updateState(bool _offroad);
+  void updateState();
   void resetSettings();
 
 private:
@@ -31,10 +32,8 @@ private:
   PushButtonSP *offroadBtn;
   MaxTimeOffroad *maxTimeOffroad;
   ButtonParamControlSP *toggleDeviceBootMode;
-  QVBoxLayout *power_group_layout;
-  bool offroad;
-
-  std::vector<PushButtonSP*> always_enabled_btns = {};
+  Brightness *brightness;
+  OptionControlSP *interactivityTimeout;
 
   const QString alwaysOffroadStyle = R"(
     PushButtonSP {

selfdrive/ui/sunnypilot/qt/offroad/settings/display/onroad_screen_brightness.cc

@@ -1,54 +0,0 @@
-/**
- * Copyright (c) 2021-, Haibin Wen, sunnypilot, and a number of other contributors.
- *
- * This file is part of sunnypilot and is licensed under the MIT License.
- * See the LICENSE.md file in the root directory for more details.
- */
-
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/display/onroad_screen_brightness.h"
-
-OnroadScreenBrightnessControl::OnroadScreenBrightnessControl(const QString &param, const QString &title,
-                                                             const QString &description, const QString &icon,
-                                                             QWidget *parent)
-  : ExpandableToggleRow(param, title, description, icon, parent) {
-  auto *mainFrame = new QFrame(this);
-  auto *mainFrameLayout = new QVBoxLayout();
-  mainFrame->setLayout(mainFrameLayout);
-  mainFrameLayout->setSpacing(30);
-  mainFrameLayout->setContentsMargins(0, 0, 0, 0);
-
-  onroadScreenOffTimer = new OptionControlSP(
-    "OnroadScreenOffTimer",
-    "Onroad Brightness Delay",
-    "",
-    "",
-    {0, 11}, 1, true, &onroadScreenOffTimerOptions);
-
-  onroadScreenBrightness = new OptionControlSP(
-    "OnroadScreenOffBrightness",
-    "Onroad Brightness",
-    "",
-    "",
-    {0, 90}, 10, true);
-
-  connect(onroadScreenOffTimer, &OptionControlSP::updateLabels, this, &OnroadScreenBrightnessControl::refresh);
-  connect(onroadScreenBrightness, &OptionControlSP::updateLabels, this, &OnroadScreenBrightnessControl::refresh);
-  mainFrameLayout->addWidget(onroadScreenBrightness);
-  mainFrameLayout->addWidget(onroadScreenOffTimer);
-
-  addItem(mainFrame);
-
-  refresh();
-}
-
-void OnroadScreenBrightnessControl::refresh() {
-  // Driving Screen Off Timer
-  int valTimer = std::atoi(params.get("OnroadScreenOffTimer").c_str());
-  std::string labelTimer = (valTimer < 60 ? std::to_string(valTimer) + "s" : std::to_string(valTimer / 60) + "m");
-  onroadScreenOffTimer->setLabel(QString::fromStdString(labelTimer));
-
-  // Driving Screen Off Brightness
-  std::string valBrightness = params.get("OnroadScreenOffBrightness");
-  std::string labelBrightness = (valBrightness == "0" ? " Screen Off" : valBrightness + "%");
-  onroadScreenBrightness->setLabel(QString::fromStdString(labelBrightness));
-}

selfdrive/ui/sunnypilot/qt/offroad/settings/display/onroad_screen_brightness.h

@@ -1,42 +0,0 @@
-/**
- * Copyright (c) 2021-, Haibin Wen, sunnypilot, and a number of other contributors.
- *
- * This file is part of sunnypilot and is licensed under the MIT License.
- * See the LICENSE.md file in the root directory for more details.
- */
-
-#pragma once
-
-#include "selfdrive/ui/sunnypilot/ui.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/settings.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/expandable_row.h"
-
-static const QMap<QString, QString> onroadScreenOffTimerOptions = {
-  {"0", "15"},
-  {"1", "30"},
-  {"2", "60"},
-  {"3", "120"},
-  {"4", "180"},
-  {"5", "240"},
-  {"6", "300"},
-  {"7", "360"},
-  {"8", "420"},
-  {"9", "480"},
-  {"10", "540"},
-  {"11", "600"}
-};
-
-class OnroadScreenBrightnessControl : public ExpandableToggleRow {
-  Q_OBJECT
-
-public:
-  OnroadScreenBrightnessControl(const QString &param, const QString &title, const QString &desc, const QString &icon,
-                                QWidget *parent = nullptr);
-  void refresh();
-
-private:
-  Params params;
-  OptionControlSP *onroadScreenOffTimer;
-  OptionControlSP *onroadScreenBrightness;
-};

selfdrive/ui/sunnypilot/qt/offroad/settings/display_panel.cc

@@ -1,65 +0,0 @@
-/**
- * Copyright (c) 2021-, Haibin Wen, sunnypilot, and a number of other contributors.
- *
- * This file is part of sunnypilot and is licensed under the MIT License.
- * See the LICENSE.md file in the root directory for more details.
- */
-
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/display_panel.h"
-
-DisplayPanel::DisplayPanel(QWidget *parent) : QWidget(parent) {
-  main_layout = new QStackedLayout(this);
-  ListWidgetSP *list = new ListWidgetSP(this, false);
-
-  sunnypilotScreen = new QWidget(this);
-  QVBoxLayout* vlayout = new QVBoxLayout(sunnypilotScreen);
-  vlayout->setContentsMargins(50, 20, 50, 20);
-
-  // Onroad Screen Off/Brightness
-  onroadScreenBrightnessControl = new OnroadScreenBrightnessControl(
-    "OnroadScreenOffControl",
-    tr("Onroad Screen: Reduced Brightness"),
-    tr("Turn off device screen or reduce brightness after driving starts. "
-       "It automatically brightens again when screen is touched or a visible alert is displayed."),
-    "",
-    this);
-  list->addItem(onroadScreenBrightnessControl);
-  list->addItem(horizontal_line());
-
-  // Global Brightness
-  brightness = new Brightness();
-  connect(brightness, &OptionControlSP::updateLabels, brightness, &Brightness::refresh);
-  list->addItem(brightness);
-  list->addItem(horizontal_line());
-
-  // Interactivity Timeout
-  interactivityTimeout =  new OptionControlSP("InteractivityTimeout", tr("Interactivity Timeout"),
-                                   tr("Apply a custom timeout for settings UI."
-                                      "\nThis is the time after which settings UI closes automatically if user is not interacting with the screen."),
-                                   "", {0, 120}, 10, true, nullptr, false);
-
-  connect(interactivityTimeout, &OptionControlSP::updateLabels, [=]() {
-    refresh();
-  });
-  list->addItem(interactivityTimeout);
-
-  sunnypilotScroller = new ScrollViewSP(list, this);
-  vlayout->addWidget(sunnypilotScroller);
-  main_layout->addWidget(sunnypilotScreen);
-}
-
-void DisplayPanel::showEvent(QShowEvent *event) {
-  QWidget::showEvent(event);
-  refresh();
-}
-
-void DisplayPanel::refresh() {
-  onroadScreenBrightnessControl->refresh();
-
-  QString timeoutValue = QString::fromStdString(params.get("InteractivityTimeout"));
-  if (timeoutValue == "0" || timeoutValue.isEmpty()) {
-    interactivityTimeout->setLabel("Default");
-  } else {
-    interactivityTimeout->setLabel(timeoutValue + "s");
-  }
-}

selfdrive/ui/sunnypilot/qt/offroad/settings/display_panel.h

@@ -1,31 +0,0 @@
-/**
- * Copyright (c) 2021-, Haibin Wen, sunnypilot, and a number of other contributors.
- *
- * This file is part of sunnypilot and is licensed under the MIT License.
- * See the LICENSE.md file in the root directory for more details.
- */
-
-#pragma once
-
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/brightness.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/display/onroad_screen_brightness.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/settings.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/scrollview.h"
-
-class DisplayPanel : public QWidget {
-  Q_OBJECT
-
-public:
-  explicit DisplayPanel(QWidget *parent = nullptr);
-  void showEvent(QShowEvent *event) override;
-  void refresh();
-
-private:
-  QStackedLayout* main_layout = nullptr;
-  QWidget* sunnypilotScreen = nullptr;
-  ScrollViewSP *sunnypilotScroller = nullptr;
-  Params params;
-  OnroadScreenBrightnessControl *onroadScreenBrightnessControl = nullptr;
-  Brightness *brightness;
-  OptionControlSP *interactivityTimeout;
-};

selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/mads_settings.cc

@@ -52,16 +52,12 @@ void MadsSettings::updateToggles(bool _offroad) {
   );
 
   auto cp_bytes = params.get("CarParamsPersistent");
-  auto cp_sp_bytes = params.get("CarParamsSPPersistent");
-  if (!cp_bytes.empty() && !cp_sp_bytes.empty()) {
+  if (!cp_bytes.empty()) {
     AlignedBuffer aligned_buf;
-    AlignedBuffer aligned_buf_sp;
     capnp::FlatArrayMessageReader cmsg(aligned_buf.align(cp_bytes.data(), cp_bytes.size()));
-    capnp::FlatArrayMessageReader cmsg_sp(aligned_buf_sp.align(cp_sp_bytes.data(), cp_sp_bytes.size()));
     cereal::CarParams::Reader CP = cmsg.getRoot<cereal::CarParams>();
-    cereal::CarParamsSP::Reader CP_SP = cmsg_sp.getRoot<cereal::CarParamsSP>();
 
-    if (madsLimitedSettings(CP, CP_SP)) {
+    if (isBrandInList(CP.getBrand(), mads_limited_settings_brands)) {
       params.remove("MadsMainCruiseAllowed");
       params.putBool("MadsUnifiedEngagementMode", true);
       params.put("MadsSteeringMode", std::to_string(static_cast<int>(MadsSteeringMode::DISENGAGE)));

selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/mads_settings.h

@@ -12,16 +12,7 @@
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/settings.h"
 #include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
 
-inline bool madsLimitedSettings(const cereal::CarParams::Reader &CP, const cereal::CarParamsSP::Reader &CP_SP) {
-  if (CP.getBrand() == "rivian") {
-    return true;
-  }
-  if (CP.getBrand() == "tesla") {
-    return !(CP_SP.getFlags() & 1);  // 1 == TeslaFlagsSP.HAS_VEHICLE_BUS
-  }
-
-  return false;
-}
+const std::vector<std::string> mads_limited_settings_brands = {"rivian", "tesla"};
 
 enum class MadsSteeringMode {
   REMAIN_ACTIVE = 0,

selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/neural_network_lateral_control.cc

@@ -10,15 +10,14 @@
 NeuralNetworkLateralControl::NeuralNetworkLateralControl() :
   ParamControl("NeuralNetworkLateralControl", tr("Neural Network Lateral Control (NNLC)"),  "", "") {
   setConfirmation(true, false);
-  updateToggle(offroad);
+  updateToggle();
 }
 
-void NeuralNetworkLateralControl::updateToggle(bool _offroad) {
+void NeuralNetworkLateralControl::updateToggle() {
   QString statusInitText = "<font color='yellow'>" + STATUS_CHECK_COMPATIBILITY + "</font>";
   QString notLoadedText = "<font color='yellow'>" + STATUS_NOT_LOADED + "</font>";
   QString loadedText = "<font color=#00ff00>" + STATUS_LOADED + "</font>";
 
-  bool allowed = true;
   auto cp_bytes = params.get("CarParamsPersistent");
   auto cp_sp_bytes = params.get("CarParamsSPPersistent");
   if (!cp_bytes.empty() && !cp_sp_bytes.empty()) {
@@ -32,7 +31,7 @@ void NeuralNetworkLateralControl::updateToggle(bool _offroad) {
     if (CP.getSteerControlType() == cereal::CarParams::SteerControlType::ANGLE) {
       params.remove("NeuralNetworkLateralControl");
       setDescription(nnffDescriptionBuilder(STATUS_NOT_AVAILABLE));
-      allowed = false;
+      setEnabled(false);
     } else {
       QString nn_model_name = QString::fromStdString(CP_SP.getNeuralNetworkLateralControl().getModel().getName());
       QString nn_fuzzy = CP_SP.getNeuralNetworkLateralControl().getFuzzyFingerprint() ?
@@ -57,11 +56,4 @@ void NeuralNetworkLateralControl::updateToggle(bool _offroad) {
   if (getDescription() != getBaseDescription()) {
     showDescription();
   }
-
-  bool enforce_torque_toggle = params.getBool("EnforceTorqueControl");
-  setEnabled(_offroad && allowed && !enforce_torque_toggle);
-
-  refresh();
-
-  offroad = _offroad;
 }

selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/neural_network_lateral_control.h

@@ -20,11 +20,10 @@ public:
   NeuralNetworkLateralControl();
 
 public slots:
-  void updateToggle(bool _offroad);
+  void updateToggle();
 
 private:
   Params params;
-  bool offroad;
 
   // Status messages
   const QString STATUS_NOT_AVAILABLE = tr("NNLC is currently not available on this platform.");

selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/torque_lateral_control_custom_params.cc

@@ -1,58 +0,0 @@
-/**
- * Copyright (c) 2021-, Haibin Wen, sunnypilot, and a number of other contributors.
- *
- * This file is part of sunnypilot and is licensed under the MIT License.
- * See the LICENSE.md file in the root directory for more details.
- */
-
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/torque_lateral_control_custom_params.h"
-
-TorqueLateralControlCustomParams::TorqueLateralControlCustomParams(const QString &param, const QString &title, const QString &description, const QString &icon, QWidget *parent)
-    : ExpandableToggleRow(param, title, description, icon, parent) {
-
-  QFrame *frame = new QFrame(this);
-  QGridLayout *frame_layout = new QGridLayout();
-  frame->setLayout(frame_layout);
-  frame_layout->setSpacing(0);
-
-  torqueLateralControlParamsOverride = new ParamControl(
-    "TorqueParamsOverrideEnabled",
-    tr("Manual Real-Time Tuning"),
-    tr("Enforces the torque lateral controller to use the fixed values instead of the learned values from Self-Tune. Enabling this toggle overrides Self-Tune values."),
-    "../assets/offroad/icon_blank.png",
-    this
-  );
-  connect(torqueLateralControlParamsOverride, &ParamControl::toggleFlipped, this, &TorqueLateralControlCustomParams::refresh);
-
-  torqueParamsOverrideLatAccelFactor = new OptionControlSP("TorqueParamsOverrideLatAccelFactor", tr("Lateral Acceleration Factor"), "", "", {1, 500}, 1, false, nullptr, true, false);
-  connect(torqueParamsOverrideLatAccelFactor, &OptionControlSP::updateLabels, this, &TorqueLateralControlCustomParams::refresh);
-  torqueParamsOverrideLatAccelFactor->setFixedWidth(280);
-
-  torqueParamsOverrideFriction = new OptionControlSP("TorqueParamsOverrideFriction", tr("Friction"), "", "", {1, 100}, 1, false, nullptr, true, false);
-  connect(torqueParamsOverrideFriction, &OptionControlSP::updateLabels, this, &TorqueLateralControlCustomParams::refresh);
-  torqueParamsOverrideFriction->setFixedWidth(280);
-
-  frame_layout->addWidget(torqueLateralControlParamsOverride, 0, 0, 1, 2);
-  QSpacerItem *spacer = new QSpacerItem(20, 40);
-  frame_layout->addItem(spacer, 1, 0, 1, 2);
-  frame_layout->addWidget(torqueParamsOverrideLatAccelFactor, 2, 0, Qt::AlignCenter);
-  frame_layout->addWidget(torqueParamsOverrideFriction, 2, 1, Qt::AlignCenter);
-
-  addItem(frame);
-
-  refresh();
-}
-
-void TorqueLateralControlCustomParams::refresh() {
-  bool torque_override_param = params.getBool("TorqueParamsOverrideEnabled");
-  float laf_param = QString::fromStdString(params.get("TorqueParamsOverrideLatAccelFactor")).toFloat();
-  const QString laf_unit = "m/s²";
-
-  float friction_param = QString::fromStdString(params.get("TorqueParamsOverrideFriction")).toFloat();
-
-  torqueParamsOverrideLatAccelFactor->setTitle(tr("Lateral Acceleration Factor") + "\n(" + (torque_override_param ? tr("Real-time and Offline") : tr("Offline Only")) + ")");
-  torqueParamsOverrideFriction->setTitle(tr("Friction") + "\n(" + (torque_override_param ? tr("Real-time and Offline") : tr("Offline Only")) + ")");
-
-  torqueParamsOverrideLatAccelFactor->setLabel(QString::number(laf_param, 'f', 2) + " " + laf_unit);
-  torqueParamsOverrideFriction->setLabel(QString::number(friction_param, 'f', 2));
-}

selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/torque_lateral_control_custom_params.h

@@ -1,27 +0,0 @@
-/**
- * Copyright (c) 2021-, Haibin Wen, sunnypilot, and a number of other contributors.
- *
- * This file is part of sunnypilot and is licensed under the MIT License.
- * See the LICENSE.md file in the root directory for more details.
- */
-
-#pragma once
-
-#include "selfdrive/ui/sunnypilot/ui.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/settings.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/expandable_row.h"
-
-class TorqueLateralControlCustomParams : public ExpandableToggleRow {
-  Q_OBJECT
-
-public:
-  TorqueLateralControlCustomParams(const QString &param, const QString &title, const QString &description, const QString &icon, QWidget *parent = nullptr);
-  void refresh();
-
-private:
-  Params params;
-  ParamControl *torqueLateralControlParamsOverride;
-  OptionControlSP *torqueParamsOverrideFriction;
-  OptionControlSP *torqueParamsOverrideLatAccelFactor;
-};

selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/torque_lateral_control_settings.cc

@@ -1,81 +0,0 @@
-/**
- * Copyright (c) 2021-, Haibin Wen, sunnypilot, and a number of other contributors.
- *
- * This file is part of sunnypilot and is licensed under the MIT License.
- * See the LICENSE.md file in the root directory for more details.
- */
-
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/torque_lateral_control_settings.h"
-
-#include "selfdrive/ui/sunnypilot/qt/widgets/scrollview.h"
-
-TorqueLateralControlSettings::TorqueLateralControlSettings(QWidget *parent) : QWidget(parent) {
-  QVBoxLayout *main_layout = new QVBoxLayout(this);
-  main_layout->setContentsMargins(50, 20, 50, 20);
-  main_layout->setSpacing(20);
-
-  // Back button
-  PanelBackButton *back = new PanelBackButton();
-  connect(back, &QPushButton::clicked, [=]() { emit backPress(); });
-  main_layout->addWidget(back, 0, Qt::AlignLeft);
-
-  ListWidget *list = new ListWidget(this, false);
-  // param, title, desc, icon
-  std::vector<std::tuple<QString, QString, QString, QString>> toggle_defs{
-    {
-      "LiveTorqueParamsToggle",
-      tr("Self-Tune"),
-      tr("Enables self-tune for Torque lateral control for platforms that do not use Torque lateral control by default."),
-      "../assets/offroad/icon_blank.png",
-    },
-    {
-      "LiveTorqueParamsRelaxedToggle",
-      tr("Less Restrict Settings for Self-Tune (Beta)"),
-      tr("Less strict settings when using Self-Tune. This allows torqued to be more forgiving when learning values."),
-      "../assets/offroad/icon_blank.png",
-    }
-  };
-
-  for (auto &[param, title, desc, icon] : toggle_defs) {
-    auto toggle = new ParamControlSP(param, title, desc, icon, this);
-    list->addItem(toggle);
-    toggles[param.toStdString()] = toggle;
-  }
-
-  torqueLateralControlCustomParams = new TorqueLateralControlCustomParams(
-    "CustomTorqueParams",
-    tr("Enable Custom Tuning"),
-    tr("Enables custom tuning for Torque lateral control. Modifying Lateral Acceleration Factor and Friction below will override the offline values indicated in the YAML files within \"opendbc/car/torque_data\". "
-       "The values will also be used live when \"Manual Real-Time Tuning\" toggle is enabled."),
-    "../assets/offroad/icon_blank.png",
-    this);
-  list->addItem(torqueLateralControlCustomParams);
-
-  QObject::connect(uiState(), &UIState::offroadTransition, this, &TorqueLateralControlSettings::updateToggles);
-  QObject::connect(toggles["LiveTorqueParamsToggle"], &ParamControlSP::toggleFlipped, [=](bool state) {
-    if (!state) {
-      params.remove("LiveTorqueParamsRelaxedToggle");
-      toggles["LiveTorqueParamsRelaxedToggle"]->refresh();
-    }
-
-    updateToggles(offroad);
-  });
-
-  main_layout->addWidget(new ScrollViewSP(list, this));
-}
-
-void TorqueLateralControlSettings::showEvent(QShowEvent *event) {
-  updateToggles(offroad);
-}
-
-void TorqueLateralControlSettings::updateToggles(bool _offroad) {
-  bool live_toggle = toggles["LiveTorqueParamsToggle"]->isToggled();
-
-  toggles["LiveTorqueParamsToggle"]->setEnabled(_offroad);
-  toggles["LiveTorqueParamsRelaxedToggle"]->setEnabled(_offroad && live_toggle);
-
-  torqueLateralControlCustomParams->setEnabled(_offroad);
-  torqueLateralControlCustomParams->refresh();
-
-  offroad = _offroad;
-}

selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/torque_lateral_control_settings.h

@@ -1,36 +0,0 @@
-/**
- * Copyright (c) 2021-, Haibin Wen, sunnypilot, and a number of other contributors.
- *
- * This file is part of sunnypilot and is licensed under the MIT License.
- * See the LICENSE.md file in the root directory for more details.
- */
-
-#pragma once
-
-#include "selfdrive/ui/qt/util.h"
-#include "selfdrive/ui/sunnypilot/ui.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/torque_lateral_control_custom_params.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/settings.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
-
-class TorqueLateralControlSettings : public QWidget {
-  Q_OBJECT
-
-public:
-  explicit TorqueLateralControlSettings(QWidget *parent = nullptr);
-
-  void showEvent(QShowEvent *event) override;
-
-  signals:
-    void backPress();
-
-public slots:
-  void updateToggles(bool _offroad);
-
-private:
-  Params params;
-  bool offroad;
-  std::map<std::string, ParamControlSP*> toggles;
-
-  TorqueLateralControlCustomParams *torqueLateralControlCustomParams;
-};

selfdrive/ui/sunnypilot/qt/offroad/settings/lateral_panel.cc

@@ -75,36 +75,6 @@ LateralPanel::LateralPanel(SettingsWindowSP *parent) : QFrame(parent) {
 
   list->addItem(horizontal_line());
 
-  // Customized Torque Lateral Control
-  torqueLateralControlToggle = new ParamControl(
-    "EnforceTorqueControl",
-    tr("Enforce Torque Lateral Control"),
-    tr("Enable this to enforce sunnypilot to steer with Torque lateral control."),
-    "");
-  list->addItem(torqueLateralControlToggle);
-
-  torqueLateralControlSettingsButton = new PushButtonSP(tr("Customize Params"));
-  torqueLateralControlSettingsButton->setObjectName("torque_btn");
-  connect(torqueLateralControlSettingsButton, &QPushButton::clicked, [=]() {
-    sunnypilotScroller->setLastScrollPosition();
-    main_layout->setCurrentWidget(torqueLateralControlWidget);
-  });
-  QObject::connect(torqueLateralControlToggle, &ToggleControl::toggleFlipped, [=](bool state) {
-    torqueLateralControlSettingsButton->setEnabled(state);
-    nnlcToggle->updateToggle(offroad);
-    updateToggles(offroad);
-  });
-
-  torqueLateralControlWidget = new TorqueLateralControlSettings(this);
-  connect(torqueLateralControlWidget, &TorqueLateralControlSettings::backPress, [=]() {
-    sunnypilotScroller->restoreScrollPosition();
-    main_layout->setCurrentWidget(sunnypilotScreen);
-  });
-  list->addItem(torqueLateralControlSettingsButton);
-
-  list->addItem(vertical_space(0));
-  list->addItem(horizontal_line());
-
   // Neural Network Lateral Control
   nnlcToggle = new NeuralNetworkLateralControl();
   list->addItem(nnlcToggle);
@@ -116,10 +86,12 @@ LateralPanel::LateralPanel(SettingsWindowSP *parent) : QFrame(parent) {
       nnlcToggle->hideDescription();
     }
 
-    nnlcToggle->updateToggle(offroad);
-    updateToggles(offroad);
+    nnlcToggle->updateToggle();
   });
 
+  toggleOffroadOnly = {
+    madsToggle, nnlcToggle,
+  };
   QObject::connect(uiState(), &UIState::offroadTransition, this, &LateralPanel::updateToggles);
 
   sunnypilotScroller = new ScrollViewSP(list, this);
@@ -128,7 +100,6 @@ LateralPanel::LateralPanel(SettingsWindowSP *parent) : QFrame(parent) {
   main_layout->addWidget(sunnypilotScreen);
   main_layout->addWidget(madsWidget);
   main_layout->addWidget(laneChangeWidget);
-  main_layout->addWidget(torqueLateralControlWidget);
 
   setStyleSheet(R"(
     #back_btn {
@@ -149,7 +120,7 @@ LateralPanel::LateralPanel(SettingsWindowSP *parent) : QFrame(parent) {
 }
 
 void LateralPanel::showEvent(QShowEvent *event) {
-  nnlcToggle->updateToggle(offroad);
+  nnlcToggle->updateToggle();
   updateToggles(offroad);
 }
 
@@ -158,40 +129,27 @@ void LateralPanel::hideEvent(QHideEvent *event) {
 }
 
 void LateralPanel::updateToggles(bool _offroad) {
-  bool torque_allowed = true;
-  auto cp_bytes = params.get("CarParamsPersistent");
-  auto cp_sp_bytes = params.get("CarParamsSPPersistent");
-  if (!cp_bytes.empty() && !cp_sp_bytes.empty()) {
-    AlignedBuffer aligned_buf;
-    AlignedBuffer aligned_buf_sp;
-    capnp::FlatArrayMessageReader cmsg(aligned_buf.align(cp_bytes.data(), cp_bytes.size()));
-    capnp::FlatArrayMessageReader cmsg_sp(aligned_buf_sp.align(cp_sp_bytes.data(), cp_sp_bytes.size()));
-    cereal::CarParams::Reader CP = cmsg.getRoot<cereal::CarParams>();
-    cereal::CarParamsSP::Reader CP_SP = cmsg_sp.getRoot<cereal::CarParamsSP>();
+  for (auto *toggle : toggleOffroadOnly) {
+    toggle->setEnabled(_offroad);
+  }
 
-    if (madsLimitedSettings(CP, CP_SP)) {
+  auto cp_bytes = params.get("CarParamsPersistent");
+  if (!cp_bytes.empty()) {
+    AlignedBuffer aligned_buf;
+    capnp::FlatArrayMessageReader cmsg(aligned_buf.align(cp_bytes.data(), cp_bytes.size()));
+    cereal::CarParams::Reader CP = cmsg.getRoot<cereal::CarParams>();
+
+    if (isBrandInList(CP.getBrand(), mads_limited_settings_brands)) {
       madsToggle->setDescription(descriptionBuilder(STATUS_MADS_SETTINGS_LIMITED_COMPATIBILITY, MADS_BASE_DESC));
     } else {
       madsToggle->setDescription(descriptionBuilder(STATUS_MADS_SETTINGS_FULL_COMPATIBILITY, MADS_BASE_DESC));
     }
-
-    if (CP.getSteerControlType() == cereal::CarParams::SteerControlType::ANGLE) {
-      params.remove("EnforceTorqueControl");
-      torque_allowed = false;
-    }
   } else {
     madsToggle->setDescription(descriptionBuilder(STATUS_MADS_CHECK_COMPATIBILITY, MADS_BASE_DESC));
-
-    params.remove("EnforceTorqueControl");
-    torque_allowed = false;
   }
 
-  madsToggle->setEnabled(_offroad);
   madsSettingsButton->setEnabled(madsToggle->isToggled());
 
-  torqueLateralControlToggle->setEnabled(_offroad && torque_allowed && !nnlcToggle->isToggled());
-  torqueLateralControlSettingsButton->setEnabled(torqueLateralControlToggle->isToggled());
-
   blinkerPauseLateralSettings->refresh();
 
   offroad = _offroad;

selfdrive/ui/sunnypilot/qt/offroad/settings/lateral_panel.h

@@ -15,7 +15,6 @@
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/mads_settings.h"
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/neural_network_lateral_control.h"
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/lane_change_settings.h"
-#include "selfdrive/ui/sunnypilot/qt/offroad/settings/lateral/torque_lateral_control_settings.h"
 #include "selfdrive/ui/qt/util.h"
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/settings.h"
 #include "selfdrive/ui/sunnypilot/qt/widgets/scrollview.h"
@@ -36,6 +35,7 @@ private:
   QStackedLayout* main_layout = nullptr;
   QWidget* sunnypilotScreen = nullptr;
   ScrollViewSP *sunnypilotScroller = nullptr;
+  std::vector<ParamControl *> toggleOffroadOnly;
   bool offroad;
 
   ParamControl *madsToggle;
@@ -45,9 +45,6 @@ private:
   LaneChangeSettings *laneChangeWidget = nullptr;
   NeuralNetworkLateralControl *nnlcToggle = nullptr;
   BlinkerPauseLateralSettings *blinkerPauseLateralSettings = nullptr;
-  ParamControl *torqueLateralControlToggle;
-  PushButtonSP *torqueLateralControlSettingsButton;
-  TorqueLateralControlSettings *torqueLateralControlWidget = nullptr;
 
   const QString MADS_BASE_DESC = tr("Enables independent engagements of Automatic Lane Centering (ALC) and Adaptive Cruise Control (ACC).");
 

selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/helpers.h

@@ -6,34 +6,6 @@
  */
 #pragma once
 
-enum class SpeedLimitOffsetType {
-  NONE,
-  FIXED,
-  PERCENT,
-};
-
-inline const QString SpeedLimitOffsetTypeTexts[]{
-  QT_TRANSLATE_NOOP("SpeedLimitSettings", "None"),
-  QT_TRANSLATE_NOOP("SpeedLimitSettings", "Fixed"),
-  QT_TRANSLATE_NOOP("SpeedLimitSettings", "Percent"),
-};
-
-enum class SpeedLimitSourcePolicy {
-  CAR_ONLY,
-  MAP_ONLY,
-  CAR_FIRST,
-  MAP_FIRST,
-  COMBINED,
-};
-
-inline const QString SpeedLimitSourcePolicyTexts[]{
-  QT_TRANSLATE_NOOP("SpeedLimitPolicy", "Car\nOnly"),
-  QT_TRANSLATE_NOOP("SpeedLimitPolicy", "Map\nOnly"),
-  QT_TRANSLATE_NOOP("SpeedLimitPolicy", "Car\nFirst"),
-  QT_TRANSLATE_NOOP("SpeedLimitPolicy", "Map\nFirst"),
-  QT_TRANSLATE_NOOP("SpeedLimitPolicy", "Combined\nData")
-};
-
 enum class SpeedLimitMode {
   OFF,
   INFORMATION,
@@ -41,9 +13,37 @@ enum class SpeedLimitMode {
   ASSIST,
 };
 
-inline const QString SpeedLimitModeTexts[]{
-  QT_TRANSLATE_NOOP("SpeedLimitSettings", "Off"),
-  QT_TRANSLATE_NOOP("SpeedLimitSettings", "Information"),
-  QT_TRANSLATE_NOOP("SpeedLimitSettings", "Warning"),
-  QT_TRANSLATE_NOOP("SpeedLimitSettings", "Assist"),
+inline const char *SpeedLimitModeTexts[]{
+  QT_TR_NOOP("Off"),
+  QT_TR_NOOP("Information"),
+  QT_TR_NOOP("Warning"),
+  QT_TR_NOOP("Assist"),
+};
+
+enum class SpeedLimitOffsetType {
+  NONE,
+  FIXED,
+  PERCENT,
+};
+
+inline const char *SpeedLimitOffsetTypeTexts[]{
+  QT_TR_NOOP("None"),
+  QT_TR_NOOP("Fixed"),
+  QT_TR_NOOP("Percent"),
+};
+
+enum class SpeedLimitSourcePolicy {
+  CAR_ONLY,
+  MAP_ONLY,
+  CAR_FIRST,
+  MAP_FIRST,
+  COMBINED
+};
+
+inline const char *SpeedLimitSourcePolicyTexts[]{
+  QT_TR_NOOP("Car\nOnly"),
+  QT_TR_NOOP("Map\nOnly"),
+  QT_TR_NOOP("Car\nFirst"),
+  QT_TR_NOOP("Map\nFirst"),
+  QT_TR_NOOP("Combined\nData")
 };

selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/speed_limit_policy.cc

@@ -4,7 +4,6 @@
  * This file is part of sunnypilot and is licensed under the MIT License.
  * See the LICENSE.md file in the root directory for more details.
  */
-#include <QScrollBar>
 
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/speed_limit_policy.h"
 
@@ -20,14 +19,14 @@ SpeedLimitPolicy::SpeedLimitPolicy(QWidget *parent) : QWidget(parent) {
 
   main_layout->addSpacing(10);
 
-  ListWidgetSP *list = new ListWidgetSP(this);
+  ListWidgetSP *list = new ListWidgetSP(this, true);
 
   std::vector<QString> speed_limit_policy_texts{
-    tr(SpeedLimitSourcePolicyTexts[static_cast<int>(SpeedLimitSourcePolicy::CAR_ONLY)].toStdString().c_str()),
-    tr(SpeedLimitSourcePolicyTexts[static_cast<int>(SpeedLimitSourcePolicy::MAP_ONLY)].toStdString().c_str()),
-    tr(SpeedLimitSourcePolicyTexts[static_cast<int>(SpeedLimitSourcePolicy::CAR_FIRST)].toStdString().c_str()),
-    tr(SpeedLimitSourcePolicyTexts[static_cast<int>(SpeedLimitSourcePolicy::MAP_FIRST)].toStdString().c_str()),
-    tr(SpeedLimitSourcePolicyTexts[static_cast<int>(SpeedLimitSourcePolicy::COMBINED)].toStdString().c_str())
+    SpeedLimitSourcePolicyTexts[static_cast<int>(SpeedLimitSourcePolicy::CAR_ONLY)],
+    SpeedLimitSourcePolicyTexts[static_cast<int>(SpeedLimitSourcePolicy::MAP_ONLY)],
+    SpeedLimitSourcePolicyTexts[static_cast<int>(SpeedLimitSourcePolicy::CAR_FIRST)],
+    SpeedLimitSourcePolicyTexts[static_cast<int>(SpeedLimitSourcePolicy::MAP_FIRST)],
+    SpeedLimitSourcePolicyTexts[static_cast<int>(SpeedLimitSourcePolicy::COMBINED)]
   };
   speed_limit_policy = new ButtonParamControlSP(
     "SpeedLimitPolicy",
@@ -39,9 +38,8 @@ SpeedLimitPolicy::SpeedLimitPolicy(QWidget *parent) : QWidget(parent) {
   list->addItem(speed_limit_policy);
   connect(speed_limit_policy, &ButtonParamControlSP::buttonClicked, this, &SpeedLimitPolicy::refresh);
 
-  speedLimitPolicyScroller = new ScrollViewSP(list, this);
-  main_layout->addWidget(speedLimitPolicyScroller);
   refresh();
+  main_layout->addWidget(list);
 };
 
 void SpeedLimitPolicy::refresh() {
@@ -50,7 +48,6 @@ void SpeedLimitPolicy::refresh() {
 }
 
 void SpeedLimitPolicy::showEvent(QShowEvent *event) {
-  speedLimitPolicyScroller->verticalScrollBar()->setValue(0);
   refresh();
   speed_limit_policy->showDescription();
 }

selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/speed_limit_policy.h

@@ -8,9 +8,9 @@
 #pragma once
 
 #include "selfdrive/ui/sunnypilot/ui.h"
+#include "selfdrive/ui/sunnypilot/qt/offroad/settings/settings.h"
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/helpers.h"
 #include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/scrollview.h"
 
 class SpeedLimitPolicy : public QWidget {
   Q_OBJECT
@@ -20,13 +20,13 @@ public:
   void refresh();
   void showEvent(QShowEvent *event) override;
 
+signals:
 signals:
   void backPress();
 
 private:
   Params params;
   ButtonParamControlSP *speed_limit_policy;
-  ScrollViewSP *speedLimitPolicyScroller;
 
   static QString sourceDescription(SpeedLimitSourcePolicy type = SpeedLimitSourcePolicy::CAR_ONLY) {
     QString car_only = tr("⦿ Car Only: Use Speed Limit data only from Car");

selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/speed_limit_settings.cc

@@ -20,53 +20,65 @@ SpeedLimitSettings::SpeedLimitSettings(QWidget *parent) : QStackedWidget(parent)
 
   subPanelLayout->addSpacing(20);
 
-  ListWidgetSP *list = new ListWidgetSP(this, false);
+  ListWidgetSP *list = new ListWidgetSP(this, true);
+
+  // Speed Limit Assist
+  // TODO-SP: OptionControlSP with Speed Limit Information/Warning as a single option
+  speedLimitAssistToggle = new ParamControlSP(
+    "SpeedLimitAssist",
+    tr("Speed Limit Assist (SLA)"),
+    tr("When you engage ACC, you will be prompted to set the cruising speed to the speed limit of the road adjusted by the Offset and Source Policy specified, or the current driving speed. "
+      "The maximum cruising speed will always be the MAX set speed."),
+    "",
+    this);
+  list->addItem(speedLimitAssistToggle);
+
+  // TODO-SP: Combine Assist/Warning/Information
+  // std::vector<QString> speed_limit_texts{
+  //   SpeedLimitModeTexts[static_cast<int>(SpeedLimitMode::OFF)],
+  //   SpeedLimitModeTexts[static_cast<int>(SpeedLimitMode::INFORMATION)],
+  //   SpeedLimitModeTexts[static_cast<int>(SpeedLimitMode::WARNING)],
+  //   SpeedLimitModeTexts[static_cast<int>(SpeedLimitMode::ASSIST)],
+  // };
+  // speed_limit_mode_settings = new ButtonParamControlSP(
+  //   "SpeedLimitMode",
+  //   tr("Speed Limit Mode"),
+  //   tr("When you engage ACC, you will be prompted to set the cruising speed to the speed limit of the road adjusted by the Offset and Source Policy specified, or the current driving speed. "
+  //     "The maximum cruising speed will always be the MAX set speed."),
+  //   "",
+  //   speed_limit_texts,
+  //   250);
+  // list->addItem(speed_limit_mode_settings);
+
+  auto *speedLimitBtnFrame = new QFrame(this);
+  auto *speedLimitBtnFrameLayout = new QGridLayout();
+  speedLimitBtnFrame->setLayout(speedLimitBtnFrameLayout);
+  speedLimitBtnFrameLayout->setContentsMargins(0, 40, 0, 40);
+  speedLimitBtnFrameLayout->setSpacing(0);
 
   speedLimitPolicyScreen = new SpeedLimitPolicy(this);
 
-  std::vector<QString> speed_limit_mode_texts{
-    tr(SpeedLimitModeTexts[static_cast<int>(SpeedLimitMode::OFF)].toStdString().c_str()),
-    tr(SpeedLimitModeTexts[static_cast<int>(SpeedLimitMode::INFORMATION)].toStdString().c_str()),
-    tr(SpeedLimitModeTexts[static_cast<int>(SpeedLimitMode::WARNING)].toStdString().c_str()),
-    tr(SpeedLimitModeTexts[static_cast<int>(SpeedLimitMode::ASSIST)].toStdString().c_str())
-  };
-  speed_limit_mode_settings = new ButtonParamControlSP(
-    "SpeedLimitMode",
-    tr("Speed Limit"),
-    "",
-    "",
-    speed_limit_mode_texts,
-    380);
-  list->addItem(speed_limit_mode_settings);
-
-  list->addItem(horizontal_line());
-  list->addItem(vertical_space());
-
   speedLimitSource = new PushButtonSP(tr("Customize Source"));
   connect(speedLimitSource, &QPushButton::clicked, [&]() {
-    speedLimitScroller->setLastScrollPosition();
     setCurrentWidget(speedLimitPolicyScreen);
     speedLimitPolicyScreen->refresh();
   });
   connect(speedLimitPolicyScreen, &SpeedLimitPolicy::backPress, [&]() {
-    speedLimitScroller->restoreScrollPosition();
     setCurrentWidget(subPanelFrame);
     showEvent(new QShowEvent());
   });
 
   speedLimitSource->setFixedWidth(720);
-  list->addItem(speedLimitSource);
-
-  list->addItem(vertical_space(0));
-  list->addItem(horizontal_line());
+  speedLimitBtnFrameLayout->addWidget(speedLimitSource, 0, 0, Qt::AlignLeft);
+  list->addItem(speedLimitBtnFrame);
 
   QFrame *offsetFrame = new QFrame(this);
   QVBoxLayout *offsetLayout = new QVBoxLayout(offsetFrame);
 
   std::vector<QString> speed_limit_offset_texts{
-    tr(SpeedLimitOffsetTypeTexts[static_cast<int>(SpeedLimitOffsetType::NONE)].toStdString().c_str()),
-    tr(SpeedLimitOffsetTypeTexts[static_cast<int>(SpeedLimitOffsetType::FIXED)].toStdString().c_str()),
-    tr(SpeedLimitOffsetTypeTexts[static_cast<int>(SpeedLimitOffsetType::PERCENT)].toStdString().c_str())
+    SpeedLimitOffsetTypeTexts[static_cast<int>(SpeedLimitOffsetType::NONE)],
+    SpeedLimitOffsetTypeTexts[static_cast<int>(SpeedLimitOffsetType::FIXED)],
+    SpeedLimitOffsetTypeTexts[static_cast<int>(SpeedLimitOffsetType::PERCENT)]
   };
   speed_limit_offset_settings = new ButtonParamControlSP(
     "SpeedLimitOffsetType",
@@ -89,57 +101,26 @@ SpeedLimitSettings::SpeedLimitSettings(QWidget *parent) : QStackedWidget(parent)
 
   list->addItem(offsetFrame);
 
-  connect(speed_limit_mode_settings, &ButtonParamControlSP::buttonClicked, this, &SpeedLimitSettings::refresh);
+  // connect(speed_limit_mode_settings, &ButtonParamControlSP::buttonClicked, this, &SpeedLimitSettings::refresh);
   connect(speed_limit_offset, &OptionControlSP::updateLabels, this, &SpeedLimitSettings::refresh);
   connect(speed_limit_offset_settings, &ButtonParamControlSP::showDescriptionEvent, speed_limit_offset, &OptionControlSP::showDescription);
   connect(speed_limit_offset_settings, &ButtonParamControlSP::buttonClicked, this, &SpeedLimitSettings::refresh);
 
   refresh();
-  speedLimitScroller = new ScrollViewSP(list, this);
-  subPanelLayout->addWidget(speedLimitScroller);
+  subPanelLayout->addWidget(list);
   addWidget(subPanelFrame);
   addWidget(speedLimitPolicyScreen);
   setCurrentWidget(subPanelFrame);
-}
+};
 
 void SpeedLimitSettings::refresh() {
-  bool is_metric_param = params.getBool("IsMetric");
-  SpeedLimitMode speed_limit_mode_param = static_cast<SpeedLimitMode>(std::atoi(params.get("SpeedLimitMode").c_str()));
   SpeedLimitOffsetType offset_type_param = static_cast<SpeedLimitOffsetType>(std::atoi(params.get("SpeedLimitOffsetType").c_str()));
   QString offsetLabel = QString::fromStdString(params.get("SpeedLimitValueOffset"));
 
-  bool has_longitudinal_control;
-  bool intelligent_cruise_button_management_available;
-  auto cp_bytes = params.get("CarParamsPersistent");
-  auto cp_sp_bytes = params.get("CarParamsSPPersistent");
-  if (!cp_bytes.empty() && !cp_sp_bytes.empty()) {
-    AlignedBuffer aligned_buf;
-    AlignedBuffer aligned_buf_sp;
-    capnp::FlatArrayMessageReader cmsg(aligned_buf.align(cp_bytes.data(), cp_bytes.size()));
-    capnp::FlatArrayMessageReader cmsg_sp(aligned_buf_sp.align(cp_sp_bytes.data(), cp_sp_bytes.size()));
-    cereal::CarParams::Reader CP = cmsg.getRoot<cereal::CarParams>();
-    cereal::CarParamsSP::Reader CP_SP = cmsg_sp.getRoot<cereal::CarParamsSP>();
-
-    has_longitudinal_control = hasLongitudinalControl(CP);
-    intelligent_cruise_button_management_available = CP_SP.getIntelligentCruiseButtonManagementAvailable();
-
-    if (!has_longitudinal_control && CP_SP.getPcmCruiseSpeed()) {
-      if (speed_limit_mode_param == SpeedLimitMode::ASSIST) {
-        params.put("SpeedLimitMode", std::to_string(static_cast<int>(SpeedLimitMode::WARNING)));
-      }
-    }
-  } else {
-    has_longitudinal_control = false;
-    intelligent_cruise_button_management_available = false;
-  }
-
-  speed_limit_mode_settings->setDescription(modeDescription(speed_limit_mode_param));
   speed_limit_offset->setDescription(offsetDescription(offset_type_param));
 
   if (offset_type_param == SpeedLimitOffsetType::PERCENT) {
     offsetLabel += "%";
-  } else if (offset_type_param == SpeedLimitOffsetType::FIXED) {
-    offsetLabel += QString(" %1").arg(is_metric_param ? "km/h" : "mph");
   }
 
   if (offset_type_param == SpeedLimitOffsetType::NONE) {
@@ -149,22 +130,9 @@ void SpeedLimitSettings::refresh() {
     speed_limit_offset->setLabel(offsetLabel);
     speed_limit_offset->showDescription();
   }
-
-  if (has_longitudinal_control || intelligent_cruise_button_management_available) {
-    speed_limit_mode_settings->setEnableSelectedButtons(true, convertSpeedLimitModeValues(getSpeedLimitModeValues()));
-  } else {
-    speed_limit_mode_settings->setEnableSelectedButtons(true, convertSpeedLimitModeValues(
-      {SpeedLimitMode::OFF, SpeedLimitMode::INFORMATION, SpeedLimitMode::WARNING}));
-  }
-
-  speed_limit_mode_settings->showDescription();
-  speed_limit_offset->showDescription();
 }
 
 void SpeedLimitSettings::showEvent(QShowEvent *event) {
   refresh();
-}
-
-void SpeedLimitSettings::hideEvent(QHideEvent *event) {
-  setCurrentWidget(subPanelFrame);
+  speed_limit_offset->showDescription();
 }

selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/speed_limit_settings.h

@@ -12,7 +12,6 @@
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/helpers.h"
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/speed_limit_policy.h"
 #include "selfdrive/ui/sunnypilot/qt/widgets/controls.h"
-#include "selfdrive/ui/sunnypilot/qt/widgets/scrollview.h"
 
 class SpeedLimitSettings : public QStackedWidget {
   Q_OBJECT
@@ -21,20 +20,19 @@ public:
   SpeedLimitSettings(QWidget *parent = nullptr);
   void refresh();
   void showEvent(QShowEvent *event) override;
-  void hideEvent(QHideEvent *event) override;
 
 signals:
   void backPress();
 
 private:
   Params params;
-  ScrollViewSP *speedLimitScroller;
   QFrame *subPanelFrame;
-  ButtonParamControlSP *speed_limit_mode_settings;
+  ParamControlSP *speedLimitAssistToggle;
+  // ButtonParamControlSP *speed_limit_mode_settings;
   PushButtonSP *speedLimitSource;
-  SpeedLimitPolicy *speedLimitPolicyScreen;
   ButtonParamControlSP *speed_limit_offset_settings;
   OptionControlSP *speed_limit_offset;
+  SpeedLimitPolicy *speedLimitPolicyScreen;
 
   static QString offsetDescription(SpeedLimitOffsetType type = SpeedLimitOffsetType::NONE) {
     QString none_str = tr("⦿ None: No Offset");
@@ -54,44 +52,4 @@ private:
         .arg(fixed_str)
         .arg(percent_str);
   }
-
-  static QString modeDescription(SpeedLimitMode mode = SpeedLimitMode::OFF) {
-    QString off_str = tr("⦿ Off: Disables the Speed Limit functions.");
-    QString info_str = tr("⦿ Information: Displays the current road's speed limit.");
-    QString warning_str = tr("⦿ Warning: Provides a warning when exceeding the current road's speed limit.");
-    QString assist_str = tr("⦿ Assist: Adjusts the vehicle's cruise speed based on the current road's speed limit when operating the +/- buttons.");
-
-    if (mode == SpeedLimitMode::ASSIST) {
-      assist_str = "<font color='white'><b>" + assist_str + "</b></font>";
-    } else if (mode == SpeedLimitMode::WARNING) {
-      warning_str = "<font color='white'><b>" + warning_str + "</b></font>";
-    } else if (mode == SpeedLimitMode::INFORMATION) {
-      info_str = "<font color='white'><b>" + info_str + "</b></font>";
-    } else {
-      off_str = "<font color='white'><b>" + off_str + "</b></font>";
-    }
-
-    return QString("%1<br>%2<br>%3<br>%4")
-        .arg(off_str)
-        .arg(info_str)
-        .arg(warning_str)
-        .arg(assist_str);
-  }
-
-  static std::vector<SpeedLimitMode> getSpeedLimitModeValues() {
-    std::vector<SpeedLimitMode> values;
-    for (int i = static_cast<int>(SpeedLimitMode::OFF);
-         i <= static_cast<int>(SpeedLimitMode::ASSIST); ++i) {
-      values.push_back(static_cast<SpeedLimitMode>(i));
-    }
-    return values;
-  }
-
-  static std::vector<int> convertSpeedLimitModeValues(const std::vector<SpeedLimitMode> &modes) {
-    std::vector<int> values;
-    for (const auto& mode : modes) {
-      values.push_back(static_cast<int>(mode));
-    }
-    return values;
-  }
 };

selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.cc

@@ -43,15 +43,6 @@ LongitudinalPanel::LongitudinalPanel(QWidget *parent) : QWidget(parent) {
   intelligentCruiseButtonManagement->setConfirmation(true, false);
   list->addItem(intelligentCruiseButtonManagement);
 
-  dynamicExperimentalControl = new ParamControlSP(
-    "DynamicExperimentalControl",
-    tr("Dynamic Experimental Control (DEC)"),
-    tr("Enable toggle to allow the model to determine when to use sunnypilot ACC or sunnypilot End to End Longitudinal."),
-    "",
-    this
-  );
-  list->addItem(dynamicExperimentalControl);
-
   SmartCruiseControlVision = new ParamControl(
     "SmartCruiseControlVision",
     tr("Smart Cruise Control - Vision"),
@@ -59,13 +50,6 @@ LongitudinalPanel::LongitudinalPanel(QWidget *parent) : QWidget(parent) {
     "");
   list->addItem(SmartCruiseControlVision);
 
-  SmartCruiseControlMap = new ParamControl(
-    "SmartCruiseControlMap",
-    tr("Smart Cruise Control - Map"),
-    tr("Use map data to estimate the appropriate speed to drive through turns ahead."),
-    "");
-  list->addItem(SmartCruiseControlMap);
-
   customAccIncrement = new CustomAccIncrement("CustomAccIncrementsEnabled", tr("Custom ACC Speed Increments"), "", "", this);
   list->addItem(customAccIncrement);
 
@@ -95,10 +79,6 @@ void LongitudinalPanel::showEvent(QShowEvent *event) {
   refresh(offroad);
 }
 
-void LongitudinalPanel::hideEvent(QHideEvent *event) {
-  main_layout->setCurrentWidget(cruisePanelScreen);
-}
-
 void LongitudinalPanel::refresh(bool _offroad) {
   auto cp_bytes = params.get("CarParamsPersistent");
   auto cp_sp_bytes = params.get("CarParamsSPPersistent");
@@ -113,17 +93,6 @@ void LongitudinalPanel::refresh(bool _offroad) {
     has_longitudinal_control = hasLongitudinalControl(CP);
     is_pcm_cruise = CP.getPcmCruise();
     intelligent_cruise_button_management_available = CP_SP.getIntelligentCruiseButtonManagementAvailable();
-
-    if (!intelligent_cruise_button_management_available || has_longitudinal_control) {
-      params.remove("IntelligentCruiseButtonManagement");
-    }
-
-    if (!has_longitudinal_control && CP_SP.getPcmCruiseSpeed()) {
-      params.remove("CustomAccIncrementsEnabled");
-      params.remove("DynamicExperimentalControl");
-      params.remove("SmartCruiseControlVision");
-      params.remove("SmartCruiseControlMap");
-    }
   } else {
     has_longitudinal_control = false;
     is_pcm_cruise = false;
@@ -147,9 +116,11 @@ void LongitudinalPanel::refresh(bool _offroad) {
         customAccIncrement->setDescription(accEnabledDescription);
       }
     } else {
+      params.remove("CustomAccIncrementsEnabled");
       customAccIncrement->toggleFlipped(false);
       customAccIncrement->setDescription(accNoLongDescription);
       customAccIncrement->showDescription();
+      params.remove("IntelligentCruiseButtonManagement");
       intelligentCruiseButtonManagement->toggleFlipped(false);
     }
   }
@@ -162,9 +133,7 @@ void LongitudinalPanel::refresh(bool _offroad) {
   customAccIncrement->setEnabled(cai_allowed && !offroad);
   customAccIncrement->refresh();
 
-  dynamicExperimentalControl->setEnabled(has_longitudinal_control);
   SmartCruiseControlVision->setEnabled(has_longitudinal_control || icbm_allowed);
-  SmartCruiseControlMap->setEnabled(has_longitudinal_control || icbm_allowed);
 
   offroad = _offroad;
 }

selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.h

@@ -11,6 +11,7 @@
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal/speed_limit/speed_limit_settings.h"
 #include "selfdrive/ui/sunnypilot/qt/offroad/settings/settings.h"
 #include "selfdrive/ui/sunnypilot/qt/widgets/scrollview.h"
+#include "selfdrive/ui/sunnypilot/ui.h"
 
 class LongitudinalPanel : public QWidget {
   Q_OBJECT
@@ -18,7 +19,6 @@ class LongitudinalPanel : public QWidget {
 public:
   explicit LongitudinalPanel(QWidget *parent = nullptr);
   void showEvent(QShowEvent *event) override;
-  void hideEvent(QHideEvent *event) override;
   void refresh(bool _offroad);
 
 private:
@@ -33,9 +33,7 @@ private:
   QWidget *cruisePanelScreen = nullptr;
   CustomAccIncrement *customAccIncrement = nullptr;
   ParamControl *SmartCruiseControlVision;
-  ParamControl *SmartCruiseControlMap;
   ParamControl *intelligentCruiseButtonManagement = nullptr;
-  ParamControl *dynamicExperimentalControl = nullptr;
   SpeedLimitSettings *speedLimitScreen;
   PushButtonSP *speedLimitSettings;
 };

selfdrive/ui/sunnypilot/qt/offroad/settings/osm_panel.cc

@@ -12,7 +12,6 @@
 #include <string>
 
 #include "common/swaglog.h"
-#include "selfdrive/ui/sunnypilot/qt/util.h"
 #include "selfdrive/ui/sunnypilot/qt/widgets/scrollview.h"
 
 OsmPanel::OsmPanel(QWidget *parent) : QFrame(parent) {
@@ -92,30 +91,24 @@ ButtonControlSP *OsmPanel::setupOsmDownloadButton(QWidget *parent) {
       locationTitles.push_back(std::get<0>(loc));
     }
 
-    InputDialog d(tr("Search Country"), this, tr("Enter search keywords, or leave blank to list all countries."), false);
-    d.setMinLength(0);
-    const int ret = d.exec();
-    if (ret) {
-      const QString selection = search(d.text(), locationTitles, tr("Select Country"));
-      if (!selection.isEmpty()) {
-        params.put("OsmLocal", "1");
-        params.put("OsmLocationTitle", selection.toStdString());
-        for (auto &loc: locations) {
-          if (std::get<0>(loc) == selection) {
-            params.put("OsmLocationName", std::get<1>(loc).toStdString());
-            break;
-          }
+    const QString selection = MultiOptionDialog::getSelection(tr("Country"), locationTitles, currentTitle, this);
+    if (!selection.isEmpty()) {
+      params.put("OsmLocal", "1");
+      params.put("OsmLocationTitle", selection.toStdString());
+      for (auto &loc: locations) {
+        if (std::get<0>(loc) == selection) {
+          params.put("OsmLocationName", std::get<1>(loc).toStdString());
+          break;
         }
-        if (params.get("OsmLocationName") == "US") {
-          usStatesBtn->click();
-          return;
-        }
-        if (selection != "== None ==") {
-          if (showConfirmationDialog(parent)) {
-            osm_download_in_progress = true;
-            params.putBool("OsmDbUpdatesCheck", true);
-            updateLabels();
-          }
+      }
+      if (params.get("OsmLocationName") == "US") {
+        usStatesBtn->click();
+        return;
+      } else if (selection != "== None ==") {
+        if (showConfirmationDialog(parent)) {
+          osm_download_in_progress = true;
+          params.putBool("OsmDbUpdatesCheck", true);
+          updateLabels();
         }
       }
     }
@@ -142,26 +135,21 @@ ButtonControlSP *OsmPanel::setupUsStatesButton(QWidget *parent) {
       locationTitles.push_back(std::get<0>(loc));
     }
 
-    InputDialog d(tr("Search State"), this, tr("Enter search keywords, or leave blank to list all states."), false);
-    d.setMinLength(0);
-    const int ret = d.exec();
-    if (ret) {
-      const QString selection = search(d.text(), locationTitles, tr("Select State"));
-      if (!selection.isEmpty()) {
-        params.put("OsmStateTitle", selection.toStdString());
-        for (auto &loc: locations) {
-          if (std::get<0>(loc) == selection) {
-            params.put("OsmStateName", std::get<1>(loc).toStdString());
-            break;
-          }
-        }
-        usStatesBtn->setValue(selection);
-        if (showConfirmationDialog(parent)) {
-          osm_download_in_progress = true;
-          params.putBool("OsmDbUpdatesCheck", true);
-          updateLabels();
+    const QString selection = MultiOptionDialog::getSelection(tr("State"), locationTitles, currentTitle, this);
+    if (!selection.isEmpty()) {
+      params.put("OsmStateTitle", selection.toStdString());
+      for (auto &loc: locations) {
+        if (std::get<0>(loc) == selection) {
+          params.put("OsmStateName", std::get<1>(loc).toStdString());
+          break;
         }
       }
+      usStatesBtn->setValue(selection);
+      if (showConfirmationDialog(parent)) {
+        osm_download_in_progress = true;
+        params.putBool("OsmDbUpdatesCheck", true);
+        updateLabels();
+      }
     }
     updateLabels();
   });
@@ -293,15 +281,3 @@ void OsmPanel::updateMapSize() {
     mapSizeFuture = QtConcurrent::run(getDirSize, MAP_PATH);
   }
 }
-
-QString OsmPanel::search(const QString &query, const QStringList &list, const QString &prompt_text) {
-  QStringList lst_results = searchFromList(query, list);
-  QString selection;
-
-  if (lst_results.isEmpty()) {
-    ConfirmationDialog::alert(tr("No results found for keywords: %1").arg(query), this);
-    return selection;
-  }
-  selection = MultiOptionDialog::getSelection(prompt_text, lst_results, "", this);
-  return selection;
-}

selfdrive/ui/sunnypilot/qt/offroad/settings/osm_panel.h

@@ -76,7 +76,6 @@ private:
   void updateDownloadProgress();
   static int extractIntFromJson(const QJsonObject &json, const QString &key);
   QString processUpdateStatus(bool pending_update_check, int total_files, int downloaded_files, const QJsonObject &json, bool failed_state);
-  QString search(const QString &query, const QStringList &list, const QString &prompt_text);
 
   ConfirmationDialog *confirmationDialog;
   LabelControlSP *mapdVersion;