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

Revert changes in Timer class; disable safety timer in handleSafetyTimer function if safetytimer inactive time was set to zero

Browse source
This commit is contained in:
PavelSindler 2018-06-14 13:14:14 +02:00
parent 2a219143fe
commit 2026e7fe4d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Firmware/Marlin_main.cpp
View file

@ -7439,7 +7439,7 @@ static void handleSafetyTimer()
#if (EXTRUDERS > 1)
#error Implemented only for one extruder.
#endif //(EXTRUDERS > 1)
if ((PRINTER_ACTIVE) || (!degTargetBed() && !degTargetHotend(0)))
if ((PRINTER_ACTIVE) || (!degTargetBed() && !degTargetHotend(0)) || (!safetytimer_inactive_time))
{
safetyTimer.stop();
}

2
Firmware/Timer.cpp
View file

@ -43,7 +43,7 @@ void Timer<T>::start()
template<typename T>
bool Timer<T>::expired(T msPeriod)
{
if ((!m_isRunning) || (!msPeriod)) return false;
if (!m_isRunning) return false;
bool expired = false;
const T now = millis();
if (m_started <= m_started + msPeriod)