Browse Source

Finish the solution for #7166

Scott Lahteine 7 years ago
parent
commit
30b327d24c
1 changed files with 5 additions and 9 deletions
  1. 5
    9
      Marlin/gcode.h

+ 5
- 9
Marlin/gcode.h View File

144
 
144
 
145
     #define SEEN_TEST(L) TEST(codebits[LETTER_IND(L)], LETTER_BIT(L))
145
     #define SEEN_TEST(L) TEST(codebits[LETTER_IND(L)], LETTER_BIT(L))
146
 
146
 
147
-    // Seen any axis parameter
148
-    // Optimized by moving 'X' up to index 24
149
-    FORCE_INLINE bool seen_axis() { return codebits[3] || SEEN_TEST('E'); }
150
-
151
   #else // !FASTER_GCODE_PARSER
147
   #else // !FASTER_GCODE_PARSER
152
 
148
 
153
     // Code is found in the string. If not found, value_ptr is unchanged.
149
     // Code is found in the string. If not found, value_ptr is unchanged.
164
 
160
 
165
     #define SEEN_TEST(L) !!strchr(command_args, L)
161
     #define SEEN_TEST(L) !!strchr(command_args, L)
166
 
162
 
167
-    // Seen any axis parameter
168
-    static bool seen_axis() {
169
-      return SEEN_TEST('X') || SEEN_TEST('Y') || SEEN_TEST('Z') || SEEN_TEST('E');
170
-    }
171
-
172
   #endif // !FASTER_GCODE_PARSER
163
   #endif // !FASTER_GCODE_PARSER
173
 
164
 
165
+  // Seen any axis parameter
166
+  static bool seen_axis() {
167
+    return SEEN_TEST('X') || SEEN_TEST('Y') || SEEN_TEST('Z') || SEEN_TEST('E');
168
+  }
169
+
174
   // Populate all fields by parsing a single line of GCode
170
   // Populate all fields by parsing a single line of GCode
175
   // This uses 54 bytes of SRAM to speed up seen/value
171
   // This uses 54 bytes of SRAM to speed up seen/value
176
   static void parse(char * p);
172
   static void parse(char * p);

Loading…
Cancel
Save