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

fix er

Browse source
This commit is contained in:
TT 2016-10-16 14:05:44 +09:00
parent 86fae97c9b
commit f22830cdb0
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
main.c
View file

@ -500,10 +500,12 @@ eterm_calc_er(int sign)
int i; int i;
for (i = 0; i < 101; i++) { for (i = 0; i < 101; i++) {
// Er = sign*(1-Es)S11mo' // Er = sign*(1-Es)S11mo'
float s11or = cal_data[CAL_OPEN][i][0] - cal_data[ETERM_ED][i][0];
float s11oi = cal_data[CAL_OPEN][i][1] - cal_data[ETERM_ED][i][1];
float esr = 1 - cal_data[ETERM_ES][i][0]; float esr = 1 - cal_data[ETERM_ES][i][0];
float esi = -cal_data[ETERM_ES][i][1]; float esi = -cal_data[ETERM_ES][i][1];
float err = esr * cal_data[CAL_OPEN][i][0] - esi * cal_data[CAL_OPEN][i][1]; float err = esr * s11or - esi * s11oi;
float eri = esr * cal_data[CAL_OPEN][i][1] + esi * cal_data[CAL_OPEN][i][0]; float eri = esr * s11oi + esi * s11or;
if (sign < 0) { if (sign < 0) {
err = -err; err = -err;
eri = -eri; eri = -eri;
@ -639,14 +641,14 @@ static void cmd_cal(BaseSequentialStream *chp, int argc, char *argv[])
cal_status = 0; cal_status = 0;
return; return;
} else if (strcmp(cmd, "data") == 0) { } else if (strcmp(cmd, "data") == 0) {
chprintf(chp, "%d %d\r\n", (int)cal_data[CAL_LOAD][0][0], (int)cal_data[CAL_LOAD][0][1]); chprintf(chp, "%d %d\r\n", (int)cal_data[CAL_LOAD][0][0]*10000, (int)cal_data[CAL_LOAD][0][1]*10000);
chprintf(chp, "%d %d\r\n", (int)cal_data[CAL_OPEN][0][0], (int)cal_data[CAL_OPEN][0][1]); chprintf(chp, "%d %d\r\n", (int)cal_data[CAL_OPEN][0][0]*10000, (int)cal_data[CAL_OPEN][0][1]*10000);
chprintf(chp, "%d %d\r\n", (int)cal_data[CAL_SHORT][0][0], (int)cal_data[CAL_SHORT][0][1]); chprintf(chp, "%d %d\r\n", (int)cal_data[CAL_SHORT][0][0]*10000, (int)cal_data[CAL_SHORT][0][1]*10000);
chprintf(chp, "%d %d\r\n", (int)cal_data[CAL_THRU][0][0], (int)cal_data[CAL_THRU][0][1]); chprintf(chp, "%d %d\r\n", (int)cal_data[CAL_THRU][0][0]*10000, (int)cal_data[CAL_THRU][0][1]*10000);
chprintf(chp, "%d %d\r\n", (int)cal_data[CAL_ISOLN][0][0], (int)cal_data[CAL_ISOLN][0][1]); chprintf(chp, "%d %d\r\n", (int)cal_data[CAL_ISOLN][0][0]*10000, (int)cal_data[CAL_ISOLN][0][1]*10000);
return; return;
} else { } else {
chprintf(chp, "usage: cal {load|open|short|thru|isoln|done}\r\n"); chprintf(chp, "usage: cal [load|open|short|thru|isoln|done|reset|on|off]\r\n");
return; return;
} }
} }