Browse Source

Ensure language.h include order

See #17604
vanilla_fb_2.0.x
Scott Lahteine 5 years ago
parent
commit
000ec9fc13
  1. 4
      Marlin/src/core/language.h
  2. 2
      Marlin/src/core/serial.cpp
  3. 1
      Marlin/src/feature/pause.cpp
  4. 1
      Marlin/src/gcode/feature/pause/G60.cpp
  5. 1
      Marlin/src/gcode/feature/pause/G61.cpp
  6. 2
      Marlin/src/lcd/lcdprint.cpp
  7. 1
      Marlin/src/module/configuration_store.cpp
  8. 1
      Marlin/src/module/planner.cpp
  9. 1
      Marlin/src/module/planner_bezier.cpp
  10. 1
      Marlin/src/module/stepper.cpp
  11. 1
      Marlin/src/module/temperature.cpp
  12. 1
      Marlin/src/sd/cardreader.cpp

4
Marlin/src/core/language.h

@ -81,12 +81,10 @@
#ifdef CUSTOM_MACHINE_NAME
#undef MACHINE_NAME
#define MACHINE_NAME CUSTOM_MACHINE_NAME
#else
#ifdef DEFAULT_MACHINE_NAME
#elif defined(DEFAULT_MACHINE_NAME)
#undef MACHINE_NAME
#define MACHINE_NAME DEFAULT_MACHINE_NAME
#endif
#endif
#ifndef MACHINE_UUID
#define MACHINE_UUID DEFAULT_MACHINE_UUID

2
Marlin/src/core/serial.cpp

@ -21,7 +21,7 @@
*/
#include "serial.h"
#include "language.h"
#include "../inc/MarlinConfig.h"
uint8_t marlin_debug_flags = MARLIN_DEBUG_NONE;

1
Marlin/src/feature/pause.cpp

@ -53,7 +53,6 @@
#include "../lcd/extui/ui_api.h"
#endif
#include "../core/language.h"
#include "../lcd/ultralcd.h"
#if HAS_BUZZER

1
Marlin/src/gcode/feature/pause/G60.cpp

@ -24,7 +24,6 @@
#if SAVED_POSITIONS
#include "../../../core/language.h"
#include "../../gcode.h"
#include "../../../module/motion.h"

1
Marlin/src/gcode/feature/pause/G61.cpp

@ -24,7 +24,6 @@
#if SAVED_POSITIONS
#include "../../../core/language.h"
#include "../../../module/planner.h"
#include "../../gcode.h"
#include "../../../module/motion.h"

2
Marlin/src/lcd/lcdprint.cpp

@ -28,8 +28,8 @@
#if HAS_SPI_LCD
#include "../inc/MarlinConfig.h"
#include "lcdprint.h"
#include "../core/language.h"
/**
* lcd_put_u8str_ind_P

1
Marlin/src/module/configuration_store.cpp

@ -51,7 +51,6 @@
#include "stepper.h"
#include "temperature.h"
#include "../lcd/ultralcd.h"
#include "../core/language.h"
#include "../libs/vector_3.h" // for matrix_3x3
#include "../gcode/gcode.h"
#include "../MarlinCore.h"

1
Marlin/src/module/planner.cpp

@ -67,7 +67,6 @@
#include "motion.h"
#include "temperature.h"
#include "../lcd/ultralcd.h"
#include "../core/language.h"
#include "../gcode/parser.h"
#include "../MarlinCore.h"

1
Marlin/src/module/planner_bezier.cpp

@ -36,7 +36,6 @@
#include "temperature.h"
#include "../MarlinCore.h"
#include "../core/language.h"
#include "../gcode/queue.h"
// See the meaning in the documentation of cubic_b_spline().

1
Marlin/src/module/stepper.cpp

@ -97,7 +97,6 @@ Stepper stepper; // Singleton
#include "temperature.h"
#include "../lcd/ultralcd.h"
#include "../core/language.h"
#include "../gcode/queue.h"
#include "../sd/cardreader.h"
#include "../MarlinCore.h"

1
Marlin/src/module/temperature.cpp

@ -30,7 +30,6 @@
#include "../MarlinCore.h"
#include "../lcd/ultralcd.h"
#include "planner.h"
#include "../core/language.h"
#include "../HAL/shared/Delay.h"
#if ENABLED(EXTENSIBLE_UI)
#include "../lcd/extui/ui_api.h"

1
Marlin/src/sd/cardreader.cpp

@ -30,7 +30,6 @@
#include "../lcd/ultralcd.h"
#include "../module/planner.h" // for synchronize
#include "../module/printcounter.h"
#include "../core/language.h"
#include "../gcode/queue.h"
#include "../module/configuration_store.h"

Loading…
Cancel
Save