Merge pull request #77 from borisbu/develop

Releasing `1.4.1`

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Version 1
 
+### 1.4.1
+
+- Fixed issue with turning relays ON when start printing.
+  - Thanks to [@hcooper](https://github.com/hcooper)'s contribution issues
+    [#39](https://github.com/borisbu/OctoRelay/issues/39) and
+    [#52](https://github.com/borisbu/OctoRelay/issues/52) are most likely resolved.
+
 ### 1.4.0
 
 - JS: Types constraints and tests.

octoprint_octorelay/__init__.py

@@ -310,11 +310,12 @@ def print_started(self):
             settings = self.get_settings_defaults()[index]
             settings.update(self._settings.get([index]))
 
+            relay_pin = int(settings["relay_pin"])
+            inverted = settings['inverted_output']
             autoONforPrint = settings['autoONforPrint']
-            if autoONforPrint:
-                relay_pin = int(settings["relay_pin"])
-                inverted = settings['inverted_output']
-
+            active = settings["active"]
+            if autoONforPrint and active:
+                self._logger.debug("turning on pin: {}, index: {}".format(relay_pin, index))
                 GPIO.setup(relay_pin, GPIO.OUT)
                 # XOR with inverted
                 GPIO.output(relay_pin, inverted != True)

setup.py

@@ -15,7 +15,7 @@
 plugin_name = "OctoRelay"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "1.4.0"
+plugin_version = "1.4.1"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module