From 95078c22d5e516ce0ab79d3340935708873de623 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Mon, 5 Jun 2023 17:16:57 -0400 Subject: [PATCH] CarState: update objects when refreshing params (#96) --- selfdrive/car/chrysler/interface.py | 2 +- selfdrive/car/gm/interface.py | 2 +- selfdrive/car/honda/interface.py | 2 +- selfdrive/car/hyundai/interface.py | 2 +- selfdrive/car/interfaces.py | 1 + selfdrive/car/mazda/interface.py | 2 +- selfdrive/car/nissan/interface.py | 2 +- selfdrive/car/subaru/interface.py | 2 +- selfdrive/car/toyota/interface.py | 2 +- selfdrive/car/volkswagen/interface.py | 2 +- 10 files changed, 10 insertions(+), 9 deletions(-) diff --git a/selfdrive/car/chrysler/interface.py b/selfdrive/car/chrysler/interface.py index 7fd8c22fa5..b3d4e926f8 100755 --- a/selfdrive/car/chrysler/interface.py +++ b/selfdrive/car/chrysler/interface.py @@ -94,7 +94,7 @@ class CarInterface(CarInterfaceBase): def _update(self, c): ret = self.CS.update(self.cp, self.cp_cam) - self.sp_update_params(self.CS) + self.CS = self.sp_update_params(self.CS) buttonEvents = [] diff --git a/selfdrive/car/gm/interface.py b/selfdrive/car/gm/interface.py index 7269a1d470..3596b1b1cc 100755 --- a/selfdrive/car/gm/interface.py +++ b/selfdrive/car/gm/interface.py @@ -252,7 +252,7 @@ class CarInterface(CarInterfaceBase): # returns a car.CarState def _update(self, c): ret = self.CS.update(self.cp, self.cp_cam, self.cp_loopback) - self.sp_update_params(self.CS) + self.CS = self.sp_update_params(self.CS) buttonEvents = [] diff --git a/selfdrive/car/honda/interface.py b/selfdrive/car/honda/interface.py index 1e1a63f742..4fa9c281ac 100755 --- a/selfdrive/car/honda/interface.py +++ b/selfdrive/car/honda/interface.py @@ -335,7 +335,7 @@ class CarInterface(CarInterfaceBase): # returns a car.CarState def _update(self, c): ret = self.CS.update(self.cp, self.cp_cam, self.cp_body) - self.sp_update_params(self.CS) + self.CS = self.sp_update_params(self.CS) buttonEvents = [] diff --git a/selfdrive/car/hyundai/interface.py b/selfdrive/car/hyundai/interface.py index 30dd7f7d66..05a81c8351 100644 --- a/selfdrive/car/hyundai/interface.py +++ b/selfdrive/car/hyundai/interface.py @@ -341,7 +341,7 @@ class CarInterface(CarInterfaceBase): def _update(self, c): ret = self.CS.update(self.cp, self.cp_cam) - self.sp_update_params(self.CS) + self.CS = self.sp_update_params(self.CS) buttonEvents = [] diff --git a/selfdrive/car/interfaces.py b/selfdrive/car/interfaces.py index aa90982220..e39416b3cf 100644 --- a/selfdrive/car/interfaces.py +++ b/selfdrive/car/interfaces.py @@ -549,6 +549,7 @@ class CarInterfaceBase(ABC): self.gac = self.param_s.get_bool("GapAdjustCruise") self.gac_mode = round(float(self.param_s.get("GapAdjustCruiseMode", encoding="utf8"))) self.reverse_dm_cam = self.param_s.get_bool("ReverseDmCam") + return CS class RadarInterfaceBase(ABC): def __init__(self, CP): diff --git a/selfdrive/car/mazda/interface.py b/selfdrive/car/mazda/interface.py index d6b683a83c..2cbe234337 100755 --- a/selfdrive/car/mazda/interface.py +++ b/selfdrive/car/mazda/interface.py @@ -58,7 +58,7 @@ class CarInterface(CarInterfaceBase): # returns a car.CarState def _update(self, c): ret = self.CS.update(self.cp, self.cp_cam) - self.sp_update_params(self.CS) + self.CS = self.sp_update_params(self.CS) buttonEvents = [] diff --git a/selfdrive/car/nissan/interface.py b/selfdrive/car/nissan/interface.py index 51036c3336..5553280ccb 100644 --- a/selfdrive/car/nissan/interface.py +++ b/selfdrive/car/nissan/interface.py @@ -44,7 +44,7 @@ class CarInterface(CarInterfaceBase): # returns a car.CarState def _update(self, c): ret = self.CS.update(self.cp, self.cp_adas, self.cp_cam) - self.sp_update_params(self.CS) + self.CS = self.sp_update_params(self.CS) buttonEvents = [] #be = car.CarState.ButtonEvent.new_message() diff --git a/selfdrive/car/subaru/interface.py b/selfdrive/car/subaru/interface.py index ebe82e4346..bcd79b2d1f 100644 --- a/selfdrive/car/subaru/interface.py +++ b/selfdrive/car/subaru/interface.py @@ -121,7 +121,7 @@ class CarInterface(CarInterfaceBase): def _update(self, c): ret = self.CS.update(self.cp, self.cp_cam, self.cp_body) - self.sp_update_params(self.CS) + self.CS = self.sp_update_params(self.CS) buttonEvents = [] diff --git a/selfdrive/car/toyota/interface.py b/selfdrive/car/toyota/interface.py index 24d8fe215b..e95a339c78 100644 --- a/selfdrive/car/toyota/interface.py +++ b/selfdrive/car/toyota/interface.py @@ -256,7 +256,7 @@ class CarInterface(CarInterfaceBase): # returns a car.CarState def _update(self, c): ret = self.CS.update(self.cp, self.cp_cam) - self.sp_update_params(self.CS) + self.CS = self.sp_update_params(self.CS) buttonEvents = [] diff --git a/selfdrive/car/volkswagen/interface.py b/selfdrive/car/volkswagen/interface.py index 60f6e72fce..726157be6f 100644 --- a/selfdrive/car/volkswagen/interface.py +++ b/selfdrive/car/volkswagen/interface.py @@ -226,7 +226,7 @@ class CarInterface(CarInterfaceBase): # returns a car.CarState def _update(self, c): ret = self.CS.update(self.cp, self.cp_cam, self.cp_ext, self.CP.transmissionType) - self.sp_update_params(self.CS) + self.CS = self.sp_update_params(self.CS) buttonEvents = []