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

Implemented @foosel's suggestions + made the blacklist settings actually work [#1026]

Browse source 
(cherry picked from commit 1857f07)
This commit is contained in:
Peter Backx 2017-10-25 22:01:30 +02:00 committed by Gina Häußge
parent 51406b7c42
commit ce16f861b3
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -672,7 +672,7 @@ $(function() {
additionalBaudrates: function() { return _.map(splitTextToArray(self.serial_additionalBaudrates(), ",", true, function(item) { return !isNaN(parseInt(item)); }), function(item) { return parseInt(item); }) },
longRunningCommands: function() { return splitTextToArray(self.serial_longRunningCommands(), ",", true) },
checksumRequiringCommands: function() { return splitTextToArray(self.serial_checksumRequiringCommands(), ",", true) },
autoUppercaseBlacklist: function() { return splitTextToArray(self.serial_autoUppercaseBlacklist(), ",", true) },
autoUppercaseBlacklist: function() { return splitTextToArray(self.serial_autoUppercaseBlacklist(), ",", true) }
},
scripts: {
gcode: function() {

6
src/octoprint/static/js/app/viewmodels/terminal.js
View file

@ -124,6 +124,11 @@ $(function() {
self.updateFilterRegex();
});
self.blacklist=[];
self.settings.serial_autoUppercaseBlacklist.subscribe(function(newValue) {
self.blacklist = splitTextToArray(newValue, ",", true);
});
self._reenableFancyTimer = undefined;
self._reenableUnfancyTimer = undefined;
self._disableFancy = function(difference) {
@ -308,7 +313,6 @@ $(function() {
var re = /^([gmt][0-9]+)(\s.*)?/;
var commandMatch = command.match(re);
self.blacklist = splitTextToArray(self.settings.serial_autoUppercaseBlacklist(), ",", true);
if (commandMatch != null) {
command = commandMatch[1].toUpperCase() + ((commandMatch[2] !== undefined) ? commandMatch[2] : "");
if (self.blacklist.indexOf(commandMatch[1].toUpperCase()) < 0){

2
src/octoprint/templates/dialogs/settings/serialconnection.jinja2
View file

@ -145,7 +145,7 @@
<label class="control-label" for="settings-serialAutoUppercaseBlacklist">{{ _('Auto Uppercase Blacklist') }}</label>
<div class="controls">
<input type="text" class="input-block-level" id="settings-serialAutoUppercaseBlacklist" data-bind="value: serial_autoUppercaseBlacklist">
<span class="help-inline">{{ _('Use this to specify the commands that should not be automatically uppercased') }}</span>
<span class="help-inline">{{ _('Use this to specify the commands that should not be automatically uppercased. Comma seperated list.') }}</span>
</div>
</div>
<div class="controls">

1
src/octoprint/util/comm.py
View file

@ -420,7 +420,6 @@ class MachineCom(object):
self._long_running_commands = settings().get(["serial", "longRunningCommands"])
self._checksum_requiring_commands = settings().get(["serial", "checksumRequiringCommands"])
self._auto_uppercase_blacklist = settings().get(["serial", "autoUppercaseBlacklist"])
self._clear_to_send = CountedEvent(max=10, name="comm.clear_to_send")
self._send_queue = SendQueue()