Skip to content

Commit c88907a

Browse files
committed
additional lerdge adjustments
1 parent 4104615 commit c88907a

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

octoprint_bedlevelvisualizer/__init__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def __init__(self):
4949
"octoprint.plugins.bedlevelvisualizer.debug"
5050
)
5151
self.regex_mesh_data = re.compile(
52-
r"^((G33.+)|(Bed.+)|(Llit.+)|(\d+\s)|(\|\s*)|(\s*\[\s+)|(\[?\s?\+?-?\d+?\.\d+\]?\s*,?)|(\s?\.\s*)|(NAN,?)|(nan\s?,?)|(=======\s?,?)|(;-?\+?\d?.?\d+)|(?:\d\(\d+\.\d+,\d+\.\d+,(-?\d+\.\d+)\)\s?)+)+(\s+\],?)?$"
52+
r"^((G33.+)|(Bed.+)|(Llit.+)|(\d+\s)|(\|\s*)|(\s*\[\s+)|(\[?\s?\+?-?\d+?\.\d+\]?\s*,?)|(\s?\.\s*)|(NAN,?)|(nan\s?,?)|(=======\s?,?)|(;-?\+?\d?.?\d+)|(?:\d+\(\d+\.\d+,\d+\.\d+,(-?\d+\.\d+)\)\s*)+)+(\s+\],?)?$"
5353
)
5454
self.regex_bed_level_correction = re.compile(
5555
r"^(Mesh )?Bed Level (Correction Matrix|data):.*$"
@@ -61,7 +61,7 @@ def __init__(self):
6161
self.regex_makergear = re.compile(
6262
r"^(\s=\s\[)(\s*,?\s*\[(\s?-?\d+.\d+,?)+\])+\];?$"
6363
)
64-
self.regex_lerdge_extraction = re.compile(r"\d\(\d+\.\d+,\d+\.\d+,(-?\d+\.\d+)\)\s?")
64+
self.regex_lerdge_extraction = re.compile(r"\d+\(\d+\.\d+,\d+\.\d+,(-?\d+\.\d+)\)\s?")
6565
self.regex_repetier = re.compile(r"^G33 X.+$")
6666
self.regex_nan = re.compile(r"(nan)")
6767
self.regex_catmull = re.compile(
@@ -290,6 +290,7 @@ def process_gcode(self, comm, line, *args, **kwargs):
290290
self.flip_y = True
291291

292292
elif "The system starts to level automatically, please wait for finishing the leveling" in line.strip():
293+
self._bedlevelvisualizer_logger.debug("lerdge firmware detected")
293294
self.lerdge_firmware = True
294295

295296
elif self.regex_additional_mesh_data.findall(line.strip()):

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
plugin_name = "Bed Visualizer"
1515

1616
# The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
17-
plugin_version = "1.1.2rc9"
17+
plugin_version = "1.1.2rc10"
1818

1919
# The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
2020
# module

0 commit comments

Comments
 (0)