added positioning mode (move) to Grbl Control tab

Author: synman

octoprint_bettergrblsupport/__init__.py

@@ -950,11 +950,13 @@ def hook_gcode_sending(self, comm_instance, phase, cmd, cmd_type, gcode, *args,
         if "G90" in cmd.upper():
             # absolute positioning
             self.positioning = 0
+            self._plugin_manager.send_plugin_message(self._identifier, dict(type="grbl_state", positioning=self.positioning))
 
         # we need to track relative position mode for "RUN" position updates
         if "G91" in cmd.upper():
             # relative positioning
             self.positioning = 1
+            self._plugin_manager.send_plugin_message(self._identifier, dict(type="grbl_state", positioning=self.positioning))
 
         # save our G command for shorthand post processors
         if cmd.upper().startswith("G"):
@@ -1096,7 +1098,9 @@ def hook_gcode_received(self, comm_instance, line, *args, **kwargs):
                                                                             y=self.grblY,
                                                                             z=self.grblZ,
                                                                             speed=self.grblSpeed,
-                                                                            power=self.grblPowerLevel))
+                                                                            power=self.grblPowerLevel,
+                                                                            coord=self.grblCoordinateSystem,
+                                                                            positioning=self.positioning))
 
             # odd edge case where a machine could be asleep or holding while connecting
             if not self._printer.is_operational() and self.grblState.upper().strip() in ("SLEEP", "HOLD:0", "HOLD:1", "DOOR:0", "DOOR:1"):
@@ -1121,7 +1125,7 @@ def hook_gcode_received(self, comm_instance, line, *args, **kwargs):
 
             return self.pick_a_response(response)
 
-        if line.startswith('Grbl'):
+        if line.strip().startswith('Grbl'):
             # Hack to make Arduino based GRBL work.
             # When the serial port is opened, it resets and the "hello" command
             # is not processed.
@@ -1172,7 +1176,8 @@ def hook_gcode_received(self, comm_instance, line, *args, **kwargs):
             self._plugin_manager.send_plugin_message(self._identifier, dict(type="grbl_state",
                                                                             speed=self.grblSpeed,
                                                                             power=self.grblPowerLevel,
-                                                                            coord=self.grblCoordinateSystem))
+                                                                            coord=self.grblCoordinateSystem,
+                                                                            positioning=self.positioning))
 
             return self.pick_a_response(None)
 

octoprint_bettergrblsupport/static/js/bettergrblsupport.js

@@ -50,6 +50,7 @@ $(function() {
         self.zPos = ko.observable("N/A");
         self.power = ko.observable("N/A");
         self.speed = ko.observable("N/A");
+        self.positioning = ko.observable("N/A");
 
         self.feedRate = ko.observable(undefined);
         self.plungeRate = ko.observable(undefined);
@@ -503,6 +504,14 @@ $(function() {
                 }
 
                 if (data.coord != undefined) self.coordinate_system(data.coord);
+
+                if (data.positioning != undefined) {
+                  if (data.positioning == 0) {
+                    self.positioning("Absolute");
+                  } else {
+                    self.positioning("Relative");
+                  }
+                }
                 // console.log("mode=" + data.mode + " state=" + data.state + " x=" + data.x + " y=" + data.y + " z=" + data.z + " power=" + data.power + " speed=" + data.speed);
                 return
             }

octoprint_bettergrblsupport/templates/bettergrblsupport_tab.jinja2

@@ -61,6 +61,11 @@
            <td style="padding: 3px 10px 5px 5px;" align="right" valign="middle">Speed</td>
            <td style="padding: 3px 5px 5px 5px;" align="right" valign="middle"><strong data-bind="text: speed()"></strong></td>
         </tr>
+        <tr>
+           <td style="padding: 3px 10px 5px 5px;" align="right" valign="middle">Move</td>
+           <td style="padding: 3px 5px 5px 5px;" align="right" valign="middle"><strong data-bind="text: positioning()"></strong></td>
+        </tr>
+
       </table>
    </span>