Minor fixes

Author: AlbertMN

octoprint_ender3v2tempfix/__init__.py

@@ -3,42 +3,42 @@
 import octoprint.plugin
 import re
 
+
 class Ender3V2TempFixPlugin(octoprint.plugin.OctoPrintPlugin):
+    #
+    # Recv:   TT::27.7627.76  //0.000.00  BB::39.3539.35  //0.000.00  @@::00  BB@@::00
+    # Recv:  T:23.84 /0.00 B:24.05 /0.00 @:0 B@:0
+    #
+    parse_Ender3V2Temp = re.compile(
+        '.*TT::(\d+)\.\d+\.(\d+).+\/\/(\d+)\.\d+\.(\d+).*BB::(\d+)\.\d+\.(\d+).+\/\/(\d+)\.\d+\.(\d+)')
+
+    def check_for_temp_report(self, comm_instance, line, *args, **kwargs):
+        # Check to see if we received the broken temperature response and if so extract temperature for octoprint
+        #		self._logger.debug("Testing: %s" % line)
+        if "TT::" not in line:
+            return line
+        self._logger.debug("Original: %s" % line)
+        m = self.parse_Ender3V2Temp.search(line)
+        new_line = (" T:%s.%s /%s.%s B:%s.%s /%s.%s" % (
+        m.group(1), m.group(2), m.group(3), m.group(4), m.group(5), m.group(6), m.group(7), m.group(8)))
+        self._logger.debug("Modified: %s" % new_line)
+        return new_line
+
+    def TempReport(self, comm_instance, parsed_temperatures, *args, **kwargs):
+        self._logger.debug("Before: %s" % parsed_temperatures)
+        #		self._logger.debug("After: %s" % parsed_temperatures)
+        return parsed_temperatures
+
 
-#
-# Recv:   TT::27.7627.76  //0.000.00  BB::39.3539.35  //0.000.00  @@::00  BB@@::00
-# Recv:  T:23.84 /0.00 B:24.05 /0.00 @:0 B@:0
-#
-	parse_Ender3V2Temp = re.compile('.*TT::(\d+)\.\d+\.(\d+).+\/\/(\d+)\.\d+\.(\d+).*BB::(\d+)\.\d+\.(\d+).+\/\/(\d+)\.\d+\.(\d+)')
-
-	def check_for_temp_report(self, comm_instance, line, *args, **kwargs):
-		# Check to see if we received the broken temperature response and if so extract temperature for octoprint
-#		self._logger.debug("Testing: %s" % line)
-		if "TT::" not in line:
-			return line
-		self._logger.debug("Original: %s" % line)
-		m = self.parse_Ender3V2Temp.search(line)
-		new_line = (" T:%s.%s /%s.%s B:%s.%s /%s.%s" % (m.group(1), m.group(2), m.group(3), m.group(4), m.group(5), m.group(6), m.group(7), m.group(8)))
-		self._logger.debug("Modified: %s" % new_line)
-		return new_line
-
-	def TempReport(self, comm_instance, parsed_temperatures, *args, **kwargs):
-		self._logger.debug("Before: %s" % parsed_temperatures)
-#		self._logger.debug("After: %s" % parsed_temperatures)
-		return parsed_temperatures
-
-__plugin_name__ = "Ender 3 V2 Temp Fix"
-__plugin_version__ = "1.0.4"
-__plugin_description__ = "This plugin modified the very broken temperature report from the Ender 3 V2 firmware"
-__plugin_author__ = "Brad Morgan"
-__plugin_license__ = "AGPLv3"
 __plugin_pythoncompat__ = ">=2.7,<4"
+
+
 def __plugin_load__():
-	global __plugin_implementation__
-	__plugin_implementation__ = Ender3V2TempFixPlugin()
-
-	global __plugin_hooks__
-	__plugin_hooks__ = {
-		"octoprint.comm.protocol.temperatures.received": __plugin_implementation__.TempReport,
-		"octoprint.comm.protocol.gcode.received": __plugin_implementation__.check_for_temp_report
-	}
+    global __plugin_implementation__
+    __plugin_implementation__ = Ender3V2TempFixPlugin()
+
+    global __plugin_hooks__
+    __plugin_hooks__ = {
+        "octoprint.comm.protocol.temperatures.received": __plugin_implementation__.TempReport,
+        "octoprint.comm.protocol.gcode.received": __plugin_implementation__.check_for_temp_report
+    }

setup.py

@@ -20,7 +20,7 @@
 plugin_description = "Fixes the temperature reporting from the Creality Ender-3 v2 printer"
 
 # The plugin's author. Can be overwritten within OctoPrint's internal data via __plugin_author__ in the plugin module
-plugin_author = "SimplyPrint"
+plugin_author = "SimplyPrint & Brad Morgan"
 
 # The plugin's author's mail address.
 plugin_author_email = "albert@simplyprint.dk"