From 55adb7ca33aadc6cee35f5ccda64dda3be29563c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <gina@octoprint.org>
Date: Fri, 3 Nov 2017 13:16:16 +0100
Subject: [PATCH] Support sub codes for auto upper casing too

If either the full code or just the main code are blacklisted, only
upper case the code. Otherwise also upper case the parameter list.

In any case push originally entered command to history, not the
modified one.
---
 .../static/js/app/viewmodels/terminal.js      | 30 ++++++++++++++-----
 .../dialogs/settings/serialconnection.jinja2  |  6 ++--
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/octoprint/static/js/app/viewmodels/terminal.js b/src/octoprint/static/js/app/viewmodels/terminal.js
index 0f0aec86..4c61d32e 100644
--- a/src/octoprint/static/js/app/viewmodels/terminal.js
+++ b/src/octoprint/static/js/app/viewmodels/terminal.js
@@ -305,23 +305,37 @@ $(function() {
             }
         };
 
+        // command matching regex
+        // (Example output for inputs G0, G1, G28.1, M117 test)
+        // - 1: code including optional subcode. Example: G0, G1, G28.1, M117
+        // - 2: main code only. Example: G0, G1, G28, M117
+        // - 3: sub code, if available. Example: undefined, undefined, .1, undefined
+        // - 4: command parameters incl. leading whitespace, if any. Example: "", "", "", " test"
+        var commandRe = /^(([gmt][0-9]+)(\.[0-9+])?)(\s.*)?/i;
+
         self.sendCommand = function() {
             var command = self.command();
             if (!command) {
                 return;
             }
 
-            var re = /^([gmt][0-9]+)(\s.*)?/;
-            var commandMatch = command.match(re);
-            if (commandMatch != null) {
-                command = commandMatch[1].toUpperCase() + ((commandMatch[2] !== undefined) ? commandMatch[2] : "");
-                if (self.blacklist.indexOf(commandMatch[1].toUpperCase()) < 0){
-                    command = command.toUpperCase()
+            var commandToSend = command;
+            var commandMatch = commandToSend.match(commandRe);
+            if (commandMatch !== null) {
+                var fullCode = commandMatch[1].toUpperCase(); // full code incl. sub code
+                var mainCode = commandMatch[2].toUpperCase(); // main code only without sub code
+
+                if (self.blacklist.indexOf(mainCode) < 0 && self.blacklist.indexOf(fullCode) < 0) {
+                    // full or main code not on blacklist -> upper case the whole command
+                    commandToSend = commandToSend.toUpperCase();
+                } else {
+                    // full or main code on blacklist -> only upper case that and leave parameters as is
+                    commandToSend = fullCode + (commandMatch[4] !== undefined ? commandMatch[4] : "");
                 }
             }
 
-            if (command) {
-                OctoPrint.control.sendGcode(command)
+            if (commandToSend) {
+                OctoPrint.control.sendGcode(commandToSend)
                     .done(function() {
                         self.cmdHistory.push(command);
                         self.cmdHistory.slice(-300); // just to set a sane limit to how many manually entered commands will be saved...
diff --git a/src/octoprint/templates/dialogs/settings/serialconnection.jinja2 b/src/octoprint/templates/dialogs/settings/serialconnection.jinja2
index 86463c83..663c0cb8 100644
--- a/src/octoprint/templates/dialogs/settings/serialconnection.jinja2
+++ b/src/octoprint/templates/dialogs/settings/serialconnection.jinja2
@@ -141,11 +141,11 @@
                     <span class="help-inline">{{ _('Use this to specify which commands <strong>always</strong> need to be sent with a checksum. Comma separated list.') }}</span>
                 </div>
             </div>
-            <div class="control-group" title="{{ _('Commands to not completely auto-uppercase ') }}">
-                <label class="control-label" for="settings-serialAutoUppercaseBlacklist">{{ _('Auto Uppercase Blacklist') }}</label>
+            <div class="control-group" title="{{ _('Commands to not completely auto uppercase in the terminal tab') }}">
+                <label class="control-label" for="settings-serialAutoUppercaseBlacklist">{{ _('Terminal 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. Comma seperated list.') }}</span>
+                    <span class="help-inline">{{ _('Use this to specify the commands that should not have their parameters automatically uppercased in the terminal tab. Comma seperated list.') }}</span>
                 </div>
             </div>
             <div class="controls">