feat: add speed and ETA display to progress bar with quiet option

Progress bar now displays transfer speed (KB/s or MB/s) and estimated
time remaining during read, write, verify, and blank-check operations.
The --quiet / -q option suppresses all progress output for scripted or
background use. Speed is calculated from elapsed time using monotonic
clock, and ETA is derived from remaining bytes and current transfer rate.

Signed-off-by: Vincent Jardin <[email protected]>

Author: vjardin

radfu.h2m

@@ -395,8 +395,20 @@ radfu osis
 radfu config-read
 radfu boundary-set --cfs1 0 --cfs2 0 --dfs 0 --srs1 0 --srs2 0
 radfu -u -p /dev/ttyUSB0 info    # UART via USB-UART adapter
+radfu write -q firmware.bin      # Write without progress bar
 .fi
 
+[progress display]
+During read, write, verify, and blank-check operations, radfu displays a progress
+bar with transfer speed and estimated time remaining:
+
+.nf
+Writing: [###############...............] 50% (32768/65536) 125.3 KB/s ETA 2s
+.fi
+
+The \\fB-q\\fR (\\fB--quiet\\fR) option suppresses progress output. This is useful
+for scripting or when running operations in the background.
+
 [warnings]
 .B USE AT YOUR OWN RISK
 

src/main.c

@@ -8,6 +8,7 @@
 
 #include "compat.h"
 #include "formats.h"
+#include "progress.h"
 #include "raconnect.h"
 #include "radfu.h"
 #include "raosis.h"
@@ -64,6 +65,7 @@ usage(int status) {
       "  -F, --output-format <fmt> Output file format (auto/bin/ihex/srec)\n"
       "      --area <type>    Select memory area (code/data/config or KOA value)\n"
       "  -u, --uart           Use plain UART mode (P109/P110 pins)\n"
+      "  -q, --quiet          Suppress progress bar output\n"
       "      --cfs1 <KB>      Code flash secure region size without NSC\n"
       "      --cfs2 <KB>      Code flash secure region size (total)\n"
       "      --dfs <KB>       Data flash secure region size\n"
@@ -328,6 +330,7 @@ static const struct option longopts[] = {
   { "input-format",  required_argument, NULL, 'f'      },
   { "output-format", required_argument, NULL, 'F'      },
   { "uart",          no_argument,       NULL, 'u'      },
+  { "quiet",         no_argument,       NULL, 'q'      },
   { "cfs1",          required_argument, NULL, OPT_CFS1 },
   { "cfs2",          required_argument, NULL, OPT_CFS2 },
   { "dfs",           required_argument, NULL, OPT_DFS  },
@@ -368,7 +371,7 @@ main(int argc, char *argv[]) {
   enum command cmd = CMD_NONE;
   int opt;
 
-  while ((opt = getopt_long(argc, argv, "p:a:s:b:i:evf:F:uhV", longopts, NULL)) != -1) {
+  while ((opt = getopt_long(argc, argv, "p:a:s:b:i:evf:F:uqhV", longopts, NULL)) != -1) {
     switch (opt) {
     case 'p':
       port = optarg;
@@ -418,6 +421,9 @@ main(int argc, char *argv[]) {
     case 'u':
       uart_mode = true;
       break;
+    case 'q':
+      progress_global_quiet = 1;
+      break;
     case OPT_CFS1:
       bnd.cfs1 = (uint16_t)strtoul(optarg, NULL, 10);
       bnd_cfs1_set = true;

src/progress.c

@@ -6,12 +6,27 @@
  * Minimal terminal progress bar with optional callback for library integration
  */
 
+#define _DEFAULT_SOURCE /* clock_gettime, CLOCK_MONOTONIC */
+
 #include "progress.h"
 #include <stdio.h>
 #include <string.h>
 
 #define BAR_WIDTH 30
 
+/* Global quiet mode */
+int progress_global_quiet = 0;
+
+/* Get elapsed time in seconds */
+static double
+get_elapsed_secs(const struct timespec *start) {
+  struct timespec now;
+  clock_gettime(CLOCK_MONOTONIC, &now);
+  double secs = (double)(now.tv_sec - start->tv_sec);
+  secs += (double)(now.tv_nsec - start->tv_nsec) / 1e9;
+  return secs;
+}
+
 void
 progress_init(progress_t *p, size_t total, const char *desc) {
   p->total = total;
@@ -20,6 +35,8 @@ progress_init(progress_t *p, size_t total, const char *desc) {
   p->desc = desc;
   p->callback = NULL;
   p->user_data = NULL;
+  p->quiet = progress_global_quiet;
+  clock_gettime(CLOCK_MONOTONIC, &p->start_time);
   progress_update(p, 0);
 }
 
@@ -29,16 +46,27 @@ progress_set_callback(progress_t *p, progress_cb_t cb, void *user_data) {
   p->user_data = user_data;
 }
 
+void
+progress_set_quiet(progress_t *p, int quiet) {
+  p->quiet = quiet;
+}
+
 void
 progress_update(progress_t *p, size_t current) {
   p->current = current;
 
   /* Use callback if set */
   if (p->callback != NULL) {
     p->callback(current, p->total, p->desc, p->user_data);
-    return;
+    /* If quiet, skip default output even after callback */
+    if (p->quiet)
+      return;
   }
 
+  /* Skip output in quiet mode */
+  if (p->quiet)
+    return;
+
   /* Default: print to stderr */
   int percent = 0;
   int filled = 0;
@@ -58,19 +86,52 @@ progress_update(progress_t *p, size_t current) {
   memset(bar, '#', filled);
   bar[p->width] = '\0';
 
+  /* Calculate speed and ETA */
+  double elapsed = get_elapsed_secs(&p->start_time);
+  char speed_str[32] = "";
+  char eta_str[32] = "";
+
+  if (elapsed > 0.1 && current > 0) {
+    /* Speed in KB/s */
+    double speed = (double)current / elapsed / 1024.0;
+    if (speed >= 1000.0)
+      snprintf(speed_str, sizeof(speed_str), " %.1f MB/s", speed / 1024.0);
+    else
+      snprintf(speed_str, sizeof(speed_str), " %.1f KB/s", speed);
+
+    /* ETA calculation */
+    if (current < p->total && speed > 0) {
+      double remaining_bytes = (double)(p->total - current);
+      double eta_secs = remaining_bytes / (speed * 1024.0);
+      if (eta_secs < 60)
+        snprintf(eta_str, sizeof(eta_str), " ETA %ds", (int)eta_secs);
+      else if (eta_secs < 3600)
+        snprintf(
+            eta_str, sizeof(eta_str), " ETA %dm%02ds", (int)(eta_secs / 60), (int)eta_secs % 60);
+      else
+        snprintf(eta_str,
+            sizeof(eta_str),
+            " ETA %dh%02dm",
+            (int)(eta_secs / 3600),
+            (int)(eta_secs / 60) % 60);
+    }
+  }
+
   fprintf(stderr,
-      "\r%s: [%s] %3d%% (%zu/%zu)",
+      "\r%s: [%s] %3d%% (%zu/%zu)%s%s    ",
       p->desc ? p->desc : "",
       bar,
       percent,
       current,
-      p->total);
+      p->total,
+      speed_str,
+      eta_str);
   fflush(stderr);
 }
 
 void
 progress_finish(progress_t *p) {
   progress_update(p, p->total);
-  if (p->callback == NULL)
+  if (p->callback == NULL && !p->quiet)
     fprintf(stderr, "\n");
 }

src/progress.h

@@ -10,6 +10,8 @@
 #define PROGRESS_H
 
 #include <stddef.h>
+#include <stdint.h>
+#include <time.h>
 
 /*
  * Progress callback function type
@@ -25,6 +27,8 @@ typedef struct {
   const char *desc;
   progress_cb_t callback;
   void *user_data;
+  struct timespec start_time; /* Start time for speed/ETA calculation */
+  int quiet;                  /* Suppress output if set */
 } progress_t;
 
 void progress_init(progress_t *p, size_t total, const char *desc);
@@ -37,4 +41,16 @@ void progress_finish(progress_t *p);
  */
 void progress_set_callback(progress_t *p, progress_cb_t cb, void *user_data);
 
+/*
+ * Set quiet mode (suppress default progress output to stderr)
+ * Callbacks are still invoked if set
+ */
+void progress_set_quiet(progress_t *p, int quiet);
+
+/*
+ * Global quiet mode setting (affects all progress instances)
+ * Set before calling progress_init to apply to new instances
+ */
+extern int progress_global_quiet;
+
 #endif /* PROGRESS_H */