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

Compare commits

base: ManuelW:0.1.3
Branches Tags
ManuelW:master ManuelW:savelastspeed ManuelW:commandlocktest ManuelW:devel
ManuelW:0.2.1 ManuelW:0.2.0 ManuelW:0.1.9 ManuelW:0.1.8 ManuelW:0.1.7 ManuelW:0.1.6 ManuelW:0.1.5 ManuelW:0.1.4 ManuelW:0.1.3b ManuelW:0.1.3 ManuelW:0.1.2 ManuelW:0.1.1 ManuelW:0.1.0
...
compare: ManuelW:0.1.5
Branches Tags
ManuelW:master ManuelW:savelastspeed ManuelW:commandlocktest ManuelW:devel
ManuelW:0.2.1 ManuelW:0.2.0 ManuelW:0.1.9 ManuelW:0.1.8 ManuelW:0.1.7 ManuelW:0.1.6 ManuelW:0.1.5 ManuelW:0.1.4 ManuelW:0.1.3b ManuelW:0.1.3 ManuelW:0.1.2 ManuelW:0.1.1 ManuelW:0.1.0

5 Commits
0.1.3 ... 0.1.5

Author SHA1 Message Date
ntoff
56f73ad6ab increment version to 0.1.5 2017-10-12 00:59:42 +10:00
ntoff
9fe9e04016 fix button while printing (touchUI) 
missed that one :(
 2017-10-11 23:18:34 +10:00
ntoff
0772aaae3a new version again 
so I guess github doesn't support a b c releases?
 2017-09-25 06:48:54 +10:00
ntoff
112852d619 new version 2017-09-25 06:42:48 +10:00
ntoff
0462a7552e fix buttons disabled during printing 
closes #3
 2017-09-25 06:42:02 +10:00
2 changed files with 5 additions and 5 deletions
Expand all files Collapse all files

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

@ -38,8 +38,8 @@ $(function() {
//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: 100, 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 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>\
<button class=\"btn btn-block control-box\" data-bind=\"enable: isOperational() && 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() && loginState.isUser(), click: function() { $root.sendCustomCommand({ type: 'command', commands: ['M106 S0'] }) }\">" + gettext("Fan off") + "</button>\
");
} 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.");
@ -47,7 +47,7 @@ $(function() {
<div id=\"control-fan-slider\" class=\"jog-panel filament\" data-bind=\"visible: loginState.isUser\">\
<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>\
<button class=\"btn btn-block control-box\" data-bind=\"enable: isOperational() && loginState.isUser(), click: function() { sendFanSpeed() }\">" + gettext("Fan Speed(%)") + "</button>\
</div>\
</div>\
");
@ -61,4 +61,4 @@ $(function() {
FanSliderPluginViewModel,
["settingsViewModel", "controlViewModel", "loginStateViewModel"]
]);
});
});

2
setup.py
View File

@ -14,7 +14,7 @@ plugin_package = "octoprint_fanspeedslider"
plugin_name = "OctoPrint-FanSpeedSlider"
# The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
plugin_version = "0.1.3"
plugin_version = "0.1.5"
# The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
# module