From b5bff5f90b99d91f0a3078bb93d7fdfc492ad156 Mon Sep 17 00:00:00 2001 From: Vitor de Miranda Henrique Date: Fri, 3 Mar 2017 00:26:04 -0600 Subject: [PATCH] Bug Fix --- octoprint_enclosure/__init__.py | 16 ++++++++-------- setup.py | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/octoprint_enclosure/__init__.py b/octoprint_enclosure/__init__.py index c0f37fd..0387eaf 100644 --- a/octoprint_enclosure/__init__.py +++ b/octoprint_enclosure/__init__.py @@ -221,13 +221,13 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, if self.filamentSensor.enable: self.startFilamentDetection() - if self.io1.autoStartup: + if self.io1.autoStartup and self.io1.enable: scheduler.enter(self.toFloat(self.io1.timeDelay), 1, self.io1.write, (True,)) - if self.io2.autoStartup: + if self.io2.autoStartup and self.io2.enable: scheduler.enter(self.toFloat(self.io2.timeDelay), 1, self.io2.write, (True,)) - if self.io3.autoStartup: + if self.io3.autoStartup and self.io3.enable: scheduler.enter(self.toFloat(self.io3.timeDelay), 1, self.io3.write, (True,)) - if self.io4.autoStartup: + if self.io4.autoStartup and self.io4.enable: scheduler.enter(self.toFloat(self.io4.timeDelay), 1, self.io4.write, (True,)) elif event in (Events.PRINT_DONE, Events.PRINT_FAILED, Events.PRINT_CANCELLED): @@ -237,13 +237,13 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin, if self.heater.enable: self.enclosureSetTemperature = 0 - if self.io1.autoShutDown: + if self.io1.autoShutDown and self.io1.enable: scheduler.enter(self.toFloat(self.io1.timeDelay), 1, self.io1.write, (False,)) - if self.io2.autoShutDown: + if self.io2.autoShutDown and self.io2.enable:: scheduler.enter(self.toFloat(self.io2.timeDelay), 1, self.io2.write, (False,)) - if self.io3.autoShutDown: + if self.io3.autoShutDown and self.io3.enable:: scheduler.enter(self.toFloat(self.io3.timeDelay), 1, self.io3.write, (False,)) - if self.io4.autoShutDown: + if self.io4.autoShutDown and self.io4.enable:: scheduler.enter(self.toFloat(self.io4.timeDelay), 1, self.io4.write, (False,)) scheduler.run() diff --git a/setup.py b/setup.py index 8f5eaae..658778e 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ plugin_package = "octoprint_enclosure" plugin_name = "OctoPrint-Enclosure" # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module -plugin_version = "1.8" +plugin_version = "1.9" # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin # module