fix queue positions on start/end of job

README.md

@@ -1,45 +1,9 @@
-[![Usage Statistics](https://github.com/synman/OctoPluginStats/actions/workflows/get-data.yaml/badge.svg)](https://synman.github.io/OctoPluginStats/#bettergrblsupportContainer)
-# Better Grbl Support Plugin for Octoprint
+# LatheEngraver Control for Octoprint
 
-![grbl](https://user-images.githubusercontent.com/1299716/147993411-7005d1bb-53bf-4277-9e09-5022b40ccc0b.png)
-
-This plugin was inspired by mic159's Grbl Support plugin (https://plugins.octoprint.org/plugins/octoprint-grbl-plugin/).  His plugin gets you 90% of the way there for adding Grbl support to Octoprint but had a couple limitations and lacked some bells and whistles from a UI and configuration perspective.
-
-**Better Grbl Support** originally utilized mic159's gcode receiver parser but at this point I've moved well beyond his reference implementation.  
-
-Here are some of bgs's capabilities (as of v2.0.0):
-
-* Fully supports Laser and CNC operations / workflows
-* Provides for 10 axes of movement / jogging
-* Machine and Work Positioning Homing / Origin setup
-* Allows for full management of All Grbl settings ($$)
-* Provides rich details for all Grbl settings, messages, alarms, and errors
-* Supports Z-Probing and customization of Z-Probe settings
-* 9 Point Framing and auto generation of Framing dimensions
-* Detects and automatically supports Grbl 1.1 Jogging
-* Fully integrates with Octoprint Start/Pause/Resume/Cancel operations
-* All global configuration changes to Octoprint are reverted on uninstall
-* All conversions of typical marlin/repetier/etc commands to Grbl are preset
-* Disables Octoprint functions which interfere with Grbl
-* Disables the built-in GCode Viewer
-* Disables the built-in Temperature tab
-* Disables the built-in Control tab (It can be re-enabled via Settings)
-* Supports compressed/shorthand Grbl generated by numerous post processors
+This plugin is based on synman's Better Grbl Support Plugin that was in-turn inspired by mic159's Grbl Support plugin. The modifications are specific to usage with the LatheEngraver bolt-on CNC for the wood lathe.
 
 ## Documentation
 
-Visit the [Better Grbl Support Wiki](https://github.com/synman/Octoprint-Bettergrblsupport/wiki) for general instructions and workflows.
 
 ## Screenshots
 
-![](https://user-images.githubusercontent.com/1299716/147965674-d2a203d7-dc21-4e19-bcaa-9cef05007cae.png)
-
-![](https://user-images.githubusercontent.com/1299716/147965814-58f87eb9-4d41-4061-964e-a2517012f900.png)
-
-![](https://user-images.githubusercontent.com/1299716/147965811-c8b890ec-7d98-4ee1-a82b-b1472a0ec933.png)
-
-![](https://user-images.githubusercontent.com/1299716/68447249-4b266980-01ad-11ea-8712-f1bb9b45deb4.png)
-
-![](https://user-images.githubusercontent.com/1299716/68447254-4eb9f080-01ad-11ea-925f-5ee540fae35e.png)
-
-![](https://user-images.githubusercontent.com/1299716/147916286-cfd84110-21fd-4bed-852b-800aad2cc897.png)

octoprint_latheengraver/_bgs.py

@@ -299,16 +299,16 @@ def on_event(_plugin, event, payload):
             _plugin._printer.cancel_print()
             return
 
-        # reset our rate overrides
+        # reset our rate/position overrides
         _plugin.feedRate = 0
         _plugin.plungeRate = 0
         _plugin.powerRate = 0
-        _plugin.queue_X = None
-        _plugin.queue_Z = None
-        _plugin.queue_A = None
-        _plugin.queue_B = None
-        _plugin.queue_S = None
-        _plugin.queue_F = None
+        _plugin.queue_X = _plugin.grblX
+        _plugin.queue_Z = _plugin.grblZ
+        _plugin.queue_A = _plugin.grblA
+        _plugin.queue_B = _plugin.grblB
+        _plugin.queue_S = 0.0
+        _plugin.queue_F = 0.0
         _plugin.bypass_queuing = False
 
         _plugin.grblState = "Run"
@@ -349,12 +349,10 @@ def on_event(_plugin, event, payload):
         _plugin.minZ_th = 0.0
         _plugin.pauses_started = False
         _plugin.minZ_inc = 0.0
-        _plugin.queue_X = None
-        _plugin.queue_Z = None
-        _plugin.queue_A = None
-        _plugin.queue_B = None
-        _plugin.queue_S = None
-        _plugin.queue_F = None
+        _plugin.queue_X = 0.0
+        _plugin.queue_Z = 0.0
+        _plugin.queue_A = 0.0
+        _plugin.queue_B = 0.0
         _plugin.bypass_queuing = False
         return
 

setup.py

@@ -14,7 +14,7 @@
 plugin_name = "LatheEngraver Support"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "1.0.9"
+plugin_version = "1.0.10"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module