From 30361ec4a063c1b6322be5854a1748eacfbb589a Mon Sep 17 00:00:00 2001
From: 3djc <3djc@gh.com>
Date: Tue, 6 Oct 2026 10:02:41 +0200
Subject: [PATCH 1/2] feat(cli): key, trim, touch and rotary input injection
 (debug builds)

Add CLI commands that inject input on a running radio so UI changes can
be checked on hardware (pair with a framebuffer grab):

  key <label> [ms]
  trim <label><+|-> [ms]
  touch <x> <y> [ms] [x2 y2]
  rotary <steps>

Everything is behind CLI_INPUT_INJECT (CLI && DEBUG && !BOOT), so
non-debug builds are unchanged.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 radio/src/cli.cpp                      | 114 +++++++++++++++++++++++++
 radio/src/cli.h                        |  12 +++
 radio/src/gui/colorlcd/LvglWrapper.cpp |  51 ++++++++++-
 radio/src/keys.cpp                     |   7 ++
 4 files changed, 183 insertions(+), 1 deletion(-)

diff --git a/radio/src/cli.cpp b/radio/src/cli.cpp
index baaafd53e77..be310958190 100644
--- a/radio/src/cli.cpp
+++ b/radio/src/cli.cpp
@@ -1524,6 +1524,110 @@ void printAudioVars()
 #include "disk_cache.h"
 #endif
 
+#if defined(CLI_INPUT_INJECT)
+static uint32_t injKeys, injKeysUntil;
+
+// toInt() for optional arguments, which are null when omitted
+static int toIntOpt(const char ** argv, int index, int * val)
+{
+  if (!argv[index]) return 0;
+  return toInt(argv, index, val);
+}
+
+uint32_t cliInjectedKeys()
+{
+  return (injKeys && (int32_t)(time_get_ms() - injKeysUntil) < 0) ? injKeys : 0;
+}
+
+static int cliKey(const char ** argv)
+{
+  int ms = 100;
+  if (!argv[1] || toIntOpt(argv, 2, &ms) < 0) {
+    cliSerialPrint("%s: usage: key <key label> [<ms>]", argv[0]);
+    return -1;
+  }
+  for (int i = 0; i <= MAX_KEYS; i++) {
+    if (keyIsSupported((EnumKeys)i) && !strcasecmp(keysGetLabel((EnumKeys)i), argv[1])) {
+      injKeysUntil = time_get_ms() + ms;
+      injKeys = 1u << i;
+      return 0;
+    }
+  }
+  cliSerialPrint("%s: unknown key \"%s\", available:", argv[0], argv[1]);
+  for (int i = 0; i <= MAX_KEYS; i++) {
+    if (keyIsSupported((EnumKeys)i)) cliSerialPrint("  %s", keysGetLabel((EnumKeys)i));
+  }
+  return -1;
+}
+
+static uint32_t injTrims, injTrimsUntil;
+
+uint32_t cliInjectedTrims()
+{
+  return (injTrims && (int32_t)(time_get_ms() - injTrimsUntil) < 0) ? injTrims : 0;
+}
+
+// trim <label><+|-> [<ms>], e.g. "trim T1- 100"
+static int cliTrim(const char ** argv)
+{
+  int ms = 100;
+  if (!argv[1] || toIntOpt(argv, 2, &ms) < 0) {
+    cliSerialPrint("%s: usage: trim <label><+|-> [<ms>]", argv[0]);
+    return -1;
+  }
+  for (int i = 0; i < keysGetMaxTrims() * 2; i++) {
+    const char * label = getTrimLabel(i / 2);
+    size_t len = strlen(label);
+    if (!strncasecmp(label, argv[1], len) && argv[1][len] == ((i & 1) ? '+' : '-') &&
+        argv[1][len + 1] == '\0') {
+      injTrimsUntil = time_get_ms() + ms;
+      injTrims = 1u << i;
+      return 0;
+    }
+  }
+  cliSerialPrint("%s: unknown trim \"%s\", available:", argv[0], argv[1]);
+  for (int i = 0; i < keysGetMaxTrims() * 2; i++) {
+    cliSerialPrint("  %s%c", getTrimLabel(i / 2), (i & 1) ? '+' : '-');
+  }
+  return -1;
+}
+
+#if defined(COLORLCD) && (defined(ROTARY_ENCODER_NAVIGATION) || defined(USE_HATS_AS_KEYS))
+void lvglInjectRotary(int steps);
+
+static int cliRotary(const char ** argv)
+{
+  int steps = 0;
+  if (!argv[1] || toInt(argv, 1, &steps) <= 0) {
+    cliSerialPrint("%s: usage: rotary <steps> (negative = counter-clockwise)", argv[0]);
+    return -1;
+  }
+  lvglInjectRotary(steps);
+  return 0;
+}
+#endif
+
+#if defined(HARDWARE_TOUCH)
+void lvglInjectTouch(int x1, int y1, int x2, int y2, uint32_t ms);
+
+static int cliTouch(const char ** argv)
+{
+  int x1 = 0, y1 = 0, ms = 100, x2 = 0, y2 = 0;
+  if (!argv[1] || !argv[2] || toInt(argv, 1, &x1) <= 0 || toInt(argv, 2, &y1) <= 0 ||
+      toIntOpt(argv, 3, &ms) < 0) {
+    cliSerialPrint("%s: usage: touch <x> <y> [<ms>] [<x2> <y2>]", argv[0]);
+    return -1;
+  }
+  x2 = x1; y2 = y1;
+  if (toIntOpt(argv, 4, &x2) < 0 || toIntOpt(argv, 5, &y2) < 0) return -1;
+  if (ms <= 0) ms = 100;
+  lvglInjectTouch(x1, y1, x2, y2, ms);
+  return 0;
+}
+#endif
+
+#endif // CLI_INPUT_INJECT
+
 int cliDisplay(const char ** argv)
 {
   long long int address = 0;
@@ -1895,6 +1999,16 @@ int cliResetGT911(const char** argv)
 #endif
 
 const CliCommand cliCommands[] = {
+#if defined(CLI_INPUT_INJECT)
+  { "key", cliKey, "<key label> [<ms>]" },
+  { "trim", cliTrim, "<label><+|-> [<ms>]" },
+#if defined(COLORLCD) && (defined(ROTARY_ENCODER_NAVIGATION) || defined(USE_HATS_AS_KEYS))
+  { "rotary", cliRotary, "<steps>" },
+#endif
+#if defined(HARDWARE_TOUCH)
+  { "touch", cliTouch, "<x> <y> [<ms>] [<x2> <y2>]" },
+#endif
+#endif // CLI_INPUT_INJECT
   { "beep", cliBeep, "[<frequency>] [<duration>]" },
   { "ls", cliLs, "<directory>" },
   { "read", cliRead, "<filename>" },
diff --git a/radio/src/cli.h b/radio/src/cli.h
index 66af0ac5056..98746a05db5 100644
--- a/radio/src/cli.h
+++ b/radio/src/cli.h
@@ -26,5 +26,17 @@
 // CLI task function
 void cliStart();
 
+// Input injection commands (key, trim, touch, rotary) are debug-only
+#if defined(CLI) && defined(DEBUG) && !defined(BOOT)
+#define CLI_INPUT_INJECT
+#endif
+
+#if defined(CLI_INPUT_INJECT)
+// Key mask held by the "key" CLI command, 0 when none
+uint32_t cliInjectedKeys();
+// Trim switch mask held by the "trim" CLI command, 0 when none
+uint32_t cliInjectedTrims();
+#endif
+
 // Connect serial driver to CLI
 void cliSetSerialDriver(void* ctx, const etx_serial_driver_t* drv);
diff --git a/radio/src/gui/colorlcd/LvglWrapper.cpp b/radio/src/gui/colorlcd/LvglWrapper.cpp
index 400e3b01f90..3570cb6a165 100644
--- a/radio/src/gui/colorlcd/LvglWrapper.cpp
+++ b/radio/src/gui/colorlcd/LvglWrapper.cpp
@@ -24,6 +24,7 @@
 #include "edgetx.h"
 #include "etx_lv_theme.h"
 #include "hal/rotary_encoder.h"
+#include "cli.h"
 #include "keyboard_base.h"
 #include "mainwindow.h"
 #include "os/time.h"
@@ -206,11 +207,48 @@ void lvglRequestKeyboardEnter()
 }
 #endif
 
+#if defined(CLI_INPUT_INJECT) && defined(HARDWARE_TOUCH)
+static struct {
+  volatile bool active;
+  int x1, y1, x2, y2;
+  uint32_t start, dur;
+} injTouch;
+
+void lvglInjectTouch(int x1, int y1, int x2, int y2, uint32_t ms)
+{
+  injTouch.x1 = x1; injTouch.y1 = y1;
+  injTouch.x2 = x2; injTouch.y2 = y2;
+  injTouch.dur = ms ? ms : 1;
+  injTouch.start = time_get_ms();
+  injTouch.active = true;
+}
+
+static bool injectedTouchRead(lv_indev_data_t* data)
+{
+  if (!injTouch.active) return false;
+  uint32_t el = time_get_ms() - injTouch.start;
+  bool done = el >= injTouch.dur;
+  int t = done ? injTouch.dur : el;
+  data->point.x = injTouch.x1 + (injTouch.x2 - injTouch.x1) * t / (int)injTouch.dur;
+  data->point.y = injTouch.y1 + (injTouch.y2 - injTouch.y1) * t / (int)injTouch.dur;
+  data->state = done ? LV_INDEV_STATE_RELEASED : LV_INDEV_STATE_PRESSED;
+  if (done) injTouch.active = false; else reset_inactivity();
+  return true;
+}
+#endif
+
 extern "C" void touchDriverRead(lv_indev_drv_t *drv, lv_indev_data_t *data)
 {
 #if defined(HARDWARE_TOUCH)
   static lv_indev_data_t touch_data_backup;
 
+#if defined(CLI_INPUT_INJECT)
+  if (injectedTouchRead(data)) {
+    memcpy(&touch_data_backup, data, sizeof(lv_indev_data_t));
+    return;
+  }
+#endif
+
   if(!touchPanelEventOccured()) {
     memcpy(data, &touch_data_backup, sizeof(lv_indev_data_t));
     return;
@@ -264,13 +302,23 @@ extern "C" void touchDriverRead(lv_indev_drv_t *drv, lv_indev_data_t *data)
 #endif
 }
 
+#if defined(CLI_INPUT_INJECT)
+static volatile int32_t injRotary;
+
+void lvglInjectRotary(int steps) { __atomic_fetch_add(&injRotary, steps, __ATOMIC_RELAXED); }
+
+static int32_t takeInjectedRotary() { return __atomic_exchange_n(&injRotary, 0, __ATOMIC_RELAXED); }
+#else
+static int32_t takeInjectedRotary() { return 0; }
+#endif
+
 #if defined(USE_HATS_AS_KEYS)
 
 int16_t getEmuRotaryData();
 
 static void rotaryDriverRead(lv_indev_drv_t *drv, lv_indev_data_t *data)
 {
-  int16_t diff = getEmuRotaryData();
+  int16_t diff = getEmuRotaryData() + takeInjectedRotary();
 
   if(diff != 0) {
     reset_inactivity();
@@ -296,6 +344,7 @@ static void rotaryDriverRead(lv_indev_drv_t *drv, lv_indev_data_t *data)
 
   rotenc_t newPos = rotaryEncoderGetValue();
   rotenc_t diff = newPos - prevPos;
+  diff += takeInjectedRotary();
 
   data->enc_diff = (int16_t)diff;
   data->state = LV_INDEV_STATE_RELEASED;
diff --git a/radio/src/keys.cpp b/radio/src/keys.cpp
index fa796f8a176..193744104bd 100644
--- a/radio/src/keys.cpp
+++ b/radio/src/keys.cpp
@@ -19,6 +19,7 @@
  * GNU General Public License for more details.
  */
 #include "keys.h"
+#include "cli.h"
 
 #include "edgetx_helpers.h"
 #include "definitions.h"
@@ -510,6 +511,9 @@ uint8_t keysPollingCycle()
   uint32_t trims_input;
   pollKeys();
   uint32_t keys_input = readKeys();
+#if defined(CLI_INPUT_INJECT)
+  keys_input |= cliInjectedKeys();
+#endif
 
 #if defined(USE_HATS_AS_KEYS)
   transpose_trims(&keys_input);
@@ -522,6 +526,9 @@ uint8_t keysPollingCycle()
 #else
   trims_input = READ_TRIMS();
 #endif
+#if defined(CLI_INPUT_INJECT)
+  trims_input |= cliInjectedTrims();
+#endif
 
 #if !defined(BOOT) && defined(KEYS_LOCK_KEY1) && defined(KEYS_LOCK_KEY2)
   // Combo keys (from hal.h) long-pressed together toggle the key lock; killing

From 3c92a0efe5d6c7f97e4e8306f6e787b2c02dc8c1 Mon Sep 17 00:00:00 2001
From: 3djc <3djc@gh.com>
Date: Tue, 6 Oct 2026 11:17:09 +0200
Subject: [PATCH 2/2] feat(cli): file access commands (debug builds)

Add lsl, fread, fwrite, fput, rm and mkdir behind CLI_FILE_ACCESS
(CLI && DEBUG && !BOOT), so tools can read and write the SD card over
the USB VCP. fput takes raw bytes after the command line (up to 4 KB,
offset 0 truncates); fread replies in hex.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 radio/src/cli.cpp | 194 ++++++++++++++++++++++++++++++++++++++++++++++
 radio/src/cli.h   |   2 +
 2 files changed, 196 insertions(+)

diff --git a/radio/src/cli.cpp b/radio/src/cli.cpp
index be310958190..37abab70a3c 100644
--- a/radio/src/cli.cpp
+++ b/radio/src/cli.cpp
@@ -59,7 +59,13 @@
 #define CLI_COMMAND_MAX_LEN            256
 
 // CLI receive buffer size
+#if defined(CLI_FILE_ACCESS)
+// Holds one fput block (CLI_FPUT_MAX) while the SD card is busy
+#define CLI_FPUT_MAX 4096
+#define CLI_RX_BUFFER_SIZE (CLI_FPUT_MAX + 64)
+#else
 #define CLI_RX_BUFFER_SIZE 256
+#endif
 
 #define CLI_PRINT_BUFFER_SIZE 128
 
@@ -381,6 +387,186 @@ int cliLs(const char ** argv)
   return 0;
 }
 
+#if defined(CLI_FILE_ACCESS)
+#if defined(USB_SERIAL)
+void usbSerialPutc(void*, uint8_t);
+uint32_t usbSerialFreeSpace();
+#endif
+
+// The USB TX ring overwrites instead of blocking: wait until it can take `need` more bytes
+static void cliTxWait(uint32_t need)
+{
+#if defined(USB_SERIAL)
+  if (cliSendCb == usbSerialPutc) {
+    for (int i = 0; i < 1000 && usbSerialFreeSpace() < need; i++) sleep_ms(1);
+  }
+#endif
+}
+
+static const char * cliArg(const char ** argv, int index)
+{
+  return argv[index] ? argv[index] : "";
+}
+
+static bool cliUInt(const char ** argv, int index, uint32_t * val)
+{
+  const char * s = cliArg(argv, index);
+  char * end = nullptr;
+  *val = strtoul(s, &end, 0);
+  if (end == s || *end != '\0') {
+    cliSerialPrint("%s: Invalid argument \"%s\"", argv[0], s);
+    return false;
+  }
+  return true;
+}
+
+// lsl <dir>: "<d|f> <size> <name>" per entry
+int cliLsl(const char ** argv)
+{
+  FILINFO fno;
+  DIR dir;
+  FRESULT res = f_opendir(&dir, cliArg(argv, 1));
+  if (res != FR_OK) {
+    cliSerialPrint("%s: Invalid directory \"%s\"", argv[0], cliArg(argv, 1));
+    return 0;
+  }
+  for (;;) {
+    res = f_readdir(&dir, &fno);
+    if (res != FR_OK || fno.fname[0] == 0) break;
+    cliSerialPrint("%c %lu %s", (fno.fattrib & AM_DIR) ? 'd' : 'f',
+                   (unsigned long)fno.fsize, fno.fname);
+  }
+  f_closedir(&dir);
+  return 0;
+}
+
+// fread <path> <offset> <len>: one line of hex, len <= CLI_FPUT_MAX
+int cliFRead(const char ** argv)
+{
+  uint32_t offset, len;
+  if (!cliUInt(argv, 2, &offset) || !cliUInt(argv, 3, &len)) return 0;
+  if (len > CLI_FPUT_MAX) {
+    cliSerialPrint("%s: len > %d", argv[0], CLI_FPUT_MAX);
+    return 0;
+  }
+  FIL file;
+  if (f_open(&file, cliArg(argv, 1), FA_OPEN_EXISTING | FA_READ) != FR_OK) {
+    cliSerialPrint("%s: File not found \"%s\"", argv[0], cliArg(argv, 1));
+    return 0;
+  }
+  uint8_t buf[256];
+  static const char hex[] = "0123456789abcdef";
+  bool ok = f_lseek(&file, offset) == FR_OK;
+  cliTxWait(64);
+  cliSerialPrintf("OK ");
+  while (ok && len) {
+    UINT n = 0;
+    if (f_read(&file, buf, len < sizeof(buf) ? len : sizeof(buf), &n) != FR_OK || n == 0) break;
+    for (UINT i = 0; i < n; i++) {
+      if ((i & 63) == 0) cliTxWait(256);
+      cliSerialPutc(hex[buf[i] >> 4]);
+      cliSerialPutc(hex[buf[i] & 15]);
+    }
+    len -= n;
+  }
+  f_close(&file);
+  cliSerialCrlf();
+  return 0;
+}
+
+// fwrite <path> <offset> [<hex>]: offset 0 truncates the file first
+int cliFWrite(const char ** argv)
+{
+  uint32_t offset;
+  if (!cliUInt(argv, 2, &offset)) return 0;
+  const char * h = cliArg(argv, 3);
+  size_t hl = strlen(h);
+  if (hl & 1) {
+    cliSerialPrint("%s: odd hex length", argv[0]);
+    return 0;
+  }
+  uint8_t buf[CLI_COMMAND_MAX_LEN / 2];
+  size_t n = hl / 2;
+  if (n > sizeof(buf)) n = sizeof(buf);
+  for (size_t i = 0; i < n; i++) {
+    unsigned v;
+    char pair[3] = { h[2 * i], h[2 * i + 1], 0 };
+    char * end = nullptr;
+    v = strtoul(pair, &end, 16);
+    if (*end != '\0') {
+      cliSerialPrint("%s: bad hex", argv[0]);
+      return 0;
+    }
+    buf[i] = v;
+  }
+  FIL file;
+  BYTE mode = FA_WRITE | (offset == 0 ? FA_CREATE_ALWAYS : FA_OPEN_EXISTING);
+  FRESULT res = f_open(&file, cliArg(argv, 1), mode);
+  if (res == FR_OK) res = f_lseek(&file, offset);
+  UINT written = 0;
+  if (res == FR_OK && n) res = f_write(&file, buf, n, &written);
+  if (res == FR_OK) res = f_close(&file); else f_close(&file);
+  if (res != FR_OK || written != n)
+    cliSerialPrint("ERR %d", (int)res);
+  else
+    cliSerialPrint("OK %u", (unsigned)written);
+  return 0;
+}
+
+// fput <path> <offset> <len>: <len> raw bytes follow the command line; offset 0 truncates
+int cliFPut(const char ** argv)
+{
+  uint32_t offset, len;
+  if (!cliUInt(argv, 2, &offset) || !cliUInt(argv, 3, &len)) return 0;
+  if (len > CLI_FPUT_MAX) {
+    cliSerialPrint("ERR len > %d", CLI_FPUT_MAX);
+    return 0;
+  }
+  FIL file;
+  BYTE mode = FA_WRITE | (offset == 0 ? FA_CREATE_ALWAYS : FA_OPEN_EXISTING);
+  FRESULT res = f_open(&file, cliArg(argv, 1), mode);
+  bool open = res == FR_OK;
+  if (open) res = f_lseek(&file, offset);
+  uint32_t got = 0;
+  uint8_t buf[256];
+  // Always consume the whole block so a failed write does not leave data in the line parser
+  while (got < len) {
+    size_t n = xStreamBufferReceive(cliRxBuffer, buf, len - got < sizeof(buf) ? len - got : sizeof(buf),
+                                    1000 / portTICK_PERIOD_MS);
+    if (!n) break;
+    if (res == FR_OK) {
+      UINT w = 0;
+      res = f_write(&file, buf, n, &w);
+      if (res == FR_OK && w != n) res = FR_DENIED;
+    }
+    got += n;
+  }
+  if (open) {
+    FRESULT cr = f_close(&file);
+    if (res == FR_OK) res = cr;
+  }
+  if (res != FR_OK || got != len)
+    cliSerialPrint("ERR %d got %u of %u", (int)res, (unsigned)got, (unsigned)len);
+  else
+    cliSerialPrint("OK %u", (unsigned)got);
+  return 0;
+}
+
+int cliRm(const char ** argv)
+{
+  FRESULT res = f_unlink(cliArg(argv, 1));
+  if (res == FR_OK) cliSerialPrint("OK"); else cliSerialPrint("ERR %d", (int)res);
+  return 0;
+}
+
+int cliMkdir(const char ** argv)
+{
+  FRESULT res = f_mkdir(cliArg(argv, 1));
+  if (res == FR_OK) cliSerialPrint("OK"); else cliSerialPrint("ERR %d", (int)res);
+  return 0;
+}
+#endif // CLI_FILE_ACCESS
+
 int cliRead(const char ** argv)
 {
   FIL file;
@@ -2011,6 +2197,14 @@ const CliCommand cliCommands[] = {
 #endif // CLI_INPUT_INJECT
   { "beep", cliBeep, "[<frequency>] [<duration>]" },
   { "ls", cliLs, "<directory>" },
+#if defined(CLI_FILE_ACCESS)
+  { "lsl", cliLsl, "<directory>" },
+  { "fread", cliFRead, "<path> <offset> <len>" },
+  { "fwrite", cliFWrite, "<path> <offset> [<hex>]" },
+  { "fput", cliFPut, "<path> <offset> <len> (then <len> raw bytes)" },
+  { "rm", cliRm, "<path>" },
+  { "mkdir", cliMkdir, "<path>" },
+#endif
   { "read", cliRead, "<filename>" },
   { "readsd", cliReadSD, "<start sector> <sectors count> <read buffer size (sectors)>" },
   { "testsd", cliTestSD, "" },
diff --git a/radio/src/cli.h b/radio/src/cli.h
index 98746a05db5..806dd069fe1 100644
--- a/radio/src/cli.h
+++ b/radio/src/cli.h
@@ -29,6 +29,8 @@ void cliStart();
 // Input injection commands (key, trim, touch, rotary) are debug-only
 #if defined(CLI) && defined(DEBUG) && !defined(BOOT)
 #define CLI_INPUT_INJECT
+// File access commands (lsl, fread, fwrite, rm, mkdir) are debug-only too
+#define CLI_FILE_ACCESS
 #endif
 
 #if defined(CLI_INPUT_INJECT)