Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
f3b0a42
gg diagram for dynamic limits
diegoasfmravpp Mar 28, 2025
ea92375
speed and accel plots
diegoasfmravpp Mar 29, 2025
b6e87ed
50m route and launch file
diegoasfmravpp Mar 31, 2025
ec4bfa7
braking at route end for pp
diegoasfmravpp Mar 31, 2025
c442880
launch control added
Demon16th Mar 31, 2025
eb28337
plotting changes
diegoasfmravpp Mar 31, 2025
c302b05
Add 65m and right turn routes
alo-20 Apr 1, 2025
0f71fd3
modify fit_curve_radius in trajectory.py to use the min (tighest) tur…
Demon16th Apr 7, 2025
bd9800d
add better right turn paths
Demon16th Apr 3, 2025
3d1ed53
phone accel data
diegoasfmravpp Apr 5, 2025
f0a0eb0
add methods in trajectory.py to calculate upcoming turn radius
alo-20 Apr 7, 2025
c1a3983
add logic in pure_pursuit to set speed based on curve radius. Change …
Demon16th Apr 7, 2025
9fd3cd0
gg data switched to json
diegoasfmravpp Apr 7, 2025
b0ae510
add figure8 path generator and figure8 path
Demon16th Apr 7, 2025
d9322e1
update generate figure8 and figure8 path
Demon16th Apr 7, 2025
026056b
gg logs and launch control tests
Apr 7, 2025
27653c4
pp speeds
Demon16th Apr 7, 2025
6ee28df
fixed gg plot
diegoasfmravpp Apr 8, 2025
ac1031a
velocity profile based on existing route
diegoasfmravpp Apr 14, 2025
ff0a847
Add files via upload
laneccolin Apr 15, 2025
a1eb720
Update fixed_route.yaml
laneccolin Apr 15, 2025
de1aa04
Update fixed_route.yaml
laneccolin Apr 15, 2025
edc92b5
Update current.yaml
laneccolin Apr 15, 2025
31eb662
changed launch ctrl to gem
Adi9103 Apr 15, 2025
db2d83d
initial trajectory generation and feasibility check functions
ShellyRiver Apr 16, 2025
d23f1b5
Update waypoint generation and combine with trajectory planning
htliang517 Apr 16, 2025
2cd8e83
integrating velocity profile into stanley
diegoasfmravpp Apr 16, 2025
a346cd3
trajectory generation can take x in state and speed is not fixed (so …
ShellyRiver Apr 17, 2025
2067ac8
updated stanley + racing velocities, working sim
Demon16th Apr 17, 2025
3b96c70
lower speed for high cte in racing
Demon16th Apr 17, 2025
17576eb
try to run in sim
ShellyRiver Apr 18, 2025
056c036
moved logic
Adi9103 Apr 18, 2025
b112fe0
try to run in simulation
ShellyRiver Apr 18, 2025
bbdf9e0
updated launch_ctrl, added pure_pursuit
Adi9103 Apr 19, 2025
35a5d1c
Update & fix simulation problem for planner
htliang517 Apr 23, 2025
0270436
Fix U-turn scenario
htliang517 Apr 23, 2025
bdc4c9d
Update current.yaml
Jugthegreat Apr 23, 2025
970ca9a
move launch control logic out of gem.py and gem_hardware.py and into …
Demon16th Apr 23, 2025
10db54a
fix typo in current.yaml
Demon16th Apr 23, 2025
3142922
add 90turn case and test code
ShellyRiver Apr 24, 2025
65b86c4
refine 4-cone course planned trajectory
ShellyRiver Apr 24, 2025
0932f71
visualization changes for stanley logs
diegoasfmravpp Apr 25, 2025
19b4c07
Fixed code to work with simulator
htliang517 Apr 25, 2025
a025225
CONE DETECTOR DUMP
dh-agarwal Apr 29, 2025
b52f082
to test velocity profile to get total time for unit test
ShellyRiver Apr 30, 2025
cb4e8a4
add velocity profiling to racing planner
ShellyRiver May 1, 2025
c85e601
generate trajectory for whole slalom scenario
ShellyRiver May 2, 2025
de24dd3
Update planner to run both onboard and simulation
htliang517 May 2, 2025
66285d3
splines for path smoothing and updated stanley
diegoasfmravpp May 5, 2025
9f8476f
Update planner logic with real-time detection
htliang517 May 7, 2025
d578493
Update cone_detection.py
dh-agarwal May 7, 2025
c082cbe
remove commented out launch control code in gem_hardware.py
alo-20 May 7, 2025
350d815
added turn rate and accel limits to planner in
diegoasfmravpp May 7, 2025
139354e
cone logging logic?
dh-agarwal May 7, 2025
f45f962
Remove logs and unneeded files
alo-20 May 7, 2025
dc555aa
Remove old versions of racing planner
alo-20 May 7, 2025
767d1c9
modularized launch_ctrl
Adi9103 May 7, 2025
bf5a151
add velocity profile plotting from behavior.json
alo-20 May 2, 2025
828e1f6
Add up-to-date version of racing planning
alo-20 May 8, 2025
52838f1
add better version of velocity mapping accounting for steering rate
alo-20 May 8, 2025
0beb02b
Fix launch_control.py reset bug, remove launch control enable from cu…
alo-20 May 8, 2025
514b198
Clean up pure_pursuit racing logic
alo-20 May 8, 2025
503945e
velocity_profile.py cleanup
diegoasfmravpp May 9, 2025
4a78dea
velocity_profile.py cleanup
diegoasfmravpp May 9, 2025
da365c0
remove whitespace changes in gem_hardware
alo-20 May 12, 2025
c044cbd
Remove whitespace and unneeded changes in gem.py
alo-20 May 12, 2025
4d63e57
fixed route to trajectory with velocity to work
diegoasfmravpp May 9, 2025
4d60510
update stanley
alo-20 May 12, 2025
5a627af
Fix launch control reset behavior and update trajectory.py
alo-20 May 12, 2025
cfbecb1
remove launch control reset
alo-20 May 13, 2025
98f031a
Add dynamics changes from other racing branches
alo-20 May 13, 2025
0ace8e8
revert stanley
alo-20 May 13, 2025
bae5505
launch control logs
KenC1014 May 13, 2025
5369e75
Update search area for closest point
alo-20 May 14, 2025
844913b
Remove logs from pr branch
alo-20 May 14, 2025
f855531
Merge branch 's2025' into racing_pr_prep
alo-20 May 14, 2025
0169807
Re enable launch control reset and add comments
alo-20 May 14, 2025
746cbe9
update gem_simulator and racing_planning with latest
alo-20 May 14, 2025
a7ae625
Update launch files
alo-20 May 14, 2025
23f246a
duplicated code segment
diegoasfmravpp May 15, 2025
fdf73b2
Remove changes to dyanamics.py
alo-20 May 15, 2025
4e3a790
Remove changes from dynamics.py correctly
alo-20 May 15, 2025
2b551c6
Remove unncessary changes per PR comments
alo-20 May 15, 2025
add8734
Turn off velocity profile plotting by default
alo-20 May 15, 2025
611ed94
remove formatting change from current.yaml
alo-20 May 15, 2025
5b6a46b
remove whitespace
alo-20 May 15, 2025
73fd274
remove extra comments from gem_e4_dyanamics
alo-20 May 15, 2025
1e4b388
Update launch files
alo-20 May 15, 2025
fda3f62
remove route in launch file
ShellyRiver May 15, 2025
9dc7843
Clean up racing planner code
htliang517 May 15, 2025
42d887c
remove changes to cone_detection.py
alo-20 May 15, 2025
6bf4b55
remove changes to gem_e4_dyanmics
alo-20 May 16, 2025
2edbfcd
Separate racing tuning parameters in current.yaml for stanley and pur…
alo-20 May 16, 2025
4429f1e
changing desired speed for PID back to derivative eval and changing m…
diegoasfmravpp May 16, 2025
e6d0497
Merge branch 's2025' into racing_pr_prep
alo-20 May 16, 2025
8055e27
add changes from control group
alo-20 May 16, 2025
cdc2b8e
Manual integration of control team logic
alo-20 May 16, 2025
99741a0
Merge branch 's2025' into racing_pr_prep
alo-20 May 16, 2025
98cc525
Fix minor issue with unused reference test code indicated by autocheck.
htliang517 May 16, 2025
2968d06
Fix warning of velocity_profile
htliang517 May 16, 2025
53d9b09
Remove cone agents and scenes for simulation
alo-20 May 16, 2025
64c9196
remove racing_fixed_slalom
alo-20 May 16, 2025
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
34 changes: 31 additions & 3 deletions GEMstack/knowledge/defaults/current.yaml
Copy link
Owner

Choose a reason for hiding this comment

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

Don’t commit formatting changes

Copy link
Owner

Choose a reason for hiding this comment

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

Are these parameter changes coordinated with the control team / parking team?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

We agreed with the control team to separate the racing tuning parameters. So this should no longer affect them. But the Baseline stanley parameters are the same that the control team has.

Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,40 @@ control:
lookahead_scale: 3.0 # Velocity-dependent lookahead scaling factor
crosstrack_gain: 0.5 # Gain for crosstrack error correction (default: 1)
desired_speed: trajectory # Speed reference source: can be "trajectory", "path", or a constant value

# Stanley controller parameters (fine tune this)
stanley:
control_gain: 1.5
softening_gain: 0.2
desired_speed: trajectory # Speed reference source: can be "trajectory", "path", "racing" or a constant value
longitudinal_control:
pid_p: 1.0
pid_i: 0.7
pid_d: 0.1
racing: # These tuning parameters will be used if the speed source is 'racing'
pure_pursuit:
lookahead: 2.0
lookahead_scale: 2.0
crosstrack_gain: 0.3
stanley:
control_gain: 0.12
softening_gain: 0.2
longitudinal_control:
pid_p: 1.0
pid_i: 0.7
pid_d: 0.1
launch_control:
stage_duration: 0.5
planning:
longitudinal_plan:
mode: 'real' # 'real' or 'sim'
yielder: 'expert' # 'expert', 'analytic', or 'simulation'
planner: 'dt' # 'milestone', 'dt', or 'dx'
desired_speed: 1.0
acceleration: 0.5
max_deceleration: 6.0
deceleration: 2.0
min_deceleration: 0.5
yield_deceleration: 0.5
desired_speed: trajectory # Speed reference source: can be "trajectory", "path", or a constant value

# MPC controller parameters
Expand All @@ -37,13 +66,12 @@ control:
pid_p: 1.0 # Proportional gain for speed PID controller
pid_i: 0.1 # Integral gain for speed PID controller
pid_d: 1.0 # Derivative gain for speed PID controller

#configure the simulator, if using
simulator:
dt: 0.01
real_time_multiplier: 1.0 # make the simulator run faster than real time by making this > 1
gnss_emulator:
dt: 0.1 #10Hz
dt: 0.05 #10Hz
#position_noise: 0.1 #10cm noise
#orientation_noise: 0.04 #2.3 degrees noise
#velocity_noise:
Expand Down
100 changes: 100 additions & 0 deletions GEMstack/knowledge/routes/circle_10m_rad.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
10.0,0.0
9.980267284282716,0.6279051952931337
9.921147013144777,1.2533323356430426
9.822872507286887,1.8738131458572465
9.685831611286313,2.4868988716485485
9.510565162951536,3.0901699437494745
9.297764858882513,3.68124552684678
9.048270524660193,4.257792915650727
8.763066800438635,4.817536741017153
8.443279255020151,5.3582679497899655
8.090169943749476,5.87785252292473
7.705132427757894,6.3742398974868975
7.289686274214117,6.845471059286887
6.845471059286887,7.289686274214117
6.374239897486897,7.705132427757894
5.87785252292473,8.090169943749476
5.3582679497899655,8.443279255020151
4.817536741017151,8.763066800438637
4.257792915650727,9.048270524660195
3.681245526846779,9.297764858882514
3.090169943749475,9.510565162951536
2.486898871648548,9.685831611286313
1.8738131458572451,9.822872507286887
1.2533323356430426,9.921147013144777
0.6279051952931329,9.980267284282716
-1.6081226496766366e-15,9.999999999999998
-0.627905195293134,9.980267284282716
-1.2533323356430437,9.921147013144777
-1.8738131458572485,9.822872507286887
-2.486898871648549,9.685831611286313
-3.0901699437494763,9.510565162951536
-3.68124552684678,9.297764858882514
-4.257792915650728,9.048270524660195
-4.817536741017154,8.763066800438635
-5.358267949789967,8.44327925502015
-5.877852522924729,8.090169943749476
-6.374239897486897,7.705132427757894
-6.845471059286887,7.289686274214116
-7.289686274214117,6.845471059286886
-7.705132427757895,6.374239897486894
-8.090169943749475,5.877852522924732
-8.443279255020151,5.3582679497899655
-8.763066800438637,4.817536741017151
-9.048270524660195,4.257792915650725
-9.297764858882514,3.6812455268467774
-9.510565162951538,3.090169943749471
-9.685831611286313,2.4868988716485485
-9.822872507286887,1.8738131458572458
-9.921147013144777,1.2533323356430408
-9.980267284282716,0.6279051952931314
-10.0,-3.216245299353273e-15
-9.980267284282716,-0.6279051952931334
-9.921147013144777,-1.253332335643043
-9.822872507286887,-1.873813145857248
-9.685831611286313,-2.4868988716485503
-9.510565162951535,-3.090169943749478
-9.297764858882513,-3.6812455268467836
-9.048270524660193,-4.257792915650727
-8.763066800438635,-4.817536741017154
-8.44327925502015,-5.358267949789967
-8.090169943749473,-5.877852522924733
-7.705132427757891,-6.3742398974869
-7.289686274214117,-6.845471059286887
-6.845471059286886,-7.289686274214117
-6.374239897486895,-7.705132427757895
-5.877852522924733,-8.090169943749475
-5.358267949789962,-8.443279255020153
-4.817536741017153,-8.763066800438635
-4.257792915650722,-9.048270524660197
-3.6812455268467783,-9.297764858882514
-3.0901699437494763,-9.510565162951535
-2.4868988716485445,-9.685831611286313
-1.8738131458572465,-9.822872507286887
-1.2533323356430373,-9.921147013144777
-0.6279051952931319,-9.980267284282716
-1.8369701987210296e-15,-10.0
0.6279051952931372,-9.980267284282716
1.2533323356430424,-9.921147013144777
1.8738131458572516,-9.822872507286887
2.48689887164855,-9.685831611286313
3.0901699437494727,-9.510565162951538
3.681245526846783,-9.297764858882513
4.257792915650727,-9.048270524660195
4.817536741017157,-8.763066800438633
5.358267949789966,-8.44327925502015
5.877852522924735,-8.090169943749471
6.374239897486898,-7.705132427757891
6.845471059286886,-7.289686274214117
7.289686274214119,-6.845471059286883
7.705132427757894,-6.374239897486895
8.09016994374948,-5.877852522924725
8.443279255020153,-5.358267949789962
8.763066800438635,-4.817536741017153
9.048270524660197,-4.257792915650722
9.297764858882513,-3.6812455268467787
9.510565162951538,-3.0901699437494683
9.685831611286313,-2.4868988716485454
9.822872507286887,-1.8738131458572471
9.921147013144777,-1.253332335643038
9.980267284282716,-0.6279051952931326
100 changes: 100 additions & 0 deletions GEMstack/knowledge/routes/circle_20m_rad.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
20.0,0.0
19.960534568565432,1.2558103905862674
19.842294026289558,2.506664671286085
19.645745014573773,3.7476262917144925
19.37166322257262,4.973797743297096
19.02113032590307,6.180339887498948
18.595529717765025,7.362491053693559
18.09654104932039,8.515585831301454
17.526133600877273,9.635073482034306
16.886558510040302,10.716535899579933
16.18033988749895,11.755705045849464
15.410264855515782,12.748479794973795
14.579372548428232,13.690942118573775
13.690942118573773,14.579372548428232
12.748479794973793,15.410264855515784
11.75570504584946,16.18033988749895
10.716535899579931,16.886558510040302
9.635073482034302,17.526133600877273
8.515585831301454,18.096541049320393
7.3624910536935575,18.59552971776503
6.180339887498949,19.02113032590307
4.973797743297094,19.37166322257262
3.7476262917144902,19.645745014573773
2.506664671286085,19.842294026289558
1.255810390586266,19.960534568565432
-3.2162452993532727e-15,20.0
-1.255810390586268,19.960534568565432
-2.5066646712860874,19.842294026289554
-3.7476262917144965,19.645745014573773
-4.973797743297097,19.37166322257262
-6.180339887498951,19.02113032590307
-7.362491053693559,18.595529717765025
-8.515585831301454,18.09654104932039
-9.635073482034308,17.52613360087727
-10.716535899579938,16.8865585100403
-11.75570504584946,16.18033988749895
-12.748479794973795,15.410264855515784
-13.690942118573775,14.579372548428228
-14.579372548428234,13.69094211857377
-15.410264855515788,12.74847979497379
-16.180339887498945,11.755705045849465
-16.886558510040302,10.716535899579933
-17.526133600877273,9.635073482034304
-18.096541049320393,8.51558583130145
-18.59552971776503,7.362491053693555
-19.021130325903073,6.180339887498942
-19.37166322257262,4.973797743297096
-19.645745014573773,3.7476262917144916
-19.842294026289558,2.5066646712860816
-19.960534568565432,1.2558103905862628
-20.0,-6.432490598706546e-15
-19.960534568565432,-1.255810390586267
-19.842294026289558,-2.5066646712860856
-19.645745014573773,-3.7476262917144956
-19.37166322257262,-4.973797743297101
-19.02113032590307,-6.180339887498954
-18.595529717765025,-7.362491053693566
-18.09654104932039,-8.515585831301454
-17.52613360087727,-9.635073482034308
-16.8865585100403,-10.716535899579934
-16.180339887498945,-11.755705045849467
-15.41026485551578,-12.7484797949738
-14.579372548428232,-13.690942118573775
-13.690942118573773,-14.579372548428232
-12.74847979497379,-15.410264855515788
-11.755705045849465,-16.180339887498945
-10.716535899579927,-16.886558510040306
-9.635073482034306,-17.526133600877273
-8.515585831301443,-18.096541049320397
-7.362491053693557,-18.59552971776503
-6.180339887498951,-19.02113032590307
-4.973797743297089,-19.371663222572625
-3.7476262917144925,-19.645745014573773
-2.5066646712860745,-19.842294026289558
-1.255810390586264,-19.960534568565432
-3.673940397442059e-15,-20.0
1.2558103905862743,-19.960534568565432
2.5066646712860847,-19.842294026289558
3.7476262917145027,-19.645745014573773
4.973797743297099,-19.37166322257262
6.180339887498945,-19.021130325903073
7.3624910536935655,-18.595529717765025
8.515585831301452,-18.096541049320393
9.635073482034315,-17.526133600877266
10.716535899579934,-16.8865585100403
11.755705045849474,-16.18033988749894
12.7484797949738,-15.41026485551578
13.690942118573773,-14.579372548428232
14.579372548428237,-13.690942118573766
15.410264855515788,-12.748479794973793
16.180339887498956,-11.755705045849451
16.886558510040306,-10.716535899579927
17.526133600877273,-9.635073482034306
18.096541049320393,-8.515585831301443
18.59552971776503,-7.3624910536935575
19.021130325903076,-6.180339887498936
19.371663222572625,-4.97379774329709
19.645745014573773,-3.747626291714494
19.842294026289558,-2.506664671286076
19.960534568565432,-1.2558103905862652
100 changes: 100 additions & 0 deletions GEMstack/knowledge/routes/circle_5m_rad.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
5.0,0.0
4.990133642141358,0.31395259764656686
4.9605735065723895,0.6266661678215213
4.911436253643443,0.9369065729286231
4.842915805643155,1.243449435824274
4.755282581475767,1.545084971874737
4.648882429441256,1.8406227634233898
4.524135262330097,2.1288964578253635
4.381533400219318,2.4087683705085765
4.221639627510076,2.679133974894983
4.045084971874737,2.938926261462366
3.8525662138789456,3.1871199487434487
3.644843137107058,3.4227355296434436
3.422735529643443,3.644843137107058
3.1871199487434483,3.852566213878946
2.938926261462365,4.045084971874737
2.6791339748949827,4.221639627510076
2.4087683705085756,4.381533400219318
2.1288964578253635,4.524135262330098
1.8406227634233894,4.648882429441257
1.5450849718747373,4.755282581475767
1.2434494358242736,4.842915805643155
0.9369065729286226,4.911436253643443
0.6266661678215213,4.9605735065723895
0.3139525976465665,4.990133642141358
-8.040613248383182e-16,5.0
-0.313952597646567,4.990133642141358
-0.6266661678215218,4.960573506572389
-0.9369065729286241,4.911436253643443
-1.2434494358242743,4.842915805643155
-1.5450849718747377,4.755282581475767
-1.8406227634233898,4.648882429441256
-2.1288964578253635,4.524135262330097
-2.408768370508577,4.381533400219317
-2.6791339748949845,4.221639627510075
-2.938926261462365,4.045084971874737
-3.1871199487434487,3.852566213878946
-3.4227355296434436,3.644843137107057
-3.6448431371070584,3.4227355296434423
-3.852566213878947,3.1871199487434474
-4.045084971874736,2.9389262614623664
-4.221639627510076,2.679133974894983
-4.381533400219318,2.408768370508576
-4.524135262330098,2.1288964578253626
-4.648882429441257,1.8406227634233887
-4.755282581475768,1.5450849718747355
-4.842915805643155,1.243449435824274
-4.911436253643443,0.9369065729286229
-4.9605735065723895,0.6266661678215204
-4.990133642141358,0.3139525976465657
-5.0,-1.6081226496766366e-15
-4.990133642141358,-0.31395259764656674
-4.9605735065723895,-0.6266661678215214
-4.911436253643443,-0.9369065729286239
-4.842915805643155,-1.2434494358242751
-4.755282581475767,-1.5450849718747386
-4.648882429441256,-1.8406227634233916
-4.524135262330097,-2.1288964578253635
-4.381533400219317,-2.408768370508577
-4.221639627510075,-2.6791339748949836
-4.045084971874736,-2.938926261462367
-3.852566213878945,-3.18711994874345
-3.644843137107058,-3.4227355296434436
-3.422735529643443,-3.644843137107058
-3.1871199487434474,-3.852566213878947
-2.9389262614623664,-4.045084971874736
-2.679133974894982,-4.2216396275100765
-2.4087683705085765,-4.381533400219318
-2.128896457825361,-4.524135262330099
-1.8406227634233892,-4.648882429441257
-1.5450849718747377,-4.755282581475767
-1.2434494358242723,-4.842915805643156
-0.9369065729286231,-4.911436253643443
-0.6266661678215186,-4.9605735065723895
-0.313952597646566,-4.990133642141358
-9.184850993605148e-16,-5.0
0.3139525976465686,-4.990133642141358
0.6266661678215212,-4.9605735065723895
0.9369065729286257,-4.911436253643443
1.2434494358242747,-4.842915805643155
1.5450849718747361,-4.755282581475768
1.8406227634233914,-4.648882429441256
2.128896457825363,-4.524135262330098
2.4087683705085787,-4.3815334002193165
2.6791339748949836,-4.221639627510075
2.9389262614623686,-4.045084971874735
3.18711994874345,-3.852566213878945
3.422735529643443,-3.644843137107058
3.6448431371070593,-3.4227355296434414
3.852566213878947,-3.1871199487434483
4.045084971874739,-2.938926261462363
4.2216396275100765,-2.679133974894982
4.381533400219318,-2.4087683705085765
4.524135262330098,-2.128896457825361
4.648882429441257,-1.8406227634233894
4.755282581475769,-1.545084971874734
4.842915805643156,-1.2434494358242725
4.911436253643443,-0.9369065729286234
4.9605735065723895,-0.626666167821519
4.990133642141358,-0.3139525976465663
Loading
Loading