Skip to content

moving signal to cam bus, pt cuts out when OP goes into TX on ACC_02 … #5

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

Merged
dparring merged 1 commit into from
Apr 24, 2025
Merged

moving signal to cam bus, pt cuts out when OP goes into TX on ACC_02 … #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions selfdrive/car/volkswagen/carstate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def update(self, pt_cp, cam_cp, ext_cp, trans_type):
# TODO: ugly hack while testing CC-only S4, also macan.
# EDIT: bumping the upper limit to 100 to match the stock functionality (100 max CC set point on USA Macan)
if self.CP.pcmCruise:
ret.cruiseState.speed = ext_cp.vl["ACC_02"]["ACC_Wunschgeschw_02"] * CV.KPH_TO_MS
ret.cruiseState.speed = cam_cp.vl["ACC_02"]["ACC_Wunschgeschw_02"] * CV.KPH_TO_MS
if ret.cruiseState.speed > 100:
ret.cruiseState.speed = 0

Expand Down Expand Up @@ -381,7 +381,6 @@ def get_can_parser_mlb(CP):
("Blinkmodi_01", 0), # From J519 BCM (sent at 1Hz when no lights active, 50Hz when active)
("Kombi_03", 0), # From J285 instrument cluster (not present on older cars, 1Hz when present)
("Getriebe_03", 50), # TODO: what is the source of this signal? transmission ecu?
("ACC_02", 25), # Macan test: CC speed setting
]

# TODO: gear shift parsing
Expand All @@ -393,6 +392,7 @@ def get_can_parser_mlb(CP):
def get_cam_can_parser_mlb(CP):
messages = [
("ACC_05", 50), # Macan test: from radar
("ACC_02", 25), # Macan test: CC speed setting
]

if CP.networkLocation == NetworkLocation.fwdCamera:
Expand Down
Loading