Cosmetic changes and small fix for thermistortables.h
・Adjust spacing ・Standardize comments position ・Remove ',' at the tail of array
This commit is contained in:
parent
71a7408012
commit
385945ca31
1 changed files with 933 additions and 932 deletions
|
@ -29,7 +29,6 @@
|
||||||
#define OVERSAMPLENR 16
|
#define OVERSAMPLENR 16
|
||||||
|
|
||||||
#if (THERMISTORHEATER_0 == 1) || (THERMISTORHEATER_1 == 1) || (THERMISTORHEATER_2 == 1) || (THERMISTORHEATER_3 == 1) || (THERMISTORBED == 1) //100k bed thermistor
|
#if (THERMISTORHEATER_0 == 1) || (THERMISTORHEATER_1 == 1) || (THERMISTORHEATER_2 == 1) || (THERMISTORHEATER_3 == 1) || (THERMISTORBED == 1) //100k bed thermistor
|
||||||
|
|
||||||
const short temptable_1[][2] PROGMEM = {
|
const short temptable_1[][2] PROGMEM = {
|
||||||
{ 23 * OVERSAMPLENR, 300 },
|
{ 23 * OVERSAMPLENR, 300 },
|
||||||
{ 25 * OVERSAMPLENR, 295 },
|
{ 25 * OVERSAMPLENR, 295 },
|
||||||
|
@ -94,11 +93,12 @@ const short temptable_1[][2] PROGMEM = {
|
||||||
{ 1008 * OVERSAMPLENR, 0 } // safety
|
{ 1008 * OVERSAMPLENR, 0 } // safety
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (THERMISTORHEATER_0 == 2) || (THERMISTORHEATER_1 == 2) || (THERMISTORHEATER_2 == 2) || (THERMISTORHEATER_3 == 2) || (THERMISTORBED == 2) //200k bed thermistor
|
#if (THERMISTORHEATER_0 == 2) || (THERMISTORHEATER_1 == 2) || (THERMISTORHEATER_2 == 2) || (THERMISTORHEATER_3 == 2) || (THERMISTORBED == 2) //200k bed thermistor
|
||||||
const short temptable_2[][2] PROGMEM = {
|
|
||||||
// 200k ATC Semitec 204GT-2
|
// 200k ATC Semitec 204GT-2
|
||||||
// Verified by linagee. Source: http://shop.arcol.hu/static/datasheets/thermistors.pdf
|
// Verified by linagee. Source: http://shop.arcol.hu/static/datasheets/thermistors.pdf
|
||||||
// Calculated using 4.7kohm pullup, voltage divider math, and manufacturer provided temp/resistance
|
// Calculated using 4.7kohm pullup, voltage divider math, and manufacturer provided temp/resistance
|
||||||
|
const short temptable_2[][2] PROGMEM = {
|
||||||
{ 1 * OVERSAMPLENR, 848 },
|
{ 1 * OVERSAMPLENR, 848 },
|
||||||
{ 30 * OVERSAMPLENR, 300 }, // top rating 300C
|
{ 30 * OVERSAMPLENR, 300 }, // top rating 300C
|
||||||
{ 34 * OVERSAMPLENR, 290 },
|
{ 34 * OVERSAMPLENR, 290 },
|
||||||
|
@ -130,10 +130,10 @@ const short temptable_2[][2] PROGMEM = {
|
||||||
{ 993 * OVERSAMPLENR, 30 },
|
{ 993 * OVERSAMPLENR, 30 },
|
||||||
{ 1004 * OVERSAMPLENR, 20 },
|
{ 1004 * OVERSAMPLENR, 20 },
|
||||||
{ 1012 * OVERSAMPLENR, 10 },
|
{ 1012 * OVERSAMPLENR, 10 },
|
||||||
{1016 * OVERSAMPLENR, 0},
|
{ 1016 * OVERSAMPLENR, 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (THERMISTORHEATER_0 == 3) || (THERMISTORHEATER_1 == 3) || (THERMISTORHEATER_2 == 3) || (THERMISTORHEATER_3 == 3) || (THERMISTORBED == 3) //mendel-parts
|
#if (THERMISTORHEATER_0 == 3) || (THERMISTORHEATER_1 == 3) || (THERMISTORHEATER_2 == 3) || (THERMISTORHEATER_3 == 3) || (THERMISTORBED == 3) //mendel-parts
|
||||||
const short temptable_3[][2] PROGMEM = {
|
const short temptable_3[][2] PROGMEM = {
|
||||||
{ 1 * OVERSAMPLENR, 864 },
|
{ 1 * OVERSAMPLENR, 864 },
|
||||||
|
@ -165,8 +165,8 @@ const short temptable_3[][2] PROGMEM = {
|
||||||
{ 1008 * OVERSAMPLENR, 0 },
|
{ 1008 * OVERSAMPLENR, 0 },
|
||||||
{ 1018 * OVERSAMPLENR, -20 }
|
{ 1018 * OVERSAMPLENR, -20 }
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (THERMISTORHEATER_0 == 4) || (THERMISTORHEATER_1 == 4) || (THERMISTORHEATER_2 == 4) || (THERMISTORHEATER_3 == 4) || (THERMISTORBED == 4) //10k thermistor
|
#if (THERMISTORHEATER_0 == 4) || (THERMISTORHEATER_1 == 4) || (THERMISTORHEATER_2 == 4) || (THERMISTORHEATER_3 == 4) || (THERMISTORBED == 4) //10k thermistor
|
||||||
const short temptable_4[][2] PROGMEM = {
|
const short temptable_4[][2] PROGMEM = {
|
||||||
{ 1 * OVERSAMPLENR, 430 },
|
{ 1 * OVERSAMPLENR, 430 },
|
||||||
|
@ -193,10 +193,10 @@ const short temptable_4[][2] PROGMEM = {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (THERMISTORHEATER_0 == 5) || (THERMISTORHEATER_1 == 5) || (THERMISTORHEATER_2 == 5) || (THERMISTORHEATER_3 == 5) || (THERMISTORBED == 5) //100k ParCan thermistor (104GT-2)
|
#if (THERMISTORHEATER_0 == 5) || (THERMISTORHEATER_1 == 5) || (THERMISTORHEATER_2 == 5) || (THERMISTORHEATER_3 == 5) || (THERMISTORBED == 5) //100k ParCan thermistor (104GT-2)
|
||||||
const short temptable_5[][2] PROGMEM = {
|
|
||||||
// ATC Semitec 104GT-2 (Used in ParCan)
|
// ATC Semitec 104GT-2 (Used in ParCan)
|
||||||
// Verified by linagee. Source: http://shop.arcol.hu/static/datasheets/thermistors.pdf
|
// Verified by linagee. Source: http://shop.arcol.hu/static/datasheets/thermistors.pdf
|
||||||
// Calculated using 4.7kohm pullup, voltage divider math, and manufacturer provided temp/resistance
|
// Calculated using 4.7kohm pullup, voltage divider math, and manufacturer provided temp/resistance
|
||||||
|
const short temptable_5[][2] PROGMEM = {
|
||||||
{ 1 * OVERSAMPLENR, 713 },
|
{ 1 * OVERSAMPLENR, 713 },
|
||||||
{ 17 * OVERSAMPLENR, 300 }, // top rating 300C
|
{ 17 * OVERSAMPLENR, 300 }, // top rating 300C
|
||||||
{ 20 * OVERSAMPLENR, 290 },
|
{ 20 * OVERSAMPLENR, 290 },
|
||||||
|
@ -485,7 +485,7 @@ const short temptable_71[][2] PROGMEM = {
|
||||||
{ 995 * OVERSAMPLENR, 15 },
|
{ 995 * OVERSAMPLENR, 15 },
|
||||||
{ 1001 * OVERSAMPLENR, 10 },
|
{ 1001 * OVERSAMPLENR, 10 },
|
||||||
{ 1006 * OVERSAMPLENR, 5 },
|
{ 1006 * OVERSAMPLENR, 5 },
|
||||||
{1010 * OVERSAMPLENR, 0},
|
{ 1010 * OVERSAMPLENR, 0 }
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -514,6 +514,7 @@ const short temptable_8[][2] PROGMEM = {
|
||||||
{ 1008 * OVERSAMPLENR, 0 }
|
{ 1008 * OVERSAMPLENR, 0 }
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (THERMISTORHEATER_0 == 9) || (THERMISTORHEATER_1 == 9) || (THERMISTORHEATER_2 == 9) || (THERMISTORHEATER_3 == 9) || (THERMISTORBED == 9)
|
#if (THERMISTORHEATER_0 == 9) || (THERMISTORHEATER_1 == 9) || (THERMISTORHEATER_2 == 9) || (THERMISTORHEATER_3 == 9) || (THERMISTORBED == 9)
|
||||||
// 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
|
// 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
|
||||||
const short temptable_9[][2] PROGMEM = {
|
const short temptable_9[][2] PROGMEM = {
|
||||||
|
@ -550,6 +551,7 @@ const short temptable_9[][2] PROGMEM = {
|
||||||
{ 1016 * OVERSAMPLENR, 0 }
|
{ 1016 * OVERSAMPLENR, 0 }
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (THERMISTORHEATER_0 == 10) || (THERMISTORHEATER_1 == 10) || (THERMISTORHEATER_2 == 10) || (THERMISTORHEATER_3 == 10) || (THERMISTORBED == 10)
|
#if (THERMISTORHEATER_0 == 10) || (THERMISTORHEATER_1 == 10) || (THERMISTORHEATER_2 == 10) || (THERMISTORHEATER_3 == 10) || (THERMISTORBED == 10)
|
||||||
// 100k RS thermistor 198-961 (4.7k pullup)
|
// 100k RS thermistor 198-961 (4.7k pullup)
|
||||||
const short temptable_10[][2] PROGMEM = {
|
const short temptable_10[][2] PROGMEM = {
|
||||||
|
@ -589,7 +591,6 @@ const short temptable_10[][2] PROGMEM = {
|
||||||
|
|
||||||
#if (THERMISTORHEATER_0 == 11) || (THERMISTORHEATER_1 == 11) || (THERMISTORHEATER_2 == 11) || (THERMISTORHEATER_3 == 11) || (THERMISTORBED == 11)
|
#if (THERMISTORHEATER_0 == 11) || (THERMISTORHEATER_1 == 11) || (THERMISTORHEATER_2 == 11) || (THERMISTORHEATER_3 == 11) || (THERMISTORBED == 11)
|
||||||
// QU-BD silicone bed QWG-104F-3950 thermistor
|
// QU-BD silicone bed QWG-104F-3950 thermistor
|
||||||
|
|
||||||
const short temptable_11[][2] PROGMEM = {
|
const short temptable_11[][2] PROGMEM = {
|
||||||
{ 1 * OVERSAMPLENR, 938 },
|
{ 1 * OVERSAMPLENR, 938 },
|
||||||
{ 31 * OVERSAMPLENR, 314 },
|
{ 31 * OVERSAMPLENR, 314 },
|
||||||
|
@ -646,7 +647,6 @@ const short temptable_11[][2] PROGMEM = {
|
||||||
|
|
||||||
#if (THERMISTORHEATER_0 == 13) || (THERMISTORHEATER_1 == 13) || (THERMISTORHEATER_2 == 13) || (THERMISTORHEATER_3 == 13) || (THERMISTORBED == 13)
|
#if (THERMISTORHEATER_0 == 13) || (THERMISTORHEATER_1 == 13) || (THERMISTORHEATER_2 == 13) || (THERMISTORHEATER_3 == 13) || (THERMISTORBED == 13)
|
||||||
// Hisens thermistor B25/50 =3950 +/-1%
|
// Hisens thermistor B25/50 =3950 +/-1%
|
||||||
|
|
||||||
const short temptable_13[][2] PROGMEM = {
|
const short temptable_13[][2] PROGMEM = {
|
||||||
{ 20.04 * OVERSAMPLENR, 300 },
|
{ 20.04 * OVERSAMPLENR, 300 },
|
||||||
{ 23.19 * OVERSAMPLENR, 290 },
|
{ 23.19 * OVERSAMPLENR, 290 },
|
||||||
|
@ -676,8 +676,8 @@ const short temptable_13[][2] PROGMEM = {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (THERMISTORHEATER_0 == 20) || (THERMISTORHEATER_1 == 20) || (THERMISTORHEATER_2 == 20) || (THERMISTORBED == 20) // PT100 with INA826 amp on Ultimaker v2.0 electronics
|
#if (THERMISTORHEATER_0 == 20) || (THERMISTORHEATER_1 == 20) || (THERMISTORHEATER_2 == 20) || (THERMISTORBED == 20) // PT100 with INA826 amp on Ultimaker v2.0 electronics
|
||||||
/* The PT100 in the Ultimaker v2.0 electronics has a high sample value for a high temperature.
|
// The PT100 in the Ultimaker v2.0 electronics has a high sample value for a high temperature.
|
||||||
This does not match the normal thermistor behaviour so we need to set the following defines */
|
// This does not match the normal thermistor behaviour so we need to set the following defines
|
||||||
#if (THERMISTORHEATER_0 == 20)
|
#if (THERMISTORHEATER_0 == 20)
|
||||||
#define HEATER_0_RAW_HI_TEMP 16383
|
#define HEATER_0_RAW_HI_TEMP 16383
|
||||||
#define HEATER_0_RAW_LO_TEMP 0
|
#define HEATER_0_RAW_LO_TEMP 0
|
||||||
|
@ -976,9 +976,10 @@ const short temptable_60[][2] PROGMEM = {
|
||||||
{ 981 * OVERSAMPLENR, 23 },
|
{ 981 * OVERSAMPLENR, 23 },
|
||||||
{ 991 * OVERSAMPLENR, 17 },
|
{ 991 * OVERSAMPLENR, 17 },
|
||||||
{ 1001 * OVERSAMPLENR, 9 },
|
{ 1001 * OVERSAMPLENR, 9 },
|
||||||
{1008 * OVERSAMPLENR, 0},
|
{ 1008 * OVERSAMPLENR, 0 }
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (THERMISTORHEATER_0 == 12) || (THERMISTORHEATER_1 == 12) || (THERMISTORHEATER_2 == 12) || (THERMISTORHEATER_3 == 12) || (THERMISTORBED == 12)
|
#if (THERMISTORHEATER_0 == 12) || (THERMISTORHEATER_1 == 12) || (THERMISTORHEATER_2 == 12) || (THERMISTORHEATER_3 == 12) || (THERMISTORBED == 12)
|
||||||
// 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
|
// 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
|
||||||
const short temptable_12[][2] PROGMEM = {
|
const short temptable_12[][2] PROGMEM = {
|
||||||
|
@ -1011,7 +1012,7 @@ const short temptable_12[][2] PROGMEM = {
|
||||||
{ 995 * OVERSAMPLENR, 15 },
|
{ 995 * OVERSAMPLENR, 15 },
|
||||||
{ 1001 * OVERSAMPLENR, 10 },
|
{ 1001 * OVERSAMPLENR, 10 },
|
||||||
{ 1010 * OVERSAMPLENR, 0 },
|
{ 1010 * OVERSAMPLENR, 0 },
|
||||||
{1023 * OVERSAMPLENR, -40},
|
{ 1023 * OVERSAMPLENR, -40 }
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Reference in a new issue