diff --git a/README.md b/README.md index 9a94cd4..73df5b6 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,11 @@ or manually using this URL: ## Changelog +**[0.1.10]** (08/22/209) + +**Added** +- Option for ignoring Bed Level Correction Matrix. + **[0.1.9]** (06/15/2019) **Fixed** @@ -214,6 +219,7 @@ or manually using this URL: **Initial Release** +[0.1.10]: https://github.com/jneilliii/OctoPrint-BedLevelVisualizer/tree/0.1.10 [0.1.9]: https://github.com/jneilliii/OctoPrint-BedLevelVisualizer/tree/0.1.9 [0.1.8]: https://github.com/jneilliii/OctoPrint-BedLevelVisualizer/tree/0.1.8 [0.1.7]: https://github.com/jneilliii/OctoPrint-BedLevelVisualizer/tree/0.1.7 @@ -237,7 +243,7 @@ or manually using this URL: ## To-Do - [ ] Pause standard OctoPrint temperature polling or squash the responses until processing is completed. - [X] ~~Orientation testing to verify axes are in correct direction.~~ added settings to allow controlling the orientation. -- [X] Calculate bed dimensions and apply to probe points for display on graph, #28. +- [X] ~~Calculate bed dimensions and apply to probe points for display on graph, #28.~~ ## Support My Efforts I, jneilliii, programmed this plugin for fun and do my best effort to support those that have issues with it, please return the favor and leave me a tip if you find this plugin helpful. diff --git a/octoprint_bedlevelvisualizer/__init__.py b/octoprint_bedlevelvisualizer/__init__.py index f96e143..5c398ec 100644 --- a/octoprint_bedlevelvisualizer/__init__.py +++ b/octoprint_bedlevelvisualizer/__init__.py @@ -35,7 +35,8 @@ def get_settings_defaults(self): stripFirst=False, use_center_origin=False, use_relative_offsets=False, - timeout=60) + timeout=60, + ignore_correction_matrix=False) ##~~ StartupPlugin def on_after_startup(self): @@ -72,6 +73,8 @@ def flagMeshCollection(self, comm_instance, phase, cmd, cmd_type, gcode, *args, return def processGCODE(self, comm, line, *args, **kwargs): + if self._settings.get_boolean(["ignore_correction_matrix"]) and re.match(r"^Bed Level Correction Matrix:.*$", line.strip()): + line = "ok" if self.processing and "ok" not in line and re.match(r"^((G33.+)|(Bed.+)|(\d+\s)|(\|\s*)|(\[?\s?\+?\-?\d?\.\d+\]?\s*\,?)|(\s?\.\s*)|(NAN\,?))+$", line.strip()): new_line = re.findall(r"(\+?\-?\d*\.\d*)",line) diff --git a/octoprint_bedlevelvisualizer/templates/bedlevelvisualizer_settings.jinja2 b/octoprint_bedlevelvisualizer/templates/bedlevelvisualizer_settings.jinja2 index a6ebd37..70c29d7 100644 --- a/octoprint_bedlevelvisualizer/templates/bedlevelvisualizer_settings.jinja2 +++ b/octoprint_bedlevelvisualizer/templates/bedlevelvisualizer_settings.jinja2 @@ -43,6 +43,11 @@ +
+
+ Ignore Bed Level Correction Matrix: +
+
diff --git a/setup.py b/setup.py index 71a7043..caac4f6 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ plugin_name = "Bed Visualizer" # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module -plugin_version = "0.1.9" +plugin_version = "0.1.10" # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin # module diff --git a/virtual_level_report_Bed_Level_Correction_Matrix.gcode b/virtual_level_report_Bed_Level_Correction_Matrix.gcode new file mode 100644 index 0000000..5f07385 --- /dev/null +++ b/virtual_level_report_Bed_Level_Correction_Matrix.gcode @@ -0,0 +1,28 @@ +@BEDLEVELVISUALIZER +!!DEBUG:send Eqn coefficients: a: 0.00011618 b: 0.00014890 d: 1.50255799 +!!DEBUG:send Recv: Bed Height Topography: +!!DEBUG:send +--- BACK --+ +!!DEBUG:send | | +!!DEBUG:send L | (+) | R +!!DEBUG:send E | | I +!!DEBUG:send F | (-) N (+) | G +!!DEBUG:send T | | H +!!DEBUG:send | (-) | T +!!DEBUG:send | | +!!DEBUG:send O-- FRONT --+ +!!DEBUG:send (0,0) +!!DEBUG:send -0.02505 -0.01255 -0.00380 +0.00245 +0.00620 +0.00995 +0.01745 +!!DEBUG:send -0.01005 -0.00380 +0.00495 +0.01370 +0.01870 +0.01995 +0.02870 +!!DEBUG:send -0.00130 +0.00370 +0.00120 +0.00120 -0.00130 +0.00120 -0.00255 +!!DEBUG:send +0.01620 +0.01745 +0.01620 +0.01495 +0.00620 +0.00620 +0.01370 +!!DEBUG:send +0.00995 +0.00870 +0.00870 +0.00745 +0.00620 +0.00995 +0.01745 +!!DEBUG:send -0.01380 -0.01630 -0.01380 -0.01380 -0.01130 -0.00880 +0.00245 +!!DEBUG:send -0.03255 -0.03130 -0.02880 -0.02255 -0.01880 -0.01255 -0.00630 +!!DEBUG:send +!!DEBUG:send +!!DEBUG:send +!!DEBUG:send Bed Level Correction Matrix: +!!DEBUG:send +1.000000 +0.000000 +0.000116 +!!DEBUG:send -0.000000 +1.000000 +0.000149 +!!DEBUG:send -0.000116 -0.000149 +1.000000 +!!DEBUG:send ok P15 B3 \ No newline at end of file