From aa80a4812df867732d4ff8d7689467f93fea0f12 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Mon, 10 Dec 2018 14:42:22 +0300 Subject: [PATCH] Add time-based spoolup calculation --- eos/utils/spoolSupport.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eos/utils/spoolSupport.py b/eos/utils/spoolSupport.py index 70d24470f..b7b260d8b 100644 --- a/eos/utils/spoolSupport.py +++ b/eos/utils/spoolSupport.py @@ -34,10 +34,10 @@ def calculateSpoolup(modMaxValue, modStepValue, modCycleTime, spoolType, spoolAm if spoolType == SpoolType.SCALE: return int(floatUnerr(spoolAmount * modMaxValue / modStepValue)) * modStepValue elif spoolType == SpoolType.TIME: - # Stub - return 0 + cycles = int(floatUnerr(spoolAmount / modCycleTime)) + return min(modMaxValue, cycles * modStepValue) elif spoolType == SpoolType.CYCLES: - cycles = round(spoolAmount) + cycles = int(spoolAmount) return min(modMaxValue, cycles * modStepValue) else: return 0