Skip to content

Commit 404e393

Browse files
committed
Merge branch 'A1_control' into s2025_teamA_control-planning
2 parents ef3a29a + ad2bd16 commit 404e393

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

GEMstack/knowledge/vehicle/gem_e2_dynamics.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ max_accelerator_power_reverse: 10000.0 #Watts. Power (backwards) in reverse gea
1414

1515
acceleration_model : kris_v1
1616
accelerator_active_range : [0.32, 1.0] #range of accelerator pedal where output acceleration is not flat
17-
brake_active_range : [0,1] #range of brake pedal where output deceleration is not flat
17+
brake_active_range : [0.25,1] #range of brake pedal where output deceleration is not flat
1818

1919
internal_dry_deceleration: 0.2 #m/s^2: deceleration due to internal dry friction (non-speed dependent)
2020
internal_viscous_deceleration: 0.05 #1/s: scales the current velocity to get deceleration due to internal viscous friction (speed dependent)

GEMstack/knowledge/vehicle/gem_e4_dynamics.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
mass: 300.0 #kg
1+
mass: 700.0 #kg
22
gravity: 9.81 #m/s^2
3-
longitudinal_friction : 1.0 # unitless
4-
lateral_friction : 1.0 # unitless
5-
max_brake_deceleration: 8.0 #m/s^2. Deceleration at max brake pedal
6-
max_accelerator_acceleration: #m/s^2. Acceleration at max accelerator pedal, by gear
3+
longitudinal_friction : 1.0 # unitless TODO find make/model of tires
4+
lateral_friction : 1.0 # unitless (I will bet these things do not have 1 coefficent of fricition)
5+
max_brake_deceleration: 8.0 #m/s^2. Deceleration at max brake pedal TODO (un cap this cap)
6+
max_accelerator_acceleration: #m/s^2. Acceleration at max accelerator pedal, by gear (un cap this cap)
77
- 0.0
88
- 5.0
99
max_accelerator_acceleration_reverse: 2.5 #m/s^2. Acceleration (backwards) in reverse gear
10-
max_accelerator_power: #Watts. Power at max accelerator pedal, by gear
10+
max_accelerator_power: #Watts. Power at max accelerator pedal, by gear (updated from website)
1111
- 0.0
12-
- 10000.0
13-
max_accelerator_power_reverse: 10000.0 #Watts. Power (backwards) in reverse gear
12+
- 5000.0
13+
max_accelerator_power_reverse: 5000.0 #Watts. Power (backwards) in reverse gear
1414

15-
acceleration_model : kris_v1
15+
acceleration_model : hang_v1
1616
accelerator_active_range : [0.2, 1.0] #range of accelerator pedal where output acceleration is not flat
17-
brake_active_range : [0,1] #range of brake pedal where output deceleration is not flat
17+
brake_active_range : [0.5,1] #range of brake pedal where output deceleration is not flat
1818

1919
internal_dry_deceleration: 0.2 #m/s^2: deceleration due to internal dry friction (non-speed dependent)
2020
internal_viscous_deceleration: 0.05 #1/s: scales the current velocity to get deceleration due to internal viscous friction (speed dependent)

0 commit comments

Comments
 (0)