0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

cosmetic whitespace cleanup and comments added/updated

Browse source
This commit is contained in:
Steffen Vogel 2015-01-06 08:20:20 +01:00
parent 00e4bc9f54
commit 538231edfd
1 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
Marlin/scripts/createTemperatureLookupMarlin.py
View file

@ -1,12 +1,8 @@
#!/usr/bin/python #!/usr/bin/python
#
# Creates a C code lookup table for doing ADC to temperature conversion
# on a microcontroller
# based on: http://hydraraptor.blogspot.com/2007/10/measuring-temperature-easy-way.html
"""Thermistor Value Lookup Table Generator """Thermistor Value Lookup Table Generator
Generates lookup to temperature values for use in a microcontroller in C format based on: Generates lookup to temperature values for use in a microcontroller in C format based on:
http://hydraraptor.blogspot.com/2007/10/measuring-temperature-easy-way.html http://en.wikipedia.org/wiki/Steinhart-Hart_equation
The main use is for Arduino programs that read data from the circuit board described here: The main use is for Arduino programs that read data from the circuit board described here:
http://make.rrrf.org/ts-1.0 http://make.rrrf.org/ts-1.0
@ -19,7 +15,7 @@ Options:
--t1=ttt:rrr low temperature temperature:resistance point (around 25C) --t1=ttt:rrr low temperature temperature:resistance point (around 25C)
--t2=ttt:rrr middle temperature temperature:resistance point (around 150C) --t2=ttt:rrr middle temperature temperature:resistance point (around 150C)
--t3=ttt:rrr high temperature temperature:resistance point (around 250C) --t3=ttt:rrr high temperature temperature:resistance point (around 250C)
--num-temps=... the number of temperature points to calculate (default: 20) --num-temps=... the number of temperature points to calculate (default: 36)
""" """
from math import * from math import *
@ -86,15 +82,15 @@ class Thermistor:
return (r / (self.rp + r)) * (1024) return (r / (self.rp + r)) * (1024)
def main(argv): def main(argv):
"Default values"
rp = 4700; t1 = 25 # low temperature in Kelvin (25 degC)
t1 = 25; r1 = 100000 # resistance at low temperature (10 kOhm)
r1 = 100000; t2 = 150 # middle temperature in Kelvin (150 degC)
t2 = 150; r2 = 1641.9 # resistance at middle temperature (1.6 KOhm)
r2 = 1641.9; t3 = 250 # high temperature in Kelvin (250 degC)
t3 = 250; r3 = 226.15 # resistance at high temperature (226.15 Ohm)
r3 = 226.15; rp = 4700; # pull-up resistor (4.7 kOhm)
num_temps = int(36); num_temps = int(36); # number of entries for look-up table
try: try:
opts, args = getopt.getopt(argv, "h", ["help", "rp=", "t1=", "t2=", "t3=", "num-temps="]) opts, args = getopt.getopt(argv, "h", ["help", "rp=", "t1=", "t2=", "t3=", "num-temps="])
@ -102,7 +98,7 @@ def main(argv):
print str(err) print str(err)
usage() usage()
sys.exit(2) sys.exit(2)
for opt, arg in opts: for opt, arg in opts:
if opt in ("-h", "--help"): if opt in ("-h", "--help"):
usage() usage()
@ -111,16 +107,16 @@ def main(argv):
rp = int(arg) rp = int(arg)
elif opt == "--t1": elif opt == "--t1":
arg = arg.split(':') arg = arg.split(':')
t1 = float( arg[0]) t1 = float(arg[0])
r1 = float( arg[1]) r1 = float(arg[1])
elif opt == "--t2": elif opt == "--t2":
arg = arg.split(':') arg = arg.split(':')
t2 = float( arg[0]) t2 = float(arg[0])
r2 = float( arg[1]) r2 = float(arg[1])
elif opt == "--t3": elif opt == "--t3":
arg = arg.split(':') arg = arg.split(':')
t3 = float( arg[0]) t3 = float(arg[0])
r3 = float( arg[1]) r3 = float(arg[1])
elif opt == "--num-temps": elif opt == "--num-temps":
num_temps = int(arg) num_temps = int(arg)
@ -136,8 +132,9 @@ def main(argv):
print "// Thermistor lookup table for Marlin" print "// Thermistor lookup table for Marlin"
print "// ./createTemperatureLookupMarlin.py --rp=%s --t1=%s:%s --t2=%s:%s --t3=%s:%s --num-temps=%s" % (rp, t1, r1, t2, r2, t3, r3, num_temps) print "// ./createTemperatureLookupMarlin.py --rp=%s --t1=%s:%s --t2=%s:%s --t3=%s:%s --num-temps=%s" % (rp, t1, r1, t2, r2, t3, r3, num_temps)
print "// Steinhart-Hart Coefficients: %.15g, %.15g, %.15g " % (t.c1, t.c2, t.c3) print "// Steinhart-Hart Coefficients: a=%.15g, b=%.15g, c=%.15g " % (t.c1, t.c2, t.c3)
print "//#define NUMTEMPS %s" % (len(temps)) print
print "#define NUMTEMPS %s" % (len(temps))
print "const short temptable[NUMTEMPS][2] PROGMEM = {" print "const short temptable[NUMTEMPS][2] PROGMEM = {"
counter = 0 counter = 0
@ -148,7 +145,7 @@ def main(argv):
else: else:
print " {(short)(%.2f*OVERSAMPLENR), %s}, // v=%s r=%s res=%s C/count" % ((t.adc(temp)), temp, t.v(t.adc(temp)), t.r(t.adc(temp)),t.res(t.adc(temp))) print " {(short)(%.2f*OVERSAMPLENR), %s}, // v=%s r=%s res=%s C/count" % ((t.adc(temp)), temp, t.v(t.adc(temp)), t.r(t.adc(temp)),t.res(t.adc(temp)))
print "};" print "};"
def usage(): def usage():
print __doc__ print __doc__