Grbl version check, timing fix, jogging improvement, bug fixes #24
Conversation
set report mask based on version check add small delay to prevent gcode errors
set report mask based on version check add small delay to prevent gcode errors
# Conflicts: # octoprint_bettergrblsupport/__init__.py
…machine EEPROM when setting the working origin
jcl5m1
changed the title
|
sorry for the huge delay on looking into this PR. I'll see about addressing it in the coming days/weeks. I need to circle back for python3 support / etc as it is. |
| @@ -479,15 +489,7 @@ def hook_gcode_sending(self, comm_instance, phase, cmd, cmd_type, gcode, *args, | |||
| # relative positioning | |||
| self.positioning = 1 | |||
|
|
|||
| #T2 # HACK: | |||
There was a problem hiding this comment.
why was this hack removed? This was put in place to address a gcode parsing issue specific to gcode generated using T2 Laser. Reverting it may cause harm to clients who use T2.
There was a problem hiding this comment.
See issue #7 for further reference
| return | ||
|
|
||
| if command == "origin": | ||
| # do origin stuff | ||
| self.ignoreErrors = True |
There was a problem hiding this comment.
not sure why this was removed.... TBT, I'm not even sure why I put it in there to begin with
There was a problem hiding this comment.
I think I made this verbose like this because of variations across engravers. I really do like the streamlined model but need to validate we don't break other engravers
|
two questions inline via code review |
|
|
||
| if subscribed_events.find(event) == -1: | ||
| return | ||
|
|
||
| if event == Events.CONNECTED: |
There was a problem hiding this comment.
overall, I think I'm good with keeping track of the grbl version and doing version specific logic based on it
| @@ -544,6 +546,7 @@ def hook_gcode_sending(self, comm_instance, phase, cmd, cmd_type, gcode, *args, | |||
| if currentTime > self.timeRef + 500: | |||
| # self._logger.info("x={} y={} z={} f={} s={}".format(self.grblX, self.grblY, self.grblZ, self.grblSpeed, self.grblPowerLevel)) | |||
| self._plugin_manager.send_plugin_message(self._identifier, dict(type="grbl_state", | |||
| grblVersion=self.grblVersion, | |||
There was a problem hiding this comment.
we don't have to add the grbl version to the active state push loop. we should be storing the grbl version as a plugin setting during the connection phase and simply reading that setting value when needed, whether it is part of a knockout model or w/e.
| @@ -641,6 +649,7 @@ def hook_gcode_received(self, comm_instance, line, *args, **kwargs): | |||
|
|
|||
| if self.grblState == "Sleep" or self.grblState == "Run": | |||
| self._plugin_manager.send_plugin_message(self._identifier, dict(type="grbl_state", | |||
| grblVersion=self.grblVersion, | |||
| @@ -657,6 +666,7 @@ def hook_gcode_received(self, comm_instance, line, *args, **kwargs): | |||
| self.grblPowerLevel = round(float(match.groups(1)[1])) | |||
|
|
|||
| self._plugin_manager.send_plugin_message(self._identifier, dict(type="grbl_state", | |||
| grblVersion=self.grblVersion, | |||
| @@ -879,59 +890,30 @@ def on_api_command(self, command, data): | |||
| self._logger.debug("move {} {}".format(direction, distance)) | |||
|
|
|||
| if direction == "home": | |||
| self._printer.commands("G91") | |||
There was a problem hiding this comment.
we need to make sure this doesn't break other engravers
added check for grbl version/display to correctly set status report mask, rather than hard code it for 1.1. a lot of stuff from asia comes with grbl 0.9 out of the box
added small delay of 50ms to command message sending. using a Raspi 3 B+ or faster computer seems to spam the Arduino too much causing GCode errors. 10ms was not enough.
allow sending jog commands even while the robot is in Run status so you don't have to wait for it to go Idle again before moving again
jog control, and origin tool stay in workspace coordinates only rather than mess with G28 machine coordinates commands and modifying the EEPROM
estop/reset is always available
removed G01 prefixing which broke modal commands like G2/G3