From 5cfd57048067425ca9bd38ef82c539eb11deb2ce Mon Sep 17 00:00:00 2001
From: erikkaashoek <erik@kaashoek.com>
Date: Sat, 12 Aug 2023 09:58:27 +0200
Subject: [PATCH] menu command in cmd file

---
 main.c        | 7 ++++---
 vna_browser.c | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/main.c b/main.c
index 3044ad3..d6f0da0 100644
--- a/main.c
+++ b/main.c
@@ -804,6 +804,7 @@ uint8_t in_menu_command;
 
 VNA_SHELL_FUNCTION(cmd_menu)
 {
+  ui_mode_normal();
   menu_current_level = 0;
   if (argc == 0) {
     return;
@@ -2295,9 +2296,9 @@ static const VNAShellCommand commands[] =
     { "selftest", cmd_selftest,    0 },
     { "correction", cmd_correction,   CMD_RUN_IN_LOAD },
     { "calc", cmd_calc, CMD_WAIT_MUTEX | CMD_RUN_IN_LOAD},
-    { "menu", cmd_menu, CMD_WAIT_MUTEX },
-    { "text", cmd_text, 0},
-    { "remark", cmd_remark, CMD_WAIT_MUTEX },
+    { "menu", cmd_menu, CMD_WAIT_MUTEX | CMD_RUN_IN_LOAD },
+    { "text", cmd_text, CMD_RUN_IN_LOAD},
+    { "remark", cmd_remark, CMD_RUN_IN_LOAD },
 #ifdef ENABLE_SD_CARD_CMD
     { "sd_list",   cmd_sd_list,   CMD_WAIT_MUTEX },
     { "sd_read",   cmd_sd_read,   CMD_WAIT_MUTEX },
diff --git a/vna_browser.c b/vna_browser.c
index 5eb317c..f273e85 100644
--- a/vna_browser.c
+++ b/vna_browser.c
@@ -236,9 +236,10 @@ finish:
 
   case FMT_CMD_FILE:
   {
+    static char cmd_buffer[256+128];
     const int buffer_size = 256;
     const int line_size = 128;
-    char *buf_8 = (char *)spi_buffer; // must be greater then buffer_size + line_size
+    char *buf_8 = cmd_buffer; // (char *)spi_buffer; // must be greater then buffer_size + line_size
     char *line  = buf_8 + buffer_size;
     uint16_t j = 0, i;
     while (f_read(fs_file, buf_8, buffer_size, &size) == FR_OK && size > 0) {