|
18 | 18 | A_CRUISE_MIN = -1.2 |
19 | 19 | # TODO: tune from DATA! |
20 | 20 | A_CRUISE_MAX_VALS = [1.6, 1.5, 0.6, 0.4] |
21 | | -A_CRUISE_MAX_VALS_SPORT = [1.9, 1.6, 1.0, 0.8] |
22 | | -A_CRUISE_MAX_VALS_ECON = [1.4, 0.92, 0.5, 0.186] |
23 | 21 | A_CRUISE_MAX_BP = [0., 6.4, 22.5, 40.] # 0., 14., 50.3, 90 mph |
24 | 22 |
|
| 23 | +A_CRUISE_MAX_VALS_SPORT = [1.0, 0.656] |
| 24 | +A_CRUISE_MAX_BP_SPORT = [11.3876, 29.238] |
| 25 | + |
| 26 | +A_CRUISE_MAX_VALS_ECON = [1.0, 0.64, 0.5, 0.36] |
| 27 | +A_CRUISE_MAX_BP_ECON = [3., 16.6332, 22.4933, 30.2597] |
| 28 | + |
25 | 29 | # Lookup table for turns |
26 | 30 | _A_TOTAL_MAX_V = [2.5, 3.8] |
27 | 31 | _A_TOTAL_MAX_BP = [15., 40.] |
|
30 | 34 | def get_max_accel(v_ego, CS): |
31 | 35 | # change A_CRUISE_MAX_VALS live |
32 | 36 | if CS.sportOn: |
33 | | - return interp(v_ego, A_CRUISE_MAX_BP, A_CRUISE_MAX_VALS_SPORT) |
| 37 | + return interp(v_ego, A_CRUISE_MAX_BP_SPORT, A_CRUISE_MAX_VALS_SPORT) |
34 | 38 | elif CS.econOn: |
35 | | - return interp(v_ego, A_CRUISE_MAX_BP, A_CRUISE_MAX_VALS_ECON) |
| 39 | + return interp(v_ego, A_CRUISE_MAX_BP_ECON, A_CRUISE_MAX_VALS_ECON) |
36 | 40 | else: |
37 | 41 | return interp(v_ego, A_CRUISE_MAX_BP, A_CRUISE_MAX_VALS) |
38 | 42 |
|
|
0 commit comments