From 9d9e5aa02db229c56538301bcac69bc8fc988de8 Mon Sep 17 00:00:00 2001
From: Shane Smiskol <shane@smiskol.com>
Date: Mon, 15 Dec 2025 15:36:28 -0800
Subject: [PATCH] joystickd: add cruise control resume (#36876)

* Add cruise control resume logic based on conditions

* simple
---
 tools/joystick/joystickd.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/joystick/joystickd.py b/tools/joystick/joystickd.py
index 673a5bc1d..789dad562 100755
--- a/tools/joystick/joystickd.py
+++ b/tools/joystick/joystickd.py
@@ -48,6 +48,7 @@ def joystickd_thread():
     if CC.longActive:
       actuators.accel = 4.0 * float(np.clip(joystick_axes[0], -1, 1))
       actuators.longControlState = LongCtrlState.pid if sm['carState'].vEgo > CP.vEgoStopping else LongCtrlState.stopping
+      CC.cruiseControl.resume = actuators.accel > 0.0
 
     if CC.latActive:
       max_curvature = MAX_LAT_ACCEL / max(sm['carState'].vEgo ** 2, 5)