diff --git a/src/octoprint/plugins/svgtogcode/static/css/svgtogcode.css b/src/octoprint/plugins/svgtogcode/static/css/svgtogcode.css index f4ddf52f..a5166fd7 100644 --- a/src/octoprint/plugins/svgtogcode/static/css/svgtogcode.css +++ b/src/octoprint/plugins/svgtogcode/static/css/svgtogcode.css @@ -91,3 +91,14 @@ svg text { height: 70vh; margin: auto; } + +.overrideSlider { + margin-bottom: 8px; +} + +.overrideSlider input { + width:45%; +} +.overrideSlider span { + padding-left: .6em; +} \ No newline at end of file diff --git a/src/octoprint/static/js/app/viewmodels/printerstate.js b/src/octoprint/static/js/app/viewmodels/printerstate.js index 1ceacb01..a60cb639 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: 300 }); + self.feedrateOverride.extend({ rateLimit: 300 }); 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,40 @@ $(function() { self.onEventRealTimeState = function(payload){ self.currentPos({x: payload.wx, y: payload.wy}); }; + + self.intensityOverride.subscribe(function(factor){ + self._jobCommand("M221S"+factor); + }); + self.feedrateOverride.subscribe(function(factor){ + self._jobCommand("M220S"+factor); + }); + + self._configureOverrideSliders = function() { + self.intensityOverrideSlider = $("#intensity_override_slider").slider({ + step: 1, + min: 10, + max: 200, + value: 100, + tooltip: 'hide' + }).on("slide", function(ev){ + self.intensityOverride(ev.value); + }); + + self.feedrateOverrideSlider = $("#feedrate_override_slider").slider({ + step: 1, + min: 10, + max: 200, + value: 100, + tooltip: 'hide' + }).on("slide", function(ev){ + self.feedrateOverride(ev.value); + }); + + }; + + 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 2276b1dc..86b64cdf 100644 --- a/src/octoprint/templates/mrbeam_index.jinja2 +++ b/src/octoprint/templates/mrbeam_index.jinja2 @@ -155,8 +155,20 @@ {{ _('Timelapse') }}:
--> {{ _('Approx. Total Job Time') }}:
-
-
 {{ _('Processed') }} :
+
+ +
+
 {{ _('Processed') }} :
+
+
+ + 100% Intensity +
+
+ + 100% Feedrate +
+