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

Floating point operation fixed - previous calculation result type was integer.

Browse source
This commit is contained in:
klaute 2016-09-21 18:07:56 +02:00
parent 267ce2b3a4
commit 753d91457a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tools/meas.py
View file

@ -8,6 +8,7 @@ import serial
import copy import copy
import binascii import binascii
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
import math
############################################################################### ###############################################################################
@ -488,7 +489,7 @@ if __name__ == "__main__":
meas_r = [] meas_r = []
meas_p = [] meas_p = []
i = ((drive_str + 1) * 2) / 1000 i = ((drive_str + 1) * 2.0) / 1000.0
if args.output_file != None or args.show_graph == True: if args.output_file != None or args.show_graph == True:
for m in meas_data: for m in meas_data:
@ -503,12 +504,12 @@ if __name__ == "__main__":
meas_ratio.append(1) meas_ratio.append(1)
# R = meas_data[0] * 5V / 1023 * I # R = meas_data[0] * 5V / 1023 * I
r = (m[1] * 5 / 1023) / i r = (m[1] * 5.0 / 1023.0) / i
meas_r.append(r) meas_r.append(r)
# P = meas_data[0] * 5V ^ 2 / r # P = meas_data[0] * 5V ^ 2 / r
if r > 0: if r > 0:
meas_p.append(i**2 * r) meas_p.append(math.pow(i, 2) * r)
else: else:
meas_p.append(0) meas_p.append(0)
@ -519,8 +520,8 @@ if __name__ == "__main__":
plt.plot(meas_freq, meas_ratio) plt.plot(meas_freq, meas_ratio)
plt.plot(meas_freq, meas_r) plt.plot(meas_freq, meas_r)
plt.plot(meas_freq, meas_p) plt.plot(meas_freq, meas_p)
print meas_r
print meas_ratio
print "Please close the mathplot window to exit..." print "Please close the mathplot window to exit..."
plt.show() plt.show()