Skip to content

Commit

Permalink
additional lerdge adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
jneilliii committed Jan 28, 2024
1 parent 4104615 commit c88907a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions octoprint_bedlevelvisualizer/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def __init__(self):
"octoprint.plugins.bedlevelvisualizer.debug"
)
self.regex_mesh_data = re.compile(
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+\],?)?$"
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+\],?)?$"
)
self.regex_bed_level_correction = re.compile(
r"^(Mesh )?Bed Level (Correction Matrix|data):.*$"
Expand All @@ -61,7 +61,7 @@ def __init__(self):
self.regex_makergear = re.compile(
r"^(\s=\s\[)(\s*,?\s*\[(\s?-?\d+.\d+,?)+\])+\];?$"
)
self.regex_lerdge_extraction = re.compile(r"\d\(\d+\.\d+,\d+\.\d+,(-?\d+\.\d+)\)\s?")
self.regex_lerdge_extraction = re.compile(r"\d+\(\d+\.\d+,\d+\.\d+,(-?\d+\.\d+)\)\s?")
self.regex_repetier = re.compile(r"^G33 X.+$")
self.regex_nan = re.compile(r"(nan)")
self.regex_catmull = re.compile(
Expand Down Expand Up @@ -290,6 +290,7 @@ def process_gcode(self, comm, line, *args, **kwargs):
self.flip_y = True

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

elif self.regex_additional_mesh_data.findall(line.strip()):
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 = "1.1.2rc9"
plugin_version = "1.1.2rc10"

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

0 comments on commit c88907a

Please sign in to comment.