From 018be2919db19579b238ad3e1eec2eda30d81647 Mon Sep 17 00:00:00 2001 From: erikkaashoek Date: Mon, 2 Nov 2026 18:36:32 +0100 Subject: [PATCH] Trace CSV load reads MHz frequencies, preset recall turns normalize off (issue #141) --- flash.c | 2 ++ vna_browser.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/flash.c b/flash.c index 6d11baf..6ab9981 100644 --- a/flash.c +++ b/flash.c @@ -233,6 +233,8 @@ caldata_recall(uint16_t id) /* duplicated saved data onto sram to be able to modify marker/trace */ memcpy(dst, src, sizeof(setting_t)); + memset(setting.normalized, 0, sizeof setting.normalized); // the normalize reference trace is not in a preset + setting.normalized_trace = -1; #ifdef __SD_FILE_BROWSER__ sd_preset_path[0] = 0; // this preset came from flash, not from SD #endif diff --git a/vna_browser.c b/vna_browser.c index f991d1d..2b4605a 100644 --- a/vna_browser.c +++ b/vna_browser.c @@ -221,6 +221,8 @@ finish3: char *args[16]; int nargs = parse_line(line, args, 16); // Parse line to 16 args if (nargs < 2 || args[0][0] == '#' || args[0][0] == '!') continue; // No data or comment or settings + if (strchr(args[0], '.')) // MHz (CONFIG MHz CSV), Hz has no decimals + args[0][strlen(args[0])] = 'M'; // suffix so my_atoui returns Hz f = my_atoui(args[0]); // Get frequency if (count >= POINTS_COUNT || f > maxFreq) {error = "Format err"; goto finish;} if (count == 0) { @@ -331,6 +333,8 @@ static char cmd_buffer[256+128]; magic == SETTING_MAGIC && f_read(fs_file, src, total, &size) == FR_OK) { // TODO remove code duplication with flash.c + memset(setting.normalized, 0, sizeof setting.normalized); // the normalize reference trace is not in a preset + setting.normalized_trace = -1; update_min_max_freq(); update_frequencies(); set_scale(setting.scale);