Skip to content

Commit 03f7619

Browse files
authored
ParamManager: Convert missed params in cars (commaai#390)
1 parent 9ed9d00 commit 03f7619

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

selfdrive/car/chrysler/carcontroller.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,8 @@ def get_curve_speed(self, target_speed_kph, v_cruise_kph_prev):
269269
return min(target_speed_kph, curve_speed)
270270

271271
def get_button_control(self, CS, final_speed, v_cruise_kph_prev):
272-
self.init_speed = round(min(final_speed, v_cruise_kph_prev) * (CV.KPH_TO_MPH if not self.is_metric else 1))
273-
self.v_set_dis = round(CS.out.cruiseState.speed * (CV.MS_TO_MPH if not self.is_metric else CV.MS_TO_KPH))
272+
self.init_speed = round(min(final_speed, v_cruise_kph_prev) * (CV.KPH_TO_MPH if not CS.params_list.is_metric else 1))
273+
self.v_set_dis = round(CS.out.cruiseState.speed * (CV.MS_TO_MPH if not CS.params_list.is_metric else CV.MS_TO_KPH))
274274
cruise_button = self.get_button_type(self.button_type)
275275
return cruise_button
276276

selfdrive/car/volkswagen/carcontroller.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@ def get_curve_speed(self, target_speed_kph, v_cruise_kph_prev):
294294
return min(target_speed_kph, curve_speed)
295295

296296
def get_button_control(self, CS, final_speed, v_cruise_kph_prev):
297-
self.init_speed = round(min(final_speed, v_cruise_kph_prev) * (CV.KPH_TO_MPH if not self.is_metric else 1))
298-
self.v_set_dis = round(CS.out.cruiseState.speed * (CV.MS_TO_MPH if not self.is_metric else CV.MS_TO_KPH))
297+
self.init_speed = round(min(final_speed, v_cruise_kph_prev) * (CV.KPH_TO_MPH if not CS.params_list.is_metric else 1))
298+
self.v_set_dis = round(CS.out.cruiseState.speed * (CV.MS_TO_MPH if not CS.params_list.is_metric else CV.MS_TO_KPH))
299299
cruise_button = self.get_button_type(self.button_type)
300300
return cruise_button
301301

0 commit comments

Comments
 (0)