pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added setting to enable/disable the keycontrol feature

Browse source
This commit is contained in:
Gina Häußge 2015-01-12 09:37:52 +01:00
parent 52056b0eeb
commit edafee7b22
4 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/octoprint/server/api/settings.py
View file

@ -59,7 +59,8 @@ def getSettings():
"sdSupport": s.getBoolean(["feature", "sdSupport"]),
"sdAlwaysAvailable": s.getBoolean(["feature", "sdAlwaysAvailable"]),
"swallowOkAfterResend": s.getBoolean(["feature", "swallowOkAfterResend"]),
"repetierTargetTemp": s.getBoolean(["feature", "repetierTargetTemp"])
"repetierTargetTemp": s.getBoolean(["feature", "repetierTargetTemp"]),
"keyboardControl": s.getBoolean(["feature", "keyboardControl"])
},
"serial": {
"port": connectionOptions["portPreference"],
@ -149,6 +150,7 @@ def setSettings():
if "sdAlwaysAvailable" in data["feature"].keys(): s.setBoolean(["feature", "sdAlwaysAvailable"], data["feature"]["sdAlwaysAvailable"])
if "swallowOkAfterResend" in data["feature"].keys(): s.setBoolean(["feature", "swallowOkAfterResend"], data["feature"]["swallowOkAfterResend"])
if "repetierTargetTemp" in data["feature"].keys(): s.setBoolean(["feature", "repetierTargetTemp"], data["feature"]["repetierTargetTemp"])
if "keyboardControl" in data["feature"].keys(): s.setBoolean(["feature", "keyboardControl"], data["feature"]["keyboardControl"])
if "serial" in data.keys():
if "autoconnect" in data["serial"].keys(): s.setBoolean(["serial", "autoconnect"], data["serial"]["autoconnect"])

3
src/octoprint/settings.py
View file

@ -86,7 +86,8 @@ default_settings = {
"sdSupport": True,
"sdAlwaysAvailable": False,
"swallowOkAfterResend": True,
"repetierTargetTemp": False
"repetierTargetTemp": False,
"keyboardControl": True
},
"folder": {
"uploads": None,

5
src/octoprint/static/js/app/viewmodels/settings.js
View file

@ -64,6 +64,7 @@ function SettingsViewModel(loginStateViewModel, usersViewModel, printerProfilesV
self.feature_sdAlwaysAvailable = ko.observable(undefined);
self.feature_swallowOkAfterResend = ko.observable(undefined);
self.feature_repetierTargetTemp = ko.observable(undefined);
self.feature_keyboardControl = ko.observable(undefined);
self.serial_port = ko.observable();
self.serial_baudrate = ko.observable();
@ -159,6 +160,7 @@ function SettingsViewModel(loginStateViewModel, usersViewModel, printerProfilesV
self.feature_sdAlwaysAvailable(response.feature.sdAlwaysAvailable);
self.feature_swallowOkAfterResend(response.feature.swallowOkAfterResend);
self.feature_repetierTargetTemp(response.feature.repetierTargetTemp);
self.feature_keyboardControl(response.feature.keyboardControl);
self.serial_port(response.serial.port);
self.serial_baudrate(response.serial.baudrate);
@ -222,7 +224,8 @@ function SettingsViewModel(loginStateViewModel, usersViewModel, printerProfilesV
"sdSupport": self.feature_sdSupport(),
"sdAlwaysAvailable": self.feature_sdAlwaysAvailable(),
"swallowOkAfterResend": self.feature_swallowOkAfterResend(),
"repetierTargetTemp": self.feature_repetierTargetTemp()
"repetierTargetTemp": self.feature_repetierTargetTemp(),
"keyboardControl": self.feature_keyboardControl()
},
"serial": {
"port": self.serial_port(),

7
src/octoprint/templates/settings.jinja2
View file

@ -350,6 +350,13 @@
</label>
</div>
</div>
<div class="control-group">
<div class="controls">
<label class="checkbox">
<input type="checkbox" data-bind="checked: feature_keyboardControl" id="settings-featureKeyboardControl"> {{ _("Enable Keyboard Control") }}
</label>
</div>
</div>
<div class="control-group">
<div class="controls">
<label class="checkbox">