#define thermistor_pin_checksum CHECKSUM("thermistor_pin")
#define rt_curve_checksum CHECKSUM("rt_curve")
#define coefficients_checksum CHECKSUM("coefficients")
+#define use_beta_table_checksum CHECKSUM("use_beta_table")
Thermistor::Thermistor()
{
this->bad_config = false;
this->use_steinhart_hart= false;
+ this->beta= 0.0F; // not used by default
}
Thermistor::~Thermistor()
// Values are here : http://reprap.org/wiki/Thermistor
this->r0 = 100000;
this->t0 = 25;
- this->beta = 4066;
this->r1 = 0;
this->r2 = 4700;
+ // force use of beta perdefined thermistor table based on betas
+ bool use_beta_table= THEKERNEL->config->value(module_checksum, name_checksum, use_beta_table_checksum)->by_default(false)->as_bool();
+
+ bool found= false;
// load a predefined thermistor name if found
string thermistor = THEKERNEL->config->value(module_checksum, name_checksum, thermistor_checksum)->as_string();
- for (auto i : predefined_thermistors) {
- if(thermistor.compare(i.name) == 0) {
- this->beta = i.beta;
- this->r0 = i.r0;
- this->t0 = i.t0;
- this->r1 = i.r1;
- this->r2 = i.r2;
- break;
+ if(!use_beta_table) {
+ for (auto& i : predefined_thermistors) {
+ if(thermistor.compare(i.name) == 0) {
+ this->c1 = i.c1;
+ this->c2 = i.c2;
+ this->c3 = i.c3;
+ this->r1 = i.r1;
+ this->r2 = i.r2;
+ use_steinhart_hart= true;
+ found= true;
+ break;
+ }
+ }
+ }
+
+ // fall back to the old beta pre-defined table if not found above
+ if(!found) {
+ for (auto& i : predefined_thermistors_beta) {
+ if(thermistor.compare(i.name) == 0) {
+ this->beta = i.beta;
+ this->r0 = i.r0;
+ this->t0 = i.t0;
+ this->r1 = i.r1;
+ this->r2 = i.r2;
+ use_steinhart_hart= false;
+ break;
+ }
}
}
// Preset values are overriden by specified values
this->r0 = THEKERNEL->config->value(module_checksum, name_checksum, r0_checksum )->by_default(this->r0 )->as_number(); // Stated resistance eg. 100K
this->t0 = THEKERNEL->config->value(module_checksum, name_checksum, t0_checksum )->by_default(this->t0 )->as_number(); // Temperature at stated resistance, eg. 25C
- this->beta = THEKERNEL->config->value(module_checksum, name_checksum, beta_checksum)->by_default(this->beta)->as_number(); // Thermistor beta rating. See http://reprap.org/bin/view/Main/MeasuringThermistorBeta
+ this->beta = THEKERNEL->config->value(module_checksum, name_checksum, beta_checksum)->by_default(0)->as_number(); // Thermistor beta rating. See http://reprap.org/bin/view/Main/MeasuringThermistorBeta
this->r1 = THEKERNEL->config->value(module_checksum, name_checksum, r1_checksum )->by_default(this->r1 )->as_number();
this->r2 = THEKERNEL->config->value(module_checksum, name_checksum, r2_checksum )->by_default(this->r2 )->as_number();
// specify the three Steinhart-Hart coefficients
+ // specified as three comma separated floats, no spaces
string coef= THEKERNEL->config->value(module_checksum, name_checksum, coefficients_checksum)->by_default("")->as_string();
+ // speficy three temp,resistance pairs, best to use 25° 150° 240° and the coefficients will be calculated
// specified as 25.0,100000.0,150.0,1355.0,240.0,203.0 which is temp in °C,resistance in ohms
string rtc= THEKERNEL->config->value(module_checksum, name_checksum, rt_curve_checksum)->by_default("")->as_string();
if(!rtc.empty()) {
this->use_steinhart_hart= true;
}else if(!coef.empty()) {
- std::vector<float> v= parse_number_list(coef.c_str());
+ // the three Steinhart-Hart coefficients
+ // format in config is C1,C2,C3 if three are not sepcified we revert to an invalid config state
+ std::vector<float> v= parse_number_list(coef.c_str());
if(v.size() != 3) {
// punt we need 6 numbers, three pairs
THEKERNEL->streams->printf("Error in config need 3 Steinhart-Hart coefficients\n");
this->c3= v[2];
this->use_steinhart_hart= true;
- }else {
+ }else if(this->beta > 0.0F) {
// if using beta
calc_jk();
this->use_steinhart_hart= false;
+
+ }else{
+ THEKERNEL->streams->printf("Error in config need rt_curve, coefficients, beta or a valid predefined thermistor defined\n");
+ this->bad_config= true;
+ return;
}
// Thermistor pin for ADC readings
-
-typedef struct {
- const char *name;
- float beta;
- float r0;
- float t0;
- int r1;
- int r2;
-} const thermistor_table_t;
-
-static const thermistor_table_t predefined_thermistors[] {
- // name, beta, r0, t0, r1, r2
- {"EPCOS100K", 4066.0F, 100000.0F, 25.0F, 0, 4700},
- {"RRRF100K", 3960.0F, 100000.0F, 25.0F, 0, 4700},
- {"RRRF10K", 3964.0F, 10000.0F, 25.0F, 680, 1600},
- {"Honeywell100K", 3974.0F, 100000.0F, 25.0F, 0, 4700},
- {"Semitec", 4267.0F, 100000.0F, 25.0F, 0, 4700},
- {"HT100K", 3990.0F, 100000.0F, 25.0F, 0, 4700}
-};
+
+typedef struct {
+ const char *name;
+ int r1;
+ int r2;
+ float beta, r0, t0;
+} const thermistor_beta_table_t;
+
+static const thermistor_beta_table_t predefined_thermistors_beta[] {
+ // name, r1, r2, beta, r0, t0
+ {"EPCOS100K", 0, 4700, 4066.0F, 100000.0F, 25.0F}, // B57540G0104F000
+ {"RRRF100K", 0, 4700, 3960.0F, 100000.0F, 25.0F},
+ {"RRRF10K", 680, 1600, 3964.0F, 10000.0F, 25.0F},
+ {"Honeywell100K", 0, 4700, 3974.0F, 100000.0F, 25.0F}, // 135-104LAG-J01
+ {"Semitec", 0, 4700, 4267.0F, 100000.0F, 25.0F}, // 104GT-2
+ {"HT100K", 0, 4700, 3990.0F, 100000.0F, 25.0F}
+};
+
+typedef struct {
+ const char *name;
+ int r1;
+ int r2;
+ float c1, c2, c3;
+} const thermistor_table_t;
+
+// Using https://github.com/MarlinFirmware/Marlin/blob/Development/Marlin/scripts/createTemperatureLookupMarlin.py to find the coefficeints for these
+static const thermistor_table_t predefined_thermistors[] {
+ // name, r1, r2, c1, c2, c3
+ {"EPCOS100K", 0, 4700, 0.000722378300319346F, 0.000216301852054578F, 9.2641025635702e-08F}, // B57540G0104F000
+ {"Honeywell100K", 0, 4700, 0.000596153185928425F, 0.000231333192738335F, 6.19534004306738e-08F}, // 135-104LAG-J01
+ {"Semitec", 0, 4700, 0.000811290160145459F, 0.000211355789144265F, 7.17614730463848e-08F}, // 104GT-2
+ {"Honeywell-QAD", 0, 4700, 0.000827339299500986F, 0.000208786427208899F, 8.05595282332277e-08F} // 135-104QAD-J01
+};
+
HCoop / clinton / Smoothieware.git / commitdiff