diff --git a/pull_and_launch.sh b/pull_and_launch.sh new file mode 100644 index 0000000..6ffc5b6 --- /dev/null +++ b/pull_and_launch.sh @@ -0,0 +1 @@ +git pull origin clearpilot; bash launch_chffrplus.sh \ No newline at end of file diff --git a/selfdrive/car/hyundai/carstate.py b/selfdrive/car/hyundai/carstate.py index bd562d7..e136162 100644 --- a/selfdrive/car/hyundai/carstate.py +++ b/selfdrive/car/hyundai/carstate.py @@ -302,6 +302,8 @@ class CarState(CarStateBase): except: nothing = 0 + 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 @@ -315,7 +317,7 @@ class CarState(CarStateBase): print({"fix_main_enabled_executed": self.fix_main_enabled_executed}, sys.stderr) print({"self.lkas_enabled": self.lkas_enabled}, sys.stderr) print({"lkas_enabled": lkas_enabled}, sys.stderr) - print({"lkas_enabled": self.lkas_was_pressed}, sys.stderr) + print({"lkas_was_pressed": self.lkas_was_pressed}, sys.stderr) # notes on self: # lkas_enabled = 1 = lkas button has been pressed # prev_cruise_buttons = 0 (none), 1, 2 - up down @@ -324,8 +326,6 @@ class CarState(CarStateBase): # ret: cruiseState.speed > 0 = and cruiseState.enabled = false = idle cruise. # press cruise to cancel it if not op engaged - self.lkas_enabled = lkas_enabled - self.params_memory.put_float("CarSpeedLimit", self.calculate_speed_limit(cp, cp_cam) * speed_factor) return ret