Update temperature message regex

OctoPrint · Mar 14, 2021 · 9ab2ba2 · 9ab2ba2
1 parent 7ea6969
commit 9ab2ba2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -139,6 +139,7 @@ date of first contribution):
   * [Miroslav Šedivý](https://github.com/eumiro)
   * [Costas Basdekis](https://github.com/costas-basdekis)
   * [Joe Martella](https://github.com/martellaj)
+  * [Scott Lahteine](https://github.com/thinkyhead)
 
 OctoPrint started off as a fork of [Cura](https://github.com/daid/Cura) by
 [Daid Braam](https://github.com/daid). Parts of its communication layer and

diff --git a/docs/configuration/config_yaml.rst b/docs/configuration/config_yaml.rst
@@ -1132,9 +1132,9 @@ Use `Javascript regular expressions <https://developer.mozilla.org/en/docs/Web/J
    # A list of filters to display in the terminal tab. Defaults to the filters shown below
    terminalFilters:
    - name: Suppress temperature messages
-     regex: '(Send: (N\d+\s+)?M105)|(Recv:\s+(ok\s+)?.*(B|T\d*):\d+)'
+     regex: '(Send: (N\d+\s+)?M105)|(Recv:\s+(ok\s+([PBN]\d+\s+)*)?([BCLPR]|T\d*):-?\d+)'
    - name: Suppress SD status messages
-     regex: '(Send: (N\d+\s+)?M27)|(Recv: SD printing byte)'
+     regex: '(Send: (N\d+\s+)?M27)|(Recv: SD printing byte)|(Recv: Not SD printing)'
    - name: Suppress wait responses
      regex: 'Recv: wait'
    - name: Suppress processing responses

diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py
@@ -423,7 +423,7 @@ def settings(init=False, basedir=None, configfile=None, overlays=None):
     "terminalFilters": [
         {
             "name": "Suppress temperature messages",
-            "regex": r"(Send: (N\d+\s+)?M105)|(Recv:\s+(ok\s+((P|B|N)\d+\s+)*)?(B|T\d*):\d+)",
+            "regex": r"(Send: (N\d+\s+)?M105)|(Recv:\s+(ok\s+([PBN]\d+\s+)*)?([BCLPR]|T\d*):-?\d+)",
         },
         {
             "name": "Suppress SD status messages",

diff --git a/src/octoprint/static/js/app/viewmodels/settings.js b/src/octoprint/static/js/app/viewmodels/settings.js
@@ -406,7 +406,8 @@ $(function () {
         self.addTerminalFilter = function () {
             self.terminalFilters.push({
                 name: "New",
-                regex: "(Send:\\s+(N\\d+\\s+)?M105)|(Recv:\\s+(ok\\s+)?.*(B|T\\d*):\\d+)"
+                regex:
+                    "(Send:\\s+(N\\d+\\s+)?M105)|(Recv:\\s+(ok\\s+([PBN]\\d+\\s+)*)?.*([BCLPR]|T\\d*):-?\\d+)"
             });
         };