klaute/SWRMeter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of git.okoyono.de:klaute/SWRMeter

Browse source
This commit is contained in:
klaute 2016-09-25 10:57:27 +02:00
commit 2b9ec977a1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/meas.py
View file

@ -510,10 +510,10 @@ if __name__ == "__main__":
if m[1] > 0 and m[2] > 0: if m[1] > 0 and m[2] > 0:
if m[1] > m[2]: if m[1] > m[2]:
vswr = (m[1] / m[2]) vswr = (1.0 * m[1] / m[2])
meas_ratio.append(vswr) meas_ratio.append(vswr)
elif m[1] < m[2]: elif m[1] < m[2]:
vswr = (m[2] / m[1]) vswr = (1.0 * m[2] / m[1])
meas_ratio.append(vswr) meas_ratio.append(vswr)
else: else:
vswr = 1 vswr = 1
@ -541,7 +541,7 @@ if __name__ == "__main__":
FILE.write("freqency;ratio;impedance;watt;drive;a0;a1\n") FILE.write("freqency;ratio;impedance;watt;drive;a0;a1\n")
j = 0 j = 0
for m in meas_ratio: for m in meas_ratio:
FILE.write("%f;%f;%f;%f;%f;%d,%d\n" % (meas_freq[j], m, meas_r[j], meas_p[j], i, meas_data[j][1], meas_data[j][2])) FILE.write("%f;%f;%f;%f;%f;%d;%d\n" % (meas_freq[j], m, meas_r[j], meas_p[j], i, meas_data[j][1], meas_data[j][2]))
j = j + 1 j = j + 1
FILE.close() FILE.close()
print "Output file " + args.output_file + " written." print "Output file " + args.output_file + " written."