From 538231edfdd1b30debdaa7afe53e9da34fe8985f Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 6 Jan 2015 08:20:20 +0100 Subject: [PATCH 1/9] cosmetic whitespace cleanup and comments added/updated --- .../scripts/createTemperatureLookupMarlin.py | 47 +++++++++---------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/Marlin/scripts/createTemperatureLookupMarlin.py b/Marlin/scripts/createTemperatureLookupMarlin.py index 01c602dff..372a5b513 100755 --- a/Marlin/scripts/createTemperatureLookupMarlin.py +++ b/Marlin/scripts/createTemperatureLookupMarlin.py @@ -1,12 +1,8 @@ #!/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 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: http://make.rrrf.org/ts-1.0 @@ -19,7 +15,7 @@ Options: --t1=ttt:rrr low temperature temperature:resistance point (around 25C) --t2=ttt:rrr middle temperature temperature:resistance point (around 150C) --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 * @@ -86,15 +82,15 @@ class Thermistor: return (r / (self.rp + r)) * (1024) def main(argv): - - rp = 4700; - t1 = 25; - r1 = 100000; - t2 = 150; - r2 = 1641.9; - t3 = 250; - r3 = 226.15; - num_temps = int(36); + "Default values" + t1 = 25 # low temperature in Kelvin (25 degC) + r1 = 100000 # resistance at low temperature (10 kOhm) + t2 = 150 # middle temperature in Kelvin (150 degC) + r2 = 1641.9 # resistance at middle temperature (1.6 KOhm) + t3 = 250 # high temperature in Kelvin (250 degC) + r3 = 226.15 # resistance at high temperature (226.15 Ohm) + rp = 4700; # pull-up resistor (4.7 kOhm) + num_temps = int(36); # number of entries for look-up table try: opts, args = getopt.getopt(argv, "h", ["help", "rp=", "t1=", "t2=", "t3=", "num-temps="]) @@ -102,7 +98,7 @@ def main(argv): print str(err) usage() sys.exit(2) - + for opt, arg in opts: if opt in ("-h", "--help"): usage() @@ -111,16 +107,16 @@ def main(argv): rp = int(arg) elif opt == "--t1": arg = arg.split(':') - t1 = float( arg[0]) - r1 = float( arg[1]) + t1 = float(arg[0]) + r1 = float(arg[1]) elif opt == "--t2": arg = arg.split(':') - t2 = float( arg[0]) - r2 = float( arg[1]) + t2 = float(arg[0]) + r2 = float(arg[1]) elif opt == "--t3": arg = arg.split(':') - t3 = float( arg[0]) - r3 = float( arg[1]) + t3 = float(arg[0]) + r3 = float(arg[1]) elif opt == "--num-temps": num_temps = int(arg) @@ -136,8 +132,9 @@ def main(argv): 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 "// Steinhart-Hart Coefficients: %.15g, %.15g, %.15g " % (t.c1, t.c2, t.c3) - print "//#define NUMTEMPS %s" % (len(temps)) + print "// Steinhart-Hart Coefficients: a=%.15g, b=%.15g, c=%.15g " % (t.c1, t.c2, t.c3) + print + print "#define NUMTEMPS %s" % (len(temps)) print "const short temptable[NUMTEMPS][2] PROGMEM = {" counter = 0 @@ -148,7 +145,7 @@ def main(argv): 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 "};" - + def usage(): print __doc__ From fb0996b5db92415afad74d9a39e5e6f89bf831b8 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 6 Jan 2015 08:20:52 +0100 Subject: [PATCH 2/9] improved output aligment and precision --- Marlin/scripts/createTemperatureLookupMarlin.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Marlin/scripts/createTemperatureLookupMarlin.py b/Marlin/scripts/createTemperatureLookupMarlin.py index 372a5b513..93b5bd7dd 100755 --- a/Marlin/scripts/createTemperatureLookupMarlin.py +++ b/Marlin/scripts/createTemperatureLookupMarlin.py @@ -137,13 +137,13 @@ def main(argv): print "#define NUMTEMPS %s" % (len(temps)) print "const short temptable[NUMTEMPS][2] PROGMEM = {" - counter = 0 for temp in temps: - counter = counter +1 - if counter == len(temps): - 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))) - 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) (%7.2f * OVERSAMPLENR ), %s\t}%s // v=%.3f\tr=%.3f\tres=%.3f degC/count" % ( t.adc(temp), temp, \ + ',' if temp != temps[-1] else ' ', \ + t.v( t.adc(temp)), \ + t.r( t.adc(temp)), \ + t.res(t.adc(temp)) \ + ) print "};" def usage(): From 21205cc3d88ed9bc39801873e63349612172bc81 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 6 Jan 2015 08:23:51 +0100 Subject: [PATCH 3/9] more cleanups in the termistorTable generation script --- Marlin/scripts/createTemperatureLookupMarlin.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Marlin/scripts/createTemperatureLookupMarlin.py b/Marlin/scripts/createTemperatureLookupMarlin.py index 93b5bd7dd..d08abce39 100755 --- a/Marlin/scripts/createTemperatureLookupMarlin.py +++ b/Marlin/scripts/createTemperatureLookupMarlin.py @@ -22,6 +22,11 @@ from math import * import sys import getopt +"Constants" +ARES = pow(2,10) # 10 Bit ADC resolution +TMIN = 0 # lowest temperature in table +TMAX = 350 # highest temperature in table + class Thermistor: "Class to do the thermistor maths" def __init__(self, rp, t1, r1, t2, r2, t3, r3): @@ -120,15 +125,10 @@ def main(argv): elif opt == "--num-temps": num_temps = int(arg) - max_adc = (1024 ) - 1 - min_temp = 0 - max_temp = 350 - increment = int(max_adc/(num_temps-1)); - + increment = int((ARES-1)/(num_temps-1)); t = Thermistor(rp, t1, r1, t2, r2, t3, r3) - tmp = (min_temp - max_temp) / (num_temps-1) - print tmp - temps = range(max_temp, min_temp + tmp, tmp); + tmp = (TMIN-TMAX) / (num_temps-1) + temps = range(TMAX, TMIN+tmp, tmp); 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) From 95f4a55820662c7ce87c1a08b52dc281d9afda38 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 6 Jan 2015 08:24:59 +0100 Subject: [PATCH 4/9] refactored termistor table calculation to be in line with wikipedia's article about Steinhart-Hart coefficients --- .../scripts/createTemperatureLookupMarlin.py | 72 +++++++++---------- 1 file changed, 32 insertions(+), 40 deletions(-) diff --git a/Marlin/scripts/createTemperatureLookupMarlin.py b/Marlin/scripts/createTemperatureLookupMarlin.py index d08abce39..f23db1393 100755 --- a/Marlin/scripts/createTemperatureLookupMarlin.py +++ b/Marlin/scripts/createTemperatureLookupMarlin.py @@ -23,68 +23,60 @@ import sys import getopt "Constants" +ZERO = 273.15 # zero point of Kelvin scale +VADC = 5 # ADC voltage +VCC = 5 # supply voltage ARES = pow(2,10) # 10 Bit ADC resolution +VSTEP = VADC / ARES # ADC voltage resolution TMIN = 0 # lowest temperature in table TMAX = 350 # highest temperature in table class Thermistor: "Class to do the thermistor maths" def __init__(self, rp, t1, r1, t2, r2, t3, r3): - t1 = t1 + 273.15 # low temperature (25C) - r1 = r1 # resistance at low temperature - t2 = t2 + 273.15 # middle temperature (150C) - r2 = r2 # resistance at middle temperature - t3 = t3 + 273.15 # high temperature (250C) - r3 = r3 # resistance at high temperature - self.rp = rp # pull-up resistance - self.vadc = 5.0 # ADC reference - self.vcc = 5.0 # supply voltage to potential divider - a1 = log(r1) - a2 = log(r2) - a3 = log(r3) - z = a1 - a2 - y = a1 - a3 - x = 1/t1 - 1/t2 - w = 1/t1 - 1/t3 - v = pow(a1,3) - pow(a2,3) - u = pow(a1,3) - pow(a3,3) - c3 = (x-z*w/y)/(v-z*u/y) - c2 = (x-c3*v)/z - c1 = 1/t1-c3*pow(a1,3)-c2*a1 - self.c1 = c1 - self.c2 = c2 - self.c3 = c3 + l1 = log(r1) + l2 = log(r2) + l3 = log(r3) + y1 = 1.0 / (t1 + ZERO) # adjust scale + y2 = 1.0 / (t2 + ZERO) + y3 = 1.0 / (t3 + ZERO) + x = (y2 - y1) / (l2 - l1) + y = (y3 - y1) / (l3 - l1) + c = (y - x) / ((l3 - l2) * (l1 + l2 + l3)) + b = x - c * (pow(l1,2) + pow(l2,2) + l1*l2) + a = y1 - (b + pow(l1,2)*c)*l1 + self.c1 = a # Steinhart-Hart coefficients + self.c2 = b + self.c3 = c + self.rp = rp # pull-up resistance - def res(self,adc): + def res(self, adc): "Convert ADC reading into a resolution" res = self.temp(adc)-self.temp(adc+1) return res - def v(self,adc): + def v(self, adc): "Convert ADC reading into a Voltage" - v = adc * self.vadc / (1024 ) # convert the 10 bit ADC value to a voltage - return v + return adc * VSTEP # convert the 10 bit ADC value to a voltage - def r(self,adc): + def r(self, adc): "Convert ADC reading into a resistance in Ohms" - v = adc * self.vadc / (1024 ) # convert the 10 bit ADC value to a voltage - r = self.rp * v / (self.vcc - v) # resistance of thermistor + r = self.rp * self.v(adc) / (VCC - self.v(adc)) # resistance of thermistor return r - def temp(self,adc): + def temp(self, adc): "Convert ADC reading into a temperature in Celcius" - v = adc * self.vadc / (1024 ) # convert the 10 bit ADC value to a voltage - r = self.rp * v / (self.vcc - v) # resistance of thermistor + r = self.rp * self.v(adc) / (VCC - self.v(adc)) # resistance of thermistor lnr = log(r) Tinv = self.c1 + (self.c2*lnr) + (self.c3*pow(lnr,3)) - return (1/Tinv) - 273.15 # temperature + return (1/Tinv) - ZERO # temperature - def adc(self,temp): + def adc(self, temp): "Convert temperature into a ADC reading" - y = (self.c1 - (1/(temp+273.15))) / (2*self.c3) - x = sqrt(pow(self.c2 / (3*self.c3),3) + pow(y,2)) - r = exp(pow(x-y,1.0/3) - pow(x+y,1.0/3)) # resistance of thermistor - return (r / (self.rp + r)) * (1024) + x = (self.c1 - (1.0 / (temp+ZERO))) / (2*self.c3) + y = sqrt(pow(self.c2 / (3*self.c3),3) + pow(x,2)) + r = exp(pow(y-x,1.0/3) - pow(y+x,1.0/3)) # resistance of thermistor + return (r / (self.rp + r)) * ARES def main(argv): "Default values" From 81363bc4414d538544c93cb681ab4ebc93fb8883 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 6 Jan 2015 10:27:40 +0100 Subject: [PATCH 5/9] more cleanups --- .../scripts/createTemperatureLookupMarlin.py | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Marlin/scripts/createTemperatureLookupMarlin.py b/Marlin/scripts/createTemperatureLookupMarlin.py index f23db1393..f71c87b35 100755 --- a/Marlin/scripts/createTemperatureLookupMarlin.py +++ b/Marlin/scripts/createTemperatureLookupMarlin.py @@ -12,9 +12,9 @@ Usage: python createTemperatureLookup.py [options] Options: -h, --help show this help --rp=... pull-up resistor - --t1=ttt:rrr low temperature temperature:resistance point (around 25C) - --t2=ttt:rrr middle temperature temperature:resistance point (around 150C) - --t3=ttt:rrr high temperature temperature:resistance point (around 250C) + --t1=ttt:rrr low temperature temperature:resistance point (around 25 degC) + --t2=ttt:rrr middle temperature temperature:resistance point (around 150 degC) + --t3=ttt:rrr high temperature temperature:resistance point (around 250 degC) --num-temps=... the number of temperature points to calculate (default: 36) """ @@ -50,25 +50,24 @@ class Thermistor: self.c3 = c self.rp = rp # pull-up resistance - def res(self, adc): + def resol(self, adc): "Convert ADC reading into a resolution" res = self.temp(adc)-self.temp(adc+1) return res - def v(self, adc): + def voltage(self, adc): "Convert ADC reading into a Voltage" return adc * VSTEP # convert the 10 bit ADC value to a voltage - def r(self, adc): + def resist(self, adc): "Convert ADC reading into a resistance in Ohms" - r = self.rp * self.v(adc) / (VCC - self.v(adc)) # resistance of thermistor + r = self.rp * self.voltage(adc) / (VCC - self.voltage(adc)) # resistance of thermistor return r def temp(self, adc): "Convert ADC reading into a temperature in Celcius" - r = self.rp * self.v(adc) / (VCC - self.v(adc)) # resistance of thermistor - lnr = log(r) - Tinv = self.c1 + (self.c2*lnr) + (self.c3*pow(lnr,3)) + l = log(self.resist(adc)) + Tinv = self.c1 + self.c2*l + self.c3*pow(l,3) # inverse temperature return (1/Tinv) - ZERO # temperature def adc(self, temp): @@ -87,7 +86,7 @@ def main(argv): t3 = 250 # high temperature in Kelvin (250 degC) r3 = 226.15 # resistance at high temperature (226.15 Ohm) rp = 4700; # pull-up resistor (4.7 kOhm) - num_temps = int(36); # number of entries for look-up table + num_temps = 36; # number of entries for look-up table try: opts, args = getopt.getopt(argv, "h", ["help", "rp=", "t1=", "t2=", "t3=", "num-temps="]) @@ -130,11 +129,12 @@ def main(argv): print "const short temptable[NUMTEMPS][2] PROGMEM = {" for temp in temps: - print " { (short) (%7.2f * OVERSAMPLENR ), %s\t}%s // v=%.3f\tr=%.3f\tres=%.3f degC/count" % ( t.adc(temp), temp, \ + adc = t.adc(temp) + print " { (short) (%7.2f * OVERSAMPLENR ), %4s }%s // v=%.3f\tr=%.3f\tres=%.3f degC/count" % (adc , temp, \ ',' if temp != temps[-1] else ' ', \ - t.v( t.adc(temp)), \ - t.r( t.adc(temp)), \ - t.res(t.adc(temp)) \ + t.voltage(adc), \ + t.resist( adc), \ + t.resol( adc) \ ) print "};" From 4e02aff9b50ea2e55db7419a1ffdbfe8fa865f02 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 6 Jan 2015 10:28:19 +0100 Subject: [PATCH 6/9] automatically determine min/max temp for terminator --- Marlin/scripts/createTemperatureLookupMarlin.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Marlin/scripts/createTemperatureLookupMarlin.py b/Marlin/scripts/createTemperatureLookupMarlin.py index f71c87b35..80c9be52f 100755 --- a/Marlin/scripts/createTemperatureLookupMarlin.py +++ b/Marlin/scripts/createTemperatureLookupMarlin.py @@ -114,16 +114,21 @@ def main(argv): t3 = float(arg[0]) r3 = float(arg[1]) elif opt == "--num-temps": - num_temps = int(arg) + num_temps = int(arg) - increment = int((ARES-1)/(num_temps-1)); t = Thermistor(rp, t1, r1, t2, r2, t3, r3) - tmp = (TMIN-TMAX) / (num_temps-1) - temps = range(TMAX, TMIN+tmp, tmp); + increment = int((ARES-1)/(num_temps-1)); + step = (TMIN-TMAX) / (num_temps-1) + low_bound = t.temp(ARES-1); + up_bound = t.temp(1); + min_temp = int(TMIN if TMIN > low_bound else low_bound) + max_temp = int(TMAX if TMAX < up_bound else up_bound) + temps = range(max_temp, TMIN+step, step); 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 "// Steinhart-Hart Coefficients: a=%.15g, b=%.15g, c=%.15g " % (t.c1, t.c2, t.c3) + print "// Theoretical limits of termistor: %.2f to %.2f degC" % (low_bound, up_bound) print print "#define NUMTEMPS %s" % (len(temps)) print "const short temptable[NUMTEMPS][2] PROGMEM = {" From f7e65935fbd394a952c102928ee33958c2b2e076 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 6 Jan 2015 10:28:43 +0100 Subject: [PATCH 7/9] make use of power operator --- Marlin/scripts/createTemperatureLookupMarlin.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Marlin/scripts/createTemperatureLookupMarlin.py b/Marlin/scripts/createTemperatureLookupMarlin.py index 80c9be52f..0e05981a1 100755 --- a/Marlin/scripts/createTemperatureLookupMarlin.py +++ b/Marlin/scripts/createTemperatureLookupMarlin.py @@ -26,7 +26,7 @@ import getopt ZERO = 273.15 # zero point of Kelvin scale VADC = 5 # ADC voltage VCC = 5 # supply voltage -ARES = pow(2,10) # 10 Bit ADC resolution +ARES = 2**10 # 10 Bit ADC resolution VSTEP = VADC / ARES # ADC voltage resolution TMIN = 0 # lowest temperature in table TMAX = 350 # highest temperature in table @@ -43,8 +43,6 @@ class Thermistor: x = (y2 - y1) / (l2 - l1) y = (y3 - y1) / (l3 - l1) c = (y - x) / ((l3 - l2) * (l1 + l2 + l3)) - b = x - c * (pow(l1,2) + pow(l2,2) + l1*l2) - a = y1 - (b + pow(l1,2)*c)*l1 self.c1 = a # Steinhart-Hart coefficients self.c2 = b self.c3 = c @@ -67,14 +65,14 @@ class Thermistor: def temp(self, adc): "Convert ADC reading into a temperature in Celcius" l = log(self.resist(adc)) - Tinv = self.c1 + self.c2*l + self.c3*pow(l,3) # inverse temperature + Tinv = self.c1 + self.c2*l + self.c3* l**3) # inverse temperature return (1/Tinv) - ZERO # temperature def adc(self, temp): "Convert temperature into a ADC reading" x = (self.c1 - (1.0 / (temp+ZERO))) / (2*self.c3) - y = sqrt(pow(self.c2 / (3*self.c3),3) + pow(x,2)) - r = exp(pow(y-x,1.0/3) - pow(y+x,1.0/3)) # resistance of thermistor + y = sqrt((self.c2 / (3*self.c3)**3 + x**2) + r = exp((y-x)**(1.0/3) - (y+x)**(1.0/3)) return (r / (self.rp + r)) * ARES def main(argv): From df17a6a1b44176fe571d21e79bb7b682f1b71c8b Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 6 Jan 2015 10:29:26 +0100 Subject: [PATCH 8/9] fix #1305 by proposed workaround (thanks gaby64) --- Marlin/scripts/createTemperatureLookupMarlin.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Marlin/scripts/createTemperatureLookupMarlin.py b/Marlin/scripts/createTemperatureLookupMarlin.py index 0e05981a1..4f54c2833 100755 --- a/Marlin/scripts/createTemperatureLookupMarlin.py +++ b/Marlin/scripts/createTemperatureLookupMarlin.py @@ -43,6 +43,14 @@ class Thermistor: x = (y2 - y1) / (l2 - l1) y = (y3 - y1) / (l3 - l1) c = (y - x) / ((l3 - l2) * (l1 + l2 + l3)) + b = x - c * (l1**2 + l2**2 + l1*l2) + a = y1 - (b + l1**2 *c)*l1 + + if c < 0: + print "//////////////////////////////////////////////////////////////////////////////////////" + print "// WARNING: negative coefficient 'c'! Something may be wrong with the measurements! //" + print "//////////////////////////////////////////////////////////////////////////////////////" + c = -c self.c1 = a # Steinhart-Hart coefficients self.c2 = b self.c3 = c From f25e793cff5ddbdddd733df94a2351ccc804052c Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 6 Jan 2015 10:30:20 +0100 Subject: [PATCH 9/9] rename stepper lookup table scipt to be consistent with termistor lookup table script --- .../{create_speed_lookuptable.py => createSpeedLookupTable.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Marlin/scripts/{create_speed_lookuptable.py => createSpeedLookupTable.py} (100%) diff --git a/Marlin/scripts/create_speed_lookuptable.py b/Marlin/scripts/createSpeedLookupTable.py similarity index 100% rename from Marlin/scripts/create_speed_lookuptable.py rename to Marlin/scripts/createSpeedLookupTable.py