ttrftech/NanoVNA
1
0
Fork 0
mirror of https://github.com/ttrftech/NanoVNA.git synced 2026-04-09 00:13:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move offset variable to si5351.c (better use it as independent library)

Browse source 
Define and move constants in nanovna.h, and use it
Fix command 'marker' - display marker freq (not current freq)
This commit is contained in:
DiSlord 2020-03-14 15:18:14 +03:00
parent 88617a31fe
commit 922b66abdb
6 changed files with 49 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plot.c
View file

@ -425,7 +425,7 @@ logmag(const float *v)
static float
phase(const float *v)
{
return 2 * atan2f(v[1], v[0]) / M_PI * 90;
return 2 * atan2f(v[1], v[0]) / VNA_PI * 90;
}
/*
@ -438,9 +438,9 @@ groupdelay(const float *v, const float *w, float deltaf)
// atan(w)-atan(v) = atan((w-v)/(1+wv))
float r = w[0]*v[1] - w[1]*v[0];
float i = w[0]*v[0] + w[1]*v[1];
return atan2f(r, i) / (2 * M_PI * deltaf);
return atan2f(r, i) / (2 * VNA_PI * deltaf);
#else
return (atan2f(w[0], w[1]) - atan2f(v[0], v[1])) / (2 * M_PI * deltaf);
return (atan2f(w[0], w[1]) - atan2f(v[0], v[1])) / (2 * VNA_PI * deltaf);
#endif
}
@ -605,11 +605,11 @@ format_smith_value(char *buf, int len, const float coeff[2], uint32_t frequency)
case MS_RLC:
if (zi < 0){// Capacity
prefix = 'F';
value = -1 / (2 * M_PI * frequency * zi);
value = -1 / (2 * VNA_PI * frequency * zi);
}
else {
prefix = 'H';
value = zi / (2 * M_PI * frequency);
value = zi / (2 * VNA_PI * frequency);
}
plot_printf(buf, len, "%F"S_OHM" %F%c", zr, value, prefix);
break;