parent
875cd4e081
commit
000ec9fc13
@ -81,11 +81,9 @@
|
|||||||
#ifdef CUSTOM_MACHINE_NAME
|
#ifdef CUSTOM_MACHINE_NAME
|
||||||
#undef MACHINE_NAME
|
#undef MACHINE_NAME
|
||||||
#define MACHINE_NAME CUSTOM_MACHINE_NAME
|
#define MACHINE_NAME CUSTOM_MACHINE_NAME
|
||||||
#else
|
#elif defined(DEFAULT_MACHINE_NAME)
|
||||||
#ifdef DEFAULT_MACHINE_NAME
|
|
||||||
#undef MACHINE_NAME
|
#undef MACHINE_NAME
|
||||||
#define MACHINE_NAME DEFAULT_MACHINE_NAME
|
#define MACHINE_NAME DEFAULT_MACHINE_NAME
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef MACHINE_UUID
|
#ifndef MACHINE_UUID
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "serial.h"
|
#include "serial.h"
|
||||||
#include "language.h"
|
#include "../inc/MarlinConfig.h"
|
||||||
|
|
||||||
uint8_t marlin_debug_flags = MARLIN_DEBUG_NONE;
|
uint8_t marlin_debug_flags = MARLIN_DEBUG_NONE;
|
||||||
|
|
||||||
|
@ -53,7 +53,6 @@
|
|||||||
#include "../lcd/extui/ui_api.h"
|
#include "../lcd/extui/ui_api.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "../core/language.h"
|
|
||||||
#include "../lcd/ultralcd.h"
|
#include "../lcd/ultralcd.h"
|
||||||
|
|
||||||
#if HAS_BUZZER
|
#if HAS_BUZZER
|
||||||
|
@ -24,7 +24,6 @@
|
|||||||
|
|
||||||
#if SAVED_POSITIONS
|
#if SAVED_POSITIONS
|
||||||
|
|
||||||
#include "../../../core/language.h"
|
|
||||||
#include "../../gcode.h"
|
#include "../../gcode.h"
|
||||||
#include "../../../module/motion.h"
|
#include "../../../module/motion.h"
|
||||||
|
|
||||||
|
@ -24,7 +24,6 @@
|
|||||||
|
|
||||||
#if SAVED_POSITIONS
|
#if SAVED_POSITIONS
|
||||||
|
|
||||||
#include "../../../core/language.h"
|
|
||||||
#include "../../../module/planner.h"
|
#include "../../../module/planner.h"
|
||||||
#include "../../gcode.h"
|
#include "../../gcode.h"
|
||||||
#include "../../../module/motion.h"
|
#include "../../../module/motion.h"
|
||||||
|
@ -28,8 +28,8 @@
|
|||||||
|
|
||||||
#if HAS_SPI_LCD
|
#if HAS_SPI_LCD
|
||||||
|
|
||||||
|
#include "../inc/MarlinConfig.h"
|
||||||
#include "lcdprint.h"
|
#include "lcdprint.h"
|
||||||
#include "../core/language.h"
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* lcd_put_u8str_ind_P
|
* lcd_put_u8str_ind_P
|
||||||
|
@ -51,7 +51,6 @@
|
|||||||
#include "stepper.h"
|
#include "stepper.h"
|
||||||
#include "temperature.h"
|
#include "temperature.h"
|
||||||
#include "../lcd/ultralcd.h"
|
#include "../lcd/ultralcd.h"
|
||||||
#include "../core/language.h"
|
|
||||||
#include "../libs/vector_3.h" // for matrix_3x3
|
#include "../libs/vector_3.h" // for matrix_3x3
|
||||||
#include "../gcode/gcode.h"
|
#include "../gcode/gcode.h"
|
||||||
#include "../MarlinCore.h"
|
#include "../MarlinCore.h"
|
||||||
|
@ -67,7 +67,6 @@
|
|||||||
#include "motion.h"
|
#include "motion.h"
|
||||||
#include "temperature.h"
|
#include "temperature.h"
|
||||||
#include "../lcd/ultralcd.h"
|
#include "../lcd/ultralcd.h"
|
||||||
#include "../core/language.h"
|
|
||||||
#include "../gcode/parser.h"
|
#include "../gcode/parser.h"
|
||||||
|
|
||||||
#include "../MarlinCore.h"
|
#include "../MarlinCore.h"
|
||||||
|
@ -36,7 +36,6 @@
|
|||||||
#include "temperature.h"
|
#include "temperature.h"
|
||||||
|
|
||||||
#include "../MarlinCore.h"
|
#include "../MarlinCore.h"
|
||||||
#include "../core/language.h"
|
|
||||||
#include "../gcode/queue.h"
|
#include "../gcode/queue.h"
|
||||||
|
|
||||||
// See the meaning in the documentation of cubic_b_spline().
|
// See the meaning in the documentation of cubic_b_spline().
|
||||||
|
@ -97,7 +97,6 @@ Stepper stepper; // Singleton
|
|||||||
|
|
||||||
#include "temperature.h"
|
#include "temperature.h"
|
||||||
#include "../lcd/ultralcd.h"
|
#include "../lcd/ultralcd.h"
|
||||||
#include "../core/language.h"
|
|
||||||
#include "../gcode/queue.h"
|
#include "../gcode/queue.h"
|
||||||
#include "../sd/cardreader.h"
|
#include "../sd/cardreader.h"
|
||||||
#include "../MarlinCore.h"
|
#include "../MarlinCore.h"
|
||||||
|
@ -30,7 +30,6 @@
|
|||||||
#include "../MarlinCore.h"
|
#include "../MarlinCore.h"
|
||||||
#include "../lcd/ultralcd.h"
|
#include "../lcd/ultralcd.h"
|
||||||
#include "planner.h"
|
#include "planner.h"
|
||||||
#include "../core/language.h"
|
|
||||||
#include "../HAL/shared/Delay.h"
|
#include "../HAL/shared/Delay.h"
|
||||||
#if ENABLED(EXTENSIBLE_UI)
|
#if ENABLED(EXTENSIBLE_UI)
|
||||||
#include "../lcd/extui/ui_api.h"
|
#include "../lcd/extui/ui_api.h"
|
||||||
|
@ -30,7 +30,6 @@
|
|||||||
#include "../lcd/ultralcd.h"
|
#include "../lcd/ultralcd.h"
|
||||||
#include "../module/planner.h" // for synchronize
|
#include "../module/planner.h" // for synchronize
|
||||||
#include "../module/printcounter.h"
|
#include "../module/printcounter.h"
|
||||||
#include "../core/language.h"
|
|
||||||
#include "../gcode/queue.h"
|
#include "../gcode/queue.h"
|
||||||
#include "../module/configuration_store.h"
|
#include "../module/configuration_store.h"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user