From 30b327d24c272ea4e5f98179eced17e969c75b09 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 29 Jun 2017 15:11:22 -0500
Subject: [PATCH] Finish the solution for #7166
---
Marlin/gcode.h | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/Marlin/gcode.h b/Marlin/gcode.h
index ac3268d7d4..aa51a57b01 100644
--- a/Marlin/gcode.h
+++ b/Marlin/gcode.h
@@ -144,10 +144,6 @@ public:
#define SEEN_TEST(L) TEST(codebits[LETTER_IND(L)], LETTER_BIT(L))
- // Seen any axis parameter
- // Optimized by moving 'X' up to index 24
- FORCE_INLINE bool seen_axis() { return codebits[3] || SEEN_TEST('E'); }
-
#else // !FASTER_GCODE_PARSER
// Code is found in the string. If not found, value_ptr is unchanged.
@@ -164,13 +160,13 @@ public:
#define SEEN_TEST(L) !!strchr(command_args, L)
- // Seen any axis parameter
- static bool seen_axis() {
- return SEEN_TEST('X') || SEEN_TEST('Y') || SEEN_TEST('Z') || SEEN_TEST('E');
- }
-
#endif // !FASTER_GCODE_PARSER
+ // Seen any axis parameter
+ static bool seen_axis() {
+ return SEEN_TEST('X') || SEEN_TEST('Y') || SEEN_TEST('Z') || SEEN_TEST('E');
+ }
+
// Populate all fields by parsing a single line of GCode
// This uses 54 bytes of SRAM to speed up seen/value
static void parse(char * p);