diff --git a/Marlin/language_en.h b/Marlin/language_en.h index 94e061474..a9619fa3e 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -417,6 +417,9 @@ #ifndef MSG_ERR_MAXTEMP_BED #define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED" #endif +#ifndef MSG_ERR_MINTEMP_BED +#define MSG_ERR_MINTEMP_BED "Err: MINTEMP BED" +#endif #ifndef MSG_END_HOUR #define MSG_END_HOUR "hours" #endif diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp index a689759ef..356c0057c 100644 --- a/Marlin/temperature.cpp +++ b/Marlin/temperature.cpp @@ -151,7 +151,9 @@ static int minttemp_raw[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_RAW_LO_TEMP , static int maxttemp_raw[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_RAW_HI_TEMP , HEATER_1_RAW_HI_TEMP , HEATER_2_RAW_HI_TEMP, HEATER_3_RAW_HI_TEMP); static int minttemp[EXTRUDERS] = { 0 }; static int maxttemp[EXTRUDERS] = ARRAY_BY_EXTRUDERS( 16383, 16383, 16383, 16383 ); -//static int bed_minttemp_raw = HEATER_BED_RAW_LO_TEMP; /* No bed mintemp error implemented?!? */ +#ifdef BED_MINTEMP +static int bed_minttemp_raw = HEATER_BED_RAW_LO_TEMP; +#endif #ifdef BED_MAXTEMP static int bed_maxttemp_raw = HEATER_BED_RAW_HI_TEMP; #endif @@ -472,9 +474,6 @@ void max_temp_error(uint8_t e) { void min_temp_error(uint8_t e) { _temp_error(e, PSTR(MSG_T_MINTEMP), PSTR(MSG_ERR_MINTEMP)); } -void bed_max_temp_error(void) { - _temp_error(-1, PSTR(MSG_T_MAXTEMP), PSTR(MSG_ERR_MAXTEMP_BED)); -} float get_pid_output(int e) { float pid_output; @@ -977,7 +976,6 @@ void tp_init() { #endif // EXTRUDERS > 1 #ifdef BED_MINTEMP - /* No bed MINTEMP error implemented?!? */ /* while(analog2tempBed(bed_minttemp_raw) < BED_MINTEMP) { #if HEATER_BED_RAW_LO_TEMP < HEATER_BED_RAW_HI_TEMP bed_minttemp_raw += OVERSAMPLENR; @@ -985,7 +983,6 @@ void tp_init() { bed_minttemp_raw -= OVERSAMPLENR; #endif } - */ #endif //BED_MINTEMP #ifdef BED_MAXTEMP while(analog2tempBed(bed_maxttemp_raw) > BED_MAXTEMP) { @@ -1581,7 +1578,8 @@ ISR(TIMER0_COMPB_vect) { #else #define GEBED >= #endif - if (current_temperature_bed_raw GEBED bed_maxttemp_raw) bed_max_temp_error(); + if (current_temperature_bed_raw GEBED bed_maxttemp_raw) _temp_error(-1, PSTR(MSG_T_MAXTEMP), PSTR(MSG_ERR_MAXTEMP_BED)); + if (bed_minttemp_raw GEBED current_temperature_bed_raw) _temp_error(-1, PSTR(MSG_T_MINTEMP), PSTR(MSG_ERR_MINTEMP_BED)); #endif } // temp_count >= OVERSAMPLENR