ttrftech/NanoVNA
1
0
Fork 0
mirror of https://github.com/ttrftech/NanoVNA.git synced 2026-04-05 14:35:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add REAL IMAG R X trace format

Browse source
This commit is contained in:
cho45 2019-08-24 07:45:53 +09:00
parent 973de1d7c0
commit f9a5d2e3ef
4 changed files with 75 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

56
plot.c
View file

@ -459,6 +459,20 @@ float swr(float *v)
return (1 + x)/(1 - x);
}
float resitance(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 z0 = 50;
float d = z0 / ((1-v[0])*(1-v[0])+v[1]*v[1]);
float zi = 2*v[1] * d;
return zi;
}
#define RADIUS ((HEIGHT-1)/2)
void
cartesian_scale(float re, float im, int *xp, int *yp, float scale)
@ -495,6 +509,18 @@ trace_into_index(int x, int t, int i, float coeff[2])
case TRC_SWR:
v = refpos+ (1 - swr(coeff)) * scale;
break;
case TRC_REAL:
v = refpos - coeff[0] * 8 * scale;
break;
case TRC_IMAG:
v = refpos - coeff[1] * 8 * scale;
break;
case TRC_R:
v = refpos - resitance(coeff) * scale;
break;
case TRC_X:
v = refpos - reactance(coeff) * scale;
break;
case TRC_SMITH:
//case TRC_ADMIT:
case TRC_POLAR:
@ -587,6 +613,24 @@ gamma2imp(char *buf, int len, const float coeff[2], uint32_t frequency)
}
}
void
gamma2resistance(char *buf, int len, const float coeff[2], uint32_t frequency)
{
float z0 = 50;
float d = z0 / ((1-coeff[0])*(1-coeff[0])+coeff[1]*coeff[1]);
float zr = ((1+coeff[0])*(1-coeff[0]) - coeff[1]*coeff[1]) * d;
string_value_with_prefix(buf, len, zr, S_OHM[0]);
}
void
gamma2reactance(char *buf, int len, const float coeff[2], uint32_t frequency)
{
float z0 = 50;
float d = z0 / ((1-coeff[0])*(1-coeff[0])+coeff[1]*coeff[1]);
float zi = 2*coeff[1] * d;
string_value_with_prefix(buf, len, zi, S_OHM[0]);
}
void
trace_get_value_string(int t, char *buf, int len, float coeff[2], uint32_t frequency)
{
@ -614,6 +658,18 @@ trace_get_value_string(int t, char *buf, int len, float coeff[2], uint32_t frequ
case TRC_SMITH:
gamma2imp(buf, len, coeff, frequency);
break;
case TRC_REAL:
chsnprintf(buf, len, "%.2f", coeff[0]);
break;
case TRC_IMAG:
chsnprintf(buf, len, "%.2fj", coeff[1]);
break;
case TRC_R:
gamma2resistance(buf, len, coeff, frequency);
break;
case TRC_X:
gamma2reactance(buf, len, coeff, frequency);
break;
//case TRC_ADMIT:
case TRC_POLAR:
chsnprintf(buf, len, "%.2f %.2fj", coeff[0], coeff[1]);