Skip to content

Commit

Permalink
0.1.10
Browse files Browse the repository at this point in the history
- Added option for ignoring Bed Level Correction Matrix.
  • Loading branch information
jneilliii authored Aug 23, 2019
2 parents e3e9f98 + dfa3977 commit 8739cf9
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 3 deletions.
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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**
Expand Down Expand Up @@ -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
Expand All @@ -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.
Expand Down
5 changes: 4 additions & 1 deletion octoprint_bedlevelvisualizer/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@
</div>
</div>
</div>
<div class="row-fluid">
<div class="control-group">
<i class="icon icon-info-sign" title="Ignore Bed Level Correction Matrix by enabling this option." data-toggle="tooltip"></i> Ignore Bed Level Correction Matrix: <input class="input-checkbox" type="checkbox" id="ignore_correction_matrix" data-bind="checked: settingsViewModel.settings.plugins.bedlevelvisualizer.ignore_correction_matrix" style="display: inline-block;margin-bottom: 5px;"></input>
</div>
</div>
</div>
<div id="bedlevelvisualizer_stored_data" class="tab-pane">
<div class="row-fluid">
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 28 additions & 0 deletions virtual_level_report_Bed_Level_Correction_Matrix.gcode
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 8739cf9

Please sign in to comment.