pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Virtual printer: Less code duplication in temp simulation

Browse source
This commit is contained in:
Gina Häußge 2017-08-22 11:21:04 +02:00
parent fbcbb3f5f7
commit d7298cee06
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/octoprint/plugins/virtual_printer/virtual.py
View file

@ -1008,28 +1008,34 @@ class VirtualPrinter(object):
if os.path.exists(f) and os.path.isfile(f):
os.remove(f)
def _simulateTemps(self, delta=1):
def _simulateTemps(self, delta=0.5):
timeDiff = self.lastTempAt - time.time()
self.lastTempAt = time.time()
def simulate(actual, target, ambient):
if target > 0 and abs(actual - target) > delta:
goal = target
factor = 10
elif not target and abs(actual - ambient) > delta:
goal = ambient
factor = 2
else:
return actual
old = actual
actual += math.copysign(timeDiff * factor, goal - actual)
if math.copysign(1, goal - old) != math.copysign(1, goal - actual):
actual = goal
return actual
for i in range(len(self.temp)):
if i in self.pinnedExtruders:
self.temp[i] = self.pinnedExtruders[i]
continue
if abs(self.temp[i] - self.targetTemp[i]) > delta:
oldVal = self.temp[i]
self.temp[i] += math.copysign(timeDiff * 10, self.targetTemp[i] - self.temp[i])
if math.copysign(1, self.targetTemp[i] - oldVal) != math.copysign(1, self.targetTemp[i] - self.temp[i]):
self.temp[i] = self.targetTemp[i]
if self.temp[i] < self._ambient_temperature:
self.temp[i] = self._ambient_temperature
if abs(self.bedTemp - self.bedTargetTemp) > delta:
oldVal = self.bedTemp
self.bedTemp += math.copysign(timeDiff * 10, self.bedTargetTemp - self.bedTemp)
if math.copysign(1, self.bedTargetTemp - oldVal) != math.copysign(1, self.bedTargetTemp - self.bedTemp):
self.bedTemp = self.bedTargetTemp
if self.bedTemp < self._ambient_temperature:
self.bedTemp = self._ambient_temperature
self.temp[i] = simulate(self.temp[i], self.targetTemp[i], self._ambient_temperature)
self.bedTemp = simulate(self.bedTemp, self.bedTargetTemp, self._ambient_temperature)
def _processBuffer(self):
while self.buffered is not None: