Skip to content

Commit 01b1863

Browse files
haraschaxrjsmith1999
authored andcommitted
Cleanup car interfaces (commaai#24948)
* remove interface overrides * Fix test * set torque tune for ev6
1 parent 427b7ea commit 01b1863

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

selfdrive/car/interfaces.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,14 @@ def get_torque_params(candidate, default=float('NaN')):
119119
with open(TORQUE_PARAMS_PATH) as f:
120120
params = yaml.load(f, Loader=yaml.FullLoader)
121121
with open(TORQUE_OVERRIDE_PATH) as f:
122-
params_override = yaml.load(f, Loader=yaml.FullLoader)
122+
override = yaml.load(f, Loader=yaml.FullLoader)
123123

124-
assert len(set(sub.keys()) & set(params.keys()) & set(params_override.keys())) == 0
124+
# Ensure no overlap
125+
if sum([candidate in x for x in [sub, params, override]]) > 1:
126+
raise RuntimeError(f'{candidate} is defined twice in torque config')
125127

126-
if candidate in params_override:
127-
out = params_override[candidate]
128+
if candidate in override:
129+
out = override[candidate]
128130
elif candidate in params:
129131
out = params[candidate]
130132
else:

0 commit comments

Comments
 (0)