Merge branch 'perftest' into stable-1.2.2

This commit is contained in:
make-ing 2015-10-12 17:49:57 +02:00
commit 17764bba89

View file

@ -256,6 +256,15 @@ class MachineCom(object):
if self._state == newState:
return
if newState == self.STATE_PRINTING:
if self._temperature_timer is not None:
self._temperature_timer.cancel()
elif newState == self.STATE_OPERATIONAL:
if self._temperature_timer is not None:
self._temperature_timer.cancel()
self._temperature_timer = RepeatedTimer(1, self._poll_temperature, run_first=True)
self._temperature_timer.start()
if newState == self.STATE_CLOSED or newState == self.STATE_CLOSED_WITH_ERROR:
if settings().get(["feature", "sdSupport"]):
self._sdFileList = False