diff --git a/selfdrive/car/hyundai/carcontroller.py b/selfdrive/car/hyundai/carcontroller.py index e9e1fa2..15b93c3 100644 --- a/selfdrive/car/hyundai/carcontroller.py +++ b/selfdrive/car/hyundai/carcontroller.py @@ -122,8 +122,8 @@ class CarController(CarControllerBase): # LFA and HDA icons if self.frame % 5 == 0 and (not hda2 or hda2_long): # CLEARPILOT TEST self.CS.lkas_enabled - # can_sends.append(hyundaicanfd.create_lfahda_cluster(self.packer, self.CAN, CC.enabled, CC.latActive)) - can_sends.append(hyundaicanfd.create_lfahda_cluster(self.packer, self.CAN, CS.lkas_enabled, CS.lkas_enabled)) + can_sends.append(hyundaicanfd.create_lfahda_cluster(self.packer, self.CAN, CC.enabled, CC.latActive)) + # can_sends.append(hyundaicanfd.create_lfahda_cluster(self.packer, self.CAN, CS.lkas_enabled, CS.lkas_enabled)) # blinkers if hda2 and self.CP.flags & HyundaiFlags.ENABLE_BLINKERS: @@ -139,9 +139,9 @@ class CarController(CarControllerBase): else: # Clearpilot # If cruise control was enabled or idle on start, force cancel - if CS.fix_main_enabled_cancel_main: - CS.fix_main_enabled_cancel_main = False - CC.cruiseControl.cancel = True + # if CS.fix_main_enabled_cancel_main: + # CS.fix_main_enabled_cancel_main = False + # CC.cruiseControl.cancel = True # button presses can_sends.extend(self.create_button_messages(CC, CS, use_clu11=False)) else: diff --git a/selfdrive/car/hyundai/carstate.py b/selfdrive/car/hyundai/carstate.py index a5c0f64..ad1dc34 100644 --- a/selfdrive/car/hyundai/carstate.py +++ b/selfdrive/car/hyundai/carstate.py @@ -58,7 +58,7 @@ class CarState(CarStateBase): # FrogPilot variables self.main_enabled = False - # Clearpilot variables + # Clearpilot variables dev self.fix_main_enabled_check = True self.fix_main_enabled_executed = False self.fix_main_enabled_cancel_main = False @@ -305,9 +305,9 @@ class CarState(CarStateBase): self.lkas_enabled = lkas_enabled - if self.lkas_enabled and not self.lkas_previously_enabled: - self.fix_main_enabled_cancel_main = True - self.lkas_was_pressed = True + # if self.lkas_enabled and not self.lkas_previously_enabled: + # self.fix_main_enabled_cancel_main = True + # self.lkas_was_pressed = True # print('Hello World', file=sys.stderr) # sys.stderr.write(str({k: v for k, v in vars(ret).items() if isinstance(v, (int, float, str, bool))}) + '\n')