ManuelW/OctoPrint-FanSpeedSlider
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add a setting to change the default value of the slider

Browse Source
This commit is contained in:
ntoff
2017-08-30 22:39:57 +10:00
parent 79bc20c81a
commit 18f009fa85
6 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
octoprint_fanspeedslider/static/css/style.css
View File

@ -13,4 +13,8 @@
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
div#settings_plugin_fanspeedslider div {
width: 80%;
}

24
octoprint_fanspeedslider/static/js/fanslider.js
View File

@ -1,24 +1,24 @@
/*
*
*
* Author: ntoff
* License: AGPLv3
*/
$(function() {
function FanSliderPluginViewModel(parameters) {
function FanSliderPluginViewModel(parameters) {
var self = this;
self.printerstate = parameters[0];
self.loginstate = parameters[1];
self.control = parameters[2];
self.settings = parameters[3];
//default to 100% fan speed
fanSpeed = ko.observable(100);
fanSpeed = ko.observable(undefined);
//convert percentage into PWM
fanPWM = ko.pureComputed(function () {
return Math.round(fanSpeed() * 255 / 100);
});
//set fan speed
//send gcode to set fan speed
sendFanSpeed = function () {
self.control.sendCustomCommand({ command: "M106 S" + fanPWM() });
};
@ -26,13 +26,12 @@ $(function() {
$("#control > div.jog-panel").eq(0).addClass("controls");
$("#control > div.jog-panel").eq(1).addClass("tools");
$("#control > div.jog-panel").eq(2).addClass("general");
//Only display the slider if TouchUI isn't active (sorry)
//If !TouchUI then remove standard buttons + add slider + new buttons
if ($("#touch body").length ==0 ) {
//add ID to buttons
$("#control > div.general").find("button").eq(0).attr("id", "motors-off");
$("#control > div.general").find("button").eq(1).attr("id", "fan-on");
$("#control > div.general").find("button").eq(2).attr("id", "fan-off");
//remove original fan on/off buttons
$("#fan-on").remove();
$("#fan-off").remove();
@ -42,11 +41,10 @@ $(function() {
<button class=\"btn btn-block control-box\" data-bind=\"enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { sendFanSpeed() }\">" + gettext("Fan on") + ":<span data-bind=\"text: fanSpeed() + '%'\"></span></button>\
<button class=\"btn btn-block control-box\" data-bind=\"enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendCustomCommand({ type: 'command', commands: ['M106 S0'] }) }\">" + gettext("Fan off") + "</button>\
");
} else {
} else { //if TouchUI is active we only add the speed input + fan on button in a new section.
console.log("Fan Speed Slider: NOTICE! TouchUI is active, adding simplified control.");
$("#control > div.jog-panel.general").after("\
<div id=\"control-fan-slider\" class=\"jog-panel filament\" data-bind=\"visible: loginState.isUser\">\
<h1>" + gettext("Filament") + "</h1>\
<div>\
<input type=\"number\" style=\"width: 150px\" data-bind=\"slider: {min: 00, max: 255, step: 1, value: fanSpeed, tooltip: 'hide'}\">\
<button class=\"btn btn-block control-box\" data-bind=\"enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { sendFanSpeed() }\">" + gettext("Fan Speed(%)") + "</button>\
@ -54,10 +52,14 @@ $(function() {
</div>\
");
}
//retrieve settings
self.onBeforeBinding = function() {
fanSpeed(self.settings.settings.plugins.fanspeedslider.fanSpeed());
}
}
OCTOPRINT_VIEWMODELS.push([
FanSliderPluginViewModel,
["printerStateViewModel", "loginStateViewModel", "controlViewModel"]
]);
["printerStateViewModel", "loginStateViewModel", "controlViewModel", "settingsViewModel"]
]);
});