Add support for Holden/Opel Astra BK #431
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rbiasini
reviewed
Nov 12, 2018
rbiasini
reviewed
Nov 12, 2018
| ("TractionControlOn", "ESPStatus", 0), | ||
| ("EPBClosed", "EPBStatus", 0), | ||
| ("CruiseMainOn", "ECMEngineStatus", 0), | ||
| ("CruiseState", "AcceleratorPedal2", 0), | ||
| ] | ||
| elif CP.carFingerprint == CAR.CADILLAC_CT6: | ||
| if CP.carFingerprint == CAR.CADILLAC_CT6: |
There was a problem hiding this comment.
I made this change for consistency - what was previously just an if/elif is now more complicated due to the things in common between the Volt and the Astra. A series of plain ifs seem to capture it better since the cases aren't all mutually exclusive.
|
looks great. Will merge after 0.5.6 gets released. |
|
Thanks for reviewing :) |
|
@AlexHill , pending conflicts resolution, this seems ready to be merged. |
|
Thanks @rbiasini. I just tried the Github web-based conflict resolution tool for the first time and broke something - I'll rebase when I get home. |
rbiasini
reviewed
Nov 20, 2018
selfdrive/car/gm/carstate.py
Outdated
| self.regen_pressed = bool(pt_cp.vl["EBCMRegenPaddle"]['RegenPaddle']) | ||
| else: | ||
| self.regen_pressed = False | ||
| if self.car_fingerprint == CAR.CADILLAC_CT6: |
There was a problem hiding this comment.
wrong indent, 2 more spaces needed
|
Ok, I think this is good to go now. |
adhintz
added a commit
to adhintz/openpilot
that referenced
this pull request
Dec 18, 2018
* GM: remove refactor leftovers (commaai#440) * Move calibration values (commaai#441) * initial commit * moved constants * Keep steering on radar fault (commaai#442) * Add initial support for Holden/Opel Astra BK (commaai#431) * Added Astra support to README and RELEASE notes (commaai#443) * Honda Nidec: avoid giraffe setting alert when car is turned off (commaai#449) * Adding support for 2018 GMC Acadia Denali (commaai#453) * added acadia * adding acadia * adding acadia * Update radar_interface.py * adding acadia * refactored * fixed tuning * Adding acadia * Update interface.py * fixed whitespace * fixed whitespace * ACC cancel button * GM: Cadillac ATS Coupe 2018 support (commaai#445) * GM: Cadillac ATS Coupe 2018 support * Missed adding Cadillac ATS * Fixed Capitalization + Made CT6 Comment Cleaner (commaai#456) * Update README.md * Updated CT6 comment * Add Lexus RX450HL as sub to RX450H (commaai#458) Add Lexus RX450HL as sub to RX450H * on gas pedal press, send cancel ACC button to cancel OpenPilot * try sending +1 counter so our message isn't a duplicate * only do the accel pedal for specific cars * do accel pedal for all models * try always sending 1 for cancel acc frame * clean up comments and remove unused moving_fast * remove unused make can msg parameters * try incrementing wheel button counter by 2 to see if that works better for cancel * Squashed 'opendbc/' changes from 3f6cd74..e108b6b e108b6b Add more Sign recognitions (commaai#126) 6e8a363 Add GM FCW Alert (Take 2) (commaai#125) 368701a Revert "Add GM FCW dashboard alert (commaai#123)" (commaai#124) 98b5f66 Add GM FCW dashboard alert (commaai#123) 71b7588 Adds dbc for 2019 Honda Insight (commaai#122) git-subtree-dir: opendbc git-subtree-split: e108b6b * Squashed 'pyextra/' changes from fb152de..8cc1594 8cc1594 update overpy 2c18997 switch to forked version of overpy git-subtree-dir: pyextra git-subtree-split: 8cc1594238fcae6acb8bcd825ac73bbca586b1be * openpilot v0.5.7 release * try to simplify message logic * clean up code * move Chrylser into main table in readme * 0.5.7 hotfixes * On pedal press, if in steer error state, do not send ACC cancel button message. Sending the ACC cancel button message in this state causes the car to display warnings. * set the new ret.openpilotLongitudinalControl = False * hotfix: wait longer in CDP mode before switching to fast charge, so EON can boot (commaai#469) * generalize jeep fingerprint to also cover 2017 Jeep Grand Cherokee Trailhawk * disable pedal_gas for now to do a devel release. Sending 23b might fault other cars. * add jeep grand cherokee 2017 to readme car list
adhintz
added a commit
to adhintz/openpilot
that referenced
this pull request
Dec 20, 2018
) * GM: remove refactor leftovers (commaai#440) * Move calibration values (commaai#441) * initial commit * moved constants * Keep steering on radar fault (commaai#442) * Add initial support for Holden/Opel Astra BK (commaai#431) * Added Astra support to README and RELEASE notes (commaai#443) * Honda Nidec: avoid giraffe setting alert when car is turned off (commaai#449) * Adding support for 2018 GMC Acadia Denali (commaai#453) * added acadia * adding acadia * adding acadia * Update radar_interface.py * adding acadia * refactored * fixed tuning * Adding acadia * Update interface.py * fixed whitespace * fixed whitespace * ACC cancel button * GM: Cadillac ATS Coupe 2018 support (commaai#445) * GM: Cadillac ATS Coupe 2018 support * Missed adding Cadillac ATS * Fixed Capitalization + Made CT6 Comment Cleaner (commaai#456) * Update README.md * Updated CT6 comment * Add Lexus RX450HL as sub to RX450H (commaai#458) Add Lexus RX450HL as sub to RX450H * on gas pedal press, send cancel ACC button to cancel OpenPilot * try sending +1 counter so our message isn't a duplicate * only do the accel pedal for specific cars * do accel pedal for all models * try always sending 1 for cancel acc frame * clean up comments and remove unused moving_fast * remove unused make can msg parameters * try incrementing wheel button counter by 2 to see if that works better for cancel * Squashed 'opendbc/' changes from 3f6cd74..e108b6b e108b6b Add more Sign recognitions (commaai#126) 6e8a363 Add GM FCW Alert (Take 2) (commaai#125) 368701a Revert "Add GM FCW dashboard alert (commaai#123)" (commaai#124) 98b5f66 Add GM FCW dashboard alert (commaai#123) 71b7588 Adds dbc for 2019 Honda Insight (commaai#122) git-subtree-dir: opendbc git-subtree-split: e108b6b * Squashed 'pyextra/' changes from fb152de..8cc1594 8cc1594 update overpy 2c18997 switch to forked version of overpy git-subtree-dir: pyextra git-subtree-split: 8cc1594238fcae6acb8bcd825ac73bbca586b1be * openpilot v0.5.7 release * try to simplify message logic * clean up code * move Chrylser into main table in readme * 0.5.7 hotfixes * On pedal press, if in steer error state, do not send ACC cancel button message. Sending the ACC cancel button message in this state causes the car to display warnings. * set the new ret.openpilotLongitudinalControl = False * hotfix: wait longer in CDP mode before switching to fast charge, so EON can boot (commaai#469) * generalize jeep fingerprint to also cover 2017 Jeep Grand Cherokee Trailhawk * disable pedal_gas for now to do a devel release. Sending 23b might fault other cars. * add jeep grand cherokee 2017 to readme car list * separate fingerprint for trailhawk. separate wheelbase for Cherokee
adhintz
added a commit
to adhintz/openpilot
that referenced
this pull request
Dec 29, 2018
* GM: remove refactor leftovers (commaai#440) * Move calibration values (commaai#441) * initial commit * moved constants * Keep steering on radar fault (commaai#442) * Add initial support for Holden/Opel Astra BK (commaai#431) * Added Astra support to README and RELEASE notes (commaai#443) * Honda Nidec: avoid giraffe setting alert when car is turned off (commaai#449) * Adding support for 2018 GMC Acadia Denali (commaai#453) * added acadia * adding acadia * adding acadia * Update radar_interface.py * adding acadia * refactored * fixed tuning * Adding acadia * Update interface.py * fixed whitespace * fixed whitespace * ACC cancel button * GM: Cadillac ATS Coupe 2018 support (commaai#445) * GM: Cadillac ATS Coupe 2018 support * Missed adding Cadillac ATS * Fixed Capitalization + Made CT6 Comment Cleaner (commaai#456) * Update README.md * Updated CT6 comment * Add Lexus RX450HL as sub to RX450H (commaai#458) Add Lexus RX450HL as sub to RX450H * on gas pedal press, send cancel ACC button to cancel OpenPilot * try sending +1 counter so our message isn't a duplicate * only do the accel pedal for specific cars * do accel pedal for all models * try always sending 1 for cancel acc frame * clean up comments and remove unused moving_fast * remove unused make can msg parameters * try incrementing wheel button counter by 2 to see if that works better for cancel * Squashed 'opendbc/' changes from 3f6cd74..e108b6b e108b6b Add more Sign recognitions (commaai#126) 6e8a363 Add GM FCW Alert (Take 2) (commaai#125) 368701a Revert "Add GM FCW dashboard alert (commaai#123)" (commaai#124) 98b5f66 Add GM FCW dashboard alert (commaai#123) 71b7588 Adds dbc for 2019 Honda Insight (commaai#122) git-subtree-dir: opendbc git-subtree-split: e108b6b * Squashed 'pyextra/' changes from fb152de..8cc1594 8cc1594 update overpy 2c18997 switch to forked version of overpy git-subtree-dir: pyextra git-subtree-split: 8cc1594238fcae6acb8bcd825ac73bbca586b1be * openpilot v0.5.7 release * try to simplify message logic * clean up code * move Chrylser into main table in readme * 0.5.7 hotfixes * On pedal press, if in steer error state, do not send ACC cancel button message. Sending the ACC cancel button message in this state causes the car to display warnings. * set the new ret.openpilotLongitudinalControl = False * hotfix: wait longer in CDP mode before switching to fast charge, so EON can boot (commaai#469) * generalize jeep fingerprint to also cover 2017 Jeep Grand Cherokee Trailhawk * disable pedal_gas for now to do a devel release. Sending 23b might fault other cars. * add jeep grand cherokee 2017 to readme car list * separate fingerprint for trailhawk. separate wheelbase for Cherokee * add fingerprint for Pacifica 2019 Hybrid.
adhintz
added a commit
to adhintz/openpilot
that referenced
this pull request
Dec 29, 2018
* remove logging from devel * Revert "remove logging from devel" This reverts commit 2145747. * Squashed 'opendbc/' changes from 3f6cd74..e108b6b e108b6b Add more Sign recognitions (commaai#126) 6e8a363 Add GM FCW Alert (Take 2) (commaai#125) 368701a Revert "Add GM FCW dashboard alert (commaai#123)" (commaai#124) 98b5f66 Add GM FCW dashboard alert (commaai#123) 71b7588 Adds dbc for 2019 Honda Insight (commaai#122) git-subtree-dir: opendbc git-subtree-split: e108b6b * Squashed 'pyextra/' changes from fb152de..8cc1594 8cc1594 update overpy 2c18997 switch to forked version of overpy git-subtree-dir: pyextra git-subtree-split: 8cc1594238fcae6acb8bcd825ac73bbca586b1be * openpilot v0.5.7 release * 0.5.7 hotfixes * On pedal press, if in steer error state, do not send ACC cancel button message. Sending the ACC cancel button message in this state causes the car to display warnings. * set the new ret.openpilotLongitudinalControl = False * hotfix: wait longer in CDP mode before switching to fast charge, so EON can boot (commaai#469) * generalize jeep fingerprint to also cover 2017 Jeep Grand Cherokee Trailhawk * disable pedal_gas for now to do a devel release. Sending 23b might fault other cars. * add jeep grand cherokee 2017 to readme car list * 0.5.7 & Jeep Grand Cherokee 2017 support (#7) * GM: remove refactor leftovers (commaai#440) * Move calibration values (commaai#441) * initial commit * moved constants * Keep steering on radar fault (commaai#442) * Add initial support for Holden/Opel Astra BK (commaai#431) * Added Astra support to README and RELEASE notes (commaai#443) * Honda Nidec: avoid giraffe setting alert when car is turned off (commaai#449) * Adding support for 2018 GMC Acadia Denali (commaai#453) * added acadia * adding acadia * adding acadia * Update radar_interface.py * adding acadia * refactored * fixed tuning * Adding acadia * Update interface.py * fixed whitespace * fixed whitespace * ACC cancel button * GM: Cadillac ATS Coupe 2018 support (commaai#445) * GM: Cadillac ATS Coupe 2018 support * Missed adding Cadillac ATS * Fixed Capitalization + Made CT6 Comment Cleaner (commaai#456) * Update README.md * Updated CT6 comment * Add Lexus RX450HL as sub to RX450H (commaai#458) Add Lexus RX450HL as sub to RX450H * on gas pedal press, send cancel ACC button to cancel OpenPilot * try sending +1 counter so our message isn't a duplicate * only do the accel pedal for specific cars * do accel pedal for all models * try always sending 1 for cancel acc frame * clean up comments and remove unused moving_fast * remove unused make can msg parameters * try incrementing wheel button counter by 2 to see if that works better for cancel * Squashed 'opendbc/' changes from 3f6cd74..e108b6b e108b6b Add more Sign recognitions (commaai#126) 6e8a363 Add GM FCW Alert (Take 2) (commaai#125) 368701a Revert "Add GM FCW dashboard alert (commaai#123)" (commaai#124) 98b5f66 Add GM FCW dashboard alert (commaai#123) 71b7588 Adds dbc for 2019 Honda Insight (commaai#122) git-subtree-dir: opendbc git-subtree-split: e108b6b * Squashed 'pyextra/' changes from fb152de..8cc1594 8cc1594 update overpy 2c18997 switch to forked version of overpy git-subtree-dir: pyextra git-subtree-split: 8cc1594238fcae6acb8bcd825ac73bbca586b1be * openpilot v0.5.7 release * try to simplify message logic * clean up code * move Chrylser into main table in readme * 0.5.7 hotfixes * On pedal press, if in steer error state, do not send ACC cancel button message. Sending the ACC cancel button message in this state causes the car to display warnings. * set the new ret.openpilotLongitudinalControl = False * hotfix: wait longer in CDP mode before switching to fast charge, so EON can boot (commaai#469) * generalize jeep fingerprint to also cover 2017 Jeep Grand Cherokee Trailhawk * disable pedal_gas for now to do a devel release. Sending 23b might fault other cars. * add jeep grand cherokee 2017 to readme car list * separate fingerprint for trailhawk. separate wheelbase for Cherokee * separate fingerprint for trailhawk. separate wheelbase for Cherokee (#8) * GM: remove refactor leftovers (commaai#440) * Move calibration values (commaai#441) * initial commit * moved constants * Keep steering on radar fault (commaai#442) * Add initial support for Holden/Opel Astra BK (commaai#431) * Added Astra support to README and RELEASE notes (commaai#443) * Honda Nidec: avoid giraffe setting alert when car is turned off (commaai#449) * Adding support for 2018 GMC Acadia Denali (commaai#453) * added acadia * adding acadia * adding acadia * Update radar_interface.py * adding acadia * refactored * fixed tuning * Adding acadia * Update interface.py * fixed whitespace * fixed whitespace * ACC cancel button * GM: Cadillac ATS Coupe 2018 support (commaai#445) * GM: Cadillac ATS Coupe 2018 support * Missed adding Cadillac ATS * Fixed Capitalization + Made CT6 Comment Cleaner (commaai#456) * Update README.md * Updated CT6 comment * Add Lexus RX450HL as sub to RX450H (commaai#458) Add Lexus RX450HL as sub to RX450H * on gas pedal press, send cancel ACC button to cancel OpenPilot * try sending +1 counter so our message isn't a duplicate * only do the accel pedal for specific cars * do accel pedal for all models * try always sending 1 for cancel acc frame * clean up comments and remove unused moving_fast * remove unused make can msg parameters * try incrementing wheel button counter by 2 to see if that works better for cancel * Squashed 'opendbc/' changes from 3f6cd74..e108b6b e108b6b Add more Sign recognitions (commaai#126) 6e8a363 Add GM FCW Alert (Take 2) (commaai#125) 368701a Revert "Add GM FCW dashboard alert (commaai#123)" (commaai#124) 98b5f66 Add GM FCW dashboard alert (commaai#123) 71b7588 Adds dbc for 2019 Honda Insight (commaai#122) git-subtree-dir: opendbc git-subtree-split: e108b6b * Squashed 'pyextra/' changes from fb152de..8cc1594 8cc1594 update overpy 2c18997 switch to forked version of overpy git-subtree-dir: pyextra git-subtree-split: 8cc1594238fcae6acb8bcd825ac73bbca586b1be * openpilot v0.5.7 release * try to simplify message logic * clean up code * move Chrylser into main table in readme * 0.5.7 hotfixes * On pedal press, if in steer error state, do not send ACC cancel button message. Sending the ACC cancel button message in this state causes the car to display warnings. * set the new ret.openpilotLongitudinalControl = False * hotfix: wait longer in CDP mode before switching to fast charge, so EON can boot (commaai#469) * generalize jeep fingerprint to also cover 2017 Jeep Grand Cherokee Trailhawk * disable pedal_gas for now to do a devel release. Sending 23b might fault other cars. * add jeep grand cherokee 2017 to readme car list * separate fingerprint for trailhawk. separate wheelbase for Cherokee * add fingerprint for Pacifica 2019 Hybrid.
klaus385
pushed a commit
to klaus385/openpilot
that referenced
this pull request
Dec 31, 2018
pd0wm
pushed a commit
that referenced
this pull request
Feb 6, 2020
73a60d5c uds: clear rx buffer on drain 3b20804 uds: rx message buffering d034f3e Added the option to turn on IR in power savings mode (#431) 82cafd1 Allow fan control in power saving (#429) 186d9dc Fixed GMLAN interrupts when used in Tesla safety (#428) f67ec28 Fix msg checks for non Honda and Toyota (#426) git-subtree-dir: panda git-subtree-split: 73a60d5
pd0wm
pushed a commit
that referenced
this pull request
Feb 6, 2020
73a60d5c uds: clear rx buffer on drain 3b20804 uds: rx message buffering d034f3e Added the option to turn on IR in power savings mode (#431) 82cafd1 Allow fan control in power saving (#429) 186d9dc Fixed GMLAN interrupts when used in Tesla safety (#428) f67ec28 Fix msg checks for non Honda and Toyota (#426) git-subtree-dir: panda git-subtree-split: 73a60d5
pd0wm
pushed a commit
that referenced
this pull request
Feb 6, 2020
73a60d5c uds: clear rx buffer on drain 3b20804 uds: rx message buffering d034f3e Added the option to turn on IR in power savings mode (#431) 82cafd1 Allow fan control in power saving (#429) 186d9dc Fixed GMLAN interrupts when used in Tesla safety (#428) f67ec28 Fix msg checks for non Honda and Toyota (#426) git-subtree-dir: panda git-subtree-split: 73a60d5
dragonpilot
pushed a commit
to dragonpilot-community/dragonpilot
that referenced
this pull request
Apr 7, 2020
Vaggysag
pushed a commit
to Vaggysag/openpilot
that referenced
this pull request
Apr 21, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Longitudinal and lateral control tested and working in @knackerbrot's Astra. The Astra BK uses the same platform as the Volt, so most of it works identically. I've added its fingerprint (with ASCM unplugged), set the mass, wheelbase, etc, and skipped the stuff relating to the absent regen paddle.