From affe7884a0f82d51ced1abc6a7a8a9b8454642e2 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Tue, 5 Sep 2023 21:57:12 -0400 Subject: [PATCH] Upstream merge fixes --- selfdrive/car/honda/interface.py | 8 ++++---- selfdrive/car/hyundai/interface.py | 4 +--- selfdrive/car/toyota/interface.py | 5 +---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/selfdrive/car/honda/interface.py b/selfdrive/car/honda/interface.py index a18041ac7c..c5ddca0774 100755 --- a/selfdrive/car/honda/interface.py +++ b/selfdrive/car/honda/interface.py @@ -345,10 +345,10 @@ class CarInterface(CarInterfaceBase): ret = self.CS.update(self.cp, self.cp_cam, self.cp_body) self.CS = self.sp_update_params(self.CS) - buttonEvents = [] - - buttonEvents.append(create_button_events(self.CS.cruise_buttons, self.CS.prev_cruise_buttons, BUTTONS_DICT)) - buttonEvents.append(create_button_events(self.CS.cruise_setting, self.CS.prev_cruise_setting, {1: ButtonType.altButton1})) + buttonEvents = [ + *create_button_events(self.CS.cruise_buttons, self.CS.prev_cruise_buttons, BUTTONS_DICT), + *create_button_events(self.CS.cruise_setting, self.CS.prev_cruise_setting, {1: ButtonType.altButton1}), + ] self.CS.mads_enabled = self.get_sp_cruise_main_state(ret, self.CS) diff --git a/selfdrive/car/hyundai/interface.py b/selfdrive/car/hyundai/interface.py index c8e535b74e..8eb030431b 100644 --- a/selfdrive/car/hyundai/interface.py +++ b/selfdrive/car/hyundai/interface.py @@ -357,9 +357,7 @@ class CarInterface(CarInterfaceBase): ret = self.CS.update(self.cp, self.cp_cam) self.CS = self.sp_update_params(self.CS) - buttonEvents = [] - - buttonEvents.append(create_button_events(self.CS.cruise_buttons[-1], self.CS.prev_cruise_buttons, BUTTONS_DICT)) + buttonEvents = create_button_events(self.CS.cruise_buttons[-1], self.CS.prev_cruise_buttons, BUTTONS_DICT) self.CS.accEnabled, buttonEvents = self.get_sp_v_cruise_non_pcm_state(ret, self.CS.accEnabled, buttonEvents, c.vCruise) diff --git a/selfdrive/car/toyota/interface.py b/selfdrive/car/toyota/interface.py index 9bd9933799..eeadc40cdc 100644 --- a/selfdrive/car/toyota/interface.py +++ b/selfdrive/car/toyota/interface.py @@ -293,10 +293,7 @@ class CarInterface(CarInterfaceBase): ret = self.CS.update(self.cp, self.cp_cam) self.CS = self.sp_update_params(self.CS) - buttonEvents = [] - - if self.CS.gap_dist_button != self.CS.prev_gap_dist_button: - buttonEvents.append(create_button_events(self.CS.gap_dist_button, self.CS.prev_gap_dist_button, {1: ButtonType.gapAdjustCruise})) + buttonEvents = create_button_events(self.CS.gap_dist_button, self.CS.prev_gap_dist_button, {1: ButtonType.gapAdjustCruise}) self.CS.mads_enabled = self.get_sp_cruise_main_state(ret, self.CS)