diff --git a/config/board.3drag.h b/config/board.3drag.h index 40a3367..f3c7ab7 100644 --- a/config/board.3drag.h +++ b/config/board.3drag.h @@ -149,7 +149,8 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO13, THERMISTOR_EXTRUDER) DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO14, THERMISTOR_BED) -// r0 beta r2 vadc +// Beta algorithm r0 beta r2 vadc +// Steinhart-Hart rp t0 r0 t1 r1 t2 r2 //TEMP_TABLE EXTRUDER (100000, 4092, 4700, 5.0) //TEMP_TABLE BED (100000, 4092, 4700, 5.0) //DEFINE_TEMP_SENSORS_END diff --git a/config/board.gen3.h b/config/board.gen3.h index d99ca30..78d1727 100644 --- a/config/board.gen3.h +++ b/config/board.gen3.h @@ -146,6 +146,9 @@ //DEFINE_TEMP_SENSORS_START // name type pin additional DEFINE_TEMP_SENSOR(noheater, TT_INTERCOM, AIO0, 0) + +// Beta algorithm r0 beta r2 vadc +// Steinhart-Hart rp t0 r0 t1 r1 t2 r2 //DEFINE_TEMP_SENSORS_END diff --git a/config/board.gen6.h b/config/board.gen6.h index 7d1054f..ae4f39d 100644 --- a/config/board.gen6.h +++ b/config/board.gen6.h @@ -147,7 +147,8 @@ // name type pin additional DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO5, THERMISTOR_EXTRUDER) -// r0 beta r2 vadc +// Beta algorithm r0 beta r2 vadc +// Steinhart-Hart rp t0 r0 t1 r1 t2 r2 //TEMP_TABLE EXTRUDER (100000, 4092, 4700, 5.0) //DEFINE_TEMP_SENSORS_END diff --git a/config/board.gen7-v1.1-v1.3.h b/config/board.gen7-v1.1-v1.3.h index 3dda4f6..42f56bb 100644 --- a/config/board.gen7-v1.1-v1.3.h +++ b/config/board.gen7-v1.1-v1.3.h @@ -153,7 +153,8 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO1, THERMISTOR_EXTRUDER) DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO2, THERMISTOR_BED) -// r0 beta r2 vadc +// Beta algorithm r0 beta r2 vadc +// Steinhart-Hart rp t0 r0 t1 r1 t2 r2 //TEMP_TABLE EXTRUDER (100000, 4092, 4700, 5.0) //TEMP_TABLE BED (100000, 4092, 4700, 5.0) //DEFINE_TEMP_SENSORS_END diff --git a/config/board.gen7-v1.4.h b/config/board.gen7-v1.4.h index 986b581..fdf43d8 100644 --- a/config/board.gen7-v1.4.h +++ b/config/board.gen7-v1.4.h @@ -154,7 +154,8 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO1, THERMISTOR_EXTRUDER) DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO0, THERMISTOR_BED) -// r0 beta r2 vadc +// Beta algorithm r0 beta r2 vadc +// Steinhart-Hart rp t0 r0 t1 r1 t2 r2 //TEMP_TABLE EXTRUDER (100000, 4092, 4700, 5.0) //TEMP_TABLE BED (100000, 4092, 4700, 5.0) //DEFINE_TEMP_SENSORS_END diff --git a/config/board.ramps-v1.2.h b/config/board.ramps-v1.2.h index e781927..c573527 100644 --- a/config/board.ramps-v1.2.h +++ b/config/board.ramps-v1.2.h @@ -150,7 +150,8 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO2, THERMISTOR_EXTRUDER) DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO1, THERMISTOR_BED) -// r0 beta r2 vadc +// Beta algorithm r0 beta r2 vadc +// Steinhart-Hart rp t0 r0 t1 r1 t2 r2 //TEMP_TABLE EXTRUDER (100000, 4092, 4700, 5.0) //TEMP_TABLE BED (100000, 4092, 4700, 5.0) //DEFINE_TEMP_SENSORS_END diff --git a/config/board.ramps-v1.3.h b/config/board.ramps-v1.3.h index 8b0f4cd..4d455d3 100644 --- a/config/board.ramps-v1.3.h +++ b/config/board.ramps-v1.3.h @@ -151,7 +151,8 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO13, THERMISTOR_EXTRUDER) DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO14, THERMISTOR_BED) -// r0 beta r2 vadc +// Beta algorithm r0 beta r2 vadc +// Steinhart-Hart rp t0 r0 t1 r1 t2 r2 //TEMP_TABLE EXTRUDER (100000, 4092, 4700, 5.0) //TEMP_TABLE BED (100000, 4092, 4700, 5.0) //DEFINE_TEMP_SENSORS_END diff --git a/config/board.rumba.h b/config/board.rumba.h index 7f10734..7eb3986 100644 --- a/config/board.rumba.h +++ b/config/board.rumba.h @@ -152,7 +152,8 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO15, THERMISTOR_EXTRUDER) DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO11, THERMISTOR_BED) -// r0 beta r2 vadc +// Beta algorithm r0 beta r2 vadc +// Steinhart-Hart rp t0 r0 t1 r1 t2 r2 //TEMP_TABLE EXTRUDER (100000, 4092, 4700, 5.0) //TEMP_TABLE BED (100000, 4092, 4700, 5.0) //DEFINE_TEMP_SENSORS_END diff --git a/config/board.sanguinololu-v1.1.h b/config/board.sanguinololu-v1.1.h index 8906127..573e66e 100644 --- a/config/board.sanguinololu-v1.1.h +++ b/config/board.sanguinololu-v1.1.h @@ -152,7 +152,8 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO7, THERMISTOR_EXTRUDER) DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO6, THERMISTOR_BED) -// r0 beta r2 vadc +// Beta algorithm r0 beta r2 vadc +// Steinhart-Hart rp t0 r0 t1 r1 t2 r2 //TEMP_TABLE EXTRUDER (100000, 4092, 4700, 5.0) //TEMP_TABLE BED (100000, 4092, 4700, 5.0) //DEFINE_TEMP_SENSORS_END diff --git a/config/board.sanguinololu-v1.2.h b/config/board.sanguinololu-v1.2.h index 0736b69..de2946e 100644 --- a/config/board.sanguinololu-v1.2.h +++ b/config/board.sanguinololu-v1.2.h @@ -152,7 +152,8 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO7, THERMISTOR_EXTRUDER) DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO6, THERMISTOR_BED) -// r0 beta r2 vadc +// Beta algorithm r0 beta r2 vadc +// Steinhart-Hart rp t0 r0 t1 r1 t2 r2 //TEMP_TABLE EXTRUDER (100000, 4092, 4700, 5.0) //TEMP_TABLE BED (100000, 4092, 4700, 5.0) //DEFINE_TEMP_SENSORS_END diff --git a/config/board.sanguish.h b/config/board.sanguish.h index 9bc746a..68c703a 100644 --- a/config/board.sanguish.h +++ b/config/board.sanguish.h @@ -152,7 +152,8 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO1, THERMISTOR_EXTRUDER) DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO0, THERMISTOR_BED) -// r0 beta r2 vadc +// Beta algorithm r0 beta r2 vadc +// Steinhart-Hart rp t0 r0 t1 r1 t2 r2 //TEMP_TABLE EXTRUDER (100000, 4092, 4700, 5.0) //TEMP_TABLE BED (100000, 4092, 4700, 5.0) //DEFINE_TEMP_SENSORS_END diff --git a/config/board.teensy++-v2.0.h b/config/board.teensy++-v2.0.h index 4a0b5b7..bdc8a2e 100644 --- a/config/board.teensy++-v2.0.h +++ b/config/board.teensy++-v2.0.h @@ -149,7 +149,8 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO7, THERMISTOR_EXTRUDER) DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO6, THERMISTOR_BED) -// r0 beta r2 vadc +// Beta algorithm r0 beta r2 vadc +// Steinhart-Hart rp t0 r0 t1 r1 t2 r2 //TEMP_TABLE EXTRUDER (100000, 4092, 4700, 5.0) //TEMP_TABLE BED (100000, 4092, 4700, 5.0) //DEFINE_TEMP_SENSORS_END diff --git a/config/board.teensy-v2.0.h b/config/board.teensy-v2.0.h index ecefead..85a1b77 100644 --- a/config/board.teensy-v2.0.h +++ b/config/board.teensy-v2.0.h @@ -149,7 +149,8 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO1, THERMISTOR_EXTRUDER) DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO0, THERMISTOR_BED) -// r0 beta r2 vadc +// Beta algorithm r0 beta r2 vadc +// Steinhart-Hart rp t0 r0 t1 r1 t2 r2 //TEMP_TABLE EXTRUDER (100000, 4092, 4700, 5.0) //TEMP_TABLE BED (100000, 4092, 4700, 5.0) //DEFINE_TEMP_SENSORS_END diff --git a/configtool/boardpanel.py b/configtool/boardpanel.py index 065711a..f44f30b 100644 --- a/configtool/boardpanel.py +++ b/configtool/boardpanel.py @@ -504,16 +504,26 @@ class BoardPanel(wx.Panel): fp.write(ln) fp.write("// name type pin " "additional\n"); - ttString = "\n// r0 beta r2 vadc\n" + ttString = "\n" + ttString += "// Beta algorithm r0 beta r2 vadc\n" + ttString += "// Steinhart-Hart rp t0 r0 t1 " + ttString += "r1 t2 r2\n" for s in self.sensors: sstr = "%-10s%-15s%-7s" % ((s[0] + ","), (s[1] + ","), (s[2] + ",")) if s[3] is None: sstr += "0" else: - tt = s[3] sstr += "THERMISTOR_%s" % s[0].upper() - ttString += "//TEMP_TABLE %-8s (%s)\n" % \ - (s[0].upper(), ", ".join(tt)) + tt = s[3] + if len(tt) == 4: + ttString += "//TEMP_TABLE %-8s (%-8s%-6s%-6s%s)\n" % \ + (s[0].upper(), (tt[0] + ","), (tt[1] + ","), + (tt[2] + ","), tt[3]) + else: + ttString += "//TEMP_TABLE %-8s (%-8s%-6s%-8s%-6s%-8s%-6s%s)\n" % \ + (s[0].upper(), (tt[0] + ","), (tt[1] + ","), + (tt[2] + ","), (tt[3] + ","), (tt[4] + ","), + (tt[5] + ","), tt[6]) fp.write("DEFINE_TEMP_SENSOR(%s)\n" % sstr) fp.write(ttString) skipToSensorEnd = True