+
+
@@ -176,7 +182,7 @@
-
+
{{ _('Convert') }}
\ No newline at end of file
diff --git a/src/octoprint/printer/__init__.py b/src/octoprint/printer/__init__.py
index b518cb20..2a4446db 100644
--- a/src/octoprint/printer/__init__.py
+++ b/src/octoprint/printer/__init__.py
@@ -23,7 +23,7 @@ __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms
import re
-import octoprint.util.comm_acc as comm
+import octoprint.util.comm_acc2 as comm
import octoprint.util as util
from octoprint.settings import settings
diff --git a/src/octoprint/printer/standard.py b/src/octoprint/printer/standard.py
index b0827966..5fee8558 100644
--- a/src/octoprint/printer/standard.py
+++ b/src/octoprint/printer/standard.py
@@ -22,7 +22,7 @@ from octoprint.plugin import plugin_manager, ProgressPlugin
from octoprint.printer import PrinterInterface, PrinterCallback, UnknownScript
from octoprint.printer.estimation import TimeEstimationHelper
from octoprint.settings import settings
-from octoprint.util import comm_acc as comm
+from octoprint.util import comm_acc2 as comm
from octoprint.util import InvariantContainer
diff --git a/src/octoprint/static/js/app/viewmodels/control.js b/src/octoprint/static/js/app/viewmodels/control.js
index 71ecc7b4..cf3b18bf 100644
--- a/src/octoprint/static/js/app/viewmodels/control.js
+++ b/src/octoprint/static/js/app/viewmodels/control.js
@@ -108,11 +108,11 @@ $(function() {
});
}
};
-
+
self.rerenderControls = function () {
var allControls = self.controlsFromServer.concat(self.additionalControls);
- self.controls(self._processControls(allControls))
+ self.controls(self._processControls(allControls));
};
self.requestData = function () {
diff --git a/src/octoprint/static/js/app/viewmodels/files.js b/src/octoprint/static/js/app/viewmodels/files.js
index 57ab14ec..b4f71d85 100644
--- a/src/octoprint/static/js/app/viewmodels/files.js
+++ b/src/octoprint/static/js/app/viewmodels/files.js
@@ -100,7 +100,7 @@ $(function() {
});
}
};
-
+
self.fromCurrentData = function(data) {
self._processStateData(data.state);
};
@@ -138,7 +138,7 @@ $(function() {
}
});
};
-
+
self.fromResponse = function(response, filenameToFocus, locationToFocus) {
var files = response.files;
_.each(files, function(element, index, list) {
@@ -267,7 +267,7 @@ $(function() {
return "files_template_dummy";
}
};
-
+
self.getEntryId = function(data) {
return "gcode_file_" + md5(data["origin"] + ":" + data["name"]);
};
@@ -344,7 +344,7 @@ $(function() {
}
return output;
};
-
+
self.performSearch = function(e) {
if (e !== undefined) {
e.preventDefault();
@@ -375,7 +375,7 @@ $(function() {
self.enableSVGConversion = function (data) {
return self.loginState.isUser() && !(self.isPrinting() || self.isPaused());
};
-
+
self.onStartup = function() {
$(".accordion-toggle[data-target='#files']").click(function() {
var files = $("#files");
@@ -610,11 +610,13 @@ $(function() {
$('#take_photo_dialog').on('shown', function () {
$('#photo_preview').photobooth();
- var w = $('#photo_preview').width();
- var h = $('#photo_preview').height();
+ var w = $('#photo_preview').parent().width()*0.98;
+ var h = w*3.0/4.0;
+ $('#photo_preview').height(h);
+ $('#photo_preview').width(w);
$('#photo_preview').data('photobooth').resize(w, h);
});
-
+
$('#photo_preview').on("image", function (event, dataUrl) {
var photoBlob = self.dataUriToBlob(dataUrl);
var t = new Date();
@@ -660,7 +662,7 @@ $(function() {
);
return !!fGetUserMedia;
};
-
+
self.dataUriToBlob = function(dataURI) {
// serialize the base64/URLEncoded data
var byteString;
diff --git a/src/octoprint/static/js/app/viewmodels/printerstate.js b/src/octoprint/static/js/app/viewmodels/printerstate.js
index 1ceacb01..b6b8f6d5 100644
--- a/src/octoprint/static/js/app/viewmodels/printerstate.js
+++ b/src/octoprint/static/js/app/viewmodels/printerstate.js
@@ -34,6 +34,10 @@ $(function() {
self.currentHeight = ko.observable(undefined);
self.currentPos = ko.observable(undefined);
+ self.intensityOverride = ko.observable(100);
+ self.feedrateOverride = ko.observable(100);
+ self.intensityOverride.extend({ rateLimit: 500 });
+ self.feedrateOverride.extend({ rateLimit: 500 });
self.TITLE_PRINT_BUTTON_PAUSED = gettext("Restarts the print job from the beginning");
self.TITLE_PRINT_BUTTON_UNPAUSED = gettext("Starts the print job");
@@ -281,6 +285,62 @@ $(function() {
self.onEventRealTimeState = function(payload){
self.currentPos({x: payload.wx, y: payload.wy});
};
+
+ self.intensityOverride.subscribe(function(factor){
+ self._overrideCommand("/intensity "+factor);
+ });
+ self.feedrateOverride.subscribe(function(factor){
+ self._overrideCommand("/feedrate "+factor);
+ });
+
+ self._overrideCommand = function(command, callback) {
+ $.ajax({
+ url: API_BASEURL + "printer/command",
+ type: "POST",
+ dataType: "json",
+ contentType: "application/json; charset=UTF-8",
+ data: JSON.stringify({command: command}),
+ success: function(response) {
+ if (callback != undefined) {
+ callback();
+ }
+ }
+ });
+ };
+
+ self._configureOverrideSliders = function() {
+ self.intensityOverrideSlider = $("#intensity_override_slider").slider({
+ step: 1,
+ min: 10,
+ max: 200,
+ value: 100,
+// tooltip: 'hide'
+ }).on("slideStop", function(ev){
+ self.intensityOverride(ev.value);
+ });
+
+ self.feedrateOverrideSlider = $("#feedrate_override_slider").slider({
+ step: 1,
+ min: 10,
+ max: 200,
+ value: 100,
+// tooltip: 'hide'
+ }).on("slideStop", function(ev){
+ self.feedrateOverride(ev.value);
+ });
+
+ };
+
+ self.onEventPrintDone = function(){
+ self.feedrateOverrideSlider.slider('setValue', 100);
+ self.intensityOverrideSlider.slider('setValue', 100);
+ self.intensityOverride(100);
+ self.feedrateOverride(100);
+ };
+
+ self.onStartup = function() {
+ self._configureOverrideSliders();
+ };
}
OCTOPRINT_VIEWMODELS.push([
diff --git a/src/octoprint/templates/mrbeam_index.jinja2 b/src/octoprint/templates/mrbeam_index.jinja2
index 590a3132..46cb87d8 100644
--- a/src/octoprint/templates/mrbeam_index.jinja2
+++ b/src/octoprint/templates/mrbeam_index.jinja2
@@ -155,8 +155,20 @@
{{ _('Timelapse') }}: --> {{ _('Approx. Total Job Time') }}:
-
-
+
diff --git a/src/octoprint/util/comm_acc.py b/src/octoprint/util/comm_acc.py
index 83d6b82f..8dacbdd5 100644
--- a/src/octoprint/util/comm_acc.py
+++ b/src/octoprint/util/comm_acc.py
@@ -1888,22 +1888,34 @@ class MachineCom(object):
self._doSendWithoutChecksum(commandToSend)
def _doSendWithoutChecksum(self, cmd):
- self._log("Send: %s" % cmd)
- self.acc_line_lengths.append(len(cmd)+1) # Track number of characters in grbl serial read buffer
- try:
- self._serial.write(cmd + '\n')
- except serial.SerialTimeoutException:
- self._log("Serial timeout while writing to serial port, trying again.")
+ if cmd == "?":
+ try:
+ self._serial.write(cmd)
+ except serial.SerialTimeoutException:
+ self._log("Serial timeout while writing to serial port, trying again.")
+ try:
+ self._serial.write(cmd)
+ except:
+ self._log("Unexpected error while writing serial port: %s" % (get_exception_string()))
+ self._errorValue = get_exception_string()
+ self.close(True)
+ else:
+ self._log("Send: %s" % cmd)
+ self.acc_line_lengths.append(len(cmd)+1) # Track number of characters in grbl serial read buffer
try:
self._serial.write(cmd + '\n')
+ except serial.SerialTimeoutException:
+ self._log("Serial timeout while writing to serial port, trying again.")
+ try:
+ self._serial.write(cmd + '\n')
+ except:
+ self._log("Unexpected error while writing serial port: %s" % (get_exception_string()))
+ self._errorValue = get_exception_string()
+ self.close(True)
except:
self._log("Unexpected error while writing serial port: %s" % (get_exception_string()))
self._errorValue = get_exception_string()
self.close(True)
- except:
- self._log("Unexpected error while writing serial port: %s" % (get_exception_string()))
- self._errorValue = get_exception_string()
- self.close(True)
##~~ command handlers
def _gcode_H_sent(self, cmd, cmd_type=None):
diff --git a/src/octoprint/util/comm_acc2.py b/src/octoprint/util/comm_acc2.py
new file mode 100644
index 00000000..39a0318a
--- /dev/null
+++ b/src/octoprint/util/comm_acc2.py
@@ -0,0 +1,1270 @@
+# coding=utf-8
+from __future__ import absolute_import
+__author__ = "Florian Becker
+
+
@@ -270,69 +282,70 @@
+
+
+
+
+ 100% Intensity
+
+
+
+ 100% Feedrate
+
+
-
- {% if webcamStream %}
-
+
-
- {% endif %}
-
-
- ![]()
-
-
+ {% if webcamStream %}
+
+
+ {% endif %}
+
+
+ ![]()
+
+