pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added functionality to send new working area size to grbl after change of profile

Browse source
This commit is contained in:
make-ing 2015-09-01 17:15:36 +02:00
parent 54af60cdd2
commit 39bd1b4375
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/octoprint/plugins/lasercutterprofiles/__init__.py
View file

@ -10,6 +10,7 @@ import logging.handlers
import os
import flask
import socket
import time
import octoprint.plugin
import octoprint.util
@ -54,11 +55,11 @@ class LaserCutterProfilesPlugin(octoprint.plugin.SettingsPlugin,
octoprint.plugin.StartupPlugin,
octoprint.plugin.BlueprintPlugin,
octoprint.plugin.AssetPlugin,
octoprint.plugin.TemplatePlugin):
octoprint.plugin.TemplatePlugin):
# TODO global shouldn't be necessary anymore.
global laserCutterProfileManager
def __init__(self):
pass
@ -67,7 +68,7 @@ class LaserCutterProfilesPlugin(octoprint.plugin.SettingsPlugin,
pass
##~~ AssetPlugin API
def get_assets(self):
return dict(
js=["js/lasercutterprofiles.js"],
@ -104,7 +105,7 @@ class LaserCutterProfilesPlugin(octoprint.plugin.SettingsPlugin,
def get_template_configs(self):
return [dict(type = 'settings', name = "Machine Profiles")]
##~~ BlueprintPlugin API
@octoprint.plugin.BlueprintPlugin.route("/profiles", methods=["GET"])
@ -174,7 +175,6 @@ class LaserCutterProfilesPlugin(octoprint.plugin.SettingsPlugin,
@octoprint.plugin.BlueprintPlugin.route("/profiles/<string:identifier>", methods=["PATCH"])
@restricted_access
def laserCutterProfilesUpdate(self, identifier):
### TODO use self._printer to set new working area size
if not "application/json" in request.headers["Content-Type"]:
return make_response("Expected content-type JSON", 400)
@ -198,6 +198,17 @@ class LaserCutterProfilesPlugin(octoprint.plugin.SettingsPlugin,
make_default = True
del new_profile["default"]
# edit width and depth in grbl firmware
### TODO queu the commands if not in locked or operational mode
if make_default or (laserCutterProfileManager.get_current_or_default()['id'] == identifier):
if self._printer.is_locked() or self._printer.is_operational():
if "volume" in new_profile:
if "width" in new_profile["volume"]:
self._printer.commands('$130=' + str(int(new_profile['volume']['width'])))
time.sleep(0.1) ### TODO find better solution then sleep
if "depth" in new_profile["volume"]:
self._printer.commands('$131=' + str(int(new_profile['volume']['depth'])))
new_profile["id"] = identifier
try: