Added tab in settings for serial connection options
parent
b0518a71a3
commit
8231e70b44
|
@ -480,6 +480,8 @@ def getSettings():
|
||||||
|
|
||||||
[movementSpeedX, movementSpeedY, movementSpeedZ, movementSpeedE] = s.get(["printerParameters", "movementSpeed", ["x", "y", "z", "e"]])
|
[movementSpeedX, movementSpeedY, movementSpeedZ, movementSpeedE] = s.get(["printerParameters", "movementSpeed", ["x", "y", "z", "e"]])
|
||||||
|
|
||||||
|
connectionOptions = getConnectionOptions()
|
||||||
|
|
||||||
return jsonify({
|
return jsonify({
|
||||||
"api": {
|
"api": {
|
||||||
"enabled": s.getBoolean(["api", "enabled"]),
|
"enabled": s.getBoolean(["api", "enabled"]),
|
||||||
|
@ -511,6 +513,10 @@ def getSettings():
|
||||||
"sdSupport": s.getBoolean(["feature", "sdSupport"])
|
"sdSupport": s.getBoolean(["feature", "sdSupport"])
|
||||||
},
|
},
|
||||||
"serial": {
|
"serial": {
|
||||||
|
"port": connectionOptions["portPreference"],
|
||||||
|
"baudrate": connectionOptions["baudratePreference"],
|
||||||
|
"portOptions": connectionOptions["ports"],
|
||||||
|
"baudrateOptions": connectionOptions["baudrates"],
|
||||||
"autoconnect": s.getBoolean(["serial", "autoconnect"])
|
"autoconnect": s.getBoolean(["serial", "autoconnect"])
|
||||||
},
|
},
|
||||||
"folder": {
|
"folder": {
|
||||||
|
@ -567,6 +573,8 @@ def setSettings():
|
||||||
|
|
||||||
if "serial" in data.keys():
|
if "serial" in data.keys():
|
||||||
if "autoconnect" in data["serial"].keys(): s.setBoolean(["serial", "autoconnect"], data["serial"]["autoconnect"])
|
if "autoconnect" in data["serial"].keys(): s.setBoolean(["serial", "autoconnect"], data["serial"]["autoconnect"])
|
||||||
|
if "port" in data["serial"].keys(): s.set(["serial", "port"], data["serial", "port"])
|
||||||
|
if "baudrate" in data["serial"].keys(): s.setInt(["serial", "baudrate"], data["serial"]["baudrate"])
|
||||||
|
|
||||||
if "folder" in data.keys():
|
if "folder" in data.keys():
|
||||||
if "uploads" in data["folder"].keys(): s.setBaseFolder("uploads", data["folder"]["uploads"])
|
if "uploads" in data["folder"].keys(): s.setBaseFolder("uploads", data["folder"]["uploads"])
|
||||||
|
|
|
@ -1340,6 +1340,10 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
|
||||||
self.feature_alwaysSendChecksum = ko.observable(undefined);
|
self.feature_alwaysSendChecksum = ko.observable(undefined);
|
||||||
self.feature_sdSupport = ko.observable(undefined);
|
self.feature_sdSupport = ko.observable(undefined);
|
||||||
|
|
||||||
|
self.serial_port = ko.observable();
|
||||||
|
self.serial_baudrate = ko.observable();
|
||||||
|
self.serial_portOptions = ko.observableArray([]);
|
||||||
|
self.serial_baudrateOptions = ko.observableArray([]);
|
||||||
self.serial_autoconnect = ko.observable(undefined);
|
self.serial_autoconnect = ko.observable(undefined);
|
||||||
|
|
||||||
self.folder_uploads = ko.observable(undefined);
|
self.folder_uploads = ko.observable(undefined);
|
||||||
|
@ -1393,6 +1397,10 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
|
||||||
self.feature_alwaysSendChecksum(response.feature.alwaysSendChecksum);
|
self.feature_alwaysSendChecksum(response.feature.alwaysSendChecksum);
|
||||||
self.feature_sdSupport(response.feature.sdSupport);
|
self.feature_sdSupport(response.feature.sdSupport);
|
||||||
|
|
||||||
|
self.serial_port(response.serial.port);
|
||||||
|
self.serial_baudrate(response.serial.baudrate);
|
||||||
|
self.serial_portOptions(response.serial.portOptions);
|
||||||
|
self.serial_baudrateOptions(response.serial.baudrateOptions);
|
||||||
self.serial_autoconnect(response.serial.autoconnect);
|
self.serial_autoconnect(response.serial.autoconnect);
|
||||||
|
|
||||||
self.folder_uploads(response.folder.uploads);
|
self.folder_uploads(response.folder.uploads);
|
||||||
|
@ -1437,6 +1445,8 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
|
||||||
"sdSupport": self.feature_sdSupport()
|
"sdSupport": self.feature_sdSupport()
|
||||||
},
|
},
|
||||||
"serial": {
|
"serial": {
|
||||||
|
"port": self.serial_port(),
|
||||||
|
"baudrate": self.serial_baudrate(),
|
||||||
"autoconnect": self.serial_autoconnect()
|
"autoconnect": self.serial_autoconnect()
|
||||||
},
|
},
|
||||||
"folder": {
|
"folder": {
|
||||||
|
|
|
@ -6,18 +6,42 @@
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<div class="tabbable">
|
<div class="tabbable">
|
||||||
<ul class="nav nav-list span4" id="settingsTabs">
|
<ul class="nav nav-list span4" id="settingsTabs">
|
||||||
<li class="active"><a href="#settings_printerParameters" data-toggle="tab">Printer Parameters</a></li>
|
<li class="active"><a href="#settings-serialConnection" data-toggle="tab">Serial Connection</a></li>
|
||||||
|
<li><a href="#settings_printerParameters" data-toggle="tab">Printer Parameters</a></li>
|
||||||
<li><a href="#settings_webcam" data-toggle="tab">Webcam</a></li>
|
<li><a href="#settings_webcam" data-toggle="tab">Webcam</a></li>
|
||||||
<li><a href="#settings_features" data-toggle="tab">Features</a></li>
|
<li><a href="#settings_features" data-toggle="tab">Features</a></li>
|
||||||
<li><a href="#settings_folder" data-toggle="tab">Folder</a></li>
|
<li><a href="#settings_folder" data-toggle="tab">Folders</a></li>
|
||||||
<li><a href="#settings_temperature" data-toggle="tab">Temperature</a></li>
|
<li><a href="#settings_temperature" data-toggle="tab">Temperatures</a></li>
|
||||||
<li><a href="#settings_appearance" data-toggle="tab">Appearance</a></li>
|
<li><a href="#settings_appearance" data-toggle="tab">Appearance</a></li>
|
||||||
{% if enableAccessControl %}<li><a href="#settings_users" data-toggle="tab">Users</a></li>{% endif %}
|
|
||||||
<li><a href="#settings_api" data-toggle="tab">Api</a></li>
|
<li><a href="#settings_api" data-toggle="tab">Api</a></li>
|
||||||
|
{% if enableAccessControl %}<li><a href="#settings_users" data-toggle="tab">Users</a></li>{% endif %}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<div class="tab-content span8">
|
<div class="tab-content span8">
|
||||||
<div class="tab-pane active" id="settings_printerParameters">
|
<div class="tab-pane active" id="settings_serialConnection">
|
||||||
|
<form class="form-horizontal">
|
||||||
|
<div class="control-group">
|
||||||
|
<div class="controls">
|
||||||
|
<label for="settings-serialPort">Serial Port</label>
|
||||||
|
<select id="settings-serialPort" data-bind="options: serial_portOptions, optionsCaption: 'AUTO', value: serial_port"></select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="control-group">
|
||||||
|
<div class="controls">
|
||||||
|
<label for="settings-baudrate">Baudrate</label>
|
||||||
|
<select id="settings-baudrate" data-bind="options: serial_baudrateOptions, optionsCaption: 'AUTO', value: serial_baudrate"></select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="control-group">
|
||||||
|
<div class="controls">
|
||||||
|
<label class="checkbox">
|
||||||
|
<input type="checkbox" data-bind="checked: serial_autoconnect" id="settings-serialAutoconnect"> Auto-connect to printer on server start
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
<div class="tab-pane" id="settings_printerParameters">
|
||||||
<form class="form-horizontal">
|
<form class="form-horizontal">
|
||||||
<div class="control-group">
|
<div class="control-group">
|
||||||
<label class="control-label" for="settings-movementSpeedX">Movement Speed X Axis</label>
|
<label class="control-label" for="settings-movementSpeedX">Movement Speed X Axis</label>
|
||||||
|
@ -134,13 +158,6 @@
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="control-group">
|
|
||||||
<div class="controls">
|
|
||||||
<label class="checkbox">
|
|
||||||
<input type="checkbox" data-bind="checked: serial_autoconnect" id="settings-serialAutoconnect"> Auto-connect to printer on server start
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<div class="tab-pane" id="settings_folder">
|
<div class="tab-pane" id="settings_folder">
|
||||||
|
|
Loading…
Reference in New Issue