From a38f789b291aa0347526315cbd7a20e5d5df73fb Mon Sep 17 00:00:00 2001
From: liquidraver <504870+liquidraver@users.noreply.github.com>
Date: Thu, 21 May 2026 13:07:35 +0200
Subject: [PATCH] joystick UI: refresh repeater discover on entry if >60s stale

s_scan_sent (one-shot per boot) becomes s_last_scan_ms; RepeatersScreen
onEnter() re-runs the discover if there has never been a scan or the
last one is older than REPEATER_RESCAN_AFTER_MS (60s). Walking away
and returning now gives a fresh list instead of stale results.

Also fixes the manual KEY_ENTER_LONG rescan: after Phase C removed
the poll() that re-checked the flag, just unsetting it no longer
triggered anything. Now it calls doScan() directly.
---
 .../helpers/ui-joystick/joystick_screens.h    |  2 ++
 .../helpers/ui-joystick/screens/tools.cpp     | 29 ++++++++++++-------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/zephcore/helpers/ui-joystick/joystick_screens.h b/zephcore/helpers/ui-joystick/joystick_screens.h
index 0d321b9..b8c29c2 100644
--- a/zephcore/helpers/ui-joystick/joystick_screens.h
+++ b/zephcore/helpers/ui-joystick/joystick_screens.h
@@ -177,6 +177,8 @@ class RepeatersScreen : public UIScreen {
 	int _last_sel;
 	uint32_t _marquee_start_ms;
 	int _modal_idx;
+
+	void doScan();
 public:
 	RepeatersScreen(JoystickUITask *task, mesh::RTCClock *rtc);
 	int render(JoystickDisplay &display) override;
diff --git a/zephcore/helpers/ui-joystick/screens/tools.cpp b/zephcore/helpers/ui-joystick/screens/tools.cpp
index 8e4ba5e..48f7e5f 100644
--- a/zephcore/helpers/ui-joystick/screens/tools.cpp
+++ b/zephcore/helpers/ui-joystick/screens/tools.cpp
@@ -67,28 +67,27 @@ bool ToolsScreen::handleInput(char key)
 	return false;
 }
 
-#define REPEATER_SCAN_WINDOW_MS   30000
+#define REPEATER_SCAN_WINDOW_MS   30000   /* duration of "scanning..." indicator */
+#define REPEATER_RESCAN_AFTER_MS  60000   /* auto re-scan on entry if last scan is older than this */
 
 static const int RMODE_LIST = 0;
 static const int RMODE_MODAL = 1;
 
 /* Statically allocated scan state shared across the one screen instance */
-static uint32_t s_scan_until;
-static bool s_scan_sent;
+static uint32_t s_scan_until;    /* k_uptime_get_32() when the "scanning..." window ends */
+static uint32_t s_last_scan_ms;  /* k_uptime_get_32() of last scan (0 = never scanned) */
 
 RepeatersScreen::RepeatersScreen(JoystickUITask *task, mesh::RTCClock *rtc)
 	: _task(task), _rtc(rtc), _selected(0),
 	  _mode(RMODE_LIST), _last_sel(-1), _marquee_start_ms(0), _modal_idx(0)
 {
-	s_scan_until = 0; s_scan_sent = false;
+	s_scan_until = 0; s_last_scan_ms = 0;
 }
 
-void RepeatersScreen::onEnter()
+void RepeatersScreen::doScan()
 {
-	/* One-shot discover per device boot — guarded by s_scan_sent. */
-	if (s_scan_sent) return;
-	s_scan_sent = true;
-	s_scan_until = k_uptime_get_32() + REPEATER_SCAN_WINDOW_MS;
+	s_last_scan_ms = k_uptime_get_32();
+	s_scan_until = s_last_scan_ms + REPEATER_SCAN_WINDOW_MS;
 	_task->clearDiscoverSignals();
 
 	uint8_t data[10];
@@ -105,6 +104,15 @@ void RepeatersScreen::onEnter()
 	}
 }
 
+void RepeatersScreen::onEnter()
+{
+	/* Re-scan on entry if we've never scanned, or the last scan is stale. */
+	uint32_t now = k_uptime_get_32();
+	if (s_last_scan_ms == 0 || (now - s_last_scan_ms) >= REPEATER_RESCAN_AFTER_MS) {
+		doScan();
+	}
+}
+
 int RepeatersScreen::render(JoystickDisplay &display)
 {
 	/* Modal overlay */
@@ -253,7 +261,8 @@ bool RepeatersScreen::handleInput(char c)
 		return true;
 	}
 	if (c == KEY_ENTER_LONG) {
-		s_scan_sent = false; s_scan_until = 0; _selected = 0;
+		_selected = 0;
+		doScan();
 		_task->showAlert("Rescanning...", 800);
 		return true;
 	}