Merge pull request #365 from DanieleSdei/Marlin_v1
Marlin v1, italian MSG_RESUMING and RepRapPro thermistor tables.
This commit is contained in:
commit
236bb2c110
@ -72,6 +72,9 @@
|
||||
// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan) (4.7k pullup)
|
||||
// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup)
|
||||
// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)
|
||||
// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
|
||||
// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
|
||||
// 10 is 100k RS thermistor 198-961 (4.7k pullup)
|
||||
//
|
||||
// 1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k
|
||||
// (but gives greater accuracy and more stable PID)
|
||||
|
@ -571,7 +571,7 @@
|
||||
#define MSG_NO_CARD "Keine SDKarte"
|
||||
#define MSG_DWELL "Warten..."
|
||||
#define MSG_USERWAIT "Warte auf Nutzer..."
|
||||
#define MSG_RESUMING "Druck fortsetzung"
|
||||
#define MSG_RESUMING "Druck fortsetzung"
|
||||
#define MSG_NO_MOVE "Kein Zug."
|
||||
#define MSG_PART_RELEASE "Stepper tlw frei"
|
||||
#define MSG_KILLED "KILLED"
|
||||
@ -1036,6 +1036,7 @@
|
||||
#define MSG_NO_CARD " No Card"
|
||||
#define MSG_DWELL " Sospensione..."
|
||||
#define MSG_USERWAIT "Attendi utente..."
|
||||
#define MSG_RESUMING "Riprendi stampa"
|
||||
#define MSG_NO_MOVE "Nessun movimento."
|
||||
#define MSG_PART_RELEASE "Rilascio Parziale"
|
||||
#define MSG_KILLED "UCCISO. "
|
||||
|
@ -312,8 +312,105 @@ const short temptable_7[][2] PROGMEM = {
|
||||
{1023*OVERSAMPLENR, 0} //to allow internal 0°C
|
||||
};
|
||||
#endif
|
||||
#if (THERMISTORHEATER_0 == 8) || (THERMISTORHEATER_1 == 8) || (THERMISTORHEATER_2 == 8) || (THERMISTORBED == 8)
|
||||
// 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)
|
||||
const short temptable_8[][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
|
||||
#if (THERMISTORHEATER_0 == 9) || (THERMISTORHEATER_1 == 9) || (THERMISTORHEATER_2 == 9) || (THERMISTORBED == 9)
|
||||
// 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)
|
||||
const short temptable_9[][2] PROGMEM = {
|
||||
{1*OVERSAMPLENR, 936},
|
||||
{36*OVERSAMPLENR, 300},
|
||||
{71*OVERSAMPLENR, 246},
|
||||
{106*OVERSAMPLENR, 218},
|
||||
{141*OVERSAMPLENR, 199},
|
||||
{176*OVERSAMPLENR, 185},
|
||||
{211*OVERSAMPLENR, 173},
|
||||
{246*OVERSAMPLENR, 163},
|
||||
{281*OVERSAMPLENR, 155},
|
||||
{316*OVERSAMPLENR, 147},
|
||||
{351*OVERSAMPLENR, 140},
|
||||
{386*OVERSAMPLENR, 134},
|
||||
{421*OVERSAMPLENR, 128},
|
||||
{456*OVERSAMPLENR, 122},
|
||||
{491*OVERSAMPLENR, 117},
|
||||
{526*OVERSAMPLENR, 112},
|
||||
{561*OVERSAMPLENR, 107},
|
||||
{596*OVERSAMPLENR, 102},
|
||||
{631*OVERSAMPLENR, 97},
|
||||
{666*OVERSAMPLENR, 92},
|
||||
{701*OVERSAMPLENR, 87},
|
||||
{736*OVERSAMPLENR, 81},
|
||||
{771*OVERSAMPLENR, 76},
|
||||
{806*OVERSAMPLENR, 70},
|
||||
{841*OVERSAMPLENR, 63},
|
||||
{876*OVERSAMPLENR, 56},
|
||||
{911*OVERSAMPLENR, 48},
|
||||
{946*OVERSAMPLENR, 38},
|
||||
{981*OVERSAMPLENR, 23},
|
||||
{1005*OVERSAMPLENR, 5},
|
||||
{1016*OVERSAMPLENR, 0}
|
||||
};
|
||||
#endif
|
||||
#if (THERMISTORHEATER_0 == 10) || (THERMISTORHEATER_1 == 10) || (THERMISTORHEATER_2 == 10) || (THERMISTORBED == 10)
|
||||
// 100k RS thermistor 198-961 (4.7k pullup)
|
||||
const short temptable_10[][2] PROGMEM = {
|
||||
{1*OVERSAMPLENR, 929},
|
||||
{36*OVERSAMPLENR, 299},
|
||||
{71*OVERSAMPLENR, 246},
|
||||
{106*OVERSAMPLENR, 217},
|
||||
{141*OVERSAMPLENR, 198},
|
||||
{176*OVERSAMPLENR, 184},
|
||||
{211*OVERSAMPLENR, 173},
|
||||
{246*OVERSAMPLENR, 163},
|
||||
{281*OVERSAMPLENR, 154},
|
||||
{316*OVERSAMPLENR, 147},
|
||||
{351*OVERSAMPLENR, 140},
|
||||
{386*OVERSAMPLENR, 134},
|
||||
{421*OVERSAMPLENR, 128},
|
||||
{456*OVERSAMPLENR, 122},
|
||||
{491*OVERSAMPLENR, 117},
|
||||
{526*OVERSAMPLENR, 112},
|
||||
{561*OVERSAMPLENR, 107},
|
||||
{596*OVERSAMPLENR, 102},
|
||||
{631*OVERSAMPLENR, 97},
|
||||
{666*OVERSAMPLENR, 91},
|
||||
{701*OVERSAMPLENR, 86},
|
||||
{736*OVERSAMPLENR, 81},
|
||||
{771*OVERSAMPLENR, 76},
|
||||
{806*OVERSAMPLENR, 70},
|
||||
{841*OVERSAMPLENR, 63},
|
||||
{876*OVERSAMPLENR, 56},
|
||||
{911*OVERSAMPLENR, 48},
|
||||
{946*OVERSAMPLENR, 38},
|
||||
{981*OVERSAMPLENR, 23},
|
||||
{1005*OVERSAMPLENR, 5},
|
||||
{1016*OVERSAMPLENR, 0}
|
||||
};
|
||||
#endif
|
||||
|
||||
#if (THERMISTORHEATER_0 == 51) || (THERMISTORHEATER_1 == 51) || (THERMISTORHEATER_2 == 51) || (THERMISTORBED == 51)
|
||||
#if (THERMISTORHEATER_0 == 51) || (THERMISTORHEATER_1 == 51) || (THERMISTORHEATER_2 == 51) || (THERMISTORBED == 51)
|
||||
// 100k EPCOS (WITH 1kohm RESISTOR FOR PULLUP, R9 ON SANGUINOLOLU! NOT FOR 4.7kohm PULLUP! THIS IS NOT NORMAL!)
|
||||
// Verified by linagee.
|
||||
// Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance
|
||||
|
Loading…
Reference in New Issue
Block a user