From 0ccc1b1526285c01c86681bcf7e289d49fd91a53 Mon Sep 17 00:00:00 2001
From: erikkaashoek <erik@kaashoek.com>
Date: Thu, 24 Dec 2020 16:23:54 +0100
Subject: [PATCH] Solved store/load bug

---
 nanovna.h | 3 +--
 plot.c    | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/nanovna.h b/nanovna.h
index f38624f..c40478f 100644
--- a/nanovna.h
+++ b/nanovna.h
@@ -809,10 +809,9 @@ typedef struct setting
   float normalize_level;     // Level to set normalize to, zero if not doing anything
   int modulation_frequency;
   int trigger_mode;
-  uint32_t checksum;
   int slider_position;
   int32_t slider_span;
-
+  uint32_t checksum;            // must be last
 }setting_t;
 
 extern setting_t setting;
diff --git a/plot.c b/plot.c
index 8645b45..fd4b73d 100644
--- a/plot.c
+++ b/plot.c
@@ -565,11 +565,11 @@ to_dBm(const float v)
   {
   case U_DBMV:
 //  return v - 30.0 - 20.0*log10f(sqrt(50));
-    return v - 30.0 - 20.0*LOG_10_SQRT_50;
+    return v - LOG_10_SQRT_50_x20_plus30; // (30.0 + 20.0*LOG_10_SQRT_50);
     break;
   case U_DBUV:
 //  return v - 90.0 - 20.0*log10f(sqrt(50.0));     //TODO convert constants to single float number as GCC compiler does runtime calculation
-    return v - 90.0 - 20.0*LOG_10_SQRT_50;
+    return v - LOG_10_SQRT_50_x20_plus90; // (90.0 + 20.0*LOG_10_SQRT_50);
     break;
   case U_VOLT:
 //  return log10f( v / (sqrt(50.0))) * 20.0 + 30.0 ;