mirror of
https://github.com/sunnypilot/sunnypilot.git
synced 2026-06-27 00:52:05 +08:00
Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 royjr
|
fb724b9612 | ||
|
Jason Wen
|
01a843e0ac | ||
|
Jason Wen
|
097dd9b5f2 | ||
|
github-actions[bot]
|
122ac986de | ||
|
MVL
|
bc27262a92 | ||
|
James Vecellio-Grant
|
066ba92e77 | ||
|
github-actions[bot]
|
dfb21bd53e | ||
|
royjr
|
71e4f251d2 | ||
|
royjr
|
dbefa8afbd | ||
|
royjr
|
fb54689300 | ||
|
royjr
|
db8e56687f | ||
|
royjr
|
88e5e3d23d | ||
|
royjr
|
0b00470999 | ||
|
royjr
|
65dcbf698e | ||
|
royjr
|
ac99ce017c | ||
|
royjr
|
508abb227c | ||
|
royjr
|
b609622398 | ||
|
discountchubbs
|
c9f2756264 | ||
|
discountchubbs
|
3580656d78 | ||
|
discountchubbs
|
f973b7fdcb |
@@ -4,7 +4,6 @@
|
|||||||
[submodule "opendbc"]
|
[submodule "opendbc"]
|
||||||
path = opendbc_repo
|
path = opendbc_repo
|
||||||
url = https://github.com/sunnypilot/opendbc.git
|
url = https://github.com/sunnypilot/opendbc.git
|
||||||
branch = tn
|
|
||||||
[submodule "msgq"]
|
[submodule "msgq"]
|
||||||
path = msgq_repo
|
path = msgq_repo
|
||||||
url = https://github.com/commaai/msgq.git
|
url = https://github.com/commaai/msgq.git
|
||||||
|
|||||||
@@ -194,7 +194,6 @@ struct LongitudinalPlanSP @0xf35cc4560bbf6ec2 {
|
|||||||
aTarget @5 :Float32;
|
aTarget @5 :Float32;
|
||||||
events @6 :List(OnroadEventSP.Event);
|
events @6 :List(OnroadEventSP.Event);
|
||||||
e2eAlerts @7 :E2eAlerts;
|
e2eAlerts @7 :E2eAlerts;
|
||||||
acceleration @8 :Acceleration;
|
|
||||||
|
|
||||||
struct DynamicExperimentalControl {
|
struct DynamicExperimentalControl {
|
||||||
state @0 :DynamicExperimentalControlState;
|
state @0 :DynamicExperimentalControlState;
|
||||||
@@ -297,25 +296,6 @@ struct LongitudinalPlanSP @0xf35cc4560bbf6ec2 {
|
|||||||
greenLightAlert @0 :Bool;
|
greenLightAlert @0 :Bool;
|
||||||
leadDepartAlert @1 :Bool;
|
leadDepartAlert @1 :Bool;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Acceleration Personality (Eco / Normal / Sport)
|
|
||||||
struct Acceleration {
|
|
||||||
personality @0 :AccelerationPersonality;
|
|
||||||
enabled @1 :Bool;
|
|
||||||
maxAccel @2 :Float32; # current speed-indexed accel ceiling
|
|
||||||
brakeNeed @3 :Float32; # predicted decel demand from the lookahead (m/s^2, positive)
|
|
||||||
decelTarget @4 :Float32; # early-soft comfort decel target (m/s^2, negative)
|
|
||||||
smoothActive @5 :Bool; # early-soft braking currently shaping the target
|
|
||||||
bypassed @6 :Bool; # passthrough to stock plan (hard brake / FCW / should_stop / closing lead / e2e)
|
|
||||||
comfortStopActive @7 :Bool; # low-speed comfort decel-to-stop floor currently governing (behind a near-stopped lead)
|
|
||||||
comfortStopFloor @8 :Float32; # comfort-stop floor commanded (m/s^2, negative; 0 when not engaged)
|
|
||||||
}
|
|
||||||
|
|
||||||
enum AccelerationPersonality {
|
|
||||||
eco @0;
|
|
||||||
normal @1;
|
|
||||||
sport @2;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
struct OnroadEventSP @0xda96579883444c35 {
|
struct OnroadEventSP @0xda96579883444c35 {
|
||||||
@@ -362,7 +342,6 @@ struct OnroadEventSP @0xda96579883444c35 {
|
|||||||
speedLimitChanged @21;
|
speedLimitChanged @21;
|
||||||
speedLimitPending @22;
|
speedLimitPending @22;
|
||||||
e2eChime @23;
|
e2eChime @23;
|
||||||
laneChangeRoadEdge @24;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -469,8 +448,6 @@ struct LiveMapDataSP @0xf416ec09499d9d19 {
|
|||||||
|
|
||||||
struct ModelDataV2SP @0xa1680744031fdb2d {
|
struct ModelDataV2SP @0xa1680744031fdb2d {
|
||||||
laneTurnDirection @0 :TurnDirection;
|
laneTurnDirection @0 :TurnDirection;
|
||||||
leftLaneChangeEdgeBlock @1 :Bool;
|
|
||||||
rightLaneChangeEdgeBlock @2 :Bool;
|
|
||||||
|
|
||||||
enum TurnDirection {
|
enum TurnDirection {
|
||||||
none @0;
|
none @0;
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
|
||||||
#include "cereal/gen/cpp/log.capnp.h"
|
#include "cereal/gen/cpp/log.capnp.h"
|
||||||
#include "cereal/gen/cpp/custom.capnp.h"
|
|
||||||
|
|
||||||
inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
|
inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
|
||||||
{"AccessToken", {CLEAR_ON_MANAGER_START | DONT_LOG, STRING}},
|
{"AccessToken", {CLEAR_ON_MANAGER_START | DONT_LOG, STRING}},
|
||||||
@@ -180,19 +179,12 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
|
|||||||
{"QuickBootToggle", {PERSISTENT | BACKUP, BOOL, "0"}},
|
{"QuickBootToggle", {PERSISTENT | BACKUP, BOOL, "0"}},
|
||||||
{"QuietMode", {PERSISTENT | BACKUP, BOOL, "0"}},
|
{"QuietMode", {PERSISTENT | BACKUP, BOOL, "0"}},
|
||||||
{"RainbowMode", {PERSISTENT | BACKUP, BOOL, "0"}},
|
{"RainbowMode", {PERSISTENT | BACKUP, BOOL, "0"}},
|
||||||
{"RoadEdgeLaneChangeEnabled", {PERSISTENT | BACKUP, BOOL, "0"}},
|
|
||||||
{"RocketFuel", {PERSISTENT | BACKUP, BOOL, "0"}},
|
{"RocketFuel", {PERSISTENT | BACKUP, BOOL, "0"}},
|
||||||
{"ShowAdvancedControls", {PERSISTENT | BACKUP, BOOL, "0"}},
|
{"ShowAdvancedControls", {PERSISTENT | BACKUP, BOOL, "0"}},
|
||||||
{"ShowTurnSignals", {PERSISTENT | BACKUP, BOOL, "0"}},
|
{"ShowTurnSignals", {PERSISTENT | BACKUP, BOOL, "0"}},
|
||||||
{"StandstillTimer", {PERSISTENT | BACKUP, BOOL, "0"}},
|
{"StandstillTimer", {PERSISTENT | BACKUP, BOOL, "0"}},
|
||||||
{"TrueVEgoUI", {PERSISTENT | BACKUP, BOOL, "0"}},
|
{"TrueVEgoUI", {PERSISTENT | BACKUP, BOOL, "0"}},
|
||||||
|
|
||||||
// toyota specific params
|
|
||||||
{"ToyotaAutoHold", {PERSISTENT | BACKUP, BOOL, "0"}},
|
|
||||||
{"ToyotaEnhancedBsm", {PERSISTENT | BACKUP, BOOL, "0"}},
|
|
||||||
{"ToyotaTSS2Long", {PERSISTENT | BACKUP, BOOL, "0"}},
|
|
||||||
{"ToyotaDriveMode", {PERSISTENT | BACKUP, BOOL, "0"}},
|
|
||||||
|
|
||||||
// MADS params
|
// MADS params
|
||||||
{"Mads", {PERSISTENT | BACKUP, BOOL, "1"}},
|
{"Mads", {PERSISTENT | BACKUP, BOOL, "1"}},
|
||||||
{"MadsMainCruiseAllowed", {PERSISTENT | BACKUP, BOOL, "1"}},
|
{"MadsMainCruiseAllowed", {PERSISTENT | BACKUP, BOOL, "1"}},
|
||||||
@@ -236,13 +228,6 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
|
|||||||
{"DynamicExperimentalControl", {PERSISTENT | BACKUP, BOOL, "0"}},
|
{"DynamicExperimentalControl", {PERSISTENT | BACKUP, BOOL, "0"}},
|
||||||
{"BlindSpot", {PERSISTENT | BACKUP, BOOL, "0"}},
|
{"BlindSpot", {PERSISTENT | BACKUP, BOOL, "0"}},
|
||||||
|
|
||||||
// Acceleration Personality (Eco / Normal / Sport)
|
|
||||||
{"AccelPersonalityEnabled", {PERSISTENT | BACKUP, BOOL, "0"}},
|
|
||||||
{"AccelPersonality", {PERSISTENT | BACKUP, INT, std::to_string(static_cast<int>(cereal::LongitudinalPlanSP::AccelerationPersonality::NORMAL))}},
|
|
||||||
|
|
||||||
// Radar Distance: hold a lead through radar flicker/dropout so the MPC doesn't lose+regain it
|
|
||||||
{"RadarDistance", {PERSISTENT | BACKUP, BOOL, "0"}},
|
|
||||||
|
|
||||||
// sunnypilot model params
|
// sunnypilot model params
|
||||||
{"CameraOffset", {PERSISTENT | BACKUP, FLOAT, "0.0"}},
|
{"CameraOffset", {PERSISTENT | BACKUP, FLOAT, "0.0"}},
|
||||||
{"LagdToggle", {PERSISTENT | BACKUP, BOOL, "1"}},
|
{"LagdToggle", {PERSISTENT | BACKUP, BOOL, "1"}},
|
||||||
|
|||||||
+119
-117
@@ -4,24 +4,24 @@
|
|||||||
|
|
||||||
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.
|
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.
|
||||||
|
|
||||||
# 340 Supported Cars
|
# 341 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> |Video|Setup Video|
|
|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> |Video|Setup Video|
|
||||||
|---|---|---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
|
|---|---|---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
|
||||||
|Acura|ILX 2016-18|Technology Plus Package or AcuraWatch Plus|openpilot|26 mph|25 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Acura ILX 2016-18">Buy Here</a></sub></details>|||
|
|Acura|ILX 2016-18|Technology Plus Package or AcuraWatch Plus|openpilot|26 mph|25 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Acura ILX 2016-18">Buy Here</a></sub></details>|||
|
||||||
|Acura|ILX 2019|All|openpilot|26 mph|25 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Acura ILX 2019">Buy Here</a></sub></details>|||
|
|Acura|ILX 2019|All|openpilot|26 mph|25 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Acura ILX 2019">Buy Here</a></sub></details>|||
|
||||||
|Acura|MDX 2022-24|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|43 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Acura MDX 2022-24">Buy Here</a></sub></details>|||
|
|Acura|MDX 2022-24|All|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|43 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Acura MDX 2022-24">Buy Here</a></sub></details>|||
|
||||||
|Acura|MDX 2025-26|All except Type S|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch C connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Acura MDX 2025-26">Buy Here</a></sub></details>|||
|
|Acura|MDX 2025-26|All except Type S|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch C connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Acura MDX 2025-26">Buy Here</a></sub></details>|||
|
||||||
|Acura|RDX 2016-18|AcuraWatch Plus or Advance Package|openpilot|26 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Acura RDX 2016-18">Buy Here</a></sub></details>|||
|
|Acura|RDX 2016-18|AcuraWatch Plus or Advance Package|openpilot|26 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Acura RDX 2016-18">Buy Here</a></sub></details>|||
|
||||||
|Acura|RDX 2019-21|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|3 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Acura RDX 2019-21">Buy Here</a></sub></details>|||
|
|Acura|RDX 2019-21|All|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|3 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Acura RDX 2019-21">Buy Here</a></sub></details>|||
|
||||||
|Acura|TLX 2021-22|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Acura TLX 2021-22">Buy Here</a></sub></details>|||
|
|Acura|TLX 2021-22|All|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Acura TLX 2021-22">Buy Here</a></sub></details>|||
|
||||||
|Acura|TLX 2025|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch C connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Acura TLX 2025">Buy Here</a></sub></details>|||
|
|Acura|TLX 2025|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch C connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Acura TLX 2025">Buy Here</a></sub></details>|||
|
||||||
|Audi[<sup>11</sup>](#footnotes)|A3 2014-19|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Audi A3 2014-19">Buy Here</a></sub></details>|||
|
|Audi[<sup>12</sup>](#footnotes)|A3 2014-19|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Audi A3 2014-19">Buy Here</a></sub></details>|||
|
||||||
|Audi[<sup>11</sup>](#footnotes)|A3 Sportback e-tron 2017-18|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Audi A3 Sportback e-tron 2017-18">Buy Here</a></sub></details>|||
|
|Audi[<sup>12</sup>](#footnotes)|A3 Sportback e-tron 2017-18|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Audi A3 Sportback e-tron 2017-18">Buy Here</a></sub></details>|||
|
||||||
|Audi[<sup>11</sup>](#footnotes)|Q2 2018|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Audi Q2 2018">Buy Here</a></sub></details>|||
|
|Audi[<sup>12</sup>](#footnotes)|Q2 2018|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Audi Q2 2018">Buy Here</a></sub></details>|||
|
||||||
|Audi[<sup>11</sup>](#footnotes)|Q3 2019-24|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Audi Q3 2019-24">Buy Here</a></sub></details>|||
|
|Audi[<sup>12</sup>](#footnotes)|Q3 2019-24|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Audi Q3 2019-24">Buy Here</a></sub></details>|||
|
||||||
|Audi[<sup>11</sup>](#footnotes)|RS3 2018|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Audi RS3 2018">Buy Here</a></sub></details>|||
|
|Audi[<sup>12</sup>](#footnotes)|RS3 2018|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Audi RS3 2018">Buy Here</a></sub></details>|||
|
||||||
|Audi[<sup>11</sup>](#footnotes)|S3 2015-17|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Audi S3 2015-17">Buy Here</a></sub></details>|||
|
|Audi[<sup>12</sup>](#footnotes)|S3 2015-17|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Audi S3 2015-17">Buy Here</a></sub></details>|||
|
||||||
|Chevrolet|Bolt EUV 2022-23|Premier or Premier Redline Trim, without Super Cruise Package|openpilot available[<sup>1</sup>](#footnotes)|3 mph|6 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 GM connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Chevrolet Bolt EUV 2022-23">Buy Here</a></sub></details>|<a href="https://youtu.be/xvwzGMUA210" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Chevrolet|Bolt EUV 2022-23|Premier or Premier Redline Trim, without Super Cruise Package|openpilot available[<sup>1</sup>](#footnotes)|3 mph|6 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 GM connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Chevrolet Bolt EUV 2022-23">Buy Here</a></sub></details>|<a href="https://youtu.be/xvwzGMUA210" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Chevrolet|Bolt EV 2022-23|2LT Trim with Adaptive Cruise Control Package|openpilot available[<sup>1</sup>](#footnotes)|3 mph|6 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 GM connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Chevrolet Bolt EV 2022-23">Buy Here</a></sub></details>|||
|
|Chevrolet|Bolt EV 2022-23|2LT Trim with Adaptive Cruise Control Package|openpilot available[<sup>1</sup>](#footnotes)|3 mph|6 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 GM connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Chevrolet Bolt EV 2022-23">Buy Here</a></sub></details>|||
|
||||||
|Chevrolet|Equinox 2019-22|Adaptive Cruise Control (ACC)|openpilot available[<sup>1</sup>](#footnotes)|3 mph|6 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 GM connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Chevrolet Equinox 2019-22">Buy Here</a></sub></details>|||
|
|Chevrolet|Equinox 2019-22|Adaptive Cruise Control (ACC)|openpilot available[<sup>1</sup>](#footnotes)|3 mph|6 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 GM connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Chevrolet Equinox 2019-22">Buy Here</a></sub></details>|||
|
||||||
@@ -33,7 +33,7 @@ A supported vehicle is one that just works when you install a comma device. All
|
|||||||
|Chrysler|Pacifica Hybrid 2017-18|Adaptive Cruise Control (ACC)|Stock|0 mph|9 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 FCA connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Chrysler Pacifica Hybrid 2017-18">Buy Here</a></sub></details>|||
|
|Chrysler|Pacifica Hybrid 2017-18|Adaptive Cruise Control (ACC)|Stock|0 mph|9 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 FCA connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Chrysler Pacifica Hybrid 2017-18">Buy Here</a></sub></details>|||
|
||||||
|Chrysler|Pacifica Hybrid 2019-25|Adaptive Cruise Control (ACC)|Stock|0 mph|39 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 FCA connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Chrysler Pacifica Hybrid 2019-25">Buy Here</a></sub></details>|||
|
|Chrysler|Pacifica Hybrid 2019-25|Adaptive Cruise Control (ACC)|Stock|0 mph|39 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 FCA connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Chrysler Pacifica Hybrid 2019-25">Buy Here</a></sub></details>|||
|
||||||
|comma|body|All|openpilot|0 mph|0 mph|[](##)|[](##)|None|<a href="https://youtu.be/VT-i3yRsX2s?t=2736" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|comma|body|All|openpilot|0 mph|0 mph|[](##)|[](##)|None|<a href="https://youtu.be/VT-i3yRsX2s?t=2736" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|CUPRA[<sup>11</sup>](#footnotes)|Ateca 2018-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=CUPRA Ateca 2018-23">Buy Here</a></sub></details>|||
|
|CUPRA[<sup>12</sup>](#footnotes)|Ateca 2018-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=CUPRA Ateca 2018-23">Buy Here</a></sub></details>|||
|
||||||
|Dodge|Durango 2020-21|Adaptive Cruise Control (ACC)|Stock|0 mph|39 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 FCA connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Dodge Durango 2020-21">Buy Here</a></sub></details>|||
|
|Dodge|Durango 2020-21|Adaptive Cruise Control (ACC)|Stock|0 mph|39 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 FCA connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Dodge Durango 2020-21">Buy Here</a></sub></details>|||
|
||||||
|Ford|Bronco Sport 2021-24|Co-Pilot360 Assist+|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q3 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ford Bronco Sport 2021-24">Buy Here</a></sub></details>|||
|
|Ford|Bronco Sport 2021-24|Co-Pilot360 Assist+|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q3 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ford Bronco Sport 2021-24">Buy Here</a></sub></details>|||
|
||||||
|Ford|Escape 2020-22|Co-Pilot360 Assist+|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q3 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ford Escape 2020-22">Buy Here</a></sub></details>|||
|
|Ford|Escape 2020-22|Co-Pilot360 Assist+|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q3 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ford Escape 2020-22">Buy Here</a></sub></details>|||
|
||||||
@@ -47,8 +47,8 @@ A supported vehicle is one that just works when you install a comma device. All
|
|||||||
|Ford|Explorer Hybrid 2020-24|Co-Pilot360 Assist+|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q3 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ford Explorer Hybrid 2020-24">Buy Here</a></sub></details>|||
|
|Ford|Explorer Hybrid 2020-24|Co-Pilot360 Assist+|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q3 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ford Explorer Hybrid 2020-24">Buy Here</a></sub></details>|||
|
||||||
|Ford|F-150 2021-23|Co-Pilot360 Assist 2.0|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q4 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ford F-150 2021-23">Buy Here</a></sub></details>||<a href="https://www.youtube.com/watch?v=MewJc9LYp9M" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>|
|
|Ford|F-150 2021-23|Co-Pilot360 Assist 2.0|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q4 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ford F-150 2021-23">Buy Here</a></sub></details>||<a href="https://www.youtube.com/watch?v=MewJc9LYp9M" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>|
|
||||||
|Ford|F-150 Hybrid 2021-23|Co-Pilot360 Assist 2.0|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q4 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ford F-150 Hybrid 2021-23">Buy Here</a></sub></details>||<a href="https://www.youtube.com/watch?v=MewJc9LYp9M" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>|
|
|Ford|F-150 Hybrid 2021-23|Co-Pilot360 Assist 2.0|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q4 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ford F-150 Hybrid 2021-23">Buy Here</a></sub></details>||<a href="https://www.youtube.com/watch?v=MewJc9LYp9M" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>|
|
||||||
|Ford|Focus 2018[<sup>2</sup>](#footnotes)|Adaptive Cruise Control with Lane Centering|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q3 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ford Focus 2018">Buy Here</a></sub></details>|||
|
|Ford|Focus 2018-22[<sup>2</sup>](#footnotes)|Adaptive Cruise Control with Lane Centering|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q3 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ford Focus 2018-22">Buy Here</a></sub></details>|||
|
||||||
|Ford|Focus Hybrid 2018[<sup>2</sup>](#footnotes)|Adaptive Cruise Control with Lane Centering|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q3 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ford Focus Hybrid 2018">Buy Here</a></sub></details>|||
|
|Ford|Focus Hybrid 2018-22[<sup>2</sup>](#footnotes)|Adaptive Cruise Control with Lane Centering|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q3 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ford Focus Hybrid 2018-22">Buy Here</a></sub></details>|||
|
||||||
|Ford|Kuga 2020-23|Adaptive Cruise Control with Lane Centering|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q3 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ford Kuga 2020-23">Buy Here</a></sub></details>|||
|
|Ford|Kuga 2020-23|Adaptive Cruise Control with Lane Centering|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q3 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ford Kuga 2020-23">Buy Here</a></sub></details>|||
|
||||||
|Ford|Kuga Hybrid 2020-23|Adaptive Cruise Control with Lane Centering|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q3 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ford Kuga Hybrid 2020-23">Buy Here</a></sub></details>|||
|
|Ford|Kuga Hybrid 2020-23|Adaptive Cruise Control with Lane Centering|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q3 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ford Kuga Hybrid 2020-23">Buy Here</a></sub></details>|||
|
||||||
|Ford|Kuga Hybrid 2024|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q4 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ford Kuga Hybrid 2024">Buy Here</a></sub></details>||<a href="https://www.youtube.com/watch?v=uUGkH6C_EQU" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>|
|
|Ford|Kuga Hybrid 2024|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q4 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ford Kuga Hybrid 2024">Buy Here</a></sub></details>||<a href="https://www.youtube.com/watch?v=uUGkH6C_EQU" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>|
|
||||||
@@ -75,35 +75,35 @@ A supported vehicle is one that just works when you install a comma device. All
|
|||||||
|Genesis|GV70 Electrified (with HDA II) 2023-24|Highway Driving Assist II|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai Q connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Genesis GV70 Electrified (with HDA II) 2023-24">Buy Here</a></sub></details>|||
|
|Genesis|GV70 Electrified (with HDA II) 2023-24|Highway Driving Assist II|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai Q connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Genesis GV70 Electrified (with HDA II) 2023-24">Buy Here</a></sub></details>|||
|
||||||
|Genesis|GV80 2023|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai M connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Genesis GV80 2023">Buy Here</a></sub></details>|||
|
|Genesis|GV80 2023|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai M connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Genesis GV80 2023">Buy Here</a></sub></details>|||
|
||||||
|GMC|Sierra 1500 2020-21|Driver Alert Package II|openpilot available[<sup>1</sup>](#footnotes)|0 mph|6 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 GM connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=GMC Sierra 1500 2020-21">Buy Here</a></sub></details>|<a href="https://youtu.be/5HbNoBLzRwE" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|GMC|Sierra 1500 2020-21|Driver Alert Package II|openpilot available[<sup>1</sup>](#footnotes)|0 mph|6 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 GM connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=GMC Sierra 1500 2020-21">Buy Here</a></sub></details>|<a href="https://youtu.be/5HbNoBLzRwE" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Honda|Accord 2018-22|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|3 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Accord 2018-22">Buy Here</a></sub></details>|<a href="https://www.youtube.com/watch?v=mrUwlj3Mi58" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Honda|Accord 2018-22|All|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|3 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Accord 2018-22">Buy Here</a></sub></details>|<a href="https://www.youtube.com/watch?v=mrUwlj3Mi58" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Honda|Accord 2023-25|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch C connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Accord 2023-25">Buy Here</a></sub></details>|||
|
|Honda|Accord 2023-25|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch C connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Accord 2023-25">Buy Here</a></sub></details>|||
|
||||||
|Honda|Accord Hybrid 2018-22|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|3 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Accord Hybrid 2018-22">Buy Here</a></sub></details>|||
|
|Honda|Accord Hybrid 2018-22|All|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|3 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Accord Hybrid 2018-22">Buy Here</a></sub></details>|||
|
||||||
|Honda|Accord Hybrid 2023-25|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch C connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Accord Hybrid 2023-25">Buy Here</a></sub></details>|||
|
|Honda|Accord Hybrid 2023-25|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch C connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Accord Hybrid 2023-25">Buy Here</a></sub></details>|||
|
||||||
|Honda|City (Brazil only) 2023|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|14 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch B connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda City (Brazil only) 2023">Buy Here</a></sub></details>|||
|
|Honda|City (Brazil only) 2023|All|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|14 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch B connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda City (Brazil only) 2023">Buy Here</a></sub></details>|||
|
||||||
|Honda|Civic 2016-18|Honda Sensing|openpilot|0 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Civic 2016-18">Buy Here</a></sub></details>|<a href="https://youtu.be/-IkImTe1NYE" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Honda|Civic 2016-18|Honda Sensing|openpilot|0 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Civic 2016-18">Buy Here</a></sub></details>|<a href="https://youtu.be/-IkImTe1NYE" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Honda|Civic 2019-21|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|2 mph[<sup>4</sup>](#footnotes)|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Civic 2019-21">Buy Here</a></sub></details>|<a href="https://www.youtube.com/watch?v=4Iz1Mz5LGF8" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Honda|Civic 2019-21|All|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|2 mph[<sup>4</sup>](#footnotes)|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Civic 2019-21">Buy Here</a></sub></details>|<a href="https://www.youtube.com/watch?v=4Iz1Mz5LGF8" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Honda|Civic 2022-24|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch B connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Civic 2022-24">Buy Here</a></sub></details>|<a href="https://youtu.be/ytiOT5lcp6Q" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Honda|Civic 2022-24|All|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch B connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Civic 2022-24">Buy Here</a></sub></details>|<a href="https://youtu.be/ytiOT5lcp6Q" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Honda|Civic Hatchback 2017-18|Honda Sensing|openpilot available[<sup>1</sup>](#footnotes)|0 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Civic Hatchback 2017-18">Buy Here</a></sub></details>|||
|
|Honda|Civic Hatchback 2017-18|Honda Sensing|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<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|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Civic Hatchback 2019-21">Buy Here</a></sub></details>|||
|
|Honda|Civic Hatchback 2019-21|All|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<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|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch B connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<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" /></a>||
|
|Honda|Civic Hatchback 2022-24|All|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch B connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<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" /></a>||
|
||||||
|Honda|Civic Hatchback Hybrid 2025-26|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch B connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<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-26|All|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch B connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<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 (Europe only) 2023|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch B connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Civic Hatchback Hybrid (Europe only) 2023">Buy Here</a></sub></details>|||
|
|Honda|Civic Hatchback Hybrid (Europe only) 2023|All|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch B connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<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-26|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch B connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Civic Hybrid 2025-26">Buy Here</a></sub></details>|||
|
|Honda|Civic Hybrid 2025-26|All|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch B connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Civic Hybrid 2025-26">Buy Here</a></sub></details>|||
|
||||||
|Honda|CR-V 2015-16|Touring Trim|openpilot|26 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda CR-V 2015-16">Buy Here</a></sub></details>|||
|
|Honda|CR-V 2015-16|Touring Trim|openpilot|26 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda CR-V 2015-16">Buy Here</a></sub></details>|||
|
||||||
|Honda|CR-V 2017-22|Honda Sensing|openpilot available[<sup>1</sup>](#footnotes)|0 mph|15 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda CR-V 2017-22">Buy Here</a></sub></details>|||
|
|Honda|CR-V 2017-22|Honda Sensing|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|15 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda CR-V 2017-22">Buy Here</a></sub></details>|||
|
||||||
|Honda|CR-V 2023-26|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch C connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda CR-V 2023-26">Buy Here</a></sub></details>|||
|
|Honda|CR-V 2023-26|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch C connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda CR-V 2023-26">Buy Here</a></sub></details>|||
|
||||||
|Honda|CR-V Hybrid 2017-22|Honda Sensing|openpilot available[<sup>1</sup>](#footnotes)|0 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda CR-V Hybrid 2017-22">Buy Here</a></sub></details>|||
|
|Honda|CR-V Hybrid 2017-22|Honda Sensing|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda CR-V Hybrid 2017-22">Buy Here</a></sub></details>|||
|
||||||
|Honda|CR-V Hybrid 2023-26|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch C connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda CR-V Hybrid 2023-26">Buy Here</a></sub></details>|||
|
|Honda|CR-V Hybrid 2023-26|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch C connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda CR-V Hybrid 2023-26">Buy Here</a></sub></details>|||
|
||||||
|Honda|e 2020|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|3 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda e 2020">Buy Here</a></sub></details>|||
|
|Honda|e 2020|All|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|3 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda e 2020">Buy Here</a></sub></details>|||
|
||||||
|Honda|Fit 2018-20|Honda Sensing|openpilot|26 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Fit 2018-20">Buy Here</a></sub></details>|||
|
|Honda|Fit 2018-20|Honda Sensing|openpilot|26 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Fit 2018-20">Buy Here</a></sub></details>|||
|
||||||
|Honda|Freed 2020|Honda Sensing|openpilot|26 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Freed 2020">Buy Here</a></sub></details>|||
|
|Honda|Freed 2020|Honda Sensing|openpilot|26 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Freed 2020">Buy Here</a></sub></details>|||
|
||||||
|Honda|HR-V 2019-22|Honda Sensing|openpilot|26 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda HR-V 2019-22">Buy Here</a></sub></details>|||
|
|Honda|HR-V 2019-22|Honda Sensing|openpilot|26 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda HR-V 2019-22">Buy Here</a></sub></details>|||
|
||||||
|Honda|HR-V 2023-25|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch B connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda HR-V 2023-25">Buy Here</a></sub></details>|||
|
|Honda|HR-V 2023-25|All|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch B connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<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|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Insight 2019-22">Buy Here</a></sub></details>|||
|
|Honda|Insight 2019-22|All|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|3 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<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|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Inspire 2018">Buy Here</a></sub></details>|||
|
|Honda|Inspire 2018|All|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|3 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<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|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda N-Box 2018">Buy Here</a></sub></details>|||
|
|Honda|N-Box 2018|All|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|11 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<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|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Odyssey 2018-20">Buy Here</a></sub></details>|||
|
|Honda|Odyssey 2018-20|Honda Sensing|openpilot|26 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Odyssey 2018-20">Buy Here</a></sub></details>|||
|
||||||
|Honda|Odyssey 2021-26|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|43 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Odyssey 2021-26">Buy Here</a></sub></details>|||
|
|Honda|Odyssey 2021-26|All|openpilot available[<sup>1,5</sup>](#footnotes)|0 mph|43 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Odyssey 2021-26">Buy Here</a></sub></details>|||
|
||||||
|Honda|Odyssey (Singapore) 2021|Honda Sensing|openpilot|19 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Odyssey (Singapore) 2021">Buy Here</a></sub></details>|||
|
|Honda|Odyssey (Singapore) 2021|Honda Sensing|openpilot|19 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Odyssey (Singapore) 2021">Buy Here</a></sub></details>|||
|
||||||
|Honda|Odyssey (Taiwan) 2018-19|Honda Sensing|openpilot|19 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Odyssey (Taiwan) 2018-19">Buy Here</a></sub></details>|||
|
|Honda|Odyssey (Taiwan) 2018-19|Honda Sensing|openpilot|19 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Odyssey (Taiwan) 2018-19">Buy Here</a></sub></details>|||
|
||||||
|Honda|Passport 2019-25|All|openpilot|26 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Passport 2019-25">Buy Here</a></sub></details>|||
|
|Honda|Passport 2019-25|All|openpilot|26 mph|12 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Honda Passport 2019-25">Buy Here</a></sub></details>|||
|
||||||
@@ -126,6 +126,7 @@ A supported vehicle is one that just works when you install a comma device. All
|
|||||||
|Hyundai|Ioniq 5 (with HDA II) 2022-24|Highway Driving Assist II|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai Q connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Hyundai Ioniq 5 (with HDA II) 2022-24">Buy Here</a></sub></details>|||
|
|Hyundai|Ioniq 5 (with HDA II) 2022-24|Highway Driving Assist II|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai Q connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Hyundai Ioniq 5 (with HDA II) 2022-24">Buy Here</a></sub></details>|||
|
||||||
|Hyundai|Ioniq 5 (without HDA II) 2022-24|Highway Driving Assist|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai K connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Hyundai Ioniq 5 (without HDA II) 2022-24">Buy Here</a></sub></details>|||
|
|Hyundai|Ioniq 5 (without HDA II) 2022-24|Highway Driving Assist|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai K connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Hyundai Ioniq 5 (without HDA II) 2022-24">Buy Here</a></sub></details>|||
|
||||||
|Hyundai|Ioniq 6 (with HDA II) 2023-24|Highway Driving Assist II|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai P connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Hyundai Ioniq 6 (with HDA II) 2023-24">Buy Here</a></sub></details>|||
|
|Hyundai|Ioniq 6 (with HDA II) 2023-24|Highway Driving Assist II|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai P connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Hyundai Ioniq 6 (with HDA II) 2023-24">Buy Here</a></sub></details>|||
|
||||||
|
|Hyundai|Ioniq 6 (without HDA II) 2023-24|Highway Driving Assist|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai L connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Hyundai Ioniq 6 (without HDA II) 2023-24">Buy Here</a></sub></details>|||
|
||||||
|Hyundai|Ioniq Electric 2019|Smart Cruise Control (SCC)|Stock|0 mph|32 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai C connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Hyundai Ioniq Electric 2019">Buy Here</a></sub></details>|||
|
|Hyundai|Ioniq Electric 2019|Smart Cruise Control (SCC)|Stock|0 mph|32 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai C connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Hyundai Ioniq Electric 2019">Buy Here</a></sub></details>|||
|
||||||
|Hyundai|Ioniq Electric 2020|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai H connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Hyundai Ioniq Electric 2020">Buy Here</a></sub></details>|||
|
|Hyundai|Ioniq Electric 2020|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai H connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Hyundai Ioniq Electric 2020">Buy Here</a></sub></details>|||
|
||||||
|Hyundai|Ioniq Hybrid 2017-19|Smart Cruise Control (SCC)|openpilot available[<sup>1</sup>](#footnotes)|0 mph|32 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai C connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Hyundai Ioniq Hybrid 2017-19">Buy Here</a></sub></details>|||
|
|Hyundai|Ioniq Hybrid 2017-19|Smart Cruise Control (SCC)|openpilot available[<sup>1</sup>](#footnotes)|0 mph|32 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Hyundai C connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Hyundai Ioniq Hybrid 2017-19">Buy Here</a></sub></details>|||
|
||||||
@@ -223,14 +224,14 @@ A supported vehicle is one that just works when you install a comma device. All
|
|||||||
|Lexus|UX Hybrid 2019-24|All|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Lexus UX Hybrid 2019-24">Buy Here</a></sub></details>|||
|
|Lexus|UX Hybrid 2019-24|All|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Lexus UX Hybrid 2019-24">Buy Here</a></sub></details>|||
|
||||||
|Lincoln|Aviator 2020-24|Co-Pilot360 Plus|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q3 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Lincoln Aviator 2020-24">Buy Here</a></sub></details>|||
|
|Lincoln|Aviator 2020-24|Co-Pilot360 Plus|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q3 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Lincoln Aviator 2020-24">Buy Here</a></sub></details>|||
|
||||||
|Lincoln|Aviator Plug-in Hybrid 2020-24|Co-Pilot360 Plus|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q3 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Lincoln Aviator Plug-in Hybrid 2020-24">Buy Here</a></sub></details>|||
|
|Lincoln|Aviator Plug-in Hybrid 2020-24|Co-Pilot360 Plus|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Ford Q3 connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Lincoln Aviator Plug-in Hybrid 2020-24">Buy Here</a></sub></details>|||
|
||||||
|MAN[<sup>11</sup>](#footnotes)|eTGE 2020-24|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|31 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=MAN eTGE 2020-24">Buy Here</a></sub></details>|<a href="https://youtu.be/4100gLeabmo" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|MAN[<sup>12</sup>](#footnotes)|eTGE 2020-24|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|31 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=MAN eTGE 2020-24">Buy Here</a></sub></details>|<a href="https://youtu.be/4100gLeabmo" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|MAN[<sup>11</sup>](#footnotes)|TGE 2017-24|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|31 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=MAN TGE 2017-24">Buy Here</a></sub></details>|<a href="https://youtu.be/4100gLeabmo" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|MAN[<sup>12</sup>](#footnotes)|TGE 2017-24|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|31 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=MAN TGE 2017-24">Buy Here</a></sub></details>|<a href="https://youtu.be/4100gLeabmo" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Mazda|CX-5 2022-25|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Mazda connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Mazda CX-5 2022-25">Buy Here</a></sub></details>|||
|
|Mazda|CX-5 2022-25|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Mazda connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Mazda CX-5 2022-25">Buy Here</a></sub></details>|||
|
||||||
|Mazda|CX-9 2021-23|All|Stock|0 mph|28 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Mazda connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Mazda CX-9 2021-23">Buy Here</a></sub></details>|<a href="https://youtu.be/dA3duO4a0O4" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Mazda|CX-9 2021-23|All|Stock|0 mph|28 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Mazda connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Mazda CX-9 2021-23">Buy Here</a></sub></details>|<a href="https://youtu.be/dA3duO4a0O4" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Nissan[<sup>5</sup>](#footnotes)|Altima 2019-20, 2024|ProPILOT Assist|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Nissan B connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Nissan Altima 2019-20, 2024">Buy Here</a></sub></details>|||
|
|Nissan[<sup>6</sup>](#footnotes)|Altima 2019-24|ProPILOT Assist|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Nissan B connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Nissan Altima 2019-24">Buy Here</a></sub></details>|||
|
||||||
|Nissan[<sup>5</sup>](#footnotes)|Leaf 2018-23|ProPILOT Assist|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Nissan A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Nissan Leaf 2018-23">Buy Here</a></sub></details>|<a href="https://youtu.be/vaMbtAh_0cY" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Nissan[<sup>6</sup>](#footnotes)|Leaf 2018-23|ProPILOT Assist|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Nissan A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Nissan Leaf 2018-23">Buy Here</a></sub></details>|<a href="https://youtu.be/vaMbtAh_0cY" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Nissan[<sup>5</sup>](#footnotes)|Rogue 2018-20|ProPILOT Assist|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Nissan A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Nissan Rogue 2018-20">Buy Here</a></sub></details>|||
|
|Nissan[<sup>6</sup>](#footnotes)|Rogue 2018-20|ProPILOT Assist|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Nissan A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Nissan Rogue 2018-20">Buy Here</a></sub></details>|||
|
||||||
|Nissan[<sup>5</sup>](#footnotes)|X-Trail 2017|ProPILOT Assist|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Nissan A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Nissan X-Trail 2017">Buy Here</a></sub></details>|||
|
|Nissan[<sup>6</sup>](#footnotes)|X-Trail 2017|ProPILOT Assist|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 Nissan A connector<br>- 1 OBD-C cable (2 ft)<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Nissan X-Trail 2017">Buy Here</a></sub></details>|||
|
||||||
|Ram|1500 2019-24|Adaptive Cruise Control (ACC)|Stock|32 mph|1 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Ram connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ram 1500 2019-24">Buy Here</a></sub></details>|||
|
|Ram|1500 2019-24|Adaptive Cruise Control (ACC)|Stock|32 mph|1 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Ram connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ram 1500 2019-24">Buy Here</a></sub></details>|||
|
||||||
|Ram|2500 2020-24|Adaptive Cruise Control (ACC)|Stock|0 mph|36 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Ram connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ram 2500 2020-24">Buy Here</a></sub></details>|||
|
|Ram|2500 2020-24|Adaptive Cruise Control (ACC)|Stock|0 mph|36 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Ram connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ram 2500 2020-24">Buy Here</a></sub></details>|||
|
||||||
|Ram|3500 2019-22|Adaptive Cruise Control (ACC)|Stock|0 mph|36 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Ram connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ram 3500 2019-22">Buy Here</a></sub></details>|||
|
|Ram|3500 2019-22|Adaptive Cruise Control (ACC)|Stock|0 mph|36 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Ram connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Ram 3500 2019-22">Buy Here</a></sub></details>|||
|
||||||
@@ -238,35 +239,35 @@ A supported vehicle is one that just works when you install a comma device. All
|
|||||||
|Rivian|R1S 2025|All|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Rivian B connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Rivian R1S 2025">Buy Here</a></sub></details>|||
|
|Rivian|R1S 2025|All|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Rivian B connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Rivian R1S 2025">Buy Here</a></sub></details>|||
|
||||||
|Rivian|R1T 2022-24|All|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Rivian A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Rivian R1T 2022-24">Buy Here</a></sub></details>||<a href="https://youtu.be/uaISd1j7Z4U" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>|
|
|Rivian|R1T 2022-24|All|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Rivian A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Rivian R1T 2022-24">Buy Here</a></sub></details>||<a href="https://youtu.be/uaISd1j7Z4U" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>|
|
||||||
|Rivian|R1T 2025|All|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Rivian B connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Rivian R1T 2025">Buy Here</a></sub></details>|||
|
|Rivian|R1T 2025|All|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Rivian B connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Rivian R1T 2025">Buy Here</a></sub></details>|||
|
||||||
|SEAT[<sup>11</sup>](#footnotes)|Ateca 2016-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=SEAT Ateca 2016-23">Buy Here</a></sub></details>|||
|
|SEAT[<sup>12</sup>](#footnotes)|Ateca 2016-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=SEAT Ateca 2016-23">Buy Here</a></sub></details>|||
|
||||||
|SEAT[<sup>11</sup>](#footnotes)|Leon 2014-20|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=SEAT Leon 2014-20">Buy Here</a></sub></details>|||
|
|SEAT[<sup>12</sup>](#footnotes)|Leon 2014-20|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=SEAT Leon 2014-20">Buy Here</a></sub></details>|||
|
||||||
|Subaru|Ascent 2019-21|All[<sup>6</sup>](#footnotes)|openpilot available[<sup>1,7</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Ascent 2019-21">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
|Subaru|Ascent 2019-21|All[<sup>7</sup>](#footnotes)|openpilot available[<sup>1,8</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Ascent 2019-21">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
||||||
|Subaru|Crosstrek 2018-19|EyeSight Driver Assistance[<sup>6</sup>](#footnotes)|openpilot available[<sup>1,7</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Crosstrek 2018-19">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|<a href="https://youtu.be/Agww7oE1k-s?t=26" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Subaru|Crosstrek 2018-19|EyeSight Driver Assistance[<sup>7</sup>](#footnotes)|openpilot available[<sup>1,8</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Crosstrek 2018-19">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|<a href="https://youtu.be/Agww7oE1k-s?t=26" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Subaru|Crosstrek 2020-23|EyeSight Driver Assistance[<sup>6</sup>](#footnotes)|openpilot available[<sup>1,7</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Crosstrek 2020-23">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
|Subaru|Crosstrek 2020-23|EyeSight Driver Assistance[<sup>7</sup>](#footnotes)|openpilot available[<sup>1,8</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Crosstrek 2020-23">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
||||||
|Subaru|Forester 2017-18|EyeSight Driver Assistance[<sup>6</sup>](#footnotes)|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Forester 2017-18">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
|Subaru|Forester 2017-18|EyeSight Driver Assistance[<sup>7</sup>](#footnotes)|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Forester 2017-18">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
||||||
|Subaru|Forester 2019-21|All[<sup>6</sup>](#footnotes)|openpilot available[<sup>1,7</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Forester 2019-21">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
|Subaru|Forester 2019-21|All[<sup>7</sup>](#footnotes)|openpilot available[<sup>1,8</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Forester 2019-21">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
||||||
|Subaru|Impreza 2017-19|EyeSight Driver Assistance[<sup>6</sup>](#footnotes)|openpilot available[<sup>1,7</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Impreza 2017-19">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
|Subaru|Impreza 2017-19|EyeSight Driver Assistance[<sup>7</sup>](#footnotes)|openpilot available[<sup>1,8</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Impreza 2017-19">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
||||||
|Subaru|Impreza 2020-22|EyeSight Driver Assistance[<sup>6</sup>](#footnotes)|openpilot available[<sup>1,7</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Impreza 2020-22">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
|Subaru|Impreza 2020-22|EyeSight Driver Assistance[<sup>7</sup>](#footnotes)|openpilot available[<sup>1,8</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Impreza 2020-22">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
||||||
|Subaru|Legacy 2015-18|EyeSight Driver Assistance[<sup>6</sup>](#footnotes)|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Legacy 2015-18">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
|Subaru|Legacy 2015-18|EyeSight Driver Assistance[<sup>7</sup>](#footnotes)|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Legacy 2015-18">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
||||||
|Subaru|Legacy 2020-22|All[<sup>6</sup>](#footnotes)|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru B connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Legacy 2020-22">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
|Subaru|Legacy 2020-22|All[<sup>7</sup>](#footnotes)|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru B connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Legacy 2020-22">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
||||||
|Subaru|Outback 2015-17|EyeSight Driver Assistance[<sup>6</sup>](#footnotes)|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Outback 2015-17">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
|Subaru|Outback 2015-17|EyeSight Driver Assistance[<sup>7</sup>](#footnotes)|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Outback 2015-17">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
||||||
|Subaru|Outback 2018-19|EyeSight Driver Assistance[<sup>6</sup>](#footnotes)|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Outback 2018-19">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
|Subaru|Outback 2018-19|EyeSight Driver Assistance[<sup>7</sup>](#footnotes)|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Outback 2018-19">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
||||||
|Subaru|Outback 2020-22|All[<sup>6</sup>](#footnotes)|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru B connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Outback 2020-22">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
|Subaru|Outback 2020-22|All[<sup>7</sup>](#footnotes)|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru B connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru Outback 2020-22">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
||||||
|Subaru|XV 2018-19|EyeSight Driver Assistance[<sup>6</sup>](#footnotes)|openpilot available[<sup>1,7</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru XV 2018-19">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|<a href="https://youtu.be/Agww7oE1k-s?t=26" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Subaru|XV 2018-19|EyeSight Driver Assistance[<sup>7</sup>](#footnotes)|openpilot available[<sup>1,8</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru XV 2018-19">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|<a href="https://youtu.be/Agww7oE1k-s?t=26" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Subaru|XV 2020-21|EyeSight Driver Assistance[<sup>6</sup>](#footnotes)|openpilot available[<sup>1,7</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru XV 2020-21">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
|Subaru|XV 2020-21|EyeSight Driver Assistance[<sup>7</sup>](#footnotes)|openpilot available[<sup>1,8</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Subaru A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Subaru XV 2020-21">Buy Here</a></sub></details><details><summary>Tools</summary><sub>- 1 Pry Tool<br>- 1 Socket Wrench 8mm or 5/16" (deep)</sub></details>|||
|
||||||
|Škoda|Fabia 2022-23[<sup>14</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Škoda Fabia 2022-23">Buy Here</a></sub></details>[<sup>16</sup>](#footnotes)|||
|
|Škoda|Fabia 2022-23[<sup>15</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Škoda Fabia 2022-23">Buy Here</a></sub></details>[<sup>17</sup>](#footnotes)|||
|
||||||
|Škoda|Kamiq 2021-23[<sup>12,14</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Škoda Kamiq 2021-23">Buy Here</a></sub></details>[<sup>16</sup>](#footnotes)|||
|
|Škoda|Kamiq 2021-23[<sup>13,15</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Škoda Kamiq 2021-23">Buy Here</a></sub></details>[<sup>17</sup>](#footnotes)|||
|
||||||
|Škoda[<sup>11</sup>](#footnotes)|Karoq 2019-23[<sup>14</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Škoda Karoq 2019-23">Buy Here</a></sub></details>|||
|
|Škoda[<sup>12</sup>](#footnotes)|Karoq 2019-23[<sup>15</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Škoda Karoq 2019-23">Buy Here</a></sub></details>|||
|
||||||
|Škoda[<sup>11</sup>](#footnotes)|Kodiaq 2017-23[<sup>14</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Škoda Kodiaq 2017-23">Buy Here</a></sub></details>|||
|
|Škoda[<sup>12</sup>](#footnotes)|Kodiaq 2017-23[<sup>15</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Škoda Kodiaq 2017-23">Buy Here</a></sub></details>|||
|
||||||
|Škoda[<sup>11</sup>](#footnotes)|Octavia 2015-19[<sup>14</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Škoda Octavia 2015-19">Buy Here</a></sub></details>|||
|
|Škoda[<sup>12</sup>](#footnotes)|Octavia 2015-19[<sup>15</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Škoda Octavia 2015-19">Buy Here</a></sub></details>|||
|
||||||
|Škoda[<sup>11</sup>](#footnotes)|Octavia RS 2016[<sup>14</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Škoda Octavia RS 2016">Buy Here</a></sub></details>|||
|
|Škoda[<sup>12</sup>](#footnotes)|Octavia RS 2016[<sup>15</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Škoda Octavia RS 2016">Buy Here</a></sub></details>|||
|
||||||
|Škoda[<sup>11</sup>](#footnotes)|Octavia Scout 2017-19[<sup>14</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Škoda Octavia Scout 2017-19">Buy Here</a></sub></details>|||
|
|Škoda[<sup>12</sup>](#footnotes)|Octavia Scout 2017-19[<sup>15</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Škoda Octavia Scout 2017-19">Buy Here</a></sub></details>|||
|
||||||
|Škoda|Scala 2020-23[<sup>14</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Škoda Scala 2020-23">Buy Here</a></sub></details>[<sup>16</sup>](#footnotes)|||
|
|Škoda|Scala 2020-23[<sup>15</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Škoda Scala 2020-23">Buy Here</a></sub></details>[<sup>17</sup>](#footnotes)|||
|
||||||
|Škoda[<sup>11</sup>](#footnotes)|Superb 2015-22[<sup>14</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Škoda Superb 2015-22">Buy Here</a></sub></details>|||
|
|Škoda[<sup>12</sup>](#footnotes)|Superb 2015-22[<sup>15</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Škoda Superb 2015-22">Buy Here</a></sub></details>|||
|
||||||
|Tesla[<sup>9</sup>](#footnotes)|Model 3 (with HW3) 2019-23[<sup>8</sup>](#footnotes)|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Tesla A connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Tesla Model 3 (with HW3) 2019-23">Buy Here</a></sub></details>|||
|
|Tesla[<sup>10</sup>](#footnotes)|Model 3 (with HW3) 2019-23[<sup>9</sup>](#footnotes)|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Tesla A connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Tesla Model 3 (with HW3) 2019-23">Buy Here</a></sub></details>|||
|
||||||
|Tesla[<sup>9</sup>](#footnotes)|Model 3 (with HW4) 2024-25[<sup>8</sup>](#footnotes)|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Tesla B connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Tesla Model 3 (with HW4) 2024-25">Buy Here</a></sub></details>|||
|
|Tesla[<sup>10</sup>](#footnotes)|Model 3 (with HW4) 2024-25[<sup>9</sup>](#footnotes)|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Tesla B connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Tesla Model 3 (with HW4) 2024-25">Buy Here</a></sub></details>|||
|
||||||
|Tesla[<sup>9</sup>](#footnotes)|Model Y (with HW3) 2020-23[<sup>8</sup>](#footnotes)|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Tesla A connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Tesla Model Y (with HW3) 2020-23">Buy Here</a></sub></details>|||
|
|Tesla[<sup>10</sup>](#footnotes)|Model Y (with HW3) 2020-23[<sup>9</sup>](#footnotes)|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Tesla A connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Tesla Model Y (with HW3) 2020-23">Buy Here</a></sub></details>|||
|
||||||
|Tesla[<sup>9</sup>](#footnotes)|Model Y (with HW4) 2024-25[<sup>8</sup>](#footnotes)|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Tesla B connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Tesla Model Y (with HW4) 2024-25">Buy Here</a></sub></details>|||
|
|Tesla[<sup>10</sup>](#footnotes)|Model Y (with HW4) 2024-25[<sup>9</sup>](#footnotes)|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Tesla B connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Tesla Model Y (with HW4) 2024-25">Buy Here</a></sub></details>|||
|
||||||
|Toyota|Alphard 2019-20|All|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota Alphard 2019-20">Buy Here</a></sub></details>|||
|
|Toyota|Alphard 2019-20|All|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<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|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota Alphard Hybrid 2021">Buy Here</a></sub></details>|||
|
|Toyota|Alphard Hybrid 2021|All|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<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|Stock|19 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota Avalon 2016">Buy Here</a></sub></details>|||
|
|Toyota|Avalon 2016|Toyota Safety Sense P|Stock|19 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota Avalon 2016">Buy Here</a></sub></details>|||
|
||||||
@@ -279,8 +280,8 @@ A supported vehicle is one that just works when you install a comma device. All
|
|||||||
|Toyota|C-HR 2021|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota C-HR 2021">Buy Here</a></sub></details>|||
|
|Toyota|C-HR 2021|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota C-HR 2021">Buy Here</a></sub></details>|||
|
||||||
|Toyota|C-HR Hybrid 2017-20|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota C-HR Hybrid 2017-20">Buy Here</a></sub></details>|||
|
|Toyota|C-HR Hybrid 2017-20|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota C-HR Hybrid 2017-20">Buy Here</a></sub></details>|||
|
||||||
|Toyota|C-HR Hybrid 2021-22|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota C-HR Hybrid 2021-22">Buy Here</a></sub></details>|||
|
|Toyota|C-HR Hybrid 2021-22|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota C-HR Hybrid 2021-22">Buy Here</a></sub></details>|||
|
||||||
|Toyota|Camry 2018-20|All|Stock|0 mph[<sup>10</sup>](#footnotes)|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota Camry 2018-20">Buy Here</a></sub></details>|<a href="https://www.youtube.com/watch?v=fkcjviZY9CM" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Toyota|Camry 2018-20|All|Stock|0 mph[<sup>11</sup>](#footnotes)|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota Camry 2018-20">Buy Here</a></sub></details>|<a href="https://www.youtube.com/watch?v=fkcjviZY9CM" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Toyota|Camry 2021-24|All|openpilot|0 mph[<sup>10</sup>](#footnotes)|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota Camry 2021-24">Buy Here</a></sub></details>|||
|
|Toyota|Camry 2021-24|All|openpilot|0 mph[<sup>11</sup>](#footnotes)|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota Camry 2021-24">Buy Here</a></sub></details>|||
|
||||||
|Toyota|Camry Hybrid 2018-20|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota Camry Hybrid 2018-20">Buy Here</a></sub></details>|<a href="https://www.youtube.com/watch?v=Q2DYY0AWKgk" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Toyota|Camry Hybrid 2018-20|All|Stock|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota Camry Hybrid 2018-20">Buy Here</a></sub></details>|<a href="https://www.youtube.com/watch?v=Q2DYY0AWKgk" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Toyota|Camry Hybrid 2021-24|All|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota Camry Hybrid 2021-24">Buy Here</a></sub></details>|||
|
|Toyota|Camry Hybrid 2021-24|All|openpilot|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota Camry Hybrid 2021-24">Buy Here</a></sub></details>|||
|
||||||
|Toyota|Corolla 2017-19|All|Stock|19 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota Corolla 2017-19">Buy Here</a></sub></details>|||
|
|Toyota|Corolla 2017-19|All|Stock|19 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota Corolla 2017-19">Buy Here</a></sub></details>|||
|
||||||
@@ -312,60 +313,61 @@ A supported vehicle is one that just works when you install a comma device. All
|
|||||||
|Toyota|RAV4 Hybrid 2022|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota RAV4 Hybrid 2022">Buy Here</a></sub></details>|<a href="https://youtu.be/U0nH9cnrFB0" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Toyota|RAV4 Hybrid 2022|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota RAV4 Hybrid 2022">Buy Here</a></sub></details>|<a href="https://youtu.be/U0nH9cnrFB0" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Toyota|RAV4 Hybrid 2023-25|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota RAV4 Hybrid 2023-25">Buy Here</a></sub></details>|<a href="https://youtu.be/4eIsEq4L4Ng" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Toyota|RAV4 Hybrid 2023-25|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota RAV4 Hybrid 2023-25">Buy Here</a></sub></details>|<a href="https://youtu.be/4eIsEq4L4Ng" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Toyota|Sienna 2018-20|All|Stock|19 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota Sienna 2018-20">Buy Here</a></sub></details>|<a href="https://www.youtube.com/watch?v=q1UPOo4Sh68" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Toyota|Sienna 2018-20|All|Stock|19 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 Toyota A connector<br>- 1 comma four<br>- 1 comma power v3<br>- 1 harness box<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Toyota Sienna 2018-20">Buy Here</a></sub></details>|<a href="https://www.youtube.com/watch?v=q1UPOo4Sh68" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Arteon 2018-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Arteon 2018-23">Buy Here</a></sub></details>|<a href="https://youtu.be/FAomFKPFlDA" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Arteon 2018-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Arteon 2018-23">Buy Here</a></sub></details>|<a href="https://youtu.be/FAomFKPFlDA" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Arteon eHybrid 2020-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Arteon eHybrid 2020-23">Buy Here</a></sub></details>|<a href="https://youtu.be/FAomFKPFlDA" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Arteon eHybrid 2020-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Arteon eHybrid 2020-23">Buy Here</a></sub></details>|<a href="https://youtu.be/FAomFKPFlDA" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Arteon R 2020-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Arteon R 2020-23">Buy Here</a></sub></details>|<a href="https://youtu.be/FAomFKPFlDA" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Arteon R 2020-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Arteon R 2020-23">Buy Here</a></sub></details>|<a href="https://youtu.be/FAomFKPFlDA" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Arteon Shooting Brake 2020-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Arteon Shooting Brake 2020-23">Buy Here</a></sub></details>|<a href="https://youtu.be/FAomFKPFlDA" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Arteon Shooting Brake 2020-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Arteon Shooting Brake 2020-23">Buy Here</a></sub></details>|<a href="https://youtu.be/FAomFKPFlDA" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Atlas 2018-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Atlas 2018-23">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Atlas 2018-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Atlas 2018-23">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Atlas Cross Sport 2020-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Atlas Cross Sport 2020-22">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Atlas Cross Sport 2020-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Atlas Cross Sport 2020-22">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|California 2021-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|31 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen California 2021-23">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|California 2021-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|31 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen California 2021-23">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Caravelle 2020|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|31 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Caravelle 2020">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Caravelle 2020|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|31 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Caravelle 2020">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|CC 2018-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen CC 2018-22">Buy Here</a></sub></details>|<a href="https://youtu.be/FAomFKPFlDA" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Volkswagen[<sup>12</sup>](#footnotes)|CC 2018-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen CC 2018-22">Buy Here</a></sub></details>|<a href="https://youtu.be/FAomFKPFlDA" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Crafter 2017-24|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|31 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Crafter 2017-24">Buy Here</a></sub></details>|<a href="https://youtu.be/4100gLeabmo" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Crafter 2017-24|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|31 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Crafter 2017-24">Buy Here</a></sub></details>|<a href="https://youtu.be/4100gLeabmo" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|e-Crafter 2018-24|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|31 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen e-Crafter 2018-24">Buy Here</a></sub></details>|<a href="https://youtu.be/4100gLeabmo" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Volkswagen[<sup>12</sup>](#footnotes)|e-Crafter 2018-24|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|31 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen e-Crafter 2018-24">Buy Here</a></sub></details>|<a href="https://youtu.be/4100gLeabmo" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|e-Golf 2014-20|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen e-Golf 2014-20">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|e-Golf 2014-20|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen e-Golf 2014-20">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Golf 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Golf 2015-20">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Golf 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Golf 2015-20">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Golf Alltrack 2015-19|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Golf Alltrack 2015-19">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Golf Alltrack 2015-19|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Golf Alltrack 2015-19">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Golf GTD 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Golf GTD 2015-20">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Golf GTD 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Golf GTD 2015-20">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Golf GTE 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Golf GTE 2015-20">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Golf GTE 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Golf GTE 2015-20">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Golf GTI 2015-21|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Golf GTI 2015-21">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Golf GTI 2015-21|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Golf GTI 2015-21">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Golf R 2015-19|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Golf R 2015-19">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Golf R 2015-19|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Golf R 2015-19">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Golf SportsVan 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Golf SportsVan 2015-20">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Golf SportsVan 2015-20|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Golf SportsVan 2015-20">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Grand California 2019-24|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|31 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Grand California 2019-24">Buy Here</a></sub></details>|<a href="https://youtu.be/4100gLeabmo" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Grand California 2019-24|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|31 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Grand California 2019-24">Buy Here</a></sub></details>|<a href="https://youtu.be/4100gLeabmo" target="_blank"><img height="18px" src="assets/icon-youtube.svg" /></a>||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Jetta 2019-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Jetta 2019-23">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Jetta 2019-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Jetta 2019-23">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Jetta GLI 2021-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Jetta GLI 2021-23">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Jetta GLI 2021-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Jetta GLI 2021-23">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen|Passat 2015-22[<sup>13</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Passat 2015-22">Buy Here</a></sub></details>|||
|
|Volkswagen|Passat 2015-22[<sup>14</sup>](#footnotes)|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Passat 2015-22">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Passat Alltrack 2015-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Passat Alltrack 2015-22">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Passat Alltrack 2015-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Passat Alltrack 2015-22">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Passat GTE 2015-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Passat GTE 2015-22">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Passat GTE 2015-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Passat GTE 2015-22">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen|Polo 2018-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Polo 2018-23">Buy Here</a></sub></details>[<sup>16</sup>](#footnotes)|||
|
|Volkswagen|Polo 2018-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Polo 2018-23">Buy Here</a></sub></details>[<sup>17</sup>](#footnotes)|||
|
||||||
|Volkswagen|Polo GTI 2018-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Polo GTI 2018-23">Buy Here</a></sub></details>[<sup>16</sup>](#footnotes)|||
|
|Volkswagen|Polo GTI 2018-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Polo GTI 2018-23">Buy Here</a></sub></details>[<sup>17</sup>](#footnotes)|||
|
||||||
|Volkswagen|T-Cross 2021|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen T-Cross 2021">Buy Here</a></sub></details>[<sup>16</sup>](#footnotes)|||
|
|Volkswagen|T-Cross 2021|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen T-Cross 2021">Buy Here</a></sub></details>[<sup>17</sup>](#footnotes)|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|T-Roc 2018-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen T-Roc 2018-23">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|T-Roc 2018-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen T-Roc 2018-23">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Taos 2022-24|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Taos 2022-24">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Taos 2022-24|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Taos 2022-24">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Teramont 2018-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Teramont 2018-22">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Teramont 2018-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Teramont 2018-22">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Teramont Cross Sport 2021-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Teramont Cross Sport 2021-22">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Teramont Cross Sport 2021-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Teramont Cross Sport 2021-22">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Teramont X 2021-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Teramont X 2021-22">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Teramont X 2021-22|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Teramont X 2021-22">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Tiguan 2018-24|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Tiguan 2018-24">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Tiguan 2018-24|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Tiguan 2018-24">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Tiguan eHybrid 2021-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Tiguan eHybrid 2021-23">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Tiguan eHybrid 2021-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Tiguan eHybrid 2021-23">Buy Here</a></sub></details>|||
|
||||||
|Volkswagen[<sup>11</sup>](#footnotes)|Touran 2016-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,15</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Touran 2016-23">Buy Here</a></sub></details>|||
|
|Volkswagen[<sup>12</sup>](#footnotes)|Touran 2016-23|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,16</sup>](#footnotes)|0 mph|0 mph|[](##)|[](##)|<details><summary>Parts</summary><sub>- 1 OBD-C cable (2 ft)<br>- 1 VW J533 connector<br>- 1 comma four<br>- 1 harness box<br>- 1 long OBD-C cable (9.5 ft)<br>- 1 mount<br><a href="https://comma.ai/shop/comma-3x?harness=Volkswagen Touran 2016-23">Buy Here</a></sub></details>|||
|
||||||
|
|
||||||
### Footnotes
|
### Footnotes
|
||||||
<sup>1</sup>openpilot Longitudinal Control (Alpha) is available behind a toggle; the toggle is only available in non-release branches such as `nightly-dev`. <br />
|
<sup>1</sup>openpilot Longitudinal Control (Alpha) is available behind a toggle; the toggle is only available in non-release branches such as `nightly-dev`. <br />
|
||||||
<sup>2</sup>Refers only to the Focus Mk4 (C519) available in Europe/China/Taiwan/Australasia, not the Focus Mk3 (C346) in North and South America/Southeast Asia. <br />
|
<sup>2</sup>Refers only to the Focus Mk4 (C519) available in Europe/China/Taiwan/Australasia, not the Focus Mk3 (C346) in North and South America/Southeast Asia. <br />
|
||||||
<sup>3</sup>See more setup details for <a href="https://github.com/commaai/openpilot/wiki/gm" target="_blank">GM</a>. <br />
|
<sup>3</sup>See more setup details for <a href="https://github.com/commaai/openpilot/wiki/gm" target="_blank">GM</a>. <br />
|
||||||
<sup>4</sup>2019 Honda Civic 1.6L Diesel Sedan does not have ALC below 12mph. <br />
|
<sup>4</sup>2019 Honda Civic 1.6L Diesel Sedan does not have ALC below 12mph. <br />
|
||||||
<sup>5</sup>See more setup details for <a href="https://github.com/commaai/openpilot/wiki/nissan" target="_blank">Nissan</a>. <br />
|
<sup>5</sup>Enabling longitudinal control (alpha) will disable all CMBS functionality, including AEB and FCW. <br />
|
||||||
<sup>6</sup>In the non-US market, openpilot requires the car to come equipped with EyeSight with Lane Keep Assistance. <br />
|
<sup>6</sup>See more setup details for <a href="https://github.com/commaai/openpilot/wiki/nissan" target="_blank">Nissan</a>. <br />
|
||||||
<sup>7</sup>Enabling longitudinal control (alpha) will disable all EyeSight functionality, including AEB, LDW, and RAB. <br />
|
<sup>7</sup>In the non-US market, openpilot requires the car to come equipped with EyeSight with Lane Keep Assistance. <br />
|
||||||
<sup>8</sup>Some 2023 model years have HW4. To check which hardware type your vehicle has, look for <b>Autopilot computer</b> under <b>Software -> Additional Vehicle Information</b> on your vehicle's touchscreen. See <a href="https://www.notateslaapp.com/news/2173/how-to-check-if-your-tesla-has-hardware-4-ai4-or-hardware-3">this page</a> for more information. <br />
|
<sup>8</sup>Enabling longitudinal control (alpha) will disable all EyeSight functionality, including AEB, LDW, and RAB. <br />
|
||||||
<sup>9</sup>See more setup details for <a href="https://github.com/commaai/openpilot/wiki/tesla" target="_blank">Tesla</a>. <br />
|
<sup>9</sup>Some 2023 model years have HW4. To check which hardware type your vehicle has, look for <b>Autopilot computer</b> under <b>Software -> Additional Vehicle Information</b> on your vehicle's touchscreen. See <a href="https://www.notateslaapp.com/news/2173/how-to-check-if-your-tesla-has-hardware-4-ai4-or-hardware-3">this page</a> for more information. <br />
|
||||||
<sup>10</sup>openpilot operates above 28mph for Camry 4CYL L, 4CYL LE and 4CYL SE which don't have Full-Speed Range Dynamic Radar Cruise Control. <br />
|
<sup>10</sup>See more setup details for <a href="https://github.com/commaai/openpilot/wiki/tesla" target="_blank">Tesla</a>. <br />
|
||||||
<sup>11</sup>The J533 harness plugs in at the CAN gateway under the dashboard, just above the steering column. More information can be found at <a href="https://docs.howtocomma.com/docs/j533-harness-install" target="_blank">this guide</a>. <br />
|
<sup>11</sup>openpilot operates above 28mph for Camry 4CYL L, 4CYL LE and 4CYL SE which don't have Full-Speed Range Dynamic Radar Cruise Control. <br />
|
||||||
<sup>12</sup>Not including the China market Kamiq, which is based on the (currently) unsupported PQ34 platform. <br />
|
<sup>12</sup>The J533 harness plugs in at the CAN gateway under the dashboard, just above the steering column. More information can be found at <a href="https://docs.howtocomma.com/docs/j533-harness-install" target="_blank">this guide</a>. <br />
|
||||||
<sup>13</sup>Refers only to the MQB-based European B8 Passat, not the NMS Passat in the USA/China/Mideast markets. <br />
|
<sup>13</sup>Not including the China market Kamiq, which is based on the (currently) unsupported PQ34 platform. <br />
|
||||||
<sup>14</sup>Some Škoda vehicles are equipped with heated windshields, which are known to block GPS signal needed for some comma four functionality. <br />
|
<sup>14</sup>Refers only to the MQB-based European B8 Passat, not the NMS Passat in the USA/China/Mideast markets. <br />
|
||||||
<sup>15</sup>Only available for vehicles using a gateway (J533) harness. At this time, vehicles using a camera harness are limited to using stock ACC. <br />
|
<sup>15</sup>Some Škoda vehicles are equipped with heated windshields, which are known to block GPS signal needed for some comma four functionality. <br />
|
||||||
<sup>16</sup>Model-years 2022 and beyond may have a combined CAN gateway and BCM, which is supported by openpilot in software, but doesn't yet have a harness available from the comma store. <br />
|
<sup>16</sup>Only available for vehicles using a gateway (J533) harness. At this time, vehicles using a camera harness are limited to using stock ACC. <br />
|
||||||
|
<sup>17</sup>Model-years 2022 and beyond may have a combined CAN gateway and BCM, which is supported by openpilot in software, but doesn't yet have a harness available from the comma store. <br />
|
||||||
|
|
||||||
## Community Maintained Cars
|
## Community Maintained Cars
|
||||||
Although they're not upstream, the community has openpilot running on other makes and models. See the 'Community Supported Models' section of each make [on our wiki](https://wiki.comma.ai/).
|
Although they're not upstream, the community has openpilot running on other makes and models. See the 'Community Supported Models' section of each make [on our wiki](https://wiki.comma.ai/).
|
||||||
|
|||||||
+1
-1
Submodule opendbc_repo updated: 954f2391b9...b9712d20ef
@@ -10,7 +10,7 @@ from cereal import car, log, custom
|
|||||||
from openpilot.common.params import Params
|
from openpilot.common.params import Params
|
||||||
from openpilot.common.realtime import config_realtime_process, Priority, Ratekeeper
|
from openpilot.common.realtime import config_realtime_process, Priority, Ratekeeper
|
||||||
from openpilot.common.swaglog import cloudlog, ForwardingHandler
|
from openpilot.common.swaglog import cloudlog, ForwardingHandler
|
||||||
from opendbc.safety import ALTERNATIVE_EXPERIENCE
|
|
||||||
from opendbc.car import DT_CTRL, structs
|
from opendbc.car import DT_CTRL, structs
|
||||||
from opendbc.car.can_definitions import CanData, CanRecvCallable, CanSendCallable
|
from opendbc.car.can_definitions import CanData, CanRecvCallable, CanSendCallable
|
||||||
from opendbc.car.carlog import carlog
|
from opendbc.car.carlog import carlog
|
||||||
@@ -121,13 +121,7 @@ class Car:
|
|||||||
self.CI, self.CP, self.CP_SP = CI, CI.CP, CI.CP_SP
|
self.CI, self.CP, self.CP_SP = CI, CI.CP, CI.CP_SP
|
||||||
self.RI = RI
|
self.RI = RI
|
||||||
|
|
||||||
# set alternative experiences from parameters
|
|
||||||
sp_toyota_auto_brake_hold = self.params.get_bool("ToyotaAutoHold")
|
|
||||||
self.CP.alternativeExperience = 0
|
self.CP.alternativeExperience = 0
|
||||||
if sp_toyota_auto_brake_hold:
|
|
||||||
self.CP.alternativeExperience |= ALTERNATIVE_EXPERIENCE.ALLOW_AEB
|
|
||||||
|
|
||||||
|
|
||||||
# mads
|
# mads
|
||||||
set_alternative_experience(self.CP, self.CP_SP, self.params)
|
set_alternative_experience(self.CP, self.CP_SP, self.params)
|
||||||
set_car_specific_params(self.CP, self.CP_SP, self.params)
|
set_car_specific_params(self.CP, self.CP_SP, self.params)
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ from opendbc.car import DT_CTRL, gen_empty_fingerprint, structs
|
|||||||
from opendbc.car.can_definitions import CanData
|
from opendbc.car.can_definitions import CanData
|
||||||
from opendbc.car.car_helpers import FRAME_FINGERPRINT, interfaces
|
from opendbc.car.car_helpers import FRAME_FINGERPRINT, interfaces
|
||||||
from opendbc.car.fingerprints import MIGRATION
|
from opendbc.car.fingerprints import MIGRATION
|
||||||
from opendbc.car.honda.values import HondaFlags
|
from opendbc.car.honda.values import CAR as HONDA, HondaFlags
|
||||||
from opendbc.car.structs import car
|
from opendbc.car.structs import car
|
||||||
from opendbc.car.tests.routes import non_tested_cars, routes, CarTestRoute
|
from opendbc.car.tests.routes import non_tested_cars, routes, CarTestRoute
|
||||||
from opendbc.car.values import Platform, PLATFORMS
|
from opendbc.car.values import Platform, PLATFORMS
|
||||||
@@ -358,7 +358,13 @@ class TestCarModelBase(unittest.TestCase):
|
|||||||
self.assertEqual(CS.gasPressed, self.safety.get_gas_pressed_prev())
|
self.assertEqual(CS.gasPressed, self.safety.get_gas_pressed_prev())
|
||||||
|
|
||||||
if self.safety.get_brake_pressed_prev() != prev_panda_brake:
|
if self.safety.get_brake_pressed_prev() != prev_panda_brake:
|
||||||
self.assertEqual(CS.brakePressed, self.safety.get_brake_pressed_prev())
|
# TODO: remove this exception once this mismatch is resolved
|
||||||
|
brake_pressed = CS.brakePressed
|
||||||
|
if CS.brakePressed and not self.safety.get_brake_pressed_prev():
|
||||||
|
if self.CP.carFingerprint in (HONDA.HONDA_PILOT, HONDA.HONDA_RIDGELINE) and CS.brake > 0.05:
|
||||||
|
brake_pressed = False
|
||||||
|
|
||||||
|
self.assertEqual(brake_pressed, self.safety.get_brake_pressed_prev())
|
||||||
|
|
||||||
if self.safety.get_regen_braking_prev() != prev_panda_regen_braking:
|
if self.safety.get_regen_braking_prev() != prev_panda_regen_braking:
|
||||||
self.assertEqual(CS.regenBraking, self.safety.get_regen_braking_prev())
|
self.assertEqual(CS.regenBraking, self.safety.get_regen_braking_prev())
|
||||||
@@ -442,7 +448,12 @@ class TestCarModelBase(unittest.TestCase):
|
|||||||
checks['steeringAngleDeg'] += (angle_can > (self.safety.get_angle_meas_max() + 1) or
|
checks['steeringAngleDeg'] += (angle_can > (self.safety.get_angle_meas_max() + 1) or
|
||||||
angle_can < (self.safety.get_angle_meas_min() - 1))
|
angle_can < (self.safety.get_angle_meas_min() - 1))
|
||||||
|
|
||||||
checks['brakePressed'] += CS.brakePressed != self.safety.get_brake_pressed_prev()
|
# TODO: remove this exception once this mismatch is resolved
|
||||||
|
brake_pressed = CS.brakePressed
|
||||||
|
if CS.brakePressed and not self.safety.get_brake_pressed_prev():
|
||||||
|
if self.CP.carFingerprint in (HONDA.HONDA_PILOT, HONDA.HONDA_RIDGELINE) and CS.brakeDEPRECATED > 0.05:
|
||||||
|
brake_pressed = False
|
||||||
|
checks['brakePressed'] += brake_pressed != self.safety.get_brake_pressed_prev()
|
||||||
checks['regenBraking'] += CS.regenBraking != self.safety.get_regen_braking_prev()
|
checks['regenBraking'] += CS.regenBraking != self.safety.get_regen_braking_prev()
|
||||||
checks['steeringDisengage'] += CS.steeringDisengage != self.safety.get_steering_disengage_prev()
|
checks['steeringDisengage'] += CS.steeringDisengage != self.safety.get_steering_disengage_prev()
|
||||||
|
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ class DesireHelper:
|
|||||||
def get_lane_change_direction(CS):
|
def get_lane_change_direction(CS):
|
||||||
return LaneChangeDirection.left if CS.leftBlinker else LaneChangeDirection.right
|
return LaneChangeDirection.left if CS.leftBlinker else LaneChangeDirection.right
|
||||||
|
|
||||||
def update(self, carstate, lateral_active, lane_change_prob, left_edge_detected=False, right_edge_detected=False):
|
def update(self, carstate, lateral_active, lane_change_prob):
|
||||||
self.alc.update_params()
|
self.alc.update_params()
|
||||||
self.lane_turn_controller.update_params()
|
self.lane_turn_controller.update_params()
|
||||||
v_ego = carstate.vEgo
|
v_ego = carstate.vEgo
|
||||||
@@ -88,8 +88,8 @@ class DesireHelper:
|
|||||||
((carstate.steeringTorque > 0 and self.lane_change_direction == LaneChangeDirection.left) or
|
((carstate.steeringTorque > 0 and self.lane_change_direction == LaneChangeDirection.left) or
|
||||||
(carstate.steeringTorque < 0 and self.lane_change_direction == LaneChangeDirection.right))
|
(carstate.steeringTorque < 0 and self.lane_change_direction == LaneChangeDirection.right))
|
||||||
|
|
||||||
blindspot_detected = (((carstate.leftBlindspot or left_edge_detected) and self.lane_change_direction == LaneChangeDirection.left) or
|
blindspot_detected = ((carstate.leftBlindspot and self.lane_change_direction == LaneChangeDirection.left) or
|
||||||
((carstate.rightBlindspot or right_edge_detected) and self.lane_change_direction == LaneChangeDirection.right))
|
(carstate.rightBlindspot and self.lane_change_direction == LaneChangeDirection.right))
|
||||||
|
|
||||||
self.alc.update_lane_change(blindspot_detected, carstate.brakePressed)
|
self.alc.update_lane_change(blindspot_detected, carstate.brakePressed)
|
||||||
|
|
||||||
|
|||||||
@@ -110,7 +110,7 @@ class LongitudinalPlanner(LongitudinalPlannerSP):
|
|||||||
# No change cost when user is controlling the speed, or when standstill
|
# No change cost when user is controlling the speed, or when standstill
|
||||||
prev_accel_constraint = not (reset_state or sm['carState'].standstill)
|
prev_accel_constraint = not (reset_state or sm['carState'].standstill)
|
||||||
|
|
||||||
accel_clip = [ACCEL_MIN, self.accel.get_max_accel(v_ego)]
|
accel_clip = [ACCEL_MIN, get_max_accel(v_ego)]
|
||||||
steer_angle_without_offset = sm['carState'].steeringAngleDeg - sm['liveParameters'].angleOffsetDeg
|
steer_angle_without_offset = sm['carState'].steeringAngleDeg - sm['liveParameters'].angleOffsetDeg
|
||||||
accel_clip = limit_accel_in_turns(v_ego, steer_angle_without_offset, accel_clip, self.CP)
|
accel_clip = limit_accel_in_turns(v_ego, steer_angle_without_offset, accel_clip, self.CP)
|
||||||
|
|
||||||
@@ -138,7 +138,7 @@ class LongitudinalPlanner(LongitudinalPlannerSP):
|
|||||||
|
|
||||||
self.mpc.set_weights(prev_accel_constraint, personality=sm['selfdriveState'].personality)
|
self.mpc.set_weights(prev_accel_constraint, personality=sm['selfdriveState'].personality)
|
||||||
self.mpc.set_cur_state(self.v_desired_filter.x, self.a_desired)
|
self.mpc.set_cur_state(self.v_desired_filter.x, self.a_desired)
|
||||||
self.mpc.update(self.smooth_radarstate(sm['radarState']), v_cruise, personality=sm['selfdriveState'].personality)
|
self.mpc.update(sm['radarState'], v_cruise, personality=sm['selfdriveState'].personality)
|
||||||
|
|
||||||
self.v_desired_trajectory = np.interp(CONTROL_N_T_IDX, T_IDXS_MPC, self.mpc.v_solution)
|
self.v_desired_trajectory = np.interp(CONTROL_N_T_IDX, T_IDXS_MPC, self.mpc.v_solution)
|
||||||
self.a_desired_trajectory = np.interp(CONTROL_N_T_IDX, T_IDXS_MPC, self.mpc.a_solution)
|
self.a_desired_trajectory = np.interp(CONTROL_N_T_IDX, T_IDXS_MPC, self.mpc.a_solution)
|
||||||
@@ -160,8 +160,7 @@ class LongitudinalPlanner(LongitudinalPlannerSP):
|
|||||||
output_a_target_e2e = sm['modelV2'].action.desiredAcceleration
|
output_a_target_e2e = sm['modelV2'].action.desiredAcceleration
|
||||||
output_should_stop_e2e = sm['modelV2'].action.shouldStop
|
output_should_stop_e2e = sm['modelV2'].action.shouldStop
|
||||||
|
|
||||||
is_e2e = self.is_e2e(sm)
|
if self.is_e2e(sm):
|
||||||
if is_e2e:
|
|
||||||
output_a_target = min(output_a_target_e2e, output_a_target_mpc)
|
output_a_target = min(output_a_target_e2e, output_a_target_mpc)
|
||||||
self.output_should_stop = output_should_stop_e2e or output_should_stop_mpc
|
self.output_should_stop = output_should_stop_e2e or output_should_stop_mpc
|
||||||
if output_a_target < output_a_target_mpc:
|
if output_a_target < output_a_target_mpc:
|
||||||
@@ -170,15 +169,8 @@ class LongitudinalPlanner(LongitudinalPlannerSP):
|
|||||||
output_a_target = output_a_target_mpc
|
output_a_target = output_a_target_mpc
|
||||||
self.output_should_stop = output_should_stop_mpc
|
self.output_should_stop = output_should_stop_mpc
|
||||||
|
|
||||||
# Acceleration Personality: early soft braking (never weaker than the plan). No-op when disabled.
|
for idx in range(2):
|
||||||
output_a_target = self.accel.smooth_target_accel(output_a_target, self.a_desired_trajectory, CONTROL_N_T_IDX,
|
accel_clip[idx] = np.clip(accel_clip[idx], self.prev_accel_clip[idx] - 0.05, self.prev_accel_clip[idx] + 0.05)
|
||||||
self.output_should_stop or force_slow_decel, reset=reset_state, stock_brake=is_e2e,
|
|
||||||
speed_trajectory=self.v_desired_trajectory)
|
|
||||||
|
|
||||||
# Lower (braking) bound and the ceiling's downward slew stay at the stock rate; only the ceiling's
|
|
||||||
# upward slew is tier-dependent (Acceleration Personality).
|
|
||||||
accel_clip[0] = np.clip(accel_clip[0], self.prev_accel_clip[0] - 0.05, self.prev_accel_clip[0] + 0.05)
|
|
||||||
accel_clip[1] = np.clip(accel_clip[1], self.prev_accel_clip[1] - 0.05, self.prev_accel_clip[1] + self.accel.get_rise_rate())
|
|
||||||
self.output_a_target = np.clip(output_a_target, accel_clip[0], accel_clip[1])
|
self.output_a_target = np.clip(output_a_target, accel_clip[0], accel_clip[1])
|
||||||
self.prev_accel_clip = accel_clip
|
self.prev_accel_clip = accel_clip
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ from openpilot.selfdrive.modeld.helpers import usbgpu_present, modeld_pkl_path,
|
|||||||
|
|
||||||
from openpilot.sunnypilot.livedelay.helpers import get_lat_delay
|
from openpilot.sunnypilot.livedelay.helpers import get_lat_delay
|
||||||
from openpilot.sunnypilot.modeld_v2.modeld_base import ModelStateBase
|
from openpilot.sunnypilot.modeld_v2.modeld_base import ModelStateBase
|
||||||
from openpilot.sunnypilot.selfdrive.controls.lib.relc import RoadEdgeLaneChangeController
|
|
||||||
|
|
||||||
PROCESS_NAME = "selfdrive.modeld.modeld"
|
PROCESS_NAME = "selfdrive.modeld.modeld"
|
||||||
SEND_RAW_PRED = os.getenv('SEND_RAW_PRED')
|
SEND_RAW_PRED = os.getenv('SEND_RAW_PRED')
|
||||||
@@ -224,7 +223,6 @@ def main(demo=False):
|
|||||||
prev_action = log.ModelDataV2.Action()
|
prev_action = log.ModelDataV2.Action()
|
||||||
|
|
||||||
DH = DesireHelper()
|
DH = DesireHelper()
|
||||||
RELC = RoadEdgeLaneChangeController(DH)
|
|
||||||
|
|
||||||
while True:
|
while True:
|
||||||
# Keep receiving frames until we are at least 1 frame ahead of previous extra frame
|
# Keep receiving frames until we are at least 1 frame ahead of previous extra frame
|
||||||
@@ -327,10 +325,7 @@ def main(demo=False):
|
|||||||
l_lane_change_prob = desire_state[log.Desire.laneChangeLeft]
|
l_lane_change_prob = desire_state[log.Desire.laneChangeLeft]
|
||||||
r_lane_change_prob = desire_state[log.Desire.laneChangeRight]
|
r_lane_change_prob = desire_state[log.Desire.laneChangeRight]
|
||||||
lane_change_prob = l_lane_change_prob + r_lane_change_prob
|
lane_change_prob = l_lane_change_prob + r_lane_change_prob
|
||||||
RELC.update(modelv2_send.modelV2.roadEdgeStds, modelv2_send.modelV2.laneLineProbs, v_ego, modelv2_send.modelV2.roadEdges)
|
DH.update(sm['carState'], sm['carControl'].latActive, lane_change_prob)
|
||||||
mdv2sp_send.modelDataV2SP.leftLaneChangeEdgeBlock = RELC.left_edge_detected
|
|
||||||
mdv2sp_send.modelDataV2SP.rightLaneChangeEdgeBlock = RELC.right_edge_detected
|
|
||||||
DH.update(sm['carState'], sm['carControl'].latActive, lane_change_prob, RELC.left_edge_detected, RELC.right_edge_detected)
|
|
||||||
modelv2_send.modelV2.meta.laneChangeState = DH.lane_change_state
|
modelv2_send.modelV2.meta.laneChangeState = DH.lane_change_state
|
||||||
modelv2_send.modelV2.meta.laneChangeDirection = DH.lane_change_direction
|
modelv2_send.modelV2.meta.laneChangeDirection = DH.lane_change_direction
|
||||||
mdv2sp_send.modelDataV2SP.laneTurnDirection = DH.lane_turn_direction
|
mdv2sp_send.modelDataV2SP.laneTurnDirection = DH.lane_turn_direction
|
||||||
|
|||||||
@@ -321,16 +321,9 @@ class SelfdriveD(CruiseHelper):
|
|||||||
# Handle lane change
|
# Handle lane change
|
||||||
if self.sm['modelV2'].meta.laneChangeState == LaneChangeState.preLaneChange:
|
if self.sm['modelV2'].meta.laneChangeState == LaneChangeState.preLaneChange:
|
||||||
direction = self.sm['modelV2'].meta.laneChangeDirection
|
direction = self.sm['modelV2'].meta.laneChangeDirection
|
||||||
mdv2sp = self.sm['modelDataV2SP']
|
|
||||||
|
|
||||||
if (CS.leftBlindspot and direction == LaneChangeDirection.left) or \
|
if (CS.leftBlindspot and direction == LaneChangeDirection.left) or \
|
||||||
(CS.rightBlindspot and direction == LaneChangeDirection.right):
|
(CS.rightBlindspot and direction == LaneChangeDirection.right):
|
||||||
self.events.add(EventName.laneChangeBlocked)
|
self.events.add(EventName.laneChangeBlocked)
|
||||||
|
|
||||||
elif (mdv2sp.leftLaneChangeEdgeBlock and direction == LaneChangeDirection.left) or \
|
|
||||||
(mdv2sp.rightLaneChangeEdgeBlock and direction == LaneChangeDirection.right):
|
|
||||||
self.events_sp.add(custom.OnroadEventSP.EventName.laneChangeRoadEdge)
|
|
||||||
|
|
||||||
else:
|
else:
|
||||||
if direction == LaneChangeDirection.left:
|
if direction == LaneChangeDirection.left:
|
||||||
self.events.add(EventName.preLaneChangeLeft)
|
self.events.add(EventName.preLaneChangeLeft)
|
||||||
|
|||||||
@@ -31,15 +31,6 @@ DESCRIPTIONS = {
|
|||||||
"Receive alerts to steer back into the lane when your vehicle drifts over a detected lane line " +
|
"Receive alerts to steer back into the lane when your vehicle drifts over a detected lane line " +
|
||||||
"without a turn signal activated while driving over 31 mph (50 km/h)."
|
"without a turn signal activated while driving over 31 mph (50 km/h)."
|
||||||
),
|
),
|
||||||
"AccelPersonalityEnabled": tr_noop("Enable Eco/Normal/Sport acceleration profiles, including early soft braking."),
|
|
||||||
"AccelPersonality": tr_noop(
|
|
||||||
"Eco accelerates gently and brakes early and soft; Sport accelerates briskly. " +
|
|
||||||
"Hard-braking authority is always preserved."
|
|
||||||
),
|
|
||||||
"RadarDistance": tr_noop(
|
|
||||||
"Hold a lead through brief radar flicker/dropout so sunnypilot does not lose and re-grab it, " +
|
|
||||||
"smoothing the hard/late brakes that radar drop-outs cause. Braking is never reduced below stock."
|
|
||||||
),
|
|
||||||
"AlwaysOnDM": tr_noop("Enable driver monitoring even when sunnypilot is not engaged."),
|
"AlwaysOnDM": tr_noop("Enable driver monitoring even when sunnypilot is not engaged."),
|
||||||
'RecordFront': tr_noop("Upload data from the driver facing camera and help improve the driver monitoring algorithm."),
|
'RecordFront': tr_noop("Upload data from the driver facing camera and help improve the driver monitoring algorithm."),
|
||||||
"IsMetric": tr_noop("Display speed in km/h instead of mph."),
|
"IsMetric": tr_noop("Display speed in km/h instead of mph."),
|
||||||
@@ -73,12 +64,6 @@ class TogglesLayout(Widget):
|
|||||||
"disengage_on_accelerator.png",
|
"disengage_on_accelerator.png",
|
||||||
False,
|
False,
|
||||||
),
|
),
|
||||||
"RadarDistance": (
|
|
||||||
lambda: tr("Radar Distance"),
|
|
||||||
DESCRIPTIONS["RadarDistance"],
|
|
||||||
"speed_limit.png",
|
|
||||||
False,
|
|
||||||
),
|
|
||||||
"IsLdwEnabled": (
|
"IsLdwEnabled": (
|
||||||
lambda: tr("Enable Lane Departure Warnings"),
|
lambda: tr("Enable Lane Departure Warnings"),
|
||||||
DESCRIPTIONS["IsLdwEnabled"],
|
DESCRIPTIONS["IsLdwEnabled"],
|
||||||
@@ -121,24 +106,6 @@ class TogglesLayout(Widget):
|
|||||||
icon="speed_limit.png"
|
icon="speed_limit.png"
|
||||||
)
|
)
|
||||||
|
|
||||||
self._accel_personality_enabled = toggle_item(
|
|
||||||
lambda: tr("Enable Acceleration Profiles"),
|
|
||||||
lambda: tr(DESCRIPTIONS["AccelPersonalityEnabled"]),
|
|
||||||
self._params.get_bool("AccelPersonalityEnabled"),
|
|
||||||
callback=self._set_accel_personality_enabled,
|
|
||||||
icon="speed_limit.png",
|
|
||||||
)
|
|
||||||
|
|
||||||
self._accel_personality_setting = multiple_button_item(
|
|
||||||
lambda: tr("Acceleration Profile"),
|
|
||||||
lambda: tr(DESCRIPTIONS["AccelPersonality"]),
|
|
||||||
buttons=[lambda: tr("Eco"), lambda: tr("Normal"), lambda: tr("Sport")],
|
|
||||||
button_width=300,
|
|
||||||
callback=self._set_accel_personality,
|
|
||||||
selected_index=self._params.get("AccelPersonality", return_default=True),
|
|
||||||
icon="speed_limit.png"
|
|
||||||
)
|
|
||||||
|
|
||||||
self._toggles = {}
|
self._toggles = {}
|
||||||
self._locked_toggles = set()
|
self._locked_toggles = set()
|
||||||
for param, (title, desc, icon, needs_restart) in self._toggle_defs.items():
|
for param, (title, desc, icon, needs_restart) in self._toggle_defs.items():
|
||||||
@@ -168,11 +135,9 @@ class TogglesLayout(Widget):
|
|||||||
|
|
||||||
self._toggles[param] = toggle
|
self._toggles[param] = toggle
|
||||||
|
|
||||||
# insert longitudinal + acceleration personality after NDOG toggle
|
# insert longitudinal personality after NDOG toggle
|
||||||
if param == "DisengageOnAccelerator":
|
if param == "DisengageOnAccelerator":
|
||||||
self._toggles["LongitudinalPersonality"] = self._long_personality_setting
|
self._toggles["LongitudinalPersonality"] = self._long_personality_setting
|
||||||
self._toggles["AccelPersonalityEnabled"] = self._accel_personality_enabled
|
|
||||||
self._toggles["AccelPersonality"] = self._accel_personality_setting
|
|
||||||
|
|
||||||
self._update_experimental_mode_icon()
|
self._update_experimental_mode_icon()
|
||||||
self._scroller = Scroller(list(self._toggles.values()), line_separator=True, spacing=0)
|
self._scroller = Scroller(list(self._toggles.values()), line_separator=True, spacing=0)
|
||||||
@@ -211,15 +176,11 @@ class TogglesLayout(Widget):
|
|||||||
self._toggles["ExperimentalMode"].action_item.set_enabled(True)
|
self._toggles["ExperimentalMode"].action_item.set_enabled(True)
|
||||||
self._toggles["ExperimentalMode"].set_description(e2e_description)
|
self._toggles["ExperimentalMode"].set_description(e2e_description)
|
||||||
self._long_personality_setting.action_item.set_enabled(True)
|
self._long_personality_setting.action_item.set_enabled(True)
|
||||||
self._accel_personality_enabled.action_item.set_enabled(True)
|
|
||||||
self._accel_personality_setting.action_item.set_enabled(True)
|
|
||||||
else:
|
else:
|
||||||
# no long for now
|
# no long for now
|
||||||
self._toggles["ExperimentalMode"].action_item.set_enabled(False)
|
self._toggles["ExperimentalMode"].action_item.set_enabled(False)
|
||||||
self._toggles["ExperimentalMode"].action_item.set_state(False)
|
self._toggles["ExperimentalMode"].action_item.set_state(False)
|
||||||
self._long_personality_setting.action_item.set_enabled(False)
|
self._long_personality_setting.action_item.set_enabled(False)
|
||||||
self._accel_personality_enabled.action_item.set_enabled(False)
|
|
||||||
self._accel_personality_setting.action_item.set_enabled(False)
|
|
||||||
self._params.remove("ExperimentalMode")
|
self._params.remove("ExperimentalMode")
|
||||||
|
|
||||||
unavailable = tr("Experimental mode is currently unavailable on this car since the car's stock ACC is used for longitudinal control.")
|
unavailable = tr("Experimental mode is currently unavailable on this car since the car's stock ACC is used for longitudinal control.")
|
||||||
@@ -286,9 +247,3 @@ class TogglesLayout(Widget):
|
|||||||
|
|
||||||
def _set_longitudinal_personality(self, button_index: int):
|
def _set_longitudinal_personality(self, button_index: int):
|
||||||
self._params.put("LongitudinalPersonality", button_index, block=True)
|
self._params.put("LongitudinalPersonality", button_index, block=True)
|
||||||
|
|
||||||
def _set_accel_personality(self, button_index: int):
|
|
||||||
self._params.put("AccelPersonality", button_index, block=True)
|
|
||||||
|
|
||||||
def _set_accel_personality_enabled(self, state: bool):
|
|
||||||
self._params.put_bool("AccelPersonalityEnabled", state, block=True)
|
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ from openpilot.system.ui.lib.application import gui_app
|
|||||||
|
|
||||||
if gui_app.sunnypilot_ui():
|
if gui_app.sunnypilot_ui():
|
||||||
from openpilot.selfdrive.ui.sunnypilot.mici.layouts.settings import SettingsLayoutSP as SettingsLayout
|
from openpilot.selfdrive.ui.sunnypilot.mici.layouts.settings import SettingsLayoutSP as SettingsLayout
|
||||||
from openpilot.selfdrive.ui.sunnypilot.mici.layouts.onroad import OnroadViewContainerSP as AugmentedRoadView
|
|
||||||
|
|
||||||
ONROAD_DELAY = 2.5 # seconds
|
ONROAD_DELAY = 2.5 # seconds
|
||||||
|
|
||||||
@@ -119,15 +118,13 @@ class MiciMainLayout(Scroller):
|
|||||||
|
|
||||||
# FIXME: these two pops can interrupt user interacting in the settings
|
# FIXME: these two pops can interrupt user interacting in the settings
|
||||||
if self._onroad_time_delay is not None and rl.get_time() - self._onroad_time_delay >= ONROAD_DELAY:
|
if self._onroad_time_delay is not None and rl.get_time() - self._onroad_time_delay >= ONROAD_DELAY:
|
||||||
if not gui_app.sunnypilot_ui() or self._should_auto_scroll_to_onroad():
|
gui_app.pop_widgets_to(self, lambda: self._scroll_to(self._onroad_layout))
|
||||||
gui_app.pop_widgets_to(self, lambda: self._scroll_to(self._onroad_layout))
|
|
||||||
self._onroad_time_delay = None
|
self._onroad_time_delay = None
|
||||||
|
|
||||||
# When car leaves standstill, pop nav stack and scroll to onroad
|
# When car leaves standstill, pop nav stack and scroll to onroad
|
||||||
CS = ui_state.sm["carState"]
|
CS = ui_state.sm["carState"]
|
||||||
if not CS.standstill and self._prev_standstill:
|
if not CS.standstill and self._prev_standstill:
|
||||||
if not gui_app.sunnypilot_ui() or self._should_auto_scroll_to_onroad():
|
gui_app.pop_widgets_to(self, lambda: self._scroll_to(self._onroad_layout))
|
||||||
gui_app.pop_widgets_to(self, lambda: self._scroll_to(self._onroad_layout))
|
|
||||||
self._prev_standstill = CS.standstill
|
self._prev_standstill = CS.standstill
|
||||||
|
|
||||||
def _on_interactive_timeout(self):
|
def _on_interactive_timeout(self):
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ from openpilot.system.ui.widgets.list_view import button_item
|
|||||||
|
|
||||||
from openpilot.system.ui.sunnypilot.widgets.html_render import HtmlModalSP
|
from openpilot.system.ui.sunnypilot.widgets.html_render import HtmlModalSP
|
||||||
from openpilot.system.ui.sunnypilot.widgets.list_view import toggle_item_sp
|
from openpilot.system.ui.sunnypilot.widgets.list_view import toggle_item_sp
|
||||||
|
from openpilot.selfdrive.ui.sunnypilot.layouts.settings.external_storage import external_storage_item
|
||||||
|
|
||||||
PREBUILT_PATH = os.path.join(Paths.comma_home(), "prebuilt") if PC else "/data/openpilot/prebuilt"
|
PREBUILT_PATH = os.path.join(Paths.comma_home(), "prebuilt") if PC else "/data/openpilot/prebuilt"
|
||||||
|
|
||||||
@@ -52,7 +53,11 @@ class DeveloperLayoutSP(DeveloperLayout):
|
|||||||
|
|
||||||
self.error_log_btn = button_item(tr("Error Log"), tr("VIEW"), tr("View the error log for sunnypilot crashes."), callback=self._on_error_log_clicked)
|
self.error_log_btn = button_item(tr("Error Log"), tr("VIEW"), tr("View the error log for sunnypilot crashes."), callback=self._on_error_log_clicked)
|
||||||
|
|
||||||
self.items: list = [self.show_advanced_controls, self.enable_github_runner_toggle, self.enable_copyparty_toggle, self.prebuilt_toggle, self.error_log_btn,]
|
self.external_storage = external_storage_item(tr("External Storage"), description=tr("Extend your comma device's storage by inserting a USB drive " +
|
||||||
|
"into the aux port."))
|
||||||
|
|
||||||
|
self.items: list = [self.show_advanced_controls, self.enable_github_runner_toggle, self.enable_copyparty_toggle, self.prebuilt_toggle,
|
||||||
|
self.external_storage, self.error_log_btn,]
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _on_prebuilt_toggled(state):
|
def _on_prebuilt_toggled(state):
|
||||||
|
|||||||
@@ -0,0 +1,261 @@
|
|||||||
|
"""
|
||||||
|
Copyright (c) 2021-, Haibin Wen, sunnypilot, and a number of other contributors.
|
||||||
|
|
||||||
|
This file is part of sunnypilot and is licensed under the MIT License.
|
||||||
|
See the LICENSE.md file in the root directory for more details.
|
||||||
|
"""
|
||||||
|
import pyray as rl
|
||||||
|
import threading
|
||||||
|
import subprocess
|
||||||
|
import copy
|
||||||
|
from enum import Enum
|
||||||
|
from collections.abc import Callable
|
||||||
|
|
||||||
|
from openpilot.common.params import Params
|
||||||
|
from openpilot.system.hardware import PC
|
||||||
|
from openpilot.system.ui.lib.application import gui_app, FontWeight
|
||||||
|
from openpilot.system.ui.lib.text_measure import measure_text_cached
|
||||||
|
from openpilot.system.ui.lib.multilang import tr, tr_noop
|
||||||
|
from openpilot.system.ui.widgets import DialogResult
|
||||||
|
from openpilot.system.ui.widgets.button import Button, ButtonStyle
|
||||||
|
from openpilot.system.ui.widgets.confirm_dialog import alert_dialog, ConfirmDialog
|
||||||
|
from openpilot.system.ui.widgets.list_view import (
|
||||||
|
ItemAction,
|
||||||
|
ListItem,
|
||||||
|
BUTTON_HEIGHT,
|
||||||
|
BUTTON_BORDER_RADIUS,
|
||||||
|
BUTTON_FONT_SIZE,
|
||||||
|
BUTTON_WIDTH,
|
||||||
|
)
|
||||||
|
|
||||||
|
VALUE_FONT_SIZE = 48
|
||||||
|
|
||||||
|
|
||||||
|
class ExternalStorageState(Enum):
|
||||||
|
DISABLED = tr_noop("DISABLED")
|
||||||
|
LOADING = tr_noop("LOADING")
|
||||||
|
CHECK = tr_noop("CHECK")
|
||||||
|
MOUNT = tr_noop("MOUNT")
|
||||||
|
UNMOUNT = tr_noop("UNMOUNT")
|
||||||
|
FORMAT = tr_noop("FORMAT")
|
||||||
|
|
||||||
|
|
||||||
|
class ExternalStorageAction(ItemAction):
|
||||||
|
MAX_WIDTH = 500
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
super().__init__(self.MAX_WIDTH, True)
|
||||||
|
|
||||||
|
self._params = Params()
|
||||||
|
self._error_message = ""
|
||||||
|
self._text_font = gui_app.font(FontWeight.NORMAL)
|
||||||
|
|
||||||
|
self._button = Button(
|
||||||
|
"",
|
||||||
|
click_callback=self._handle_button_click,
|
||||||
|
button_style=ButtonStyle.LIST_ACTION,
|
||||||
|
border_radius=BUTTON_BORDER_RADIUS,
|
||||||
|
font_size=BUTTON_FONT_SIZE,
|
||||||
|
)
|
||||||
|
|
||||||
|
self._value_text = ""
|
||||||
|
self._formatting = False
|
||||||
|
self._refresh_pending = False
|
||||||
|
|
||||||
|
self._state = ExternalStorageState.CHECK
|
||||||
|
self._refresh_state()
|
||||||
|
self.refresh()
|
||||||
|
|
||||||
|
def set_touch_valid_callback(self, callback):
|
||||||
|
def wrapped():
|
||||||
|
if self._state == ExternalStorageState.DISABLED:
|
||||||
|
return False
|
||||||
|
return callback()
|
||||||
|
super().set_touch_valid_callback(wrapped)
|
||||||
|
self._button.set_touch_valid_callback(wrapped)
|
||||||
|
|
||||||
|
def _run(self, cmd: str) -> bool:
|
||||||
|
return subprocess.call(["sh", "-c", cmd]) == 0
|
||||||
|
|
||||||
|
def _run_output(self, cmd: str) -> str:
|
||||||
|
try:
|
||||||
|
out = subprocess.check_output(["sh", "-c", cmd], universal_newlines=True)
|
||||||
|
return out.strip()
|
||||||
|
except Exception:
|
||||||
|
return ""
|
||||||
|
|
||||||
|
def _render(self, rect: rl.Rectangle) -> bool:
|
||||||
|
if self._error_message:
|
||||||
|
msg = copy.copy(self._error_message)
|
||||||
|
gui_app.set_modal_overlay(alert_dialog(msg))
|
||||||
|
self._error_message = ""
|
||||||
|
|
||||||
|
if self._value_text:
|
||||||
|
text_size = measure_text_cached(self._text_font, self._value_text, VALUE_FONT_SIZE)
|
||||||
|
rl.draw_text_ex(
|
||||||
|
self._text_font,
|
||||||
|
self._value_text,
|
||||||
|
(rect.x + rect.width - BUTTON_WIDTH - text_size.x - 30,
|
||||||
|
rect.y + (rect.height - text_size.y) / 2),
|
||||||
|
VALUE_FONT_SIZE,
|
||||||
|
1.0,
|
||||||
|
rl.Color(170, 170, 170, 255),
|
||||||
|
)
|
||||||
|
|
||||||
|
button_rect = rl.Rectangle(
|
||||||
|
rect.x + rect.width - BUTTON_WIDTH,
|
||||||
|
rect.y + (rect.height - BUTTON_HEIGHT) / 2,
|
||||||
|
BUTTON_WIDTH,
|
||||||
|
BUTTON_HEIGHT
|
||||||
|
)
|
||||||
|
self._button.set_rect(button_rect)
|
||||||
|
self._button.set_text(tr(self._state.value))
|
||||||
|
self._button.set_enabled(self._state not in (ExternalStorageState.LOADING,
|
||||||
|
ExternalStorageState.DISABLED))
|
||||||
|
self._button.render(button_rect)
|
||||||
|
return False
|
||||||
|
|
||||||
|
def _refresh_state(self):
|
||||||
|
if PC:
|
||||||
|
self._state = ExternalStorageState.DISABLED
|
||||||
|
self._button.set_enabled(False)
|
||||||
|
self._value_text = ""
|
||||||
|
|
||||||
|
def debounced_refresh(self):
|
||||||
|
if self._refresh_pending:
|
||||||
|
return
|
||||||
|
self._refresh_pending = True
|
||||||
|
|
||||||
|
def _timer():
|
||||||
|
import time
|
||||||
|
time.sleep(0.25)
|
||||||
|
self._refresh_pending = False
|
||||||
|
self.refresh()
|
||||||
|
|
||||||
|
threading.Thread(target=_timer, daemon=True).start()
|
||||||
|
|
||||||
|
def refresh(self):
|
||||||
|
def _work():
|
||||||
|
is_mounted = self._run("findmnt -n /mnt/external_realdata")
|
||||||
|
has_drive = self._run("lsblk -f /dev/sdg")
|
||||||
|
has_fs = self._run("lsblk -f /dev/sdg1 | grep -q ext4")
|
||||||
|
has_label = self._run("blkid /dev/sdg1 | grep -q 'LABEL=\"openpilot\"'")
|
||||||
|
|
||||||
|
info = ""
|
||||||
|
if is_mounted and has_label:
|
||||||
|
info = self._run_output(
|
||||||
|
"df -h /mnt/external_realdata | awk 'NR==2 {print $3 \"/\" $2}'"
|
||||||
|
)
|
||||||
|
|
||||||
|
def apply():
|
||||||
|
if self._formatting:
|
||||||
|
self._value_text = tr("formatting")
|
||||||
|
self._state = ExternalStorageState.FORMAT
|
||||||
|
return
|
||||||
|
|
||||||
|
if not has_drive:
|
||||||
|
self._value_text = tr("insert drive")
|
||||||
|
self._state = ExternalStorageState.CHECK
|
||||||
|
|
||||||
|
elif not has_fs or not has_label:
|
||||||
|
self._value_text = tr("needs format")
|
||||||
|
self._state = ExternalStorageState.FORMAT
|
||||||
|
|
||||||
|
elif is_mounted:
|
||||||
|
self._value_text = info
|
||||||
|
self._state = ExternalStorageState.UNMOUNT
|
||||||
|
|
||||||
|
else:
|
||||||
|
self._value_text = tr("drive detected")
|
||||||
|
self._state = ExternalStorageState.MOUNT
|
||||||
|
|
||||||
|
apply()
|
||||||
|
|
||||||
|
threading.Thread(target=_work, daemon=True).start()
|
||||||
|
|
||||||
|
def _handle_button_click(self):
|
||||||
|
st = self._state
|
||||||
|
|
||||||
|
if st == ExternalStorageState.DISABLED:
|
||||||
|
return
|
||||||
|
|
||||||
|
if st in (ExternalStorageState.CHECK, ExternalStorageState.MOUNT):
|
||||||
|
self.mount_storage()
|
||||||
|
|
||||||
|
elif st == ExternalStorageState.UNMOUNT:
|
||||||
|
self.unmount_storage()
|
||||||
|
|
||||||
|
elif st == ExternalStorageState.FORMAT:
|
||||||
|
dialog = ConfirmDialog(
|
||||||
|
tr("Are you sure you want to format this drive? This will erase all data."),
|
||||||
|
confirm_text=tr("Format"),
|
||||||
|
cancel_text=tr("Cancel"),
|
||||||
|
)
|
||||||
|
gui_app.set_modal_overlay(dialog, callback=self._confirm_format)
|
||||||
|
|
||||||
|
def _confirm_format(self, result: DialogResult):
|
||||||
|
if result == DialogResult.CONFIRM:
|
||||||
|
self.format_storage()
|
||||||
|
|
||||||
|
def mount_storage(self):
|
||||||
|
self._value_text = tr("mounting")
|
||||||
|
self._state = ExternalStorageState.LOADING
|
||||||
|
|
||||||
|
def _work():
|
||||||
|
cmd = """
|
||||||
|
sudo mount -o remount,rw / &&
|
||||||
|
sudo mkdir -p /mnt/external_realdata &&
|
||||||
|
(grep -q '/dev/sdg1 /mnt/external_realdata' /etc/fstab ||
|
||||||
|
echo '/dev/sdg1 /mnt/external_realdata ext4 defaults,nofail 0 2' >> /etc/fstab) &&
|
||||||
|
sudo systemctl daemon-reexec &&
|
||||||
|
sudo mount /mnt/external_realdata &&
|
||||||
|
sudo chown -R comma:comma /mnt/external_realdata &&
|
||||||
|
sudo chmod -R 775 /mnt/external_realdata &&
|
||||||
|
sudo mount -o remount,ro /
|
||||||
|
"""
|
||||||
|
subprocess.call(["sh", "-c", cmd])
|
||||||
|
self.debounced_refresh()
|
||||||
|
|
||||||
|
threading.Thread(target=_work, daemon=True).start()
|
||||||
|
|
||||||
|
def unmount_storage(self):
|
||||||
|
self._value_text = tr("unmounting")
|
||||||
|
self._state = ExternalStorageState.LOADING
|
||||||
|
|
||||||
|
def _work():
|
||||||
|
subprocess.call(["sh", "-c", "sudo umount /mnt/external_realdata"])
|
||||||
|
self.debounced_refresh()
|
||||||
|
|
||||||
|
threading.Thread(target=_work, daemon=True).start()
|
||||||
|
|
||||||
|
def format_storage(self):
|
||||||
|
self._formatting = True
|
||||||
|
self._value_text = tr("formatting")
|
||||||
|
self._state = ExternalStorageState.LOADING
|
||||||
|
|
||||||
|
def _work():
|
||||||
|
cmd = """
|
||||||
|
sudo wipefs -a /dev/sdg &&
|
||||||
|
sudo parted -s /dev/sdg mklabel gpt mkpart primary ext4 0% 100% &&
|
||||||
|
sudo mkfs.ext4 -F -L openpilot /dev/sdg1
|
||||||
|
"""
|
||||||
|
exitcode = subprocess.call(["sh", "-c", cmd])
|
||||||
|
|
||||||
|
def apply():
|
||||||
|
self._formatting = False
|
||||||
|
if exitcode == 0:
|
||||||
|
self.mount_storage()
|
||||||
|
else:
|
||||||
|
self._value_text = tr("needs format")
|
||||||
|
self._state = ExternalStorageState.FORMAT
|
||||||
|
|
||||||
|
apply()
|
||||||
|
|
||||||
|
threading.Thread(target=_work, daemon=True).start()
|
||||||
|
|
||||||
|
def external_storage_item(title: str | Callable[[], str], description: str | Callable[[], str]) -> ListItem:
|
||||||
|
return ListItem(
|
||||||
|
title=title,
|
||||||
|
description=description,
|
||||||
|
action_item=ExternalStorageAction()
|
||||||
|
)
|
||||||
@@ -134,6 +134,11 @@ class SteeringLayout(Widget):
|
|||||||
|
|
||||||
enforce_torque_enabled = self._torque_control_toggle.action_item.get_state()
|
enforce_torque_enabled = self._torque_control_toggle.action_item.get_state()
|
||||||
nnlc_enabled = self._nnlc_toggle.action_item.get_state()
|
nnlc_enabled = self._nnlc_toggle.action_item.get_state()
|
||||||
|
if enforce_torque_enabled and nnlc_enabled:
|
||||||
|
self._torque_control_toggle.action_item.set_state(False)
|
||||||
|
self._nnlc_toggle.action_item.set_state(False)
|
||||||
|
enforce_torque_enabled = False
|
||||||
|
nnlc_enabled = False
|
||||||
self._nnlc_toggle.action_item.set_enabled(ui_state.is_offroad() and torque_allowed and not enforce_torque_enabled)
|
self._nnlc_toggle.action_item.set_enabled(ui_state.is_offroad() and torque_allowed and not enforce_torque_enabled)
|
||||||
self._torque_control_toggle.action_item.set_enabled(ui_state.is_offroad() and torque_allowed and not nnlc_enabled)
|
self._torque_control_toggle.action_item.set_enabled(ui_state.is_offroad() and torque_allowed and not nnlc_enabled)
|
||||||
self._torque_customization_button.action_item.set_enabled(self._torque_control_toggle.action_item.get_state())
|
self._torque_customization_button.action_item.set_enabled(self._torque_control_toggle.action_item.get_state())
|
||||||
|
|||||||
@@ -51,17 +51,11 @@ class LaneChangeSettingsLayout(Widget):
|
|||||||
description=lambda: tr("Toggle to enable a delay timer for seamless lane changes when blind spot monitoring " +
|
description=lambda: tr("Toggle to enable a delay timer for seamless lane changes when blind spot monitoring " +
|
||||||
"(BSM) detects a obstructing vehicle, ensuring safe maneuvering."),
|
"(BSM) detects a obstructing vehicle, ensuring safe maneuvering."),
|
||||||
)
|
)
|
||||||
self._road_edge_block = toggle_item_sp(
|
|
||||||
param="RoadEdgeLaneChangeEnabled",
|
|
||||||
title=lambda: tr("Block Lane Change: Road Edge Detection"),
|
|
||||||
description=lambda: tr("Blocks the lane change if the model sees a road edge on your signaled side."),
|
|
||||||
)
|
|
||||||
|
|
||||||
items = [
|
items = [
|
||||||
self._lane_change_timer,
|
self._lane_change_timer,
|
||||||
LineSeparatorSP(40),
|
LineSeparatorSP(40),
|
||||||
self._bsm_delay,
|
self._bsm_delay,
|
||||||
self._road_edge_block,
|
|
||||||
]
|
]
|
||||||
|
|
||||||
return items
|
return items
|
||||||
|
|||||||
@@ -1,13 +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.
|
|
||||||
"""
|
|
||||||
|
|
||||||
from openpilot.selfdrive.ui.mici.layouts.main import MiciMainLayout
|
|
||||||
|
|
||||||
|
|
||||||
class MiciMainLayoutSP(MiciMainLayout):
|
|
||||||
def _should_auto_scroll_to_onroad(self) -> bool:
|
|
||||||
return not self._onroad_layout.is_on_info_panel()
|
|
||||||
@@ -1,63 +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.
|
|
||||||
"""
|
|
||||||
import pyray as rl
|
|
||||||
from openpilot.system.ui.lib.application import gui_app
|
|
||||||
from openpilot.selfdrive.ui.sunnypilot.mici.widgets.scroller_sp import ScrollerSP
|
|
||||||
from openpilot.selfdrive.ui.sunnypilot.mici.onroad.augmented_road_view import AugmentedRoadViewSP
|
|
||||||
from openpilot.selfdrive.ui.sunnypilot.mici.layouts.onroad_info_panel import OnroadInfoPanel
|
|
||||||
|
|
||||||
CONFIDENCE_BALL_VISIBLE_RATIO = 0.4
|
|
||||||
HORIZONTAL_SETTLE_PX = 5
|
|
||||||
HORIZONTAL_RESET_RATIO = 0.5
|
|
||||||
|
|
||||||
|
|
||||||
class OnroadViewContainerSP(ScrollerSP):
|
|
||||||
def __init__(self, bookmark_callback=None):
|
|
||||||
super().__init__(horizontal=False, snap_items=True, spacing=0, pad=0, scroll_indicator=False, edge_shadows=False)
|
|
||||||
self.road_view = AugmentedRoadViewSP(bookmark_callback=bookmark_callback)
|
|
||||||
self.onroad_info_panel = OnroadInfoPanel(bookmark_callback=bookmark_callback)
|
|
||||||
|
|
||||||
self._scroller.add_widgets([
|
|
||||||
self.road_view,
|
|
||||||
self.onroad_info_panel,
|
|
||||||
])
|
|
||||||
self._scroller.set_reset_scroll_at_show(False)
|
|
||||||
self._scroller.set_scrolling_enabled(lambda: abs(self.rect.x) < HORIZONTAL_SETTLE_PX)
|
|
||||||
|
|
||||||
for child in (self.road_view, self.onroad_info_panel):
|
|
||||||
inner_touch_valid = child._touch_valid_callback
|
|
||||||
child.set_touch_valid_callback(
|
|
||||||
lambda inner=inner_touch_valid: self._touch_valid() and (inner() if inner else True)
|
|
||||||
)
|
|
||||||
|
|
||||||
def set_rect(self, rect: rl.Rectangle):
|
|
||||||
super().set_rect(rect)
|
|
||||||
self.road_view.set_rect(rect)
|
|
||||||
self.onroad_info_panel.set_rect(rect)
|
|
||||||
return self
|
|
||||||
|
|
||||||
def is_swiping_left(self) -> bool:
|
|
||||||
return self.road_view.is_swiping_left() or self.onroad_info_panel.is_swiping_left()
|
|
||||||
|
|
||||||
def set_click_callback(self, callback) -> None:
|
|
||||||
self.road_view.set_click_callback(callback)
|
|
||||||
self.onroad_info_panel.set_click_callback(callback)
|
|
||||||
|
|
||||||
def is_on_info_panel(self) -> bool:
|
|
||||||
"""True when scrolled past halfway toward onroad_info_panel (used by main layout
|
|
||||||
to skip auto-pop-back-to-camera while user is reading the info panel)."""
|
|
||||||
return abs(self._scroller.scroll_panel.get_offset()) > self._rect.height / 2
|
|
||||||
|
|
||||||
def _render(self, rect: rl.Rectangle):
|
|
||||||
if abs(self.rect.x) > gui_app.width * HORIZONTAL_RESET_RATIO:
|
|
||||||
self._scroller.scroll_panel.set_offset(0)
|
|
||||||
|
|
||||||
vertical_offset = self._scroller.scroll_panel.get_offset()
|
|
||||||
show_ball = abs(vertical_offset) < rect.height * CONFIDENCE_BALL_VISIBLE_RATIO
|
|
||||||
self.road_view.set_show_confidence_ball(show_ball)
|
|
||||||
|
|
||||||
super()._render(rect)
|
|
||||||
@@ -1,324 +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.
|
|
||||||
"""
|
|
||||||
|
|
||||||
import pyray as rl
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from openpilot.common.constants import CV
|
|
||||||
from openpilot.common.filter_simple import FirstOrderFilter
|
|
||||||
from openpilot.selfdrive.ui.ui_state import ui_state
|
|
||||||
from openpilot.system.ui.lib.application import gui_app, FontWeight
|
|
||||||
from openpilot.system.ui.lib.multilang import tr
|
|
||||||
from openpilot.system.ui.lib.text_measure import measure_text_cached
|
|
||||||
from openpilot.system.ui.lib.application import MousePos
|
|
||||||
from openpilot.system.ui.widgets import Widget
|
|
||||||
from openpilot.selfdrive.ui.mici.onroad.alert_renderer import AlertRenderer
|
|
||||||
from openpilot.selfdrive.ui.mici.onroad.augmented_road_view import BookmarkIcon
|
|
||||||
|
|
||||||
METER_TO_KM = 0.001
|
|
||||||
METER_TO_MILE = 0.000621371
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class OnroadInfoPanelColors:
|
|
||||||
white: rl.Color = rl.WHITE
|
|
||||||
black: rl.Color = rl.BLACK
|
|
||||||
red: rl.Color = rl.Color(255, 0, 0, 255)
|
|
||||||
green: rl.Color = rl.Color(0, 255, 0, 255)
|
|
||||||
grey: rl.Color = rl.Color(190, 195, 190, 255)
|
|
||||||
light_grey: rl.Color = rl.Color(200, 200, 200, 255)
|
|
||||||
dark_grey: rl.Color = rl.Color(100, 100, 100, 255)
|
|
||||||
bg_dark: rl.Color = rl.Color(0, 0, 0, 255)
|
|
||||||
card_bg: rl.Color = rl.Color(50, 50, 50, 200)
|
|
||||||
badge_bg: rl.Color = rl.Color(60, 60, 60, 255)
|
|
||||||
|
|
||||||
|
|
||||||
COLORS = OnroadInfoPanelColors()
|
|
||||||
|
|
||||||
|
|
||||||
class OnroadInfoPanel(Widget):
|
|
||||||
def __init__(self, bookmark_callback=None):
|
|
||||||
super().__init__()
|
|
||||||
self.speed_limit: float = 0.0
|
|
||||||
self.speed_limit_valid: bool = False
|
|
||||||
self.speed_limit_offset: float = 0.0
|
|
||||||
self.next_speed_limit: float = 0.0
|
|
||||||
self.next_speed_limit_distance: float = 0.0
|
|
||||||
self.road_name: str = ""
|
|
||||||
self.current_speed: float = 0.0
|
|
||||||
self.set_speed: float = 0.0
|
|
||||||
self.cruise_enabled: bool = False
|
|
||||||
|
|
||||||
self._sign_slide: float = 0.0
|
|
||||||
|
|
||||||
self._font_bold: rl.Font = gui_app.font(FontWeight.BOLD)
|
|
||||||
self._font_semi_bold: rl.Font = gui_app.font(FontWeight.SEMI_BOLD)
|
|
||||||
self._font_medium: rl.Font = gui_app.font(FontWeight.MEDIUM)
|
|
||||||
|
|
||||||
self._marquee_offset: float = 0.0
|
|
||||||
self._marquee_direction: int = 1
|
|
||||||
self._marquee_pause_timer: float = 0.0
|
|
||||||
self._marquee_speed: float = 40.0
|
|
||||||
self._marquee_pause_duration: float = 1.5
|
|
||||||
|
|
||||||
self._alert_renderer = AlertRenderer()
|
|
||||||
self._alert_alpha_filter = FirstOrderFilter(0, 0.05, 1 / gui_app.target_fps)
|
|
||||||
|
|
||||||
self._bookmark_icon = BookmarkIcon(bookmark_callback)
|
|
||||||
|
|
||||||
def is_swiping_left(self) -> bool:
|
|
||||||
return self._bookmark_icon.is_swiping_left()
|
|
||||||
|
|
||||||
def _handle_mouse_release(self, mouse_pos: MousePos) -> None:
|
|
||||||
# Mirror stock AugmentedRoadView: suppress click while bookmark gesture active
|
|
||||||
if not self._bookmark_icon.interacting():
|
|
||||||
super()._handle_mouse_release(mouse_pos)
|
|
||||||
|
|
||||||
def _update_state(self) -> None:
|
|
||||||
sm = ui_state.sm
|
|
||||||
speed_conv = CV.MS_TO_KPH if ui_state.is_metric else CV.MS_TO_MPH
|
|
||||||
|
|
||||||
if sm.valid["longitudinalPlanSP"]:
|
|
||||||
lp_sp = sm["longitudinalPlanSP"]
|
|
||||||
resolver = lp_sp.speedLimit.resolver
|
|
||||||
self.speed_limit = resolver.speedLimit * speed_conv
|
|
||||||
self.speed_limit_valid = resolver.speedLimitValid
|
|
||||||
self.speed_limit_offset = resolver.speedLimitOffset * speed_conv
|
|
||||||
|
|
||||||
if sm.valid["liveMapDataSP"]:
|
|
||||||
lmd = sm["liveMapDataSP"]
|
|
||||||
self.next_speed_limit = lmd.speedLimitAhead * speed_conv
|
|
||||||
self.next_speed_limit_distance = lmd.speedLimitAheadDistance
|
|
||||||
self.road_name = lmd.roadName
|
|
||||||
|
|
||||||
if sm.updated["carState"]:
|
|
||||||
self.current_speed = sm["carState"].vEgo * speed_conv
|
|
||||||
|
|
||||||
if sm.valid["carState"] and sm.valid["controlsState"]:
|
|
||||||
self.cruise_enabled = sm["carState"].cruiseState.enabled
|
|
||||||
v_cruise_cluster = sm["carState"].vCruiseCluster
|
|
||||||
set_speed_kph = sm["controlsState"].vCruiseDEPRECATED if v_cruise_cluster == 0.0 else v_cruise_cluster
|
|
||||||
self.set_speed = set_speed_kph * (METER_TO_MILE / METER_TO_KM) if not ui_state.is_metric else set_speed_kph
|
|
||||||
|
|
||||||
def _render(self, rect: rl.Rectangle) -> None:
|
|
||||||
self._update_state()
|
|
||||||
|
|
||||||
rl.draw_rectangle(int(rect.x), int(rect.y), int(rect.width), int(rect.height), COLORS.bg_dark)
|
|
||||||
margin = 20
|
|
||||||
mid_y = rect.y + rect.height / 2
|
|
||||||
|
|
||||||
left_x = rect.x + margin
|
|
||||||
|
|
||||||
if self.cruise_enabled:
|
|
||||||
unit = tr("MAX")
|
|
||||||
display_speed = self.set_speed
|
|
||||||
else:
|
|
||||||
unit = tr("km/h") if ui_state.is_metric else tr("MPH")
|
|
||||||
display_speed = self.current_speed
|
|
||||||
|
|
||||||
speed_val = str(round(display_speed))
|
|
||||||
if self.speed_limit_valid and display_speed > self.speed_limit:
|
|
||||||
speed_color = COLORS.red
|
|
||||||
else:
|
|
||||||
speed_color = COLORS.white
|
|
||||||
|
|
||||||
rl.draw_text_ex(self._font_semi_bold, unit, rl.Vector2(left_x, mid_y - 95), 38, 0, COLORS.grey)
|
|
||||||
rl.draw_text_ex(self._font_bold, speed_val, rl.Vector2(left_x, mid_y - 60), 110, 0, speed_color)
|
|
||||||
|
|
||||||
sign_width = 135
|
|
||||||
sign_height = 135 if ui_state.is_metric else 175
|
|
||||||
|
|
||||||
has_next = self.next_speed_limit > 0 and self.next_speed_limit != self.speed_limit
|
|
||||||
target_slide = 1.0 if has_next else 0.0
|
|
||||||
slide_speed = 3.0 * rl.get_frame_time()
|
|
||||||
if self._sign_slide < target_slide:
|
|
||||||
self._sign_slide = min(self._sign_slide + slide_speed, target_slide)
|
|
||||||
elif self._sign_slide > target_slide:
|
|
||||||
self._sign_slide = max(self._sign_slide - slide_speed, target_slide)
|
|
||||||
|
|
||||||
next_w = int(sign_width * 0.7)
|
|
||||||
next_h = int(sign_height * 0.7)
|
|
||||||
next_peek = int(next_w * 0.85) + 5
|
|
||||||
centered_x = rect.x + rect.width - sign_width - margin
|
|
||||||
shifted_x = rect.x + rect.width - sign_width - margin - next_peek
|
|
||||||
sign_x = centered_x + (shifted_x - centered_x) * self._sign_slide
|
|
||||||
sign_y = rect.y + (rect.height - sign_height) / 2
|
|
||||||
|
|
||||||
road_y = mid_y + 55
|
|
||||||
road_width = sign_x - left_x - margin
|
|
||||||
self._draw_road_name(left_x, road_y, road_width)
|
|
||||||
|
|
||||||
if has_next and self._sign_slide > 0.01:
|
|
||||||
next_val = str(round(self.next_speed_limit))
|
|
||||||
dist_str = self._format_distance(self.next_speed_limit_distance)
|
|
||||||
next_x = sign_x + sign_width - int(next_w * 0.15)
|
|
||||||
next_y = sign_y + (sign_height - next_h) / 2
|
|
||||||
|
|
||||||
next_speed_color = COLORS.black
|
|
||||||
if ui_state.is_metric:
|
|
||||||
self._draw_vienna_sign(next_x, next_y, next_w, next_h, next_val, next_speed_color, is_upcoming=True)
|
|
||||||
else:
|
|
||||||
self._draw_mutcd_sign(next_x, next_y, next_w, next_h, next_val, next_speed_color, is_upcoming=True)
|
|
||||||
|
|
||||||
dist_size = measure_text_cached(self._font_medium, dist_str, 24)
|
|
||||||
rl.draw_text_ex(self._font_medium, dist_str, rl.Vector2(next_x + next_w / 2 - dist_size.x / 2, next_y + next_h + 4), 24, 0, COLORS.grey)
|
|
||||||
|
|
||||||
self._draw_speed_limit_sign(sign_x, sign_y, sign_width, sign_height)
|
|
||||||
|
|
||||||
if self.speed_limit_offset != 0 and self.speed_limit_valid:
|
|
||||||
offset_val = str(abs(round(self.speed_limit_offset)))
|
|
||||||
badge_sz = 42
|
|
||||||
badge_x = sign_x + sign_width - badge_sz * 0.85
|
|
||||||
badge_y = sign_y - badge_sz * 0.25
|
|
||||||
|
|
||||||
if ui_state.is_metric:
|
|
||||||
badge_r = badge_sz / 2
|
|
||||||
badge_cx = badge_x + badge_r
|
|
||||||
badge_cy = badge_y + badge_r
|
|
||||||
rl.draw_circle(int(badge_cx), int(badge_cy), badge_r + 2, COLORS.dark_grey)
|
|
||||||
rl.draw_circle(int(badge_cx), int(badge_cy), badge_r, COLORS.badge_bg)
|
|
||||||
self._draw_text_centered(self._font_bold, offset_val, 24, rl.Vector2(badge_cx, badge_cy), COLORS.white)
|
|
||||||
else:
|
|
||||||
mutcd_badge_x = sign_x + sign_width - badge_sz * 0.65
|
|
||||||
mutcd_badge_y = sign_y - badge_sz * 0.50
|
|
||||||
badge_rect = rl.Rectangle(mutcd_badge_x, mutcd_badge_y, badge_sz, badge_sz)
|
|
||||||
rl.draw_rectangle_rounded(badge_rect, 0.25, 10, COLORS.badge_bg)
|
|
||||||
rl.draw_rectangle_rounded_lines_ex(badge_rect, 0.25, 10, 2, COLORS.dark_grey)
|
|
||||||
self._draw_text_centered(self._font_bold, offset_val, 24, rl.Vector2(mutcd_badge_x + badge_sz / 2, mutcd_badge_y + badge_sz / 2), COLORS.white)
|
|
||||||
|
|
||||||
# SCC
|
|
||||||
speed_size = measure_text_cached(self._font_bold, speed_val, 110)
|
|
||||||
scc_x = left_x + speed_size.x + 30
|
|
||||||
scc_y = mid_y - 50
|
|
||||||
self._draw_scc_icons(scc_x, scc_y)
|
|
||||||
|
|
||||||
self._bookmark_icon.render(rect)
|
|
||||||
|
|
||||||
if ui_state.started:
|
|
||||||
alert_obj, no_alert = self._alert_renderer.will_render()
|
|
||||||
self._alert_alpha_filter.update(0 if no_alert else 1)
|
|
||||||
alpha = self._alert_alpha_filter.x
|
|
||||||
if alpha > 0.01:
|
|
||||||
rl.draw_rectangle(int(rect.x), int(rect.y), int(rect.width), int(rect.height), rl.Color(0, 0, 0, int(150 * alpha)))
|
|
||||||
self._alert_renderer.render(rect)
|
|
||||||
|
|
||||||
def _draw_scc_icons(self, x: float, y: float) -> None:
|
|
||||||
sm = ui_state.sm
|
|
||||||
if not sm.valid["longitudinalPlanSP"]:
|
|
||||||
return
|
|
||||||
scc = sm["longitudinalPlanSP"].smartCruiseControl
|
|
||||||
|
|
||||||
box_w, box_h = 100, 36
|
|
||||||
gap = 6
|
|
||||||
drawn = 0
|
|
||||||
|
|
||||||
for label, active in [("SCC-V", scc.vision.active), ("SCC-M", scc.map.active)]:
|
|
||||||
if not active:
|
|
||||||
continue
|
|
||||||
bx = x
|
|
||||||
by = y + drawn * (box_h + gap)
|
|
||||||
rl.draw_rectangle_rounded(rl.Rectangle(bx, by, box_w, box_h), 0.3, 10, COLORS.green)
|
|
||||||
self._draw_text_centered(self._font_bold, label, 20, rl.Vector2(bx + box_w / 2, by + box_h / 2), COLORS.black)
|
|
||||||
drawn += 1
|
|
||||||
|
|
||||||
def _draw_speed_limit_sign(self, x: float, y: float, sign_width: float, sign_height: float) -> None:
|
|
||||||
speed_str = str(round(self.speed_limit)) if self.speed_limit_valid and self.speed_limit > 0 else "--"
|
|
||||||
speed_color = COLORS.black if not self.speed_limit_valid or self.current_speed <= self.speed_limit else COLORS.red
|
|
||||||
|
|
||||||
if ui_state.is_metric:
|
|
||||||
self._draw_vienna_sign(x, y, sign_width, sign_height, speed_str, speed_color, is_upcoming=False)
|
|
||||||
else:
|
|
||||||
self._draw_mutcd_sign(x, y, sign_width, sign_height, speed_str, speed_color, is_upcoming=False)
|
|
||||||
|
|
||||||
def _draw_road_name(self, x: float, y: float, width: float) -> None:
|
|
||||||
road_display = self.road_name if self.road_name else "--"
|
|
||||||
font_size = 30
|
|
||||||
road_size = measure_text_cached(self._font_semi_bold, road_display, font_size)
|
|
||||||
text_width = road_size.x
|
|
||||||
|
|
||||||
if text_width <= width:
|
|
||||||
self._marquee_offset = 0.0
|
|
||||||
self._marquee_direction = 1
|
|
||||||
self._marquee_pause_timer = 0.0
|
|
||||||
rl.draw_text_ex(self._font_semi_bold, road_display, rl.Vector2(x, y), font_size, 0, COLORS.white)
|
|
||||||
else:
|
|
||||||
overflow = text_width - width
|
|
||||||
dt = rl.get_frame_time()
|
|
||||||
|
|
||||||
if self._marquee_pause_timer > 0:
|
|
||||||
self._marquee_pause_timer -= dt
|
|
||||||
else:
|
|
||||||
self._marquee_offset += self._marquee_direction * self._marquee_speed * dt
|
|
||||||
|
|
||||||
if self._marquee_offset >= overflow:
|
|
||||||
self._marquee_offset = overflow
|
|
||||||
self._marquee_direction = -1
|
|
||||||
self._marquee_pause_timer = self._marquee_pause_duration
|
|
||||||
elif self._marquee_offset <= 0:
|
|
||||||
self._marquee_offset = 0
|
|
||||||
self._marquee_direction = 1
|
|
||||||
self._marquee_pause_timer = self._marquee_pause_duration
|
|
||||||
|
|
||||||
rl.begin_scissor_mode(int(x), int(y), int(width), int(road_size.y + 4))
|
|
||||||
text_pos = rl.Vector2(x - self._marquee_offset, y)
|
|
||||||
rl.draw_text_ex(self._font_semi_bold, road_display, text_pos, font_size, 0, COLORS.white)
|
|
||||||
rl.end_scissor_mode()
|
|
||||||
|
|
||||||
def _draw_vienna_sign(self, x: float, y: float, width: float, height: float, speed_str: str, speed_color: rl.Color, is_upcoming: bool = False) -> None:
|
|
||||||
center = rl.Vector2(x + width / 2, y + height / 2)
|
|
||||||
outer_radius = min(width, height) / 2
|
|
||||||
|
|
||||||
rl.draw_circle_v(center, outer_radius, COLORS.white)
|
|
||||||
ring_width = outer_radius * 0.18
|
|
||||||
rl.draw_ring(center, outer_radius - ring_width, outer_radius, 0, 360, 36, COLORS.red)
|
|
||||||
|
|
||||||
font_size = outer_radius * (0.7 if len(speed_str) >= 3 else 0.9)
|
|
||||||
text_size = measure_text_cached(self._font_bold, speed_str, int(font_size))
|
|
||||||
text_pos = rl.Vector2(center.x - text_size.x / 2, center.y - text_size.y / 2)
|
|
||||||
rl.draw_text_ex(self._font_bold, speed_str, text_pos, font_size, 0, speed_color)
|
|
||||||
|
|
||||||
def _draw_mutcd_sign(self, x: float, y: float, width: float, height: float, speed_str: str, speed_color: rl.Color, is_upcoming: bool = False) -> None:
|
|
||||||
sign_rect = rl.Rectangle(x, y, width, height)
|
|
||||||
rl.draw_rectangle_rounded(sign_rect, 0.35, 10, COLORS.white)
|
|
||||||
|
|
||||||
inset = max(4, width * 0.05)
|
|
||||||
inner_rect = rl.Rectangle(x + inset, y + inset, width - inset * 2, height - inset * 2)
|
|
||||||
outer_radius = 0.35 * width / 2.0
|
|
||||||
inner_radius = outer_radius - inset
|
|
||||||
inner_roundness = inner_radius / (inner_rect.width / 2.0)
|
|
||||||
rl.draw_rectangle_rounded_lines_ex(inner_rect, inner_roundness, 10, 3, COLORS.black)
|
|
||||||
|
|
||||||
mid_x = x + width / 2
|
|
||||||
label_size = max(18, int(width * 0.26))
|
|
||||||
if is_upcoming:
|
|
||||||
self._draw_text_centered(self._font_bold, tr("AHEAD"), label_size, rl.Vector2(mid_x, y + height * 0.27), COLORS.black)
|
|
||||||
else:
|
|
||||||
self._draw_text_centered(self._font_bold, tr("SPEED"), label_size, rl.Vector2(mid_x, y + height * 0.20), COLORS.black)
|
|
||||||
self._draw_text_centered(self._font_bold, tr("LIMIT"), label_size, rl.Vector2(mid_x, y + height * 0.40), COLORS.black)
|
|
||||||
|
|
||||||
speed_font_size = int(width * 0.52) if len(speed_str) >= 3 else int(width * 0.62)
|
|
||||||
self._draw_text_centered(self._font_bold, speed_str, speed_font_size, rl.Vector2(mid_x, y + height * 0.72), speed_color)
|
|
||||||
|
|
||||||
def _draw_text_centered(self, font, text, size, pos_center, color):
|
|
||||||
sz = measure_text_cached(font, text, size)
|
|
||||||
rl.draw_text_ex(font, text, rl.Vector2(pos_center.x - sz.x / 2, pos_center.y - sz.y / 2), size, 0, color)
|
|
||||||
|
|
||||||
def _format_distance(self, distance: float) -> str:
|
|
||||||
if ui_state.is_metric:
|
|
||||||
if distance < 50:
|
|
||||||
return tr("Near")
|
|
||||||
if distance >= 1000:
|
|
||||||
return f"{distance * METER_TO_KM:.1f}" + tr("km")
|
|
||||||
if distance < 200:
|
|
||||||
rounded = max(10, int(distance / 10) * 10)
|
|
||||||
else:
|
|
||||||
rounded = int(distance / 100) * 100
|
|
||||||
return str(rounded) + tr("m")
|
|
||||||
else:
|
|
||||||
distance_mi = distance * METER_TO_MILE
|
|
||||||
if distance_mi < 0.1:
|
|
||||||
return tr("Near")
|
|
||||||
return f"{distance_mi:.1f}" + tr("mi")
|
|
||||||
@@ -1,30 +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.
|
|
||||||
"""
|
|
||||||
|
|
||||||
import pyray as rl
|
|
||||||
from openpilot.selfdrive.ui.mici.onroad.augmented_road_view import AugmentedRoadView
|
|
||||||
|
|
||||||
|
|
||||||
class _SuppressedConfidenceBall:
|
|
||||||
def render(self, *_):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class AugmentedRoadViewSP(AugmentedRoadView):
|
|
||||||
def __init__(self, **kwargs):
|
|
||||||
super().__init__(**kwargs)
|
|
||||||
self._show_confidence_ball: bool = True
|
|
||||||
self._real_confidence_ball = self._confidence_ball
|
|
||||||
self._confidence_ball = _SuppressedConfidenceBall()
|
|
||||||
|
|
||||||
def set_show_confidence_ball(self, show: bool) -> None:
|
|
||||||
self._show_confidence_ball = show
|
|
||||||
|
|
||||||
def _render(self, rect: rl.Rectangle) -> None:
|
|
||||||
super()._render(rect)
|
|
||||||
if self._show_confidence_ball:
|
|
||||||
self._real_confidence_ball.render(self.rect)
|
|
||||||
@@ -1,34 +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.
|
|
||||||
"""
|
|
||||||
|
|
||||||
import pyray as rl
|
|
||||||
from openpilot.system.ui.lib.application import MouseEvent
|
|
||||||
from openpilot.system.ui.lib.scroll_panel2 import GuiScrollPanel2, ScrollState
|
|
||||||
|
|
||||||
|
|
||||||
class GuiScrollPanel2SP(GuiScrollPanel2):
|
|
||||||
"""Reject orthogonal-dominant drags so nested scrollers (outer horizontal +
|
|
||||||
inner vertical) don't both engage on a slightly diagonal swipe.
|
|
||||||
|
|
||||||
Implemented as a post-super state rollback rather than reimplementing the
|
|
||||||
PRESSED state machine — keeps stock behaviour authoritative."""
|
|
||||||
|
|
||||||
def _handle_mouse_event(self, mouse_event: MouseEvent, bounds: rl.Rectangle, bounds_size: float,
|
|
||||||
content_size: float) -> None:
|
|
||||||
pre_state = self._state
|
|
||||||
super()._handle_mouse_event(mouse_event, bounds, bounds_size, content_size)
|
|
||||||
|
|
||||||
if self._state == ScrollState.MANUAL_SCROLL and pre_state == ScrollState.PRESSED and \
|
|
||||||
self._initial_click_event is not None:
|
|
||||||
diff_x = abs(mouse_event.pos.x - self._initial_click_event.pos.x)
|
|
||||||
diff_y = abs(mouse_event.pos.y - self._initial_click_event.pos.y)
|
|
||||||
along = diff_x if self._horizontal else diff_y
|
|
||||||
anti = diff_y if self._horizontal else diff_x
|
|
||||||
if anti > along:
|
|
||||||
self._state = ScrollState.STEADY
|
|
||||||
self._velocity = 0.0
|
|
||||||
self._velocity_buffer.clear()
|
|
||||||
@@ -1,16 +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.
|
|
||||||
"""
|
|
||||||
|
|
||||||
from openpilot.system.ui.widgets.scroller import Scroller
|
|
||||||
from openpilot.selfdrive.ui.sunnypilot.mici.widgets.scroll_panel_sp import GuiScrollPanel2SP
|
|
||||||
|
|
||||||
|
|
||||||
class ScrollerSP(Scroller):
|
|
||||||
def __init__(self, **kwargs):
|
|
||||||
super().__init__(**kwargs)
|
|
||||||
inner = self._scroller
|
|
||||||
inner.scroll_panel = GuiScrollPanel2SP(inner._horizontal, handle_out_of_bounds=not inner._snap_items)
|
|
||||||
@@ -179,6 +179,10 @@ class UIStateSP:
|
|||||||
CP = self.CP
|
CP = self.CP
|
||||||
|
|
||||||
if CP is not None:
|
if CP is not None:
|
||||||
|
if self.params.get_bool("EnforceTorqueControl") and self.params.get_bool("NeuralNetworkLateralControl"):
|
||||||
|
self.params.put_bool("EnforceTorqueControl", False, block=True)
|
||||||
|
self.params.put_bool("NeuralNetworkLateralControl", False, block=True)
|
||||||
|
|
||||||
# Angle steering: no torque-based lateral controls
|
# Angle steering: no torque-based lateral controls
|
||||||
if CP.steerControlType == car.CarParams.SteerControlType.angle:
|
if CP.steerControlType == car.CarParams.SteerControlType.angle:
|
||||||
self.params.remove("EnforceTorqueControl")
|
self.params.remove("EnforceTorqueControl")
|
||||||
|
|||||||
@@ -10,9 +10,6 @@ from openpilot.selfdrive.ui.layouts.main import MainLayout
|
|||||||
from openpilot.selfdrive.ui.mici.layouts.main import MiciMainLayout
|
from openpilot.selfdrive.ui.mici.layouts.main import MiciMainLayout
|
||||||
from openpilot.selfdrive.ui.ui_state import ui_state
|
from openpilot.selfdrive.ui.ui_state import ui_state
|
||||||
|
|
||||||
if gui_app.sunnypilot_ui():
|
|
||||||
from openpilot.selfdrive.ui.sunnypilot.mici.layouts.main import MiciMainLayoutSP as MiciMainLayout
|
|
||||||
|
|
||||||
BIG_UI = gui_app.big_ui()
|
BIG_UI = gui_app.big_ui()
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -188,7 +188,7 @@ def make_supercombo_input_queues(input_shapes, frame_skip, device):
|
|||||||
n_frames = img_shape[1] // 6
|
n_frames = img_shape[1] // 6
|
||||||
img_buf_shape = (frame_skip * (n_frames - 1) + 1, 6, img_shape[2], img_shape[3])
|
img_buf_shape = (frame_skip * (n_frames - 1) + 1, 6, img_shape[2], img_shape[3])
|
||||||
|
|
||||||
npy_keys = {}
|
numpy_keys = {}
|
||||||
queue_keys = {}
|
queue_keys = {}
|
||||||
|
|
||||||
for key, shape in input_shapes.items():
|
for key, shape in input_shapes.items():
|
||||||
@@ -196,7 +196,7 @@ def make_supercombo_input_queues(input_shapes, frame_skip, device):
|
|||||||
continue
|
continue
|
||||||
if len(shape) == 3 and shape[1] > 1:
|
if len(shape) == 3 and shape[1] > 1:
|
||||||
if key.startswith('desire'):
|
if key.startswith('desire'):
|
||||||
npy_keys[key] = np.zeros(shape[2], dtype=np.float32)
|
numpy_keys[key] = np.zeros(shape[2], dtype=np.float32)
|
||||||
queue_keys[f'{key}_q'] = Tensor(
|
queue_keys[f'{key}_q'] = Tensor(
|
||||||
np.zeros((frame_skip * shape[1], shape[0], shape[2]), dtype=np.float32),
|
np.zeros((frame_skip * shape[1], shape[0], shape[2]), dtype=np.float32),
|
||||||
device=device).contiguous().realize()
|
device=device).contiguous().realize()
|
||||||
@@ -205,24 +205,24 @@ def make_supercombo_input_queues(input_shapes, frame_skip, device):
|
|||||||
np.zeros((frame_skip * (shape[1] - 1) + 1, shape[0], shape[2]), dtype=np.float32),
|
np.zeros((frame_skip * (shape[1] - 1) + 1, shape[0], shape[2]), dtype=np.float32),
|
||||||
device=device).contiguous().realize()
|
device=device).contiguous().realize()
|
||||||
else:
|
else:
|
||||||
npy_keys[key] = np.zeros(shape, dtype=np.float32)
|
numpy_keys[key] = np.zeros(shape, dtype=np.float32)
|
||||||
elif len(shape) == 2:
|
elif len(shape) == 2:
|
||||||
npy_keys[key] = np.zeros(shape, dtype=np.float32)
|
numpy_keys[key] = np.zeros(shape, dtype=np.float32)
|
||||||
|
|
||||||
if 'traffic_convention' not in npy_keys:
|
if 'traffic_convention' not in numpy_keys:
|
||||||
tc_shape = input_shapes.get('traffic_convention', (1, 2))
|
tc_shape = input_shapes.get('traffic_convention', (1, 2))
|
||||||
npy_keys['traffic_convention'] = np.zeros(tc_shape, dtype=np.float32)
|
numpy_keys['traffic_convention'] = np.zeros(tc_shape, dtype=np.float32)
|
||||||
|
|
||||||
npy_keys['tfm'] = np.zeros((3, 3), dtype=np.float32)
|
numpy_keys['tfm'] = np.zeros((3, 3), dtype=np.float32)
|
||||||
npy_keys['big_tfm'] = np.zeros((3, 3), dtype=np.float32)
|
numpy_keys['big_tfm'] = np.zeros((3, 3), dtype=np.float32)
|
||||||
|
|
||||||
input_queues = {
|
input_queues = {
|
||||||
'img_q': Tensor(np.zeros(img_buf_shape, dtype=np.uint8), device=device).contiguous().realize(),
|
'img_q': Tensor(np.zeros(img_buf_shape, dtype=np.uint8), device=device).contiguous().realize(),
|
||||||
'big_img_q': Tensor(np.zeros(img_buf_shape, dtype=np.uint8), device=device).contiguous().realize(),
|
'big_img_q': Tensor(np.zeros(img_buf_shape, dtype=np.uint8), device=device).contiguous().realize(),
|
||||||
**queue_keys,
|
**queue_keys,
|
||||||
**{k: Tensor(v, device='NPY').realize() for k, v in npy_keys.items()},
|
**{k: Tensor(v, device='NPY').realize() for k, v in numpy_keys.items()},
|
||||||
}
|
}
|
||||||
return input_queues, npy_keys
|
return input_queues, numpy_keys
|
||||||
|
|
||||||
|
|
||||||
def make_run_supercombo(model_runner, nv12: NV12Frame, model_w, model_h,
|
def make_run_supercombo(model_runner, nv12: NV12Frame, model_w, model_h,
|
||||||
|
|||||||
@@ -40,7 +40,6 @@ from openpilot.sunnypilot.modeld_v2.camera_offset_helper import CameraOffsetHelp
|
|||||||
from openpilot.sunnypilot.livedelay.helpers import get_lat_delay
|
from openpilot.sunnypilot.livedelay.helpers import get_lat_delay
|
||||||
from openpilot.sunnypilot.modeld_v2.modeld_base import ModelStateBase
|
from openpilot.sunnypilot.modeld_v2.modeld_base import ModelStateBase
|
||||||
from openpilot.sunnypilot.models.helpers import get_active_bundle
|
from openpilot.sunnypilot.models.helpers import get_active_bundle
|
||||||
from openpilot.sunnypilot.selfdrive.controls.lib.relc import RoadEdgeLaneChangeController
|
|
||||||
|
|
||||||
PROCESS_NAME = "selfdrive.modeld.modeld_tinygrad"
|
PROCESS_NAME = "selfdrive.modeld.modeld_tinygrad"
|
||||||
|
|
||||||
@@ -63,11 +62,6 @@ def _find_driving_pkl(bundle):
|
|||||||
if _pkl_exists(pkl_path):
|
if _pkl_exists(pkl_path):
|
||||||
return pkl_path
|
return pkl_path
|
||||||
|
|
||||||
fallback = os.path.join(model_root, 'driving_tinygrad.pkl')
|
|
||||||
if _pkl_exists(fallback):
|
|
||||||
return fallback
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
class FrameMeta:
|
class FrameMeta:
|
||||||
frame_id: int = 0
|
frame_id: int = 0
|
||||||
@@ -126,7 +120,7 @@ class ModelState(ModelStateBase):
|
|||||||
self._vision_input_names = [k for k in model_metadata['input_shapes'] if 'img' in k]
|
self._vision_input_names = [k for k in model_metadata['input_shapes'] if 'img' in k]
|
||||||
from openpilot.sunnypilot.modeld_v2.compile_modeld import make_supercombo_input_queues
|
from openpilot.sunnypilot.modeld_v2.compile_modeld import make_supercombo_input_queues
|
||||||
frame_skip = derive_frame_skip({}, model_metadata['input_shapes'])
|
frame_skip = derive_frame_skip({}, model_metadata['input_shapes'])
|
||||||
self.input_queues, self.npy = make_supercombo_input_queues(model_metadata['input_shapes'], frame_skip, device=self.DEV)
|
self.input_queues, self.numpy_inputs = make_supercombo_input_queues(model_metadata['input_shapes'], frame_skip, device=self.DEV)
|
||||||
else:
|
else:
|
||||||
vision_metadata = metadata['vision']
|
vision_metadata = metadata['vision']
|
||||||
policy_keys = [k for k in metadata if k != 'vision']
|
policy_keys = [k for k in metadata if k != 'vision']
|
||||||
@@ -144,7 +138,7 @@ class ModelState(ModelStateBase):
|
|||||||
policy_input_shapes = first_policy_metadata['input_shapes']
|
policy_input_shapes = first_policy_metadata['input_shapes']
|
||||||
self._vision_input_names = [k for k in vision_input_shapes if 'img' in k]
|
self._vision_input_names = [k for k in vision_input_shapes if 'img' in k]
|
||||||
frame_skip = derive_frame_skip(vision_input_shapes, policy_input_shapes)
|
frame_skip = derive_frame_skip(vision_input_shapes, policy_input_shapes)
|
||||||
self.input_queues, self.npy = make_split_input_queues(vision_input_shapes, policy_input_shapes, frame_skip, device=self.DEV)
|
self.input_queues, self.numpy_inputs = make_split_input_queues(vision_input_shapes, policy_input_shapes, frame_skip, device=self.DEV)
|
||||||
|
|
||||||
from openpilot.sunnypilot.modeld_v2.parse_model_outputs_split import Parser as SplitParser
|
from openpilot.sunnypilot.modeld_v2.parse_model_outputs_split import Parser as SplitParser
|
||||||
from openpilot.sunnypilot.modeld_v2.parse_model_outputs import Parser as CombinedParser
|
from openpilot.sunnypilot.modeld_v2.parse_model_outputs import Parser as CombinedParser
|
||||||
@@ -184,7 +178,7 @@ class ModelState(ModelStateBase):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def desire_key(self) -> str:
|
def desire_key(self) -> str:
|
||||||
return next(k for k in self.npy if k.startswith('desire'))
|
return next(k for k in self.numpy_inputs if k.startswith('desire'))
|
||||||
|
|
||||||
def run(self, bufs: dict[str, VisionBuf], transforms: dict[str, np.ndarray],
|
def run(self, bufs: dict[str, VisionBuf], transforms: dict[str, np.ndarray],
|
||||||
inputs: dict[str, np.ndarray], prepare_only: bool) -> dict[str, np.ndarray] | None:
|
inputs: dict[str, np.ndarray], prepare_only: bool) -> dict[str, np.ndarray] | None:
|
||||||
@@ -200,16 +194,16 @@ class ModelState(ModelStateBase):
|
|||||||
|
|
||||||
desire_key = self.desire_key
|
desire_key = self.desire_key
|
||||||
inputs[desire_key][0] = 0
|
inputs[desire_key][0] = 0
|
||||||
self.npy[desire_key][:] = np.where(inputs[desire_key] - self.prev_desire > .99, inputs[desire_key], 0)
|
self.numpy_inputs[desire_key][:] = np.where(inputs[desire_key] - self.prev_desire > .99, inputs[desire_key], 0)
|
||||||
self.prev_desire[:] = inputs[desire_key]
|
self.prev_desire[:] = inputs[desire_key]
|
||||||
for key in ('traffic_convention', 'lateral_control_params'):
|
for key in ('traffic_convention', 'lateral_control_params'):
|
||||||
if key in self.npy and key in inputs:
|
if key in self.numpy_inputs and key in inputs:
|
||||||
self.npy[key][:] = inputs[key]
|
self.numpy_inputs[key][:] = inputs[key]
|
||||||
|
|
||||||
road_key = next(n for n in bufs if 'big' not in n)
|
road_key = next(n for n in bufs if 'big' not in n)
|
||||||
wide_key = next(n for n in bufs if 'big' in n)
|
wide_key = next(n for n in bufs if 'big' in n)
|
||||||
self.npy['tfm'][:, :] = transforms[road_key].reshape(3, 3)
|
self.numpy_inputs['tfm'][:, :] = transforms[road_key].reshape(3, 3)
|
||||||
self.npy['big_tfm'][:, :] = transforms[wide_key].reshape(3, 3)
|
self.numpy_inputs['big_tfm'][:, :] = transforms[wide_key].reshape(3, 3)
|
||||||
|
|
||||||
if prepare_only:
|
if prepare_only:
|
||||||
self._warp_enqueue(**self.input_queues, frame=self.full_frames[road_key], big_frame=self.full_frames[wide_key])
|
self._warp_enqueue(**self.input_queues, frame=self.full_frames[road_key], big_frame=self.full_frames[wide_key])
|
||||||
@@ -237,8 +231,8 @@ class ModelState(ModelStateBase):
|
|||||||
if 'planplus' in outputs and 'plan' in outputs:
|
if 'planplus' in outputs and 'plan' in outputs:
|
||||||
outputs['plan'] = outputs['plan'] + outputs['planplus']
|
outputs['plan'] = outputs['plan'] + outputs['planplus']
|
||||||
|
|
||||||
if 'desired_curvature' in outputs and 'prev_desired_curv' in self.npy:
|
if 'desired_curvature' in outputs and 'prev_desired_curv' in self.numpy_inputs:
|
||||||
buf = self.npy['prev_desired_curv']
|
buf = self.numpy_inputs['prev_desired_curv']
|
||||||
buf[0, :-1] = buf[0, 1:]
|
buf[0, :-1] = buf[0, 1:]
|
||||||
buf[0, -1, :] = outputs['desired_curvature'][0, :] if not self.mlsim else 0
|
buf[0, -1, :] = outputs['desired_curvature'][0, :] if not self.mlsim else 0
|
||||||
|
|
||||||
@@ -330,7 +324,6 @@ def main(demo=False):
|
|||||||
prev_action = log.ModelDataV2.Action()
|
prev_action = log.ModelDataV2.Action()
|
||||||
|
|
||||||
DH = DesireHelper()
|
DH = DesireHelper()
|
||||||
RELC = RoadEdgeLaneChangeController(DH)
|
|
||||||
meta_constants = load_meta_constants()
|
meta_constants = load_meta_constants()
|
||||||
|
|
||||||
while True:
|
while True:
|
||||||
@@ -411,7 +404,7 @@ def main(demo=False):
|
|||||||
'traffic_convention': traffic_convention,
|
'traffic_convention': traffic_convention,
|
||||||
}
|
}
|
||||||
|
|
||||||
if 'lateral_control_params' in model.npy:
|
if 'lateral_control_params' in model.numpy_inputs:
|
||||||
inputs['lateral_control_params'] = np.array([v_ego, lat_delay], dtype=np.float32)
|
inputs['lateral_control_params'] = np.array([v_ego, lat_delay], dtype=np.float32)
|
||||||
|
|
||||||
mt1 = time.perf_counter()
|
mt1 = time.perf_counter()
|
||||||
@@ -435,10 +428,7 @@ def main(demo=False):
|
|||||||
l_lane_change_prob = desire_state[log.Desire.laneChangeLeft]
|
l_lane_change_prob = desire_state[log.Desire.laneChangeLeft]
|
||||||
r_lane_change_prob = desire_state[log.Desire.laneChangeRight]
|
r_lane_change_prob = desire_state[log.Desire.laneChangeRight]
|
||||||
lane_change_prob = l_lane_change_prob + r_lane_change_prob
|
lane_change_prob = l_lane_change_prob + r_lane_change_prob
|
||||||
RELC.update(modelv2_send.modelV2.roadEdgeStds, modelv2_send.modelV2.laneLineProbs, v_ego, modelv2_send.modelV2.roadEdges)
|
DH.update(sm['carState'], sm['carControl'].latActive, lane_change_prob)
|
||||||
mdv2sp_send.modelDataV2SP.leftLaneChangeEdgeBlock = RELC.left_edge_detected
|
|
||||||
mdv2sp_send.modelDataV2SP.rightLaneChangeEdgeBlock = RELC.right_edge_detected
|
|
||||||
DH.update(sm['carState'], sm['carControl'].latActive, lane_change_prob, RELC.left_edge_detected, RELC.right_edge_detected)
|
|
||||||
modelv2_send.modelV2.meta.laneChangeState = DH.lane_change_state
|
modelv2_send.modelV2.meta.laneChangeState = DH.lane_change_state
|
||||||
modelv2_send.modelV2.meta.laneChangeDirection = DH.lane_change_direction
|
modelv2_send.modelV2.meta.laneChangeDirection = DH.lane_change_direction
|
||||||
mdv2sp_send.modelDataV2SP.laneTurnDirection = DH.lane_turn_direction
|
mdv2sp_send.modelDataV2SP.laneTurnDirection = DH.lane_turn_direction
|
||||||
|
|||||||
@@ -1,62 +0,0 @@
|
|||||||
## Neural networks in openpilot
|
|
||||||
To view the architecture of the ONNX networks, you can use [netron](https://netron.app/)
|
|
||||||
|
|
||||||
## Supercombo
|
|
||||||
### Supercombo input format (Full size: 799906 x float32)
|
|
||||||
* **image stream**
|
|
||||||
* Two consecutive images (256 * 512 * 3 in RGB) recorded at 20 Hz : 393216 = 2 * 6 * 128 * 256
|
|
||||||
* Each 256 * 512 image is represented in YUV420 with 6 channels : 6 * 128 * 256
|
|
||||||
* Channels 0,1,2,3 represent the full-res Y channel and are represented in numpy as Y[::2, ::2], Y[::2, 1::2], Y[1::2, ::2], and Y[1::2, 1::2]
|
|
||||||
* Channel 4 represents the half-res U channel
|
|
||||||
* Channel 5 represents the half-res V channel
|
|
||||||
* **wide image stream**
|
|
||||||
* Two consecutive images (256 * 512 * 3 in RGB) recorded at 20 Hz : 393216 = 2 * 6 * 128 * 256
|
|
||||||
* Each 256 * 512 image is represented in YUV420 with 6 channels : 6 * 128 * 256
|
|
||||||
* Channels 0,1,2,3 represent the full-res Y channel and are represented in numpy as Y[::2, ::2], Y[::2, 1::2], Y[1::2, ::2], and Y[1::2, 1::2]
|
|
||||||
* Channel 4 represents the half-res U channel
|
|
||||||
* Channel 5 represents the half-res V channel
|
|
||||||
* **desire**
|
|
||||||
* one-hot encoded buffer to command model to execute certain actions, bit needs to be sent for the past 5 seconds (at 20FPS) : 100 * 8
|
|
||||||
* **traffic convention**
|
|
||||||
* one-hot encoded vector to tell model whether traffic is right-hand or left-hand traffic : 2
|
|
||||||
* **feature buffer**
|
|
||||||
* A buffer of intermediate features that gets appended to the current feature to form a 5 seconds temporal context (at 20FPS) : 99 * 512
|
|
||||||
|
|
||||||
|
|
||||||
### Supercombo output format (Full size: XXX x float32)
|
|
||||||
Read [here](https://github.com/commaai/openpilot/blob/90af436a121164a51da9fa48d093c29f738adf6a/selfdrive/modeld/models/driving.h#L236) for more.
|
|
||||||
|
|
||||||
|
|
||||||
## Driver Monitoring Model
|
|
||||||
* .onnx model can be run with onnx runtimes
|
|
||||||
* .dlc file is a pre-quantized model and only runs on qualcomm DSPs
|
|
||||||
|
|
||||||
### input format
|
|
||||||
* single image W = 1440 H = 960 luminance channel (Y) from the planar YUV420 format:
|
|
||||||
* full input size is 1440 * 960 = 1382400
|
|
||||||
* normalized ranging from 0.0 to 1.0 in float32 (onnx runner) or ranging from 0 to 255 in uint8 (snpe runner)
|
|
||||||
* camera calibration angles (roll, pitch, yaw) from liveCalibration: 3 x float32 inputs
|
|
||||||
|
|
||||||
### output format
|
|
||||||
* 84 x float32 outputs = 2 + 41 * 2 ([parsing example](https://github.com/commaai/openpilot/blob/22ce4e17ba0d3bfcf37f8255a4dd1dc683fe0c38/selfdrive/modeld/models/dmonitoring.cc#L33))
|
|
||||||
* for each person in the front seats (2 * 41)
|
|
||||||
* face pose: 12 = 6 + 6
|
|
||||||
* face orientation [pitch, yaw, roll] in camera frame: 3
|
|
||||||
* face position [dx, dy] relative to image center: 2
|
|
||||||
* normalized face size: 1
|
|
||||||
* standard deviations for above outputs: 6
|
|
||||||
* face visible probability: 1
|
|
||||||
* eyes: 20 = (8 + 1) + (8 + 1) + 1 + 1
|
|
||||||
* eye position and size, and their standard deviations: 8
|
|
||||||
* eye visible probability: 1
|
|
||||||
* eye closed probability: 1
|
|
||||||
* wearing sunglasses probability: 1
|
|
||||||
* face occluded probability: 1
|
|
||||||
* touching wheel probability: 1
|
|
||||||
* paying attention probability: 1
|
|
||||||
* (deprecated) distracted probabilities: 2
|
|
||||||
* using phone probability: 1
|
|
||||||
* distracted probability: 1
|
|
||||||
* common outputs 2
|
|
||||||
* poor camera vision probability: 1
|
|
||||||
* left hand drive probability: 1
|
|
||||||
@@ -1,101 +0,0 @@
|
|||||||
// clang++ -O2 repro.cc && ./a.out
|
|
||||||
|
|
||||||
#include <sched.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
#include <cstdint>
|
|
||||||
#include <cstdio>
|
|
||||||
#include <cstdlib>
|
|
||||||
#include <cstring>
|
|
||||||
#include <ctime>
|
|
||||||
|
|
||||||
static inline double millis_since_boot() {
|
|
||||||
struct timespec t;
|
|
||||||
clock_gettime(CLOCK_BOOTTIME, &t);
|
|
||||||
return t.tv_sec * 1000.0 + t.tv_nsec * 1e-6;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define MODEL_WIDTH 320
|
|
||||||
#define MODEL_HEIGHT 640
|
|
||||||
|
|
||||||
// null function still breaks it
|
|
||||||
#define input_lambda(x) x
|
|
||||||
|
|
||||||
// this is copied from models/dmonitoring.cc, and is the code that triggers the issue
|
|
||||||
void inner(uint8_t *resized_buf, float *net_input_buf) {
|
|
||||||
int resized_width = MODEL_WIDTH;
|
|
||||||
int resized_height = MODEL_HEIGHT;
|
|
||||||
|
|
||||||
// one shot conversion, O(n) anyway
|
|
||||||
// yuvframe2tensor, normalize
|
|
||||||
for (int r = 0; r < MODEL_HEIGHT/2; r++) {
|
|
||||||
for (int c = 0; c < MODEL_WIDTH/2; c++) {
|
|
||||||
// Y_ul
|
|
||||||
net_input_buf[(c*MODEL_HEIGHT/2) + r] = input_lambda(resized_buf[(2*r*resized_width) + (2*c)]);
|
|
||||||
// Y_ur
|
|
||||||
net_input_buf[(c*MODEL_HEIGHT/2) + r + (2*(MODEL_WIDTH/2)*(MODEL_HEIGHT/2))] = input_lambda(resized_buf[(2*r*resized_width) + (2*c+1)]);
|
|
||||||
// Y_dl
|
|
||||||
net_input_buf[(c*MODEL_HEIGHT/2) + r + ((MODEL_WIDTH/2)*(MODEL_HEIGHT/2))] = input_lambda(resized_buf[(2*r*resized_width+1) + (2*c)]);
|
|
||||||
// Y_dr
|
|
||||||
net_input_buf[(c*MODEL_HEIGHT/2) + r + (3*(MODEL_WIDTH/2)*(MODEL_HEIGHT/2))] = input_lambda(resized_buf[(2*r*resized_width+1) + (2*c+1)]);
|
|
||||||
// U
|
|
||||||
net_input_buf[(c*MODEL_HEIGHT/2) + r + (4*(MODEL_WIDTH/2)*(MODEL_HEIGHT/2))] = input_lambda(resized_buf[(resized_width*resized_height) + (r*resized_width/2) + c]);
|
|
||||||
// V
|
|
||||||
net_input_buf[(c*MODEL_HEIGHT/2) + r + (5*(MODEL_WIDTH/2)*(MODEL_HEIGHT/2))] = input_lambda(resized_buf[(resized_width*resized_height) + ((resized_width/2)*(resized_height/2)) + (r*resized_width/2) + c]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
float trial() {
|
|
||||||
int resized_width = MODEL_WIDTH;
|
|
||||||
int resized_height = MODEL_HEIGHT;
|
|
||||||
|
|
||||||
int yuv_buf_len = (MODEL_WIDTH/2) * (MODEL_HEIGHT/2) * 6; // Y|u|v -> y|y|y|y|u|v
|
|
||||||
|
|
||||||
// allocate the buffers
|
|
||||||
uint8_t *resized_buf = (uint8_t*)malloc(resized_width*resized_height*3/2);
|
|
||||||
float *net_input_buf = (float*)malloc(yuv_buf_len*sizeof(float));
|
|
||||||
printf("allocate -- %p 0x%x -- %p 0x%lx\n", resized_buf, resized_width*resized_height*3/2, net_input_buf, yuv_buf_len*sizeof(float));
|
|
||||||
|
|
||||||
// test for bad buffers
|
|
||||||
static int CNT = 20;
|
|
||||||
float avg = 0.0;
|
|
||||||
for (int i = 0; i < CNT; i++) {
|
|
||||||
double s4 = millis_since_boot();
|
|
||||||
inner(resized_buf, net_input_buf);
|
|
||||||
double s5 = millis_since_boot();
|
|
||||||
avg += s5-s4;
|
|
||||||
}
|
|
||||||
avg /= CNT;
|
|
||||||
|
|
||||||
// once it's bad, it's reliably bad
|
|
||||||
if (avg > 10) {
|
|
||||||
printf("HIT %f\n", avg);
|
|
||||||
printf("BAD\n");
|
|
||||||
|
|
||||||
for (int i = 0; i < 200; i++) {
|
|
||||||
double s4 = millis_since_boot();
|
|
||||||
inner(resized_buf, net_input_buf);
|
|
||||||
double s5 = millis_since_boot();
|
|
||||||
printf("%.2f ", s5-s4);
|
|
||||||
}
|
|
||||||
printf("\n");
|
|
||||||
|
|
||||||
exit(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
// don't free so we get a different buffer each time
|
|
||||||
//free(resized_buf);
|
|
||||||
//free(net_input_buf);
|
|
||||||
|
|
||||||
return avg;
|
|
||||||
}
|
|
||||||
|
|
||||||
int main() {
|
|
||||||
while (true) {
|
|
||||||
float ret = trial();
|
|
||||||
printf("got %f\n", ret);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -46,16 +46,6 @@ class TestFindDrivingPkl:
|
|||||||
assert result is not None
|
assert result is not None
|
||||||
assert 'driving_fof_tinygrad.pkl' in result
|
assert 'driving_fof_tinygrad.pkl' in result
|
||||||
|
|
||||||
def test_finds_fallback_driving_tinygrad(self, tmp_path, monkeypatch):
|
|
||||||
(tmp_path / 'driving_tinygrad.pkl').write_bytes(b'fake')
|
|
||||||
from openpilot.system.hardware import hw
|
|
||||||
monkeypatch.setattr(hw.Paths, 'model_root', staticmethod(lambda: str(tmp_path)))
|
|
||||||
|
|
||||||
bundle = DummyBundle(models=[DummyModel('vision', 'nonexistent.pkl')])
|
|
||||||
result = _find_driving_pkl(bundle)
|
|
||||||
assert result is not None
|
|
||||||
assert 'driving_tinygrad.pkl' in result
|
|
||||||
|
|
||||||
|
|
||||||
# Init — assertion guard
|
# Init — assertion guard
|
||||||
|
|
||||||
@@ -84,8 +74,8 @@ class TestStockEquivalence:
|
|||||||
skip_keys = {'action_t'}
|
skip_keys = {'action_t'}
|
||||||
assert set(state.input_queues.keys()) == set(stock_queues.keys()) - skip_keys, \
|
assert set(state.input_queues.keys()) == set(stock_queues.keys()) - skip_keys, \
|
||||||
f"Queue keys differ: v2={set(state.input_queues.keys())}, stock={set(stock_queues.keys())}"
|
f"Queue keys differ: v2={set(state.input_queues.keys())}, stock={set(stock_queues.keys())}"
|
||||||
assert set(state.npy.keys()) == set(stock_npy.keys()) - skip_keys, \
|
assert set(state.numpy_inputs.keys()) == set(stock_npy.keys()) - skip_keys, \
|
||||||
f"Npy keys differ: v2={set(state.npy.keys())}, stock={set(stock_npy.keys())}"
|
f"Npy keys differ: v2={set(state.numpy_inputs.keys())}, stock={set(stock_npy.keys())}"
|
||||||
|
|
||||||
def test_split_queue_keys_work_with_desire_key(self, model_state_factory):
|
def test_split_queue_keys_work_with_desire_key(self, model_state_factory):
|
||||||
from openpilot.sunnypilot.modeld_v2.compile_modeld import derive_frame_skip, make_split_input_queues
|
from openpilot.sunnypilot.modeld_v2.compile_modeld import derive_frame_skip, make_split_input_queues
|
||||||
@@ -188,16 +178,16 @@ class TestInputQueueCreation:
|
|||||||
def test_npy_contains_transforms(self, archetype_name, model_state_factory):
|
def test_npy_contains_transforms(self, archetype_name, model_state_factory):
|
||||||
arch = ARCHETYPES[archetype_name]
|
arch = ARCHETYPES[archetype_name]
|
||||||
state = model_state_factory(arch)
|
state = model_state_factory(arch)
|
||||||
assert 'tfm' in state.npy, f"{arch.name}: 'tfm' missing from npy"
|
assert 'tfm' in state.numpy_inputs, f"{arch.name}: 'tfm' missing from npy"
|
||||||
assert 'big_tfm' in state.npy, f"{arch.name}: 'big_tfm' missing from npy"
|
assert 'big_tfm' in state.numpy_inputs, f"{arch.name}: 'big_tfm' missing from npy"
|
||||||
assert state.npy['tfm'].shape == (3, 3)
|
assert state.numpy_inputs['tfm'].shape == (3, 3)
|
||||||
assert state.npy['big_tfm'].shape == (3, 3)
|
assert state.numpy_inputs['big_tfm'].shape == (3, 3)
|
||||||
|
|
||||||
@pytest.mark.parametrize("archetype_name", ARCHETYPE_NAMES)
|
@pytest.mark.parametrize("archetype_name", ARCHETYPE_NAMES)
|
||||||
def test_npy_contains_desire(self, archetype_name, model_state_factory):
|
def test_npy_contains_desire(self, archetype_name, model_state_factory):
|
||||||
arch = ARCHETYPES[archetype_name]
|
arch = ARCHETYPES[archetype_name]
|
||||||
state = model_state_factory(arch)
|
state = model_state_factory(arch)
|
||||||
assert arch.expected_desire_key in state.npy, \
|
assert arch.expected_desire_key in state.numpy_inputs, \
|
||||||
f"{arch.name}: '{arch.expected_desire_key}' missing from npy"
|
f"{arch.name}: '{arch.expected_desire_key}' missing from npy"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
clang++ -I /home/batman/one/external/tensorflow/include/ -L /home/batman/one/external/tensorflow/lib -Wl,-rpath=/home/batman/one/external/tensorflow/lib main.cc -ltensorflow
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
#include <cassert>
|
|
||||||
#include <cstdio>
|
|
||||||
#include <cstdlib>
|
|
||||||
#include "tensorflow/c/c_api.h"
|
|
||||||
|
|
||||||
void* read_file(const char* path, size_t* out_len) {
|
|
||||||
FILE* f = fopen(path, "r");
|
|
||||||
if (!f) {
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
fseek(f, 0, SEEK_END);
|
|
||||||
long f_len = ftell(f);
|
|
||||||
rewind(f);
|
|
||||||
|
|
||||||
char* buf = (char*)calloc(f_len, 1);
|
|
||||||
assert(buf);
|
|
||||||
|
|
||||||
size_t num_read = fread(buf, f_len, 1, f);
|
|
||||||
fclose(f);
|
|
||||||
|
|
||||||
if (num_read != 1) {
|
|
||||||
free(buf);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (out_len) {
|
|
||||||
*out_len = f_len;
|
|
||||||
}
|
|
||||||
|
|
||||||
return buf;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void DeallocateBuffer(void* data, size_t) {
|
|
||||||
free(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
int main(int argc, char* argv[]) {
|
|
||||||
TF_Buffer* buf;
|
|
||||||
TF_Graph* graph;
|
|
||||||
TF_Status* status;
|
|
||||||
char *path = argv[1];
|
|
||||||
|
|
||||||
// load model
|
|
||||||
{
|
|
||||||
size_t model_size;
|
|
||||||
char tmp[1024];
|
|
||||||
snprintf(tmp, sizeof(tmp), "%s.pb", path);
|
|
||||||
printf("loading model %s\n", tmp);
|
|
||||||
uint8_t *model_data = (uint8_t *)read_file(tmp, &model_size);
|
|
||||||
buf = TF_NewBuffer();
|
|
||||||
buf->data = model_data;
|
|
||||||
buf->length = model_size;
|
|
||||||
buf->data_deallocator = DeallocateBuffer;
|
|
||||||
printf("loaded model of size %d\n", model_size);
|
|
||||||
}
|
|
||||||
|
|
||||||
// import graph
|
|
||||||
status = TF_NewStatus();
|
|
||||||
graph = TF_NewGraph();
|
|
||||||
TF_ImportGraphDefOptions *opts = TF_NewImportGraphDefOptions();
|
|
||||||
TF_GraphImportGraphDef(graph, buf, opts, status);
|
|
||||||
TF_DeleteImportGraphDefOptions(opts);
|
|
||||||
TF_DeleteBuffer(buf);
|
|
||||||
if (TF_GetCode(status) != TF_OK) {
|
|
||||||
printf("FAIL: %s\n", TF_Message(status));
|
|
||||||
} else {
|
|
||||||
printf("SUCCESS\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
import sys
|
|
||||||
import tensorflow as tf
|
|
||||||
|
|
||||||
with open(sys.argv[1], "rb") as f:
|
|
||||||
graph_def = tf.compat.v1.GraphDef()
|
|
||||||
graph_def.ParseFromString(f.read())
|
|
||||||
#tf.io.write_graph(graph_def, '', sys.argv[1]+".try")
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
|
|
||||||
import os
|
|
||||||
import time
|
|
||||||
import numpy as np
|
|
||||||
|
|
||||||
import cereal.messaging as messaging
|
|
||||||
from openpilot.system.manager.process_config import managed_processes
|
|
||||||
|
|
||||||
|
|
||||||
N = int(os.getenv("N", "5"))
|
|
||||||
TIME = int(os.getenv("TIME", "30"))
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
sock = messaging.sub_sock('modelV2', conflate=False, timeout=1000)
|
|
||||||
|
|
||||||
execution_times = []
|
|
||||||
|
|
||||||
for _ in range(N):
|
|
||||||
os.environ['LOGPRINT'] = 'debug'
|
|
||||||
managed_processes['modeld'].start()
|
|
||||||
time.sleep(5)
|
|
||||||
|
|
||||||
t = []
|
|
||||||
start = time.monotonic()
|
|
||||||
while time.monotonic() - start < TIME:
|
|
||||||
msgs = messaging.drain_sock(sock, wait_for_one=True)
|
|
||||||
for m in msgs:
|
|
||||||
t.append(m.modelV2.modelExecutionTime)
|
|
||||||
|
|
||||||
execution_times.append(np.array(t[10:]) * 1000)
|
|
||||||
managed_processes['modeld'].stop()
|
|
||||||
|
|
||||||
print("\n\n")
|
|
||||||
print(f"ran modeld {N} times for {TIME}s each")
|
|
||||||
for _, t in enumerate(execution_times):
|
|
||||||
print(f"\tavg: {sum(t)/len(t):0.2f}ms, min: {min(t):0.2f}ms, max: {max(t):0.2f}ms")
|
|
||||||
print("\n\n")
|
|
||||||
+117
-85
@@ -6,80 +6,138 @@ See the LICENSE.md file in the root directory for more details.
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
import hashlib
|
import hashlib
|
||||||
|
import os
|
||||||
import pickle
|
import pickle
|
||||||
|
from pathlib import Path
|
||||||
import numpy as np
|
import numpy as np
|
||||||
|
|
||||||
from openpilot.common.params import Params
|
|
||||||
from cereal import custom
|
from cereal import custom
|
||||||
from openpilot.sunnypilot.models.constants import Meta, MetaTombRaider, MetaSimPose
|
from openpilot.common.params import Params
|
||||||
|
from openpilot.common.swaglog import cloudlog
|
||||||
|
from openpilot.sunnypilot.models.constants import Meta, MetaSimPose, MetaTombRaider
|
||||||
from openpilot.system.hardware.hw import Paths
|
from openpilot.system.hardware.hw import Paths
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
# see the README.md for more details on the model selector versioning
|
|
||||||
CURRENT_SELECTOR_VERSION = 15
|
|
||||||
REQUIRED_MIN_SELECTOR_VERSION = 14
|
|
||||||
|
|
||||||
|
# SET ME TO THE EXACT JSON VERSION WE SET IN SUNNYPILOT_MODELS REPO
|
||||||
|
REQUIRED_JSON_VERSION = 15
|
||||||
|
|
||||||
CUSTOM_MODEL_PATH = Paths.model_root()
|
CUSTOM_MODEL_PATH = Paths.model_root()
|
||||||
METADATA_PATH = Path(__file__).parent / '../models/supercombo_metadata.pkl'
|
METADATA_PATH = Path(__file__).parent / '../models/supercombo_metadata.pkl'
|
||||||
|
|
||||||
ModelManager = custom.ModelManagerSP
|
ModelManager = custom.ModelManagerSP
|
||||||
|
_LAST_VALIDATED_RAW = None
|
||||||
|
|
||||||
|
|
||||||
|
def _compute_hash(file_path: str) -> str | None:
|
||||||
|
from openpilot.common.file_chunker import read_file_chunked
|
||||||
|
try:
|
||||||
|
return hashlib.sha256(read_file_chunked(file_path)).hexdigest().lower()
|
||||||
|
except FileNotFoundError:
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
async def verify_file(file_path: str, expected_hash: str) -> bool:
|
async def verify_file(file_path: str, expected_hash: str) -> bool:
|
||||||
from openpilot.common.file_chunker import read_file_chunked
|
file_hash = _compute_hash(file_path)
|
||||||
try:
|
return file_hash == expected_hash.lower() if file_hash else False
|
||||||
data = read_file_chunked(file_path)
|
|
||||||
except FileNotFoundError:
|
|
||||||
return False
|
def _verify_file(file_path: str, expected_hash: str) -> bool:
|
||||||
return hashlib.sha256(data).hexdigest().lower() == expected_hash.lower()
|
file_hash = _compute_hash(file_path)
|
||||||
|
return file_hash == expected_hash.lower() if file_hash else False
|
||||||
|
|
||||||
|
|
||||||
def is_bundle_version_compatible(bundle: dict) -> bool:
|
def is_bundle_version_compatible(bundle: dict) -> bool:
|
||||||
"""
|
"""
|
||||||
Checks whether the model bundle is compatible with the current selector version constraints.
|
The bundle parsed from the json specifies a `minimum_selector_version`, which defines the minimum selector version
|
||||||
|
|
||||||
The bundle specifies a `minimum_selector_version`, which defines the minimum selector version
|
|
||||||
required to load the model. This function ensures that:
|
required to load the model. This function ensures that:
|
||||||
|
the bundle MUST match the `REQUIRED_JSON_VERSION` set here in helpers.
|
||||||
1. The model is not too old: the bundle must require at least `REQUIRED_MIN_SELECTOR_VERSION`.
|
|
||||||
2. The model is not too new: it must support the current selector version (`CURRENT_SELECTOR_VERSION`).
|
|
||||||
|
|
||||||
This allows the selector to enforce both a minimum and maximum range of supported models,
|
|
||||||
even if a model would otherwise be compatible.
|
|
||||||
|
|
||||||
:param bundle: Dictionary containing `minimum_selector_version`, as defined by the model bundle.
|
|
||||||
:type bundle: Dict
|
|
||||||
:return: True if the selector version is within the accepted range for the bundle; otherwise False.
|
|
||||||
:rtype: Bool
|
|
||||||
"""
|
"""
|
||||||
return bool(REQUIRED_MIN_SELECTOR_VERSION <= bundle.get("minimumSelectorVersion", 0) <= CURRENT_SELECTOR_VERSION)
|
return bundle.get("minimumSelectorVersion", 0) == REQUIRED_JSON_VERSION
|
||||||
|
|
||||||
|
|
||||||
def get_active_bundle(params: Params = None) -> custom.ModelManagerSP.ModelBundle:
|
def _bundle_artifacts(bundle: custom.ModelManagerSP.ModelBundle) -> list[tuple[str, str]]:
|
||||||
"""Gets the active model bundle from cache"""
|
artifacts = []
|
||||||
if params is None:
|
for model in getattr(bundle, 'models', []) or []:
|
||||||
params = Params()
|
for artifact in (getattr(model, 'artifact', None), getattr(model, 'metadata', None)):
|
||||||
|
if artifact and getattr(artifact, 'fileName', None) and getattr(artifact, 'downloadUri', None):
|
||||||
|
sha256 = getattr(artifact.downloadUri, 'sha256', None)
|
||||||
|
if sha256:
|
||||||
|
artifacts.append((artifact.fileName, sha256))
|
||||||
|
return artifacts
|
||||||
|
|
||||||
|
|
||||||
|
def _bundle_is_valid_locally(bundle: custom.ModelManagerSP.ModelBundle) -> bool:
|
||||||
|
model_root = Paths.model_root()
|
||||||
|
return all(_verify_file(os.path.join(model_root, file_name), expected_hash)
|
||||||
|
for file_name, expected_hash in _bundle_artifacts(bundle))
|
||||||
|
|
||||||
|
|
||||||
|
def _bundle_needs_reset(active_bundle: custom.ModelManagerSP.ModelBundle, available_bundles: list[custom.ModelManagerSP.ModelBundle] | None) -> bool:
|
||||||
|
if active_bundle is None:
|
||||||
|
return False
|
||||||
|
|
||||||
|
if available_bundles is not None:
|
||||||
|
matching_bundle = None
|
||||||
|
for bundle in available_bundles:
|
||||||
|
if getattr(active_bundle, 'ref', None) and getattr(bundle, 'ref', None):
|
||||||
|
if active_bundle.ref == bundle.ref:
|
||||||
|
matching_bundle = bundle
|
||||||
|
break
|
||||||
|
elif getattr(active_bundle, 'internalName', None) == getattr(bundle, 'internalName', None):
|
||||||
|
matching_bundle = bundle
|
||||||
|
break
|
||||||
|
|
||||||
|
if matching_bundle is None:
|
||||||
|
return True
|
||||||
|
if active_bundle.minimumSelectorVersion != matching_bundle.minimumSelectorVersion:
|
||||||
|
return True
|
||||||
|
|
||||||
|
active_runner = getattr(active_bundle, 'runner', None)
|
||||||
|
matching_runner = getattr(matching_bundle, 'runner', None)
|
||||||
|
if active_runner is not None and matching_runner is not None:
|
||||||
|
if getattr(active_runner, 'raw', active_runner) != getattr(matching_runner, 'raw', matching_runner):
|
||||||
|
return True
|
||||||
|
if set(_bundle_artifacts(active_bundle)) != set(_bundle_artifacts(matching_bundle)):
|
||||||
|
return True
|
||||||
|
|
||||||
|
return not _bundle_is_valid_locally(active_bundle)
|
||||||
|
|
||||||
|
|
||||||
|
def validate_active_bundle(params: Params, available_bundles: list[custom.ModelManagerSP.ModelBundle] | None = None) -> None:
|
||||||
|
global _LAST_VALIDATED_RAW
|
||||||
|
|
||||||
|
raw_bundle = params.get("ModelManager_ActiveBundle")
|
||||||
|
if not raw_bundle:
|
||||||
|
return
|
||||||
|
|
||||||
|
if raw_bundle == _LAST_VALIDATED_RAW:
|
||||||
|
return
|
||||||
|
|
||||||
|
active_bundle = get_active_bundle(params, raw_bundle_dict=raw_bundle)
|
||||||
|
if active_bundle is None or _bundle_needs_reset(active_bundle, available_bundles):
|
||||||
|
cloudlog.warning("Active model bundle invalid; resetting to default")
|
||||||
|
params.remove("ModelManager_ActiveBundle")
|
||||||
|
params.put("ModelRunnerTypeCache", int(custom.ModelManagerSP.Runner.stock), block=True)
|
||||||
|
_LAST_VALIDATED_RAW = None
|
||||||
|
else:
|
||||||
|
_LAST_VALIDATED_RAW = raw_bundle
|
||||||
|
|
||||||
|
|
||||||
|
def get_active_bundle(params: Params | None = None, raw_bundle_dict: dict | bytes | None = None) -> "custom.ModelManagerSP.ModelBundle | None":
|
||||||
|
params = params or Params()
|
||||||
try:
|
try:
|
||||||
if (active_bundle := params.get("ModelManager_ActiveBundle") or {}) and is_bundle_version_compatible(active_bundle):
|
active_bundle_dict = raw_bundle_dict if raw_bundle_dict is not None else (params.get("ModelManager_ActiveBundle") or {})
|
||||||
return custom.ModelManagerSP.ModelBundle(**active_bundle)
|
if active_bundle_dict and is_bundle_version_compatible(active_bundle_dict):
|
||||||
|
return custom.ModelManagerSP.ModelBundle(**active_bundle_dict)
|
||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
def get_active_model_runner(params: Params = None, force_check=False) -> int:
|
def get_active_model_runner(params: Params | None = None, force_check: bool = False) -> int:
|
||||||
if params is None:
|
params = params or Params()
|
||||||
params = Params()
|
|
||||||
|
|
||||||
cached_runner_type = params.get("ModelRunnerTypeCache")
|
cached_runner_type = params.get("ModelRunnerTypeCache")
|
||||||
if cached_runner_type is not None and not force_check:
|
if cached_runner_type is not None and not force_check:
|
||||||
return cached_runner_type
|
return cached_runner_type
|
||||||
|
|
||||||
runner_type = custom.ModelManagerSP.Runner.stock
|
runner_type = custom.ModelManagerSP.Runner.stock
|
||||||
|
|
||||||
if active_bundle := get_active_bundle(params):
|
if active_bundle := get_active_bundle(params):
|
||||||
runner_type = active_bundle.runner.raw
|
runner_type = active_bundle.runner.raw
|
||||||
|
|
||||||
@@ -88,66 +146,40 @@ def get_active_model_runner(params: Params = None, force_check=False) -> int:
|
|||||||
|
|
||||||
return runner_type
|
return runner_type
|
||||||
|
|
||||||
|
|
||||||
def _get_model():
|
def _get_model():
|
||||||
if bundle := get_active_bundle():
|
if bundle := get_active_bundle():
|
||||||
drive_model = next(model for model in bundle.models if model.type == ModelManager.Model.Type.supercombo)
|
drive_model = next(model for model in bundle.models if model.type == ModelManager.Model.Type.supercombo)
|
||||||
return drive_model
|
return drive_model
|
||||||
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def load_metadata():
|
|
||||||
metadata_path = METADATA_PATH
|
|
||||||
|
|
||||||
if model := _get_model():
|
def load_metadata():
|
||||||
metadata_path = f"{CUSTOM_MODEL_PATH}/{model.metadata.fileName}"
|
model = _get_model()
|
||||||
|
metadata_path = f"{CUSTOM_MODEL_PATH}/{model.metadata.fileName}" if model else METADATA_PATH
|
||||||
|
|
||||||
with open(metadata_path, 'rb') as f:
|
with open(metadata_path, 'rb') as f:
|
||||||
return pickle.load(f)
|
return pickle.load(f)
|
||||||
|
|
||||||
|
|
||||||
def prepare_inputs(model_metadata) -> dict[str, np.ndarray]:
|
def prepare_inputs(model_metadata: dict) -> dict[str, np.ndarray]:
|
||||||
# img buffers are managed in openCL transform code so we don't pass them as inputs
|
return {
|
||||||
inputs = {
|
key: np.zeros(shape, dtype=np.float32).flatten()
|
||||||
k: np.zeros(v, dtype=np.float32).flatten()
|
for key, shape in model_metadata['input_shapes'].items()
|
||||||
for k, v in model_metadata['input_shapes'].items()
|
if 'img' not in key
|
||||||
if 'img' not in k
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return inputs
|
|
||||||
|
|
||||||
|
def load_meta_constants(model_metadata: dict):
|
||||||
|
""" Loads the appropriate meta model class based on key shapes"""
|
||||||
|
if 'sim_pose' in model_metadata['input_shapes']:
|
||||||
|
return MetaSimPose
|
||||||
|
|
||||||
def load_meta_constants(model_metadata):
|
meta_slice = model_metadata['output_slices']['meta']
|
||||||
"""
|
if (meta_slice.start, meta_slice.stop, meta_slice.step) == (5868, 5921, None):
|
||||||
Determines and loads the appropriate meta model class based on the metadata provided. The function checks
|
return MetaTombRaider
|
||||||
specific keys and conditions within the provided metadata dictionary to identify the corresponding meta
|
|
||||||
model class to return.
|
|
||||||
|
|
||||||
:param model_metadata: Dictionary containing metadata about the model. It includes
|
return Meta
|
||||||
details such as input shapes, output slices, and other configurations for identifying
|
|
||||||
metadata-dependent meta model classes.
|
|
||||||
:type model_metadata: dict
|
|
||||||
:return: The appropriate meta model class (Meta, MetaSimPose, or MetaTombRaider)
|
|
||||||
based on the conditions and metadata provided.
|
|
||||||
:rtype: type
|
|
||||||
"""
|
|
||||||
meta = Meta # Default Meta
|
|
||||||
|
|
||||||
if 'sim_pose' in model_metadata['input_shapes'].keys():
|
|
||||||
# Meta for models with sim_pose input
|
|
||||||
meta = MetaSimPose
|
|
||||||
else:
|
|
||||||
# Meta for Tomb Raider, it does not include sim_pose input but has the same meta slice as previous models
|
|
||||||
meta_slice = model_metadata['output_slices']['meta']
|
|
||||||
meta_tf_slice = slice(5868, 5921, None)
|
|
||||||
|
|
||||||
if (
|
|
||||||
meta_slice.start == meta_tf_slice.start and
|
|
||||||
meta_slice.stop == meta_tf_slice.stop and
|
|
||||||
meta_slice.step == meta_tf_slice.step
|
|
||||||
):
|
|
||||||
meta = MetaTombRaider
|
|
||||||
|
|
||||||
return meta
|
|
||||||
|
|
||||||
|
|
||||||
# The following method(s) are modeld helper methods
|
# The following method(s) are modeld helper methods
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ from openpilot.system.hardware.hw import Paths
|
|||||||
|
|
||||||
from cereal import messaging, custom
|
from cereal import messaging, custom
|
||||||
from openpilot.sunnypilot.models.fetcher import ModelFetcher
|
from openpilot.sunnypilot.models.fetcher import ModelFetcher
|
||||||
from openpilot.sunnypilot.models.helpers import verify_file, get_active_bundle
|
from openpilot.sunnypilot.models.helpers import get_active_bundle, validate_active_bundle, verify_file
|
||||||
|
|
||||||
|
|
||||||
class ModelManagerSP:
|
class ModelManagerSP:
|
||||||
@@ -239,6 +239,7 @@ class ModelManagerSP:
|
|||||||
while True:
|
while True:
|
||||||
try:
|
try:
|
||||||
self.available_models = self.model_fetcher.get_available_bundles()
|
self.available_models = self.model_fetcher.get_available_bundles()
|
||||||
|
validate_active_bundle(self.params, self.available_models)
|
||||||
self.active_bundle = get_active_bundle(self.params)
|
self.active_bundle = get_active_bundle(self.params)
|
||||||
|
|
||||||
if (index_to_download := self.params.get("ModelManager_DownloadIndex")) is not None:
|
if (index_to_download := self.params.get("ModelManager_DownloadIndex")) is not None:
|
||||||
@@ -252,8 +253,8 @@ class ModelManagerSP:
|
|||||||
self.selected_bundle = None
|
self.selected_bundle = None
|
||||||
|
|
||||||
if self.params.get("ModelManager_ClearCache"):
|
if self.params.get("ModelManager_ClearCache"):
|
||||||
self.clear_model_cache()
|
self.clear_model_cache()
|
||||||
self.params.remove("ModelManager_ClearCache")
|
self.params.remove("ModelManager_ClearCache")
|
||||||
|
|
||||||
self._report_status()
|
self._report_status()
|
||||||
rk.keep_time()
|
rk.keep_time()
|
||||||
|
|||||||
@@ -1,233 +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.
|
|
||||||
|
|
||||||
Acceleration personality: per-profile launch/cruise accel ceiling (ECO/NORMAL/SPORT), an anticipatory
|
|
||||||
brake front-load, and a low-speed comfort stop. SAFETY: a firm/closing brake -- emergency (raw <=
|
|
||||||
HARD_BRAKE_TARGET_ACCEL or brake_need >= HARD_BRAKE_NEED), FCW/crash, should_stop, or blended/e2e -- passes
|
|
||||||
the plan straight through at full strength and rate, never softened/delayed/rate-limited. Only on the
|
|
||||||
NON-emergency comfort path may the onset arrive spread by at most ONSET_SPREAD_MAX (a tightly bounded,
|
|
||||||
transient lag) so a gentle brake does not land as a step. The front-load and comfort stop only ever ADD
|
|
||||||
braking (min(., plan)). Disabled => byte-stock.
|
|
||||||
"""
|
|
||||||
|
|
||||||
from collections.abc import Sequence
|
|
||||||
|
|
||||||
import numpy as np
|
|
||||||
|
|
||||||
from cereal import messaging
|
|
||||||
from opendbc.car import structs
|
|
||||||
from openpilot.common.params import Params
|
|
||||||
from openpilot.common.realtime import DT_MDL
|
|
||||||
from openpilot.sunnypilot import get_sanitize_int_param
|
|
||||||
from openpilot.sunnypilot.selfdrive.controls.lib.accel_personality.constants import \
|
|
||||||
NORMAL, PERSONALITY_MIN, PERSONALITY_MAX, A_CRUISE_MAX_BP, A_CRUISE_MAX_V, RISE_RATE, \
|
|
||||||
STOCK_A_CRUISE_MAX_V, STOCK_RISE_RATE, SMOOTH_DECEL_BP, SMOOTH_DECEL_V, BRAKE_DEEPENING_JERK, \
|
|
||||||
BRAKE_RELEASE_JERK, ACCEL_RISE_JERK, SMOOTH_DECEL_LOOKAHEAD_T, MIN_SMOOTH_BRAKE_NEED, \
|
|
||||||
HARD_BRAKE_TARGET_ACCEL, HARD_BRAKE_NEED, OVERBITE_CAP, STOP_PASSTHROUGH_V, \
|
|
||||||
STOP_IMMINENT_VEGO, STOP_IMMINENT_LOOKAHEAD_T, ONSET_SPREAD_MAX, ONSET_SPREAD_JERK, \
|
|
||||||
COMFORT_STOP_V, COMFORT_STOP_LEAD_V, COMFORT_STOP_GAP, \
|
|
||||||
COMFORT_STOP_MAX_DECEL, COMFORT_STOP_RELEASE_V, COMFORT_STOP_HOLD_GAP
|
|
||||||
|
|
||||||
_ZERO_ACCEL_EPS = 1e-6
|
|
||||||
|
|
||||||
|
|
||||||
class AccelController:
|
|
||||||
def __init__(self, CP: structs.CarParams, mpc, params=None):
|
|
||||||
self._CP = CP
|
|
||||||
self._mpc = mpc
|
|
||||||
self._params = params or Params()
|
|
||||||
self._frame = 0
|
|
||||||
self._enabled = self._params.get_bool("AccelPersonalityEnabled")
|
|
||||||
self._personality = NORMAL
|
|
||||||
self._v_ego = 0.0
|
|
||||||
self._last_target_accel = 0.0
|
|
||||||
self._brake_need = 0.0
|
|
||||||
self._decel_target = 0.0
|
|
||||||
self._smooth_active = False
|
|
||||||
self._bypassed = False
|
|
||||||
self._lead_status = False
|
|
||||||
self._lead_d = 0.0
|
|
||||||
self._lead_vlead = 0.0
|
|
||||||
self._stop_floor = 0.0 # comfort-stop floor latch (monotone within a stop episode, eased on release)
|
|
||||||
self._read_params()
|
|
||||||
|
|
||||||
def _read_params(self) -> None:
|
|
||||||
self._enabled = self._params.get_bool("AccelPersonalityEnabled")
|
|
||||||
if not self._enabled:
|
|
||||||
self._personality = NORMAL
|
|
||||||
return
|
|
||||||
self._personality = get_sanitize_int_param("AccelPersonality", PERSONALITY_MIN, PERSONALITY_MAX, self._params)
|
|
||||||
|
|
||||||
def update(self, sm: messaging.SubMaster) -> None:
|
|
||||||
if self._frame % int(1. / DT_MDL) == 0:
|
|
||||||
self._read_params()
|
|
||||||
self._v_ego = sm['carState'].vEgo
|
|
||||||
lead = sm['radarState'].leadOne # raw radard lead (== what the MPC sees at crawl, where the enforcer acts)
|
|
||||||
self._lead_status = bool(lead.status)
|
|
||||||
self._lead_d = float(lead.dRel)
|
|
||||||
self._lead_vlead = float(lead.vLead)
|
|
||||||
self._frame += 1
|
|
||||||
|
|
||||||
def get_max_accel(self, v_ego: float) -> float:
|
|
||||||
# Disabled -> stock ceiling (off == stock, independent of the NORMAL profile so NORMAL is free to differ).
|
|
||||||
table = A_CRUISE_MAX_V[self._personality] if self._enabled else STOCK_A_CRUISE_MAX_V
|
|
||||||
return float(np.interp(v_ego, A_CRUISE_MAX_BP, table))
|
|
||||||
|
|
||||||
def get_rise_rate(self) -> float:
|
|
||||||
# Disabled -> stock rise rate (off == stock, independent of the NORMAL profile).
|
|
||||||
return RISE_RATE[self._personality] if self._enabled else STOCK_RISE_RATE
|
|
||||||
|
|
||||||
def get_decel_target(self, brake_need: float) -> float:
|
|
||||||
return float(np.interp(max(0.0, float(brake_need)), SMOOTH_DECEL_BP, SMOOTH_DECEL_V[self._personality]))
|
|
||||||
|
|
||||||
def smooth_target_accel(self, raw_target_accel: float, accel_trajectory: Sequence[float], t_idxs: Sequence[float],
|
|
||||||
should_stop: bool, reset: bool = False, stock_brake: bool = False,
|
|
||||||
speed_trajectory: Sequence[float] | None = None) -> float:
|
|
||||||
raw = float(raw_target_accel)
|
|
||||||
self._brake_need = self._compute_brake_need(raw, accel_trajectory, t_idxs)
|
|
||||||
self._decel_target = 0.0
|
|
||||||
self._smooth_active = False
|
|
||||||
self._bypassed = False
|
|
||||||
|
|
||||||
out = self._shape(raw, should_stop, reset, speed_trajectory, t_idxs, stock_brake)
|
|
||||||
out = self._comfort_stop(out, reset) # low-speed monotone comfort decel-to-stop (replaces the self-releasing enforcer)
|
|
||||||
return self._finalize(out)
|
|
||||||
|
|
||||||
def _shape(self, raw: float, should_stop: bool, reset: bool, speed_trajectory, t_idxs, stock_brake: bool) -> float:
|
|
||||||
# --- Full stock passthroughs (output is exactly the plan, no shaping) ---
|
|
||||||
if reset or not self._enabled:
|
|
||||||
return raw # disabled / reset
|
|
||||||
if self._v_ego < STOP_PASSTHROUGH_V and raw <= 0.0:
|
|
||||||
return raw # stop/creep regime: braking is stock (no coast-in)
|
|
||||||
self._bypassed = self._emergency_bypass(raw, should_stop)
|
|
||||||
if self._bypassed or self._stop_imminent(speed_trajectory, t_idxs):
|
|
||||||
return raw # emergency / coming stop: full strength, no delay
|
|
||||||
|
|
||||||
# Anticipatory front-load, capped at OVERBITE_CAP below the live plan (avoids an abrupt over-bite on a
|
|
||||||
# cut-in brake_need spike).
|
|
||||||
target = raw
|
|
||||||
if self._brake_need >= MIN_SMOOTH_BRAKE_NEED:
|
|
||||||
self._smooth_active = True
|
|
||||||
self._decel_target = max(self.get_decel_target(self._brake_need), raw - OVERBITE_CAP)
|
|
||||||
target = min(raw, self._decel_target)
|
|
||||||
if raw > 0.0:
|
|
||||||
target = max(target, 0.0) # plan wants throttle -> ease the gas early, never fabricate a brake
|
|
||||||
slewed = self._slew(target)
|
|
||||||
if raw >= 0.0:
|
|
||||||
return slewed
|
|
||||||
if stock_brake:
|
|
||||||
return min(slewed, raw) # blended/e2e: the model owns the brake -> strict never-weaker
|
|
||||||
return self._onset_spread(slewed, raw) # non-emergency brake: bounded onset spread (<= ONSET_SPREAD_MAX weaker)
|
|
||||||
|
|
||||||
def _onset_spread(self, shaped: float, raw: float) -> float:
|
|
||||||
# Scoped softening: on a NON-emergency brake the onset may arrive spread instead of stepping to the plan.
|
|
||||||
# The output deepens toward the plan jerk-limited at ONSET_SPREAD_JERK and may lag it by at most
|
|
||||||
# ONSET_SPREAD_MAX -- a tightly bounded, transient weaker-than-plan window that smooths the felt onset.
|
|
||||||
# Emergency brakes never reach here (raw passthrough in _shape), so a genuine hard brake is never softened.
|
|
||||||
# The front-load still wins when it is deeper (anticipation preserved).
|
|
||||||
spread = max(raw, self._last_target_accel - ONSET_SPREAD_JERK * DT_MDL) # deepen toward the plan, jerk-limited
|
|
||||||
spread = min(spread, raw + ONSET_SPREAD_MAX) # never more than the bounded lag weaker
|
|
||||||
return min(shaped, spread)
|
|
||||||
|
|
||||||
def _comfort_stop(self, out: float, reset: bool) -> float:
|
|
||||||
# Low-speed ANTI-CREEP HOLD behind a near-stopped lead. In the final-approach window it HOLDS the deepest
|
|
||||||
# decel the PLAN itself commanded this episode (gentle-capped at COMFORT_STOP_MAX_DECEL), so the brake does
|
|
||||||
# not ease off / creep in before the car is stopped (no roll, slightly roomier). It is NEVER firmer than the
|
|
||||||
# plan -- it only stops the brake from WEAKENING -- so it can never add a hard bite (the old kinematic
|
|
||||||
# enforcer demanded a firm ~-1.6 grab; this does not). Outside the window (gap opening as a creeping lead
|
|
||||||
# pulls away / lead moving / launch / standstill) the floor eases out at the release rate. min(out, floor)
|
|
||||||
# keeps it never weaker than the plan. Off => no-op (off==stock).
|
|
||||||
if reset or not self._enabled:
|
|
||||||
self._stop_floor = 0.0 # disengaged/disabled: drop the latch, pure passthrough
|
|
||||||
return out
|
|
||||||
final_approach = (self._lead_status and self._lead_vlead < COMFORT_STOP_LEAD_V and self._lead_d > 0.1
|
|
||||||
and COMFORT_STOP_RELEASE_V <= self._v_ego < COMFORT_STOP_V
|
|
||||||
and self._lead_d - COMFORT_STOP_GAP <= COMFORT_STOP_HOLD_GAP)
|
|
||||||
if final_approach:
|
|
||||||
plan_hold = max(out, COMFORT_STOP_MAX_DECEL) # the plan's own decel, gentle-capped (never firmer)
|
|
||||||
self._stop_floor = min(plan_hold, self._stop_floor) # latch the deepest -> hold through the plan's ease
|
|
||||||
else:
|
|
||||||
# Not final approach (cruise / gap opening / lead moving / launch / standstill): ease the floor toward 0 at
|
|
||||||
# the release rate. Matches _shape's own _slew_up rate, so the floor decays in lockstep with the natural
|
|
||||||
# output -> no launch drag, no release-direction snap, no phantom brake into an opening gap.
|
|
||||||
self._stop_floor = min(0.0, self._stop_floor + BRAKE_RELEASE_JERK * DT_MDL)
|
|
||||||
return min(out, self._stop_floor) if self._stop_floor < 0.0 else out
|
|
||||||
|
|
||||||
def _stop_imminent(self, speed_trajectory: Sequence[float] | None, t_idxs: Sequence[float]) -> bool:
|
|
||||||
# plan predicts a near-stop within the lookahead -> a stop is coming (lead or light/sign).
|
|
||||||
if speed_trajectory is None:
|
|
||||||
return False
|
|
||||||
return any(float(s) < STOP_IMMINENT_VEGO
|
|
||||||
for s, t in zip(speed_trajectory, t_idxs, strict=False) if float(t) <= STOP_IMMINENT_LOOKAHEAD_T)
|
|
||||||
|
|
||||||
def _compute_brake_need(self, raw_target_accel: float, accel_trajectory: Sequence[float], t_idxs: Sequence[float]) -> float:
|
|
||||||
min_accel = float(raw_target_accel)
|
|
||||||
for accel, t in zip(accel_trajectory, t_idxs, strict=False):
|
|
||||||
if float(t) <= SMOOTH_DECEL_LOOKAHEAD_T:
|
|
||||||
min_accel = min(min_accel, float(accel))
|
|
||||||
return max(0.0, -min_accel)
|
|
||||||
|
|
||||||
def _emergency_bypass(self, raw_target_accel: float, should_stop: bool) -> bool:
|
|
||||||
return (self._mpc.crash_cnt > 0 or should_stop or
|
|
||||||
raw_target_accel <= HARD_BRAKE_TARGET_ACCEL or self._brake_need >= HARD_BRAKE_NEED)
|
|
||||||
|
|
||||||
def _slew(self, target_accel: float) -> float:
|
|
||||||
# Jerk-limit the brake DEEPENING (smooths the front-load's extra depth). On the brake side the caller
|
|
||||||
# clamps with min(., raw), so this NEVER delays a real brake -- when the plan is deeper than the slewed
|
|
||||||
# value, min(.) picks the plan and the brake passes through at full rate.
|
|
||||||
target_accel = float(target_accel)
|
|
||||||
if target_accel <= self._last_target_accel:
|
|
||||||
jmax = BRAKE_DEEPENING_JERK[self._personality]
|
|
||||||
return self._clean_accel(max(target_accel, self._last_target_accel - jmax * DT_MDL))
|
|
||||||
return self._slew_up(target_accel)
|
|
||||||
|
|
||||||
def _slew_up(self, target_accel: float) -> float:
|
|
||||||
# Releasing the brake / accelerating: rate-limit the rise (release jerk on the brake side, the
|
|
||||||
# personality accel-rise jerk on the throttle side).
|
|
||||||
if self._last_target_accel < 0.0:
|
|
||||||
released = min(target_accel, self._last_target_accel + BRAKE_RELEASE_JERK * DT_MDL)
|
|
||||||
if released <= 0.0:
|
|
||||||
return self._clean_accel(released)
|
|
||||||
return self._clean_accel(min(target_accel, ACCEL_RISE_JERK[self._personality] * DT_MDL))
|
|
||||||
step = ACCEL_RISE_JERK[self._personality] * DT_MDL
|
|
||||||
return self._clean_accel(min(target_accel, self._last_target_accel + step))
|
|
||||||
|
|
||||||
def _finalize(self, target_accel: float) -> float:
|
|
||||||
target_accel = self._clean_accel(target_accel)
|
|
||||||
self._last_target_accel = target_accel
|
|
||||||
return target_accel
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def _clean_accel(accel: float) -> float:
|
|
||||||
accel = float(accel)
|
|
||||||
return 0.0 if abs(accel) < _ZERO_ACCEL_EPS else accel
|
|
||||||
|
|
||||||
def enabled(self) -> bool:
|
|
||||||
return self._enabled
|
|
||||||
|
|
||||||
def personality(self):
|
|
||||||
return self._personality
|
|
||||||
|
|
||||||
def max_accel(self) -> float:
|
|
||||||
return self.get_max_accel(self._v_ego)
|
|
||||||
|
|
||||||
def brake_need(self) -> float:
|
|
||||||
return self._brake_need
|
|
||||||
|
|
||||||
def decel_target(self) -> float:
|
|
||||||
return self._decel_target
|
|
||||||
|
|
||||||
def smooth_active(self) -> bool:
|
|
||||||
return self._smooth_active
|
|
||||||
|
|
||||||
def bypassed(self) -> bool:
|
|
||||||
return self._bypassed
|
|
||||||
|
|
||||||
def comfort_stop_floor(self) -> float:
|
|
||||||
return self._stop_floor
|
|
||||||
|
|
||||||
def comfort_stop_active(self) -> bool:
|
|
||||||
return self._stop_floor < 0.0
|
|
||||||
@@ -1,88 +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.
|
|
||||||
"""
|
|
||||||
|
|
||||||
from cereal import custom
|
|
||||||
|
|
||||||
AccelerationPersonality = custom.LongitudinalPlanSP.AccelerationPersonality
|
|
||||||
ECO = AccelerationPersonality.eco
|
|
||||||
NORMAL = AccelerationPersonality.normal
|
|
||||||
SPORT = AccelerationPersonality.sport
|
|
||||||
|
|
||||||
PERSONALITY_MIN = min(AccelerationPersonality.schema.enumerants.values())
|
|
||||||
PERSONALITY_MAX = max(AccelerationPersonality.schema.enumerants.values())
|
|
||||||
|
|
||||||
# Positive-accel ceiling + its upward slew rate (launch/cruise side; independent of braking). off==stock is
|
|
||||||
# enforced in accel_controller (falls back to STOCK_* when disabled), so the tiers are free to differ.
|
|
||||||
A_CRUISE_MAX_BP = [0., 14., 25., 40.]
|
|
||||||
STOCK_A_CRUISE_MAX_V = [1.6, 0.7, 0.2, 0.08]
|
|
||||||
STOCK_RISE_RATE = 0.05
|
|
||||||
A_CRUISE_MAX_V = {
|
|
||||||
ECO: [1.70, 0.75, 0.25, 0.10], # prompt launch, efficient cruise
|
|
||||||
NORMAL: [2.10, 1.10, 0.50, 0.18], # quick launch, balanced cruise
|
|
||||||
SPORT: [2.60, 1.55, 0.85, 0.35], # fast launch, strong cruise
|
|
||||||
}
|
|
||||||
RISE_RATE = {ECO: 0.10, NORMAL: 0.15, SPORT: 0.22} # ceiling open-rate: all >> stock 0.05 for fast take-off
|
|
||||||
|
|
||||||
# Anticipatory front-load: predicted brake need (m/s^2) -> early decel target (m/s^2). Starts a gentle
|
|
||||||
# decel early when a brake is predicted, so it arrives spread out, not as one late firm onset. The first
|
|
||||||
# knot sits AT the MIN_SMOOTH_BRAKE_NEED gate (0.00 there): below the gate there is no front-load, so there
|
|
||||||
# is no dead [0, gate) anchor and no step at the gate (the old [0.0 -> 0.00] knot was never evaluated).
|
|
||||||
SMOOTH_DECEL_BP = [0.4, 0.8, 1.2, 1.6, 2.0, 2.4]
|
|
||||||
SMOOTH_DECEL_V = {
|
|
||||||
ECO: [0.00, -0.20, -0.35, -0.55, -0.78, -1.00],
|
|
||||||
NORMAL: [0.00, -0.30, -0.55, -0.84, -1.12, -1.40],
|
|
||||||
SPORT: [0.00, -0.40, -0.72, -1.05, -1.35, -1.65],
|
|
||||||
}
|
|
||||||
BRAKE_DEEPENING_JERK = {ECO: 0.5, NORMAL: 0.8, SPORT: 1.0}
|
|
||||||
BRAKE_RELEASE_JERK = 2.0
|
|
||||||
ACCEL_RISE_JERK = {ECO: 1.0, NORMAL: 1.5, SPORT: 2.2} # accel-onset jerk: higher = snappier take-off, stepped per tier
|
|
||||||
|
|
||||||
SMOOTH_DECEL_LOOKAHEAD_T = 3.0
|
|
||||||
MIN_SMOOTH_BRAKE_NEED = 0.4 # below this no front-load (kills the faint low-brake_need drag + the gate-crossing toggle)
|
|
||||||
|
|
||||||
# Cap how much DEEPER than the live plan the front-load may bite -> no abrupt over-bite on a cut-in
|
|
||||||
# brake_need spike (binds only when the plan still wants throttle; once it brakes, the table wins).
|
|
||||||
OVERBITE_CAP = 0.30 # m/s^2 max front-load depth below the live plan
|
|
||||||
|
|
||||||
# Hard brake: at/below this accel, or this predicted brake_need within the lookahead, the controller hands
|
|
||||||
# the plan straight through at full strength and rate (no front-load, no rate limit) -- a firm/closing-lead
|
|
||||||
# brake must never be delayed, softened or rate-limited.
|
|
||||||
HARD_BRAKE_TARGET_ACCEL = -1.5
|
|
||||||
HARD_BRAKE_NEED = 2.6
|
|
||||||
|
|
||||||
# Stop-imminent stand-down. When the plan predicts a near-stop within the lookahead, hand the plan straight
|
|
||||||
# through (stock decel) so the car stops at the proper gap with no front-load coast-in. Keyed on the
|
|
||||||
# PREDICTED speed reaching ~0 (covers lead AND light/sign stops), not raw ego speed.
|
|
||||||
STOP_IMMINENT_VEGO = 1.0 # m/s plan-predicted speed below this within the lookahead == stop coming
|
|
||||||
STOP_IMMINENT_LOOKAHEAD_T = 3.0 # s
|
|
||||||
|
|
||||||
# Below this ego speed the brake side is stock passthrough (the comfort stop below adds the only low-speed
|
|
||||||
# shaping); the bounded onset-spread does not run here, so a stock stop is not rate-limited.
|
|
||||||
STOP_PASSTHROUGH_V = 5.0 # m/s
|
|
||||||
|
|
||||||
# Scoped onset-spread -- the ONLY place the output may be transiently WEAKER than the plan. On a NON-emergency
|
|
||||||
# brake the onset may arrive spread over a bounded ramp instead of stepping straight to the plan: the output
|
|
||||||
# may lag the plan by at most ONSET_SPREAD_MAX, deepening toward it at ONSET_SPREAD_JERK. A firm/closing brake
|
|
||||||
# (raw <= HARD_BRAKE_TARGET_ACCEL or brake_need >= HARD_BRAKE_NEED, FCW/crash, should_stop, blended/e2e) skips
|
|
||||||
# this entirely (raw passthrough), so a real hard brake is never softened or delayed.
|
|
||||||
ONSET_SPREAD_MAX = 0.25 # m/s^2: max the output may lag (be weaker than) the live plan, non-emergency only
|
|
||||||
ONSET_SPREAD_JERK = 2.5 # m/s^3: rate the spread output deepens back toward the plan
|
|
||||||
|
|
||||||
# Low-speed comfort stop = ANTI-CREEP HOLD (not a brake adder). In the final approach behind a (near-)stopped
|
|
||||||
# lead it HOLDS the deepest decel the PLAN itself has commanded (gentle-capped), so the brake does not ease
|
|
||||||
# off / creep in before the car is stopped (no roll, slightly roomier). It is NEVER firmer than the plan, so
|
|
||||||
# it can never add a hard bite -- the stop stays as gentle as the plan's own decel. Outside the final approach
|
|
||||||
# (cruising / gap opening as a creeping lead pulls away / lead moving / launch) the floor eases out at the
|
|
||||||
# release rate. min(plan, floor) keeps it never weaker than the plan. Replaces the old kinematic v^2/(2*gap)
|
|
||||||
# enforcer, which engaged late and demanded a firm ~-1.6 grab to hit a fixed gap. Off => no-op.
|
|
||||||
COMFORT_STOP_V = 4.0 # m/s: only engage at/below this ego speed
|
|
||||||
COMFORT_STOP_LEAD_V = 1.0 # m/s: only behind a (near-)stopped lead
|
|
||||||
COMFORT_STOP_GAP = 5.0 # m: reference standstill gap (radar dRel) for the final-approach window
|
|
||||||
COMFORT_STOP_MAX_DECEL = -1.6 # m/s^2: backstop cap on the held decel (a brief plan spike is not held firmer than this)
|
|
||||||
COMFORT_STOP_RELEASE_V = 0.3 # m/s: below this, ease the floor out (release rate) -> smooth stock standstill handoff
|
|
||||||
COMFORT_STOP_HOLD_GAP = 2.0 # m: within this of the reference gap = final-approach window where the hold applies;
|
|
||||||
# beyond it the floor eases out (a creeping lead opening the gap -> no phantom brake)
|
|
||||||
@@ -1,355 +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.
|
|
||||||
"""
|
|
||||||
|
|
||||||
from types import SimpleNamespace
|
|
||||||
|
|
||||||
import numpy as np
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
from openpilot.sunnypilot.selfdrive.controls.lib.accel_personality.accel_controller import AccelController
|
|
||||||
from openpilot.sunnypilot.selfdrive.controls.lib.accel_personality.constants import \
|
|
||||||
ECO, NORMAL, SPORT, PERSONALITY_MIN, PERSONALITY_MAX, A_CRUISE_MAX_BP, RISE_RATE, \
|
|
||||||
STOCK_A_CRUISE_MAX_V, STOCK_RISE_RATE, HARD_BRAKE_TARGET_ACCEL, OVERBITE_CAP, \
|
|
||||||
STOP_PASSTHROUGH_V, ONSET_SPREAD_MAX, AccelerationPersonality
|
|
||||||
|
|
||||||
T_IDXS = [0.0, 0.2, 0.4, 0.6, 0.8, 1.0, 1.25, 1.5, 1.75, 2.0, 2.5, 3.0, 4.0]
|
|
||||||
_EPS = 1e-6
|
|
||||||
|
|
||||||
|
|
||||||
class FakeParams:
|
|
||||||
def __init__(self, store=None):
|
|
||||||
self.store = dict(store or {})
|
|
||||||
|
|
||||||
def get_bool(self, key):
|
|
||||||
return bool(self.store.get(key, False))
|
|
||||||
|
|
||||||
def get(self, key, return_default=False):
|
|
||||||
return int(self.store.get(key, 1))
|
|
||||||
|
|
||||||
def put(self, key, val, block=False):
|
|
||||||
self.store[key] = val
|
|
||||||
|
|
||||||
|
|
||||||
def make_sm(v_ego=20.0, lead_status=False, lead_d=0.0, lead_vlead=0.0):
|
|
||||||
lead = SimpleNamespace(status=lead_status, dRel=lead_d, vLead=lead_vlead)
|
|
||||||
return {'carState': SimpleNamespace(vEgo=v_ego), 'radarState': SimpleNamespace(leadOne=lead)}
|
|
||||||
|
|
||||||
|
|
||||||
def make_controller(enabled=True, personality=NORMAL, crash_cnt=0):
|
|
||||||
store = {"AccelPersonalityEnabled": enabled, "AccelPersonality": int(personality)}
|
|
||||||
ctrl = AccelController(CP=SimpleNamespace(), mpc=SimpleNamespace(crash_cnt=crash_cnt), params=FakeParams(store))
|
|
||||||
ctrl.update(make_sm())
|
|
||||||
return ctrl
|
|
||||||
|
|
||||||
|
|
||||||
def flat_traj(value):
|
|
||||||
return [float(value)] * len(T_IDXS)
|
|
||||||
|
|
||||||
|
|
||||||
# --- Profiles / off==stock ---------------------------------------------------
|
|
||||||
|
|
||||||
def test_enum_source_parity():
|
|
||||||
assert (ECO, NORMAL, SPORT) == (AccelerationPersonality.eco, AccelerationPersonality.normal, AccelerationPersonality.sport)
|
|
||||||
assert (PERSONALITY_MIN, PERSONALITY_MAX) == (0, 2)
|
|
||||||
|
|
||||||
|
|
||||||
def test_disabled_forces_normal_and_stock_ceiling():
|
|
||||||
ctrl = make_controller(enabled=False, personality=SPORT)
|
|
||||||
assert ctrl.personality() == NORMAL
|
|
||||||
assert not ctrl.enabled()
|
|
||||||
for v in (0.0, 10.0, 25.0, 40.0):
|
|
||||||
assert ctrl.get_max_accel(v) == pytest.approx(np.interp(v, A_CRUISE_MAX_BP, STOCK_A_CRUISE_MAX_V))
|
|
||||||
assert ctrl.get_rise_rate() == STOCK_RISE_RATE
|
|
||||||
|
|
||||||
|
|
||||||
def test_disabled_passes_brake_through():
|
|
||||||
ctrl = make_controller(enabled=False)
|
|
||||||
for raw in (-3.0, -1.5, -0.5, 0.0, 1.0):
|
|
||||||
out = ctrl.smooth_target_accel(raw, flat_traj(raw), T_IDXS, should_stop=False)
|
|
||||||
assert out == pytest.approx(raw, abs=_EPS)
|
|
||||||
|
|
||||||
|
|
||||||
def test_normal_is_distinct_from_stock():
|
|
||||||
# off==stock is enforced via the disabled path, NOT by NORMAL==stock, so enabled NORMAL is free to differ.
|
|
||||||
ctrl = make_controller(personality=NORMAL)
|
|
||||||
assert ctrl.get_max_accel(0.0) != pytest.approx(np.interp(0.0, A_CRUISE_MAX_BP, STOCK_A_CRUISE_MAX_V))
|
|
||||||
assert ctrl.get_rise_rate() != STOCK_RISE_RATE
|
|
||||||
|
|
||||||
|
|
||||||
def test_ceiling_ordering_eco_lt_normal_lt_sport():
|
|
||||||
eco, normal, sport = (make_controller(personality=p) for p in (ECO, NORMAL, SPORT))
|
|
||||||
for v in (0.0, 14.0, 25.0, 40.0):
|
|
||||||
assert eco.get_max_accel(v) < normal.get_max_accel(v) < sport.get_max_accel(v)
|
|
||||||
assert eco.get_rise_rate() < normal.get_rise_rate() < sport.get_rise_rate()
|
|
||||||
|
|
||||||
|
|
||||||
def test_rise_rate_ordering():
|
|
||||||
assert RISE_RATE[ECO] < RISE_RATE[NORMAL] < RISE_RATE[SPORT]
|
|
||||||
|
|
||||||
|
|
||||||
# --- SAFETY: never weaker than the plan, hard brakes never delayed --------------
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("personality", [ECO, NORMAL, SPORT])
|
|
||||||
def test_never_weaker_than_plan_sustained(personality):
|
|
||||||
# Safety: an EMERGENCY brake is never weaker than the plan (strict). A non-emergency brake may lag the plan
|
|
||||||
# by at most ONSET_SPREAD_MAX (the bounded onset-spread) and no more.
|
|
||||||
ctrl = make_controller(personality=personality)
|
|
||||||
for raw in [0.0, -0.2, -0.5, -0.9, -1.2, -1.5, -2.0] + [-2.0] * 20:
|
|
||||||
out = ctrl.smooth_target_accel(raw, flat_traj(raw), T_IDXS, should_stop=False)
|
|
||||||
if raw <= HARD_BRAKE_TARGET_ACCEL:
|
|
||||||
assert out <= raw + _EPS # emergency: strict never-weaker
|
|
||||||
elif raw < 0.0:
|
|
||||||
assert out <= raw + ONSET_SPREAD_MAX + _EPS # non-emergency: bounded onset-spread only
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("personality", [ECO, NORMAL, SPORT])
|
|
||||||
def test_never_weaker_random_walk(personality):
|
|
||||||
rng = np.random.default_rng(0)
|
|
||||||
ctrl = make_controller(personality=personality)
|
|
||||||
for _ in range(500):
|
|
||||||
raw = float(rng.uniform(-2.5, 1.5))
|
|
||||||
traj = flat_traj(raw - float(rng.uniform(0.0, 0.6)))
|
|
||||||
out = ctrl.smooth_target_accel(raw, traj, T_IDXS, should_stop=False)
|
|
||||||
if raw < 0.0:
|
|
||||||
assert out <= raw + ONSET_SPREAD_MAX + _EPS # never more than the bounded onset-spread weaker
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("personality", [ECO, NORMAL, SPORT])
|
|
||||||
def test_hard_brake_passes_through_immediately(personality):
|
|
||||||
# Regression for route 00000466 near-crash: a sudden hard brake (plan steps deep) must reach FULL depth
|
|
||||||
# on the FIRST frame -- never rate-limited / delayed, or the car under-brakes into a closing lead.
|
|
||||||
ctrl = make_controller(personality=personality)
|
|
||||||
out = ctrl.smooth_target_accel(-3.5, flat_traj(-3.5), T_IDXS, should_stop=False)
|
|
||||||
assert out == pytest.approx(-3.5, abs=_EPS)
|
|
||||||
assert ctrl.bypassed()
|
|
||||||
|
|
||||||
|
|
||||||
def test_sudden_lead_no_brake_delay():
|
|
||||||
# The exact 466 shape: cruising (plan +1.7, no brake) then a fast lead appears and the plan steps to max
|
|
||||||
# brake. The commanded brake must hit full depth immediately, not ramp in over time.
|
|
||||||
ctrl = make_controller(personality=ECO)
|
|
||||||
for _ in range(5):
|
|
||||||
ctrl.smooth_target_accel(1.7, flat_traj(1.7), T_IDXS, should_stop=False) # cruising, no lead
|
|
||||||
out = ctrl.smooth_target_accel(-3.5, flat_traj(-3.5), T_IDXS, should_stop=False) # lead appears
|
|
||||||
assert out == pytest.approx(-3.5, abs=_EPS) # full brake, zero delay
|
|
||||||
|
|
||||||
|
|
||||||
def test_should_stop_passes_through():
|
|
||||||
ctrl = make_controller(personality=ECO)
|
|
||||||
out = ctrl.smooth_target_accel(-1.0, flat_traj(-1.0), T_IDXS, should_stop=True)
|
|
||||||
assert out == pytest.approx(-1.0, abs=_EPS)
|
|
||||||
assert ctrl.bypassed()
|
|
||||||
|
|
||||||
|
|
||||||
def test_fcw_crash_passes_through():
|
|
||||||
ctrl = make_controller(personality=ECO, crash_cnt=3)
|
|
||||||
out = ctrl.smooth_target_accel(-1.0, flat_traj(-1.0), T_IDXS, should_stop=False)
|
|
||||||
assert out == pytest.approx(-1.0, abs=_EPS)
|
|
||||||
assert ctrl.bypassed()
|
|
||||||
|
|
||||||
|
|
||||||
def test_blended_never_weaker():
|
|
||||||
# Blended/e2e (stock_brake): never weaker than the plan (may anticipate via the never-weaker front-load).
|
|
||||||
ctrl = make_controller(personality=ECO)
|
|
||||||
for raw in [0.0, -0.3, -0.6, -0.9, -1.0, -1.0, -1.0]:
|
|
||||||
out = ctrl.smooth_target_accel(raw, flat_traj(raw), T_IDXS, should_stop=False, stock_brake=True)
|
|
||||||
assert out <= raw + _EPS
|
|
||||||
|
|
||||||
|
|
||||||
# --- Anticipatory front-load (never weaker, capped) ------------------------------
|
|
||||||
|
|
||||||
def test_front_load_brakes_before_plan():
|
|
||||||
# A deeper brake is predicted ahead (brake_need=1.0) while the live plan is still flat -> front-load
|
|
||||||
# brakes early (output goes negative), but the smooth branch keeps it never weaker than the plan.
|
|
||||||
ctrl = make_controller(personality=ECO)
|
|
||||||
out = ctrl.smooth_target_accel(0.0, flat_traj(-1.0), T_IDXS, should_stop=False)
|
|
||||||
assert out < 0.0
|
|
||||||
assert ctrl.smooth_active()
|
|
||||||
assert ctrl.brake_need() == pytest.approx(1.0)
|
|
||||||
|
|
||||||
|
|
||||||
def test_front_load_anticipates_below_live_plan():
|
|
||||||
# When the live plan is gently braking and a deeper brake is predicted, the front-load deepens below the
|
|
||||||
# live plan (anticipatory early brake), settling within OVERBITE_CAP of it.
|
|
||||||
ctrl = make_controller(personality=ECO)
|
|
||||||
out = 0.0
|
|
||||||
for _ in range(20):
|
|
||||||
out = ctrl.smooth_target_accel(-0.2, flat_traj(-1.5), T_IDXS, should_stop=False)
|
|
||||||
assert out < -0.2 - _EPS # deeper than the live -0.2 plan
|
|
||||||
assert out >= -0.2 - OVERBITE_CAP - _EPS # but never more than the cap below it
|
|
||||||
|
|
||||||
|
|
||||||
def test_overbite_cap_limits_frontload_vs_live_plan():
|
|
||||||
# Cut-in/merge: plan still wants throttle (+0.5) while a deep brake is predicted -> front-load may not
|
|
||||||
# settle more than OVERBITE_CAP below the live plan (no abrupt early over-bite).
|
|
||||||
ctrl = make_controller(personality=ECO)
|
|
||||||
traj = [0.5, 0.3, 0.0, -0.5, -1.5, -2.0] + [-2.0] * (len(T_IDXS) - 6)
|
|
||||||
out = 0.0
|
|
||||||
for _ in range(10):
|
|
||||||
out = ctrl.smooth_target_accel(0.5, traj, T_IDXS, should_stop=False)
|
|
||||||
assert ctrl.smooth_active()
|
|
||||||
assert out == pytest.approx(0.5 - OVERBITE_CAP, abs=1e-3)
|
|
||||||
|
|
||||||
|
|
||||||
# --- Stop / low-speed neutrality -------------------------------------------------
|
|
||||||
|
|
||||||
def test_low_speed_brake_is_stock_passthrough():
|
|
||||||
# Stop/creep regime (vEgo < STOP_PASSTHROUGH_V): braking is stock so the stop distance matches OFF.
|
|
||||||
ctrl = make_controller(personality=ECO)
|
|
||||||
ctrl.update(make_sm(v_ego=STOP_PASSTHROUGH_V - 0.1))
|
|
||||||
for raw in (-0.3, -1.0):
|
|
||||||
out = ctrl.smooth_target_accel(raw, flat_traj(-1.5), T_IDXS, should_stop=False)
|
|
||||||
assert out == pytest.approx(raw, abs=_EPS)
|
|
||||||
assert not ctrl.smooth_active()
|
|
||||||
|
|
||||||
|
|
||||||
def test_low_speed_launch_still_shapes():
|
|
||||||
# The low-speed brake passthrough must NOT neutralize positive-accel (launch) shaping.
|
|
||||||
ctrl = make_controller(personality=ECO)
|
|
||||||
ctrl.update(make_sm(v_ego=STOP_PASSTHROUGH_V - 0.1))
|
|
||||||
ctrl.smooth_target_accel(0.0, flat_traj(0.0), T_IDXS, should_stop=False)
|
|
||||||
out = ctrl.smooth_target_accel(1.5, flat_traj(1.5), T_IDXS, should_stop=False)
|
|
||||||
assert out < 1.5 # rise-rate limited (shaped)
|
|
||||||
|
|
||||||
|
|
||||||
def test_stop_imminent_passthrough_but_moving_follow_shapes():
|
|
||||||
# Stop coming (plan speed -> ~0): stock passthrough (no coast-in). Slowing to a moving follow: front-load
|
|
||||||
# stays active so the early-brake goal is preserved.
|
|
||||||
ctrl = make_controller(personality=ECO)
|
|
||||||
stopping = [3.0, 2.0, 1.0, 0.4, 0.0] + [0.0] * (len(T_IDXS) - 5)
|
|
||||||
out = ctrl.smooth_target_accel(-0.1, flat_traj(-1.0), T_IDXS, should_stop=False, speed_trajectory=stopping)
|
|
||||||
assert not ctrl.smooth_active()
|
|
||||||
assert out == pytest.approx(-0.1, abs=_EPS)
|
|
||||||
moving = [8.0] * len(T_IDXS)
|
|
||||||
ctrl.smooth_target_accel(-0.1, flat_traj(-1.0), T_IDXS, should_stop=False, speed_trajectory=moving)
|
|
||||||
assert ctrl.smooth_active()
|
|
||||||
|
|
||||||
|
|
||||||
def test_comfort_stop_holds_through_plan_ease():
|
|
||||||
# Plan brakes to a peak then eases off near the stop (the stock creep). The hold keeps the deeper decel so
|
|
||||||
# the brake does not ease in (no roll) -- but NEVER firmer than the plan's own peak (no added hard bite).
|
|
||||||
ctrl = make_controller(personality=ECO)
|
|
||||||
out = 0.0
|
|
||||||
for plan in [-0.4, -0.8, -1.1, -1.1, -0.6, -0.3, -0.1]: # decel to a -1.1 peak, then ease (creep)
|
|
||||||
ctrl.update(make_sm(v_ego=2.0, lead_status=True, lead_d=6.0, lead_vlead=0.0))
|
|
||||||
out = ctrl.smooth_target_accel(plan, flat_traj(plan), T_IDXS, should_stop=False)
|
|
||||||
assert out < -0.3 - _EPS # held deeper than the easing plan (-0.1) -> no creep-in
|
|
||||||
assert out >= -1.1 - _EPS # but never firmer than the plan's own peak (no -1.6 bite)
|
|
||||||
|
|
||||||
|
|
||||||
def test_comfort_stop_never_firmer_than_plan():
|
|
||||||
# The hold can only stop the brake from WEAKENING; it never commands a decel firmer than the plan itself.
|
|
||||||
ctrl = make_controller(personality=ECO)
|
|
||||||
for plan in [-0.2, -0.5, -0.9, -0.9, -0.9]: # steady (no ease) -> hold matches plan, adds nothing
|
|
||||||
ctrl.update(make_sm(v_ego=2.0, lead_status=True, lead_d=6.0, lead_vlead=0.0))
|
|
||||||
out = ctrl.smooth_target_accel(plan, flat_traj(plan), T_IDXS, should_stop=False)
|
|
||||||
assert out == pytest.approx(plan, abs=_EPS) # never firmer than the (non-easing) plan -> no bite/grab
|
|
||||||
|
|
||||||
|
|
||||||
def test_comfort_stop_monotone_no_early_release():
|
|
||||||
# While still moving, the comfort floor never WEAKENS frame-to-frame (the old enforcer self-released -> roll).
|
|
||||||
ctrl = make_controller(personality=ECO)
|
|
||||||
floors = []
|
|
||||||
for v in [3.0, 2.6, 2.2, 1.8, 1.4, 1.0, 0.6]: # decelerating toward the lead
|
|
||||||
ctrl.update(make_sm(v_ego=v, lead_status=True, lead_d=max(0.5, 7.0 - (3.0 - v) * 2), lead_vlead=0.0))
|
|
||||||
ctrl.smooth_target_accel(-0.5, flat_traj(-0.5), T_IDXS, should_stop=False)
|
|
||||||
floors.append(ctrl._stop_floor)
|
|
||||||
for a, b in zip(floors, floors[1:], strict=False):
|
|
||||||
assert b <= a + _EPS # monotone non-weakening while approaching
|
|
||||||
|
|
||||||
|
|
||||||
def test_comfort_stop_off_when_disabled():
|
|
||||||
ctrl = make_controller(enabled=False, personality=ECO)
|
|
||||||
ctrl.update(make_sm(v_ego=2.0, lead_status=True, lead_d=4.0, lead_vlead=0.0))
|
|
||||||
out = ctrl.smooth_target_accel(-0.1, flat_traj(-0.1), T_IDXS, should_stop=False)
|
|
||||||
assert out == pytest.approx(-0.1, abs=_EPS)
|
|
||||||
|
|
||||||
|
|
||||||
def test_comfort_stop_no_op_moving_lead():
|
|
||||||
# Moving lead (vLead high): no comfort stop (only behind a near-stopped lead).
|
|
||||||
ctrl = make_controller(personality=ECO)
|
|
||||||
ctrl.update(make_sm(v_ego=2.0, lead_status=True, lead_d=6.0, lead_vlead=5.0))
|
|
||||||
out = ctrl.smooth_target_accel(-0.1, flat_traj(-0.1), T_IDXS, should_stop=False)
|
|
||||||
assert out == pytest.approx(-0.1, abs=_EPS)
|
|
||||||
|
|
||||||
|
|
||||||
def test_comfort_stop_never_weaker():
|
|
||||||
# The comfort floor only ever ADDS braking: output never weaker than the plan.
|
|
||||||
ctrl = make_controller(personality=ECO)
|
|
||||||
for raw in (-0.05, -0.3, -1.0, -2.5):
|
|
||||||
ctrl.update(make_sm(v_ego=2.0, lead_status=True, lead_d=5.5, lead_vlead=0.0))
|
|
||||||
out = ctrl.smooth_target_accel(raw, flat_traj(raw), T_IDXS, should_stop=False)
|
|
||||||
assert out <= raw + _EPS
|
|
||||||
|
|
||||||
|
|
||||||
def test_comfort_stop_weakens_when_gap_opens():
|
|
||||||
# Creeping stop-and-go lead (vLead stays < COMFORT_STOP_LEAD_V) that pulls away: once the gap opens well past
|
|
||||||
# the target the floor must WEAKEN, not hold a phantom brake into an opening gap.
|
|
||||||
ctrl = make_controller(personality=ECO)
|
|
||||||
for _ in range(15): # approach close -> deep floor (final-approach hold)
|
|
||||||
ctrl.update(make_sm(v_ego=2.0, lead_status=True, lead_d=5.5, lead_vlead=0.3))
|
|
||||||
ctrl.smooth_target_accel(-0.5, flat_traj(-0.5), T_IDXS, should_stop=False)
|
|
||||||
deep = ctrl._stop_floor
|
|
||||||
assert deep < -0.3
|
|
||||||
for _ in range(25): # lead creeps away (still vLead<1): gap opens wide
|
|
||||||
ctrl.update(make_sm(v_ego=2.0, lead_status=True, lead_d=12.0, lead_vlead=0.5))
|
|
||||||
ctrl.smooth_target_accel(-0.05, flat_traj(-0.05), T_IDXS, should_stop=False)
|
|
||||||
assert ctrl._stop_floor > deep + 0.3 # floor weakened as the gap opened (no phantom brake)
|
|
||||||
|
|
||||||
|
|
||||||
def test_comfort_stop_releases_on_launch():
|
|
||||||
# Stop-and-go GO: after holding a comfort floor at a stop, once the lead moves and the plan wants throttle the
|
|
||||||
# floor must release (track the plan up) and not hold the output below the natural plan -> the car launches.
|
|
||||||
ctrl = make_controller(personality=ECO)
|
|
||||||
for _ in range(20): # hold the plan's -1.0 decel approaching a stopped lead
|
|
||||||
ctrl.update(make_sm(v_ego=1.5, lead_status=True, lead_d=6.0, lead_vlead=0.0))
|
|
||||||
ctrl.smooth_target_accel(-1.0, flat_traj(-1.0), T_IDXS, should_stop=False)
|
|
||||||
assert ctrl._stop_floor < -0.5 # floor holds the plan's decel (engaged/deep)
|
|
||||||
out = 0.0
|
|
||||||
for _ in range(30): # lead launches, plan wants throttle
|
|
||||||
ctrl.update(make_sm(v_ego=2.0, lead_status=True, lead_d=8.0, lead_vlead=4.0))
|
|
||||||
out = ctrl.smooth_target_accel(0.8, flat_traj(0.8), T_IDXS, should_stop=False)
|
|
||||||
assert out > 0.0 # launches (floor did not hold it back)
|
|
||||||
assert ctrl._stop_floor == 0.0 # floor fully released
|
|
||||||
|
|
||||||
|
|
||||||
def test_onset_spread_bounded_and_skipped_for_emergency():
|
|
||||||
# Non-emergency brake onset is spread (lagged) but never by more than ONSET_SPREAD_MAX; an emergency brake
|
|
||||||
# is instant full depth (no spread).
|
|
||||||
ctrl = make_controller(personality=ECO)
|
|
||||||
for _ in range(3):
|
|
||||||
ctrl.smooth_target_accel(0.0, flat_traj(0.0), T_IDXS, should_stop=False)
|
|
||||||
out = ctrl.smooth_target_accel(-1.0, flat_traj(-1.0), T_IDXS, should_stop=False) # non-emergency step
|
|
||||||
assert out > -1.0 + _EPS # lagged (spread), not an instant step
|
|
||||||
assert out <= -1.0 + ONSET_SPREAD_MAX + _EPS # but bounded
|
|
||||||
ctrl2 = make_controller(personality=ECO)
|
|
||||||
for _ in range(3):
|
|
||||||
ctrl2.smooth_target_accel(0.0, flat_traj(0.0), T_IDXS, should_stop=False)
|
|
||||||
out2 = ctrl2.smooth_target_accel(-2.0, flat_traj(-2.0), T_IDXS, should_stop=False) # emergency (<= -1.5)
|
|
||||||
assert out2 == pytest.approx(-2.0, abs=_EPS)
|
|
||||||
|
|
||||||
|
|
||||||
def test_disabled_hard_brake_is_instant_stock():
|
|
||||||
ctrl = make_controller(enabled=False, personality=ECO)
|
|
||||||
out = ctrl.smooth_target_accel(-3.0, flat_traj(-3.0), T_IDXS, should_stop=False)
|
|
||||||
assert out == pytest.approx(-3.0, abs=_EPS)
|
|
||||||
|
|
||||||
|
|
||||||
# --- Misc ------------------------------------------------------------------------
|
|
||||||
|
|
||||||
def test_out_of_range_personality_clamps():
|
|
||||||
ctrl = AccelController(CP=SimpleNamespace(), mpc=SimpleNamespace(crash_cnt=0),
|
|
||||||
params=FakeParams({"AccelPersonalityEnabled": True, "AccelPersonality": 99}))
|
|
||||||
ctrl.update(make_sm())
|
|
||||||
assert ctrl.personality() == PERSONALITY_MAX
|
|
||||||
|
|
||||||
|
|
||||||
def test_reset_passes_through():
|
|
||||||
ctrl = make_controller(personality=ECO)
|
|
||||||
out = ctrl.smooth_target_accel(0.0, flat_traj(-1.0), T_IDXS, should_stop=False, reset=True)
|
|
||||||
assert out == pytest.approx(0.0, abs=_EPS)
|
|
||||||
assert not ctrl.bypassed()
|
|
||||||
@@ -1,53 +1,17 @@
|
|||||||
from openpilot.common.realtime import DT_MDL
|
|
||||||
|
|
||||||
|
|
||||||
class WMACConstants:
|
class WMACConstants:
|
||||||
TRAJECTORY_SIZE = 33
|
# Lead detection parameters
|
||||||
PARAM_READ_FRAMES = max(1, int(round(1.0 / DT_MDL)))
|
LEAD_WINDOW_SIZE = 6 # Stable detection window
|
||||||
|
LEAD_PROB = 0.45 # Balanced threshold for lead detection
|
||||||
|
|
||||||
EMERGENCY_HOLD_FRAMES = max(1, int(round(0.75 / DT_MDL)))
|
# Slow down detection parameters
|
||||||
MIN_MODE_DURATION = {'acc': max(1, int(round(0.6 / DT_MDL))), 'blended': max(1, int(round(0.5 / DT_MDL)))}
|
SLOW_DOWN_WINDOW_SIZE = 5 # Responsive but stable
|
||||||
ENTER_BLENDED_FRAMES = max(1, int(round(0.4 / DT_MDL)))
|
SLOW_DOWN_PROB = 0.3 # Balanced threshold for slow down scenarios
|
||||||
EXIT_BLENDED_FRAMES = max(1, int(round(0.35 / DT_MDL)))
|
|
||||||
STANDSTILL_FRAMES = max(1, int(round(0.2 / DT_MDL)))
|
|
||||||
|
|
||||||
LEAD_PROB = 0.45
|
# Optimized slow down distance curve - smooth and progressive
|
||||||
LEAD_EXIT_PROB = 0.25
|
|
||||||
LEAD_RISE_RATE = 1.0
|
|
||||||
LEAD_FALL_RATE = 0.35
|
|
||||||
RADAR_LEAD_ACC_PROB = 0.5
|
|
||||||
RADAR_LEAD_ACC_EXIT_PROB = 0.4
|
|
||||||
RADAR_LEAD_ACC_RISE_RATE = 1.0
|
|
||||||
RADAR_LEAD_ACC_FALL_RATE = 0.25
|
|
||||||
RADAR_LEAD_ACC_MAX_DREL = 80.0
|
|
||||||
RADAR_LEAD_ACC_MAX_TTC = 6.0
|
|
||||||
RADAR_LEAD_ACC_MIN_CLOSING_SPEED = -0.5
|
|
||||||
|
|
||||||
SLOW_DOWN_PROB = 0.5
|
|
||||||
SLOW_DOWN_EXIT_PROB = 0.4
|
|
||||||
SLOW_DOWN_RISE_RATE = 0.65
|
|
||||||
SLOW_DOWN_FALL_RATE = 0.15
|
|
||||||
SLOW_DOWN_BP = [0., 10., 20., 30., 40., 50., 55., 60.]
|
SLOW_DOWN_BP = [0., 10., 20., 30., 40., 50., 55., 60.]
|
||||||
SLOW_DOWN_DIST = [32., 46., 64., 86., 108., 130., 145., 165.]
|
SLOW_DOWN_DIST = [32., 46., 64., 86., 108., 130., 145., 165.]
|
||||||
URGENT_SLOW_DOWN_PROB = 0.85
|
|
||||||
|
|
||||||
MODEL_DECEL_START = -0.5
|
# Slowness detection parameters
|
||||||
MODEL_DECEL_RANGE = 2.0
|
SLOWNESS_WINDOW_SIZE = 10 # Stable slowness detection
|
||||||
MODEL_STOP_TIME = 3.0
|
SLOWNESS_PROB = 0.55 # Clear threshold for slowness
|
||||||
MODEL_STOP_MIN_DISTANCE = 4.0
|
SLOWNESS_CRUISE_OFFSET = 1.025 # Conservative cruise speed offset
|
||||||
MODEL_STOP_TARGET_TIME = 3.0
|
|
||||||
MODEL_STOP_PROB = 0.55
|
|
||||||
MODEL_STOP_EXIT_PROB = 0.35
|
|
||||||
MODEL_STOP_RISE_RATE = 0.8
|
|
||||||
MODEL_STOP_FALL_RATE = 0.25
|
|
||||||
ENDPOINT_URGENCY_GAIN = 1.3
|
|
||||||
CRITICAL_ENDPOINT_FACTOR = 0.3
|
|
||||||
CRITICAL_URGENCY_GAIN = 1.5
|
|
||||||
SPEED_URGENCY_MIN = 25.0
|
|
||||||
SPEED_URGENCY_RANGE = 80.0
|
|
||||||
|
|
||||||
SLOWNESS_PROB = 0.55
|
|
||||||
SLOWNESS_EXIT_PROB = 0.45
|
|
||||||
SLOWNESS_RISE_RATE = 0.35
|
|
||||||
SLOWNESS_FALL_RATE = 0.5
|
|
||||||
SLOWNESS_CRUISE_OFFSET = 1.025
|
|
||||||
|
|||||||
@@ -6,116 +6,129 @@ See the LICENSE.md file in the root directory for more details.
|
|||||||
"""
|
"""
|
||||||
# Version = 2025-6-30
|
# Version = 2025-6-30
|
||||||
|
|
||||||
|
from cereal import messaging
|
||||||
|
from opendbc.car import structs
|
||||||
|
from numpy import interp
|
||||||
|
from openpilot.common.params import Params
|
||||||
|
from openpilot.common.realtime import DT_MDL
|
||||||
|
from openpilot.sunnypilot.selfdrive.controls.lib.dec.constants import WMACConstants
|
||||||
from typing import Literal
|
from typing import Literal
|
||||||
|
|
||||||
from cereal import messaging
|
# d-e2e, from modeldata.h
|
||||||
from numpy import interp
|
TRAJECTORY_SIZE = 33
|
||||||
from opendbc.car import structs
|
SET_MODE_TIMEOUT = 15
|
||||||
from openpilot.common.params import Params
|
|
||||||
from openpilot.sunnypilot.selfdrive.controls.lib.dec.constants import WMACConstants
|
|
||||||
|
|
||||||
|
# Define the valid mode types
|
||||||
ModeType = Literal['acc', 'blended']
|
ModeType = Literal['acc', 'blended']
|
||||||
|
|
||||||
|
|
||||||
def clip01(value: float) -> float:
|
class SmoothKalmanFilter:
|
||||||
return max(0.0, min(1.0, float(value)))
|
"""Enhanced Kalman filter with smoothing for stable decision making."""
|
||||||
|
|
||||||
|
def __init__(self, initial_value=0, measurement_noise=0.1, process_noise=0.01,
|
||||||
|
alpha=1.0, smoothing_factor=0.85):
|
||||||
|
self.x = initial_value
|
||||||
|
self.P = 1.0
|
||||||
|
self.R = measurement_noise
|
||||||
|
self.Q = process_noise
|
||||||
|
self.alpha = alpha
|
||||||
|
self.smoothing_factor = smoothing_factor
|
||||||
|
self.initialized = False
|
||||||
|
self.history = []
|
||||||
|
self.max_history = 10
|
||||||
|
self.confidence = 0.0
|
||||||
|
|
||||||
class SmoothedSignal:
|
def add_data(self, measurement):
|
||||||
def __init__(self, rise_rate: float, fall_rate: float, initial_value: float = 0.0):
|
if len(self.history) >= self.max_history:
|
||||||
self.rise_rate = clip01(rise_rate)
|
self.history.pop(0)
|
||||||
self.fall_rate = clip01(fall_rate)
|
self.history.append(measurement)
|
||||||
self.value = clip01(initial_value)
|
|
||||||
|
|
||||||
def update(self, measurement: float) -> float:
|
if not self.initialized:
|
||||||
measurement = clip01(measurement)
|
self.x = measurement
|
||||||
rate = self.rise_rate if measurement > self.value else self.fall_rate
|
self.initialized = True
|
||||||
self.value += (measurement - self.value) * rate
|
self.confidence = 0.1
|
||||||
return self.value
|
return
|
||||||
|
|
||||||
def reset(self, value: float = 0.0) -> None:
|
self.P = self.alpha * self.P + self.Q
|
||||||
self.value = clip01(value)
|
|
||||||
|
|
||||||
|
K = self.P / (self.P + self.R)
|
||||||
|
effective_K = K * (1.0 - self.smoothing_factor) + self.smoothing_factor * 0.1
|
||||||
|
|
||||||
class HysteresisSignal:
|
innovation = measurement - self.x
|
||||||
def __init__(self, enter_threshold: float, exit_threshold: float, rise_rate: float, fall_rate: float):
|
self.x = self.x + effective_K * innovation
|
||||||
self.enter_threshold = clip01(enter_threshold)
|
self.P = (1 - effective_K) * self.P
|
||||||
self.exit_threshold = clip01(exit_threshold)
|
|
||||||
self.filter = SmoothedSignal(rise_rate, fall_rate)
|
|
||||||
self.active = False
|
|
||||||
|
|
||||||
def update(self, measurement: float) -> bool:
|
if abs(innovation) < 0.1:
|
||||||
value = self.filter.update(measurement)
|
self.confidence = min(1.0, self.confidence + 0.05)
|
||||||
threshold = self.exit_threshold if self.active else self.enter_threshold
|
else:
|
||||||
self.active = value > threshold
|
self.confidence = max(0.1, self.confidence - 0.02)
|
||||||
return self.active
|
|
||||||
|
|
||||||
def reset(self) -> None:
|
def get_value(self):
|
||||||
self.filter.reset()
|
return self.x if self.initialized else None
|
||||||
self.active = False
|
|
||||||
|
|
||||||
@property
|
def get_confidence(self):
|
||||||
def value(self) -> float:
|
return self.confidence
|
||||||
return self.filter.value
|
|
||||||
|
def reset_data(self):
|
||||||
|
self.initialized = False
|
||||||
|
self.history = []
|
||||||
|
self.confidence = 0.0
|
||||||
|
|
||||||
|
|
||||||
class ModeTransitionManager:
|
class ModeTransitionManager:
|
||||||
|
"""Manages smooth transitions between driving modes with hysteresis."""
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.current_mode: ModeType = 'acc'
|
self.current_mode: ModeType = 'acc'
|
||||||
|
self.mode_confidence = {'acc': 1.0, 'blended': 0.0}
|
||||||
|
self.transition_timeout = 0
|
||||||
|
self.min_mode_duration = 10
|
||||||
self.mode_duration = 0
|
self.mode_duration = 0
|
||||||
self._pending_mode: ModeType = 'acc'
|
self.emergency_override = False
|
||||||
self._pending_count = 0
|
|
||||||
self._blended_hold_frames = 0
|
|
||||||
|
|
||||||
def request_mode(self, mode: ModeType, immediate: bool = False, hold_frames: int = 0, cancel_hold: bool = False) -> None:
|
def request_mode(self, mode: ModeType, confidence: float = 1.0, emergency: bool = False):
|
||||||
if immediate:
|
# Emergency override for critical situations (stops, collisions)
|
||||||
self._blended_hold_frames = max(self._blended_hold_frames, hold_frames)
|
if emergency:
|
||||||
self._pending_mode = mode
|
self.emergency_override = True
|
||||||
self._pending_count = 0
|
self.current_mode = mode
|
||||||
self._switch_mode(mode)
|
self.transition_timeout = SET_MODE_TIMEOUT
|
||||||
|
self.mode_duration = 0
|
||||||
return
|
return
|
||||||
|
|
||||||
if cancel_hold and mode == 'acc':
|
self.mode_confidence[mode] = min(1.0, self.mode_confidence[mode] + 0.1 * confidence)
|
||||||
self._blended_hold_frames = 0
|
for m in self.mode_confidence:
|
||||||
|
if m != mode:
|
||||||
|
self.mode_confidence[m] = max(0.0, self.mode_confidence[m] - 0.05)
|
||||||
|
|
||||||
if self._blended_hold_frames > 0:
|
# Require minimum duration in current mode (unless emergency)
|
||||||
mode = 'blended'
|
if self.mode_duration < self.min_mode_duration and not self.emergency_override:
|
||||||
|
|
||||||
if mode == self.current_mode:
|
|
||||||
self._pending_mode = mode
|
|
||||||
self._pending_count = 0
|
|
||||||
return
|
return
|
||||||
|
|
||||||
if mode != self._pending_mode:
|
# Hysteresis: higher threshold for mode changes
|
||||||
self._pending_mode = mode
|
confidence_threshold = 0.6 if mode != self.current_mode else 0.3 # Lower threshold for faster response
|
||||||
self._pending_count = 1
|
|
||||||
else:
|
|
||||||
self._pending_count += 1
|
|
||||||
|
|
||||||
if self.mode_duration < WMACConstants.MIN_MODE_DURATION[self.current_mode]:
|
if self.mode_confidence[mode] > confidence_threshold:
|
||||||
return
|
if mode != self.current_mode and self.transition_timeout == 0:
|
||||||
|
self.transition_timeout = SET_MODE_TIMEOUT
|
||||||
|
self.current_mode = mode
|
||||||
|
self.mode_duration = 0
|
||||||
|
|
||||||
required_count = WMACConstants.ENTER_BLENDED_FRAMES if mode == 'blended' else WMACConstants.EXIT_BLENDED_FRAMES
|
def update(self):
|
||||||
if self._pending_count >= required_count:
|
if self.transition_timeout > 0:
|
||||||
self._switch_mode(mode)
|
self.transition_timeout -= 1
|
||||||
|
|
||||||
def update(self) -> None:
|
|
||||||
if self._blended_hold_frames > 0:
|
|
||||||
self._blended_hold_frames -= 1
|
|
||||||
self.mode_duration += 1
|
self.mode_duration += 1
|
||||||
|
|
||||||
|
# Reset emergency override after some time
|
||||||
|
if self.emergency_override and self.mode_duration > 20:
|
||||||
|
self.emergency_override = False
|
||||||
|
|
||||||
|
# Gradual confidence decay
|
||||||
|
for mode in self.mode_confidence:
|
||||||
|
self.mode_confidence[mode] *= 0.98
|
||||||
|
|
||||||
def get_mode(self) -> ModeType:
|
def get_mode(self) -> ModeType:
|
||||||
return self.current_mode
|
return self.current_mode
|
||||||
|
|
||||||
def _switch_mode(self, mode: ModeType) -> None:
|
|
||||||
if mode == self.current_mode:
|
|
||||||
return
|
|
||||||
|
|
||||||
self.current_mode = mode
|
|
||||||
self.mode_duration = 0
|
|
||||||
self._pending_mode = mode
|
|
||||||
self._pending_count = 0
|
|
||||||
|
|
||||||
|
|
||||||
class DynamicExperimentalController:
|
class DynamicExperimentalController:
|
||||||
def __init__(self, CP: structs.CarParams, mpc, params=None):
|
def __init__(self, CP: structs.CarParams, mpc, params=None):
|
||||||
@@ -129,57 +142,50 @@ class DynamicExperimentalController:
|
|||||||
|
|
||||||
self._mode_manager = ModeTransitionManager()
|
self._mode_manager = ModeTransitionManager()
|
||||||
|
|
||||||
self._lead_tracker = HysteresisSignal(
|
# Smooth filters for stable decision making with faster response for critical scenarios
|
||||||
enter_threshold=WMACConstants.LEAD_PROB,
|
self._lead_filter = SmoothKalmanFilter(
|
||||||
exit_threshold=WMACConstants.LEAD_EXIT_PROB,
|
measurement_noise=0.15,
|
||||||
rise_rate=WMACConstants.LEAD_RISE_RATE,
|
process_noise=0.05,
|
||||||
fall_rate=WMACConstants.LEAD_FALL_RATE,
|
alpha=1.02,
|
||||||
)
|
smoothing_factor=0.8
|
||||||
self._radar_acc_lead_tracker = HysteresisSignal(
|
|
||||||
enter_threshold=WMACConstants.RADAR_LEAD_ACC_PROB,
|
|
||||||
exit_threshold=WMACConstants.RADAR_LEAD_ACC_EXIT_PROB,
|
|
||||||
rise_rate=WMACConstants.RADAR_LEAD_ACC_RISE_RATE,
|
|
||||||
fall_rate=WMACConstants.RADAR_LEAD_ACC_FALL_RATE,
|
|
||||||
)
|
|
||||||
self._slow_down_tracker = HysteresisSignal(
|
|
||||||
enter_threshold=WMACConstants.SLOW_DOWN_PROB,
|
|
||||||
exit_threshold=WMACConstants.SLOW_DOWN_EXIT_PROB,
|
|
||||||
rise_rate=WMACConstants.SLOW_DOWN_RISE_RATE,
|
|
||||||
fall_rate=WMACConstants.SLOW_DOWN_FALL_RATE,
|
|
||||||
)
|
|
||||||
self._slowness_tracker = HysteresisSignal(
|
|
||||||
enter_threshold=WMACConstants.SLOWNESS_PROB,
|
|
||||||
exit_threshold=WMACConstants.SLOWNESS_EXIT_PROB,
|
|
||||||
rise_rate=WMACConstants.SLOWNESS_RISE_RATE,
|
|
||||||
fall_rate=WMACConstants.SLOWNESS_FALL_RATE,
|
|
||||||
)
|
|
||||||
self._model_stop_tracker = HysteresisSignal(
|
|
||||||
enter_threshold=WMACConstants.MODEL_STOP_PROB,
|
|
||||||
exit_threshold=WMACConstants.MODEL_STOP_EXIT_PROB,
|
|
||||||
rise_rate=WMACConstants.MODEL_STOP_RISE_RATE,
|
|
||||||
fall_rate=WMACConstants.MODEL_STOP_FALL_RATE,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
self._slow_down_filter = SmoothKalmanFilter(
|
||||||
|
measurement_noise=0.1,
|
||||||
|
process_noise=0.1,
|
||||||
|
alpha=1.05,
|
||||||
|
smoothing_factor=0.7
|
||||||
|
)
|
||||||
|
|
||||||
|
self._slowness_filter = SmoothKalmanFilter(
|
||||||
|
measurement_noise=0.1,
|
||||||
|
process_noise=0.06,
|
||||||
|
alpha=1.015,
|
||||||
|
smoothing_factor=0.92
|
||||||
|
)
|
||||||
|
|
||||||
|
self._mpc_fcw_filter = SmoothKalmanFilter(
|
||||||
|
measurement_noise=0.2,
|
||||||
|
process_noise=0.1,
|
||||||
|
alpha=1.1,
|
||||||
|
smoothing_factor=0.5
|
||||||
|
)
|
||||||
self._has_lead_filtered = False
|
self._has_lead_filtered = False
|
||||||
self._has_radar_acc_lead = False
|
|
||||||
self._has_slow_down = False
|
self._has_slow_down = False
|
||||||
self._has_slowness = False
|
self._has_slowness = False
|
||||||
self._has_mpc_fcw = False
|
self._has_mpc_fcw = False
|
||||||
self._has_model_should_stop = False
|
|
||||||
self._has_model_stop = False
|
|
||||||
self._v_ego_kph = 0.0
|
self._v_ego_kph = 0.0
|
||||||
self._v_cruise_kph = 0.0
|
self._v_cruise_kph = 0.0
|
||||||
self._has_standstill = False
|
self._has_standstill = False
|
||||||
self._mpc_fcw_crash_cnt = 0
|
self._mpc_fcw_crash_cnt = 0
|
||||||
self._standstill_count = 0
|
self._standstill_count = 0
|
||||||
|
# debug
|
||||||
self._endpoint_x = float('inf')
|
self._endpoint_x = float('inf')
|
||||||
self._expected_distance = 0.0
|
self._expected_distance = 0.0
|
||||||
self._trajectory_valid = False
|
self._trajectory_valid = False
|
||||||
self._raw_urgency = 0.0
|
|
||||||
|
|
||||||
def _read_params(self) -> None:
|
def _read_params(self) -> None:
|
||||||
if self._frame % WMACConstants.PARAM_READ_FRAMES == 0:
|
if self._frame % int(1. / DT_MDL) == 0:
|
||||||
self._enabled = self._params.get_bool("DynamicExperimentalControl")
|
self._enabled = self._params.get_bool("DynamicExperimentalControl")
|
||||||
|
|
||||||
def mode(self) -> str:
|
def mode(self) -> str:
|
||||||
@@ -191,19 +197,8 @@ class DynamicExperimentalController:
|
|||||||
def active(self) -> bool:
|
def active(self) -> bool:
|
||||||
return self._active
|
return self._active
|
||||||
|
|
||||||
def force_stop_requested(self) -> bool:
|
|
||||||
return self._active and self._trajectory_valid and self._has_model_stop and not self._has_lead_filtered
|
|
||||||
|
|
||||||
def apply_model_stop_target(self, v_target: float) -> float:
|
|
||||||
if not self.force_stop_requested():
|
|
||||||
return v_target
|
|
||||||
if self._has_standstill:
|
|
||||||
return 0.0
|
|
||||||
|
|
||||||
stop_target = max(0.0, self._endpoint_x) / WMACConstants.MODEL_STOP_TARGET_TIME
|
|
||||||
return min(v_target, stop_target)
|
|
||||||
|
|
||||||
def set_mpc_fcw_crash_cnt(self) -> None:
|
def set_mpc_fcw_crash_cnt(self) -> None:
|
||||||
|
"""Set MPC FCW crash count"""
|
||||||
self._mpc_fcw_crash_cnt = self._mpc.crash_cnt
|
self._mpc_fcw_crash_cnt = self._mpc.crash_cnt
|
||||||
|
|
||||||
def _update_calculations(self, sm: messaging.SubMaster) -> None:
|
def _update_calculations(self, sm: messaging.SubMaster) -> None:
|
||||||
@@ -215,121 +210,179 @@ class DynamicExperimentalController:
|
|||||||
self._v_cruise_kph = car_state.vCruise
|
self._v_cruise_kph = car_state.vCruise
|
||||||
self._has_standstill = car_state.standstill
|
self._has_standstill = car_state.standstill
|
||||||
|
|
||||||
|
# standstill detection
|
||||||
if self._has_standstill:
|
if self._has_standstill:
|
||||||
self._standstill_count = min(WMACConstants.STANDSTILL_FRAMES * 3, self._standstill_count + 1)
|
self._standstill_count = min(20, self._standstill_count + 1)
|
||||||
else:
|
else:
|
||||||
self._standstill_count = max(0, self._standstill_count - 1)
|
self._standstill_count = max(0, self._standstill_count - 1)
|
||||||
|
|
||||||
self._has_lead_filtered = self._lead_tracker.update(float(lead_one.status))
|
# Lead detection
|
||||||
self._has_radar_acc_lead = self._radar_acc_lead_tracker.update(self._radar_acc_lead_score(lead_one))
|
self._lead_filter.add_data(float(lead_one.status))
|
||||||
self._has_mpc_fcw = self._mpc_fcw_crash_cnt > 0
|
lead_value = self._lead_filter.get_value() or 0.0
|
||||||
|
self._has_lead_filtered = lead_value > WMACConstants.LEAD_PROB
|
||||||
|
|
||||||
|
# MPC FCW detection
|
||||||
|
fcw_filtered_value = self._mpc_fcw_filter.get_value() or 0.0
|
||||||
|
self._mpc_fcw_filter.add_data(float(self._mpc_fcw_crash_cnt > 0))
|
||||||
|
self._has_mpc_fcw = fcw_filtered_value > 0.5
|
||||||
|
|
||||||
|
# Slow down detection
|
||||||
self._calculate_slow_down(md)
|
self._calculate_slow_down(md)
|
||||||
|
|
||||||
if self._standstill_count > WMACConstants.STANDSTILL_FRAMES or self._has_slow_down:
|
# Slowness detection
|
||||||
self._slowness_tracker.reset()
|
if not (self._standstill_count > 5) and not self._has_slow_down:
|
||||||
self._has_slowness = False
|
|
||||||
else:
|
|
||||||
current_slowness = float(self._v_ego_kph <= (self._v_cruise_kph * WMACConstants.SLOWNESS_CRUISE_OFFSET))
|
current_slowness = float(self._v_ego_kph <= (self._v_cruise_kph * WMACConstants.SLOWNESS_CRUISE_OFFSET))
|
||||||
self._has_slowness = self._slowness_tracker.update(current_slowness)
|
self._slowness_filter.add_data(current_slowness)
|
||||||
|
slowness_value = self._slowness_filter.get_value() or 0.0
|
||||||
|
|
||||||
def _calculate_slow_down(self, md) -> None:
|
# Hysteresis for slowness
|
||||||
|
threshold = WMACConstants.SLOWNESS_PROB * (0.8 if self._has_slowness else 1.1)
|
||||||
|
self._has_slowness = slowness_value > threshold
|
||||||
|
|
||||||
|
def _calculate_slow_down(self, md):
|
||||||
|
"""Calculate urgency based on trajectory endpoint vs expected distance."""
|
||||||
|
|
||||||
|
# Reset to safe defaults
|
||||||
|
urgency = 0.0
|
||||||
self._endpoint_x = float('inf')
|
self._endpoint_x = float('inf')
|
||||||
self._expected_distance = 0.0
|
|
||||||
self._trajectory_valid = False
|
self._trajectory_valid = False
|
||||||
self._has_model_should_stop = False
|
|
||||||
|
|
||||||
urgency = self._model_action_urgency(md)
|
#Require exact trajectory size
|
||||||
position_valid = len(md.position.x) == WMACConstants.TRAJECTORY_SIZE
|
position_valid = len(md.position.x) == TRAJECTORY_SIZE
|
||||||
|
orientation_valid = len(md.orientation.x) == TRAJECTORY_SIZE
|
||||||
|
|
||||||
if position_valid:
|
if not (position_valid and orientation_valid):
|
||||||
self._trajectory_valid = True
|
# Invalid trajectory - this itself might indicate a stop scenario
|
||||||
self._endpoint_x = md.position.x[WMACConstants.TRAJECTORY_SIZE - 1]
|
# Apply moderate urgency for incomplete trajectories at speed
|
||||||
self._expected_distance = interp(self._v_ego_kph, WMACConstants.SLOW_DOWN_BP, WMACConstants.SLOW_DOWN_DIST)
|
if self._v_ego_kph > 20.0:
|
||||||
urgency = max(urgency, self._endpoint_urgency(self._endpoint_x, self._expected_distance))
|
urgency = 0.3
|
||||||
|
|
||||||
self._raw_urgency = clip01(urgency)
|
self._slow_down_filter.add_data(urgency)
|
||||||
self._has_slow_down = self._slow_down_tracker.update(self._raw_urgency)
|
urgency_filtered = self._slow_down_filter.get_value() or 0.0
|
||||||
self._urgency = self._slow_down_tracker.value
|
self._has_slow_down = urgency_filtered > WMACConstants.SLOW_DOWN_PROB
|
||||||
self._update_model_stop()
|
self._urgency = urgency_filtered
|
||||||
|
return
|
||||||
|
|
||||||
def _radar_acc_lead_score(self, lead_one) -> float:
|
# We have a valid full trajectory
|
||||||
if not lead_one.status:
|
self._trajectory_valid = True
|
||||||
return 0.0
|
|
||||||
|
|
||||||
d_rel = float(getattr(lead_one, 'dRel', float('inf')))
|
# Use the exact endpoint (33rd point, index 32)
|
||||||
v_rel = float(getattr(lead_one, 'vRel', 0.0))
|
endpoint_x = md.position.x[TRAJECTORY_SIZE - 1]
|
||||||
if d_rel <= WMACConstants.RADAR_LEAD_ACC_MAX_DREL:
|
self._endpoint_x = endpoint_x
|
||||||
return 1.0
|
|
||||||
if v_rel <= WMACConstants.RADAR_LEAD_ACC_MIN_CLOSING_SPEED and d_rel / max(-v_rel, 0.1) <= WMACConstants.RADAR_LEAD_ACC_MAX_TTC:
|
|
||||||
return 1.0
|
|
||||||
return 0.0
|
|
||||||
|
|
||||||
def _model_action_urgency(self, md) -> float:
|
# Get expected distance based on current speed using tuned constants
|
||||||
action = getattr(md, 'action', None)
|
expected_distance = interp(self._v_ego_kph,
|
||||||
if action is None:
|
WMACConstants.SLOW_DOWN_BP,
|
||||||
return 0.0
|
WMACConstants.SLOW_DOWN_DIST)
|
||||||
|
self._expected_distance = expected_distance
|
||||||
|
|
||||||
self._has_model_should_stop = bool(getattr(action, 'shouldStop', False))
|
# Calculate urgency based on trajectory shortage
|
||||||
urgency = 1.0 if self._has_model_should_stop else 0.0
|
if endpoint_x < expected_distance:
|
||||||
desired_accel = getattr(action, 'desiredAcceleration', 0.0)
|
shortage = expected_distance - endpoint_x
|
||||||
if desired_accel < WMACConstants.MODEL_DECEL_START:
|
shortage_ratio = shortage / expected_distance
|
||||||
urgency = max(urgency, min(1.0, (WMACConstants.MODEL_DECEL_START - desired_accel) / WMACConstants.MODEL_DECEL_RANGE))
|
|
||||||
return urgency
|
|
||||||
|
|
||||||
def _update_model_stop(self) -> None:
|
# Base urgency on shortage ratio
|
||||||
stop_score = 0.0
|
urgency = min(1.0, shortage_ratio * 2.0)
|
||||||
if self._has_model_should_stop and self._trajectory_valid and not self._has_lead_filtered:
|
|
||||||
v_ego = self._v_ego_kph / 3.6
|
|
||||||
stop_window = max(WMACConstants.MODEL_STOP_MIN_DISTANCE, v_ego * WMACConstants.MODEL_STOP_TIME)
|
|
||||||
stop_score = float(0.0 < self._endpoint_x <= stop_window)
|
|
||||||
|
|
||||||
self._has_model_stop = self._model_stop_tracker.update(stop_score)
|
# Increase urgency for very short trajectories (imminent stops)
|
||||||
|
critical_distance = expected_distance * 0.3
|
||||||
|
if endpoint_x < critical_distance:
|
||||||
|
urgency = min(1.0, urgency * 2.0)
|
||||||
|
|
||||||
def _endpoint_urgency(self, endpoint_x: float, expected_distance: float) -> float:
|
# Speed-based urgency adjustment
|
||||||
if endpoint_x >= expected_distance:
|
if self._v_ego_kph > 25.0:
|
||||||
return 0.0
|
speed_factor = 1.0 + (self._v_ego_kph - 25.0) / 80.0
|
||||||
|
urgency = min(1.0, urgency * speed_factor)
|
||||||
|
|
||||||
shortage_ratio = (expected_distance - endpoint_x) / expected_distance
|
# Apply filtering but with less smoothing for stops
|
||||||
urgency = min(1.0, shortage_ratio * WMACConstants.ENDPOINT_URGENCY_GAIN)
|
self._slow_down_filter.add_data(urgency)
|
||||||
|
urgency_filtered = self._slow_down_filter.get_value() or 0.0
|
||||||
|
|
||||||
if endpoint_x < expected_distance * WMACConstants.CRITICAL_ENDPOINT_FACTOR:
|
# Update state with lower threshold for better stop detection
|
||||||
urgency = min(1.0, urgency * WMACConstants.CRITICAL_URGENCY_GAIN)
|
self._has_slow_down = urgency_filtered > (WMACConstants.SLOW_DOWN_PROB * 0.8)
|
||||||
|
self._urgency = urgency_filtered
|
||||||
|
|
||||||
if self._v_ego_kph > WMACConstants.SPEED_URGENCY_MIN:
|
def _radarless_mode(self) -> None:
|
||||||
speed_factor = 1.0 + (self._v_ego_kph - WMACConstants.SPEED_URGENCY_MIN) / WMACConstants.SPEED_URGENCY_RANGE
|
"""Radarless mode decision logic with emergency handling."""
|
||||||
urgency = min(1.0, urgency * speed_factor)
|
|
||||||
|
|
||||||
return urgency
|
|
||||||
|
|
||||||
def _desired_mode(self) -> tuple[ModeType, bool]:
|
|
||||||
if not self._CP.radarUnavailable and self._has_radar_acc_lead:
|
|
||||||
return 'acc', False
|
|
||||||
|
|
||||||
|
# EMERGENCY: MPC FCW - immediate blended mode
|
||||||
if self._has_mpc_fcw:
|
if self._has_mpc_fcw:
|
||||||
return 'blended', True
|
self._mode_manager.request_mode('blended', confidence=1.0, emergency=True)
|
||||||
|
return
|
||||||
|
|
||||||
standstill = self._standstill_count > WMACConstants.STANDSTILL_FRAMES
|
# Standstill: use blended
|
||||||
urgent_slow_down = self._has_slow_down and self._raw_urgency > WMACConstants.URGENT_SLOW_DOWN_PROB
|
if self._standstill_count > 3:
|
||||||
|
self._mode_manager.request_mode('blended', confidence=0.9)
|
||||||
|
return
|
||||||
|
|
||||||
if self._CP.radarUnavailable:
|
# Slow down scenarios: emergency for high urgency, normal for lower urgency
|
||||||
if standstill or self._has_slow_down:
|
if self._has_slow_down:
|
||||||
return 'blended', urgent_slow_down
|
if self._urgency > 0.7:
|
||||||
return 'acc', False
|
# Emergency: immediate blended mode for high urgency stops
|
||||||
|
self._mode_manager.request_mode('blended', confidence=1.0, emergency=True)
|
||||||
|
else:
|
||||||
|
# Normal: blended with urgency-based confidence
|
||||||
|
confidence = min(1.0, self._urgency * 1.5)
|
||||||
|
self._mode_manager.request_mode('blended', confidence=confidence)
|
||||||
|
return
|
||||||
|
|
||||||
if standstill or self._has_slow_down:
|
# Driving slow: use ACC (but not if actively slowing down)
|
||||||
return 'blended', urgent_slow_down
|
if self._has_slowness and not self._has_slow_down:
|
||||||
|
self._mode_manager.request_mode('acc', confidence=0.8)
|
||||||
|
return
|
||||||
|
|
||||||
return 'acc', False
|
# Default: ACC
|
||||||
|
self._mode_manager.request_mode('acc', confidence=0.7)
|
||||||
|
|
||||||
|
def _radar_mode(self) -> None:
|
||||||
|
"""Radar mode with emergency handling."""
|
||||||
|
|
||||||
|
# EMERGENCY: MPC FCW - immediate blended mode
|
||||||
|
if self._has_mpc_fcw:
|
||||||
|
self._mode_manager.request_mode('blended', confidence=1.0, emergency=True)
|
||||||
|
return
|
||||||
|
|
||||||
|
# If lead detected and not in standstill: always use ACC
|
||||||
|
if self._has_lead_filtered and not (self._standstill_count > 3):
|
||||||
|
self._mode_manager.request_mode('acc', confidence=1.0)
|
||||||
|
return
|
||||||
|
|
||||||
|
# Slow down scenarios: emergency for high urgency, normal for lower urgency
|
||||||
|
if self._has_slow_down:
|
||||||
|
if self._urgency > 0.7:
|
||||||
|
# Emergency: immediate blended mode for high urgency stops
|
||||||
|
self._mode_manager.request_mode('blended', confidence=1.0, emergency=True)
|
||||||
|
else:
|
||||||
|
# Normal: blended with urgency-based confidence
|
||||||
|
confidence = min(1.0, self._urgency * 1.3)
|
||||||
|
self._mode_manager.request_mode('blended', confidence=confidence)
|
||||||
|
return
|
||||||
|
|
||||||
|
# Standstill: use blended
|
||||||
|
if self._standstill_count > 3:
|
||||||
|
self._mode_manager.request_mode('blended', confidence=0.9)
|
||||||
|
return
|
||||||
|
|
||||||
|
# Driving slow: use ACC (but not if actively slowing down)
|
||||||
|
if self._has_slowness and not self._has_slow_down:
|
||||||
|
self._mode_manager.request_mode('acc', confidence=0.8)
|
||||||
|
return
|
||||||
|
|
||||||
|
# Default: ACC
|
||||||
|
self._mode_manager.request_mode('acc', confidence=0.7)
|
||||||
|
|
||||||
def update(self, sm: messaging.SubMaster) -> None:
|
def update(self, sm: messaging.SubMaster) -> None:
|
||||||
self._read_params()
|
self._read_params()
|
||||||
|
|
||||||
self.set_mpc_fcw_crash_cnt()
|
self.set_mpc_fcw_crash_cnt()
|
||||||
|
|
||||||
self._update_calculations(sm)
|
self._update_calculations(sm)
|
||||||
|
|
||||||
mode, immediate = self._desired_mode()
|
if self._CP.radarUnavailable:
|
||||||
self._mode_manager.request_mode(mode, immediate=immediate, hold_frames=WMACConstants.EMERGENCY_HOLD_FRAMES,
|
self._radarless_mode()
|
||||||
cancel_hold=self._has_radar_acc_lead)
|
else:
|
||||||
self._mode_manager.update()
|
self._radar_mode()
|
||||||
|
|
||||||
|
self._mode_manager.update()
|
||||||
self._active = sm['selfdriveState'].experimentalMode and self._enabled
|
self._active = sm['selfdriveState'].experimentalMode and self._enabled
|
||||||
self._frame += 1
|
self._frame += 1
|
||||||
|
|||||||
@@ -0,0 +1,94 @@
|
|||||||
|
import pytest
|
||||||
|
|
||||||
|
from openpilot.sunnypilot.selfdrive.controls.lib.dec.dec import DynamicExperimentalController
|
||||||
|
|
||||||
|
class MockLeadOne:
|
||||||
|
def __init__(self, status=0.0):
|
||||||
|
self.status = status
|
||||||
|
|
||||||
|
class MockRadarState:
|
||||||
|
def __init__(self, status=0.0):
|
||||||
|
self.leadOne = MockLeadOne(status=status)
|
||||||
|
|
||||||
|
class MockCarState:
|
||||||
|
def __init__(self, vEgo=0.0, vCruise=0.0, standstill=False):
|
||||||
|
self.vEgo = vEgo
|
||||||
|
self.vCruise = vCruise
|
||||||
|
self.standstill = standstill
|
||||||
|
|
||||||
|
class MockModelData:
|
||||||
|
def __init__(self, valid=True):
|
||||||
|
size = 33 if valid else 10 # incomplete if invalid
|
||||||
|
self.position = type("Pos", (), {"x": [0.0] * size})()
|
||||||
|
self.orientation = type("Ori", (), {"x": [0.0] * size})()
|
||||||
|
|
||||||
|
class MockSelfDriveState:
|
||||||
|
def __init__(self, experimentalMode=False):
|
||||||
|
self.experimentalMode = experimentalMode
|
||||||
|
|
||||||
|
class MockParams:
|
||||||
|
def get_bool(self, name):
|
||||||
|
return True
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def default_sm():
|
||||||
|
sm = {
|
||||||
|
'carState': MockCarState(vEgo=10.0, vCruise=20.0),
|
||||||
|
'radarState': MockRadarState(status=1.0),
|
||||||
|
'modelV2': MockModelData(valid=True),
|
||||||
|
'selfdriveState': MockSelfDriveState(experimentalMode=True),
|
||||||
|
}
|
||||||
|
return sm
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def mock_cp():
|
||||||
|
class CP:
|
||||||
|
radarUnavailable = False
|
||||||
|
return CP()
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def mock_mpc():
|
||||||
|
class MPC:
|
||||||
|
crash_cnt = 0
|
||||||
|
return MPC()
|
||||||
|
|
||||||
|
# Fake Kalman Filter that always returns a given value
|
||||||
|
class FakeKalman:
|
||||||
|
def __init__(self, value=1.0):
|
||||||
|
self.value = value
|
||||||
|
def add_data(self, v): pass
|
||||||
|
def get_value(self): return self.value
|
||||||
|
def get_confidence(self): return 1.0
|
||||||
|
def reset_data(self): pass
|
||||||
|
|
||||||
|
def test_initial_mode_is_acc(mock_cp, mock_mpc):
|
||||||
|
controller = DynamicExperimentalController(mock_cp, mock_mpc, params=MockParams())
|
||||||
|
assert controller.mode() == "acc"
|
||||||
|
|
||||||
|
def test_standstill_triggers_blended(mock_cp, mock_mpc, default_sm):
|
||||||
|
controller = DynamicExperimentalController(mock_cp, mock_mpc, params=MockParams())
|
||||||
|
default_sm['carState'].standstill = True
|
||||||
|
for _ in range(10):
|
||||||
|
controller.update(default_sm)
|
||||||
|
assert controller.mode() == "blended"
|
||||||
|
|
||||||
|
def test_emergency_blended_on_fcw(mock_cp, mock_mpc, default_sm):
|
||||||
|
controller = DynamicExperimentalController(mock_cp, mock_mpc, params=MockParams())
|
||||||
|
mock_mpc.crash_cnt = 1 # simulate FCW
|
||||||
|
for _ in range(2):
|
||||||
|
controller.update(default_sm)
|
||||||
|
assert controller.mode() == "blended"
|
||||||
|
|
||||||
|
def test_radarless_slowdown_triggers_blended(mock_cp, mock_mpc, default_sm):
|
||||||
|
mock_cp.radarUnavailable = True
|
||||||
|
controller = DynamicExperimentalController(mock_cp, mock_mpc, params=MockParams())
|
||||||
|
|
||||||
|
# Force conditions to simulate slowdown
|
||||||
|
controller._slow_down_filter = FakeKalman(value=1.0) # Ensure urgency triggers slowdown
|
||||||
|
controller._v_ego_kph = 35.0
|
||||||
|
default_sm['modelV2'] = MockModelData(valid=False) # Incomplete trajectory
|
||||||
|
|
||||||
|
for _ in range(3):
|
||||||
|
controller.update(default_sm)
|
||||||
|
|
||||||
|
assert controller.mode() == "blended"
|
||||||
@@ -1,292 +0,0 @@
|
|||||||
import pytest
|
|
||||||
|
|
||||||
from openpilot.sunnypilot.selfdrive.controls.lib.dec.dec import DynamicExperimentalController, HysteresisSignal
|
|
||||||
|
|
||||||
|
|
||||||
class MockLeadOne:
|
|
||||||
def __init__(self, status=0.0, dRel=30.0, vRel=0.0):
|
|
||||||
self.status = status
|
|
||||||
self.dRel = dRel
|
|
||||||
self.vRel = vRel
|
|
||||||
|
|
||||||
|
|
||||||
class MockRadarState:
|
|
||||||
def __init__(self, status=0.0, dRel=30.0, vRel=0.0):
|
|
||||||
self.leadOne = MockLeadOne(status=status, dRel=dRel, vRel=vRel)
|
|
||||||
|
|
||||||
|
|
||||||
class MockCarState:
|
|
||||||
def __init__(self, vEgo=0.0, vCruise=0.0, standstill=False):
|
|
||||||
self.vEgo = vEgo
|
|
||||||
self.vCruise = vCruise
|
|
||||||
self.standstill = standstill
|
|
||||||
|
|
||||||
|
|
||||||
class MockAction:
|
|
||||||
def __init__(self, desiredAcceleration=0.0, shouldStop=False):
|
|
||||||
self.desiredAcceleration = desiredAcceleration
|
|
||||||
self.shouldStop = shouldStop
|
|
||||||
|
|
||||||
|
|
||||||
class MockModelData:
|
|
||||||
def __init__(self, valid=True, endpoint_x=200.0, orientation_valid=None, desired_acceleration=0.0, should_stop=False):
|
|
||||||
position_size = 33 if valid else 10
|
|
||||||
orientation_size = position_size if orientation_valid is None else (33 if orientation_valid else 10)
|
|
||||||
position_x = [0.0] * position_size
|
|
||||||
if position_x:
|
|
||||||
position_x[-1] = endpoint_x
|
|
||||||
self.position = type("Pos", (), {"x": position_x})()
|
|
||||||
self.orientation = type("Ori", (), {"x": [0.0] * orientation_size})()
|
|
||||||
self.acceleration = type("Accel", (), {"x": [0.0] * position_size})()
|
|
||||||
self.action = MockAction(desired_acceleration, should_stop)
|
|
||||||
|
|
||||||
|
|
||||||
class MockSelfDriveState:
|
|
||||||
def __init__(self, experimentalMode=False):
|
|
||||||
self.experimentalMode = experimentalMode
|
|
||||||
|
|
||||||
|
|
||||||
class MockParams:
|
|
||||||
def get_bool(self, name):
|
|
||||||
return True
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def default_sm():
|
|
||||||
sm = {
|
|
||||||
'carState': MockCarState(vEgo=10.0, vCruise=20.0),
|
|
||||||
'radarState': MockRadarState(status=1.0),
|
|
||||||
'modelV2': MockModelData(valid=True),
|
|
||||||
'selfdriveState': MockSelfDriveState(experimentalMode=True),
|
|
||||||
}
|
|
||||||
return sm
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def mock_cp():
|
|
||||||
class CP:
|
|
||||||
radarUnavailable = False
|
|
||||||
return CP()
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def mock_mpc():
|
|
||||||
class MPC:
|
|
||||||
crash_cnt = 0
|
|
||||||
return MPC()
|
|
||||||
|
|
||||||
|
|
||||||
def test_initial_mode_is_acc(mock_cp, mock_mpc):
|
|
||||||
controller = DynamicExperimentalController(mock_cp, mock_mpc, params=MockParams())
|
|
||||||
assert controller.mode() == "acc"
|
|
||||||
|
|
||||||
|
|
||||||
def test_standstill_triggers_blended(mock_cp, mock_mpc, default_sm):
|
|
||||||
controller = DynamicExperimentalController(mock_cp, mock_mpc, params=MockParams())
|
|
||||||
default_sm['radarState'] = MockRadarState(status=0.0)
|
|
||||||
default_sm['carState'].standstill = True
|
|
||||||
for _ in range(20):
|
|
||||||
controller.update(default_sm)
|
|
||||||
assert controller.mode() == "blended"
|
|
||||||
|
|
||||||
|
|
||||||
def test_emergency_blended_on_fcw(mock_cp, mock_mpc, default_sm):
|
|
||||||
controller = DynamicExperimentalController(mock_cp, mock_mpc, params=MockParams())
|
|
||||||
default_sm['radarState'] = MockRadarState(status=0.0)
|
|
||||||
mock_mpc.crash_cnt = 1
|
|
||||||
controller.update(default_sm)
|
|
||||||
assert controller.mode() == "blended"
|
|
||||||
|
|
||||||
|
|
||||||
def test_radarless_slowdown_triggers_blended(mock_cp, mock_mpc, default_sm):
|
|
||||||
mock_cp.radarUnavailable = True
|
|
||||||
controller = DynamicExperimentalController(mock_cp, mock_mpc, params=MockParams())
|
|
||||||
default_sm['radarState'] = MockRadarState(status=0.0)
|
|
||||||
default_sm['modelV2'] = MockModelData(valid=True, endpoint_x=0.0)
|
|
||||||
|
|
||||||
controller.update(default_sm)
|
|
||||||
|
|
||||||
assert controller.mode() == "blended"
|
|
||||||
|
|
||||||
|
|
||||||
def test_valid_position_with_missing_orientation_can_trigger_slowdown(mock_cp, mock_mpc, default_sm):
|
|
||||||
mock_cp.radarUnavailable = True
|
|
||||||
controller = DynamicExperimentalController(mock_cp, mock_mpc, params=MockParams())
|
|
||||||
default_sm['radarState'] = MockRadarState(status=0.0)
|
|
||||||
default_sm['modelV2'] = MockModelData(valid=True, endpoint_x=0.0, orientation_valid=False)
|
|
||||||
|
|
||||||
controller.update(default_sm)
|
|
||||||
|
|
||||||
assert controller._trajectory_valid
|
|
||||||
assert controller.mode() == "blended"
|
|
||||||
|
|
||||||
|
|
||||||
def test_incomplete_position_does_not_trigger_slowdown(mock_cp, mock_mpc, default_sm):
|
|
||||||
mock_cp.radarUnavailable = True
|
|
||||||
controller = DynamicExperimentalController(mock_cp, mock_mpc, params=MockParams())
|
|
||||||
default_sm['radarState'] = MockRadarState(status=0.0)
|
|
||||||
default_sm['modelV2'] = MockModelData(valid=False, endpoint_x=0.0)
|
|
||||||
|
|
||||||
for _ in range(3):
|
|
||||||
controller.update(default_sm)
|
|
||||||
|
|
||||||
assert not controller._trajectory_valid
|
|
||||||
assert not controller._has_slow_down
|
|
||||||
assert controller.mode() == "acc"
|
|
||||||
|
|
||||||
|
|
||||||
def test_slowdown_hysteresis_prevents_threshold_chatter():
|
|
||||||
signal = HysteresisSignal(enter_threshold=0.5, exit_threshold=0.4, rise_rate=1.0, fall_rate=1.0)
|
|
||||||
|
|
||||||
assert signal.update(0.55)
|
|
||||||
assert signal.update(0.45)
|
|
||||||
assert not signal.update(0.35)
|
|
||||||
|
|
||||||
|
|
||||||
def test_model_should_stop_triggers_blended_without_valid_trajectory(mock_cp, mock_mpc, default_sm):
|
|
||||||
mock_cp.radarUnavailable = True
|
|
||||||
controller = DynamicExperimentalController(mock_cp, mock_mpc, params=MockParams())
|
|
||||||
default_sm['radarState'] = MockRadarState(status=0.0)
|
|
||||||
default_sm['modelV2'] = MockModelData(valid=False, should_stop=True)
|
|
||||||
|
|
||||||
controller.update(default_sm)
|
|
||||||
|
|
||||||
assert not controller._trajectory_valid
|
|
||||||
assert controller.mode() == "blended"
|
|
||||||
assert not controller.force_stop_requested()
|
|
||||||
assert controller.apply_model_stop_target(20.0) == 20.0
|
|
||||||
|
|
||||||
|
|
||||||
def test_model_should_stop_clamps_target_for_confirmed_near_stop(mock_cp, mock_mpc, default_sm):
|
|
||||||
mock_cp.radarUnavailable = True
|
|
||||||
controller = DynamicExperimentalController(mock_cp, mock_mpc, params=MockParams())
|
|
||||||
default_sm['radarState'] = MockRadarState(status=0.0)
|
|
||||||
default_sm['modelV2'] = MockModelData(valid=True, endpoint_x=12.0, should_stop=True)
|
|
||||||
|
|
||||||
controller.update(default_sm)
|
|
||||||
|
|
||||||
assert controller.mode() == "blended"
|
|
||||||
assert controller.force_stop_requested()
|
|
||||||
assert controller.apply_model_stop_target(20.0) == pytest.approx(4.0)
|
|
||||||
|
|
||||||
|
|
||||||
def test_far_model_should_stop_does_not_force_stop_target(mock_cp, mock_mpc, default_sm):
|
|
||||||
mock_cp.radarUnavailable = True
|
|
||||||
controller = DynamicExperimentalController(mock_cp, mock_mpc, params=MockParams())
|
|
||||||
default_sm['radarState'] = MockRadarState(status=0.0)
|
|
||||||
default_sm['modelV2'] = MockModelData(valid=True, endpoint_x=200.0, should_stop=True)
|
|
||||||
|
|
||||||
controller.update(default_sm)
|
|
||||||
|
|
||||||
assert controller.mode() == "blended"
|
|
||||||
assert not controller.force_stop_requested()
|
|
||||||
assert controller.apply_model_stop_target(20.0) == 20.0
|
|
||||||
|
|
||||||
|
|
||||||
def test_invalid_trajectory_suppresses_stale_model_force_stop(mock_cp, mock_mpc, default_sm):
|
|
||||||
mock_cp.radarUnavailable = True
|
|
||||||
controller = DynamicExperimentalController(mock_cp, mock_mpc, params=MockParams())
|
|
||||||
default_sm['radarState'] = MockRadarState(status=0.0)
|
|
||||||
default_sm['modelV2'] = MockModelData(valid=True, endpoint_x=12.0, should_stop=True)
|
|
||||||
controller.update(default_sm)
|
|
||||||
assert controller.force_stop_requested()
|
|
||||||
|
|
||||||
default_sm['modelV2'] = MockModelData(valid=False, should_stop=True)
|
|
||||||
controller.update(default_sm)
|
|
||||||
|
|
||||||
assert not controller.force_stop_requested()
|
|
||||||
assert controller.apply_model_stop_target(20.0) == 20.0
|
|
||||||
|
|
||||||
|
|
||||||
def test_radar_lead_suppresses_model_force_stop(mock_cp, mock_mpc, default_sm):
|
|
||||||
controller = DynamicExperimentalController(mock_cp, mock_mpc, params=MockParams())
|
|
||||||
default_sm['radarState'] = MockRadarState(status=1.0, dRel=20.0, vRel=0.0)
|
|
||||||
default_sm['modelV2'] = MockModelData(valid=True, endpoint_x=12.0, should_stop=True)
|
|
||||||
|
|
||||||
for _ in range(3):
|
|
||||||
controller.update(default_sm)
|
|
||||||
|
|
||||||
assert controller._has_lead_filtered
|
|
||||||
assert controller.mode() == "acc"
|
|
||||||
assert not controller.force_stop_requested()
|
|
||||||
assert controller.apply_model_stop_target(20.0) == 20.0
|
|
||||||
|
|
||||||
|
|
||||||
def test_radar_lead_keeps_acc_over_model_slowdown(mock_cp, mock_mpc, default_sm):
|
|
||||||
controller = DynamicExperimentalController(mock_cp, mock_mpc, params=MockParams())
|
|
||||||
default_sm['radarState'] = MockRadarState(status=1.0)
|
|
||||||
default_sm['modelV2'] = MockModelData(valid=True, endpoint_x=0.0)
|
|
||||||
|
|
||||||
for _ in range(3):
|
|
||||||
controller.update(default_sm)
|
|
||||||
|
|
||||||
assert controller._has_slow_down
|
|
||||||
assert controller._has_radar_acc_lead
|
|
||||||
assert controller.mode() == "acc"
|
|
||||||
|
|
||||||
|
|
||||||
def test_far_radar_lead_allows_blended_until_acc_relevant(mock_cp, mock_mpc, default_sm):
|
|
||||||
controller = DynamicExperimentalController(mock_cp, mock_mpc, params=MockParams())
|
|
||||||
default_sm['radarState'] = MockRadarState(status=1.0, dRel=120.0, vRel=0.0)
|
|
||||||
default_sm['modelV2'] = MockModelData(valid=True, endpoint_x=0.0)
|
|
||||||
|
|
||||||
controller.update(default_sm)
|
|
||||||
|
|
||||||
assert controller._has_lead_filtered
|
|
||||||
assert not controller._has_radar_acc_lead
|
|
||||||
assert controller.mode() == "blended"
|
|
||||||
|
|
||||||
|
|
||||||
def test_relevant_radar_lead_smoothly_returns_to_acc(mock_cp, mock_mpc, default_sm):
|
|
||||||
controller = DynamicExperimentalController(mock_cp, mock_mpc, params=MockParams())
|
|
||||||
default_sm['radarState'] = MockRadarState(status=1.0, dRel=120.0, vRel=0.0)
|
|
||||||
default_sm['modelV2'] = MockModelData(valid=True, endpoint_x=0.0)
|
|
||||||
controller.update(default_sm)
|
|
||||||
assert controller.mode() == "blended"
|
|
||||||
|
|
||||||
default_sm['radarState'] = MockRadarState(status=1.0, dRel=45.0, vRel=0.0)
|
|
||||||
for _ in range(20):
|
|
||||||
controller.update(default_sm)
|
|
||||||
|
|
||||||
assert controller._has_radar_acc_lead
|
|
||||||
assert controller.mode() == "acc"
|
|
||||||
|
|
||||||
|
|
||||||
def test_closing_far_radar_lead_returns_to_acc(mock_cp, mock_mpc, default_sm):
|
|
||||||
controller = DynamicExperimentalController(mock_cp, mock_mpc, params=MockParams())
|
|
||||||
default_sm['radarState'] = MockRadarState(status=1.0, dRel=120.0, vRel=-25.0)
|
|
||||||
default_sm['modelV2'] = MockModelData(valid=True, endpoint_x=0.0)
|
|
||||||
|
|
||||||
for _ in range(20):
|
|
||||||
controller.update(default_sm)
|
|
||||||
|
|
||||||
assert controller._has_radar_acc_lead
|
|
||||||
assert controller.mode() == "acc"
|
|
||||||
|
|
||||||
|
|
||||||
def test_radar_lead_keeps_acc_over_fcw_and_standstill(mock_cp, mock_mpc, default_sm):
|
|
||||||
controller = DynamicExperimentalController(mock_cp, mock_mpc, params=MockParams())
|
|
||||||
default_sm['radarState'] = MockRadarState(status=1.0)
|
|
||||||
default_sm['carState'].standstill = True
|
|
||||||
default_sm['modelV2'] = MockModelData(valid=True, endpoint_x=0.0, should_stop=True)
|
|
||||||
mock_mpc.crash_cnt = 1
|
|
||||||
|
|
||||||
for _ in range(10):
|
|
||||||
controller.update(default_sm)
|
|
||||||
|
|
||||||
assert controller._has_lead_filtered
|
|
||||||
assert controller._has_mpc_fcw
|
|
||||||
assert controller.mode() == "acc"
|
|
||||||
|
|
||||||
|
|
||||||
def test_lead_flicker_hold_prevents_one_frame_mode_flip(mock_cp, mock_mpc, default_sm):
|
|
||||||
controller = DynamicExperimentalController(mock_cp, mock_mpc, params=MockParams())
|
|
||||||
default_sm['radarState'] = MockRadarState(status=1.0)
|
|
||||||
controller.update(default_sm)
|
|
||||||
|
|
||||||
default_sm['radarState'] = MockRadarState(status=0.0)
|
|
||||||
default_sm['modelV2'] = MockModelData(valid=True, endpoint_x=0.0)
|
|
||||||
controller.update(default_sm)
|
|
||||||
|
|
||||||
assert controller._has_lead_filtered
|
|
||||||
assert controller.mode() == "acc"
|
|
||||||
@@ -9,8 +9,6 @@ from cereal import messaging, custom
|
|||||||
from opendbc.car import structs
|
from opendbc.car import structs
|
||||||
from openpilot.common.constants import CV
|
from openpilot.common.constants import CV
|
||||||
from openpilot.selfdrive.car.cruise import V_CRUISE_MAX
|
from openpilot.selfdrive.car.cruise import V_CRUISE_MAX
|
||||||
from openpilot.sunnypilot.selfdrive.controls.lib.accel_personality.accel_controller import AccelController
|
|
||||||
from openpilot.sunnypilot.selfdrive.controls.lib.radar_distance.radar_distance import RadarDistanceController
|
|
||||||
from openpilot.sunnypilot.selfdrive.controls.lib.dec.dec import DynamicExperimentalController
|
from openpilot.sunnypilot.selfdrive.controls.lib.dec.dec import DynamicExperimentalController
|
||||||
from openpilot.sunnypilot.selfdrive.controls.lib.e2e_alerts_helper import E2EAlertsHelper
|
from openpilot.sunnypilot.selfdrive.controls.lib.e2e_alerts_helper import E2EAlertsHelper
|
||||||
from openpilot.sunnypilot.selfdrive.controls.lib.smart_cruise_control.smart_cruise_control import SmartCruiseControl
|
from openpilot.sunnypilot.selfdrive.controls.lib.smart_cruise_control.smart_cruise_control import SmartCruiseControl
|
||||||
@@ -28,8 +26,6 @@ class LongitudinalPlannerSP:
|
|||||||
self.events_sp = EventsSP()
|
self.events_sp = EventsSP()
|
||||||
self.resolver = SpeedLimitResolver()
|
self.resolver = SpeedLimitResolver()
|
||||||
self.dec = DynamicExperimentalController(CP, mpc)
|
self.dec = DynamicExperimentalController(CP, mpc)
|
||||||
self.accel = AccelController(CP, mpc)
|
|
||||||
self.radar_distance = RadarDistanceController(CP)
|
|
||||||
self.scc = SmartCruiseControl()
|
self.scc = SmartCruiseControl()
|
||||||
self.resolver = SpeedLimitResolver()
|
self.resolver = SpeedLimitResolver()
|
||||||
self.sla = SpeedLimitAssist(CP, CP_SP)
|
self.sla = SpeedLimitAssist(CP, CP_SP)
|
||||||
@@ -75,19 +71,13 @@ class LongitudinalPlannerSP:
|
|||||||
|
|
||||||
self.source = min(targets, key=lambda k: targets[k][0])
|
self.source = min(targets, key=lambda k: targets[k][0])
|
||||||
self.output_v_target, self.output_a_target = targets[self.source]
|
self.output_v_target, self.output_a_target = targets[self.source]
|
||||||
self.output_v_target = self.dec.apply_model_stop_target(self.output_v_target)
|
|
||||||
return self.output_v_target, self.output_a_target
|
return self.output_v_target, self.output_a_target
|
||||||
|
|
||||||
def update(self, sm: messaging.SubMaster) -> None:
|
def update(self, sm: messaging.SubMaster) -> None:
|
||||||
self.events_sp.clear()
|
self.events_sp.clear()
|
||||||
self.dec.update(sm)
|
self.dec.update(sm)
|
||||||
self.accel.update(sm)
|
|
||||||
self.radar_distance.update(sm)
|
|
||||||
self.e2e_alerts_helper.update(sm, self.events_sp)
|
self.e2e_alerts_helper.update(sm, self.events_sp)
|
||||||
|
|
||||||
def smooth_radarstate(self, radarstate):
|
|
||||||
return self.radar_distance.smooth_radarstate(radarstate)
|
|
||||||
|
|
||||||
def publish_longitudinal_plan_sp(self, sm: messaging.SubMaster, pm: messaging.PubMaster) -> None:
|
def publish_longitudinal_plan_sp(self, sm: messaging.SubMaster, pm: messaging.PubMaster) -> None:
|
||||||
plan_sp_send = messaging.new_message('longitudinalPlanSP')
|
plan_sp_send = messaging.new_message('longitudinalPlanSP')
|
||||||
|
|
||||||
@@ -148,17 +138,4 @@ class LongitudinalPlannerSP:
|
|||||||
e2eAlerts.greenLightAlert = self.e2e_alerts_helper.green_light_alert
|
e2eAlerts.greenLightAlert = self.e2e_alerts_helper.green_light_alert
|
||||||
e2eAlerts.leadDepartAlert = self.e2e_alerts_helper.lead_depart_alert
|
e2eAlerts.leadDepartAlert = self.e2e_alerts_helper.lead_depart_alert
|
||||||
|
|
||||||
# Acceleration Personality
|
|
||||||
acceleration = longitudinalPlanSP.acceleration
|
|
||||||
acceleration.personality = self.accel.personality()
|
|
||||||
acceleration.enabled = self.accel.enabled()
|
|
||||||
acceleration.maxAccel = float(self.accel.max_accel())
|
|
||||||
acceleration.brakeNeed = float(self.accel.brake_need())
|
|
||||||
acceleration.decelTarget = float(self.accel.decel_target())
|
|
||||||
acceleration.smoothActive = self.accel.smooth_active()
|
|
||||||
acceleration.bypassed = bool(self.accel.bypassed())
|
|
||||||
acceleration.comfortStopActive = bool(self.accel.comfort_stop_active())
|
|
||||||
acceleration.comfortStopFloor = float(self.accel.comfort_stop_floor())
|
|
||||||
|
|
||||||
|
|
||||||
pm.send('longitudinalPlanSP', plan_sp_send)
|
pm.send('longitudinalPlanSP', plan_sp_send)
|
||||||
|
|||||||
@@ -1,123 +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.
|
|
||||||
|
|
||||||
RadarDistance: keep a just-dropped, recently-sustained lead alive through a brief radar dropout (flicker-hold),
|
|
||||||
so the MPC does not lose+regain a flickering lead. The held lead is obstacle-monotone (held obstacle <= last
|
|
||||||
real <= stock) -> braking is always >= stock, never weaker. Active only above LOW_SPEED_PASSTHROUGH_V; at/below
|
|
||||||
it (stop/creep) it returns the raw radarstate unchanged -> byte-stock stops. Default off => stock passthrough.
|
|
||||||
|
|
||||||
NOTE: an earlier vLead "rise smoothing" was removed -- it lagged the lead's speed-up by ~1 s, so when a lead
|
|
||||||
pulled away in stop-and-go it reported the lead as still near-stopped (measured up to 11 m/s slower than real).
|
|
||||||
That fed the MPC a phantom-slow/stopped lead -> phantom hard braking + a launch rubber-band. The lead's real
|
|
||||||
speed is passed through unchanged now.
|
|
||||||
"""
|
|
||||||
|
|
||||||
from opendbc.car import structs
|
|
||||||
from openpilot.common.params import Params
|
|
||||||
from openpilot.common.realtime import DT_MDL
|
|
||||||
|
|
||||||
HOLD_MAX_FRAMES = 10 # ~0.5s flicker-hold cap, since the last sustained lead
|
|
||||||
SUSTAIN_FRAMES = 2 # consecutive valid frames to arm the hold
|
|
||||||
DROPOUT_DREL = 1.0
|
|
||||||
FCW_PROB_CAP = 0.9 # held lead can't reach the FCW gate (>0.9)
|
|
||||||
MIN_HELD_DREL = 0.5
|
|
||||||
|
|
||||||
# Stop/creep regime: return the raw radarstate so stop distance is byte-identical to stock (off==on).
|
|
||||||
LOW_SPEED_PASSTHROUGH_V = 5.0 # m/s
|
|
||||||
|
|
||||||
|
|
||||||
class _HeldLead:
|
|
||||||
__slots__ = ('status', 'dRel', 'yRel', 'vRel', 'vLead', 'vLeadK', 'aLeadK', 'aLeadTau', 'modelProb')
|
|
||||||
|
|
||||||
def __init__(self, dRel, vRel, vLead, aLeadK, aLeadTau, modelProb):
|
|
||||||
self.status = True
|
|
||||||
self.dRel = dRel
|
|
||||||
self.vRel = vRel
|
|
||||||
self.vLead = vLead
|
|
||||||
self.vLeadK = vLead
|
|
||||||
self.aLeadK = aLeadK
|
|
||||||
self.aLeadTau = aLeadTau
|
|
||||||
self.modelProb = modelProb
|
|
||||||
self.yRel = 0.0
|
|
||||||
|
|
||||||
|
|
||||||
class _RadarStateProxy:
|
|
||||||
__slots__ = ('leadOne', 'leadTwo')
|
|
||||||
|
|
||||||
def __init__(self, lead_one, lead_two):
|
|
||||||
self.leadOne = lead_one
|
|
||||||
self.leadTwo = lead_two
|
|
||||||
|
|
||||||
|
|
||||||
class _LeadHold:
|
|
||||||
def __init__(self):
|
|
||||||
self._last = None
|
|
||||||
self._sustained = 0
|
|
||||||
self._since_real = 0
|
|
||||||
self._armed = False
|
|
||||||
self._held_dRel = 0.0
|
|
||||||
|
|
||||||
def reset(self):
|
|
||||||
self.__init__()
|
|
||||||
|
|
||||||
def step(self, raw):
|
|
||||||
# Validity mirrors the MPC (keys off status alone). modelProb is NOT a gate: radard's low_speed_override
|
|
||||||
# emits a real close lead with modelProb=0.0, so gating on prob dropped real stop-and-go leads.
|
|
||||||
if raw.status and raw.dRel > DROPOUT_DREL:
|
|
||||||
self._last = (raw.dRel, raw.vRel, raw.vLead, raw.aLeadK, raw.aLeadTau, raw.modelProb)
|
|
||||||
self._sustained += 1
|
|
||||||
if self._sustained >= SUSTAIN_FRAMES:
|
|
||||||
self._since_real = 0
|
|
||||||
self._armed = True
|
|
||||||
return raw
|
|
||||||
|
|
||||||
self._sustained = 0
|
|
||||||
self._since_real += 1
|
|
||||||
if self._armed and self._last is not None and self._since_real <= HOLD_MAX_FRAMES:
|
|
||||||
dRel0, vRel0, vLead0, aLeadK0, aLeadTau0, prob0 = self._last
|
|
||||||
if self._since_real == 1:
|
|
||||||
self._held_dRel = dRel0
|
|
||||||
self._held_dRel = max(MIN_HELD_DREL, self._held_dRel - max(-vRel0, 0.0) * DT_MDL)
|
|
||||||
return _HeldLead(self._held_dRel, vRel0, vLead0, min(aLeadK0, 0.0), aLeadTau0, min(prob0, FCW_PROB_CAP))
|
|
||||||
|
|
||||||
self._armed = False
|
|
||||||
return raw
|
|
||||||
|
|
||||||
|
|
||||||
class RadarDistanceController:
|
|
||||||
def __init__(self, CP: structs.CarParams, params=None):
|
|
||||||
self._CP = CP
|
|
||||||
self._params = params or Params()
|
|
||||||
self._frame = 0
|
|
||||||
self._v_ego = 0.0
|
|
||||||
self._enabled = self._params.get_bool("RadarDistance")
|
|
||||||
self._one = _LeadHold()
|
|
||||||
self._two = _LeadHold()
|
|
||||||
|
|
||||||
def _read_params(self) -> None:
|
|
||||||
enabled = self._params.get_bool("RadarDistance")
|
|
||||||
if enabled and not self._enabled:
|
|
||||||
self._one.reset()
|
|
||||||
self._two.reset()
|
|
||||||
self._enabled = enabled
|
|
||||||
|
|
||||||
def update(self, sm) -> None:
|
|
||||||
if self._frame % int(1. / DT_MDL) == 0:
|
|
||||||
self._read_params()
|
|
||||||
self._v_ego = float(sm['carState'].vEgo)
|
|
||||||
self._frame += 1
|
|
||||||
|
|
||||||
def enabled(self) -> bool:
|
|
||||||
return self._enabled
|
|
||||||
|
|
||||||
def smooth_radarstate(self, radarstate):
|
|
||||||
if not self._enabled:
|
|
||||||
return radarstate
|
|
||||||
one = self._one.step(radarstate.leadOne)
|
|
||||||
two = self._two.step(radarstate.leadTwo)
|
|
||||||
if self._v_ego < LOW_SPEED_PASSTHROUGH_V: # stop/creep -> raw (byte-stock stops)
|
|
||||||
return radarstate
|
|
||||||
return _RadarStateProxy(one, two) # flicker-hold only; lead speed passed through as-is
|
|
||||||
@@ -1,169 +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.
|
|
||||||
"""
|
|
||||||
|
|
||||||
from types import SimpleNamespace
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
from openpilot.sunnypilot.selfdrive.controls.lib.radar_distance.radar_distance import \
|
|
||||||
RadarDistanceController, HOLD_MAX_FRAMES, FCW_PROB_CAP, LOW_SPEED_PASSTHROUGH_V
|
|
||||||
|
|
||||||
COMFORT_BRAKE = 2.5
|
|
||||||
|
|
||||||
|
|
||||||
class FakeParams:
|
|
||||||
def __init__(self, store=None):
|
|
||||||
self.store = dict(store or {})
|
|
||||||
|
|
||||||
def get_bool(self, key):
|
|
||||||
return bool(self.store.get(key, False))
|
|
||||||
|
|
||||||
|
|
||||||
def lead(status=True, dRel=40.0, vRel=-2.0, vLead=18.0, aLeadK=0.0, aLeadTau=1.5, modelProb=0.95):
|
|
||||||
return SimpleNamespace(status=status, dRel=dRel, yRel=0.0, vRel=vRel, vLead=vLead, vLeadK=vLead,
|
|
||||||
aLeadK=aLeadK, aLeadTau=aLeadTau, modelProb=modelProb)
|
|
||||||
|
|
||||||
|
|
||||||
def rs(one, two=None):
|
|
||||||
return SimpleNamespace(leadOne=one, leadTwo=two or lead(status=False, dRel=0.0, modelProb=0.0))
|
|
||||||
|
|
||||||
|
|
||||||
def obstacle(ld):
|
|
||||||
return ld.dRel + ld.vLead ** 2 / (2 * COMFORT_BRAKE)
|
|
||||||
|
|
||||||
|
|
||||||
def ctrl(enabled=True):
|
|
||||||
c = RadarDistanceController(CP=SimpleNamespace(), params=FakeParams({'RadarDistance': enabled}))
|
|
||||||
c._v_ego = LOW_SPEED_PASSTHROUGH_V + 10.0 # default above the gate so hold-logic tests exercise the flicker-hold
|
|
||||||
return c
|
|
||||||
|
|
||||||
|
|
||||||
def test_disabled_is_identity():
|
|
||||||
c = ctrl(enabled=False)
|
|
||||||
r = rs(lead())
|
|
||||||
assert c.smooth_radarstate(r) is r # byte-stock passthrough
|
|
||||||
|
|
||||||
|
|
||||||
def test_valid_lead_passthrough():
|
|
||||||
c = ctrl()
|
|
||||||
one = lead(dRel=40.0)
|
|
||||||
out = c.smooth_radarstate(rs(one))
|
|
||||||
assert out.leadOne is one
|
|
||||||
|
|
||||||
|
|
||||||
def test_holds_after_sustained_dropout():
|
|
||||||
c = ctrl()
|
|
||||||
for _ in range(3): # sustain (>= SUSTAIN_FRAMES)
|
|
||||||
c.smooth_radarstate(rs(lead(dRel=30.0, vRel=-4.0, vLead=16.0)))
|
|
||||||
out = c.smooth_radarstate(rs(lead(status=False, dRel=0.0, modelProb=0.0)))
|
|
||||||
held = out.leadOne
|
|
||||||
assert held.status is True
|
|
||||||
assert held.dRel < 30.0 # dead-reckoned closer
|
|
||||||
assert held.dRel == pytest.approx(30.0 - 4.0 * 0.05, abs=1e-6)
|
|
||||||
|
|
||||||
|
|
||||||
def test_low_speed_override_lead_passthrough():
|
|
||||||
# radard low_speed_override emits a real closest-track lead with modelProb=0.0. It must be honored as a
|
|
||||||
# real lead (passthrough), NOT rejected and replaced by a stale farther held lead (would under-brake at
|
|
||||||
# stop-and-go and stop too close).
|
|
||||||
c = ctrl()
|
|
||||||
one = lead(status=True, dRel=2.5, vRel=0.0, vLead=0.0, modelProb=0.0)
|
|
||||||
out = c.smooth_radarstate(rs(one))
|
|
||||||
assert out.leadOne is one # passed straight through, not substituted
|
|
||||||
|
|
||||||
|
|
||||||
def test_low_speed_override_lead_arms_hold():
|
|
||||||
# a sustained prob=0 real lead should arm the hold like any real lead
|
|
||||||
c = ctrl()
|
|
||||||
for _ in range(3):
|
|
||||||
c.smooth_radarstate(rs(lead(status=True, dRel=3.0, vRel=-0.5, vLead=1.0, modelProb=0.0)))
|
|
||||||
held = c.smooth_radarstate(rs(lead(status=False, dRel=0.0, modelProb=0.0))).leadOne
|
|
||||||
assert held.status is True # armed off the prob=0 lead, holds through dropout
|
|
||||||
|
|
||||||
|
|
||||||
def test_low_speed_returns_raw_object():
|
|
||||||
# Stop/creep regime: ENABLED returns the EXACT raw radarstate object (byte-identical to OFF), so the
|
|
||||||
# lead the MPC sees -- and thus the stop distance -- is stock. This is the core stop-neutrality guarantee.
|
|
||||||
c = ctrl()
|
|
||||||
c._v_ego = LOW_SPEED_PASSTHROUGH_V - 0.1
|
|
||||||
r = rs(lead(status=True, dRel=6.0, vRel=0.0, vLead=0.0))
|
|
||||||
assert c.smooth_radarstate(r) is r # object identity == stock
|
|
||||||
|
|
||||||
|
|
||||||
def test_low_speed_passthrough_but_hold_warmed_for_highway():
|
|
||||||
# At low speed the raw radarstate is returned, but the hold is still stepped (state kept warm) so the
|
|
||||||
# flicker-hold engages the moment speed rises above the gate.
|
|
||||||
c = ctrl()
|
|
||||||
for _ in range(3): # sustain a real lead while in the low-speed regime
|
|
||||||
c._v_ego = LOW_SPEED_PASSTHROUGH_V - 0.1
|
|
||||||
r = rs(lead(dRel=30.0, vRel=-4.0, vLead=16.0))
|
|
||||||
assert c.smooth_radarstate(r) is r # returned object stays raw at low speed
|
|
||||||
c._v_ego = LOW_SPEED_PASSTHROUGH_V + 10.0 # rise above the gate -> dropout now held (proxy, not raw)
|
|
||||||
out = c.smooth_radarstate(rs(lead(status=False, dRel=0.0, modelProb=0.0)))
|
|
||||||
assert out.leadOne.status is True
|
|
||||||
|
|
||||||
|
|
||||||
def test_vlead_passed_through_unchanged():
|
|
||||||
# The lead's real speed is reported as-is above the gate (no rise-lag) -- a lead pulling away is NOT
|
|
||||||
# reported as still-slow, so no phantom-slow-lead braking / stop-and-go rubber-band.
|
|
||||||
c = ctrl() # default _v_ego above the gate
|
|
||||||
c.smooth_radarstate(rs(lead(dRel=30.0, vLead=15.0)))
|
|
||||||
rising = c.smooth_radarstate(rs(lead(dRel=30.0, vLead=25.0))).leadOne
|
|
||||||
assert rising.vLead == pytest.approx(25.0, abs=1e-6) # real speed, not lagged below it
|
|
||||||
|
|
||||||
|
|
||||||
def test_obstacle_monotone_during_hold():
|
|
||||||
c = ctrl()
|
|
||||||
for _ in range(3):
|
|
||||||
c.smooth_radarstate(rs(lead(dRel=30.0, vRel=-4.0, vLead=16.0)))
|
|
||||||
last_obs = obstacle(lead(dRel=30.0, vLead=16.0))
|
|
||||||
prev = last_obs
|
|
||||||
for _ in range(HOLD_MAX_FRAMES):
|
|
||||||
held = c.smooth_radarstate(rs(lead(status=False, dRel=0.0, modelProb=0.0))).leadOne
|
|
||||||
if not held.status:
|
|
||||||
break
|
|
||||||
o = obstacle(held)
|
|
||||||
assert o <= last_obs + 1e-6 # never farther than the last real obstacle (brakes >= last real)
|
|
||||||
assert o <= prev + 1e-6 # monotonically non-increasing -> brakes more over the hold
|
|
||||||
prev = o
|
|
||||||
|
|
||||||
|
|
||||||
def test_releases_after_hold_cap():
|
|
||||||
c = ctrl()
|
|
||||||
for _ in range(3):
|
|
||||||
c.smooth_radarstate(rs(lead(dRel=30.0)))
|
|
||||||
statuses = [c.smooth_radarstate(rs(lead(status=False, dRel=0.0, modelProb=0.0))).leadOne.status
|
|
||||||
for _ in range(HOLD_MAX_FRAMES + 3)]
|
|
||||||
assert all(statuses[:HOLD_MAX_FRAMES]) # held through the cap
|
|
||||||
assert statuses[HOLD_MAX_FRAMES] is False # released after
|
|
||||||
|
|
||||||
|
|
||||||
def test_no_hold_without_sustained_lead():
|
|
||||||
c = ctrl()
|
|
||||||
c.smooth_radarstate(rs(lead(dRel=30.0))) # single valid frame (< SUSTAIN_FRAMES)
|
|
||||||
out = c.smooth_radarstate(rs(lead(status=False, dRel=0.0, modelProb=0.0)))
|
|
||||||
assert out.leadOne.status is False # not armed -> no hold
|
|
||||||
|
|
||||||
|
|
||||||
def test_flicker_does_not_reset_wall_clock():
|
|
||||||
c = ctrl()
|
|
||||||
for _ in range(3):
|
|
||||||
c.smooth_radarstate(rs(lead(dRel=30.0)))
|
|
||||||
# 1/0/1/0 flicker: lone valid frames must NOT reset the wall-clock (sustained < SUSTAIN_FRAMES)
|
|
||||||
for _ in range(4):
|
|
||||||
c.smooth_radarstate(rs(lead(status=False, dRel=0.0, modelProb=0.0))) # dropout
|
|
||||||
c.smooth_radarstate(rs(lead(dRel=31.0))) # lone valid
|
|
||||||
assert c._one._since_real > 0 # wall-clock kept climbing through the flicker
|
|
||||||
|
|
||||||
|
|
||||||
def test_fcw_prob_capped_and_aleadk_not_positive():
|
|
||||||
c = ctrl()
|
|
||||||
for _ in range(3):
|
|
||||||
c.smooth_radarstate(rs(lead(dRel=30.0, aLeadK=1.0, modelProb=0.99)))
|
|
||||||
held = c.smooth_radarstate(rs(lead(status=False, dRel=0.0, modelProb=0.0))).leadOne
|
|
||||||
assert held.modelProb <= FCW_PROB_CAP # no false FCW from a held phantom
|
|
||||||
assert held.aLeadK <= 0.0 # never project the held lead as accelerating
|
|
||||||
@@ -1,106 +0,0 @@
|
|||||||
"""
|
|
||||||
Copyright (c) 2021-, rav4kumar, Haibin Wen, sunnypilot, and a number of other contributors.
|
|
||||||
|
|
||||||
This file is part of sunnypilot and is licensed under the MIT License.
|
|
||||||
See the LICENSE.md file in the root directory for more details.
|
|
||||||
"""
|
|
||||||
import numpy as np
|
|
||||||
|
|
||||||
from openpilot.common.constants import CV
|
|
||||||
from openpilot.common.realtime import DT_MDL
|
|
||||||
from openpilot.common.params import Params
|
|
||||||
|
|
||||||
NEARSIDE_PROB = 0.25
|
|
||||||
EDGE_PROB = 0.35
|
|
||||||
EDGE_REACTION_TIME = 1.0
|
|
||||||
EDGE_CLEAR_TIME = 0.3
|
|
||||||
MIN_SPEED = 20 * CV.MPH_TO_MS
|
|
||||||
NEAR_EDGE_DISTANCE = 4.5
|
|
||||||
LEFT_NEARSIDE_LANE_IDX = 1
|
|
||||||
RIGHT_NEARSIDE_LANE_IDX = 2
|
|
||||||
|
|
||||||
|
|
||||||
class RoadEdgeLaneChangeController:
|
|
||||||
def __init__(self, desire_helper):
|
|
||||||
self.DH = desire_helper
|
|
||||||
self.params = Params()
|
|
||||||
self.enabled = self.params.get_bool("RoadEdgeLaneChangeEnabled")
|
|
||||||
self.param_read_counter = 0
|
|
||||||
self.left_edge_detected = False
|
|
||||||
self.right_edge_detected = False
|
|
||||||
self.left_edge_timer = 0.0
|
|
||||||
self.right_edge_timer = 0.0
|
|
||||||
self.left_clear_timer = 0.0
|
|
||||||
self.right_clear_timer = 0.0
|
|
||||||
|
|
||||||
def read_params(self) -> None:
|
|
||||||
self.enabled = self.params.get_bool("RoadEdgeLaneChangeEnabled")
|
|
||||||
|
|
||||||
def update_params(self) -> None:
|
|
||||||
if self.param_read_counter % 50 == 0:
|
|
||||||
self.read_params()
|
|
||||||
self.param_read_counter += 1
|
|
||||||
|
|
||||||
def reset(self) -> None:
|
|
||||||
self.left_edge_detected = False
|
|
||||||
self.right_edge_detected = False
|
|
||||||
self.left_edge_timer = 0.0
|
|
||||||
self.right_edge_timer = 0.0
|
|
||||||
self.left_clear_timer = 0.0
|
|
||||||
self.right_clear_timer = 0.0
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def _road_edge_y(road_edges, idx: int) -> float | None:
|
|
||||||
if road_edges is None or len(road_edges) <= idx or len(road_edges[idx].y) == 0:
|
|
||||||
return None
|
|
||||||
return road_edges[idx].y[0]
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def _edge_is_near(edge_y: float | None, left: bool) -> bool:
|
|
||||||
if edge_y is None:
|
|
||||||
return False
|
|
||||||
if left:
|
|
||||||
return bool(-NEAR_EDGE_DISTANCE < edge_y < 0.0)
|
|
||||||
return bool(0.0 < edge_y < NEAR_EDGE_DISTANCE)
|
|
||||||
|
|
||||||
def update(self, road_edge_stds, lane_line_probs, v_ego: float, road_edges=None) -> None:
|
|
||||||
self.update_params()
|
|
||||||
|
|
||||||
if not self.enabled or v_ego < MIN_SPEED:
|
|
||||||
self.reset()
|
|
||||||
return
|
|
||||||
|
|
||||||
left_edge_prob = np.clip(1.0 - road_edge_stds[0], 0.0, 1.0)
|
|
||||||
right_edge_prob = np.clip(1.0 - road_edge_stds[1], 0.0, 1.0)
|
|
||||||
left_lane_prob = lane_line_probs[LEFT_NEARSIDE_LANE_IDX]
|
|
||||||
right_lane_prob = lane_line_probs[RIGHT_NEARSIDE_LANE_IDX]
|
|
||||||
|
|
||||||
left_edge_y = self._road_edge_y(road_edges, 0)
|
|
||||||
right_edge_y = self._road_edge_y(road_edges, 1)
|
|
||||||
left_edge_near = self._edge_is_near(left_edge_y, True)
|
|
||||||
right_edge_near = self._edge_is_near(right_edge_y, False)
|
|
||||||
|
|
||||||
left_cond = left_edge_prob > EDGE_PROB and (left_edge_near or (left_edge_y is None and left_lane_prob < NEARSIDE_PROB))
|
|
||||||
right_cond = right_edge_prob > EDGE_PROB and (right_edge_near or (right_edge_y is None and right_lane_prob < NEARSIDE_PROB))
|
|
||||||
|
|
||||||
if left_cond:
|
|
||||||
self.left_edge_timer = min(self.left_edge_timer + DT_MDL, EDGE_REACTION_TIME + EDGE_CLEAR_TIME)
|
|
||||||
self.left_clear_timer = 0.0
|
|
||||||
if self.left_edge_timer > EDGE_REACTION_TIME:
|
|
||||||
self.left_edge_detected = True
|
|
||||||
else:
|
|
||||||
self.left_clear_timer += DT_MDL
|
|
||||||
if self.left_clear_timer > EDGE_CLEAR_TIME:
|
|
||||||
self.left_edge_timer = 0.0
|
|
||||||
self.left_edge_detected = False
|
|
||||||
|
|
||||||
if right_cond:
|
|
||||||
self.right_edge_timer = min(self.right_edge_timer + DT_MDL, EDGE_REACTION_TIME + EDGE_CLEAR_TIME)
|
|
||||||
self.right_clear_timer = 0.0
|
|
||||||
if self.right_edge_timer > EDGE_REACTION_TIME:
|
|
||||||
self.right_edge_detected = True
|
|
||||||
else:
|
|
||||||
self.right_clear_timer += DT_MDL
|
|
||||||
if self.right_clear_timer > EDGE_CLEAR_TIME:
|
|
||||||
self.right_edge_timer = 0.0
|
|
||||||
self.right_edge_detected = False
|
|
||||||
@@ -5,8 +5,6 @@ from openpilot.common.params import Params
|
|||||||
from openpilot.selfdrive.controls.lib.desire_helper import DesireHelper
|
from openpilot.selfdrive.controls.lib.desire_helper import DesireHelper
|
||||||
from openpilot.sunnypilot.selfdrive.controls.lib.lane_turn_desire import LaneTurnController, LANE_CHANGE_SPEED_MIN
|
from openpilot.sunnypilot.selfdrive.controls.lib.lane_turn_desire import LaneTurnController, LANE_CHANGE_SPEED_MIN
|
||||||
from openpilot.sunnypilot.selfdrive.controls.lib.auto_lane_change import AutoLaneChangeMode
|
from openpilot.sunnypilot.selfdrive.controls.lib.auto_lane_change import AutoLaneChangeMode
|
||||||
from openpilot.sunnypilot.selfdrive.controls.lib.relc import RoadEdgeLaneChangeController
|
|
||||||
|
|
||||||
|
|
||||||
TurnDirection = custom.ModelDataV2SP.TurnDirection
|
TurnDirection = custom.ModelDataV2SP.TurnDirection
|
||||||
|
|
||||||
@@ -109,11 +107,7 @@ def set_lane_turn_params():
|
|||||||
])
|
])
|
||||||
def test_desire_helper_integration(carstate, lateral_active, lane_change_prob, expected_desire, set_lane_turn_params):
|
def test_desire_helper_integration(carstate, lateral_active, lane_change_prob, expected_desire, set_lane_turn_params):
|
||||||
dh = DesireHelper()
|
dh = DesireHelper()
|
||||||
relc = RoadEdgeLaneChangeController(dh)
|
|
||||||
relc.enabled = True
|
|
||||||
dh.alc.lane_change_set_timer = AutoLaneChangeMode.NUDGE
|
dh.alc.lane_change_set_timer = AutoLaneChangeMode.NUDGE
|
||||||
for _ in range(10):
|
for _ in range(10):
|
||||||
dh.update(carstate, lateral_active, lane_change_prob,
|
dh.update(carstate, lateral_active, lane_change_prob)
|
||||||
left_edge_detected=relc.left_edge_detected, right_edge_detected=relc.right_edge_detected)
|
|
||||||
assert dh.desire == expected_desire # The first four tests were unit tests to test the controller, where this tests the integration in desire helpers
|
assert dh.desire == expected_desire # The first four tests were unit tests to test the controller, where this tests the integration in desire helpers
|
||||||
|
|
||||||
|
|||||||
@@ -1,133 +0,0 @@
|
|||||||
"""
|
|
||||||
Copyright (c) 2021-, rav4kumar, Haibin Wen, sunnypilot, and a number of other contributors.
|
|
||||||
|
|
||||||
This file is part of sunnypilot and is licensed under the MIT License.
|
|
||||||
See the LICENSE.md file in the root directory for more details.
|
|
||||||
"""
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
from openpilot.common.realtime import DT_MDL
|
|
||||||
from openpilot.selfdrive.controls.lib.desire_helper import DesireHelper
|
|
||||||
from openpilot.sunnypilot.selfdrive.controls.lib.relc import (
|
|
||||||
RoadEdgeLaneChangeController, EDGE_REACTION_TIME, EDGE_CLEAR_TIME, MIN_SPEED,
|
|
||||||
)
|
|
||||||
|
|
||||||
V_HIGH = MIN_SPEED + 2.0
|
|
||||||
V_LOW = MIN_SPEED - 1.0
|
|
||||||
|
|
||||||
|
|
||||||
class DummyRoadEdge:
|
|
||||||
def __init__(self, y):
|
|
||||||
self.y = [y]
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def relc(mocker):
|
|
||||||
mock_params = mocker.patch("openpilot.sunnypilot.selfdrive.controls.lib.relc.Params")
|
|
||||||
mock_params.return_value.get_bool.return_value = True
|
|
||||||
controller = RoadEdgeLaneChangeController(DesireHelper())
|
|
||||||
controller.enabled = True
|
|
||||||
return controller
|
|
||||||
|
|
||||||
|
|
||||||
def make_road_edges(left_y=-3.0, right_y=3.0):
|
|
||||||
return [DummyRoadEdge(left_y), DummyRoadEdge(right_y)]
|
|
||||||
|
|
||||||
|
|
||||||
def drive(controller, road_edge_stds, lane_line_probs, seconds, v_ego=V_HIGH, road_edges=None):
|
|
||||||
for _ in range(int(seconds / DT_MDL) + 1):
|
|
||||||
controller.update(road_edge_stds, lane_line_probs, v_ego, road_edges)
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("road_edge_stds,lane_line_probs,attr", [
|
|
||||||
([0.0, 0.9], [0.8, 0.0, 0.8, 0.8], "left_edge_detected"),
|
|
||||||
([0.9, 0.0], [0.8, 0.8, 0.0, 0.8], "right_edge_detected"),
|
|
||||||
])
|
|
||||||
def test_edge_detection(relc, road_edge_stds, lane_line_probs, attr):
|
|
||||||
drive(relc, road_edge_stds, lane_line_probs, EDGE_REACTION_TIME + 0.1)
|
|
||||||
assert getattr(relc, attr)
|
|
||||||
|
|
||||||
|
|
||||||
def test_edge_detection_requires_time(relc):
|
|
||||||
drive(relc, [0.0, 0.9], [0.8, 0.0, 0.8, 0.8], EDGE_REACTION_TIME - 0.05)
|
|
||||||
assert not relc.left_edge_detected
|
|
||||||
|
|
||||||
|
|
||||||
def test_both_edges_detected(relc):
|
|
||||||
drive(relc, [0.0, 0.0], [0.8, 0.0, 0.0, 0.8], EDGE_REACTION_TIME + 0.1)
|
|
||||||
assert relc.left_edge_detected
|
|
||||||
assert relc.right_edge_detected
|
|
||||||
|
|
||||||
|
|
||||||
def test_noise_doesnt_clear(relc):
|
|
||||||
edge = ([0.0, 0.9], [0.8, 0.0, 0.8, 0.8])
|
|
||||||
clear = ([0.9, 0.9], [0.8, 0.8, 0.8, 0.8])
|
|
||||||
|
|
||||||
drive(relc, *edge, EDGE_REACTION_TIME + 0.1)
|
|
||||||
assert relc.left_edge_detected
|
|
||||||
|
|
||||||
relc.update(*clear, V_HIGH)
|
|
||||||
relc.update(*edge, V_HIGH)
|
|
||||||
assert relc.left_edge_detected
|
|
||||||
|
|
||||||
|
|
||||||
def test_clears_after_window(relc):
|
|
||||||
edge = ([0.0, 0.9], [0.8, 0.0, 0.8, 0.8])
|
|
||||||
clear = ([0.9, 0.9], [0.8, 0.8, 0.8, 0.8])
|
|
||||||
|
|
||||||
drive(relc, *edge, EDGE_REACTION_TIME + 0.1)
|
|
||||||
assert relc.left_edge_detected
|
|
||||||
|
|
||||||
drive(relc, *clear, EDGE_CLEAR_TIME + 0.05)
|
|
||||||
assert not relc.left_edge_detected
|
|
||||||
assert relc.left_edge_timer == 0.0
|
|
||||||
|
|
||||||
|
|
||||||
def test_low_speed_skips(relc):
|
|
||||||
drive(relc, [0.0, 0.9], [0.8, 0.0, 0.8, 0.8], EDGE_REACTION_TIME + 0.1, v_ego=V_LOW)
|
|
||||||
assert not relc.left_edge_detected
|
|
||||||
assert relc.left_edge_timer == 0.0
|
|
||||||
|
|
||||||
|
|
||||||
def test_speed_drop_resets(relc):
|
|
||||||
drive(relc, [0.0, 0.9], [0.8, 0.0, 0.8, 0.8], EDGE_REACTION_TIME + 0.1)
|
|
||||||
assert relc.left_edge_detected
|
|
||||||
|
|
||||||
relc.update([0.0, 0.9], [0.8, 0.0, 0.8, 0.8], V_LOW)
|
|
||||||
assert not relc.left_edge_detected
|
|
||||||
|
|
||||||
|
|
||||||
def test_param_off_resets(relc):
|
|
||||||
drive(relc, [0.0, 0.9], [0.8, 0.0, 0.8, 0.8], EDGE_REACTION_TIME + 0.1)
|
|
||||||
assert relc.left_edge_detected
|
|
||||||
|
|
||||||
relc.params.get_bool.return_value = False
|
|
||||||
relc.read_params()
|
|
||||||
relc.update([0.0, 0.9], [0.8, 0.0, 0.8, 0.8], V_HIGH)
|
|
||||||
assert not relc.left_edge_detected
|
|
||||||
assert not relc.right_edge_detected
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("lane_line_probs", [
|
|
||||||
[0.0, 0.8, 0.8, 0.8],
|
|
||||||
[0.8, 0.8, 0.8, 0.0],
|
|
||||||
])
|
|
||||||
def test_outer_lane_lines_do_not_drive_edge_detection(relc, lane_line_probs):
|
|
||||||
drive(relc, [0.0, 0.0], lane_line_probs, EDGE_REACTION_TIME + 0.1)
|
|
||||||
assert not relc.left_edge_detected
|
|
||||||
assert not relc.right_edge_detected
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("road_edge_stds,road_edges,attr", [
|
|
||||||
([0.0, 0.9], make_road_edges(left_y=-3.0, right_y=8.0), "left_edge_detected"),
|
|
||||||
([0.9, 0.0], make_road_edges(left_y=-8.0, right_y=3.0), "right_edge_detected"),
|
|
||||||
])
|
|
||||||
def test_near_road_edge_geometry_blocks_with_visible_lane_lines(relc, road_edge_stds, road_edges, attr):
|
|
||||||
drive(relc, road_edge_stds, [0.8, 0.8, 0.8, 0.8], EDGE_REACTION_TIME + 0.1, road_edges=road_edges)
|
|
||||||
assert getattr(relc, attr)
|
|
||||||
|
|
||||||
|
|
||||||
def test_far_road_edge_geometry_does_not_block(relc):
|
|
||||||
drive(relc, [0.0, 0.0], [0.8, 0.0, 0.0, 0.8], EDGE_REACTION_TIME + 0.1, road_edges=make_road_edges(left_y=-8.0, right_y=8.0))
|
|
||||||
assert not relc.left_edge_detected
|
|
||||||
assert not relc.right_edge_detected
|
|
||||||
@@ -243,12 +243,4 @@ EVENTS_SP: dict[int, dict[str, Alert | AlertCallbackType]] = {
|
|||||||
AlertStatus.normal, AlertSize.none,
|
AlertStatus.normal, AlertSize.none,
|
||||||
Priority.MID, VisualAlert.none, AudibleAlert.prompt, 3.),
|
Priority.MID, VisualAlert.none, AudibleAlert.prompt, 3.),
|
||||||
},
|
},
|
||||||
|
|
||||||
EventNameSP.laneChangeRoadEdge: {
|
|
||||||
ET.WARNING: Alert(
|
|
||||||
"Lane Change Unavailable: Road Edge",
|
|
||||||
"",
|
|
||||||
AlertStatus.userPrompt, AlertSize.small,
|
|
||||||
Priority.LOW, VisualAlert.none, AudibleAlert.prompt, 0.1),
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,7 +41,6 @@ LOCAL_PORT_WHITELIST = {8022}
|
|||||||
SUNNYLINK_LOG_ATTR_NAME = "user.sunny.upload"
|
SUNNYLINK_LOG_ATTR_NAME = "user.sunny.upload"
|
||||||
SUNNYLINK_RECONNECT_TIMEOUT_S = 70 # FYI changing this will also would require a change on sidebar.cc
|
SUNNYLINK_RECONNECT_TIMEOUT_S = 70 # FYI changing this will also would require a change on sidebar.cc
|
||||||
DISALLOW_LOG_UPLOAD = threading.Event()
|
DISALLOW_LOG_UPLOAD = threading.Event()
|
||||||
METADATA_PATH = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "params_metadata.json")
|
|
||||||
|
|
||||||
params = Params()
|
params = Params()
|
||||||
|
|
||||||
@@ -170,39 +169,6 @@ def getParamsAllKeys() -> list[str]:
|
|||||||
return keys
|
return keys
|
||||||
|
|
||||||
|
|
||||||
@dispatcher.add_method
|
|
||||||
def getParamsAllKeysV1() -> dict[str, str]:
|
|
||||||
try:
|
|
||||||
with open(METADATA_PATH) as f:
|
|
||||||
metadata = json.load(f)
|
|
||||||
except Exception:
|
|
||||||
cloudlog.exception("sunnylinkd.getParamsAllKeysV1.metadata.exception")
|
|
||||||
metadata = {}
|
|
||||||
|
|
||||||
try:
|
|
||||||
available_keys: list[str] = [k.decode('utf-8') for k in Params().all_keys()]
|
|
||||||
|
|
||||||
params_dict: dict[str, list[dict[str, str | bool | int | object | dict | None]]] = {"params": []}
|
|
||||||
for key in available_keys:
|
|
||||||
value = get_param_as_byte(key, get_default=True)
|
|
||||||
|
|
||||||
param_entry = {
|
|
||||||
"key": key,
|
|
||||||
"type": int(params.get_type(key).value),
|
|
||||||
"default_value": base64.b64encode(value).decode('utf-8') if value else None,
|
|
||||||
}
|
|
||||||
|
|
||||||
if key in metadata:
|
|
||||||
meta_copy = metadata[key].copy()
|
|
||||||
param_entry["_extra"] = meta_copy
|
|
||||||
|
|
||||||
params_dict["params"].append(param_entry)
|
|
||||||
return {"keys": json.dumps(params_dict.get("params", []))}
|
|
||||||
except Exception:
|
|
||||||
cloudlog.exception("sunnylinkd.getParamsAllKeysV1.exception")
|
|
||||||
raise
|
|
||||||
|
|
||||||
|
|
||||||
@dispatcher.add_method
|
@dispatcher.add_method
|
||||||
def getParamsMetadata() -> str:
|
def getParamsMetadata() -> str:
|
||||||
"""Return settings_ui.json + live capabilities as gzip-compressed, base64-encoded string.
|
"""Return settings_ui.json + live capabilities as gzip-compressed, base64-encoded string.
|
||||||
|
|||||||
@@ -97,12 +97,11 @@ The compiler splices a list-context `$ref` into its parent list. Macros may refe
|
|||||||
|
|
||||||
```
|
```
|
||||||
1. common/params_keys.h — add/remove the C++ param key
|
1. common/params_keys.h — add/remove the C++ param key
|
||||||
2. params_metadata.json — automated via update_params_metadata.py
|
2. settings_ui_src/pages/<page>.yaml — add/edit/remove the item in the right section
|
||||||
3. settings_ui_src/pages/<page>.yaml — add/edit/remove the item in the right section
|
3. python sunnypilot/sunnylink/tools/compile_settings_ui.py
|
||||||
4. python sunnypilot/sunnylink/tools/compile_settings_ui.py
|
4. python sunnypilot/sunnylink/tools/validate_settings_ui.py (or: --check on the compiler)
|
||||||
5. python sunnypilot/sunnylink/tools/validate_settings_ui.py (or: --check on the compiler)
|
5. uv run python -m pytest sunnypilot/sunnylink/tests/ # run regression + compiler tests
|
||||||
6. uv run python -m pytest sunnypilot/sunnylink/tests/ # run regression + compiler tests
|
6. commit
|
||||||
7. commit
|
|
||||||
```
|
```
|
||||||
|
|
||||||
CI runs `compile_settings_ui.py --check` to fail on hand-edited `settings_ui.json`.
|
CI runs `compile_settings_ui.py --check` to fail on hand-edited `settings_ui.json`.
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -537,12 +537,6 @@
|
|||||||
"value": 0
|
"value": 0
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "RoadEdgeLaneChangeEnabled",
|
|
||||||
"widget": "toggle",
|
|
||||||
"title": "Block Lane Change: Road Edge Detection",
|
|
||||||
"description": "Blocks the lane change if the model sees a road edge on your signaled side."
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -593,26 +587,6 @@
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"key": "RadarDistance",
|
|
||||||
"widget": "toggle",
|
|
||||||
"title": "Radar Distance",
|
|
||||||
"description": "Holds a lead through brief radar flicker/dropout so sunnypilot does not lose and re-grab it, smoothing the hard/late brakes that radar drop-outs cause. Braking is never reduced below stock.",
|
|
||||||
"visibility": [
|
|
||||||
{
|
|
||||||
"type": "capability",
|
|
||||||
"field": "has_longitudinal_control",
|
|
||||||
"equals": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"enablement": [
|
|
||||||
{
|
|
||||||
"type": "capability",
|
|
||||||
"field": "has_longitudinal_control",
|
|
||||||
"equals": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"key": "DisengageOnAccelerator",
|
"key": "DisengageOnAccelerator",
|
||||||
"widget": "toggle",
|
"widget": "toggle",
|
||||||
@@ -646,58 +620,6 @@
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"key": "AccelPersonalityEnabled",
|
|
||||||
"widget": "toggle",
|
|
||||||
"title": "Enable Acceleration Profiles",
|
|
||||||
"description": "Enables Eco/Normal/Sport acceleration profiles for longitudinal control, including early soft braking.",
|
|
||||||
"visibility": [
|
|
||||||
{
|
|
||||||
"type": "capability",
|
|
||||||
"field": "has_longitudinal_control",
|
|
||||||
"equals": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"enablement": [
|
|
||||||
{
|
|
||||||
"type": "capability",
|
|
||||||
"field": "has_longitudinal_control",
|
|
||||||
"equals": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "AccelPersonality",
|
|
||||||
"widget": "multiple_button",
|
|
||||||
"title": "Acceleration Profile",
|
|
||||||
"description": "Eco accelerates gently and brakes early and soft; Sport accelerates briskly. Hard-braking authority is always preserved.",
|
|
||||||
"options": [
|
|
||||||
{
|
|
||||||
"value": 0,
|
|
||||||
"label": "Eco"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"value": 1,
|
|
||||||
"label": "Normal"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"value": 2,
|
|
||||||
"label": "Sport"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"enablement": [
|
|
||||||
{
|
|
||||||
"type": "capability",
|
|
||||||
"field": "has_longitudinal_control",
|
|
||||||
"equals": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "param",
|
|
||||||
"key": "AccelPersonalityEnabled",
|
|
||||||
"equals": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"key": "IntelligentCruiseButtonManagement",
|
"key": "IntelligentCruiseButtonManagement",
|
||||||
"widget": "toggle",
|
"widget": "toggle",
|
||||||
@@ -2079,22 +2001,6 @@
|
|||||||
"equals": true
|
"equals": true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "PlanplusControl",
|
|
||||||
"widget": "option",
|
|
||||||
"title": "Plan Plus Controls",
|
|
||||||
"description": "Adjust planplus model recentering strength. The higher this number the more aggressively the model will recover to lane center; too high and it will ping-pong.",
|
|
||||||
"min": 0.0,
|
|
||||||
"max": 2.0,
|
|
||||||
"step": 0.1,
|
|
||||||
"enablement": [
|
|
||||||
{
|
|
||||||
"type": "param",
|
|
||||||
"key": "ShowAdvancedControls",
|
|
||||||
"equals": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@@ -2262,50 +2168,6 @@
|
|||||||
"title": "Toyota / Lexus Settings",
|
"title": "Toyota / Lexus Settings",
|
||||||
"description": "",
|
"description": "",
|
||||||
"items": [
|
"items": [
|
||||||
{
|
|
||||||
"key": "ToyotaAutoHold",
|
|
||||||
"widget": "toggle",
|
|
||||||
"needs_onroad_cycle": true,
|
|
||||||
"title": "Toyota: Auto Brake Hold FOR TSS2 HYBRID CARS",
|
|
||||||
"enablement": [
|
|
||||||
{
|
|
||||||
"type": "not_engaged"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "ToyotaEnhancedBsm",
|
|
||||||
"widget": "toggle",
|
|
||||||
"needs_onroad_cycle": true,
|
|
||||||
"title": "Toyota: Prius TSS2 BSM and some tssp",
|
|
||||||
"enablement": [
|
|
||||||
{
|
|
||||||
"type": "not_engaged"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "ToyotaTSS2Long",
|
|
||||||
"widget": "toggle",
|
|
||||||
"needs_onroad_cycle": true,
|
|
||||||
"title": "Toyota: custom longitudinal for TSS2",
|
|
||||||
"enablement": [
|
|
||||||
{
|
|
||||||
"type": "not_engaged"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "ToyotaDriveMode",
|
|
||||||
"widget": "toggle",
|
|
||||||
"needs_onroad_cycle": true,
|
|
||||||
"title": "Enable drive mode btn link",
|
|
||||||
"enablement": [
|
|
||||||
{
|
|
||||||
"type": "not_engaged"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"key": "ToyotaEnforceStockLongitudinal",
|
"key": "ToyotaEnforceStockLongitudinal",
|
||||||
"widget": "toggle",
|
"widget": "toggle",
|
||||||
|
|||||||
@@ -24,15 +24,6 @@ sections:
|
|||||||
- $ref: '#/macros/longitudinal'
|
- $ref: '#/macros/longitudinal'
|
||||||
enablement:
|
enablement:
|
||||||
- $ref: '#/macros/longitudinal'
|
- $ref: '#/macros/longitudinal'
|
||||||
- key: RadarDistance
|
|
||||||
widget: toggle
|
|
||||||
title: Radar Distance
|
|
||||||
description: Holds a lead through brief radar flicker/dropout so sunnypilot does not lose and re-grab
|
|
||||||
it, smoothing the hard/late brakes that radar drop-outs cause. Braking is never reduced below stock.
|
|
||||||
visibility:
|
|
||||||
- $ref: '#/macros/longitudinal'
|
|
||||||
enablement:
|
|
||||||
- $ref: '#/macros/longitudinal'
|
|
||||||
- key: DisengageOnAccelerator
|
- key: DisengageOnAccelerator
|
||||||
widget: toggle
|
widget: toggle
|
||||||
title: Disengage Cruise on Accelerator Pedal
|
title: Disengage Cruise on Accelerator Pedal
|
||||||
@@ -52,31 +43,6 @@ sections:
|
|||||||
label: Relaxed
|
label: Relaxed
|
||||||
enablement:
|
enablement:
|
||||||
- $ref: '#/macros/longitudinal'
|
- $ref: '#/macros/longitudinal'
|
||||||
- key: AccelPersonalityEnabled
|
|
||||||
widget: toggle
|
|
||||||
title: Enable Acceleration Profiles
|
|
||||||
description: Enables Eco/Normal/Sport acceleration profiles for longitudinal control, including early soft braking.
|
|
||||||
visibility:
|
|
||||||
- $ref: '#/macros/longitudinal'
|
|
||||||
enablement:
|
|
||||||
- $ref: '#/macros/longitudinal'
|
|
||||||
- key: AccelPersonality
|
|
||||||
widget: multiple_button
|
|
||||||
title: Acceleration Profile
|
|
||||||
description: Eco accelerates gently and brakes early and soft; Sport accelerates briskly. Hard-braking
|
|
||||||
authority is always preserved.
|
|
||||||
options:
|
|
||||||
- value: 0
|
|
||||||
label: Eco
|
|
||||||
- value: 1
|
|
||||||
label: Normal
|
|
||||||
- value: 2
|
|
||||||
label: Sport
|
|
||||||
enablement:
|
|
||||||
- $ref: '#/macros/longitudinal'
|
|
||||||
- type: param
|
|
||||||
key: AccelPersonalityEnabled
|
|
||||||
equals: true
|
|
||||||
- key: IntelligentCruiseButtonManagement
|
- key: IntelligentCruiseButtonManagement
|
||||||
widget: toggle
|
widget: toggle
|
||||||
title: Intelligent Cruise Button Management (ICBM) (Alpha)
|
title: Intelligent Cruise Button Management (ICBM) (Alpha)
|
||||||
|
|||||||
@@ -51,16 +51,6 @@ sections:
|
|||||||
key: LagdToggle
|
key: LagdToggle
|
||||||
equals: true
|
equals: true
|
||||||
- $ref: '#/macros/advanced_only'
|
- $ref: '#/macros/advanced_only'
|
||||||
- key: PlanplusControl
|
|
||||||
widget: option
|
|
||||||
title: Plan Plus Controls
|
|
||||||
description: Adjust planplus model recentering strength. The higher this number the more aggressively the model will recover
|
|
||||||
to lane center; too high and it will ping-pong.
|
|
||||||
min: 0.0
|
|
||||||
max: 2.0
|
|
||||||
step: 0.1
|
|
||||||
enablement:
|
|
||||||
- $ref: '#/macros/advanced_only'
|
|
||||||
- id: lateral_control
|
- id: lateral_control
|
||||||
title: Lateral Control
|
title: Lateral Control
|
||||||
description: Neural network lateral control for supported models
|
description: Neural network lateral control for supported models
|
||||||
|
|||||||
@@ -255,7 +255,3 @@ sections:
|
|||||||
key: AutoLaneChangeTimer
|
key: AutoLaneChangeTimer
|
||||||
op: '>'
|
op: '>'
|
||||||
value: 0
|
value: 0
|
||||||
- key: RoadEdgeLaneChangeEnabled
|
|
||||||
widget: toggle
|
|
||||||
title: 'Block Lane Change: Road Edge Detection'
|
|
||||||
description: Blocks the lane change if the model sees a road edge on your signaled side.
|
|
||||||
|
|||||||
@@ -60,30 +60,6 @@ sections:
|
|||||||
title: Toyota / Lexus Settings
|
title: Toyota / Lexus Settings
|
||||||
description: ''
|
description: ''
|
||||||
items:
|
items:
|
||||||
- key: ToyotaAutoHold
|
|
||||||
widget: toggle
|
|
||||||
needs_onroad_cycle: true
|
|
||||||
title: 'Toyota: Auto Brake Hold FOR TSS2 HYBRID CARS'
|
|
||||||
enablement:
|
|
||||||
- $ref: '#/macros/not_engaged'
|
|
||||||
- key: ToyotaEnhancedBsm
|
|
||||||
widget: toggle
|
|
||||||
needs_onroad_cycle: true
|
|
||||||
title: 'Toyota: Prius TSS2 BSM and some tssp'
|
|
||||||
enablement:
|
|
||||||
- $ref: '#/macros/not_engaged'
|
|
||||||
- key: ToyotaTSS2Long
|
|
||||||
widget: toggle
|
|
||||||
needs_onroad_cycle: true
|
|
||||||
title: 'Toyota: custom longitudinal for TSS2'
|
|
||||||
enablement:
|
|
||||||
- $ref: '#/macros/not_engaged'
|
|
||||||
- key: ToyotaDriveMode
|
|
||||||
widget: toggle
|
|
||||||
needs_onroad_cycle: true
|
|
||||||
title: Enable drive mode btn link
|
|
||||||
enablement:
|
|
||||||
- $ref: '#/macros/not_engaged'
|
|
||||||
- key: ToyotaEnforceStockLongitudinal
|
- key: ToyotaEnforceStockLongitudinal
|
||||||
widget: toggle
|
widget: toggle
|
||||||
needs_onroad_cycle: true
|
needs_onroad_cycle: true
|
||||||
|
|||||||
@@ -1,86 +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.
|
|
||||||
"""
|
|
||||||
import json
|
|
||||||
|
|
||||||
from openpilot.sunnypilot.sunnylink.athena.sunnylinkd import getParamsAllKeysV1, METADATA_PATH
|
|
||||||
|
|
||||||
|
|
||||||
def test_get_params_all_keys_v1():
|
|
||||||
"""
|
|
||||||
Test the getParamsAllKeysV1 API endpoint.
|
|
||||||
|
|
||||||
Why:
|
|
||||||
This endpoint is used by the UI (and potentially external tools) to fetch the list of
|
|
||||||
available parameters along with their metadata (titles, descriptions, options, constraints).
|
|
||||||
We need to ensure it returns the correct structure and that the metadata from
|
|
||||||
params_metadata.json is correctly merged into the response.
|
|
||||||
|
|
||||||
Expected:
|
|
||||||
- The response should contain a "keys" field which is a JSON string of a list of parameters.
|
|
||||||
- Each parameter object should have "key", "type", "default_value", and optionally "_extra".
|
|
||||||
- The "_extra" field should contain the rich metadata (title, options, min/max, etc.) matching
|
|
||||||
the source of truth (params_metadata.json).
|
|
||||||
"""
|
|
||||||
response = getParamsAllKeysV1()
|
|
||||||
assert "keys" in response
|
|
||||||
|
|
||||||
keys_json = response["keys"]
|
|
||||||
params_list = json.loads(keys_json)
|
|
||||||
|
|
||||||
assert isinstance(params_list, list)
|
|
||||||
assert len(params_list) > 0
|
|
||||||
|
|
||||||
# Check structure of first item
|
|
||||||
first_param = params_list[0]
|
|
||||||
assert "key" in first_param
|
|
||||||
assert "type" in first_param
|
|
||||||
assert "default_value" in first_param
|
|
||||||
|
|
||||||
if "_extra" in first_param:
|
|
||||||
assert isinstance(first_param["_extra"], dict)
|
|
||||||
assert "default" not in first_param["_extra"]
|
|
||||||
assert "type" not in first_param["_extra"]
|
|
||||||
|
|
||||||
# Load the source of truth
|
|
||||||
with open(METADATA_PATH) as f:
|
|
||||||
metadata = json.load(f)
|
|
||||||
|
|
||||||
# Verify that the API response matches the metadata file for a few sample keys
|
|
||||||
# This ensures the plumbing is working without being brittle to content changes
|
|
||||||
|
|
||||||
# 1. Check a key that should have metadata
|
|
||||||
keys_with_metadata = [k for k in params_list if k["key"] in metadata]
|
|
||||||
assert len(keys_with_metadata) > 0, "No parameters found that match metadata keys"
|
|
||||||
|
|
||||||
for param in keys_with_metadata[:5]: # Check first 5 matches
|
|
||||||
key = param["key"]
|
|
||||||
expected_meta = metadata[key]
|
|
||||||
|
|
||||||
assert "_extra" in param, f"Parameter {key} should have _extra field"
|
|
||||||
actual_meta = param["_extra"]
|
|
||||||
|
|
||||||
# Verify all fields in JSON are present in the API response
|
|
||||||
for meta_key, meta_val in expected_meta.items():
|
|
||||||
assert meta_key in actual_meta, f"Missing {meta_key} in API response for {key}"
|
|
||||||
assert actual_meta[meta_key] == meta_val, f"Mismatch for {key}.{meta_key}: expected {meta_val}, got {actual_meta[meta_key]}"
|
|
||||||
|
|
||||||
# 2. Check that we are correctly serving options if they exist
|
|
||||||
params_with_options = [k for k in keys_with_metadata if "options" in k.get("_extra", {})]
|
|
||||||
if params_with_options:
|
|
||||||
param = params_with_options[0]
|
|
||||||
key = param["key"]
|
|
||||||
assert isinstance(param["_extra"]["options"], list), f"Options for {key} should be a list"
|
|
||||||
assert param["_extra"]["options"] == metadata[key]["options"]
|
|
||||||
|
|
||||||
# 3. Check that we are correctly serving numeric constraints if they exist
|
|
||||||
params_with_constraints = [k for k in keys_with_metadata if "min" in k.get("_extra", {})]
|
|
||||||
if params_with_constraints:
|
|
||||||
param = params_with_constraints[0]
|
|
||||||
key = param["key"]
|
|
||||||
assert param["_extra"]["min"] == metadata[key]["min"]
|
|
||||||
assert param["_extra"]["max"] == metadata[key]["max"]
|
|
||||||
assert param["_extra"]["step"] == metadata[key]["step"]
|
|
||||||
@@ -1,284 +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.
|
|
||||||
"""
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
from openpilot.common.params import Params
|
|
||||||
from openpilot.sunnypilot.sunnylink.athena.sunnylinkd import METADATA_PATH
|
|
||||||
|
|
||||||
|
|
||||||
def test_metadata_json_exists():
|
|
||||||
"""
|
|
||||||
Test that the params_metadata.json file exists at the expected path.
|
|
||||||
|
|
||||||
Why:
|
|
||||||
The metadata file is the source of truth for parameter descriptions, options, and constraints.
|
|
||||||
If it's missing, the UI will not be able to display rich information for parameters.
|
|
||||||
|
|
||||||
Expected:
|
|
||||||
The file should exist at sunnypilot/sunnylink/params_metadata.json.
|
|
||||||
"""
|
|
||||||
assert os.path.exists(METADATA_PATH), f"Metadata file not found at {METADATA_PATH}"
|
|
||||||
|
|
||||||
|
|
||||||
def test_metadata_json_valid():
|
|
||||||
"""
|
|
||||||
Test that the params_metadata.json file contains valid JSON.
|
|
||||||
|
|
||||||
Why:
|
|
||||||
Invalid JSON will cause the metadata loading to fail, potentially crashing the UI or
|
|
||||||
resulting in missing metadata.
|
|
||||||
|
|
||||||
Expected:
|
|
||||||
The file content should be parseable as a JSON object (dictionary).
|
|
||||||
"""
|
|
||||||
with open(METADATA_PATH) as f:
|
|
||||||
try:
|
|
||||||
data = json.load(f)
|
|
||||||
except json.JSONDecodeError:
|
|
||||||
pytest.fail("Metadata file is not valid JSON")
|
|
||||||
|
|
||||||
assert isinstance(data, dict), "Metadata root must be a dictionary"
|
|
||||||
|
|
||||||
|
|
||||||
def test_all_params_have_metadata():
|
|
||||||
"""
|
|
||||||
Test that every parameter in the codebase has a corresponding entry in params_metadata.json.
|
|
||||||
|
|
||||||
Why:
|
|
||||||
We want to ensure 100% coverage of parameter metadata. Any parameter added to the codebase
|
|
||||||
should also be documented in the metadata file.
|
|
||||||
|
|
||||||
Expected:
|
|
||||||
There should be no parameters in Params() that are missing from the metadata file.
|
|
||||||
If this fails, run 'python3 sunnypilot/sunnylink/tools/update_params_metadata.py'.
|
|
||||||
"""
|
|
||||||
params = Params()
|
|
||||||
all_keys = [k.decode('utf-8') for k in params.all_keys()]
|
|
||||||
|
|
||||||
with open(METADATA_PATH) as f:
|
|
||||||
metadata = json.load(f)
|
|
||||||
|
|
||||||
missing_keys = [key for key in all_keys if key not in metadata]
|
|
||||||
|
|
||||||
if missing_keys:
|
|
||||||
pytest.fail(
|
|
||||||
f"The following parameters are missing from metadata: {missing_keys}. "
|
|
||||||
+ "Please run 'python3 sunnypilot/sunnylink/tools/update_params_metadata.py' to update."
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def test_metadata_keys_exist_in_params():
|
|
||||||
"""
|
|
||||||
Test that all keys in params_metadata.json actually exist in the codebase.
|
|
||||||
|
|
||||||
Why:
|
|
||||||
We want to avoid stale metadata for parameters that have been removed or renamed.
|
|
||||||
This keeps the metadata file clean and relevant.
|
|
||||||
|
|
||||||
Expected:
|
|
||||||
There should be no keys in the metadata file that are not present in Params().
|
|
||||||
This prints a warning rather than failing, as it's less critical than missing metadata.
|
|
||||||
"""
|
|
||||||
params = Params()
|
|
||||||
all_keys = {k.decode('utf-8') for k in params.all_keys()}
|
|
||||||
|
|
||||||
with open(METADATA_PATH) as f:
|
|
||||||
metadata = json.load(f)
|
|
||||||
|
|
||||||
extra_keys = [key for key in metadata.keys() if key not in all_keys]
|
|
||||||
|
|
||||||
if extra_keys:
|
|
||||||
print(f"Warning: The following keys in metadata do not exist in Params: {extra_keys}")
|
|
||||||
|
|
||||||
|
|
||||||
def test_no_default_titles():
|
|
||||||
"""
|
|
||||||
Test that no parameter has a title that is identical to its key.
|
|
||||||
|
|
||||||
Why:
|
|
||||||
The default behavior of the update script is to set the title equal to the key.
|
|
||||||
We want to force developers to provide human-readable, descriptive titles for all parameters.
|
|
||||||
|
|
||||||
Expected:
|
|
||||||
No parameter metadata should have 'title' == 'key'.
|
|
||||||
"""
|
|
||||||
with open(METADATA_PATH) as f:
|
|
||||||
metadata = json.load(f)
|
|
||||||
|
|
||||||
default_title_keys = [key for key, meta in metadata.items() if meta.get("title") == key]
|
|
||||||
|
|
||||||
if default_title_keys:
|
|
||||||
pytest.fail(
|
|
||||||
f"The following parameters have default titles (title == key): {default_title_keys}. "
|
|
||||||
+ "Please update 'params_metadata.json' with descriptive titles."
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def test_options_structure():
|
|
||||||
"""
|
|
||||||
Test that the 'options' field in metadata follows the correct structure.
|
|
||||||
|
|
||||||
Why:
|
|
||||||
The UI expects 'options' to be a list of objects with 'value' and 'label' keys.
|
|
||||||
Incorrect structure will break the UI rendering for dropdowns/toggles.
|
|
||||||
|
|
||||||
Expected:
|
|
||||||
If 'options' is present, it must be a list of dicts, and each dict must have 'value' and 'label'.
|
|
||||||
"""
|
|
||||||
with open(METADATA_PATH) as f:
|
|
||||||
metadata = json.load(f)
|
|
||||||
|
|
||||||
for key, meta in metadata.items():
|
|
||||||
if "options" in meta:
|
|
||||||
options = meta["options"]
|
|
||||||
assert isinstance(options, list), f"Options for {key} must be a list"
|
|
||||||
for option in options:
|
|
||||||
assert isinstance(option, dict), f"Option in {key} must be a dictionary"
|
|
||||||
assert "value" in option, f"Option in {key} must have a 'value' key"
|
|
||||||
assert "label" in option, f"Option in {key} must have a 'label' key"
|
|
||||||
|
|
||||||
|
|
||||||
def test_numeric_constraints():
|
|
||||||
"""
|
|
||||||
Test that numeric parameters have valid 'min', 'max', and 'step' constraints.
|
|
||||||
|
|
||||||
Why:
|
|
||||||
The UI uses these constraints to validate user input and render sliders/steppers.
|
|
||||||
Missing or invalid constraints can lead to UI bugs or invalid parameter values.
|
|
||||||
|
|
||||||
Expected:
|
|
||||||
If any of min/max/step is present, ALL of them must be present.
|
|
||||||
They must be numbers (int/float), and min must be less than max.
|
|
||||||
"""
|
|
||||||
with open(METADATA_PATH) as f:
|
|
||||||
metadata = json.load(f)
|
|
||||||
|
|
||||||
for key, meta in metadata.items():
|
|
||||||
if "min" in meta or "max" in meta or "step" in meta:
|
|
||||||
assert "min" in meta, f"Numeric param {key} must have 'min'"
|
|
||||||
assert "max" in meta, f"Numeric param {key} must have 'max'"
|
|
||||||
assert "step" in meta, f"Numeric param {key} must have 'step'"
|
|
||||||
|
|
||||||
assert isinstance(meta["min"], (int, float)), f"Min for {key} must be number"
|
|
||||||
assert isinstance(meta["max"], (int, float)), f"Max for {key} must be number"
|
|
||||||
assert isinstance(meta["step"], (int, float)), f"Step for {key} must be number"
|
|
||||||
assert meta["min"] < meta["max"], f"Min must be less than max for {key}"
|
|
||||||
|
|
||||||
|
|
||||||
def test_known_params_metadata():
|
|
||||||
"""
|
|
||||||
Test specific known parameters to ensure they have the expected rich metadata.
|
|
||||||
|
|
||||||
Why:
|
|
||||||
This acts as a spot check to ensure that our rich metadata population logic is working correctly
|
|
||||||
and that critical parameters (like LongitudinalPersonality) have their options and constraints preserved.
|
|
||||||
|
|
||||||
Expected:
|
|
||||||
'LongitudinalPersonality' should have 3 options (Aggressive, Standard, Relaxed).
|
|
||||||
'CustomAccLongPressIncrement' should have min=1, max=10, step=1.
|
|
||||||
"""
|
|
||||||
with open(METADATA_PATH) as f:
|
|
||||||
metadata = json.load(f)
|
|
||||||
|
|
||||||
# Check an enum-like param
|
|
||||||
lp = metadata.get("LongitudinalPersonality")
|
|
||||||
assert lp is not None
|
|
||||||
assert "options" in lp
|
|
||||||
assert len(lp["options"]) == 3
|
|
||||||
assert lp["options"][0]["label"] == "Aggressive"
|
|
||||||
assert lp["options"][0]["value"] == 0
|
|
||||||
|
|
||||||
# Check a numeric param
|
|
||||||
acc_long = metadata.get("CustomAccLongPressIncrement")
|
|
||||||
assert acc_long is not None
|
|
||||||
assert acc_long["min"] == 1
|
|
||||||
assert acc_long["max"] == 10
|
|
||||||
assert acc_long["step"] == 1
|
|
||||||
|
|
||||||
|
|
||||||
def test_torque_control_tune_versions_in_sync():
|
|
||||||
"""
|
|
||||||
Test that TorqueControlTune options in params_metadata.json match versions in latcontrol_torque_versions.json.
|
|
||||||
|
|
||||||
Why:
|
|
||||||
The TorqueControlTune dropdown in the UI should always reflect the available torque tune versions.
|
|
||||||
If versions are added/removed from latcontrol_torque_versions.json, the metadata must be updated accordingly.
|
|
||||||
|
|
||||||
Expected:
|
|
||||||
- TorqueControlTune should have a 'Default' option with empty string value
|
|
||||||
- All versions from latcontrol_torque_versions.json should be present in the options
|
|
||||||
- The version values and labels should match between both files
|
|
||||||
"""
|
|
||||||
from openpilot.common.basedir import BASEDIR
|
|
||||||
|
|
||||||
versions_json_path = os.path.join(BASEDIR, "sunnypilot", "selfdrive", "controls", "lib", "latcontrol_torque_versions.json")
|
|
||||||
sync_script_path = "python3 sunnypilot/sunnylink/tools/sync_torque_versions.py"
|
|
||||||
|
|
||||||
# Load both files
|
|
||||||
with open(METADATA_PATH) as f:
|
|
||||||
metadata = json.load(f)
|
|
||||||
|
|
||||||
with open(versions_json_path) as f:
|
|
||||||
versions = json.load(f)
|
|
||||||
|
|
||||||
# Get TorqueControlTune metadata
|
|
||||||
torque_tune = metadata.get("TorqueControlTune")
|
|
||||||
if torque_tune is None:
|
|
||||||
pytest.fail(f"TorqueControlTune not found in params_metadata.json. Please run '{sync_script_path}' to sync.")
|
|
||||||
|
|
||||||
if "options" not in torque_tune:
|
|
||||||
pytest.fail(f"TorqueControlTune must have options. Please run '{sync_script_path}' to sync.")
|
|
||||||
|
|
||||||
options = torque_tune["options"]
|
|
||||||
if not isinstance(options, list):
|
|
||||||
pytest.fail(f"TorqueControlTune options must be a list. Please run '{sync_script_path}' to sync.")
|
|
||||||
|
|
||||||
if len(options) == 0:
|
|
||||||
pytest.fail(f"TorqueControlTune must have at least one option. Please run '{sync_script_path}' to sync.")
|
|
||||||
|
|
||||||
# Check that Default option exists
|
|
||||||
default_option = next((opt for opt in options if opt.get("value") == ""), None)
|
|
||||||
if default_option is None:
|
|
||||||
pytest.fail(f"TorqueControlTune must have a 'Default' option with empty string value. Please run '{sync_script_path}' to sync.")
|
|
||||||
|
|
||||||
if default_option.get("label") != "Default":
|
|
||||||
pytest.fail(f"Default option must have label 'Default'. Please run '{sync_script_path}' to sync.")
|
|
||||||
|
|
||||||
# Build expected options from versions.json
|
|
||||||
expected_version_keys = set(versions.keys())
|
|
||||||
actual_version_keys = set()
|
|
||||||
|
|
||||||
for option in options:
|
|
||||||
if option.get("value") == "":
|
|
||||||
continue # Skip the default option
|
|
||||||
|
|
||||||
label = option.get("label")
|
|
||||||
value = option.get("value")
|
|
||||||
|
|
||||||
# Check that this option corresponds to a version
|
|
||||||
if label not in versions:
|
|
||||||
pytest.fail(f"Option label '{label}' not found in latcontrol_torque_versions.json. Please run '{sync_script_path}' to sync.")
|
|
||||||
|
|
||||||
# Check that the value matches the version number
|
|
||||||
expected_value = float(versions[label]["version"])
|
|
||||||
if value != expected_value:
|
|
||||||
pytest.fail(f"Option '{label}' has value {value}, expected {expected_value}. Please run '{sync_script_path}' to sync.")
|
|
||||||
|
|
||||||
actual_version_keys.add(label)
|
|
||||||
|
|
||||||
# Check that all versions are represented
|
|
||||||
missing_versions = expected_version_keys - actual_version_keys
|
|
||||||
if missing_versions:
|
|
||||||
pytest.fail(f"The following versions are missing from TorqueControlTune options: {missing_versions}. " +
|
|
||||||
f"Please run '{sync_script_path}' to sync.")
|
|
||||||
|
|
||||||
extra_versions = actual_version_keys - expected_version_keys
|
|
||||||
if extra_versions:
|
|
||||||
pytest.fail("The following versions in TorqueControlTune options are not in latcontrol_torque_versions.json: " +
|
|
||||||
f"{extra_versions}. Please run '{sync_script_path}' to sync.")
|
|
||||||
@@ -1,133 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
"""
|
|
||||||
Copyright (c) 2021-, Haibin Wen, sunnypilot, and a number of other contributors.
|
|
||||||
|
|
||||||
This file is part of sunnypilot and is licensed under the MIT License.
|
|
||||||
See the LICENSE.md file in the root directory for more details.
|
|
||||||
"""
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
|
|
||||||
from openpilot.common.basedir import BASEDIR
|
|
||||||
from openpilot.common.params import Params
|
|
||||||
from openpilot.sunnypilot.system.params_migration import ONROAD_BRIGHTNESS_TIMER_VALUES
|
|
||||||
|
|
||||||
METADATA_PATH = os.path.join(os.path.dirname(__file__), "../params_metadata.json")
|
|
||||||
TORQUE_VERSIONS_JSON = os.path.join(BASEDIR, "sunnypilot", "selfdrive", "controls", "lib", "latcontrol_torque_versions.json")
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
params = Params()
|
|
||||||
all_keys = params.all_keys()
|
|
||||||
|
|
||||||
if os.path.exists(METADATA_PATH):
|
|
||||||
with open(METADATA_PATH) as f:
|
|
||||||
try:
|
|
||||||
data = json.load(f)
|
|
||||||
except json.JSONDecodeError:
|
|
||||||
data = {}
|
|
||||||
else:
|
|
||||||
data = {}
|
|
||||||
|
|
||||||
# Add new keys
|
|
||||||
for key in all_keys:
|
|
||||||
key_str = key.decode("utf-8")
|
|
||||||
if key_str not in data:
|
|
||||||
print(f"Adding new key: {key_str}")
|
|
||||||
data[key_str] = {
|
|
||||||
"title": key_str,
|
|
||||||
"description": "",
|
|
||||||
}
|
|
||||||
|
|
||||||
# Remove deleted keys
|
|
||||||
# keys_to_remove = [k for k in data.keys() if k.encode("utf-8") not in all_keys]
|
|
||||||
# for k in keys_to_remove:
|
|
||||||
# print(f"Removing deleted key: {k}")
|
|
||||||
# del data[k]
|
|
||||||
|
|
||||||
# Sort keys
|
|
||||||
sorted_data = dict(sorted(data.items()))
|
|
||||||
|
|
||||||
with open(METADATA_PATH, "w") as f:
|
|
||||||
json.dump(sorted_data, f, indent=2)
|
|
||||||
f.write("\n")
|
|
||||||
|
|
||||||
print(f"Updated {METADATA_PATH}")
|
|
||||||
|
|
||||||
# update onroad screen brightness params
|
|
||||||
update_onroad_brightness_param()
|
|
||||||
|
|
||||||
# update onroad screen brightness timer params
|
|
||||||
update_onroad_brightness_timer_param()
|
|
||||||
|
|
||||||
# update torque versions param
|
|
||||||
update_torque_versions_param()
|
|
||||||
|
|
||||||
|
|
||||||
def update_onroad_brightness_param():
|
|
||||||
try:
|
|
||||||
with open(METADATA_PATH) as f:
|
|
||||||
params_metadata = json.load(f)
|
|
||||||
if "OnroadScreenOffBrightness" in params_metadata:
|
|
||||||
options = [
|
|
||||||
{"value": 0, "label": "Auto (Default)"},
|
|
||||||
{"value": 1, "label": "Auto (Dark)"},
|
|
||||||
{"value": 2, "label": "Screen Off"},
|
|
||||||
]
|
|
||||||
for i in range(3, 23):
|
|
||||||
options.append({"value": i, "label": f"{(i - 2) * 5} %"})
|
|
||||||
params_metadata["OnroadScreenOffBrightness"]["options"] = options
|
|
||||||
with open(METADATA_PATH, 'w') as f:
|
|
||||||
json.dump(params_metadata, f, indent=2)
|
|
||||||
f.write('\n')
|
|
||||||
print(f"Updated OnroadScreenOffBrightness options in params_metadata.json with {len(options)} options.")
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Failed to update OnroadScreenOffBrightness versions in params_metadata.json: {e}")
|
|
||||||
|
|
||||||
|
|
||||||
def update_onroad_brightness_timer_param():
|
|
||||||
try:
|
|
||||||
with open(METADATA_PATH) as f:
|
|
||||||
params_metadata = json.load(f)
|
|
||||||
if "OnroadScreenOffTimer" in params_metadata:
|
|
||||||
options = []
|
|
||||||
for _index, seconds in sorted(ONROAD_BRIGHTNESS_TIMER_VALUES.items()):
|
|
||||||
label = f"{seconds}s" if seconds < 60 else f"{seconds // 60}m"
|
|
||||||
options.append({"value": seconds, "label": label})
|
|
||||||
params_metadata["OnroadScreenOffTimer"]["options"] = options
|
|
||||||
with open(METADATA_PATH, 'w') as f:
|
|
||||||
json.dump(params_metadata, f, indent=2)
|
|
||||||
f.write('\n')
|
|
||||||
print(f"Updated OnroadScreenOffTimer options in params_metadata.json with {len(options)} options.")
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Failed to update OnroadScreenOffTimer options in params_metadata.json: {e}")
|
|
||||||
|
|
||||||
|
|
||||||
def update_torque_versions_param():
|
|
||||||
with open(TORQUE_VERSIONS_JSON) as f:
|
|
||||||
current_versions = json.load(f)
|
|
||||||
|
|
||||||
try:
|
|
||||||
with open(METADATA_PATH) as f:
|
|
||||||
params_metadata = json.load(f)
|
|
||||||
|
|
||||||
options = [{"value": "", "label": "Default"}]
|
|
||||||
for version_key, version_data in current_versions.items():
|
|
||||||
version_value = float(version_data["version"])
|
|
||||||
options.append({"value": version_value, "label": str(version_key)})
|
|
||||||
|
|
||||||
if "TorqueControlTune" in params_metadata:
|
|
||||||
params_metadata["TorqueControlTune"]["options"] = options
|
|
||||||
|
|
||||||
with open(METADATA_PATH, 'w') as f:
|
|
||||||
json.dump(params_metadata, f, indent=2)
|
|
||||||
f.write('\n')
|
|
||||||
|
|
||||||
print(f"Updated TorqueControlTune options in params_metadata.json with {len(options)} options: \n{options}")
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Failed to update TorqueControlTune versions in params_metadata.json: {e}")
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
@@ -45,9 +45,8 @@ class ScrollState(Enum):
|
|||||||
|
|
||||||
|
|
||||||
class GuiScrollPanel2:
|
class GuiScrollPanel2:
|
||||||
def __init__(self, horizontal: bool = True, handle_out_of_bounds: bool = True) -> None:
|
def __init__(self, horizontal: bool = True) -> None:
|
||||||
self._horizontal = horizontal
|
self._horizontal = horizontal
|
||||||
self._handle_out_of_bounds = handle_out_of_bounds
|
|
||||||
self._state = ScrollState.STEADY
|
self._state = ScrollState.STEADY
|
||||||
self._offset: rl.Vector2 = rl.Vector2(0, 0)
|
self._offset: rl.Vector2 = rl.Vector2(0, 0)
|
||||||
self._initial_click_event: MouseEvent | None = None
|
self._initial_click_event: MouseEvent | None = None
|
||||||
@@ -99,7 +98,7 @@ class GuiScrollPanel2:
|
|||||||
# simple exponential return if out of bounds
|
# simple exponential return if out of bounds
|
||||||
# out of bounds is handled by snapping, so skip if set
|
# out of bounds is handled by snapping, so skip if set
|
||||||
out_of_bounds = self.get_offset() > max_offset or self.get_offset() < min_offset
|
out_of_bounds = self.get_offset() > max_offset or self.get_offset() < min_offset
|
||||||
if out_of_bounds and snap_target is None and self._handle_out_of_bounds:
|
if out_of_bounds and snap_target is None:
|
||||||
target = max_offset if self.get_offset() > max_offset else min_offset
|
target = max_offset if self.get_offset() > max_offset else min_offset
|
||||||
|
|
||||||
dt = rl.get_frame_time() or 1e-6
|
dt = rl.get_frame_time() or 1e-6
|
||||||
|
|||||||
@@ -75,6 +75,7 @@ class _Scroller(Widget):
|
|||||||
self._items: list[Widget] = []
|
self._items: list[Widget] = []
|
||||||
self._horizontal = horizontal
|
self._horizontal = horizontal
|
||||||
self._snap_items = snap_items
|
self._snap_items = snap_items
|
||||||
|
assert not self._snap_items or self._horizontal, "Snapping is only supported for horizontal scrolling"
|
||||||
self._spacing = spacing
|
self._spacing = spacing
|
||||||
self._pad = pad
|
self._pad = pad
|
||||||
|
|
||||||
@@ -190,12 +191,8 @@ class _Scroller(Widget):
|
|||||||
snap_target: float | None = None
|
snap_target: float | None = None
|
||||||
if self._snap_items and visible_items and self._scrolling_to[0] is None:
|
if self._snap_items and visible_items and self._scrolling_to[0] is None:
|
||||||
# TODO: this doesn't handle two small buttons at the edges well
|
# TODO: this doesn't handle two small buttons at the edges well
|
||||||
if self._horizontal:
|
center_pos = self._rect.x + self._rect.width / 2
|
||||||
center_pos = self._rect.x + self._rect.width / 2
|
closest_delta_pos = min((((item.rect.x + item.rect.width / 2) - center_pos) for item in visible_items), key=abs)
|
||||||
closest_delta_pos = min((((item.rect.x + item.rect.width / 2) - center_pos) for item in visible_items), key=abs)
|
|
||||||
else:
|
|
||||||
center_pos = self._rect.y + self._rect.height / 2
|
|
||||||
closest_delta_pos = min((((item.rect.y + item.rect.height / 2) - center_pos) for item in visible_items), key=abs)
|
|
||||||
snap_target = self.scroll_panel.get_offset() - closest_delta_pos
|
snap_target = self.scroll_panel.get_offset() - closest_delta_pos
|
||||||
|
|
||||||
return self.scroll_panel.update(self._rect, content_size, snap_target=snap_target)
|
return self.scroll_panel.update(self._rect, content_size, snap_target=snap_target)
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ wheels = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "aiohttp"
|
name = "aiohttp"
|
||||||
version = "3.13.5"
|
version = "3.14.1"
|
||||||
source = { registry = "https://pypi.org/simple" }
|
source = { registry = "https://pypi.org/simple" }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "aiohappyeyeballs" },
|
{ name = "aiohappyeyeballs" },
|
||||||
@@ -30,27 +30,29 @@ dependencies = [
|
|||||||
{ name = "frozenlist" },
|
{ name = "frozenlist" },
|
||||||
{ name = "multidict" },
|
{ name = "multidict" },
|
||||||
{ name = "propcache" },
|
{ name = "propcache" },
|
||||||
|
{ name = "typing-extensions" },
|
||||||
{ name = "yarl" },
|
{ name = "yarl" },
|
||||||
]
|
]
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/77/9a/152096d4808df8e4268befa55fba462f440f14beab85e8ad9bf990516918/aiohttp-3.13.5.tar.gz", hash = "sha256:9d98cc980ecc96be6eb4c1994ce35d28d8b1f5e5208a23b421187d1209dbb7d1", size = 7858271, upload-time = "2026-03-31T22:01:03.343Z" }
|
sdist = { url = "https://files.pythonhosted.org/packages/82/78/8ea7308cac6934de8c74a14f3d5f65d1c89287426688be79538d0e5c013d/aiohttp-3.14.1.tar.gz", hash = "sha256:307f2cff90a764d329e77040603fa032db89c5c24fdad50c4c15334cba744035", size = 7955794, upload-time = "2026-06-07T21:09:35.529Z" }
|
||||||
wheels = [
|
wheels = [
|
||||||
{ url = "https://files.pythonhosted.org/packages/be/6f/353954c29e7dcce7cf00280a02c75f30e133c00793c7a2ed3776d7b2f426/aiohttp-3.13.5-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:023ecba036ddd840b0b19bf195bfae970083fd7024ce1ac22e9bba90464620e9", size = 748876, upload-time = "2026-03-31T21:57:36.319Z" },
|
{ url = "https://files.pythonhosted.org/packages/1d/21/151624b51cd92553d95424daf4bf19f19ce9be9002d19253e7e7ce67197b/aiohttp-3.14.1-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:d35143e27778b4bb0fb189562d7f275bff79c62ab8e98459717c0ea617ff2480", size = 757402, upload-time = "2026-06-07T21:06:40.311Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/f5/1b/428a7c64687b3b2e9cd293186695affc0e1e54a445d0361743b231f11066/aiohttp-3.13.5-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:15c933ad7920b7d9a20de151efcd05a6e38302cbf0e10c9b2acb9a42210a2416", size = 499557, upload-time = "2026-03-31T21:57:38.236Z" },
|
{ url = "https://files.pythonhosted.org/packages/c2/82/280619e0bd7bf2454987e19282616e84762255dd9c8468f62382e8c191f1/aiohttp-3.14.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:bcfb80a2cc36fba2534e5e5b5264dc7ae6fcd9bf15256da3e53d2f499e6fa29d", size = 512310, upload-time = "2026-06-07T21:06:42.207Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/29/47/7be41556bfbb6917069d6a6634bb7dd5e163ba445b783a90d40f5ac7e3a7/aiohttp-3.13.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ab2899f9fa2f9f741896ebb6fa07c4c883bfa5c7f2ddd8cf2aafa86fa981b2d2", size = 500258, upload-time = "2026-03-31T21:57:39.923Z" },
|
{ url = "https://files.pythonhosted.org/packages/55/b2/2aac325583aaa1353045f96dffa586d8a34e8322e14a7ba49cffeb103ab4/aiohttp-3.14.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:27fd7c91e51729b4f7e1577865fa6d34c9adccbc39aabe9000285b48af9f0ec2", size = 512448, upload-time = "2026-06-07T21:06:43.813Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/67/84/c9ecc5828cb0b3695856c07c0a6817a99d51e2473400f705275a2b3d9239/aiohttp-3.13.5-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a60eaa2d440cd4707696b52e40ed3e2b0f73f65be07fd0ef23b6b539c9c0b0b4", size = 1749199, upload-time = "2026-03-31T21:57:41.938Z" },
|
{ url = "https://files.pythonhosted.org/packages/8a/72/a60607cb849faa8af8a356c9329ea2eb6f395d49e82cc82ccba1fd8deb8f/aiohttp-3.14.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:64c567bf9eaf664280116a8688f63016e6b32db2505908e2bdaca1b6438142f2", size = 1766854, upload-time = "2026-06-07T21:06:45.391Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/f0/d3/3c6d610e66b495657622edb6ae7c7fd31b2e9086b4ec50b47897ad6042a9/aiohttp-3.13.5-cp312-cp312-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:55b3bdd3292283295774ab585160c4004f4f2f203946997f49aac032c84649e9", size = 1721013, upload-time = "2026-03-31T21:57:43.904Z" },
|
{ url = "https://files.pythonhosted.org/packages/b5/d3/d9fe1c9ec7557ab4d0d82bebaa728c6418f0b93295ec2f4ab015f7710cc7/aiohttp-3.14.1-cp312-cp312-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:f5e6ff2bdbb8f4cd3fbe41f99e25bbcd58e3bf9f13d3dd31a11e7917251cc77a", size = 1740884, upload-time = "2026-06-07T21:06:47.413Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/49/a0/24409c12217456df0bae7babe3b014e460b0b38a8e60753d6cb339f6556d/aiohttp-3.13.5-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:c2b2355dc094e5f7d45a7bb262fe7207aa0460b37a0d87027dcf21b5d890e7d5", size = 1781501, upload-time = "2026-03-31T21:57:46.285Z" },
|
{ url = "https://files.pythonhosted.org/packages/c1/dc/f2cecfaf9337ba3e63f181500814ff502aa3d00d9c7ec93a9d23d10a27b2/aiohttp-3.14.1-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2f73e01dc37122325caf079982621262f96d74823c179038a82fddfc50359264", size = 1810034, upload-time = "2026-06-07T21:06:50.165Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/98/9d/b65ec649adc5bccc008b0957a9a9c691070aeac4e41cea18559fef49958b/aiohttp-3.13.5-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:b38765950832f7d728297689ad78f5f2cf79ff82487131c4d26fe6ceecdc5f8e", size = 1878981, upload-time = "2026-03-31T21:57:48.734Z" },
|
{ url = "https://files.pythonhosted.org/packages/66/d7/2ff65c5e65c0d7476daf7e15c032e0805e36811185b9623e3238ad6c763e/aiohttp-3.14.1-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:bb2c0c80d431c0d03f2c7dbf125150fedd4f0de17366a7ca33f7ccb822391842", size = 1904054, upload-time = "2026-06-07T21:06:52.035Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/57/d8/8d44036d7eb7b6a8ec4c5494ea0c8c8b94fbc0ed3991c1a7adf230df03bf/aiohttp-3.13.5-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b18f31b80d5a33661e08c89e202edabf1986e9b49c42b4504371daeaa11b47c1", size = 1767934, upload-time = "2026-03-31T21:57:51.171Z" },
|
{ url = "https://files.pythonhosted.org/packages/20/9c/d445818389df371f56d141d881153ba23183c4735a03f7356ffb43f7757d/aiohttp-3.14.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:3e6fc1a85fa7194a1a7d19f44e8609180f4a8eb5fa4c7ed8b4355f080fad235c", size = 1790278, upload-time = "2026-06-07T21:06:54.049Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/31/04/d3f8211f273356f158e3464e9e45484d3fb8c4ce5eb2f6fe9405c3273983/aiohttp-3.13.5-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:33add2463dde55c4f2d9635c6ab33ce154e5ecf322bd26d09af95c5f81cfa286", size = 1566671, upload-time = "2026-03-31T21:57:53.326Z" },
|
{ url = "https://files.pythonhosted.org/packages/4d/aa/bf04cb4d865fc6101c2229a294ad744973b72e513fdc5a6b791e6983d72a/aiohttp-3.14.1-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:686b6c0d3911ec387b444ddf5dc62fb7f7c0a7d5186a7861626496a5ab4aff95", size = 1591795, upload-time = "2026-06-07T21:06:55.911Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/41/db/073e4ebe00b78e2dfcacff734291651729a62953b48933d765dc513bf798/aiohttp-3.13.5-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:327cc432fdf1356fb4fbc6fe833ad4e9f6aacb71a8acaa5f1855e4b25910e4a9", size = 1705219, upload-time = "2026-03-31T21:57:55.385Z" },
|
{ url = "https://files.pythonhosted.org/packages/dc/b4/4dac0038960427ba832f6609dfb4ea5437d7fd80c72001b9e48f834f428b/aiohttp-3.14.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:c6fa4dc7ad6f8109c70bb1499e589f76b0b792baf39f9b017eb92c8a81d0a199", size = 1728397, upload-time = "2026-06-07T21:06:57.777Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/48/45/7dfba71a2f9fd97b15c95c06819de7eb38113d2cdb6319669195a7d64270/aiohttp-3.13.5-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:7c35b0bf0b48a70b4cb4fc5d7bed9b932532728e124874355de1a0af8ec4bc88", size = 1743049, upload-time = "2026-03-31T21:57:57.341Z" },
|
{ url = "https://files.pythonhosted.org/packages/2b/f9/7cd4e8ad7aa3b75f17d56bb5498dd604a93d4e6eece822ba0568c413fff0/aiohttp-3.14.1-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:87a5eea1b2a5e21e1ebdbb33ad4165359189327e63fc4e4894693e7f821ac817", size = 1766504, upload-time = "2026-06-07T21:07:00.009Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/18/71/901db0061e0f717d226386a7f471bb59b19566f2cae5f0d93874b017271f/aiohttp-3.13.5-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:df23d57718f24badef8656c49743e11a89fd6f5358fa8a7b96e728fda2abf7d3", size = 1749557, upload-time = "2026-03-31T21:57:59.626Z" },
|
{ url = "https://files.pythonhosted.org/packages/f9/df/fc01d9fcad0f73fed3f3d361f1f94f975947b50dff82919f6dc2bf4316cc/aiohttp-3.14.1-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:1c1421eb01d4fd608d88cc8290211d177a58532b55ad94076fb349c5bf467f0a", size = 1777806, upload-time = "2026-06-07T21:07:02.064Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/08/d5/41eebd16066e59cd43728fe74bce953d7402f2b4ddfdfef2c0e9f17ca274/aiohttp-3.13.5-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:02e048037a6501a5ec1f6fc9736135aec6eb8a004ce48838cb951c515f32c80b", size = 1558931, upload-time = "2026-03-31T21:58:01.972Z" },
|
{ url = "https://files.pythonhosted.org/packages/41/09/47e2d090bddcc8fb4ccb4c314aadc32d7c5d9bb55f50f6ad1c92fc15d501/aiohttp-3.14.1-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:34b257ec41345c1e8f2df68fa908a7952f5de932723871eb633ecbbff396c9a4", size = 1580707, upload-time = "2026-06-07T21:07:03.942Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/30/e6/4a799798bf05740e66c3a1161079bda7a3dd8e22ca392481d7a7f9af82a6/aiohttp-3.13.5-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:31cebae8b26f8a615d2b546fee45d5ffb76852ae6450e2a03f42c9102260d6fe", size = 1774125, upload-time = "2026-03-31T21:58:04.007Z" },
|
{ url = "https://files.pythonhosted.org/packages/3d/36/f1a4ce904ae0b6930cfe9afc96d0896f7ec1a620c400405d63783bb95a9c/aiohttp-3.14.1-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:de538791a80e5d862addbc183f70f0158ac9b9bb872bb147f1fd2a683691e087", size = 1798121, upload-time = "2026-06-07T21:07:05.987Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/84/63/7749337c90f92bc2cb18f9560d67aa6258c7060d1397d21529b8004fcf6f/aiohttp-3.13.5-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:888e78eb5ca55a615d285c3c09a7a91b42e9dd6fc699b166ebd5dee87c9ccf14", size = 1732427, upload-time = "2026-03-31T21:58:06.337Z" },
|
{ url = "https://files.pythonhosted.org/packages/70/0a/e0075ce9ca0279ee1d4f0c0b85f54fea02ebc83c3007651a72bece658fec/aiohttp-3.14.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:6f71173be42d3241d428f760122febb748de0623f44308a6f120d0dd9ec572e3", size = 1767580, upload-time = "2026-06-07T21:07:07.873Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/98/de/cf2f44ff98d307e72fb97d5f5bbae3bfcb442f0ea9790c0bf5c5c2331404/aiohttp-3.13.5-cp312-cp312-win32.whl", hash = "sha256:8bd3ec6376e68a41f9f95f5ed170e2fcf22d4eb27a1f8cb361d0508f6e0557f3", size = 433534, upload-time = "2026-03-31T21:58:08.712Z" },
|
{ url = "https://files.pythonhosted.org/packages/3e/61/a0c0a8f327a9c52095cdd8e312391b00d3ed64ab6c72bb5c33d8ec251cf7/aiohttp-3.14.1-cp312-cp312-win32.whl", hash = "sha256:ec8dc383ee57ea3e883477dcca3f11b65d58199f1080acaf4cd6ad9a99698be4", size = 452771, upload-time = "2026-06-07T21:07:09.669Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/aa/ca/eadf6f9c8fa5e31d40993e3db153fb5ed0b11008ad5d9de98a95045bed84/aiohttp-3.13.5-cp312-cp312-win_amd64.whl", hash = "sha256:110e448e02c729bcebb18c60b9214a87ba33bac4a9fa5e9a5f139938b56c6cb1", size = 460446, upload-time = "2026-03-31T21:58:10.945Z" },
|
{ url = "https://files.pythonhosted.org/packages/df/d9/ea367c75f16ac9c6cdc8febb25e8318fa21a2b1bc8d6514d4b2d890bface/aiohttp-3.14.1-cp312-cp312-win_amd64.whl", hash = "sha256:2aa92c87868cd13674989f9ee83e5f9f7ea4237589b728048e1f0c8f6caa3271", size = 479873, upload-time = "2026-06-07T21:07:11.538Z" },
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/03/64/8d96784a7851156db8a4c6c3f6f91042fdf39fb15a4cc38c8b3c14833c45/aiohttp-3.14.1-cp312-cp312-win_arm64.whl", hash = "sha256:2c840c90759922cb5e6dda94596e079a30fb5a5ba548e7e0dc00574703940847", size = 448073, upload-time = "2026-06-07T21:07:13.637Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -477,11 +479,11 @@ wheels = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "idna"
|
name = "idna"
|
||||||
version = "3.17"
|
version = "3.18"
|
||||||
source = { registry = "https://pypi.org/simple" }
|
source = { registry = "https://pypi.org/simple" }
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/b9/28/99c51f664567218d824af024c0251650fb27e4ca066df188dab0769c5b91/idna-3.17.tar.gz", hash = "sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f", size = 196048, upload-time = "2026-05-28T14:32:38.55Z" }
|
sdist = { url = "https://files.pythonhosted.org/packages/cd/63/9496c57188a2ee585e0f1db071d75089a11e98aa86eb99d9d7618fc1edce/idna-3.18.tar.gz", hash = "sha256:ffb385a7e039654cef1ab9ef32c6fafe283c0c0467bba1d9029738ce4a14a848", size = 196711, upload-time = "2026-06-02T14:34:07.794Z" }
|
||||||
wheels = [
|
wheels = [
|
||||||
{ url = "https://files.pythonhosted.org/packages/de/a7/f76514cc40ad6234098ecdebda08732d75964776c51a42845b7da10649e2/idna-3.17-py3-none-any.whl", hash = "sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c", size = 65316, upload-time = "2026-05-28T14:32:37.035Z" },
|
{ url = "https://files.pythonhosted.org/packages/1e/5e/d4e9f1a599fb8e573b7b87160658329fbf28d19eac2718f51fc3def3aa5a/idna-3.18-py3-none-any.whl", hash = "sha256:7f952cbe720b688055e3f87de14f5c3e5fdaa8bc3928985c4077ca689de849a2", size = 65455, upload-time = "2026-06-02T14:34:06.319Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1333,27 +1335,27 @@ wheels = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ruff"
|
name = "ruff"
|
||||||
version = "0.15.15"
|
version = "0.15.16"
|
||||||
source = { registry = "https://pypi.org/simple" }
|
source = { registry = "https://pypi.org/simple" }
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/84/6f/a76f7d96e5c962f5b69cee865e49c15c1116897c01990faa8a57edb62e7f/ruff-0.15.15.tar.gz", hash = "sha256:b8dff018130b46d8e5bf0f926ef6b60cf871d6d5ae45fc9334e09632daa741d6", size = 4706985, upload-time = "2026-05-28T14:16:57.784Z" }
|
sdist = { url = "https://files.pythonhosted.org/packages/a6/bd/5f7ec371001337d8fa61701c186ff8b613ecac1651848c5950f4c4d5f2e9/ruff-0.15.16.tar.gz", hash = "sha256:d05e78d38c78caf020b03789e25106c93017db5a0cb6e2819885018c61343b78", size = 4714267, upload-time = "2026-06-04T16:33:09.974Z" }
|
||||||
wheels = [
|
wheels = [
|
||||||
{ url = "https://files.pythonhosted.org/packages/fa/9d/3a45c05b8ab04b4705989de70a79008e27c8003296a0feaee9edc18dd7e9/ruff-0.15.15-py3-none-linux_armv6l.whl", hash = "sha256:cf93e5388f412e1b108b1f8b34a6e036b70fe8aff89393befad96fe48670311b", size = 10710652, upload-time = "2026-05-28T14:16:06.701Z" },
|
{ url = "https://files.pythonhosted.org/packages/0c/42/53ef1c3953f157956db9bf7861e3bc50b9b887ce93300aa48cdba8336fe6/ruff-0.15.16-py3-none-linux_armv6l.whl", hash = "sha256:6ac3c0b3969cc6cf6b158c4e2f8f682acb58e7d700d8a44b65ecdc72d66ab0b2", size = 10709025, upload-time = "2026-06-04T16:32:51.935Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/05/66/da974431624bf3b49f6ee1f9543c02d929ff1cba78b0d5a79c38cf21f744/ruff-0.15.15-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:ac5a646d1f6a7dadd5d50842dae2c1f9862ac887ef5d1b1375e02def791fde6e", size = 11096615, upload-time = "2026-05-28T14:16:23.313Z" },
|
{ url = "https://files.pythonhosted.org/packages/93/9a/a79159346f19134a956607754e57d8d128f7a4c00f4ad2f7514d224c172c/ruff-0.15.16-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:197c207ed75ffba54a0dec23db4aa939a27a3053073e085e0042433cbdc58e4a", size = 11063550, upload-time = "2026-06-04T16:32:42.24Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/8c/09/7443452e5d290230a712103f2fdceeef7184f3ec99a2bd01c8be78aaceb5/ruff-0.15.15-py3-none-macosx_11_0_arm64.whl", hash = "sha256:77d955a431430c66f72dd94e379ad38a16daea3d25094872ac4edf9e797be530", size = 10436683, upload-time = "2026-05-28T14:16:40.974Z" },
|
{ url = "https://files.pythonhosted.org/packages/bc/72/3ce2ac000a5299ec238e01f51397b3b653c93b077d9b1bfe8715bb895f20/ruff-0.15.16-py3-none-macosx_11_0_arm64.whl", hash = "sha256:3a39fec45ab316cc23e7558f23fea4a70403ddb5648ea9a4a3854a16973d0071", size = 10421345, upload-time = "2026-06-04T16:32:37.251Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/53/01/d330c26a57fa4f3943a14424904027428315b700fe4d14a84bb123a649e5/ruff-0.15.15-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7614ee79c69788cf6cedd568069ade9cecc22a1ad20494efe8d0c9ebb4b622d4", size = 10769064, upload-time = "2026-05-28T14:16:28.905Z" },
|
{ url = "https://files.pythonhosted.org/packages/b0/c2/cc7fad3ec9169373f5b6a18f1917b91080feec40c3f9658334a1d28e2f03/ruff-0.15.16-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ba93191d79003116b95128c9d306e045200fdbd0bccb782b110f3cd1d4abc5cf", size = 10757217, upload-time = "2026-06-04T16:32:54.722Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/1d/85/cc8770f8bdff541b1da8392d1634141fe4a0e3f4ee596605959b7906c27f/ruff-0.15.15-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:3cdb1679e06a1f6b47bc384714ae96f6e2fb65ca441eb78c43d2ca554176ce1f", size = 10511987, upload-time = "2026-05-28T14:16:43.732Z" },
|
{ url = "https://files.pythonhosted.org/packages/69/d2/3474009eaa0a65b31fa7152a2fad5e2f050c640ceb1e6b02ee6922e94c82/ruff-0.15.16-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c6ee4b90520630120ef032aa5cc10db483852dff950e78b1d717e2993a61ac8d", size = 10507035, upload-time = "2026-06-04T16:33:05.343Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/7c/29/8c190c1472b63013583ba391f3342036e02010544c1270455ed8e519bdf3/ruff-0.15.15-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2728b93d7b23a603ea2c0ac6eb73d760bd38ec9de35f35fb41e18f7a3fee7622", size = 11275100, upload-time = "2026-05-28T14:16:55.244Z" },
|
{ url = "https://files.pythonhosted.org/packages/ca/81/b7ae6ccbd11f0c8dc3d5d67fc4be9b57ff57ca86ba56152021378e1277f2/ruff-0.15.16-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4e4215bc938bc3c8215c1472c1aa437e310fee20cd427335fec9d7e609563628", size = 11255291, upload-time = "2026-06-04T16:32:49.49Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/9f/6b/7e145ce2cc8e63d6834eca03d83a0e18d121def5c69f91b4cf4011ed4879/ruff-0.15.15-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:be582fcc0db438902c7792b08d6ddf6c9b9e21addaa10092c2c741cfb09e5a45", size = 12176903, upload-time = "2026-05-28T14:16:14.368Z" },
|
{ url = "https://files.pythonhosted.org/packages/d9/e1/46e526f1a7cc90857ce6ddf25fbb77eb6568651ac38d71b033af07076dd5/ruff-0.15.16-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7c8d26be963b090f10e29abc8b3e74a2a321f6fa34e02424e30b5af89350ecbb", size = 12124922, upload-time = "2026-06-04T16:33:07.821Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/80/a3/d5974637f68e451f7fadf015cf3101d1cd7d8ba5027cffe0b9e3826ebe6b/ruff-0.15.15-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7aa77465b8ecaf1a27bea098d696f7fed5e1eccbd10b321b682d6de586ae5627", size = 11404550, upload-time = "2026-05-28T14:16:20.138Z" },
|
{ url = "https://files.pythonhosted.org/packages/1a/da/5c791b088b596b24d0deb967fa28ae02ad751a140c0b9ea81c5ab915d6c0/ruff-0.15.16-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f198cf4123602a2280ed46c307bcbafe41758d6fee5b456b6b6058ca1514b3b4", size = 11332186, upload-time = "2026-06-04T16:33:02.971Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/fe/1c/e6e5e568f22be4fb05d6244234aba384c06b451252453b821e1a529263cf/ruff-0.15.15-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:48decfa11d740de4889de623be1463308346312f2409a56e24aa280c86162dc4", size = 11382027, upload-time = "2026-05-28T14:16:46.615Z" },
|
{ url = "https://files.pythonhosted.org/packages/72/11/5da87abe20047c8962361473923ebb2f62b595250126aadfad8c20649c1e/ruff-0.15.16-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bb27515fa6240fb586ae82b901a59e67d24acff86f2190b433dc542fe0435aeb", size = 11373541, upload-time = "2026-06-04T16:32:47.007Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/1d/01/170921b49fcd2e8858825593f91cf7146c3e40a5c3e6df763e4bb0484dde/ruff-0.15.15-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:a5015088452ca0081387063649ec67f06d3d1d6b8b936a1f836b5e9657ecd48c", size = 11366041, upload-time = "2026-05-28T14:16:26.247Z" },
|
{ url = "https://files.pythonhosted.org/packages/fe/2a/8554754c23a854ae3fd6b507e36ad61ddb121e298c6d5d617dec94ed0f14/ruff-0.15.16-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:a267c46ba1593fc26b8eecbea050b39d40c0b6bb7781ee11c90a02cd10032951", size = 11353014, upload-time = "2026-06-04T16:32:34.795Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/87/54/a7bad711d7de93254e15e06a4c375b89a03d18de45d3e5dcc86a4472fb1a/ruff-0.15.15-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:f5294aab6356c81600fcdea3a62bb1b924dfd5e91767c12318d3f68f86af57cd", size = 10741795, upload-time = "2026-05-28T14:16:17.11Z" },
|
{ url = "https://files.pythonhosted.org/packages/62/25/62ea41529ec89f742ea3fed9cb1059c72877ec7cf9b9e99ac9cf3294d1d9/ruff-0.15.16-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:528c68f39a91498a8d50e91ff5985df3d105782bab49cc378e73ac26bff083e8", size = 10737467, upload-time = "2026-06-04T16:32:26.348Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/c9/31/38c075963668f8b41c6914ee0f6f318727fbe30ab9145cb29e6df464c5fa/ruff-0.15.15-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:db5bd4d802415cca656dc1616070b725952d6ae95eb5d4831e49fbd94a38f75f", size = 10511117, upload-time = "2026-05-28T14:16:31.767Z" },
|
{ url = "https://files.pythonhosted.org/packages/90/17/334d3ad9de4d40f9dd58fdd09e35ce64553bb501e2f19a839e2fb6be14fc/ruff-0.15.16-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:7ed55c58950df60589a9a7a5d2f8fa5f54ebd287163be805adfe6ee95a9de123", size = 10521910, upload-time = "2026-06-04T16:32:32.54Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/9d/96/6ff689e1f7e375d1d97075eca022f74c2bab59554a432fe4d2e6f091986a/ruff-0.15.15-py3-none-musllinux_1_2_i686.whl", hash = "sha256:587a6278ed42059191c1a466e490bd7930fb50bd2e255398bc29616c895a61cb", size = 10994867, upload-time = "2026-05-28T14:16:35.149Z" },
|
{ url = "https://files.pythonhosted.org/packages/4d/bd/3ac7c6ae77a885c1004b3dda2446ea401768d24f851c14b4ad4b24f6639c/ruff-0.15.16-py3-none-musllinux_1_2_i686.whl", hash = "sha256:d482feaf51512b50f9790ceb417a56a61dd1e9d9bf967662b9ed27c01b34f53a", size = 10979190, upload-time = "2026-06-04T16:32:57.492Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/c3/c2/5dce0ab9f92a8d534fa62b9bf9caca3eddb8c1a81b616f5e195ada4f0d6e/ruff-0.15.15-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:df0c1c084f5f4be9812f61518a45c440d3c30d69ce4bf6c5270e66d38338f02a", size = 11482101, upload-time = "2026-05-28T14:16:49.598Z" },
|
{ url = "https://files.pythonhosted.org/packages/33/d7/609546e6a413c3f216fbf2a50c928f97c80939154f6a0503114094a86191/ruff-0.15.16-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:1e15bc8c94513dae2a40cc9ef07c94fdd4ecc9e29dabebeebe170f952322c9e3", size = 11477014, upload-time = "2026-06-04T16:32:44.687Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/b1/c0/1003b60edd697c649faf61f1a34094b1abb38fb3d1181e3f895781250a08/ruff-0.15.15-py3-none-win32.whl", hash = "sha256:29428ea79694afbe756d45fd59b36f22b6b020dc0443cf7de0173046236964b9", size = 10716774, upload-time = "2026-05-28T14:16:52.337Z" },
|
{ url = "https://files.pythonhosted.org/packages/74/0d/f2cd247ad32633a5c36e97141a2c21b11c6279f7957bc2ff360b1e08fddd/ruff-0.15.16-py3-none-win32.whl", hash = "sha256:580378f7bd4aa25f72e74aa54948a9622f142b1e509521dd10902e886681cc1e", size = 10735541, upload-time = "2026-06-04T16:32:30.145Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/02/a8/1269eddd6945a06c23f055ef7848886e37cf9d6a8bebb386a3115f01470c/ruff-0.15.15-py3-none-win_amd64.whl", hash = "sha256:8df0323902e15e24bc4bf246da830573d3cf3352bd0b9a164eab335d111ff4a4", size = 11868463, upload-time = "2026-05-28T14:16:11.333Z" },
|
{ url = "https://files.pythonhosted.org/packages/8b/9e/02e845ef151b1dee585e55c4739f8e1734ae1d9f1221dff65761c162208b/ruff-0.15.16-py3-none-win_amd64.whl", hash = "sha256:408256017284eddf98fff77b29aa4fb30f586042d535b2d9befc6512f400aaec", size = 11843403, upload-time = "2026-06-04T16:32:39.76Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/4e/b2/920464c907b191e37469d477a1aa8bc048b8f36c4c1610dfa4ab87b39e18/ruff-0.15.15-py3-none-win_arm64.whl", hash = "sha256:3c8ceca6792f38196b8f589bc92eccd03eef286602da92e5dc05cc42ef6441b7", size = 11138498, upload-time = "2026-05-28T14:16:38.425Z" },
|
{ url = "https://files.pythonhosted.org/packages/15/19/016553f86f207450aebebc2b2b5088d086b901cc8186c02ac4284db3bd88/ruff-0.15.16-py3-none-win_arm64.whl", hash = "sha256:8cd61783afb39638a7133ef0d2dfb1e91277593962f81b5a8423eb0b888a6121", size = 11134555, upload-time = "2026-06-04T16:33:00.136Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1367,15 +1369,15 @@ wheels = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sentry-sdk"
|
name = "sentry-sdk"
|
||||||
version = "2.61.1"
|
version = "2.62.0"
|
||||||
source = { registry = "https://pypi.org/simple" }
|
source = { registry = "https://pypi.org/simple" }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "certifi" },
|
{ name = "certifi" },
|
||||||
{ name = "urllib3" },
|
{ name = "urllib3" },
|
||||||
]
|
]
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/63/3b/4bc6b348bbd331daa14d4babe9f2b99bc854f4da41560eefb9488d78481d/sentry_sdk-2.61.1.tar.gz", hash = "sha256:9c6adccb3feefa9ba032c8d295ca477575c2f11896046a2b0ad686c47c4af555", size = 459429, upload-time = "2026-06-01T07:24:18.875Z" }
|
sdist = { url = "https://files.pythonhosted.org/packages/f6/5d/a343201726150e05f2036eeb6e493e2e2f8bf8a66f5aa70f2f4ac96f9ca3/sentry_sdk-2.62.0.tar.gz", hash = "sha256:3c870b9f50d9fd15b58c817dbde1c7cfaa9fe3f05df0a4c6edd5571cb82f5491", size = 463986, upload-time = "2026-06-08T13:23:49.223Z" }
|
||||||
wheels = [
|
wheels = [
|
||||||
{ url = "https://files.pythonhosted.org/packages/df/54/c9218db183846e08efaf68534889ef42e499dde432778881104a42f7071b/sentry_sdk-2.61.1-py3-none-any.whl", hash = "sha256:fa36eaf4b8ad708f718500d4bdcc1532637526a22beb874d88cbc0a46458b5ae", size = 483735, upload-time = "2026-06-01T07:24:17.027Z" },
|
{ url = "https://files.pythonhosted.org/packages/3d/07/05440381627877aae223fd68f330df9b9fc6641d08bf65328b55235617a2/sentry_sdk-2.62.0-py3-none-any.whl", hash = "sha256:27f61d13a86c3c1648dec666dd5a64f79772dd6a84b446f11866601ecab24f6f", size = 490586, upload-time = "2026-06-08T13:23:47.486Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1477,39 +1479,39 @@ wheels = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tqdm"
|
name = "tqdm"
|
||||||
version = "4.67.3"
|
version = "4.68.1"
|
||||||
source = { registry = "https://pypi.org/simple" }
|
source = { registry = "https://pypi.org/simple" }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "colorama", marker = "sys_platform == 'win32'" },
|
{ name = "colorama", marker = "sys_platform == 'win32'" },
|
||||||
]
|
]
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/09/a9/6ba95a270c6f1fbcd8dac228323f2777d886cb206987444e4bce66338dd4/tqdm-4.67.3.tar.gz", hash = "sha256:7d825f03f89244ef73f1d4ce193cb1774a8179fd96f31d7e1dcde62092b960bb", size = 169598, upload-time = "2026-02-03T17:35:53.048Z" }
|
sdist = { url = "https://files.pythonhosted.org/packages/06/b3/36c8ecf72e8925200671613332db156d84b99b3aee742a41c1938ebb0808/tqdm-4.68.1.tar.gz", hash = "sha256:fc163d96b287bd031e1aa24421ce4411b25559bd0a1be4fe649bdaa4d2c02bf5", size = 171236, upload-time = "2026-06-05T17:23:15.267Z" }
|
||||||
wheels = [
|
wheels = [
|
||||||
{ url = "https://files.pythonhosted.org/packages/16/e1/3079a9ff9b8e11b846c6ac5c8b5bfb7ff225eee721825310c91b3b50304f/tqdm-4.67.3-py3-none-any.whl", hash = "sha256:ee1e4c0e59148062281c49d80b25b67771a127c85fc9676d3be5f243206826bf", size = 78374, upload-time = "2026-02-03T17:35:50.982Z" },
|
{ url = "https://files.pythonhosted.org/packages/47/aa/218a0eb34de1f753c83e4d0d1c8e7c4cef27f20dcb8342e024f63a80dc86/tqdm-4.68.1-py3-none-any.whl", hash = "sha256:fea4a90e4023f764914569f7802a297277c5ab1a66be5144143e142e1a4031d8", size = 78354, upload-time = "2026-06-05T17:23:13.654Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ty"
|
name = "ty"
|
||||||
version = "0.0.41"
|
version = "0.0.46"
|
||||||
source = { registry = "https://pypi.org/simple" }
|
source = { registry = "https://pypi.org/simple" }
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/eb/8b/a64ba465cbc5d1b83c561a498ee5e7729b810606220277cafa93983e6ce1/ty-0.0.41.tar.gz", hash = "sha256:1e8b55bf4729634b2db64a7d9541cd880087cd681e87efc36e6a056cf05fb648", size = 5765398, upload-time = "2026-06-01T11:49:36.815Z" }
|
sdist = { url = "https://files.pythonhosted.org/packages/5a/7d/d95b5a9dea83472006be3ce5e480028c44b34138d84d0172e910f287fb69/ty-0.0.46.tar.gz", hash = "sha256:c6c2d7105b5633b49950b4c3a90d1ed2613eb9d794ad582bbbf6c4ffcb93accf", size = 5832380, upload-time = "2026-06-09T03:28:05.056Z" }
|
||||||
wheels = [
|
wheels = [
|
||||||
{ url = "https://files.pythonhosted.org/packages/8f/22/b032e4d0f35a436f60eabaa19c70dbed6f5095eb7e30c53ddff918aafcff/ty-0.0.41-py3-none-linux_armv6l.whl", hash = "sha256:5f61c5c06616129ce31dd74141e18be69f5e4204a9a0f4505688213353475b30", size = 11541803, upload-time = "2026-06-01T11:49:33.837Z" },
|
{ url = "https://files.pythonhosted.org/packages/0e/24/f9f7533c391610521f4164e6b8e37ef72d0c1ee8651bc0d9ce9e658b953b/ty-0.0.46-py3-none-linux_armv6l.whl", hash = "sha256:5e716337994699cbc1a1a7b7a3e6622306f2574c710330f9d9691c2c3d8391b0", size = 11756264, upload-time = "2026-06-09T03:28:20.112Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/46/f8/78f073febd728f19f0fcbe2e320855ed337b871ed775e0abe5c7b25bbc6a/ty-0.0.41-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:25d6b4fbf198ae7523b8e4845ec3c7e1b1cd5efa1712febcad3856e70e66632b", size = 11275600, upload-time = "2026-06-01T11:49:59.384Z" },
|
{ url = "https://files.pythonhosted.org/packages/66/49/ff3d13655b9b5cc8176f4c3446bf7ec2df43c8ad9e5272d4adc5d952fa45/ty-0.0.46-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:51d618dec5403635690d0e3e298cd0ad3d84ebc6a576652939ef30ce96fce4b2", size = 11492723, upload-time = "2026-06-09T03:28:13.23Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/62/c6/b1b46684514e7372960348c723657f56db56799c36542571b49c77c18c87/ty-0.0.41-py3-none-macosx_11_0_arm64.whl", hash = "sha256:3509788ed3753669cdd28d289f281b834ceee91b4de648fcf0ef60677a75b030", size = 10695726, upload-time = "2026-06-01T11:50:05.232Z" },
|
{ url = "https://files.pythonhosted.org/packages/82/4a/e7e3209e353c5835c7756339bbcdfda10852407b80fbb9ed46c17241873a/ty-0.0.46-py3-none-macosx_11_0_arm64.whl", hash = "sha256:acbafd6a2351b07a6cf4c945b0b1d47f6d2826faac2526a351dfa74d3a3cc664", size = 10892822, upload-time = "2026-06-09T03:27:51.179Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/36/73/badf085590648a14bfe06571799becefaa2b409c5838c39b198b790c8f58/ty-0.0.41-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b8c04f1424c872f1d8d28efbd69fb52728fcc6c37aa2d11675bf16f76d33ae14", size = 11196461, upload-time = "2026-06-01T11:50:07.174Z" },
|
{ url = "https://files.pythonhosted.org/packages/6c/20/4390c90434a9ddefcecb65e8df00e4c2700e9739dc0baf58bed36d25f713/ty-0.0.46-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:de5df602ffd760612ae36602bbad69b0123ff6cffd92e62aa92b7709317d69e3", size = 11408745, upload-time = "2026-06-09T03:27:58.049Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/ff/8f/399ee615282f80fd912b5ce4b3fe31206a6d40283e0700046aebbbb893f2/ty-0.0.41-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:53e52bfce12f3723c376d690625f5c462fe318c46dbe53b16d36c266388ee04c", size = 11310318, upload-time = "2026-06-01T11:49:50.663Z" },
|
{ url = "https://files.pythonhosted.org/packages/75/0c/f13a1bf9c6798530c773667095a6cf8f73ec9721db359423e7249bff7fbc/ty-0.0.46-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7abf5a10b30d8641faad90f6a19989daec941bb90261159e05cfeb04d2012046", size = 11544432, upload-time = "2026-06-09T03:27:53.519Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/e8/43/204e8fe9f4f8932dd8e42a23e3aa8a365a93ecc601f67172da1c4cea50c0/ty-0.0.41-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c4f1d606602dc0eb895a0943af737d638311c7afd48b414897fd42a05e876a76", size = 11785266, upload-time = "2026-06-01T11:49:48.733Z" },
|
{ url = "https://files.pythonhosted.org/packages/56/69/eb3710c13dff846a0362df04fadd8a39b64ccc244c0d02ce5285ede8eae5/ty-0.0.46-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8770404139c6ccee2ce2fc226478cfa4100915133c876c257e52197b8b92051d", size = 12031228, upload-time = "2026-06-09T03:28:29.816Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/e3/85/9098e96e40324ebd3797c3cad20ea0d855b56219806605e10b6455cf71b3/ty-0.0.41-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e8f3c41f0b6b0525bcc8d76a9a5921cccda11886ae11f73e2d51e20e185bafb3", size = 12328093, upload-time = "2026-06-01T11:49:52.945Z" },
|
{ url = "https://files.pythonhosted.org/packages/e9/68/5f5db9c84c1d44acdc67281089b372d9d818ee68123a60c59c66187095e2/ty-0.0.46-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f960d5a6e4860076924d2b86891d9872c4a3daa4663fb416e640b22cf3dbf68e", size = 12596073, upload-time = "2026-06-09T03:28:25.204Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/0e/41/b6a4d29591e86a27ab1364ddc70d6cee9a78cff1ede5466f6862f0384a68/ty-0.0.41-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:bff8c4468933961e656664c3ef190800e3d50582c248aed41bb8a1578d64864a", size = 11979937, upload-time = "2026-06-01T11:49:29.633Z" },
|
{ url = "https://files.pythonhosted.org/packages/14/be/cfd0bb272e6a1491f6de30c60da1f39c2b3c3524ec64a5c92b71365c9185/ty-0.0.46-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1d9000a4a3ed08fc37e8a2ff0b801cde06e1c2af3bc053677744bb5a1b751030", size = 12284885, upload-time = "2026-06-09T03:28:10.58Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/94/b2/6772c2c24fe412ebd0d57166d36afc176948857f7e90f368d321c561a12e/ty-0.0.41-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c83077a5c56770b1dab5b086a908a4e77740fb8f29d862ed05bd4c854549603d", size = 11859185, upload-time = "2026-06-01T11:49:46.474Z" },
|
{ url = "https://files.pythonhosted.org/packages/a8/3a/2cd541f6320f5d6f70a45725c4e1016efedd5545348bb23b47ffb3e4c724/ty-0.0.46-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d1160e6dc86536109ab755f7142f36f4dda5333c8330cf230d61819494d27125", size = 12079480, upload-time = "2026-06-09T03:27:55.847Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/75/59/e4a1e0feef9d74308621c3a8b1558db97fa1c022948341d0eed1bdfc59a1/ty-0.0.41-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:8067fae5532ad3c48295c7ddbd1657ea3ee7392810c57810c9c98fe83d43d57f", size = 12036836, upload-time = "2026-06-01T11:49:39.182Z" },
|
{ url = "https://files.pythonhosted.org/packages/de/91/8e0075bc6568fb477e7ef4d805c67fa6902b692cb4419e0bf5ce3c04c5bc/ty-0.0.46-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:b619c0efe007731f8221fa787701bfa4402da7a83eb26c61ae25e77b6ace6384", size = 12316547, upload-time = "2026-06-09T03:28:08.28Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/31/67/38f5312c74d51a510fb46c55b49880af6ca186cb87618938c67e808a45a5/ty-0.0.41-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:73a245242380bac3fbf3005d085c153923a45de8918001fad475af54c6fd50e4", size = 11179559, upload-time = "2026-06-01T11:50:01.355Z" },
|
{ url = "https://files.pythonhosted.org/packages/00/28/b96cbfeda019a4044c6a8cd06ff84d08b631d4ba7d9a1e6dc0311df3563a/ty-0.0.46-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:ad98fccb6a8a94c4121b993761a0deee602f5826c4162e0a91f4f8118ddadd42", size = 11392846, upload-time = "2026-06-09T03:28:00.418Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/8c/55/f8cb36874dc1b8b26c6ae066f8ebec392197caa22becdc55bc7e53d251a5/ty-0.0.41-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:4eb25f5dc398aa0a5fbd90de62d6a0fd3713354e566ba93cc53670fe84067ee1", size = 11347231, upload-time = "2026-06-01T11:49:55.093Z" },
|
{ url = "https://files.pythonhosted.org/packages/3b/d0/4d77f699a95ac7a13b94ca1a58682667cfe974f91557d9e2a9fc0b808a7f/ty-0.0.46-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:74536b13c3cc3f5944408669c202d4c57c3d19ff154732df8e6145718aef9191", size = 11559017, upload-time = "2026-06-09T03:28:17.619Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/8d/96/2d4369d7e8240b2dea1d7a7985709c38c6ccc57bbc8dbbdae3db5ee8d71a/ty-0.0.41-py3-none-musllinux_1_2_i686.whl", hash = "sha256:092c3a1ef9e3a189f71428092e736080ef42bf5c14412aa61bee8d644261797d", size = 11446240, upload-time = "2026-06-01T11:49:31.822Z" },
|
{ url = "https://files.pythonhosted.org/packages/88/62/1d6f6b51c2b132da8011c6a41ead0c1fd2a0b17ea72304bcf6ce084d581a/ty-0.0.46-py3-none-musllinux_1_2_i686.whl", hash = "sha256:5e50b1e96ced41b609e24ed27d9e4f508584ed7f4d0bb717ca8c8d75d2fd1b7c", size = 11666509, upload-time = "2026-06-09T03:28:22.454Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/8b/b0/36f09bfb568bc14f8496f2ace503c63c9152b4b65da4518cd3be0aa85312/ty-0.0.41-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:53edeb6e2ac430fe789454471f0e22a2a71581100818271150bd8f89fa468cc7", size = 11947795, upload-time = "2026-06-01T11:49:41.654Z" },
|
{ url = "https://files.pythonhosted.org/packages/fe/9a/6643894bc12cb30c281f4c8bf37f6d30c1fbd9484ef39a12b0ea6dae3c1c/ty-0.0.46-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:0a7d9f58d26d938e5d2f607481b7a412d8c00d675a1ec72004fa9d6b3b9def99", size = 12180448, upload-time = "2026-06-09T03:28:32.329Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/92/33/ffd38f5e3ecb25e1b7aac314d902ceaa93be16f4874dc236f9da79509468/ty-0.0.41-py3-none-win32.whl", hash = "sha256:f66bdf3afb71f11d412a4c704fa9691e0209cbc8268a19489c8960c7b74eac8b", size = 10776684, upload-time = "2026-06-01T11:50:03.309Z" },
|
{ url = "https://files.pythonhosted.org/packages/86/68/0f3b7bb03a7da676ef51b1c0af0bde1e500d69d5f0c807ed63b6f30b66dd/ty-0.0.46-py3-none-win32.whl", hash = "sha256:26db0ce89c573e60132d14e9688c9329a1633b1a8c26fe457025c7c406f7d5e6", size = 10960002, upload-time = "2026-06-09T03:28:02.832Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/ce/35/4c3e821906cfb05a88c232f5c1202be7ed336e05f4cc796213c809ab6177/ty-0.0.41-py3-none-win_amd64.whl", hash = "sha256:c18386e5c3a0c3d118ce58ee0d8a35f8d18d6b1020ca8ec690f6064e6230a79b", size = 11860965, upload-time = "2026-06-01T11:49:57.07Z" },
|
{ url = "https://files.pythonhosted.org/packages/b1/f4/91ff618b2dee39d0633d23e1adac0174aa1de80df17e270acac534034dbc/ty-0.0.46-py3-none-win_amd64.whl", hash = "sha256:90e8e6d446b9cb7cb4bede9fca7b3c99fd1e2355605ecf431c131a51db2a5e93", size = 12097413, upload-time = "2026-06-09T03:28:27.495Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/5e/20/7c587e4c3c6da1757555831cac308c4add7a958f8b1c7f76cb1dd55ceabf/ty-0.0.41-py3-none-win_arm64.whl", hash = "sha256:289eb66ee5c3554d59b0ea69885ddc5fc8051f3228dd9fee2501799db4a07117", size = 11206414, upload-time = "2026-06-01T11:49:44.395Z" },
|
{ url = "https://files.pythonhosted.org/packages/e5/2e/300174fca375a27a7c28dd80e990d857d7b3e3b25980c65063f980aa2f17/ty-0.0.46-py3-none-win_arm64.whl", hash = "sha256:ebd320d82605079b901a095dc4711037a0c488b4ace79a602fef4df0d3f4cf74", size = 11439595, upload-time = "2026-06-09T03:28:15.355Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1595,7 +1597,7 @@ wheels = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zensical"
|
name = "zensical"
|
||||||
version = "0.0.43"
|
version = "0.0.44"
|
||||||
source = { registry = "https://pypi.org/simple" }
|
source = { registry = "https://pypi.org/simple" }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "click" },
|
{ name = "click" },
|
||||||
@@ -1607,20 +1609,20 @@ dependencies = [
|
|||||||
{ name = "pyyaml" },
|
{ name = "pyyaml" },
|
||||||
{ name = "tomli" },
|
{ name = "tomli" },
|
||||||
]
|
]
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/d4/85/ec45162e7824a8f879d887ef0774ee65926bf7d1064e2eebccc7eaee3378/zensical-0.0.43.tar.gz", hash = "sha256:dc2d3804ff562795c1024130e0c3ce79736467930729dda314f096d0e35b98c8", size = 3932396, upload-time = "2026-05-19T09:44:07.418Z" }
|
sdist = { url = "https://files.pythonhosted.org/packages/86/44/e8c891e607708ed6e2b38620948f0715d13cb378f9525caab84aaf4dfb6c/zensical-0.0.44.tar.gz", hash = "sha256:7452eb2a88e2e42e9a9d7861c5ee6a3b4413766a5c737aa6dc840dab344d46aa", size = 3934771, upload-time = "2026-06-04T17:30:53.326Z" }
|
||||||
wheels = [
|
wheels = [
|
||||||
{ url = "https://files.pythonhosted.org/packages/55/c2/55e0709607ae41c266987c3b91a1a9702b37fbbef0d07eddfe5e25c2d823/zensical-0.0.43-cp310-abi3-macosx_10_12_x86_64.whl", hash = "sha256:17c335362b6bac3a50178181694a964f6d9f0c516fc532129ba5a0a5c4103fb6", size = 12706531, upload-time = "2026-05-19T09:43:32.729Z" },
|
{ url = "https://files.pythonhosted.org/packages/a7/0f/08c503dff4077c66a99f00556d02f16bd1c67790e43cdd256499d6cab251/zensical-0.0.44-cp310-abi3-macosx_10_12_x86_64.whl", hash = "sha256:f7d562b231129356c1ac0a05147d48da759111b671be5c2d4ff6765639550606", size = 12702807, upload-time = "2026-06-04T17:30:18.476Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/2c/64/ce8627bc5ea30556162b29b041fe97d6a6aef2a87b51f12def628e4fa608/zensical-0.0.43-cp310-abi3-macosx_11_0_arm64.whl", hash = "sha256:b8fe97f185194215f6193af45a17d2b30ebd72c8113e3650f2d7d6767b9c2206", size = 12563012, upload-time = "2026-05-19T09:43:35.962Z" },
|
{ url = "https://files.pythonhosted.org/packages/f7/01/88806c9e8ca6caa246dd9c5c3e15a8d25015c0862820e32b5cfd5cf01d56/zensical-0.0.44-cp310-abi3-macosx_11_0_arm64.whl", hash = "sha256:534c5303b7f3e4e842a2aa21cd6afe1a19b89a62cda22bff64a8932d988c1e2a", size = 12575802, upload-time = "2026-06-04T17:30:21.617Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/66/d1/533bc9454f0e06b3d9d8bd2e7ac405308c3d4dee6572acab98f0ed6d1c07/zensical-0.0.43-cp310-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4c4c85978c765b3e7f347e8102dfe1373d4bbe4229d7008b6bdbf352f1fbcd7f", size = 12947599, upload-time = "2026-05-19T09:43:38.754Z" },
|
{ url = "https://files.pythonhosted.org/packages/5e/21/bc55faf26e5a5e6d8b9216b9efba8a5f2b8c1db09d123b077696e5286fd9/zensical-0.0.44-cp310-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3255e14e648571eba1fc51b5d638e5738b96579acc2fd346ae94bb00ca1a37b9", size = 12944141, upload-time = "2026-06-04T17:30:24.532Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/75/a0/94f47d6fb592997be7ab9526938c929f0199adf2637c3c2b2b9b2101b28e/zensical-0.0.43-cp310-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:90d7c06ffd07b2bdf78bef041d541baba8a3ea51fd2dd84dbdbc5b0229076524", size = 12904911, upload-time = "2026-05-19T09:43:42.434Z" },
|
{ url = "https://files.pythonhosted.org/packages/2d/62/27f934e443894174cddd1cc1d99fb296e0657611a21fdceb4e071a1207ac/zensical-0.0.44-cp310-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:83b167831e181451d266aedad66bf4d199b8ee3147439261c4193bcea09fd8b2", size = 12916341, upload-time = "2026-06-04T17:30:28.134Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/96/fb/1db3ad9a86ff772f74a8bc60ad5b447aa02a158e70f94adacf50bdd5c40f/zensical-0.0.43-cp310-abi3-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:60022f4a6b95e46ec0023f51052fcd491743b3ebd08c0066b22a5cf1e741fecd", size = 13269386, upload-time = "2026-05-19T09:43:45.387Z" },
|
{ url = "https://files.pythonhosted.org/packages/18/65/aaa4f0630cb5cd5083176e45af9221bcabfc304af961a5c180f64b5a4dde/zensical-0.0.44-cp310-abi3-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7556f3a824b45302e29ec2145b2f8c52ca9df3c6c7f2ac40bc7ce3d39f090f01", size = 13277072, upload-time = "2026-06-04T17:30:31.916Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/31/ee/b24fd0f94885519d851c35615b086d069a1077b0198021a56755395a4633/zensical-0.0.43-cp310-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e278eb948a0b7545d50609d713c7c27e366dade4523ff73a311a5d5f136518a", size = 12999364, upload-time = "2026-05-19T09:43:48.549Z" },
|
{ url = "https://files.pythonhosted.org/packages/04/03/542ee91da33ec16fefcb5bf5fee40e29bfb15193adade6e729a2d3089982/zensical-0.0.44-cp310-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d27ca2de859241fe13871f252c488b5aabcf757772973ba6e57db6be1cdee55", size = 12977180, upload-time = "2026-06-04T17:30:34.508Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/28/78/401ccd7afd9d2690f81b5319b7f1eed05108154ce20e4207053914518c1c/zensical-0.0.43-cp310-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:b85e5ab99fbda13823e67c43a4be6e5ebda6600602969c6575e143f20ac203fd", size = 13124392, upload-time = "2026-05-19T09:43:50.965Z" },
|
{ url = "https://files.pythonhosted.org/packages/4b/71/4a20eb41b312e458e111119a2902ab402bd60320ea1c029ef1f4839c35ad/zensical-0.0.44-cp310-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:062c8a4071f75b25bcbe66c95d8984b967ed43ea9eeb3fd79374b4409618f93d", size = 13122478, upload-time = "2026-06-04T17:30:37.44Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/98/b3/9af6eba5826b0ef143fc8308bd1e219e221441e307a958e39f824ba9ab53/zensical-0.0.43-cp310-abi3-musllinux_1_2_armv7l.whl", hash = "sha256:751385accc92cccfd4560dabed7c423870686ef6ede244a67e5c96286af25e8f", size = 13177538, upload-time = "2026-05-19T09:43:53.964Z" },
|
{ url = "https://files.pythonhosted.org/packages/67/90/d01e1fbe39ca687cbd076d1eeee9a2ac70b255d18a0f178ec9c0465ae349/zensical-0.0.44-cp310-abi3-musllinux_1_2_armv7l.whl", hash = "sha256:17252630f2e4294ae8852b1616b6d87bdafb4d7608d2eb75f6d5ded043bd05ff", size = 13188163, upload-time = "2026-06-04T17:30:40.218Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/be/6b/cd090bd6659d32692487206469988ee84d41aa6de4cdf9e380f847da90e2/zensical-0.0.43-cp310-abi3-musllinux_1_2_i686.whl", hash = "sha256:dd3ff5bfa6e65cf3d2550dc639c3da2a3bfa11087b83d57e06623c4c1607d583", size = 13327086, upload-time = "2026-05-19T09:43:56.8Z" },
|
{ url = "https://files.pythonhosted.org/packages/08/bf/34a2080dcc131dba174f4247e2309113d9fcdaad0f1bd5bd4e0891d87991/zensical-0.0.44-cp310-abi3-musllinux_1_2_i686.whl", hash = "sha256:4d0dba5a44634bff9d0661ca212d602c126efdb1d7a122c6a389630d17a5c15c", size = 13330242, upload-time = "2026-06-04T17:30:42.684Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/79/5b/ac2555354b5a53cb9c2c942811905c47be0b9f5603d3c1328ee8564333eb/zensical-0.0.43-cp310-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:85055a115b12f49c6ab194dcf04f966fc06b690ed6a8ddddd819929fc5f340e6", size = 13284645, upload-time = "2026-05-19T09:43:59.329Z" },
|
{ url = "https://files.pythonhosted.org/packages/eb/81/d752314525b6309657f5bf52b5f4414884df7b1175dc4ad6aaac5e2f5f1d/zensical-0.0.44-cp310-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:f7ef005280c62a7cfa258583ff68b443bd5e460da9f996f7c671251403dcdb4a", size = 13261108, upload-time = "2026-06-04T17:30:45.516Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/d0/c6/1688ec6e5be15e3ab367d7804753291bfbdff3109b06e20c19ce30a7129c/zensical-0.0.43-cp310-abi3-win32.whl", hash = "sha256:8a75ddd4bb3cd3c4a8e71d2ebae44c5611fd636c1d355c6124dd96e2f9c52838", size = 12256740, upload-time = "2026-05-19T09:44:02.102Z" },
|
{ url = "https://files.pythonhosted.org/packages/d5/08/cd69f37e43619f5613612d2e6b1eeee2842101c29b2db9fdde501716086d/zensical-0.0.44-cp310-abi3-win32.whl", hash = "sha256:b844e28292e9ea93e5dcca229773c027fd3931419d581e1af4fd5ff310679237", size = 12261668, upload-time = "2026-06-04T17:30:48.217Z" },
|
||||||
{ url = "https://files.pythonhosted.org/packages/ca/a8/d967e70eac810a7e9eb8c5150d6d02848a1f42260f42977c71debed3cb02/zensical-0.0.43-cp310-abi3-win_amd64.whl", hash = "sha256:03a9d1744a6394ad66c355d6f1de04cfd92efa525b0b94bf6dbf6971c5cd2c6b", size = 12496166, upload-time = "2026-05-19T09:44:04.915Z" },
|
{ url = "https://files.pythonhosted.org/packages/d4/4d/261244d82be63383482717651befa9971255a6c1399bae61d6c14a117dd9/zensical-0.0.44-cp310-abi3-win_amd64.whl", hash = "sha256:912219e11af23081a7b6bc13e81131bdeacd6bb3516b9508c6b52d8b23aa8208", size = 12502071, upload-time = "2026-06-04T17:30:51.02Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|||||||
Reference in New Issue
Block a user