From 8cc31d1b2ea35fa175616b49377c5b944c4b3ac8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 25 Apr 2018 06:54:17 -0500
Subject: [PATCH] Cleanup to emergency parser

Followup to #10516
---
 Marlin/src/feature/emergency_parser.cpp | 60 ++++++++++++-------------
 Marlin/src/feature/emergency_parser.h   | 24 +++++-----
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/Marlin/src/feature/emergency_parser.cpp b/Marlin/src/feature/emergency_parser.cpp
index 21b1f3c8fc..c914e2dab0 100644
--- a/Marlin/src/feature/emergency_parser.cpp
+++ b/Marlin/src/feature/emergency_parser.cpp
@@ -33,7 +33,7 @@
 extern volatile bool wait_for_user, wait_for_heatup;
 void quickstop_stepper();
 
-EmergencyParser::State EmergencyParser::state = EmergencyParser::State::RESET;
+EmergencyParser::State EmergencyParser::state = EP_RESET;
 bool EmergencyParser::killed_by_M112; // = false
 
 EmergencyParser emergency_parser;
@@ -41,79 +41,79 @@ EmergencyParser emergency_parser;
 void EmergencyParser::update(const uint8_t c) {
 
   switch (state) {
-    case EmergencyParser::State::RESET:
+    case EP_RESET:
       switch (c) {
         case ' ': break;
-        case 'N': state = EmergencyParser::State::N;      break;
-        case 'M': state = EmergencyParser::State::M;      break;
-        default: state  = EmergencyParser::State::IGNORE;
+        case 'N': state = EP_N;      break;
+        case 'M': state = EP_M;      break;
+        default: state  = EP_IGNORE;
       }
       break;
 
-    case EmergencyParser::State::N:
+    case EP_N:
       switch (c) {
         case '0': case '1': case '2':
         case '3': case '4': case '5':
         case '6': case '7': case '8':
         case '9': case '-': case ' ':   break;
-        case 'M': state = EmergencyParser::State::M;      break;
-        default:  state = EmergencyParser::State::IGNORE;
+        case 'M': state = EP_M;      break;
+        default:  state = EP_IGNORE;
       }
       break;
 
-    case EmergencyParser::State::M:
+    case EP_M:
       switch (c) {
         case ' ': break;
-        case '1': state = EmergencyParser::State::M1;     break;
-        case '4': state = EmergencyParser::State::M4;     break;
-        default: state  = EmergencyParser::State::IGNORE;
+        case '1': state = EP_M1;     break;
+        case '4': state = EP_M4;     break;
+        default: state  = EP_IGNORE;
       }
       break;
 
-    case EmergencyParser::State::M1:
+    case EP_M1:
       switch (c) {
-        case '0': state = EmergencyParser::State::M10;    break;
-        case '1': state = EmergencyParser::State::M11;    break;
-        default: state  = EmergencyParser::State::IGNORE;
+        case '0': state = EP_M10;    break;
+        case '1': state = EP_M11;    break;
+        default: state  = EP_IGNORE;
       }
       break;
 
-    case EmergencyParser::State::M10:
-      state = (c == '8') ? EmergencyParser::State::M108 : EmergencyParser::State::IGNORE;
+    case EP_M10:
+      state = (c == '8') ? EP_M108 : EP_IGNORE;
       break;
 
-    case EmergencyParser::State::M11:
-      state = (c == '2') ? EmergencyParser::State::M112 : EmergencyParser::State::IGNORE;
+    case EP_M11:
+      state = (c == '2') ? EP_M112 : EP_IGNORE;
       break;
 
-    case EmergencyParser::State::M4:
-      state = (c == '1') ? EmergencyParser::State::M41 : EmergencyParser::State::IGNORE;
+    case EP_M4:
+      state = (c == '1') ? EP_M41 : EP_IGNORE;
       break;
 
-    case EmergencyParser::State::M41:
-      state = (c == '0') ? EmergencyParser::State::M410 : EmergencyParser::State::IGNORE;
+    case EP_M41:
+      state = (c == '0') ? EP_M410 : EP_IGNORE;
       break;
 
-    case EmergencyParser::State::IGNORE:
-      if (c == '\n') state = EmergencyParser::State::RESET;
+    case EP_IGNORE:
+      if (c == '\n') state = EP_RESET;
       break;
 
     default:
       if (c == '\n') {
         switch (state) {
-          case EmergencyParser::State::M108:
+          case EP_M108:
             wait_for_user = wait_for_heatup = false;
             break;
-          case EmergencyParser::State::M112:
+          case EP_M112:
             killed_by_M112 = true;
             break;
-          case EmergencyParser::State::M410:
+          case EP_M410:
             quickstop_stepper();
             break;
           default:
             break;
         }
-        state = EmergencyParser::State::RESET;
+        state = EP_RESET;
       }
   }
 }
diff --git a/Marlin/src/feature/emergency_parser.h b/Marlin/src/feature/emergency_parser.h
index 140200be19..be2bf3d7a2 100644
--- a/Marlin/src/feature/emergency_parser.h
+++ b/Marlin/src/feature/emergency_parser.h
@@ -31,18 +31,18 @@ class EmergencyParser {
 
   // Currently looking for: M108, M112, M410
   enum State : char {
-    RESET,
-    N,
-    M,
-    M1,
-    M10,
-    M108,
-    M11,
-    M112,
-    M4,
-    M41,
-    M410,
-    IGNORE // to '\n'
+    EP_RESET,
+    EP_N,
+    EP_M,
+    EP_M1,
+    EP_M10,
+    EP_M108,
+    EP_M11,
+    EP_M112,
+    EP_M4,
+    EP_M41,
+    EP_M410,
+    EP_IGNORE // to '\n'
   };
 
 public: