|
|
|
@ -874,7 +874,7 @@ void Temperature::manage_heater() {
|
|
|
|
|
|
|
|
|
|
// Derived from RepRap FiveD extruder::getTemperature()
|
|
|
|
|
// For hot end temperature measurement.
|
|
|
|
|
float Temperature::analog2temp(int raw, uint8_t e) {
|
|
|
|
|
float Temperature::analog2temp(const int raw, const uint8_t e) {
|
|
|
|
|
#if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
|
|
|
|
|
if (e > HOTENDS)
|
|
|
|
|
#else
|
|
|
|
@ -915,9 +915,10 @@ float Temperature::analog2temp(int raw, uint8_t e) {
|
|
|
|
|
return ((raw * ((5.0 * 100.0) / 1024.0) / OVERSAMPLENR) * (TEMP_SENSOR_AD595_GAIN)) + TEMP_SENSOR_AD595_OFFSET;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Derived from RepRap FiveD extruder::getTemperature()
|
|
|
|
|
// For bed temperature measurement.
|
|
|
|
|
float Temperature::analog2tempBed(const int raw) {
|
|
|
|
|
#if HAS_TEMP_BED
|
|
|
|
|
// Derived from RepRap FiveD extruder::getTemperature()
|
|
|
|
|
// For bed temperature measurement.
|
|
|
|
|
float Temperature::analog2tempBed(const int raw) {
|
|
|
|
|
#if ENABLED(BED_USES_THERMISTOR)
|
|
|
|
|
float celsius = 0;
|
|
|
|
|
byte i;
|
|
|
|
@ -947,7 +948,8 @@ float Temperature::analog2tempBed(const int raw) {
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif // HAS_TEMP_BED
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Get the raw values into the actual temperatures.
|
|
|
|
@ -1234,6 +1236,7 @@ void Temperature::init() {
|
|
|
|
|
#endif // HOTENDS > 2
|
|
|
|
|
#endif // HOTENDS > 1
|
|
|
|
|
|
|
|
|
|
#if HAS_TEMP_BED
|
|
|
|
|
#ifdef BED_MINTEMP
|
|
|
|
|
while (analog2tempBed(bed_minttemp_raw) < BED_MINTEMP) {
|
|
|
|
|
#if HEATER_BED_RAW_LO_TEMP < HEATER_BED_RAW_HI_TEMP
|
|
|
|
@ -1252,6 +1255,7 @@ void Temperature::init() {
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
#endif // BED_MAXTEMP
|
|
|
|
|
#endif //HAS_TEMP_BED
|
|
|
|
|
|
|
|
|
|
#if ENABLED(PROBING_HEATERS_OFF)
|
|
|
|
|
paused = false;
|
|
|
|
|