From ccb2a9545638b6f55073c674950fac4e6973a021 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 14 Mar 2018 00:57:08 -0500 Subject: [PATCH] Update includes for gcode.h => parser.h --- Marlin/G26_Mesh_Validation_Tool.cpp | 2 +- Marlin/I2CPositionEncoder.cpp | 2 +- Marlin/M100_Free_Mem_Chk.cpp | 2 +- Marlin/Marlin.h | 2 +- Marlin/Marlin_main.cpp | 2 +- Marlin/configuration_store.cpp | 2 +- Marlin/hex_print_routines.cpp | 2 +- Marlin/malyanlcd.cpp | 2 +- Marlin/parser.cpp | 4 ++-- Marlin/parser.h | 13 ++++++------- Marlin/planner.cpp | 2 +- Marlin/ubl_G29.cpp | 2 +- Marlin/ultralcd.cpp | 2 +- 13 files changed, 19 insertions(+), 20 deletions(-) diff --git a/Marlin/G26_Mesh_Validation_Tool.cpp b/Marlin/G26_Mesh_Validation_Tool.cpp index 9bddfc1f6..46689c89b 100644 --- a/Marlin/G26_Mesh_Validation_Tool.cpp +++ b/Marlin/G26_Mesh_Validation_Tool.cpp @@ -33,7 +33,7 @@ #include "stepper.h" #include "temperature.h" #include "ultralcd.h" - #include "gcode.h" + #include "parser.h" #include "serial.h" #include "bitmap_flags.h" diff --git a/Marlin/I2CPositionEncoder.cpp b/Marlin/I2CPositionEncoder.cpp index 03c886e3a..95e0f1b72 100644 --- a/Marlin/I2CPositionEncoder.cpp +++ b/Marlin/I2CPositionEncoder.cpp @@ -36,7 +36,7 @@ #include "temperature.h" #include "stepper.h" #include "I2CPositionEncoder.h" - #include "gcode.h" + #include "parser.h" #include diff --git a/Marlin/M100_Free_Mem_Chk.cpp b/Marlin/M100_Free_Mem_Chk.cpp index b1d0bedf2..9a455aba9 100644 --- a/Marlin/M100_Free_Mem_Chk.cpp +++ b/Marlin/M100_Free_Mem_Chk.cpp @@ -54,7 +54,7 @@ #define M100_FREE_MEMORY_CORRUPTOR // Enable for the `M100 C` Corrupt sub-command #include "Marlin.h" -#include "gcode.h" +#include "parser.h" #include "hex_print_routines.h" #define TEST_BYTE ((char) 0xE5) diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index 174175933..bf9d00010 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -35,7 +35,7 @@ #include "MarlinConfig.h" #ifdef DEBUG_GCODE_PARSER - #include "gcode.h" + #include "parser.h" #endif #include "enum.h" diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index b8efcf502..218bf43f5 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -263,7 +263,7 @@ #include "printcounter.h" #include "duration_t.h" #include "types.h" -#include "gcode.h" +#include "parser.h" #if ENABLED(AUTO_POWER_CONTROL) #include "power.h" diff --git a/Marlin/configuration_store.cpp b/Marlin/configuration_store.cpp index 1d78a6a74..a65fd8860 100644 --- a/Marlin/configuration_store.cpp +++ b/Marlin/configuration_store.cpp @@ -52,7 +52,7 @@ #include "temperature.h" #include "ultralcd.h" #include "stepper.h" -#include "gcode.h" +#include "parser.h" #include "vector_3.h" #if ENABLED(MESH_BED_LEVELING) diff --git a/Marlin/hex_print_routines.cpp b/Marlin/hex_print_routines.cpp index bb019a822..e99a01afe 100644 --- a/Marlin/hex_print_routines.cpp +++ b/Marlin/hex_print_routines.cpp @@ -21,7 +21,7 @@ */ #include "MarlinConfig.h" -#include "gcode.h" +#include "parser.h" #if ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(M100_FREE_MEMORY_WATCHER) || ENABLED(DEBUG_GCODE_PARSER) diff --git a/Marlin/malyanlcd.cpp b/Marlin/malyanlcd.cpp index 3a91e8c2d..29177deef 100644 --- a/Marlin/malyanlcd.cpp +++ b/Marlin/malyanlcd.cpp @@ -52,7 +52,7 @@ #include "stepper.h" #include "duration_t.h" #include "printcounter.h" -#include "gcode.h" +#include "parser.h" #include "configuration_store.h" #include "Marlin.h" diff --git a/Marlin/parser.cpp b/Marlin/parser.cpp index 8b3f25241..9abaf1e09 100644 --- a/Marlin/parser.cpp +++ b/Marlin/parser.cpp @@ -21,10 +21,10 @@ */ /** - * gcode.cpp - Parser for a GCode line, providing a parameter interface. + * parser.cpp - Parser for a GCode line, providing a parameter interface. */ -#include "gcode.h" +#include "parser.h" #include "Marlin.h" #include "language.h" diff --git a/Marlin/parser.h b/Marlin/parser.h index 8bd31602f..6676f228d 100644 --- a/Marlin/parser.h +++ b/Marlin/parser.h @@ -21,20 +21,19 @@ */ /** - * gcode.h - Parser for a GCode line, providing a parameter interface. - * Codes like M149 control the way the GCode parser behaves, - * so settings for these codes are located in this class. + * parser.h - Parser for a GCode line, providing a parameter interface. + * Codes like M149 control the way the GCode parser behaves, + * so settings for these codes are located in this class. */ -#ifndef GCODE_H -#define GCODE_H +#ifndef _PARSER_H_ +#define _PARSER_H_ #include "enum.h" #include "types.h" #include "MarlinConfig.h" //#define DEBUG_GCODE_PARSER - #if ENABLED(DEBUG_GCODE_PARSER) #include "hex_print_routines.h" #include "serial.h" @@ -331,4 +330,4 @@ public: extern GCodeParser parser; -#endif // GCODE_H +#endif // _PARSER_H_ diff --git a/Marlin/planner.cpp b/Marlin/planner.cpp index 69f514a62..0ef1e17fb 100644 --- a/Marlin/planner.cpp +++ b/Marlin/planner.cpp @@ -63,7 +63,7 @@ #include "temperature.h" #include "ultralcd.h" #include "language.h" -#include "gcode.h" +#include "parser.h" #include "Marlin.h" diff --git a/Marlin/ubl_G29.cpp b/Marlin/ubl_G29.cpp index 7abe183f8..bf9f57762 100644 --- a/Marlin/ubl_G29.cpp +++ b/Marlin/ubl_G29.cpp @@ -33,7 +33,7 @@ #include "ultralcd.h" #include "stepper.h" #include "planner.h" - #include "gcode.h" + #include "parser.h" #include "serial.h" #include "bitmap_flags.h" diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 788770d32..05ea9a941 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -33,7 +33,7 @@ #include "stepper.h" #include "configuration_store.h" #include "utility.h" -#include "gcode.h" +#include "parser.h" #if HAS_BUZZER && DISABLED(LCD_USE_I2C_BUZZER) #include "buzzer.h"