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

touch ui compatibility

Browse Source
This commit is contained in:
ntoff 2017-08-30 18:28:26 +10:00
parent 594455ef61
commit 05e2e10497
3 changed files with 67 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
octoprint_fanspeedslider/__init__.py
View File

@ -8,9 +8,13 @@ class FanSliderPlugin(octoprint.plugin.StartupPlugin,
octoprint.plugin.SettingsPlugin, octoprint.plugin.SettingsPlugin,
octoprint.plugin.AssetPlugin): octoprint.plugin.AssetPlugin):
def get_settings_defaults(self):
return dict(fanSpeed="255")
def get_assets(self): def get_assets(self):
return dict( return dict(
js=["js/fanslider.js"] js=["js/fanslider.js"],
css=["css/style.css"]
) )
def get_update_information(self): def get_update_information(self):

16
octoprint_fanspeedslider/static/css/style.css Normal file
View File

@ -0,0 +1,16 @@
#touch body #control #control-fan-slider {
padding: 30px 0 15px 15px;
width: 50%;
}
#touch body #control #control-fan-slider button, #touch body #control #control-fan-slider input {
padding: 10px 20px;
margin: 0 0 20px;
width: 100%;
min-height: 40px;
height: auto;
-ms-box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}

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

@ -11,22 +11,23 @@ $(function() {
self.printerstate = parameters[0]; self.printerstate = parameters[0];
self.loginstate = parameters[1]; self.loginstate = parameters[1];
self.control = parameters[2] self.control = parameters[2];
//default to 100% fan speed
fanSpeed = ko.observable(255); fanSpeed = ko.observable(100);
//convert 0 - 255 to 0 - 100% for the button //convert percentage into PWM
fanPercent = ko.pureComputed(function () { fanPWM = ko.pureComputed(function () {
return Math.floor(fanSpeed() /255 * 100); return Math.round(fanSpeed() * 255 / 100);
}); });
//set fan speed //set fan speed
sendFanSpeed = function () { sendFanSpeed = function () {
self.control.sendCustomCommand({ command: "M106 S" + fanSpeed() }); self.control.sendCustomCommand({ command: "M106 S" + fanPWM() });
}; };
//extra classes //extra classes
$("#control > div.jog-panel").eq(0).addClass("controls"); $("#control > div.jog-panel").eq(0).addClass("controls");
$("#control > div.jog-panel").eq(1).addClass("tools"); $("#control > div.jog-panel").eq(1).addClass("tools");
$("#control > div.jog-panel").eq(2).addClass("general"); $("#control > div.jog-panel").eq(2).addClass("general");
//Only display the slider if TouchUI isn't active (sorry)
if ($("#touch body").length ==0 ) {
//add ID to buttons //add ID to buttons
$("#control > div.general").find("button").eq(0).attr("id", "motors-off"); $("#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(1).attr("id", "fan-on");
@ -36,10 +37,23 @@ $(function() {
$("#fan-on").remove(); $("#fan-on").remove();
$("#fan-off").remove(); $("#fan-off").remove();
//add new fan controls //add new fan controls
$("#control > div.jog-panel.general").find("button").eq(0).before("<input type=\"number\" style=\"width: 90px\" data-bind=\"slider: {min: 00, max: 255, step: 1, value: fanSpeed, tooltip: 'hide'}\">\ $("#control > div.jog-panel.general").find("button").eq(0).before("\
<button class=\"btn btn-block control-box\" data-bind=\"enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { sendFanSpeed() }\">" + gettext("Fan on") + ":<span data-bind=\"text: fanPercent() + '%'\"></span></button>\ <input type=\"number\" style=\"width: 90px\" data-bind=\"slider: {min: 00, max: 100, step: 1, value: fanSpeed, tooltip: 'hide'}\">\
<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>"); <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 {
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>\
</div>\
</div>\
");
}
} }
OCTOPRINT_VIEWMODELS.push([ OCTOPRINT_VIEWMODELS.push([
FanSliderPluginViewModel, FanSliderPluginViewModel,