Replace __init__.py with the modified 1.0.0 version

b-morgan · Apr 12, 2019 · 676afae · 676afae
1 parent 9035836
commit 676afae
Show file tree

Hide file tree

Showing 2 changed files with 144 additions and 110 deletions.
diff --git a/octoprint_FanSpeedMirror/__init__.py b/octoprint_FanSpeedMirror/__init__.py
@@ -1,116 +1,150 @@
 # coding=utf-8
 from __future__ import absolute_import
 
-__author__ = "Shawn Bruce <[email protected]>"
-__license__ = "GNU Affero General Public License http://www.gnu.org/licenses/agpl.html"
-__copyright__ = "Copyright (C) 2017 Shawn Bruce - Released under terms of the AGPLv3 License"
-
+from decimal import *
+import re
 import octoprint.plugin
-import time
-import os
-import sys
-
-class GCodeSystemCommands(octoprint.plugin.StartupPlugin,
-                            octoprint.plugin.TemplatePlugin,
-                            octoprint.plugin.AssetPlugin,
-                            octoprint.plugin.SettingsPlugin):
-
-    def __init__(self):
-        self.command_definitions = {}
-
-
-    def on_settings_initialized(self):
-        self.reload_command_definitions()
-
-    def reload_command_definitions(self):
-        self.command_definitions = {}
-
-        command_definitions_tmp = self._settings.get(["command_definitions"])
-        self._logger.debug("command_definitions: %s" % command_definitions_tmp)
-
-        for definition in command_definitions_tmp:
-            cmd_id = definition['id']
-            cmd_line = definition['command']
-            self.command_definitions[cmd_id] = cmd_line
-            self._logger.info("Add command definition OCTO%s = %s" % (cmd_id, cmd_line))
-
-    def hook_gcode_queuing(self, comm_instance, phase, cmd, cmd_type, gcode, *args, **kwargs):
-        if not gcode and cmd[:4].upper() == 'OCTO':
-            cmd_id = cmd[4:].split(' ')[0]
-
-            try:
-                cmd_line = self.command_definitions[cmd_id]
-            except:
-                self._logger.error("No definiton found for ID %s" % cmd_id)
-                return (None,)
-
-            self._logger.debug("Command ID=%s, Command Line=%s" % (cmd_id, cmd_line))
-
-            self._logger.info("Executing command ID: %s" % cmd_id)
-            comm_instance._log("Exec(GCodeSystemCommands): OCTO%s" % cmd_id)
-
-            try:
-                r = os.system(cmd_line)
-            except:
-                e = sys.exc_info()[0]
-                self._logger.exception("Error executing command ID %s: %s" % (cmd_id, e))
-                return (None,)
+import subprocess
+
+class FanSpeedMirror(octoprint.plugin.StartupPlugin,
+					 octoprint.plugin.TemplatePlugin,
+					 octoprint.plugin.SettingsPlugin,
+					 octoprint.plugin.AssetPlugin):
+
+	def __init__(self):
+#		self._logger.info("__init__")
+		self.M106command=""
+		self.M107command=""
+
+	def on_after_startup(self):
+#		self._logger.info("on_after_startup")
+		self.get_settings_updates()
+
+	def get_settings_defaults(self):
+#		self._logger.info("get_settings_defaults")
+		return dict(
+			M106command="",
+			M107command=""
+		)
+
+	def on_settings_save(self, data):
+#		self._logger.info("on_settings_save")
+		s = self._settings
+		if "M106command" in data.keys():
+			s.set(["M106command"], data["M106command"])
+		if "M107command" in data.keys():
+			s.set(["M107command"], data["M107command"])
+		self.get_settings_updates()
+		#clean up settings if everything's default
+		self.on_settings_cleanup()
+		s.save()
+
+	def on_settings_cleanup(self):
+#		self._logger.info("on_settings_cleanup")
+		import octoprint.util
+		from octoprint.settings import NoSuchSettingsPath
+
+		try:
+			config = self._settings.get_all_data(merged=False, incl_defaults=False, error_on_path=True)
+		except NoSuchSettingsPath:
+			return
+
+		if config is None:
+			self._settings.clean_all_data()
+			return
+
+		if self.config_version_key in config and config[self.config_version_key] is None:
+			del config[self.config_version_key]
+
+		defaults = self.get_settings_defaults()
+		diff = octoprint.util.dict_minimal_mergediff(defaults, config)
+
+		if not diff:
+			self._settings.clean_all_data()
+		else:
+			self._settings.set([], diff)
+
+	def get_assets(self):
+#		self._logger.info("get_assets")
+		return dict(
+			js=["js/FanSpeedMirror.js"],
+			css=["css/FanSpeedMirror.css"],
+			less=["less/FanSpeedMirror.less"]
+		)
+
+	def get_template_configs(self):
+#		self._logger.info("get_template_configs")
+		return [
+			dict(type="settings", custom_bindings=False)
+		]
+
+	def get_settings_updates(self):
+#		self._logger.info("get_settings_updates")
+		self.M106command = self._settings.get(["M106command"])
+		self.M107command = self._settings.get(["M107command"])
+
+	def mirror_fan(self, comm_instance, phase, cmd, cmd_type, gcode, *args, **kwargs):
+		if gcode and gcode.startswith('M106'):
+			fanPwm = re.search("S(\d+\.?\d*)", cmd)
+			if fanPwm and fanPwm.group(1):
+				fanPwm = fanPwm.group(1)
+				if self.M106command != "":
+					cmd_line = self.M106command + " " + str(fanPwm)
+					self._logger.debug("Executing (" + cmd_line + ")")
+					try:
+						r = subprocess.call([self.M106command, str(fanPwm)])
+						if r < 0:
+							self._logger.error("Error executing command %s: %s" % (cmd_line, r))
+					except OSError as e:
+						self._logger.exception("Exception executing command %s: %s" % (cmd_line, e))
+				else:
+					self._logger.debug("M106command is empty")
+		elif gcode and gcode.startswith('M107'):
+			if self.M107command != "":
+				cmd_line = self.M107command
+				self._logger.debug("Executing (" + cmd_line + ")")
+				try:
+					r = subprocess.call(cmd_line)
+					if r < 0:
+						self._logger.error("Error executing command %s: %s" % (cmd_line, r))
+				except OSError as e:
+					self._logger.exception("Exception executing command %s: %s" % (cmd_line, e))
+			else:
+				self._logger.debug("M107command is empty")
+
+	def get_update_information(self):
+		# Define the configuration for your plugin to use with the Software Update
+		# Plugin here. See https://github.com/foosel/OctoPrint/wiki/Plugin:-Software-Update
+		# for details.
+		return dict(
+			FanSpeedMirror=dict(
+				displayName="Fan Speed Mirror",
+				displayVersion=self._plugin_version,
+
+				# version check: github repository
+				type="github_release",
+				user="b-morgan",
+				repo="OctoPrint-FanSpeedMirror",
+				current=self._plugin_version,
+
+				# update method: pip
+				pip="https://github.com/b-morgan/OctoPrint-FanSpeedMirror/archive/{target_version}.zip"
+			)
+		)
+
+
+# If you want your plugin to be registered within OctoPrint under a different name than what you defined in setup.py
+# ("OctoPrint-PluginSkeleton"), you may define that here. Same goes for the other metadata derived from setup.py that
+# can be overwritten via __plugin_xyz__ control properties. See the documentation for that.
+__plugin_name__ = "Fan Speed Mirror"
 
-            self._logger.info("Command ID %s returned: %s" % (cmd_id, r))
-
-            if r == 0:
-                status = 'ok'
-            else:
-                status = 'error'
-
-            comm_instance._log("Return(GCodeSystemCommands): %s" % status)
-
-            return (None,)
-
-    def get_settings_defaults(self):
-        return dict(
-            command_definitions = []
-        )
-
-    def on_settings_save(self, data):
-        octoprint.plugin.SettingsPlugin.on_settings_save(self, data)
-        self.reload_command_definitions()
-
-    def get_template_configs(self):
-        return [
-            dict(type="settings", custom_bindings=True)
-        ]
-
-    def get_assets(self):
-        return {
-            "js": ["js/gcodesystemcommands.js"]
-        } 
-
-    def get_update_information(self):
-        return dict(
-            gcodesystemcommands=dict(
-                displayName="GCode System Commands",
-                displayVersion=self._plugin_version,
-
-                # version check: github repository
-                type="github_release",
-                user="kantlivelong",
-                repo="OctoPrint-GCodeSystemCommands",
-                current=self._plugin_version,
-
-                # update method: pip w/ dependency links
-                pip="https://github.com/kantlivelong/OctoPrint-GCodeSystemCommands/archive/{target_version}.zip"
-            )
-        )
+def __plugin_load__():
+	global __plugin_implementation__
+	__plugin_implementation__ = FanSpeedMirror()
 
-__plugin_name__ = "GCODE System Commands"
+	global __plugin_hooks__
+	__plugin_hooks__ = {
+		"octoprint.comm.protocol.gcode.sent": __plugin_implementation__.mirror_fan,
+		"octoprint.plugin.softwareupdate.check_config": __plugin_implementation__.get_update_information
+	}
 
-def __plugin_load__():
-    global __plugin_implementation__
-    __plugin_implementation__ = GCodeSystemCommands()
-
-    global __plugin_hooks__
-    __plugin_hooks__ = {
-        "octoprint.comm.protocol.gcode.queuing": __plugin_implementation__.hook_gcode_queuing,
-        "octoprint.plugin.softwareupdate.check_config": __plugin_implementation__.get_update_information
-    }
diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 plugin_name = "OctoPrint-FanSpeedMirror"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "1.1.0"
+plugin_version = "1.2.0"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module