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

update marker info continuously

Browse source
This commit is contained in:
TT 2016-10-27 20:57:53 +09:00
parent 17188a0418
commit c0fd7810e5
1 changed files with 45 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
ili9431.c
View file

@ -567,33 +567,23 @@ uint32_t trace_index[TRACES_MAX][101];
float logmag(float *v) float logmag(float *v)
{ {
float x = 1 - log10f(v[0]*v[0] + v[1]*v[1]); return log10f(v[0]*v[0] + v[1]*v[1]);
if (x < 0) x = 0;
if (x > 8) x = 8;
return x;
} }
float phase(float *v) float phase(float *v)
{ {
return 4 + 2 * atan2f(v[1], v[0]) / M_PI; return 2 * atan2f(v[1], v[0]) / M_PI;
} }
float linear(float *v) float linear(float *v)
{ {
float x = 8 - sqrt(v[0]*v[0] + v[1]*v[1]) * 8; return - sqrt(v[0]*v[0] + v[1]*v[1]) * 8;
if (x < 0) x = 0;
if (x > 8) x = 8;
return x;
} }
float swr(float *v) float swr(float *v)
{ {
float x = sqrt(v[0]*v[0] + v[1]*v[1]); float x = sqrt(v[0]*v[0] + v[1]*v[1]);
float vswr = (1 + x)/(1 - x); return (1 + x)/(1 - x);
x = 9 - vswr;
if (x < 0) x = 0;
if (x > 8) x = 8;
return x;
} }
@ -710,34 +700,59 @@ force_set_markmap(void)
uint32_t uint32_t
trace_into_index(int x, int t, int i, float coeff[2]) trace_into_index(int x, int t, int i, float coeff[2])
{ {
int x1, y1; int y = 0;
uint32_t idx = 0; float v;
switch (trace[t].type) { switch (trace[t].type) {
case TRC_LOGMAG: case TRC_LOGMAG:
y1 = logmag(coeff) * 29; v = 1 - logmag(coeff);
idx = INDEX(x, y1, i);
break; break;
case TRC_PHASE: case TRC_PHASE:
y1 = phase(coeff) * 29; v = 4 + phase(coeff);
idx = INDEX(x, y1, i);
break; break;
case TRC_LINEAR: case TRC_LINEAR:
y1 = linear(coeff) * 29; v = 8 + linear(coeff);
idx = INDEX(x, y1, i);
break; break;
case TRC_SWR: case TRC_SWR:
y1 = swr(coeff) * 29; v = 9 - swr(coeff);
idx = INDEX(x, y1, i);
break; break;
case TRC_SMITH: case TRC_SMITH:
case TRC_ADMIT: case TRC_ADMIT:
case TRC_POLAR: case TRC_POLAR:
cartesian_scale(coeff[0], coeff[1], &x1, &y1, trace[t].scale); cartesian_scale(coeff[0], coeff[1], &x, &y, trace[t].scale);
idx = INDEX(x1, y1, i); return INDEX(x, y, i);
break;
}
if (v < 0) v = 0;
if (v > 8) v = 8;
y = v * 29;
return INDEX(x, y, i);
}
void
trace_get_value_string(int t, char *buf, int len, float coeff[2])
{
float v;
switch (trace[t].type) {
case TRC_LOGMAG:
v = logmag(coeff);
chsnprintf(buf, len, "%.2f dB", v * 10);
break;
case TRC_PHASE:
v = phase(coeff);
chsnprintf(buf, len, "%.2f deg", v * 90);
break;
case TRC_LINEAR:
v = linear(coeff);
chsnprintf(buf, len, "%.2f", v);
break;
case TRC_SWR:
v = swr(coeff);
chsnprintf(buf, len, "%.2f", v);
break;
case TRC_SMITH:
chsnprintf(buf, len, "%.2f %.2fj", coeff[0], coeff[1]);
break; break;
} }
return idx;
} }
void plot_into_index(float measured[2][101][2]) void plot_into_index(float measured[2][101][2])
@ -1146,8 +1161,8 @@ cell_draw_marker_info(int m, int n, int w, int h)
} }
#endif #endif
} }
#if 0 #if 1
if (m == 6 || m == 7) { if (m == 6 || m == 7 || m == 8) {
int xpos = 216; int xpos = 216;
int ypos = 1; int ypos = 1;
xpos -= m * w; xpos -= m * w;