From 34d72198e68a6d2c9ccd142bc76afacd1d2049cc Mon Sep 17 00:00:00 2001 From: jeanmarc Date: Tue, 22 May 2012 10:05:39 +0100 Subject: [PATCH] more thermistor tables added --- Marlin/Configuration.h | 21 ++++---- Marlin/pins.h | 4 +- Marlin/thermistortables.h | 108 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 11 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 20589d5620..edd6947ab2 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -46,15 +46,18 @@ // 5 is ParCan supplied 104GT-2 100K // 6 is EPCOS 100k // 7 is 100k Honeywell thermistor 135-104LAG-J01 -// 100 is 100k GE Sensing AL03006-58.2K-97-G1 -// 101 is 100k 0603 SMD Vishay NTCS0603E3104FXT -// 102 is 100k EPCOS G57540 Nozzle -// 103 is 100k EPCOS G57540 Bed +// 100 is 100k GE Sensing AL03006-58.2K-97-G1 with r2=4k7 +// 101 is 100k 0603 SMD Vishay NTCS0603E3104FXT with r2=4k7 +// 102 is 100k EPCOS G57540 Nozzle with r2=4k7 +// 103 is 100k EPCOS G57540 Bed with r2=4k7 +// 104 is 10k G57540 Bed with r2=4k7 +// 105 is 10k G57540 Bed with r2=10k +// 110 is reprappro xmas huxley hot end with 10K resistor (RS thermistor 198-961) -#define TEMP_SENSOR_0 100 +#define TEMP_SENSOR_0 110 #define TEMP_SENSOR_1 0 #define TEMP_SENSOR_2 0 -#define TEMP_SENSOR_BED 101 +#define TEMP_SENSOR_BED 105 // Actual temperature must be close to target for this long before M109 returns success #define TEMP_RESIDENCY_TIME 10 // (seconds) @@ -155,9 +158,9 @@ const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of t #define min_software_endstops true //If true, axis won't move to coordinates less than zero. #define max_software_endstops true //If true, axis won't move to coordinates greater than the defined lengths below. -#define X_MAX_LENGTH 145 //155 for v2 -#define Y_MAX_LENGTH 145 //150 for v2 -#define Z_MAX_LENGTH 100 +#define X_MAX_LENGTH 250 //155 for v2 +#define Y_MAX_LENGTH 200 //150 for v2 +#define Z_MAX_LENGTH 140 // The position of the homing switches. Use MAX_LENGTH * -0.5 if the center should be 0, 0, 0 #define X_HOME_POS 0 diff --git a/Marlin/pins.h b/Marlin/pins.h index 681f608056..c98a233781 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -588,7 +588,7 @@ #define PROBE_PIN -1 //29 on Melzi1284p A2, 11 on SL1.3a #define LED_PIN -1//27 //27 on Melzi1284p -#define FAN_PIN 12 //4 on Melzi1284p +#define FAN_PIN -1 //4 on Melzi1284p #define PS_ON_PIN -1 #define KILL_PIN -1 @@ -599,7 +599,7 @@ #ifdef SANGUINOLOLU_V_1_2 -#define HEATER_BED_PIN 10 // (bed) - 10 for spare DIO pin and bed MOSFET, 12 for SL MOSFET +#define HEATER_BED_PIN 12 // (bed) - 10 for spare DIO pin and bed MOSFET, 12 for SL MOSFET #define X_ENABLE_PIN 14 #define Y_ENABLE_PIN 14 #define Z_ENABLE_PIN 26 diff --git a/Marlin/thermistortables.h b/Marlin/thermistortables.h index 91eec98405..5da8a40fe6 100644 --- a/Marlin/thermistortables.h +++ b/Marlin/thermistortables.h @@ -475,6 +475,114 @@ const short temptable_103[][2] PROGMEM = { {1008*OVERSAMPLENR,0} }; #endif +#if (THERMISTORHEATER_0 == 104) || (THERMISTORHEATER_1 == 104) || (THERMISTORHEATER_2 == 104) || (THERMISTORBED == 104) // EPCOS G57540G103F - r2=4k7 +const short temptable_104[][2] PROGMEM = { + {1*OVERSAMPLENR, 599}, + {54*OVERSAMPLENR, 160}, + {107*OVERSAMPLENR, 123}, + {160*OVERSAMPLENR, 103}, + {213*OVERSAMPLENR, 90}, + {266*OVERSAMPLENR, 79}, + {319*OVERSAMPLENR, 70}, + {372*OVERSAMPLENR, 62}, + {425*OVERSAMPLENR, 55}, + {478*OVERSAMPLENR, 49}, + {531*OVERSAMPLENR, 43}, + {584*OVERSAMPLENR, 37}, + {637*OVERSAMPLENR, 31}, + {690*OVERSAMPLENR, 25}, + {743*OVERSAMPLENR, 19}, + {796*OVERSAMPLENR, 12}, + {849*OVERSAMPLENR, 5}, + {902*OVERSAMPLENR, -3}, + {955*OVERSAMPLENR, -16}, + {1008*OVERSAMPLENR, -42} +}; +#endif +#if (THERMISTORHEATER_0 == 105) || (THERMISTORHEATER_1 == 105) || (THERMISTORHEATER_2 == 105) || (THERMISTORBED == 105) // EPCOS G57540G103F - r2=10k +const short temptable_105[][2] PROGMEM = { + {1*OVERSAMPLENR, 460}, + {54*OVERSAMPLENR, 123}, + {107*OVERSAMPLENR, 92}, + {160*OVERSAMPLENR, 75}, + {213*OVERSAMPLENR, 63}, + {266*OVERSAMPLENR, 54}, + {319*OVERSAMPLENR, 46}, + {372*OVERSAMPLENR, 40}, + {425*OVERSAMPLENR, 34}, + {478*OVERSAMPLENR, 28}, + {531*OVERSAMPLENR, 23}, + {584*OVERSAMPLENR, 17}, + {637*OVERSAMPLENR, 12}, + {690*OVERSAMPLENR, 7}, + {743*OVERSAMPLENR, 2}, + {796*OVERSAMPLENR, -3}, + {849*OVERSAMPLENR, -10}, + {902*OVERSAMPLENR, -18}, + {955*OVERSAMPLENR, -29}, + {1008*OVERSAMPLENR, -53} +}; +#endif + +#if (THERMISTORHEATER_0 == 110) || (THERMISTORHEATER_1 == 110) || (THERMISTORHEATER_2 == 110) || (THERMISTORBED == 110) // RS thermistor 198-961 +const short temptable_110[][2] PROGMEM = { + {1*OVERSAMPLENR, 704}, + {15*OVERSAMPLENR, 280}, + {21*OVERSAMPLENR, 266}, + {41*OVERSAMPLENR, 234}, + {61*OVERSAMPLENR, 208}, + {81*OVERSAMPLENR, 191}, + {101*OVERSAMPLENR, 178}, + {121*OVERSAMPLENR, 168}, + {141*OVERSAMPLENR, 159}, + {161*OVERSAMPLENR, 152}, + {181*OVERSAMPLENR, 146}, + {221*OVERSAMPLENR, 135}, + {261*OVERSAMPLENR, 126}, + {301*OVERSAMPLENR, 118}, + {341*OVERSAMPLENR, 111}, + {381*OVERSAMPLENR, 105}, + {421*OVERSAMPLENR, 99}, + {461*OVERSAMPLENR, 94}, + {501*OVERSAMPLENR, 88}, + {541*OVERSAMPLENR, 83}, + {581*OVERSAMPLENR, 78}, + {621*OVERSAMPLENR, 73}, + {661*OVERSAMPLENR, 68}, + {741*OVERSAMPLENR, 58}, + {781*OVERSAMPLENR, 52}, + {821*OVERSAMPLENR, 46}, + {861*OVERSAMPLENR, 40}, + {901*OVERSAMPLENR, 32}, + {981*OVERSAMPLENR, 7}, + {1008*OVERSAMPLENR, 0} +}; +#endif + +#if (THERMISTORHEATER_0 == 111) || (THERMISTORHEATER_1 == 111) || (THERMISTORHEATER_2 == 111) || (THERMISTORBED == 111) //100k EPCOS +const short temptable_111[][2] PROGMEM = { + {1*OVERSAMPLENR, 704}, + {54*OVERSAMPLENR, 216}, + {107*OVERSAMPLENR, 175}, + {160*OVERSAMPLENR, 152}, + {213*OVERSAMPLENR, 137}, + {266*OVERSAMPLENR, 125}, + {319*OVERSAMPLENR, 115}, + {372*OVERSAMPLENR, 106}, + {425*OVERSAMPLENR, 99}, + {478*OVERSAMPLENR, 91}, + {531*OVERSAMPLENR, 85}, + {584*OVERSAMPLENR, 78}, + {637*OVERSAMPLENR, 71}, + {690*OVERSAMPLENR, 65}, + {743*OVERSAMPLENR, 58}, + {796*OVERSAMPLENR, 50}, + {849*OVERSAMPLENR, 42}, + {902*OVERSAMPLENR, 31}, + {955*OVERSAMPLENR, 17}, + {1008*OVERSAMPLENR, 0} +}; +#endif #define _TT_NAME(_N) temptable_ ## _N #define TT_NAME(_N) _TT_NAME(_N)