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.

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

raise gm steer delta to match max torque #426

Closed
wants to merge 87 commits into from
Closed
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
16d9f55
Update values.py
CryptoKylan Aug 28, 2018
98d37b9
Update values.py
CryptoKylan Aug 28, 2018
e5fcf3a
added 2018 gmc acadia fingerprint
CryptoKylan Aug 28, 2018
1abf00b
updated properly with acadia as own class
CryptoKylan Aug 28, 2018
e35e98f
FIXED SPACING
CryptoKylan Aug 28, 2018
14dcdde
ONE MORE FIX
CryptoKylan Aug 28, 2018
4ebd3b9
Update carcontroller.py
CryptoKylan Aug 28, 2018
1f82e15
Update carstate.py
CryptoKylan Aug 28, 2018
33a9a0c
Update interface.py
CryptoKylan Aug 28, 2018
8cfb5e3
Update radar_interface.py
CryptoKylan Aug 28, 2018
51a23e2
Update carstate.py
CryptoKylan Aug 28, 2018
233241e
Update carstate.py
CryptoKylan Aug 28, 2018
196b932
Update interface.py
CryptoKylan Aug 28, 2018
4bcb9c7
Update interface.py
CryptoKylan Aug 29, 2018
ec4e4e2
Update interface.py
CryptoKylan Aug 29, 2018
33a222a
Update carcontroller.py
CryptoKylan Aug 29, 2018
243a53f
Update carstate.py
CryptoKylan Aug 29, 2018
f466648
Update interface.py
CryptoKylan Aug 29, 2018
bdaf492
Update radar_interface.py
CryptoKylan Aug 29, 2018
e3ddd9d
Update values.py
CryptoKylan Aug 29, 2018
dc2bf65
Update values.py
CryptoKylan Aug 29, 2018
520ffbc
Update values.py
CryptoKylan Aug 29, 2018
f0ba896
Update values.py
CryptoKylan Aug 29, 2018
105b010
Update carcontroller.py
CryptoKylan Aug 29, 2018
3d4d4ce
Update carcontroller.py
CryptoKylan Aug 29, 2018
d1a54bb
Merge pull request #1 from commaai/devel
CryptoKylan Sep 4, 2018
f91c8ff
Merge pull request #2 from commaai/devel
CryptoKylan Sep 5, 2018
f310f8a
Merge pull request #3 from commaai/devel
CryptoKylan Sep 6, 2018
d52db46
Update safety_gm.h
CryptoKylan Sep 10, 2018
31dc6e2
mistake
CryptoKylan Sep 10, 2018
dd139b0
Merge pull request #8 from commaai/devel
CryptoKylan Sep 10, 2018
34ccd7f
reverting changes
CryptoKylan Sep 11, 2018
0a4001d
Update values.py
CryptoKylan Sep 13, 2018
76564ef
Merge pull request #9 from CryptoKylan/malibu
CryptoKylan Sep 13, 2018
3fdcb56
added acadia tuning
CryptoKylan Sep 14, 2018
0b7fe50
Update carstate.py
CryptoKylan Sep 16, 2018
8563bf8
Update values.py
CryptoKylan Sep 16, 2018
2301ed6
Update carcontroller.py
CryptoKylan Sep 16, 2018
1956806
Merge pull request #10 from CryptoKylan/Acadia
CryptoKylan Sep 16, 2018
37e3f90
fixed tuning
CryptoKylan Sep 17, 2018
56f6ef8
updating to working settings
CryptoKylan Sep 18, 2018
53a460b
updated with working settings
CryptoKylan Sep 18, 2018
0e91f58
Update carstate.py
CryptoKylan Sep 18, 2018
1e357e3
Update carstate.py
CryptoKylan Sep 18, 2018
0dfd07a
Update interface.py
CryptoKylan Sep 18, 2018
0a9e14e
removed space
CryptoKylan Sep 18, 2018
d4c2034
fixed weight
CryptoKylan Sep 18, 2018
4f16479
corrected steer settings to stock lkas
CryptoKylan Sep 18, 2018
a0d64c6
fixed min speed comment
CryptoKylan Sep 18, 2018
9d45b53
Merge pull request #16 from commaai/devel
CryptoKylan Sep 28, 2018
29a7989
Update carcontroller.py
CryptoKylan Sep 28, 2018
fc5c5c9
Update carcontroller.py
CryptoKylan Sep 28, 2018
a3f5a3e
Update carcontroller.py
CryptoKylan Sep 30, 2018
0e38f8f
tuning
CryptoKylan Oct 2, 2018
149ee69
stock msgs
CryptoKylan Oct 2, 2018
cda3dea
Merge pull request #22 from commaai/devel
CryptoKylan Oct 2, 2018
69060ee
Create gm_global_acadia_denali_2018.dbc
CryptoKylan Oct 3, 2018
03e38d1
Update values.py
CryptoKylan Oct 3, 2018
70a6880
Rename gm_global_acadia_denali_2018.dbc to gm_global_acadia_denali_20…
CryptoKylan Oct 3, 2018
00b116f
Merge pull request #25 from commaai/devel
CryptoKylan Oct 19, 2018
b6f28ac
Merge pull request #28 from commaai/devel
CryptoKylan Oct 23, 2018
545a219
Update pathplanner.py
CryptoKylan Oct 24, 2018
a093e4a
Merge pull request #33 from commaai/devel
CryptoKylan Oct 26, 2018
74e52c3
Update interface.py
CryptoKylan Nov 3, 2018
e17f68c
Update carcontroller.py
CryptoKylan Nov 3, 2018
ce4b0c7
Delete gm_global_acadia_denali_2018_powertrain.dbc
CryptoKylan Nov 3, 2018
9508648
Update carstate.py
CryptoKylan Nov 3, 2018
ca309e3
Update radar_interface.py
CryptoKylan Nov 3, 2018
c26241f
Update values.py
CryptoKylan Nov 3, 2018
9d2569b
Update radar_interface.py
CryptoKylan Nov 3, 2018
b10a2d3
Update carstate.py
CryptoKylan Nov 3, 2018
bec141e
Update carstate.py
CryptoKylan Nov 3, 2018
8e51aaf
Update radar_interface.py
CryptoKylan Nov 3, 2018
abb4b37
Update radar_interface.py
CryptoKylan Nov 3, 2018
dcd3e03
Update carstate.py
CryptoKylan Nov 3, 2018
5e6bb62
Update carstate.py
CryptoKylan Nov 3, 2018
e41b90f
Update carstate.py
CryptoKylan Nov 3, 2018
b42b8d4
Update carstate.py
CryptoKylan Nov 3, 2018
7744960
Update carstate.py
CryptoKylan Nov 3, 2018
c4962eb
Update carstate.py
CryptoKylan Nov 3, 2018
e355530
Update carstate.py
CryptoKylan Nov 3, 2018
8d4ed62
Update radar_interface.py
CryptoKylan Nov 3, 2018
b356456
Update pathplanner.py
CryptoKylan Nov 3, 2018
980a361
Merge pull request #40 from commaai/devel
CryptoKylan Nov 3, 2018
5e4df67
Merge pull request #45 from commaai/devel
CryptoKylan Nov 8, 2018
5715403
updated delta up and down
CryptoKylan Nov 8, 2018
891aba2
fixed comment
CryptoKylan Nov 8, 2018
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/gm/carcontroller.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ def __init__(self, car_fingerprint):
if car_fingerprint == CAR.VOLT:
self.STEER_MAX = 300
self.STEER_STEP = 2 # how often we update the steer cmd
self.STEER_DELTA_UP = 7 # ~0.75s time to peak torque (255/50hz/0.75s)
self.STEER_DELTA_DOWN = 17 # ~0.3s from peak torque to zero
self.STEER_DELTA_UP = 8 # ~0.75s time to peak torque (300/50hz/0.75s)
self.STEER_DELTA_DOWN = 20 # ~0.3s from peak torque to zero
Copy link
Contributor

Choose a reason for hiding this comment

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

this requires a safety change in panda. Also, I would rather fix the comments instead of changing the rate limits. They were tuned for what was considered safe.

Copy link
Author

Choose a reason for hiding this comment

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

I just thought the point was to hit peak torque in or under 0.75 seconds. What I'm seeing now is when we're hitting the max steering cmd of 300 actual delivered torque is still falling behind to around 250 ish and slowly creeps up if max steer remains saturated from what I can tell. By raising the step from 7 to 8 this gets actual torque delivered to better match the steering cmd and stays within commas safety standards.

I did also submit the PR for the panda changes.

So just to be clear you don't want to raise the steer delta to match time to peak torque now that max steer is now 300?

Copy link
Contributor

Choose a reason for hiding this comment

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

@CryptoKylan , correct: the rate limit should stay the same, as the safety standard is defined in terms of rate of steer torque (~Nm/s) rather than how long it takes to get to peak torque. Makes sense?

elif car_fingerprint == CAR.CADILLAC_CT6:
self.STEER_MAX = 150
self.STEER_STEP = 1 # how often we update the steer cmd
Expand Down