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

added support for avalon 2021 #767

Merged
merged 41 commits into from
Jan 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
226a3b4
toyota rsa logic
rav4kumar Jan 7, 2021
2389500
no arne messaging and add opedit
rav4kumar Jan 7, 2021
c4521c9
add gas_press, smartspeed and spdval1 to carstate
rav4kumar Jan 7, 2021
1e0a989
more fixes
rav4kumar Jan 7, 2021
6c2f6fa
new_message
arne182 Jan 7, 2021
14c0b24
thats right we dont have anglelater code yet.
rav4kumar Jan 7, 2021
1ad692a
revert to working mapd code? and pylint ignore mapd
rav4kumar Jan 7, 2021
5512133
flake8 ignore.
rav4kumar Jan 7, 2021
2386d98
flake8 e701 fix
rav4kumar Jan 7, 2021
ab54af7
control df with distance button?
rav4kumar Jan 7, 2021
688dfe9
wrong struct
rav4kumar Jan 7, 2021
dc35ede
Update carstate.py
rav4kumar Jan 7, 2021
5ac7bc3
update missing
arne182 Jan 8, 2021
a4bbbc4
start MessagedArneThread
arne182 Jan 8, 2021
5fb7d1e
Update carstate.py
rav4kumar Jan 8, 2021
ccc2eda
pubmaster?
rav4kumar Jan 8, 2021
dbcd716
message
rav4kumar Jan 8, 2021
008f76e
update carstate.py
rav4kumar Jan 8, 2021
bee932d
no .status
rav4kumar Jan 8, 2021
e8f1f10
pm
rav4kumar Jan 8, 2021
ae8288c
use dp_dynamic_follow to send DF status
arne182 Jan 8, 2021
245f769
sntax
rav4kumar Jan 8, 2021
957a073
encoding='utf8'
rav4kumar Jan 8, 2021
d70472a
Update carstate.py
arne182 Jan 8, 2021
ca499cf
Update carstate.py
arne182 Jan 8, 2021
d8022d8
pyopencl pipenv
geohot Jan 8, 2021
ee4522a
change the order so we can display right thing with distance toggle
rav4kumar Jan 8, 2021
4235cda
doesnt work well with dg
rav4kumar Jan 8, 2021
a4c9a94
Revert "change the order so we can display right thing with distance …
rav4kumar Jan 9, 2021
f91ea55
turn off distance button for now.
rav4kumar Jan 9, 2021
1cae82d
Parametrize MIN_CAN_SPEED in car interfaces
briskspirit Dec 4, 2020
1f75c95
Parametrize stoppingBrakeRate
briskspirit Dec 11, 2020
4596de0
Parametrize startingBrakeRate
briskspirit Dec 16, 2020
8d4e2f8
add the parameter to cereal .
rav4kumar Jan 9, 2021
bb8a348
Update dp_common.py
rav4kumar Jan 9, 2021
0496d7e
tune dg
rav4kumar Jan 9, 2021
9f2745f
add AVALON_2021 in dp080
rav4kumar Jan 11, 2021
9d15d0d
sync (#93)
rav4kumar Jan 11, 2021
3eac057
added dbc to release and test route.
rav4kumar Jan 11, 2021
bd32052
cant use the route since comma doesnt got it.
rav4kumar Jan 11, 2021
358e04c
i cant spell
rav4kumar Jan 11, 2021
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
1 change: 1 addition & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ torch = "*"
torchsummary = "*"
blosc = "==1.9.2"
segmentation-models-pytorch = "==0.1.2"
pyopencl = "*"

[packages]
atomicwrites = "*"
Expand Down
191 changes: 104 additions & 87 deletions Pipfile.lock

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions cereal/car.capnp
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,9 @@ struct CarParams {
steerRateCost @33 :Float32; # Lateral MPC cost on steering rate
steerControlType @34 :SteerControlType;
radarOffCan @35 :Bool; # True when radar objects aren't visible on CAN
minSpeedCan @51 :Float32; # Minimum vehicle speed from CAN (below this value drops to 0)
stoppingBrakeRate @52 :Float32; # brake_travel/s while trying to stop
startingBrakeRate @53 :Float32; # brake_travel/s while releasing on restart

steerActuatorDelay @36 :Float32; # Steering wheel actuator delay in seconds
openpilotLongitudinalControl @37 :Bool; # is openpilot doing the longitudinal control?
Expand Down
16 changes: 8 additions & 8 deletions common/dp_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
from common.params import Params
from common.realtime import sec_since_boot
import os
import time
from math import floor
#import time
#from math import floor
params = Params()
from common.travis_checker import travis
from common.dp_conf import init_params_vals
#from common.dp_conf import init_params_vals

if travis:
PARAM_PATH = str(os.environ.get('HOME')) + "/.comma/params/d/"
else:
PARAM_PATH = "/data/params/d/"
LAST_MODIFIED = str(PARAM_PATH) + "dp_last_modified"
if not os.path.exists(LAST_MODIFIED):
os.makedirs(str(os.environ.get('HOME')) + "/.comma/params/d/", exist_ok=True)
print("dp_last_modified is " + str(floor(time.time())))
params.put('dp_last_modified',str(floor(time.time())))
init_params_vals(params)
#if not os.path.exists(LAST_MODIFIED):
# os.makedirs(str(os.environ.get('HOME')) + "/.comma/params/d/", exist_ok=True)
# print("dp_last_modified is " + str(floor(time.time())))
# params.put('dp_last_modified',str(floor(time.time())))
# init_params_vals(params)

def is_online():
try:
Expand Down
20 changes: 10 additions & 10 deletions common/op_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,15 @@ def __init__(self):
#'hotspot_on_boot': Param(False, bool, 'Enable Hotspot On Boot'),
'keep_openpilot_engaged': Param(True, bool, 'True is stock behavior in this fork. False lets you use the brake and cruise control stalk to disengage as usual'),
#'lat_d': Param(9.0, VT.number, 'The lateral derivative gain, default is 9.0 for TSS2 Corolla. This is active at all speeds', live=True),
#'limit_rsa': Param(False, bool, "Switch off RSA above rsa_max_speed"),
'limit_rsa': Param(False, bool, "Switch off RSA above rsa_max_speed"),
#'ludicrous_mode': Param(False, bool, 'Double overall acceleration!'),
'mpc_offset': Param(0.0, VT.number, 'Offset model braking by how many m/s. Lower numbers equals more model braking', live=True),
#'NoctuaMode': Param(False, bool, 'Noctua Fan are super quite and they run at full speed at all time.'),
'offset_limit': Param(0, VT.number, 'Speed at which apk percent offset will work in m/s'),
'osm': Param(True, bool, 'Whether to use OSM for drives'),
'prius_pid': Param(False, bool, 'This enables the PID lateral controller with new a experimental derivative tune\nFalse: stock INDI, True: TSS2-tuned PID'),
'rolling_stop': Param(False, bool, 'If you do not want stop signs to go down to 0 kph enable this for 9kph slow down'),
#'rsa_max_speed': Param(24.5, VT.number, 'Speed limit to ignore RSA in m/s'),
'rsa_max_speed': Param(24.5, VT.number, 'Speed limit to ignore RSA in m/s'),
'smart_speed': Param(True, bool, 'Whether to use Smart Speed for drives above smart_speed_max_vego'),
'smart_speed_max_vego': Param(26.8, VT.number, 'Speed limit to ignore Smartspeed in m/s'),
#'spairrowtuning': Param(False, bool, 'INDI Tuning for Corolla Tss2, set steer_up_15 param to True and flash panda'),
Expand All @@ -118,14 +118,14 @@ def __init__(self):
#'use_virtual_middle_line': Param(False, bool, 'For roads over 4m wide, hug right. For roads under 2m wide, hug left.'),
'uniqueID': Param(None, [type(None), str], 'User\'s unique ID'),
'enable_indi_live': Param(False, bool, live=True),
'indi_inner_gain_bp': Param([0, 255, 255], [list, float, int], live=True, depends_on='enable_indi_live'),
'indi_inner_gain_v': Param([6.0, 6.0, 6.0], [list, float, int], live=True, depends_on='enable_indi_live'),
'indi_outer_gain_bp': Param([0, 255, 255], [list, float, int], live=True, depends_on='enable_indi_live'),
'indi_outer_gain_v': Param([15, 15, 15], [list, float, int], live=True, depends_on='enable_indi_live'),
'indi_time_constant_bp': Param([0, 255, 255], [list, float, int], live=True, depends_on='enable_indi_live'),
'indi_time_constant_v': Param([5.5, 5.5, 5.5], [list, float, int], live=True, depends_on='enable_indi_live'),
'indi_actuator_effectiveness_bp': Param([0, 255, 255], [list, float, int], live=True, depends_on='enable_indi_live'),
'indi_actuator_effectiveness_v': Param([6, 6, 6], [list, float, int], live=True, depends_on='enable_indi_live'),
'indi_inner_gain_bp': Param([18, 22, 26], [list, float, int], live=True, depends_on='enable_indi_live'),
'indi_inner_gain_v': Param([5, 10, 15], [list, float, int], live=True, depends_on='enable_indi_live'),
'indi_outer_gain_bp': Param([18, 22, 26], [list, float, int], live=True, depends_on='enable_indi_live'),
'indi_outer_gain_v': Param([4, 9, 14.99], [list, float, int], live=True, depends_on='enable_indi_live'),
'indi_time_constant_bp': Param([18, 22, 26], [list, float, int], live=True, depends_on='enable_indi_live'),
'indi_time_constant_v': Param([2, 4, 5.5], [list, float, int], live=True, depends_on='enable_indi_live'),
'indi_actuator_effectiveness_bp': Param([18, 22, 26], [list, float, int], live=True, depends_on='enable_indi_live'),
'indi_actuator_effectiveness_v': Param([5, 10, 15], [list, float, int], live=True, depends_on='enable_indi_live'),
'steer_limit_timer': Param(0.4, VT.number, live=True, depends_on='enable_indi_live')
}

Expand Down
Loading