3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge changes from upstream

Browse source
This commit is contained in:
PavelSindler 2019-02-04 15:23:39 +01:00
commit ea20529945
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Firmware/temperature.cpp
View file

@ -1990,7 +1990,7 @@ if(current_temperature_raw_ambient>(OVERSAMPLENR*MINTEMP_MINAMBIENT_RAW)) // the
// * nozzle checking // * nozzle checking
if(target_temperature[active_extruder]>minttemp[active_extruder]) if(target_temperature[active_extruder]>minttemp[active_extruder])
{ // ~ nozzle heating is on { // ~ nozzle heating is on
//bCheckingOnHeater=bCheckingOnHeater||(current_temperature[active_extruder]>=minttemp[active_extruder]); // for eventually delay cutting bCheckingOnHeater=bCheckingOnHeater||(current_temperature[active_extruder]>(minttemp[active_extruder]+TEMP_HYSTERESIS)); // for eventually delay cutting
if(oTimer4minTempHeater.expired(HEATER_MINTEMP_DELAY)||(!oTimer4minTempHeater.running())||bCheckingOnHeater) if(oTimer4minTempHeater.expired(HEATER_MINTEMP_DELAY)||(!oTimer4minTempHeater.running())||bCheckingOnHeater)
{ {
bCheckingOnHeater=true; // not necessary bCheckingOnHeater=true; // not necessary
@ -2004,7 +2004,7 @@ else { // ~ nozzle heating is off
// * bed checking // * bed checking
if(target_temperature_bed>BED_MINTEMP) if(target_temperature_bed>BED_MINTEMP)
{ // ~ bed heating is on { // ~ bed heating is on
//bCheckingOnBed=bCheckingOnBed||(current_temperature_bed>=BED_MINTEMP); // for eventually delay cutting bCheckingOnBed=bCheckingOnBed||(current_temperature_bed>(BED_MINTEMP+TEMP_HYSTERESIS)); // for eventually delay cutting
if(oTimer4minTempBed.expired(BED_MINTEMP_DELAY)||(!oTimer4minTempBed.running())||bCheckingOnBed) if(oTimer4minTempBed.expired(BED_MINTEMP_DELAY)||(!oTimer4minTempBed.running())||bCheckingOnBed)
{ {
bCheckingOnBed=true; // not necessary bCheckingOnBed=true; // not necessary