From e79acab8f7577f647b895471c0eee6c99f00876e Mon Sep 17 00:00:00 2001
From: cepetr <petr@cerninovi.cz>
Date: Tue, 28 Jan 2025 11:58:34 +0100
Subject: [PATCH] fixup! feat(prodtest): refactor and improve prodtest

---
 .../prodtest/cmd/prodtest_boardloader.c       |  3 +-
 .../prodtest/cmd/prodtest_bootloader.c        |  3 +-
 .../projects/prodtest/cmd/prodtest_button.c   |  8 +-
 .../projects/prodtest/cmd/prodtest_display.c  | 15 +--
 .../prodtest/cmd/prodtest_get_cpuid.c         |  3 +-
 .../projects/prodtest/cmd/prodtest_haptic.c   |  5 +-
 .../projects/prodtest/cmd/prodtest_help.c     |  5 +-
 .../projects/prodtest/cmd/prodtest_optiga.c   | 37 ++++---
 .../prodtest/cmd/prodtest_otp_batch.c         | 12 ++-
 .../prodtest/cmd/prodtest_otp_variant.c       |  8 +-
 .../projects/prodtest/cmd/prodtest_ping.c     |  3 +-
 .../projects/prodtest/cmd/prodtest_pmic.c     | 26 +++--
 .../projects/prodtest/cmd/prodtest_powerctl.c |  3 +-
 .../projects/prodtest/cmd/prodtest_prodtest.c |  9 +-
 .../projects/prodtest/cmd/prodtest_reboot.c   |  3 +-
 .../projects/prodtest/cmd/prodtest_rgbled.c   |  9 +-
 .../projects/prodtest/cmd/prodtest_sbu.c      |  7 +-
 .../projects/prodtest/cmd/prodtest_sdcard.c   |  3 +-
 .../projects/prodtest/cmd/prodtest_touch.c    | 38 ++++---
 .../projects/prodtest/cmd/prodtest_wpc.c      | 28 ++++--
 core/embed/rtl/cli.c                          | 98 +++++++++++++++----
 core/embed/rtl/inc/rtl/cli.h                  | 36 +++++--
 22 files changed, 249 insertions(+), 113 deletions(-)

diff --git a/core/embed/projects/prodtest/cmd/prodtest_boardloader.c b/core/embed/projects/prodtest/cmd/prodtest_boardloader.c
index f228ef87e9c..dd5f913c662 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_boardloader.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_boardloader.c
@@ -40,5 +40,6 @@ static void prodtest_boardloader_version(cli_t* cli) {
 PRODTEST_CLI_CMD(
   .name = "boardloader-version", 
   .func = prodtest_boardloader_version,
-  .info = "Retrieve the boardloader version"
+  .info = "Retrieve the boardloader version",
+  .args = ""
 );
diff --git a/core/embed/projects/prodtest/cmd/prodtest_bootloader.c b/core/embed/projects/prodtest/cmd/prodtest_bootloader.c
index a27aabca20d..e967d475870 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_bootloader.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_bootloader.c
@@ -56,5 +56,6 @@ static void prodtest_bootloader_version(cli_t *cli) {
 PRODTEST_CLI_CMD(
   .name = "bootloader-version", 
   .func = prodtest_bootloader_version,
-  .info = "Retrieve the bootloader version"
+  .info = "Retrieve the bootloader version",
+  .args = ""
 );
diff --git a/core/embed/projects/prodtest/cmd/prodtest_button.c b/core/embed/projects/prodtest/cmd/prodtest_button.c
index edff1740b5d..f520799062a 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_button.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_button.c
@@ -97,7 +97,7 @@ static void test_button_combination(cli_t* cli, uint32_t timeout, button_t btn1,
 }
 
 static void prodtest_button_test(cli_t* cli) {
-  const char* button = cli_arg(cli, 0);
+  const char* button = cli_arg(cli, "button");
   int btn1 = -1;
   int btn2 = -1;
 
@@ -113,11 +113,12 @@ static void prodtest_button_test(cli_t* cli) {
   } else {
     cli_error_arg(cli,
                   "Expecting button name - left, right, left+right or power.");
+    return;
   }
 
   uint32_t timeout = 0;
 
-  if (!cli_arg_uint32(cli, 1, &timeout)) {
+  if (!cli_arg_uint32(cli, "timeout", &timeout)) {
     cli_error_arg(cli, "Expecting timeout in milliseconds.");
     return;
   }
@@ -139,7 +140,8 @@ static void prodtest_button_test(cli_t* cli) {
 PRODTEST_CLI_CMD(
   .name = "button-test", 
   .func = prodtest_button_test,
-  .info = "Test the hardware buttons"
+  .info = "Test the hardware buttons",
+  .args = "<button> <timeout>"
 );
 
 #endif  // USE_BUTTON
diff --git a/core/embed/projects/prodtest/cmd/prodtest_display.c b/core/embed/projects/prodtest/cmd/prodtest_display.c
index 503e3dc3bfc..d56ab3044b8 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_display.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_display.c
@@ -47,7 +47,7 @@ static void prodtest_display_border(cli_t* cli) {
 static void prodtest_display_bars(cli_t* cli) {
   gfx_clear();
 
-  const char* colors = cli_arg(cli, 0);
+  const char* colors = cli_arg(cli, "colors");
   size_t color_count = strlen(colors);
 
   if (cli_arg_count(cli) > 1) {
@@ -90,7 +90,7 @@ static void prodtest_display_bars(cli_t* cli) {
   }
 
   if (strlen(colors) == 0 || invalid_color) {
-    cli_trace(cli, "Expecting valid color pattern (RGBW characters).");
+    cli_trace(cli, "Not valid color pattern (RGBW characters expected).");
   }
 
   display_refresh();
@@ -101,7 +101,7 @@ static void prodtest_display_bars(cli_t* cli) {
 static void prodtest_display_set_backlight(cli_t* cli) {
   uint32_t level = 0;
 
-  if (!cli_arg_uint32(cli, 0, &level) || level > 255) {
+  if (!cli_arg_uint32(cli, "level", &level) || level > 255) {
     cli_error_arg(cli, "Expecting backlig level in range 0-255 (100%%).");
     return;
   }
@@ -122,17 +122,20 @@ static void prodtest_display_set_backlight(cli_t* cli) {
 PRODTEST_CLI_CMD(
   .name = "display-border", 
   .func = prodtest_display_border,
-  .info = "Display a border around the screen"
+  .info = "Display a border around the screen",
+  .args = ""
 );
 
 PRODTEST_CLI_CMD(
   .name = "display-bars", 
   .func = prodtest_display_bars,
-  .info = "Display vertical bars in different colors"
+  .info = "Display vertical bars in different colors",
+  .args = "<colors>"
 );
 
 PRODTEST_CLI_CMD(
   .name = "display-set-backlight", 
   .func = prodtest_display_set_backlight,
-  .info = "Set the display backlight level"
+  .info = "Set the display backlight level",
+  .args = "<level>"
 );
diff --git a/core/embed/projects/prodtest/cmd/prodtest_get_cpuid.c b/core/embed/projects/prodtest/cmd/prodtest_get_cpuid.c
index 07deaae31ba..570307da533 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_get_cpuid.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_get_cpuid.c
@@ -51,7 +51,8 @@ static void prodtest_get_cpuid(cli_t* cli) {
 PRODTEST_CLI_CMD(
   .name = "get-cpuid", 
   .func = prodtest_get_cpuid,
-  .info = "Retrieve unique CPU ID"
+  .info = "Retrieve unique CPU ID",
+  .args = ""
 );
 
 
diff --git a/core/embed/projects/prodtest/cmd/prodtest_haptic.c b/core/embed/projects/prodtest/cmd/prodtest_haptic.c
index 37be398d3b0..6a75ae27c6e 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_haptic.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_haptic.c
@@ -27,7 +27,7 @@
 static void prodtest_haptic_test(cli_t* cli) {
   uint32_t duration = 0;  // ms
 
-  if (!cli_arg_uint32(cli, 0, &duration) || duration > 5000) {
+  if (!cli_arg_uint32(cli, "duration", &duration) || duration > 5000) {
     cli_error_arg(cli, "Expecting time in milliseconds in range 0-5000.");
     return;
   }
@@ -59,7 +59,8 @@ static void prodtest_haptic_test(cli_t* cli) {
 PRODTEST_CLI_CMD(
   .name = "haptic-test", 
   .func = prodtest_haptic_test,
-  .info = "Test the haptic feedback actuator"
+  .info = "Test the haptic feedback actuator",
+  .args = "<duration>"
 );
 
 #endif  // USE_HAPTIC
diff --git a/core/embed/projects/prodtest/cmd/prodtest_help.c b/core/embed/projects/prodtest/cmd/prodtest_help.c
index ebf2ce44601..02f4a45540a 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_help.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_help.c
@@ -22,7 +22,7 @@
 #include <rtl/cli.h>
 
 static void prodtest_help(cli_t* cli) {
-  const char* prefix = cli_arg(cli, 0);
+  const char* prefix = cli_arg(cli, "prefix");
   size_t prefix_len = strlen(prefix);
 
   if (cli_arg_count(cli) > 1) {
@@ -56,5 +56,6 @@ static void prodtest_help(cli_t* cli) {
 PRODTEST_CLI_CMD(
   .name = "help",
   .func = prodtest_help,
-  .info = "Dsiplay the list of available commands"
+  .info = "Dsiplay the list of available commands",
+  .args = "[<prefix>]"
 );
diff --git a/core/embed/projects/prodtest/cmd/prodtest_optiga.c b/core/embed/projects/prodtest/cmd/prodtest_optiga.c
index 78223a13e46..597d99ebb98 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_optiga.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_optiga.c
@@ -443,7 +443,7 @@ static void cert_write(cli_t* cli, uint16_t oid) {
   size_t len = 0;
   uint8_t data_bytes[OPTIGA_MAX_CERT_SIZE];
 
-  if (!cli_arg_hex(cli, 0, data_bytes, sizeof(data_bytes), &len)) {
+  if (!cli_arg_hex(cli, "hex-data", data_bytes, sizeof(data_bytes), &len)) {
     if (len == sizeof(data_bytes)) {
       cli_error(cli, CLI_ERROR, "Certificate too long.");
     } else {
@@ -544,7 +544,7 @@ static void prodtest_optiga_keyfido_write(cli_t* cli) {
   uint8_t data_bytes[EXPECTED_SIZE];
   size_t len = 0;
 
-  if (!cli_arg_hex(cli, 0, data_bytes, sizeof(data_bytes), &len)) {
+  if (!cli_arg_hex(cli, "hex-data", data_bytes, sizeof(data_bytes), &len)) {
     if (len == sizeof(data_bytes)) {
       cli_error(cli, CLI_ERROR, "Key too long.");
     } else {
@@ -956,67 +956,78 @@ static void prodtest_optiga_keyfido_read(cli_t* cli) {
 PRODTEST_CLI_CMD(
   .name = "optiga-id-read", 
   .func = prodtest_optiga_id_read,
-  .info = "Retrieve the unique ID of the Optiga chip"
+  .info = "Retrieve the unique ID of the Optiga chip",
+  .args = ""
 );
 
 PRODTEST_CLI_CMD(
   .name = "optiga-certinf-read", 
   .func = prodtest_optiga_certinf_read,
-  .info = "Read the X.509 certificate issued by Infineon"
+  .info = "Read the X.509 certificate issued by Infineon",
+  .args = ""
 );
 
 PRODTEST_CLI_CMD(
   .name = "optiga-certdev-read", 
   .func = prodtest_optiga_certdev_read,
-  .info = "Read the device's X.509 certificate"
+  .info = "Read the device's X.509 certificate",
+  .args = ""
 );
 
 PRODTEST_CLI_CMD(
   .name = "optiga-certdev-write", 
   .func = prodtest_optiga_certdev_write,
-  .info = "Write the device's X.509 certificate"
+  .info = "Write the device's X.509 certificate",
+  .args = "<hex-data>"
 );
 
 PRODTEST_CLI_CMD(
   .name = "optiga-certfido-read", 
   .func = prodtest_optiga_certfido_read,
-  .info = "Read the X.509 certificate for the FIDO key"
+  .info = "Read the X.509 certificate for the FIDO key",
+  .args = ""
 );
 
 PRODTEST_CLI_CMD(
   .name = "optiga-certfido-write", 
   .func = prodtest_optiga_certfido_write,
-  .info = "Write the X.509 certificate for the FIDO key"
+  .info = "Write the X.509 certificate for the FIDO key",
+  .args = "<hex-data>"
 );
 
 PRODTEST_CLI_CMD(
   .name = "optiga-keyfido-read", 
   .func = prodtest_optiga_keyfido_read,
-  .info = "Read the x-coordinate of the FIDO public key."
+  .info = "Read the x-coordinate of the FIDO public key.",
+  .args = ""
 );
 
 PRODTEST_CLI_CMD(
   .name = "optiga-keyfido-write", 
   .func = prodtest_optiga_keyfido_write,
-  .info = "Write the FIDO private key"
+  .info = "Write the FIDO private key",
+  .args = "<hex-data>"
 );
 
 PRODTEST_CLI_CMD(
   .name = "optiga-lock", 
   .func = prodtest_optiga_lock,
-  .info = "Lock Optiga's data objects containing provisioning data"
+  .info = "Lock Optiga's data objects containing provisioning data",
+  .args = ""
 );
 
 PRODTEST_CLI_CMD(
   .name = "optiga-lock-check", 
   .func = prodtest_optiga_lock_check,
-  .info = "Check whether Optiga's data objects are locked"
+  .info = "Check whether Optiga's data objects are locked",
+  .args = ""
 );
 
 PRODTEST_CLI_CMD(
   .name = "optiga-counter-read", 
   .func = prodtest_optiga_counter_read,
-  .info = "Read the Optiga security event counter"
+  .info = "Read the Optiga security event counter",
+  .args = "" 
 );
 
 #endif  // USE_OPTIGA
diff --git a/core/embed/projects/prodtest/cmd/prodtest_otp_batch.c b/core/embed/projects/prodtest/cmd/prodtest_otp_batch.c
index befc49e6d73..ab2373afc0b 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_otp_batch.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_otp_batch.c
@@ -64,7 +64,7 @@ static void prodtest_otp_batch_read(cli_t* cli) {
 }
 
 static void prodtest_otp_batch_write(cli_t* cli) {
-  const char* data = cli_arg(cli, 0);
+  const char* data = cli_arg(cli, "text");
 
   if (strlen(data) == 0 || strlen(data) > FLASH_OTP_BLOCK_SIZE - 1) {
     cli_error_arg(cli, "Expecting text (up to 31 characters).");
@@ -77,8 +77,8 @@ static void prodtest_otp_batch_write(cli_t* cli) {
   bool dry_run = true;
 #endif
 
-  if (cli_is_arg(cli, 1)) {
-    const char* option = cli_arg(cli, 1);
+  if (cli_has_nth_arg(cli, 1)) {
+    const char* option = cli_nth_arg(cli, 1);
     if (strcmp(option, "--execute") == 0) {
       dry_run = false;
     } else if (strcmp(option, "--dry-run") == 0) {
@@ -145,11 +145,13 @@ static void prodtest_otp_batch_write(cli_t* cli) {
 PRODTEST_CLI_CMD(
   .name = "otp-batch-read", 
   .func = prodtest_otp_batch_read,
-  .info = "Read the device batch info from OTP memory"
+  .info = "Read the device batch info from OTP memory",
+  .args = ""
 );
 
 PRODTEST_CLI_CMD(
   .name = "otp-batch-write", 
   .func = prodtest_otp_batch_write,
-  .info = "Write the device batch info into OTP memory"
+  .info = "Write the device batch info into OTP memory",
+  .args = "<text> [--execute | --dry-run]"
 );
diff --git a/core/embed/projects/prodtest/cmd/prodtest_otp_variant.c b/core/embed/projects/prodtest/cmd/prodtest_otp_variant.c
index bc643b7526c..a6b83f06890 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_otp_variant.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_otp_variant.c
@@ -81,7 +81,7 @@ static void prodtest_otp_variant_write(cli_t* cli) {
   block[val_count++] = 0x01;  // Always 1
 
   while (arg_idx < cli_arg_count(cli)) {
-    const char* arg = cli_arg(cli, arg_idx++);
+    const char* arg = cli_nth_arg(cli, arg_idx++);
     uint32_t val = 0;
 
     if (strcmp(arg, "--execute") == 0) {
@@ -167,11 +167,13 @@ static void prodtest_otp_variant_write(cli_t* cli) {
 PRODTEST_CLI_CMD(
   .name = "otp-variant-read", 
   .func = prodtest_otp_variant_read,
-  .info = "Read the device variant info from OTP memory"
+  .info = "Read the device variant info from OTP memory",
+  .args = ""  
 );
 
 PRODTEST_CLI_CMD(
   .name = "otp-variant-write", 
   .func = prodtest_otp_variant_write,
-  .info = "Write the device variant info into OTP memory"
+  .info = "Write the device variant info into OTP memory",
+  .args = "<values...> [--execute | --dry-run]"
 );
diff --git a/core/embed/projects/prodtest/cmd/prodtest_ping.c b/core/embed/projects/prodtest/cmd/prodtest_ping.c
index f9d18bd96a6..3c9f2b1f864 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_ping.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_ping.c
@@ -36,5 +36,6 @@ static void prodtest_ping(cli_t* cli) {
 PRODTEST_CLI_CMD(
   .name = "ping", 
   .func = prodtest_ping,
-  .info = "Send a ping to the device"
+  .info = "Send a ping to the device",
+  .args = ""
 );
diff --git a/core/embed/projects/prodtest/cmd/prodtest_pmic.c b/core/embed/projects/prodtest/cmd/prodtest_pmic.c
index 9642b7ecfa4..6f6f9a2ba44 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_pmic.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_pmic.c
@@ -81,7 +81,7 @@ static void prodtest_pmic_charge_disable(cli_t* cli) {
 static void prodtest_pmic_charge_set_limit(cli_t* cli) {
   uint32_t i_charge = 0;
 
-  if (!cli_arg_uint32(cli, 0, &i_charge) ||
+  if (!cli_arg_uint32(cli, "limit", &i_charge) ||
       i_charge < NPM1300_CHARGING_LIMIT_MIN ||
       i_charge > NPM1300_CHARGING_LIMIT_MAX) {
     cli_error_arg(cli, "Expecting charging limit in range %d-%d mA.",
@@ -107,7 +107,7 @@ static void prodtest_pmic_charge_set_limit(cli_t* cli) {
 static void prodtest_pmic_buck_set_mode(cli_t* cli) {
   npm1300_buck_mode_t buck_mode = NPM1300_BUCK_MODE_AUTO;
 
-  const char* mode = cli_arg(cli, 0);
+  const char* mode = cli_arg(cli, "mode");
   if (strcmp(mode, "pwm") == 0) {
     buck_mode = NPM1300_BUCK_MODE_PWM;
   } else if (strcmp(mode, "pfm") == 0) {
@@ -138,12 +138,12 @@ static void prodtest_pmic_report(cli_t* cli) {
   uint32_t count = 1;
   uint32_t period = 1000;
 
-  if (cli_is_arg(cli, 0) && !cli_arg_uint32(cli, 0, &count)) {
+  if (cli_has_arg(cli, "count") && !cli_arg_uint32(cli, "count", &count)) {
     cli_error_arg(cli, "Expecting count of measurements.");
     return;
   }
 
-  if (cli_is_arg(cli, 1) && !cli_arg_uint32(cli, 1, &period)) {
+  if (cli_has_arg(cli, "period") && !cli_arg_uint32(cli, "period", &period)) {
     cli_error_arg(cli, "Expecting period in milliseconds.");
     return;
   }
@@ -203,37 +203,43 @@ static void prodtest_pmic_report(cli_t* cli) {
 PRODTEST_CLI_CMD(
   .name = "pmic-init", 
   .func = prodtest_pmic_init,
-  .info = "Initialize the PMIC driver"
+  .info = "Initialize the PMIC driver",
+  .args = ""
 );
 
 PRODTEST_CLI_CMD(
   .name = "pmic-charge-enable", 
   .func = prodtest_pmic_charge_enable,
-  .info = "Enable battery charging"
+  .info = "Enable battery charging",
+  .args = ""
 );
 
 PRODTEST_CLI_CMD(
   .name = "pmic-charge-disable", 
   .func = prodtest_pmic_charge_disable,
-  .info = "Disable battery charging"
+  .info = "Disable battery charging",
+  .args = ""
 );
 
 PRODTEST_CLI_CMD(
   .name = "pmic-charge-set-limit", 
   .func = prodtest_pmic_charge_set_limit,
-  .info = "Set the battery charging limit"
+  .info = "Set the battery charging limit",
+  .args = "<limit>"
 );
 
 PRODTEST_CLI_CMD(
   .name = "pmic-buck-set-mode", 
   .func = prodtest_pmic_buck_set_mode,
-  .info = "Set the buck converter mode"
+  .info = "Set the buck converter mode",
+  .args = "<mode>"
 )
 
 PRODTEST_CLI_CMD(
   .name = "pmic-report", 
   .func = prodtest_pmic_report,
-  .info = "Retrieve PMIC report"
+  .info = "Retrieve PMIC report",
+  .args = "[<count>] [<period>]"
 );
 
 #endif  // USE_POWERCTL
diff --git a/core/embed/projects/prodtest/cmd/prodtest_powerctl.c b/core/embed/projects/prodtest/cmd/prodtest_powerctl.c
index 85737d1012b..c5f63bda685 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_powerctl.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_powerctl.c
@@ -48,7 +48,8 @@ static void prodtest_powerctl_suspend(cli_t* cli) {
 PRODTEST_CLI_CMD(
   .name = "powerctl-suspend", 
   .func = prodtest_powerctl_suspend,
-  .info = "Suspend the device to low-power mode"
+  .info = "Suspend the device to low-power mode",
+  .args = ""
 );
 
 #endif  // USE_POWERCTL
diff --git a/core/embed/projects/prodtest/cmd/prodtest_prodtest.c b/core/embed/projects/prodtest/cmd/prodtest_prodtest.c
index f8ab24732fb..a1a21c7c858 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_prodtest.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_prodtest.c
@@ -76,17 +76,20 @@ static void prodtest_prodtest_wipe(cli_t* cli) {
 PRODTEST_CLI_CMD(
   .name = "$intro",
   .func = prodtest_prodtest_intro,
-  .info = ""
+  .info = "",
+  .args = "",
 );
 
 PRODTEST_CLI_CMD(
   .name = "prodtest-version",
   .func = prodtest_prodtest_version,
-  .info = "Retrieve the production test firmware version"
+  .info = "Retrieve the production test firmware version",
+  .args = ""
 );
 
 PRODTEST_CLI_CMD(
   .name = "prodtest-wipe",
   .func = prodtest_prodtest_wipe,
-  .info = "Wipe the production test firmware"
+  .info = "Wipe the production test firmware",
+  .args = ""
 );
\ No newline at end of file
diff --git a/core/embed/projects/prodtest/cmd/prodtest_reboot.c b/core/embed/projects/prodtest/cmd/prodtest_reboot.c
index e024b9cddcd..da47cc9aca4 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_reboot.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_reboot.c
@@ -41,7 +41,8 @@ static void prodtest_reboot(cli_t* cli) {
 PRODTEST_CLI_CMD(
   .name = "reboot", 
   .func = prodtest_reboot,
-  .info = "Reboot the device"
+  .info = "Reboot the device",
+  .args = ""
 );
 
 
diff --git a/core/embed/projects/prodtest/cmd/prodtest_rgbled.c b/core/embed/projects/prodtest/cmd/prodtest_rgbled.c
index e8fde677d8b..b0170d36669 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_rgbled.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_rgbled.c
@@ -29,17 +29,17 @@ static void prodtest_rgbled_set(cli_t* cli) {
   uint32_t g = 0;
   uint32_t b = 0;
 
-  if (!cli_arg_uint32(cli, 0, &r) || r > 255) {
+  if (!cli_arg_uint32(cli, "r", &r) || r > 255) {
     cli_error_arg(cli, "Expecting red value in range 0-255.");
     return;
   }
 
-  if (!cli_arg_uint32(cli, 1, &g) || g > 255) {
+  if (!cli_arg_uint32(cli, "g", &g) || g > 255) {
     cli_error_arg(cli, "Expecting green value in range 0-255.");
     return;
   }
 
-  if (!cli_arg_uint32(cli, 2, &b) || b > 255) {
+  if (!cli_arg_uint32(cli, "b", &b) || b > 255) {
     cli_error_arg(cli, "Expecting blue value in range 0-255.");
     return;
   }
@@ -63,7 +63,8 @@ static void prodtest_rgbled_set(cli_t* cli) {
 PRODTEST_CLI_CMD(
   .name = "rgbled-set", 
   .func = prodtest_rgbled_set,
-  .info = "Set the RGB LED color"
+  .info = "Set the RGB LED color",
+  .args = "<r> <g> <b>"
 );
 
 #endif  // USE_RGB_LED
diff --git a/core/embed/projects/prodtest/cmd/prodtest_sbu.c b/core/embed/projects/prodtest/cmd/prodtest_sbu.c
index 9b22414eaa5..e49dddcd7e7 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_sbu.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_sbu.c
@@ -26,12 +26,12 @@ static void prodtest_sbu_set(cli_t* cli) {
   uint32_t sbu1 = 0;
   uint32_t sbu2 = 0;
 
-  if (!cli_arg_uint32(cli, 0, &sbu1) || sbu1 > 1) {
+  if (!cli_arg_uint32(cli, "sbu1", &sbu1) || sbu1 > 1) {
     cli_error_arg(cli, "Expecting logical level (0 or 1).");
     return;
   }
 
-  if (!cli_arg_uint32(cli, 1, &sbu2) || sbu2 > 1) {
+  if (!cli_arg_uint32(cli, "sbu2", &sbu2) || sbu2 > 1) {
     cli_error_arg(cli, "Expecting logical level (0 or 1).");
     return;
   }
@@ -52,5 +52,6 @@ static void prodtest_sbu_set(cli_t* cli) {
 PRODTEST_CLI_CMD(
   .name = "sbu-set", 
   .func = prodtest_sbu_set,
-  .info = "Set the SBU pins' levels"
+  .info = "Set the SBU pins' levels",
+  .args = "<sbu1> <sbu2>"
 );
diff --git a/core/embed/projects/prodtest/cmd/prodtest_sdcard.c b/core/embed/projects/prodtest/cmd/prodtest_sdcard.c
index 64e495df4d9..a5fa2334e8a 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_sdcard.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_sdcard.c
@@ -99,7 +99,8 @@ static void prodtest_sdcard_test(cli_t* cli) {
 PRODTEST_CLI_CMD(
   .name = "sdcard-test", 
   .func = prodtest_sdcard_test,
-  .info = "Test the SD card interface"
+  .info = "Test the SD card interface",
+  .args = ""
 );
 
 #endif  // USE_SD_CARD
diff --git a/core/embed/projects/prodtest/cmd/prodtest_touch.c b/core/embed/projects/prodtest/cmd/prodtest_touch.c
index 9397d8d9c79..e00b7be21dc 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_touch.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_touch.c
@@ -91,12 +91,12 @@ static void prodtest_touch_test(cli_t* cli) {
   uint32_t position = 0;
   uint32_t timeout = 0;
 
-  if (!cli_arg_uint32(cli, 0, &position)) {
+  if (!cli_arg_uint32(cli, "position", &position)) {
     cli_error_arg(cli, "Expecting position (0, 1, 2 or 3).");
     return;
   }
 
-  if (!cli_arg_uint32(cli, 1, &timeout)) {
+  if (!cli_arg_uint32(cli, "timeout", &timeout)) {
     cli_error_arg(cli, "Expecting timeout in milliseconds.");
     return;
   }
@@ -155,27 +155,27 @@ static void prodtest_touch_test_custom(cli_t* cli) {
   uint32_t height = 0;
   uint32_t timeout = 0;
 
-  if (!cli_arg_uint32(cli, 0, &x)) {
+  if (!cli_arg_uint32(cli, "x", &x)) {
     cli_error_arg(cli, "Expecting x coordinate.");
     return;
   }
 
-  if (!cli_arg_uint32(cli, 1, &y)) {
+  if (!cli_arg_uint32(cli, "y", &y)) {
     cli_error_arg(cli, "Expecting y coordinate.");
     return;
   }
 
-  if (!cli_arg_uint32(cli, 2, &width)) {
+  if (!cli_arg_uint32(cli, "width", &width)) {
     cli_error_arg(cli, "Expecting rectangle width.");
     return;
   }
 
-  if (!cli_arg_uint32(cli, 3, &height)) {
+  if (!cli_arg_uint32(cli, "height", &height)) {
     cli_error_arg(cli, "Expecting rectangle height.");
     return;
   }
 
-  if (!cli_arg_uint32(cli, 4, &timeout)) {
+  if (!cli_arg_uint32(cli, "timeout", &timeout)) {
     cli_error_arg(cli, "Expecting timeout in milliseconds.");
     return;
   }
@@ -239,7 +239,7 @@ static void prodtest_touch_test_custom(cli_t* cli) {
 static void prodtest_touch_test_idle(cli_t* cli) {
   uint32_t timeout = 0;
 
-  if (!cli_arg_uint32(cli, 0, &timeout)) {
+  if (!cli_arg_uint32(cli, "timeout", &timeout)) {
     cli_error_arg(cli, "Expecting timeout in milliseconds.");
     return;
   }
@@ -287,7 +287,7 @@ static void prodtest_touch_test_idle(cli_t* cli) {
 static void prodtest_touch_test_power(cli_t* cli) {
   uint32_t timeout = 0;
 
-  if (!cli_arg_uint32(cli, 0, &timeout)) {
+  if (!cli_arg_uint32(cli, "timeout", &timeout)) {
     cli_error_arg(cli, "Expecting timeout in milliseconds.");
     return;
   }
@@ -325,7 +325,7 @@ static void prodtest_touch_test_power(cli_t* cli) {
 static void prodtest_touch_test_sensitivity(cli_t* cli) {
   uint32_t sensitivity = 0;
 
-  if (!cli_arg_uint32(cli, 0, &sensitivity) || sensitivity > 255) {
+  if (!cli_arg_uint32(cli, "sensitivity", &sensitivity) || sensitivity > 255) {
     cli_error_arg(cli, "Expecting sensitivity level in range 0-255.");
     return;
   }
@@ -376,37 +376,43 @@ static void prodtest_touch_test_sensitivity(cli_t* cli) {
 PRODTEST_CLI_CMD(
   .name = "touch-version", 
   .func = prodtest_touch_version,
-  .info = "Retrieve the touch controller version"
+  .info = "Retrieve the touch controller version",
+  .args = ""
 );
 
 PRODTEST_CLI_CMD(
   .name = "touch-test", 
   .func = prodtest_touch_test,
-  .info = "Test the touch controller"
+  .info = "Test the touch controller",
+  .args = "<position> <timeout>"
 );
 
 PRODTEST_CLI_CMD(
   .name = "touch-test-custom", 
   .func = prodtest_touch_test_custom,
-  .info = "Test the touch controller with custom parameters"
+  .info = "Test the touch controller with custom parameters",
+  .args = "<x> <y> <width> <height> <timeout>"
 );
 
 PRODTEST_CLI_CMD(
   .name = "touch-test-idle", 
   .func = prodtest_touch_test_idle,
-  .info = "Test the touch controller in idle mode"
+  .info = "Test the touch controller in idle mode",
+  .args = "<timeout>"
 );
 
 PRODTEST_CLI_CMD(
   .name = "touch-test-power", 
   .func = prodtest_touch_test_power,
-  .info = "Test the touch controller's power consumption"
+  .info = "Test the touch controller's power consumption",
+  .args = "<timeout>"
 )
 
 PRODTEST_CLI_CMD(
   .name = "touch-test-sensitivity", 
   .func = prodtest_touch_test_sensitivity,
-  .info = "Test the touch controller sensitivity"
+  .info = "Test the touch controller sensitivity",
+  .args = "<sensitivity>"
 )
 
 #endif  // USE_TOUCH
diff --git a/core/embed/projects/prodtest/cmd/prodtest_wpc.c b/core/embed/projects/prodtest/cmd/prodtest_wpc.c
index bfdee6cb557..271c42fa124 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_wpc.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_wpc.c
@@ -113,12 +113,12 @@ static void prodtest_wpc_report(cli_t* cli) {
   uint32_t count = 1;
   uint32_t period = 1000;
 
-  if (cli_is_arg(cli, 0) && !cli_arg_uint32(cli, 0, &count)) {
+  if (cli_has_arg(cli, "count") && !cli_arg_uint32(cli, "count", &count)) {
     cli_error_arg(cli, "Expecting count of measurements.");
     return;
   }
 
-  if (cli_is_arg(cli, 1) && !cli_arg_uint32(cli, 1, &period)) {
+  if (cli_has_arg(cli, "timeout") && !cli_arg_uint32(cli, "timeout", &period)) {
     cli_error_arg(cli, "Expecting period in milliseconds.");
     return;
   }
@@ -233,49 +233,57 @@ static void prodtest_wpc_update(cli_t* cli) {
 PRODTEST_CLI_CMD(
   .name = "wpc-init", 
   .func = prodtest_wpc_init,
-  .info = "Initialize the WPC driver"
+  .info = "Initialize the WPC driver",
+  .args = ""
 );
 
 PRODTEST_CLI_CMD(
   .name = "wpc-enable", 
   .func = prodtest_wpc_enable,
-  .info = "Enable the WPC chip"
+  .info = "Enable the WPC chip",
+  .args = ""
 );
 
 PRODTEST_CLI_CMD(
   .name = "wpc-disable", 
   .func = prodtest_wpc_disable,
-  .info = "Disable the WPC chip"
+  .info = "Disable the WPC chip",
+  .args = ""
 );
 
 PRODTEST_CLI_CMD(
   .name = "wpc-out-enable", 
   .func = prodtest_wpc_vout_enable,
-  .info = "Enable WPC output"
+  .info = "Enable WPC output",
+  .args = ""
 );
 
 PRODTEST_CLI_CMD(
   .name = "wpc-out-disable", 
   .func = prodtest_wpc_vout_disable,
-  .info = "Disable WPC output"
+  .info = "Disable WPC output",
+  .args = ""
 );
 
 PRODTEST_CLI_CMD(
   .name = "wpc-report", 
   .func = prodtest_wpc_report,
-  .info = "Retrieve WPC report"
+  .info = "Retrieve WPC report",
+  .args = "[<count>] [<timeout>]"
 );
 
 PRODTEST_CLI_CMD(
   .name = "wpc-info", 
   .func = prodtest_wpc_info,
-  .info = "Retrieve WPC chip information"
+  .info = "Retrieve WPC chip information",
+  .args = ""
 );
 
 PRODTEST_CLI_CMD(
   .name = "wpc-update", 
   .func = prodtest_wpc_update,
-  .info = "Update WPC firmware & configuration"
+  .info = "Update WPC firmware & configuration",
+  .args = ""
 );
 
 #endif // USE_POWERCTL
diff --git a/core/embed/rtl/cli.c b/core/embed/rtl/cli.c
index bbd3a74bc62..8a510cd5fc1 100644
--- a/core/embed/rtl/cli.c
+++ b/core/embed/rtl/cli.c
@@ -153,6 +153,15 @@ void cli_error(cli_t* cli, const char* code, const char* format, ...) {
 }
 
 void cli_error_arg(cli_t* cli, const char* format, ...) {
+  if (cli->interactive && cli->current_cmd != NULL) {
+    const cli_command_t* cmd = cli->current_cmd;
+    if (cmd->args != NULL) {
+      cli_trace(cli, "USAGE: %s %s", cmd->name, cmd->args);
+    } else {
+      cli_trace(cli, "USAGE: %s", cmd->name);
+    }
+  }
+
   va_list args;
   va_start(args, format);
   cli_verror(cli, CLI_ERROR_INVALID_ARG, format, args);
@@ -508,7 +517,7 @@ static const char* cstr_token(char** str) {
 static bool cli_split_args(cli_t* cli) {
   char* buf = cli->line_buffer;
 
-  cli->cmd = cstr_token(&buf);
+  cli->cmd_name = cstr_token(&buf);
   cli->args_count = 0;
 
   while (*buf != '\0' && cli->args_count < CLI_MAX_ARGS) {
@@ -550,14 +559,14 @@ void cli_run_loop(cli_t* cli) {
     }
 
     // Empty line?
-    if (*cli->cmd == '\0') {
+    if (*cli->cmd_name == '\0') {
       // Switch to interactive mode if two empty lines are entered
       if (++cli->empty_lines >= 2 && !cli->interactive) {
         cli->interactive = true;
         // Print the welcome message
-        const cli_command_t* rec = cli_find_command(cli, "$intro");
-        if (rec != NULL) {
-          rec->func(cli);
+        const cli_command_t* cmd = cli_find_command(cli, "$intro");
+        if (cmd != NULL) {
+          cmd->func(cli);
         }
       }
       continue;
@@ -565,15 +574,16 @@ void cli_run_loop(cli_t* cli) {
     cli->empty_lines = 0;
 
     // Find the command handler
-    const cli_command_t* rec = cli_find_command(cli, cli->cmd);
+    cli->current_cmd = cli_find_command(cli, cli->cmd_name);
 
-    if (rec == NULL) {
-      cli_error(cli, CLI_ERROR_INVALID_CMD, "Invalid command, try 'help'.");
+    if (cli->current_cmd == NULL) {
+      cli_error(cli, CLI_ERROR_INVALID_CMD, "Invalid command '%s', try 'help'.",
+                cli->cmd_name);
       continue;
     }
 
     // Call the command handler
-    rec->func(cli);
+    cli->current_cmd->func(cli);
 
     if (!cli->final_status) {
       // Command handler hasn't send final status
@@ -587,25 +597,79 @@ void cli_run_loop(cli_t* cli) {
   }
 }
 
+// Return position of the argument with the given name in
+// the command definition.
+//
+// Returns -1 if the argument is not present.
+static int find_arg(const cli_command_t* cmd, const char* name) {
+  if (cmd->args == NULL) {
+    return -1;
+  }
+
+  const char* p = cmd->args;
+  int index = 0;
+
+  while (*p != '\0') {
+    // Skip '<' or '[>'
+    while (*p != '\0' && (*p == ' ' || *p == '<' || *p == '[')) {
+      p++;
+    }
+
+    // Extract argument name
+    const char* s = p;
+    while (*p != '\0' && (*p != '>' && *p != ']')) {
+      p++;
+    }
+
+    if (strlen(name) == (p - s) && strncmp(s, name, p - s) == 0) {
+      return index;
+    }
+
+    // Skip ']' or '>'
+    while (*p != '\0' && (*p == ']' || *p == '>')) {
+      p++;
+    }
+
+    index++;
+  }
+
+  return -1;
+}
+
 size_t cli_arg_count(cli_t* cli) { return cli->args_count; }
 
-bool cli_is_arg(cli_t* cli, int index) { return index < cli->args_count; }
+bool cli_has_nth_arg(cli_t* cli, int n) {
+  return n >= 0 && n < cli->args_count;
+}
+
+bool cli_has_arg(cli_t* cli, const char* name) {
+  return cli_has_nth_arg(cli, find_arg(cli->current_cmd, name));
+}
 
-const char* cli_arg(cli_t* cli, int index) {
-  if (index >= 0 && index < cli->args_count) {
-    return cli->args[index];
+const char* cli_nth_arg(cli_t* cli, int n) {
+  if (n >= 0 && n < cli->args_count) {
+    return cli->args[n];
   } else {
     return "";
   }
 }
 
-bool cli_arg_uint32(cli_t* cli, int n, uint32_t* result) {
-  const char* arg = cli_arg(cli, n);
+const char* cli_arg(cli_t* cli, const char* name) {
+  return cli_nth_arg(cli, find_arg(cli->current_cmd, name));
+}
+
+bool cli_nth_arg_uint32(cli_t* cli, int n, uint32_t* result) {
+  const char* arg = cli_nth_arg(cli, n);
+  return cstr_parse_uint32(arg, 0, result);
+}
+
+bool cli_arg_uint32(cli_t* cli, const char* name, uint32_t* result) {
+  const char* arg = cli_arg(cli, name);
   return cstr_parse_uint32(arg, 0, result);
 }
 
-bool cli_arg_hex(cli_t* cli, int n, uint8_t* dst, size_t dst_len,
+bool cli_arg_hex(cli_t* cli, const char* name, uint8_t* dst, size_t dst_len,
                  size_t* bytes_written) {
-  const char* arg = cli_arg(cli, n);
+  const char* arg = cli_arg(cli, name);
   return cstr_decode_hex(arg, dst, dst_len, bytes_written);
 }
diff --git a/core/embed/rtl/inc/rtl/cli.h b/core/embed/rtl/inc/rtl/cli.h
index 1cf0034e0db..97d29df3439 100644
--- a/core/embed/rtl/inc/rtl/cli.h
+++ b/core/embed/rtl/inc/rtl/cli.h
@@ -51,9 +51,16 @@ typedef void (*cli_cmd_handler_t)(cli_t* cli);
 
 // Structure describing the registration record for a CLI command handler
 typedef struct {
+  // Command name
   const char* name;
+  // Command handler
   cli_cmd_handler_t func;
+  // Single line command description
   const char* info;
+  // Arguments definition
+  // "<mandatory-arg> [<optional-arg>] [--flag1 | --flag2]"
+  // NOTE: optional args must be placed after mandatory args
+  const char* args;
 } cli_command_t;
 
 #define CONCAT_INDIRECT(x, y) x##y
@@ -84,11 +91,13 @@ struct cli {
   // Current line buffer
   char line_buffer[CLI_LINE_BUFFER_SIZE];
   // Command name (pointer to the line buffer)
-  const char* cmd;
+  const char* cmd_name;
   // Number of parsed arguments
   size_t args_count;
   // Parsed arguments (pointers to the line buffer)
   const char* args[CLI_MAX_ARGS];
+  // Currently processed command
+  const cli_command_t* current_cmd;
 
   // Command history
   char history[CLI_HISTORY_DEPTH][CLI_HISTORY_LINE_SIZE];
@@ -124,21 +133,30 @@ size_t cli_arg_count(cli_t* cli);
 //
 // Arguments are separated by spaces. The first argument is at index 0.
 // Returns an empty string if the argument is not present.
-const char* cli_arg(cli_t* cli, int index);
+const char* cli_nth_arg(cli_t* cli, int n);
 
-// Returns true if the n-th argument is present
-bool cli_is_arg(cli_t* cli, int index);
+// Returns the argument with the given name from the command line.
+//
+// Arguments are separated by spaces. The first argument is at index 0.
+// Returns an empty string if the argument is not present.
+const char* cli_arg(cli_t* cli, const char* name);
+
+// Returns true if the n-th argument is present.
+bool cli_has_nth_arg(cli_t* cli, int n);
+
+// Returns true if the argument with the given name is present.
+bool cli_has_arg(cli_t* cli, const char* name);
 
-// Parses the n-th argument as an unsigned 32-bit integer.
+// Parses the argument with the given name as an unsigned 32-bit integer.
 //
 // The result is set only if the argument is present and can be parsed.
 // Otherwise, the function returns false and the result is not modified.
-bool cli_arg_uint32(cli_t* cli, int n, uint32_t* result);
+bool cli_arg_uint32(cli_t* cli, const char* name, uint32_t* result);
 
-// Parses the n-th argument as a hexadecimal string.
+// Parses the argument with the given name as a hexadecimal string.
 //
-// (see slice_parse_hex() for details)
-bool cli_arg_hex(cli_t* cli, int n, uint8_t* dst, size_t dst_len,
+// (see cstr_parse_hex() for details)
+bool cli_arg_hex(cli_t* cli, const char* name, uint8_t* dst, size_t dst_len,
                  size_t* bytes_written);
 
 // Writes a formatted trace string to the console. The formatted string is