Skip to content

Commit

Permalink
feat: add marker smith value format menu
Browse files Browse the repository at this point in the history
  • Loading branch information
@edy555
edy555 committed Nov 30, 2019
1 parent 14a130c commit 0bfa2c0
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 26 deletions.
6 changes: 6 additions & 0 deletions nanovna.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,11 @@ enum {
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 {
int8_t digit; /* 0~5 */
int8_t digit_mode;
Expand All @@ -358,6 +363,7 @@ typedef struct {
uint32_t previous_value;
uint8_t lever_mode;
bool marker_delta;
uint8_t marker_smith_format;
} uistat_t;

extern uistat_t uistat;
Expand Down
76 changes: 53 additions & 23 deletions plot.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,23 +428,23 @@ draw_on_strut(int v0, int d, int color)
/*
* calculate log10(abs(gamma))
*/
float logmag(float *v)
float logmag(const float *v)
{
return log10f(v[0]*v[0] + v[1]*v[1]) * 10;
}

/*
* 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;
}

/*
* calculate groupdelay
*/
float groupdelay(float *v, float *w, float deltaf)
float groupdelay(const float *v, const float *w, float deltaf)
{
#if 1
// atan(w)-atan(v) = atan((w-v)/(1+wv))
Expand All @@ -459,30 +459,30 @@ float groupdelay(float *v, float *w, float deltaf)
/*
* calculate abs(gamma)
*/
float linear(float *v)
float linear(const float *v)
{
return - sqrtf(v[0]*v[0] + v[1]*v[1]);
}

/*
* 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]);
if (x > 1)
return INFINITY;
return (1 + x)/(1 - x);
}

float resitance(float *v) {
float resitance(const float *v) {
float z0 = 50;
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;
return zr;
}

float reactance(float *v) {
float reactance(const float *v) {
float z0 = 50;
float d = z0 / ((1-v[0])*(1-v[0])+v[1]*v[1]);
float zi = 2*v[1] * d;
Expand Down Expand Up @@ -572,10 +572,11 @@ static int
string_value_with_prefix(char *buf, int len, float val, char unit)
{
char prefix;
int n;
int n = 0;
if (val < 0) {
val = -val;
*buf++ = '-';
*buf = '-';
n++;
len--;
}
if (val < 1e-12) {
Expand Down Expand Up @@ -607,11 +608,11 @@ string_value_with_prefix(char *buf, int len, float val, char unit)
}

if (val < 10) {
n = chsnprintf(buf, len, "%.2f", val);
n += chsnprintf(&buf[n], len, "%.2f", val);
} else if (val < 100) {
n = chsnprintf(buf, len, "%.1f", val);
n += chsnprintf(&buf[n], len, "%.1f", val);
} else {
n = chsnprintf(buf, len, "%d", (int)val);
n += chsnprintf(&buf[n], len, "%d", (int)val);
}

if (prefix)
Expand All @@ -626,7 +627,7 @@ string_value_with_prefix(char *buf, int len, float val, char unit)
#define PI2 6.283184

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
float z0 = 50;
Expand All @@ -635,15 +636,44 @@ gamma2imp(char *buf, int len, const float coeff[2], uint32_t frequency)
float zi = 2*coeff[1] * d;
int n;

n = string_value_with_prefix(buf, len, zr, S_OHM[0]);
buf[n++] = ' ';
switch (uistat.marker_smith_format) {
case MS_LIN:
chsnprintf(buf, len, "%.2f %.1f" S_DEGREE, linear(coeff), phase(coeff));
break;

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');
case MS_LOG: {
float v = logmag(coeff);
if (v == -INFINITY)
chsnprintf(buf, len, "-INF dB");
else
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;
}
}

Expand Down Expand Up @@ -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);
break;
case TRC_SMITH:
gamma2imp(buf, len, coeff, frequencies[i]);
format_smith_value(buf, len, coeff, frequencies[i]);
break;
case TRC_REAL:
chsnprintf(buf, len, "%.2f", coeff[0]);
Expand Down Expand Up @@ -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);
break;
case TRC_SMITH:
gamma2imp(buf, len, coeff, frequencies[index]);
format_smith_value(buf, len, coeff, frequencies[index]);
break;
case TRC_REAL:
chsnprintf(buf, len, "\004%.2f", coeff[0] - coeff_ref[0]);
Expand Down
30 changes: 27 additions & 3 deletions ui.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ uistat_t uistat = {
digit: 6,
current_trace: 0,
lever_mode: LM_MARKER,
marker_delta: FALSE
marker_delta: FALSE,
marker_smith_format: MS_RLC
};



#define NO_EVENT 0
#define EVT_BUTTON_SINGLE_CLICK 0x01
#define EVT_BUTTON_DOUBLE_CLICK 0x02
Expand Down Expand Up @@ -885,6 +885,14 @@ menu_marker_search_cb(int item)
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
active_marker_select(int item)
{
Expand Down Expand Up @@ -1083,10 +1091,21 @@ const menuitem_t menu_marker_search[] = {
{ 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[] = {
{ MT_SUBMENU, "\2SELECT\0MARKER", menu_marker_sel },
{ MT_SUBMENU, "SEARCH", menu_marker_search },
{ MT_SUBMENU, "OPERATIONS", menu_marker_ops },
{ MT_SUBMENU, "\2SMITH\0VALUE", menu_marker_smith },
{ MT_CANCEL, S_LARROW" BACK", NULL },
{ MT_NONE, NULL, NULL } // sentinel
};
Expand Down Expand Up @@ -1400,7 +1419,12 @@ menu_item_modify_attribute(const menuitem_t *menu, int item,
*bg = 0x0000;
*fg = 0xffff;
}
}
}
} else if (menu == menu_marker_smith) {
if (uistat.marker_smith_format == item) {
*bg = 0x0000;
*fg = 0xffff;
}
} else if (menu == menu_calop) {
if ((item == 0 && (cal_status & CALSTAT_OPEN))
|| (item == 1 && (cal_status & CALSTAT_SHORT))
Expand Down

0 comments on commit 0bfa2c0

Please sign in to comment.