Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FCA Giorgio: Alfa Romeo Stelvio / Giulia #33618

Closed
wants to merge 8 commits into from
Closed

FCA Giorgio: Alfa Romeo Stelvio / Giulia #33618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9b37fab
car_specific support for FCA Giorgio
jyoung8607 Sep 18, 2024
14e7ba4
force fingerprint -- revert before merge
jyoung8607 Sep 18, 2024
3bfc28f
temp disable process_replay for FCA Giorgio
jyoung8607 Sep 18, 2024
f9431bb
regen CARS.md
jyoung8607 Sep 18, 2024
d499eb5
bump opendbc
jyoung8607 Sep 19, 2024
540730b
bump panda
jyoung8607 Sep 19, 2024
4233b60
note this should be reverted
jyoung8607 Sep 21, 2024
4b73eeb
note this should be refactored
jyoung8607 Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docs/CARS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@

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.

# 289 Supported Cars
# 290 Supported Cars

|Make|Model|Supported Package|ACC|No ACC accel below|No ALC below|Steering Torque|Resume from stop|<a href="##"><img width=2000></a>Hardware Needed<br>&nbsp;|Video|
|---|---|---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
|Acura|ILX 2016-19|AcuraWatch Plus|openpilot|26 mph|25 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Acura&model=ILX 2016-19">Buy Here</a></sub></details>||
|Acura|RDX 2016-18|AcuraWatch Plus|openpilot|26 mph|12 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-empty.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Nidec connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Acura&model=RDX 2016-18">Buy Here</a></sub></details>||
|Acura|RDX 2019-22|All|openpilot available[<sup>1</sup>](#footnotes)|0 mph|3 mph|[![star](assets/icon-star-empty.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 Honda Bosch A connector<br>- 1 RJ45 cable (7 ft)<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Acura&model=RDX 2019-22">Buy Here</a></sub></details>||
|Alfa|Romeo Stelvio 2017-24|Adaptive Cruise Control (ACC) & Lane Assist|Stock|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 RJ45 cable (7 ft)<br>- 1 VW A connector<br>- 1 comma 3X<br>- 1 comma power v2<br>- 1 harness box<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Alfa&model=Romeo Stelvio 2017-24">Buy Here</a></sub></details>||
|Audi|A3 2014-19|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,12</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 USB-C coupler<br>- 1 VW J533 connector<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Audi&model=A3 2014-19">Buy Here</a></sub></details>||
|Audi|A3 Sportback e-tron 2017-18|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,12</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 USB-C coupler<br>- 1 VW J533 connector<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Audi&model=A3 Sportback e-tron 2017-18">Buy Here</a></sub></details>||
|Audi|Q2 2018|Adaptive Cruise Control (ACC) & Lane Assist|openpilot available[<sup>1,12</sup>](#footnotes)|0 mph|0 mph|[![star](assets/icon-star-full.svg)](##)|[![star](assets/icon-star-full.svg)](##)|<details><summary>Parts</summary><sub>- 1 USB-C coupler<br>- 1 VW J533 connector<br>- 1 comma 3X<br>- 1 harness box<br>- 1 long OBD-C cable<br>- 1 mount<br>- 1 right angle OBD-C cable (1.5 ft)<br><a href="https://comma.ai/shop/comma-3x.html?make=Audi&model=Q2 2018">Buy Here</a></sub></details>||
Expand Down
3 changes: 3 additions & 0 deletions launch_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ if [ -z "$AGNOS_VERSION" ]; then
fi

export STAGING_ROOT="/data/safe_staging"

# FIXME: revert once UDS/VIN fingerprinting in place
export FINGERPRINT="ALFA_ROMEO_STELVIO_1ST_GEN"
2 changes: 1 addition & 1 deletion opendbc_repo
Open in desktop
Submodule opendbc_repo updated 12 files
+0 −0 opendbc/car/fca_giorgio/__init__.py
+45 −0 opendbc/car/fca_giorgio/carcontroller.py
+88 −0 opendbc/car/fca_giorgio/carstate.py
+24 −0 opendbc/car/fca_giorgio/fca_giorgiocan.py
+12 −0 opendbc/car/fca_giorgio/fingerprints.py
+26 −0 opendbc/car/fca_giorgio/interface.py
+4 −0 opendbc/car/fca_giorgio/radar_interface.py
+70 −0 opendbc/car/fca_giorgio/values.py
+3 −0 opendbc/car/tests/routes.py
+2 −1 opendbc/car/tests/test_fw_fingerprint.py
+1 −0 opendbc/car/torque_data/override.toml
+2 −1 opendbc/car/values.py
2 changes: 1 addition & 1 deletion panda
Open in desktop
Submodule panda updated 4 files
+3 −0 board/safety.h
+180 −0 board/safety/safety_fca_giorgio.h
+1 −0 python/__init__.py
+67 −0 tests/safety/test_fca_giorgio.py
5 changes: 5 additions & 0 deletions selfdrive/car/car_specific.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,11 @@ def update(self, CS: car.CarState, CS_prev: car.CarState, CC: car.CarControl):
if self.low_speed_alert:
events.add(EventName.belowSteerSpeed)

# TODO: Shouldn't be necessary. Refactor CarSpecificEvents with a simple default case, override only if necessary.
# Default case should cover FCA Giorgio, Subaru, Mazda, maybe Ford. Further simplification possible.
elif self.CP.carName == 'fca_giorgio':
events = self.create_common_events(CS.out, CS_prev)
Comment on lines +161 to +164
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sshane is this done? I think we can close this PR

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah that's done, and I'll take care of the rest whenever FCA Giorgio comes in.


else:
raise ValueError(f"Unsupported car: {self.CP.carName}")

Expand Down
3 changes: 2 additions & 1 deletion selfdrive/test/process_replay/test_processes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@
]

# dashcamOnly makes don't need to be tested until a full port is done
excluded_interfaces = ["mock", "tesla"]
# FIXME: Revert before merging, need a process_replay test route for fca_giorgio
excluded_interfaces = ["mock", "tesla", "fca_giorgio"]

BASE_URL = "https://commadataci.blob.core.windows.net/openpilotci/"
REF_COMMIT_FN = os.path.join(PROC_REPLAY_DIR, "ref_commit")
Expand Down
Loading