Skip to content

Commit

Permalink
- fixes #50
Browse files Browse the repository at this point in the history 
- clear command buffer on connecting event
  • Loading branch information
@synman
synman committed Dec 28, 2021
1 parent d4807a1 commit 12a2f09
Show file tree
Hide file tree
Showing 4 changed files with 158 additions and 102 deletions.
127 changes: 77 additions & 50 deletions octoprint_bettergrblsupport/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,6 @@ def __init__(self):

self.grblVersion = "unknown"

# fail-safe for homing if origin has not been set
self.originSet = False

# load up our item/value pairs for errors, warnings, and settings
self.loadGrblDescriptions()

Expand All @@ -135,6 +132,8 @@ def get_settings_defaults(self):
frame_origin = None,
distance = 10,
distances = [.1, 1, 5, 10, 50, 100],
origin_axis = "XY",
origin_axes = ["Z", "Y", "X", "XY", "ALL"],
is_printing = False,
is_operational = False,
disableModelSizeDetection = True,
Expand Down Expand Up @@ -423,7 +422,7 @@ def get_template_configs(self):
def on_event(self, event, payload):
subscribed_events = (Events.FILE_SELECTED, Events.PRINT_STARTED, Events.PRINT_CANCELLED, Events.PRINT_CANCELLING,
Events.PRINT_PAUSED, Events.PRINT_RESUMED, Events.PRINT_DONE, Events.PRINT_FAILED,
Events.PLUGIN_PLUGINMANAGER_UNINSTALL_PLUGIN, Events.UPLOAD)
Events.PLUGIN_PLUGINMANAGER_UNINSTALL_PLUGIN, Events.UPLOAD, Events.CONNECTING)

if event not in subscribed_events:
self._logger.debug('event [{}] received but not subscribed - discarding'.format(event))
Expand All @@ -439,6 +438,11 @@ def on_event(self, event, payload):
if self._printer_profile_manager.get_current_or_default()["id"] != "_bgs":
return

# - CONNECTING
if event == Events.CONNECTING:
# let's make sure we don't have any commands queued up
self.grblCmdQueue.clear()

# 'PrintStarted'
if event == Events.PRINT_STARTED:
if self.grblState != "Idle":
Expand All @@ -447,6 +451,7 @@ def on_event(self, event, payload):
return

self.grblState = "Run"
addToNotifyQueue(["Pgm Begin"])
return

# Print ended (finished / failed / cancelled)
Expand All @@ -458,11 +463,7 @@ def on_event(self, event, payload):
if event == Events.PRINT_CANCELLING:
self._logger.debug("canceling job")
self._printer.commands(["!", "?"], force=True)
self.queue_cmds_and_send(["M999"], wait=True)
self._printer.commands("G21 G90 G1 Z5 F100")

if self.originSet:
self._printer.commands("G28")
self.queue_cmds_and_send(["M999", "?"], wait=True)

# Print Paused
if event == Events.PRINT_PAUSED:
Expand Down Expand Up @@ -643,7 +644,7 @@ def cleanUpDueToUninstall(self, remove_profile=True):

def get_extension_tree(self, *args, **kwargs):
return dict(
model=dict(
model=dict(
grbl_gcode=["gc", "nc"]
)
)
Expand Down Expand Up @@ -1157,9 +1158,6 @@ def on_api_command(self, command, data):
else:
self._printer.commands("$X")

#fail-safe for ensuring we do not home
self.originSet = False

return

if command == "reset":
Expand Down Expand Up @@ -1257,19 +1255,41 @@ def on_api_command(self, command, data):
# do move stuff
direction = data.get("direction")
distance = data.get("distance")
axis = data.get("axis")

# max X feed rate
xf = int(float(self.grblSettings.get(110)[0]))
# max Y feed rate
yf = int(float(self.grblSettings.get(111)[0]))
# max Z feed rate
zf = int(float(self.grblSettings.get(112)[0]))

if distance != self._settings.get(["distance"]):
self._settings.set(["distance"], distance)
self._settings.save()

self._logger.debug("move direction={} distance={}".format(direction, distance))
if axis != self._settings.get(["origin_axis"]):
self._settings.set(["origin_axis"], axis)
self._settings.save()

self._logger.debug("move direction={} distance={} axis={}".format(direction, distance, axis))

if direction == "home":
self._printer.commands("G28")
# add a notification if we just homed
self.addToNotifyQueue(["Machine has been (work) homed"])
self._printer.commands(["G54", "G90"])

if axis == "X":
self._printer.commands(["G0 X0", "G91"])
elif axis == "Y":
self._printer.commands(["G0 Y0", "G91"])
elif axis == "Z":
self._printer.commands(["G0 Z0", "G91"])
elif axis == "XY":
self._printer.commands(["G0 X0 Y0", "G91"])
else:
self._printer.commands(["G0 X0 Y0 Z0", "G91"])

self.originSet = True
# add a notification if we just homed
self.addToNotifyQueue(["Moved to work home for {}".format(axis)])

if direction == "probez":
# probe z using offset
Expand All @@ -1278,52 +1298,59 @@ def on_api_command(self, command, data):
"G92 Z{}".format(self.zProbeOffset),
"G0 Z5"])

if direction == "forward":
# max Y feed rate
f = int(float(self.grblSettings.get(111)[0]))
self._printer.commands("{}G91 G21 Y{:f} F{}".format("$J=" if self.isGrblOneDotOne() else "G1 ", distance, f))
if direction == "northwest":
self._printer.commands("{}G91 G21 X{:f} Y{:f} F{}".format("$J=" if self.isGrblOneDotOne() else "G1 ", distance * -1, distance, xf if xf < yf else yf))

if direction == "north":
self._printer.commands("{}G91 G21 Y{:f} F{}".format("$J=" if self.isGrblOneDotOne() else "G1 ", distance, yf))

if direction == "northeast":
self._printer.commands("{}G91 G21 X{:f} Y{:f} F{}".format("$J=" if self.isGrblOneDotOne() else "G1 ", distance * 1, distance, xf if xf < yf else yf))

if direction == "west":
self._printer.commands("{}G91 G21 X{:f} F{}".format("$J=" if self.isGrblOneDotOne() else "G1 ", distance * -1, xf))

if direction == "east":
self._printer.commands("{}G91 G21 X{:f} F{}".format("$J=" if self.isGrblOneDotOne() else "G1 ", distance, xf))

if direction == "backward":
# max Y feed rate
f = int(float(self.grblSettings.get(111)[0]))
self._printer.commands("{}G91 G21 Y{:f} F{}".format("$J=" if self.isGrblOneDotOne() else "G1 ", distance * -1, f))
if direction == "southwest":
self._printer.commands("{}G91 G21 X{:f} Y{:f} F{}".format("$J=" if self.isGrblOneDotOne() else "G1 ", distance * -1, distance * -1, xf if xf < yf else yf))

if direction == "left":
# max X feed rate
f = int(float(self.grblSettings.get(110)[0]))
self._printer.commands("{}G91 G21 X{:f} F{}".format("$J=" if self.isGrblOneDotOne() else "G1 ", distance * -1, f))
if direction == "south":
self._printer.commands("{}G91 G21 Y{:f} F{}".format("$J=" if self.isGrblOneDotOne() else "G1 ", distance * -1, yf))

if direction == "right":
# max X feed rate
f = int(float(self.grblSettings.get(110)[0]))
self._printer.commands("{}G91 G21 X{:f} F{}".format("$J=" if self.isGrblOneDotOne() else "G1 ", distance, f))
if direction == "southeast":
self._printer.commands("{}G91 G21 X{:f} Y{:f} F{}".format("$J=" if self.isGrblOneDotOne() else "G1 ", distance, distance * -1, xf if xf < yf else yf))

if direction == "up":
# max Z feed rate
f = int(float(self.grblSettings.get(112)[0]))
self._printer.commands("{}G91 G21 Z{:f} F{}".format("$J=" if self.isGrblOneDotOne() else "G1 ", distance, f))
self._printer.commands("{}G91 G21 Z{:f} F{}".format("$J=" if self.isGrblOneDotOne() else "G1 ", distance, zf))

if direction == "down":
# max Z feed rate
f = int(float(self.grblSettings.get(112)[0]))
self._printer.commands("{}G91 G21 Z{:f} F{}".format("$J=" if self.isGrblOneDotOne() else "G1 ", distance * -1, f))
self._printer.commands("{}G91 G21 Z{:f} F{}".format("$J=" if self.isGrblOneDotOne() else "G1 ", distance * -1, zf))

return

if command == "origin":
self._printer.commands(["G28.1", "G10 P1 L20 X0 Y0 Z0", "G92 X0 Y0 Z0"])
self.addToNotifyQueue(["Work origin set"])
return
axis = data.get("origin_axis")

if axis != self._settings.get(["origin_axis"]):
self._settings.set(["origin_axis"], axis)
self._settings.save()

# this command is deprecated
if command == "originz":
# technically this is unnecessary - may revisit the whole need for
# for separating Z from X/Y when managing work plane home
self._logger.debug("origin axis={}".format(axis))

self._printer.commands("G28.1")
# i really like this zeroing feature - may need to make it configurable
self._printer.commands("G92 Z0")
if axis == "X":
self._printer.commands(["G91 G10 P1 L20 X0"])
elif axis == "Y":
self._printer.commands(["G91 G10 P1 L20 Y0"])
elif axis == "Z":
self._printer.commands(["G91 G10 P1 L20 Z0"])
elif axis == "XY":
self._printer.commands(["G91 G10 P1 L20 X0 Y0"])
else:
self._printer.commands(["G91 G10 P1 L20 X0 Y0 Z0"])

self.addToNotifyQueue(["Work origin for {} set".format(axis)])
return

if command == "toggleWeak":
Expand Down
12 changes: 10 additions & 2 deletions octoprint_bettergrblsupport/static/js/bettergrblsupport.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ $(function() {
self.distances = ko.observableArray([.1, 1, 5, 10, 50, 100]);
self.distance = ko.observable(10);

self.origin_axes = ko.observableArray(["X", "Y", "Z", "ALL"]);
self.origin_axis = ko.observable("ALL");

self.is_printing = ko.observable(false);
self.is_operational = ko.observable(false);

Expand Down Expand Up @@ -141,7 +144,8 @@ $(function() {
data: JSON.stringify({
command: "move",
direction: direction,
distance: self.distance()
distance: self.distance(),
axis: self.origin_axis()
}),
contentType: "application/json; charset=UTF-8",
error: function (data, status) {
Expand Down Expand Up @@ -217,7 +221,8 @@ $(function() {
type: "POST",
dataType: "json",
data: JSON.stringify({
command: command
command: command,
origin_axis: self.origin_axis()
}),
contentType: "application/json; charset=UTF-8",
error: function (data, status) {
Expand All @@ -242,6 +247,9 @@ $(function() {
self.distance(self.settings.settings.plugins.bettergrblsupport.distance());
self.distances(self.settings.settings.plugins.bettergrblsupport.distances());

self.origin_axis(self.settings.settings.plugins.bettergrblsupport.origin_axis());
self.origin_axes(self.settings.settings.plugins.bettergrblsupport.origin_axes());

self.is_printing(self.settings.settings.plugins.bettergrblsupport.is_printing());
self.is_operational(self.settings.settings.plugins.bettergrblsupport.is_operational());

Expand Down
2 changes: 1 addition & 1 deletion octoprint_bettergrblsupport/static/txt/_bgs.profile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ axes:
speed: 200
color: default
extruder:
count: 2
count: 20
nozzleDiameter: 0.4
offsets:
- - 0.0
Expand Down
Loading

0 comments on commit 12a2f09

Please sign in to comment.