ttrftech/NanoVNA
1
0
Fork 0
mirror of https://github.com/ttrftech/NanoVNA.git synced 2025-12-06 03:31:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: add marker smith value format menu

Browse source
This commit is contained in:
TT 2019-11-30 10:17:14 +09:00
parent 14a130c24b
commit 0bfa2c073e
3 changed files with 86 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nanovna.h
View file

@ -350,6 +350,11 @@ enum {
LM_MARKER, LM_SEARCH, LM_CENTER, LM_SPAN LM_MARKER, LM_SEARCH, LM_CENTER, LM_SPAN
}; };
// marker smith value format
enum {
MS_LIN, MS_LOG, MS_REIM, MS_RX, MS_RLC
};
typedef struct { typedef struct {
int8_t digit; /* 0~5 */ int8_t digit; /* 0~5 */
int8_t digit_mode; int8_t digit_mode;
@ -358,6 +363,7 @@ typedef struct {
uint32_t previous_value; uint32_t previous_value;
uint8_t lever_mode; uint8_t lever_mode;
bool marker_delta; bool marker_delta;
uint8_t marker_smith_format;
} uistat_t; } uistat_t;
extern uistat_t uistat; extern uistat_t uistat;

76
plot.c
View file

@ -428,7 +428,7 @@ draw_on_strut(int v0, int d, int color)
/* /*
* calculate log10(abs(gamma)) * calculate log10(abs(gamma))
*/ */
float logmag(float *v) float logmag(const float *v)
{ {
return log10f(v[0]*v[0] + v[1]*v[1]) * 10; return log10f(v[0]*v[0] + v[1]*v[1]) * 10;
} }
@ -436,7 +436,7 @@ float logmag(float *v)
/* /*
* calculate phase[-2:2] of coefficient * calculate phase[-2:2] of coefficient
*/ */
float phase(float *v) float phase(const float *v)
{ {
return 2 * atan2f(v[1], v[0]) / M_PI * 90; return 2 * atan2f(v[1], v[0]) / M_PI * 90;
} }
@ -444,7 +444,7 @@ float phase(float *v)
/* /*
* calculate groupdelay * calculate groupdelay
*/ */
float groupdelay(float *v, float *w, float deltaf) float groupdelay(const float *v, const float *w, float deltaf)
{ {
#if 1 #if 1
// atan(w)-atan(v) = atan((w-v)/(1+wv)) // atan(w)-atan(v) = atan((w-v)/(1+wv))
@ -459,7 +459,7 @@ float groupdelay(float *v, float *w, float deltaf)
/* /*
* calculate abs(gamma) * calculate abs(gamma)
*/ */
float linear(float *v) float linear(const float *v)
{ {
return - sqrtf(v[0]*v[0] + v[1]*v[1]); return - sqrtf(v[0]*v[0] + v[1]*v[1]);
} }
@ -467,7 +467,7 @@ float linear(float *v)
/* /*
* calculate vswr; (1+gamma)/(1-gamma) * calculate vswr; (1+gamma)/(1-gamma)
*/ */
float swr(float *v) float swr(const float *v)
{ {
float x = sqrtf(v[0]*v[0] + v[1]*v[1]); float x = sqrtf(v[0]*v[0] + v[1]*v[1]);
if (x > 1) if (x > 1)
@ -475,14 +475,14 @@ float swr(float *v)
return (1 + x)/(1 - x); return (1 + x)/(1 - x);
} }
float resitance(float *v) { float resitance(const float *v) {
float z0 = 50; float z0 = 50;
float d = z0 / ((1-v[0])*(1-v[0])+v[1]*v[1]); float d = z0 / ((1-v[0])*(1-v[0])+v[1]*v[1]);
float zr = ((1+v[0])*(1-v[0]) - v[1]*v[1]) * d; float zr = ((1+v[0])*(1-v[0]) - v[1]*v[1]) * d;
return zr; return zr;
} }
float reactance(float *v) { float reactance(const float *v) {
float z0 = 50; float z0 = 50;
float d = z0 / ((1-v[0])*(1-v[0])+v[1]*v[1]); float d = z0 / ((1-v[0])*(1-v[0])+v[1]*v[1]);
float zi = 2*v[1] * d; float zi = 2*v[1] * d;
@ -572,10 +572,11 @@ static int
string_value_with_prefix(char *buf, int len, float val, char unit) string_value_with_prefix(char *buf, int len, float val, char unit)
{ {
char prefix; char prefix;
int n; int n = 0;
if (val < 0) { if (val < 0) {
val = -val; val = -val;
*buf++ = '-'; *buf = '-';
n++;
len--; len--;
} }
if (val < 1e-12) { if (val < 1e-12) {
@ -607,11 +608,11 @@ string_value_with_prefix(char *buf, int len, float val, char unit)
} }
if (val < 10) { if (val < 10) {
n = chsnprintf(buf, len, "%.2f", val); n += chsnprintf(&buf[n], len, "%.2f", val);
} else if (val < 100) { } else if (val < 100) {
n = chsnprintf(buf, len, "%.1f", val); n += chsnprintf(&buf[n], len, "%.1f", val);
} else { } else {
n = chsnprintf(buf, len, "%d", (int)val); n += chsnprintf(&buf[n], len, "%d", (int)val);
} }
if (prefix) if (prefix)
@ -626,7 +627,7 @@ string_value_with_prefix(char *buf, int len, float val, char unit)
#define PI2 6.283184 #define PI2 6.283184
static void static void
gamma2imp(char *buf, int len, const float coeff[2], uint32_t frequency) format_smith_value(char *buf, int len, const float coeff[2], uint32_t frequency)
{ {
// z = (gamma+1)/(gamma-1) * z0 // z = (gamma+1)/(gamma-1) * z0
float z0 = 50; float z0 = 50;
@ -635,15 +636,44 @@ gamma2imp(char *buf, int len, const float coeff[2], uint32_t frequency)
float zi = 2*coeff[1] * d; float zi = 2*coeff[1] * d;
int n; int n;
n = string_value_with_prefix(buf, len, zr, S_OHM[0]); switch (uistat.marker_smith_format) {
buf[n++] = ' '; case MS_LIN:
chsnprintf(buf, len, "%.2f %.1f" S_DEGREE, linear(coeff), phase(coeff));
break;
if (zi < 0) { case MS_LOG: {
float c = -1 / (PI2 * frequency * zi); float v = logmag(coeff);
string_value_with_prefix(buf+n, len-n, c, 'F'); if (v == -INFINITY)
} else { chsnprintf(buf, len, "-INF dB");
float l = zi / (PI2 * frequency); else
string_value_with_prefix(buf+n, len-n, l, 'H'); chsnprintf(buf, len, "%.1fdB %.1f" S_DEGREE, v, phase(coeff));
}
break;
case MS_REIM:
n = string_value_with_prefix(buf, len, coeff[0], '\0');
if (coeff[1] >= 0) buf[n++] = '+';
string_value_with_prefix(buf+n, len-n, coeff[1], 'j');
break;
case MS_RX:
n = string_value_with_prefix(buf, len, zr, S_OHM[0]);
buf[n++] = ' ';
string_value_with_prefix(buf+n, len-n, zi, 'j');
break;
case MS_RLC:
n = string_value_with_prefix(buf, len, zr, S_OHM[0]);
buf[n++] = ' ';
if (zi < 0) {
float c = -1 / (PI2 * frequency * zi);
string_value_with_prefix(buf+n, len-n, c, 'F');
} else {
float l = zi / (PI2 * frequency);
string_value_with_prefix(buf+n, len-n, l, 'H');
}
break;
} }
} }
@ -695,7 +725,7 @@ trace_get_value_string(int t, char *buf, int len, float array[101][2], int i)
chsnprintf(buf, len, "%.2f", v); chsnprintf(buf, len, "%.2f", v);
break; break;
case TRC_SMITH: case TRC_SMITH:
gamma2imp(buf, len, coeff, frequencies[i]); format_smith_value(buf, len, coeff, frequencies[i]);
break; break;
case TRC_REAL: case TRC_REAL:
chsnprintf(buf, len, "%.2f", coeff[0]); chsnprintf(buf, len, "%.2f", coeff[0]);
@ -747,7 +777,7 @@ trace_get_value_string_delta(int t, char *buf, int len, float array[101][2], int
chsnprintf(buf, len, "\004%.2f", v); chsnprintf(buf, len, "\004%.2f", v);
break; break;
case TRC_SMITH: case TRC_SMITH:
gamma2imp(buf, len, coeff, frequencies[index]); format_smith_value(buf, len, coeff, frequencies[index]);
break; break;
case TRC_REAL: case TRC_REAL:
chsnprintf(buf, len, "\004%.2f", coeff[0] - coeff_ref[0]); chsnprintf(buf, len, "\004%.2f", coeff[0] - coeff_ref[0]);

30
ui.c
View file

@ -30,11 +30,11 @@ uistat_t uistat = {
digit: 6, digit: 6,
current_trace: 0, current_trace: 0,
lever_mode: LM_MARKER, lever_mode: LM_MARKER,
marker_delta: FALSE marker_delta: FALSE,
marker_smith_format: MS_RLC
}; };
#define NO_EVENT 0 #define NO_EVENT 0
#define EVT_BUTTON_SINGLE_CLICK 0x01 #define EVT_BUTTON_SINGLE_CLICK 0x01
#define EVT_BUTTON_DOUBLE_CLICK 0x02 #define EVT_BUTTON_DOUBLE_CLICK 0x02
@ -885,6 +885,14 @@ menu_marker_search_cb(int item)
uistat.lever_mode = LM_SEARCH; uistat.lever_mode = LM_SEARCH;
} }
static void
menu_marker_smith_cb(int item)
{
uistat.marker_smith_format = item;
redraw_marker(active_marker, TRUE);
draw_menu();
}
void void
active_marker_select(int item) active_marker_select(int item)
{ {
@ -1083,10 +1091,21 @@ const menuitem_t menu_marker_search[] = {
{ MT_NONE, NULL, NULL } // sentinel { MT_NONE, NULL, NULL } // sentinel
}; };
const menuitem_t menu_marker_smith[] = {
{ MT_CALLBACK, "LIN", menu_marker_smith_cb },
{ MT_CALLBACK, "LOG", menu_marker_smith_cb },
{ MT_CALLBACK, "Re+Im", menu_marker_smith_cb },
{ MT_CALLBACK, "R+Xj", menu_marker_smith_cb },
{ MT_CALLBACK, "R+L/C", menu_marker_smith_cb },
{ MT_CANCEL, S_LARROW" BACK", NULL },
{ MT_NONE, NULL, NULL } // sentinel
};
const menuitem_t menu_marker[] = { const menuitem_t menu_marker[] = {
{ MT_SUBMENU, "\2SELECT\0MARKER", menu_marker_sel }, { MT_SUBMENU, "\2SELECT\0MARKER", menu_marker_sel },
{ MT_SUBMENU, "SEARCH", menu_marker_search }, { MT_SUBMENU, "SEARCH", menu_marker_search },
{ MT_SUBMENU, "OPERATIONS", menu_marker_ops }, { MT_SUBMENU, "OPERATIONS", menu_marker_ops },
{ MT_SUBMENU, "\2SMITH\0VALUE", menu_marker_smith },
{ MT_CANCEL, S_LARROW" BACK", NULL }, { MT_CANCEL, S_LARROW" BACK", NULL },
{ MT_NONE, NULL, NULL } // sentinel { MT_NONE, NULL, NULL } // sentinel
}; };
@ -1400,7 +1419,12 @@ menu_item_modify_attribute(const menuitem_t *menu, int item,
*bg = 0x0000; *bg = 0x0000;
*fg = 0xffff; *fg = 0xffff;
} }
} }
} else if (menu == menu_marker_smith) {
if (uistat.marker_smith_format == item) {
*bg = 0x0000;
*fg = 0xffff;
}
} else if (menu == menu_calop) { } else if (menu == menu_calop) {
if ((item == 0 && (cal_status & CALSTAT_OPEN)) if ((item == 0 && (cal_status & CALSTAT_OPEN))
|| (item == 1 && (cal_status & CALSTAT_SHORT)) || (item == 1 && (cal_status & CALSTAT_SHORT))