From 3213a8022cd6a4726c833ea83ee4249add92aeaf Mon Sep 17 00:00:00 2001 From: DiSlord Date: Sun, 21 Jun 2020 08:00:01 +0300 Subject: [PATCH] Fix MAX_TRACE_TYPE to 13 Increase digit for show Q factor (use %.3f format) --- main.c | 2 +- nanovna.h | 2 +- plot.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main.c b/main.c index a49b1dc..54cf1ad 100644 --- a/main.c +++ b/main.c @@ -1773,7 +1773,7 @@ VNA_SHELL_FUNCTION(cmd_trace) shell_printf("%d %s %s\r\n", t, type, channel); return; } -#if MAX_TRACE_TYPE != 12 +#if MAX_TRACE_TYPE != 13 #error "Trace type enum possibly changed, check cmd_trace function" #endif // enum TRC_LOGMAG, TRC_PHASE, TRC_DELAY, TRC_SMITH, TRC_POLAR, TRC_LINEAR, TRC_SWR, TRC_REAL, TRC_IMAG, TRC_R, TRC_X, TRC_Q, TRC_OFF diff --git a/nanovna.h b/nanovna.h index ee7875e..0b86881 100644 --- a/nanovna.h +++ b/nanovna.h @@ -228,7 +228,7 @@ extern const uint16_t numfont16x22[]; #define S_OHM "\036" // trace -#define MAX_TRACE_TYPE 12 +#define MAX_TRACE_TYPE 13 enum trace_type { TRC_LOGMAG=0, TRC_PHASE, TRC_DELAY, TRC_SMITH, TRC_POLAR, TRC_LINEAR, TRC_SWR, TRC_REAL, TRC_IMAG, TRC_R, TRC_X, TRC_Q, TRC_OFF }; diff --git a/plot.c b/plot.c index 8ed9216..1b03afe 100644 --- a/plot.c +++ b/plot.c @@ -665,7 +665,7 @@ trace_get_value_string(int t, char *buf, int len, float array[POINTS_COUNT][2], v = reactance(coeff); break; case TRC_Q: - format = "%.1f"; + format = "%.3f"; v = qualityfactor(coeff); break; case TRC_SMITH: @@ -729,7 +729,7 @@ trace_get_value_string_delta(int t, char *buf, int len, float array[POINTS_COUNT v = reactance(coeff); break; case TRC_Q: - format = "%.1f"; + format = "%.3f"; v = qualityfactor(coeff); break; //case TRC_ADMIT: