瀏覽代碼

Fix Visual Micro "Arduino IDE for Visual Studio" support (#16418)

Dirk O. Kaar 5 年之前
父節點
當前提交
d0e1166cce
共有 80 個文件被更改,包括 81 次插入85 次删除
  1. 1
    1
      Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp
  2. 1
    1
      Marlin/src/HAL/HAL_AVR/watchdog.cpp
  3. 1
    1
      Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp
  4. 1
    1
      Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
  5. 1
    1
      Marlin/src/HAL/HAL_DUE/watchdog.cpp
  6. 1
    1
      Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.cpp
  7. 1
    1
      Marlin/src/MarlinCore.cpp
  8. 0
    0
      Marlin/src/MarlinCore.h
  9. 1
    1
      Marlin/src/core/utility.cpp
  10. 1
    1
      Marlin/src/feature/Max7219_Debug_LEDs.cpp
  11. 1
    1
      Marlin/src/feature/babystep.cpp
  12. 1
    1
      Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
  13. 1
    1
      Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
  14. 1
    1
      Marlin/src/feature/dac/dac_dac084s085.cpp
  15. 1
    1
      Marlin/src/feature/pause.cpp
  16. 1
    1
      Marlin/src/feature/power.cpp
  17. 1
    1
      Marlin/src/feature/prusa_MMU2/mmu2.cpp
  18. 1
    1
      Marlin/src/feature/runout.cpp
  19. 1
    1
      Marlin/src/feature/tmc_util.cpp
  20. 1
    1
      Marlin/src/gcode/bedlevel/G26.cpp
  21. 1
    1
      Marlin/src/gcode/bedlevel/G42.cpp
  22. 1
    1
      Marlin/src/gcode/calibrate/G425.cpp
  23. 1
    1
      Marlin/src/gcode/calibrate/M100.cpp
  24. 1
    1
      Marlin/src/gcode/config/M200-M205.cpp
  25. 1
    1
      Marlin/src/gcode/config/M217.cpp
  26. 1
    1
      Marlin/src/gcode/config/M43.cpp
  27. 1
    1
      Marlin/src/gcode/control/M108_M112_M410.cpp
  28. 1
    1
      Marlin/src/gcode/control/M17_M18_M84.cpp
  29. 1
    1
      Marlin/src/gcode/control/M226.cpp
  30. 1
    1
      Marlin/src/gcode/control/M42.cpp
  31. 1
    1
      Marlin/src/gcode/control/M80_M81.cpp
  32. 1
    1
      Marlin/src/gcode/control/M85.cpp
  33. 1
    1
      Marlin/src/gcode/control/M999.cpp
  34. 1
    1
      Marlin/src/gcode/feature/camera/M240.cpp
  35. 1
    1
      Marlin/src/gcode/feature/filwidth/M404-M407.cpp
  36. 1
    1
      Marlin/src/gcode/feature/i2c/M260_M261.cpp
  37. 1
    1
      Marlin/src/gcode/feature/pause/M701_M702.cpp
  38. 1
    1
      Marlin/src/gcode/gcode.cpp
  39. 1
    1
      Marlin/src/gcode/host/M16.cpp
  40. 1
    1
      Marlin/src/gcode/host/M876.cpp
  41. 1
    1
      Marlin/src/gcode/motion/G0_G1.cpp
  42. 1
    1
      Marlin/src/gcode/motion/G5.cpp
  43. 1
    1
      Marlin/src/gcode/parser.cpp
  44. 1
    1
      Marlin/src/gcode/queue.cpp
  45. 1
    1
      Marlin/src/gcode/scara/M360-M364.cpp
  46. 1
    1
      Marlin/src/gcode/sdcard/M24_M25.cpp
  47. 1
    1
      Marlin/src/gcode/sdcard/M32.cpp
  48. 1
    1
      Marlin/src/gcode/stats/M75-M78.cpp
  49. 1
    1
      Marlin/src/gcode/temperature/M104_M109.cpp
  50. 1
    1
      Marlin/src/gcode/temperature/M140_M190.cpp
  51. 1
    1
      Marlin/src/gcode/temperature/M141_M191.cpp
  52. 1
    1
      Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
  53. 1
    1
      Marlin/src/lcd/dogm/lcdprint_u8g.cpp
  54. 1
    1
      Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
  55. 1
    1
      Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp
  56. 1
    1
      Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h
  57. 1
    1
      Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language.cpp
  58. 1
    1
      Marlin/src/lcd/fontutils.cpp
  59. 1
    1
      Marlin/src/lcd/menu/menu.cpp
  60. 1
    1
      Marlin/src/lcd/menu/menu_tune.cpp
  61. 3
    7
      Marlin/src/lcd/ultralcd.cpp
  62. 1
    1
      Marlin/src/lcd/ultralcd.h
  63. 1
    1
      Marlin/src/libs/nozzle.cpp
  64. 1
    1
      Marlin/src/module/configuration_store.cpp
  65. 1
    1
      Marlin/src/module/delta.cpp
  66. 1
    1
      Marlin/src/module/endstops.cpp
  67. 1
    1
      Marlin/src/module/planner.cpp
  68. 1
    1
      Marlin/src/module/planner.h
  69. 1
    1
      Marlin/src/module/planner_bezier.cpp
  70. 1
    1
      Marlin/src/module/printcounter.cpp
  71. 1
    1
      Marlin/src/module/probe.cpp
  72. 1
    1
      Marlin/src/module/stepper.cpp
  73. 1
    1
      Marlin/src/module/temperature.cpp
  74. 1
    1
      Marlin/src/module/tool_change.cpp
  75. 1
    1
      Marlin/src/sd/Sd2Card.cpp
  76. 1
    1
      Marlin/src/sd/SdBaseFile.cpp
  77. 1
    1
      Marlin/src/sd/SdVolume.cpp
  78. 1
    1
      Marlin/src/sd/cardreader.cpp
  79. 1
    1
      Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
  80. 1
    1
      buildroot/share/scripts/createSpeedLookupTable.py

+ 1
- 1
Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp 查看文件

41
 #if !defined(USBCON) && (defined(UBRRH) || defined(UBRR0H) || defined(UBRR1H) || defined(UBRR2H) || defined(UBRR3H))
41
 #if !defined(USBCON) && (defined(UBRRH) || defined(UBRR0H) || defined(UBRR1H) || defined(UBRR2H) || defined(UBRR3H))
42
 
42
 
43
   #include "MarlinSerial.h"
43
   #include "MarlinSerial.h"
44
-  #include "../../Marlin.h"
44
+  #include "../../MarlinCore.h"
45
 
45
 
46
   template<typename Cfg> typename MarlinSerial<Cfg>::ring_buffer_r MarlinSerial<Cfg>::rx_buffer = { 0, 0, { 0 } };
46
   template<typename Cfg> typename MarlinSerial<Cfg>::ring_buffer_r MarlinSerial<Cfg>::rx_buffer = { 0, 0, { 0 } };
47
   template<typename Cfg> typename MarlinSerial<Cfg>::ring_buffer_t MarlinSerial<Cfg>::tx_buffer = { 0 };
47
   template<typename Cfg> typename MarlinSerial<Cfg>::ring_buffer_t MarlinSerial<Cfg>::tx_buffer = { 0 };

+ 1
- 1
Marlin/src/HAL/HAL_AVR/watchdog.cpp 查看文件

28
 
28
 
29
 #include "watchdog.h"
29
 #include "watchdog.h"
30
 
30
 
31
-#include "../../Marlin.h"
31
+#include "../../MarlinCore.h"
32
 
32
 
33
 // Initialize watchdog with 8s timeout, if possible. Otherwise, make it 4s.
33
 // Initialize watchdog with 8s timeout, if possible. Otherwise, make it 4s.
34
 void watchdog_init() {
34
 void watchdog_init() {

+ 1
- 1
Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp 查看文件

31
 
31
 
32
 #include "MarlinSerial.h"
32
 #include "MarlinSerial.h"
33
 #include "InterruptVectors.h"
33
 #include "InterruptVectors.h"
34
-#include "../../Marlin.h"
34
+#include "../../MarlinCore.h"
35
 
35
 
36
 template<typename Cfg> typename MarlinSerial<Cfg>::ring_buffer_r MarlinSerial<Cfg>::rx_buffer = { 0, 0, { 0 } };
36
 template<typename Cfg> typename MarlinSerial<Cfg>::ring_buffer_r MarlinSerial<Cfg>::rx_buffer = { 0, 0, { 0 } };
37
 template<typename Cfg> typename MarlinSerial<Cfg>::ring_buffer_t MarlinSerial<Cfg>::tx_buffer = { 0 };
37
 template<typename Cfg> typename MarlinSerial<Cfg>::ring_buffer_t MarlinSerial<Cfg>::tx_buffer = { 0 };

+ 1
- 1
Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp 查看文件

63
 
63
 
64
 #include <U8glib.h>
64
 #include <U8glib.h>
65
 
65
 
66
-#include "../../../Marlin.h"
66
+#include "../../../MarlinCore.h"
67
 
67
 
68
 void spiBegin();
68
 void spiBegin();
69
 void spiInit(uint8_t spiRate);
69
 void spiInit(uint8_t spiRate);

+ 1
- 1
Marlin/src/HAL/HAL_DUE/watchdog.cpp 查看文件

23
 #ifdef ARDUINO_ARCH_SAM
23
 #ifdef ARDUINO_ARCH_SAM
24
 
24
 
25
 #include "../../inc/MarlinConfig.h"
25
 #include "../../inc/MarlinConfig.h"
26
-#include "../../Marlin.h"
26
+#include "../../MarlinCore.h"
27
 #include "watchdog.h"
27
 #include "watchdog.h"
28
 
28
 
29
 // Override Arduino runtime to either config or disable the watchdog
29
 // Override Arduino runtime to either config or disable the watchdog

+ 1
- 1
Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.cpp 查看文件

36
 #include "TMC2660.h"
36
 #include "TMC2660.h"
37
 
37
 
38
 #include "../../../inc/MarlinConfig.h"
38
 #include "../../../inc/MarlinConfig.h"
39
-#include "../../../Marlin.h"
39
+#include "../../../MarlinCore.h"
40
 #include "../../../module/stepper/indirection.h"
40
 #include "../../../module/stepper/indirection.h"
41
 #include "../../../module/printcounter.h"
41
 #include "../../../module/printcounter.h"
42
 #include "../../../libs/duration_t.h"
42
 #include "../../../libs/duration_t.h"

Marlin/src/Marlin.cpp → Marlin/src/MarlinCore.cpp 查看文件

28
  *  - https://github.com/grbl/grbl
28
  *  - https://github.com/grbl/grbl
29
  */
29
  */
30
 
30
 
31
-#include "Marlin.h"
31
+#include "MarlinCore.h"
32
 
32
 
33
 #include "core/utility.h"
33
 #include "core/utility.h"
34
 #include "lcd/ultralcd.h"
34
 #include "lcd/ultralcd.h"

Marlin/src/Marlin.h → Marlin/src/MarlinCore.h 查看文件


+ 1
- 1
Marlin/src/core/utility.cpp 查看文件

22
 
22
 
23
 #include "utility.h"
23
 #include "utility.h"
24
 
24
 
25
-#include "../Marlin.h"
25
+#include "../MarlinCore.h"
26
 #include "../module/temperature.h"
26
 #include "../module/temperature.h"
27
 
27
 
28
 void safe_delay(millis_t ms) {
28
 void safe_delay(millis_t ms) {

+ 1
- 1
Marlin/src/feature/Max7219_Debug_LEDs.cpp 查看文件

45
 
45
 
46
 #include "../module/planner.h"
46
 #include "../module/planner.h"
47
 #include "../module/stepper.h"
47
 #include "../module/stepper.h"
48
-#include "../Marlin.h"
48
+#include "../MarlinCore.h"
49
 #include "../HAL/shared/Delay.h"
49
 #include "../HAL/shared/Delay.h"
50
 
50
 
51
 #define HAS_SIDE_BY_SIDE (ENABLED(MAX7219_SIDE_BY_SIDE) && MAX7219_NUMBER_UNITS > 1)
51
 #define HAS_SIDE_BY_SIDE (ENABLED(MAX7219_SIDE_BY_SIDE) && MAX7219_NUMBER_UNITS > 1)

+ 1
- 1
Marlin/src/feature/babystep.cpp 查看文件

25
 #if ENABLED(BABYSTEPPING)
25
 #if ENABLED(BABYSTEPPING)
26
 
26
 
27
 #include "babystep.h"
27
 #include "babystep.h"
28
-#include "../Marlin.h"
28
+#include "../MarlinCore.h"
29
 #include "../module/planner.h"
29
 #include "../module/planner.h"
30
 #include "../module/stepper.h"
30
 #include "../module/stepper.h"
31
 
31
 

+ 1
- 1
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp 查看文件

26
 
26
 
27
   #include "../bedlevel.h"
27
   #include "../bedlevel.h"
28
 
28
 
29
-  #include "../../../Marlin.h"
29
+  #include "../../../MarlinCore.h"
30
   #include "../../../HAL/shared/persistent_store_api.h"
30
   #include "../../../HAL/shared/persistent_store_api.h"
31
   #include "../../../libs/hex_print_routines.h"
31
   #include "../../../libs/hex_print_routines.h"
32
   #include "../../../module/configuration_store.h"
32
   #include "../../../module/configuration_store.h"

+ 1
- 1
Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp 查看文件

32
   #include "../../../module/delta.h"
32
   #include "../../../module/delta.h"
33
 #endif
33
 #endif
34
 
34
 
35
-#include "../../../Marlin.h"
35
+#include "../../../MarlinCore.h"
36
 #include <math.h>
36
 #include <math.h>
37
 
37
 
38
 #if !UBL_SEGMENTED
38
 #if !UBL_SEGMENTED

+ 1
- 1
Marlin/src/feature/dac/dac_dac084s085.cpp 查看文件

10
 
10
 
11
 #include "dac_dac084s085.h"
11
 #include "dac_dac084s085.h"
12
 
12
 
13
-#include "../../Marlin.h"
13
+#include "../../MarlinCore.h"
14
 #include "../../module/stepper.h"
14
 #include "../../module/stepper.h"
15
 #include "../../HAL/shared/Delay.h"
15
 #include "../../HAL/shared/Delay.h"
16
 
16
 

+ 1
- 1
Marlin/src/feature/pause.cpp 查看文件

29
 
29
 
30
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
30
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
31
 
31
 
32
-#include "../Marlin.h"
32
+#include "../MarlinCore.h"
33
 #include "../gcode/gcode.h"
33
 #include "../gcode/gcode.h"
34
 #include "../module/motion.h"
34
 #include "../module/motion.h"
35
 #include "../module/planner.h"
35
 #include "../module/planner.h"

+ 1
- 1
Marlin/src/feature/power.cpp 查看文件

31
 #include "power.h"
31
 #include "power.h"
32
 #include "../module/temperature.h"
32
 #include "../module/temperature.h"
33
 #include "../module/stepper/indirection.h"
33
 #include "../module/stepper/indirection.h"
34
-#include "../Marlin.h"
34
+#include "../MarlinCore.h"
35
 
35
 
36
 Power powerManager;
36
 Power powerManager;
37
 
37
 

+ 1
- 1
Marlin/src/feature/prusa_MMU2/mmu2.cpp 查看文件

36
 #include "../../module/temperature.h"
36
 #include "../../module/temperature.h"
37
 #include "../../module/planner.h"
37
 #include "../../module/planner.h"
38
 #include "../../module/stepper/indirection.h"
38
 #include "../../module/stepper/indirection.h"
39
-#include "../../Marlin.h"
39
+#include "../../MarlinCore.h"
40
 
40
 
41
 #if ENABLED(HOST_PROMPT_SUPPORT)
41
 #if ENABLED(HOST_PROMPT_SUPPORT)
42
   #include "../../feature/host_actions.h"
42
   #include "../../feature/host_actions.h"

+ 1
- 1
Marlin/src/feature/runout.cpp 查看文件

61
 //
61
 //
62
 // Filament Runout event handler
62
 // Filament Runout event handler
63
 //
63
 //
64
-#include "../Marlin.h"
64
+#include "../MarlinCore.h"
65
 #include "../gcode/queue.h"
65
 #include "../gcode/queue.h"
66
 
66
 
67
 #if ENABLED(HOST_ACTION_COMMANDS)
67
 #if ENABLED(HOST_ACTION_COMMANDS)

+ 1
- 1
Marlin/src/feature/tmc_util.cpp 查看文件

25
 #if HAS_TRINAMIC
25
 #if HAS_TRINAMIC
26
 
26
 
27
 #include "tmc_util.h"
27
 #include "tmc_util.h"
28
-#include "../Marlin.h"
28
+#include "../MarlinCore.h"
29
 
29
 
30
 #include "../module/stepper/indirection.h"
30
 #include "../module/stepper/indirection.h"
31
 #include "../module/printcounter.h"
31
 #include "../module/printcounter.h"

+ 1
- 1
Marlin/src/gcode/bedlevel/G26.cpp 查看文件

34
 #include "../../gcode/gcode.h"
34
 #include "../../gcode/gcode.h"
35
 #include "../../feature/bedlevel/bedlevel.h"
35
 #include "../../feature/bedlevel/bedlevel.h"
36
 
36
 
37
-#include "../../Marlin.h"
37
+#include "../../MarlinCore.h"
38
 #include "../../module/planner.h"
38
 #include "../../module/planner.h"
39
 #include "../../module/stepper.h"
39
 #include "../../module/stepper.h"
40
 #include "../../module/motion.h"
40
 #include "../../module/motion.h"

+ 1
- 1
Marlin/src/gcode/bedlevel/G42.cpp 查看文件

25
 #if HAS_MESH
25
 #if HAS_MESH
26
 
26
 
27
 #include "../gcode.h"
27
 #include "../gcode.h"
28
-#include "../../Marlin.h" // for IsRunning()
28
+#include "../../MarlinCore.h" // for IsRunning()
29
 #include "../../module/motion.h"
29
 #include "../../module/motion.h"
30
 #include "../../module/probe.h" // for probe_offset
30
 #include "../../module/probe.h" // for probe_offset
31
 #include "../../feature/bedlevel/bedlevel.h"
31
 #include "../../feature/bedlevel/bedlevel.h"

+ 1
- 1
Marlin/src/gcode/calibrate/G425.cpp 查看文件

20
  *
20
  *
21
  */
21
  */
22
 
22
 
23
-#include "../../Marlin.h"
23
+#include "../../MarlinCore.h"
24
 
24
 
25
 #if ENABLED(CALIBRATION_GCODE)
25
 #if ENABLED(CALIBRATION_GCODE)
26
 
26
 

+ 1
- 1
Marlin/src/gcode/calibrate/M100.cpp 查看文件

28
 #include "../queue.h"
28
 #include "../queue.h"
29
 #include "../../libs/hex_print_routines.h"
29
 #include "../../libs/hex_print_routines.h"
30
 
30
 
31
-#include "../../Marlin.h" // for idle()
31
+#include "../../MarlinCore.h" // for idle()
32
 
32
 
33
 /**
33
 /**
34
  * M100 Free Memory Watcher
34
  * M100 Free Memory Watcher

+ 1
- 1
Marlin/src/gcode/config/M200-M205.cpp 查看文件

21
  */
21
  */
22
 
22
 
23
 #include "../gcode.h"
23
 #include "../gcode.h"
24
-#include "../../Marlin.h"
24
+#include "../../MarlinCore.h"
25
 #include "../../module/planner.h"
25
 #include "../../module/planner.h"
26
 
26
 
27
 #if DISABLED(NO_VOLUMETRICS)
27
 #if DISABLED(NO_VOLUMETRICS)

+ 1
- 1
Marlin/src/gcode/config/M217.cpp 查看文件

27
 #include "../gcode.h"
27
 #include "../gcode.h"
28
 #include "../../module/tool_change.h"
28
 #include "../../module/tool_change.h"
29
 
29
 
30
-#include "../../Marlin.h" // for SP_X_STR, etc.
30
+#include "../../MarlinCore.h" // for SP_X_STR, etc.
31
 
31
 
32
 extern const char SP_X_STR[], SP_Y_STR[], SP_Z_STR[];
32
 extern const char SP_X_STR[], SP_Y_STR[], SP_Z_STR[];
33
 
33
 

+ 1
- 1
Marlin/src/gcode/config/M43.cpp 查看文件

25
 #if ENABLED(PINS_DEBUGGING)
25
 #if ENABLED(PINS_DEBUGGING)
26
 
26
 
27
 #include "../gcode.h"
27
 #include "../gcode.h"
28
-#include "../../Marlin.h" // for pin_is_protected
28
+#include "../../MarlinCore.h" // for pin_is_protected
29
 #include "../../pins/pinsDebug.h"
29
 #include "../../pins/pinsDebug.h"
30
 #include "../../module/endstops.h"
30
 #include "../../module/endstops.h"
31
 
31
 

+ 1
- 1
Marlin/src/gcode/control/M108_M112_M410.cpp 查看文件

25
 #if DISABLED(EMERGENCY_PARSER)
25
 #if DISABLED(EMERGENCY_PARSER)
26
 
26
 
27
 #include "../gcode.h"
27
 #include "../gcode.h"
28
-#include "../../Marlin.h" // for wait_for_heatup, kill, quickstop_stepper
28
+#include "../../MarlinCore.h" // for wait_for_heatup, kill, quickstop_stepper
29
 
29
 
30
 /**
30
 /**
31
  * M108: Stop the waiting for heaters in M109, M190, M303. Does not affect the target temperature.
31
  * M108: Stop the waiting for heaters in M109, M190, M303. Does not affect the target temperature.

+ 1
- 1
Marlin/src/gcode/control/M17_M18_M84.cpp 查看文件

21
  */
21
  */
22
 
22
 
23
 #include "../gcode.h"
23
 #include "../gcode.h"
24
-#include "../../Marlin.h" // for stepper_inactive_time, disable_e_steppers
24
+#include "../../MarlinCore.h" // for stepper_inactive_time, disable_e_steppers
25
 #include "../../lcd/ultralcd.h"
25
 #include "../../lcd/ultralcd.h"
26
 #include "../../module/stepper.h"
26
 #include "../../module/stepper.h"
27
 
27
 

+ 1
- 1
Marlin/src/gcode/control/M226.cpp 查看文件

21
  */
21
  */
22
 
22
 
23
 #include "../gcode.h"
23
 #include "../gcode.h"
24
-#include "../../Marlin.h" // for pin_is_protected and idle()
24
+#include "../../MarlinCore.h" // for pin_is_protected and idle()
25
 #include "../../module/stepper.h"
25
 #include "../../module/stepper.h"
26
 
26
 
27
 /**
27
 /**

+ 1
- 1
Marlin/src/gcode/control/M42.cpp 查看文件

21
  */
21
  */
22
 
22
 
23
 #include "../gcode.h"
23
 #include "../gcode.h"
24
-#include "../../Marlin.h" // for pin_is_protected
24
+#include "../../MarlinCore.h" // for pin_is_protected
25
 #include "../../inc/MarlinConfig.h"
25
 #include "../../inc/MarlinConfig.h"
26
 
26
 
27
 #if FAN_COUNT > 0
27
 #if FAN_COUNT > 0

+ 1
- 1
Marlin/src/gcode/control/M80_M81.cpp 查看文件

32
 #endif
32
 #endif
33
 
33
 
34
 #if HAS_SUICIDE
34
 #if HAS_SUICIDE
35
-  #include "../../Marlin.h"
35
+  #include "../../MarlinCore.h"
36
 #endif
36
 #endif
37
 
37
 
38
 #if ENABLED(PSU_CONTROL)
38
 #if ENABLED(PSU_CONTROL)

+ 1
- 1
Marlin/src/gcode/control/M85.cpp 查看文件

21
  */
21
  */
22
 
22
 
23
 #include "../gcode.h"
23
 #include "../gcode.h"
24
-#include "../../Marlin.h" // for max_inactive_time
24
+#include "../../MarlinCore.h" // for max_inactive_time
25
 
25
 
26
 /**
26
 /**
27
  * M85: Set inactivity shutdown timer with parameter S<seconds>. To disable set zero (default)
27
  * M85: Set inactivity shutdown timer with parameter S<seconds>. To disable set zero (default)

+ 1
- 1
Marlin/src/gcode/control/M999.cpp 查看文件

23
 #include "../gcode.h"
23
 #include "../gcode.h"
24
 
24
 
25
 #include "../../lcd/ultralcd.h" // for lcd_reset_alert_level
25
 #include "../../lcd/ultralcd.h" // for lcd_reset_alert_level
26
-#include "../../Marlin.h"       // for Running
26
+#include "../../MarlinCore.h"   // for Running
27
 #include "../queue.h"           // for flush_and_request_resend
27
 #include "../queue.h"           // for flush_and_request_resend
28
 
28
 
29
 /**
29
 /**

+ 1
- 1
Marlin/src/gcode/feature/camera/M240.cpp 查看文件

32
 #endif
32
 #endif
33
 
33
 
34
 #if defined(PHOTO_POSITION) && PHOTO_DELAY_MS > 0
34
 #if defined(PHOTO_POSITION) && PHOTO_DELAY_MS > 0
35
-  #include "../../../Marlin.h" // for idle()
35
+  #include "../../../MarlinCore.h" // for idle()
36
 #endif
36
 #endif
37
 
37
 
38
 #ifdef PHOTO_RETRACT_MM
38
 #ifdef PHOTO_RETRACT_MM

+ 1
- 1
Marlin/src/gcode/feature/filwidth/M404-M407.cpp 查看文件

27
 #include "../../../feature/filwidth.h"
27
 #include "../../../feature/filwidth.h"
28
 #include "../../../module/planner.h"
28
 #include "../../../module/planner.h"
29
 #include "../../../module/temperature.h"
29
 #include "../../../module/temperature.h"
30
-#include "../../../Marlin.h"
30
+#include "../../../MarlinCore.h"
31
 #include "../../gcode.h"
31
 #include "../../gcode.h"
32
 
32
 
33
 /**
33
 /**

+ 1
- 1
Marlin/src/gcode/feature/i2c/M260_M261.cpp 查看文件

26
 
26
 
27
 #include "../../gcode.h"
27
 #include "../../gcode.h"
28
 
28
 
29
-#include "../../../Marlin.h" // for i2c
29
+#include "../../../MarlinCore.h" // for i2c
30
 
30
 
31
 /**
31
 /**
32
  * M260: Send data to a I2C slave device
32
  * M260: Send data to a I2C slave device

+ 1
- 1
Marlin/src/gcode/feature/pause/M701_M702.cpp 查看文件

25
 #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
25
 #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
26
 
26
 
27
 #include "../../gcode.h"
27
 #include "../../gcode.h"
28
-#include "../../../Marlin.h"
28
+#include "../../../MarlinCore.h"
29
 #include "../../../module/motion.h"
29
 #include "../../../module/motion.h"
30
 #include "../../../module/temperature.h"
30
 #include "../../../module/temperature.h"
31
 #include "../../../feature/pause.h"
31
 #include "../../../feature/pause.h"

+ 1
- 1
Marlin/src/gcode/gcode.cpp 查看文件

49
   #include "../feature/cancel_object.h"
49
   #include "../feature/cancel_object.h"
50
 #endif
50
 #endif
51
 
51
 
52
-#include "../Marlin.h" // for idle() and suspend_auto_report
52
+#include "../MarlinCore.h" // for idle() and suspend_auto_report
53
 
53
 
54
 millis_t GcodeSuite::previous_move_ms;
54
 millis_t GcodeSuite::previous_move_ms;
55
 
55
 

+ 1
- 1
Marlin/src/gcode/host/M16.cpp 查看文件

25
 #if ENABLED(EXPECTED_PRINTER_CHECK)
25
 #if ENABLED(EXPECTED_PRINTER_CHECK)
26
 
26
 
27
 #include "../gcode.h"
27
 #include "../gcode.h"
28
-#include "../../Marlin.h"
28
+#include "../../MarlinCore.h"
29
 
29
 
30
 /**
30
 /**
31
  * M16: Expected Printer Check
31
  * M16: Expected Printer Check

+ 1
- 1
Marlin/src/gcode/host/M876.cpp 查看文件

25
 
25
 
26
 #include "../../feature/host_actions.h"
26
 #include "../../feature/host_actions.h"
27
 #include "../gcode.h"
27
 #include "../gcode.h"
28
-#include "../../Marlin.h"
28
+#include "../../MarlinCore.h"
29
 
29
 
30
 /**
30
 /**
31
  * M876: Handle Prompt Response
31
  * M876: Handle Prompt Response

+ 1
- 1
Marlin/src/gcode/motion/G0_G1.cpp 查看文件

23
 #include "../gcode.h"
23
 #include "../gcode.h"
24
 #include "../../module/motion.h"
24
 #include "../../module/motion.h"
25
 
25
 
26
-#include "../../Marlin.h"
26
+#include "../../MarlinCore.h"
27
 
27
 
28
 #if BOTH(FWRETRACT, FWRETRACT_AUTORETRACT)
28
 #if BOTH(FWRETRACT, FWRETRACT_AUTORETRACT)
29
   #include "../../feature/fwretract.h"
29
   #include "../../feature/fwretract.h"

+ 1
- 1
Marlin/src/gcode/motion/G5.cpp 查看文件

35
  */
35
  */
36
 
36
 
37
 #include "../gcode.h"
37
 #include "../gcode.h"
38
-#include "../../Marlin.h" // for IsRunning()
38
+#include "../../MarlinCore.h" // for IsRunning()
39
 
39
 
40
 /**
40
 /**
41
  * G5: Cubic B-spline
41
  * G5: Cubic B-spline

+ 1
- 1
Marlin/src/gcode/parser.cpp 查看文件

26
 
26
 
27
 #include "parser.h"
27
 #include "parser.h"
28
 
28
 
29
-#include "../Marlin.h"
29
+#include "../MarlinCore.h"
30
 
30
 
31
 #if NUM_SERIAL > 1
31
 #if NUM_SERIAL > 1
32
   #include "queue.h"
32
   #include "queue.h"

+ 1
- 1
Marlin/src/gcode/queue.cpp 查看文件

33
 #include "../sd/cardreader.h"
33
 #include "../sd/cardreader.h"
34
 #include "../module/planner.h"
34
 #include "../module/planner.h"
35
 #include "../module/temperature.h"
35
 #include "../module/temperature.h"
36
-#include "../Marlin.h"
36
+#include "../MarlinCore.h"
37
 
37
 
38
 #if ENABLED(PRINTER_EVENT_LEDS)
38
 #if ENABLED(PRINTER_EVENT_LEDS)
39
   #include "../feature/leds/printer_event_leds.h"
39
   #include "../feature/leds/printer_event_leds.h"

+ 1
- 1
Marlin/src/gcode/scara/M360-M364.cpp 查看文件

27
 #include "../gcode.h"
27
 #include "../gcode.h"
28
 #include "../../module/scara.h"
28
 #include "../../module/scara.h"
29
 #include "../../module/motion.h"
29
 #include "../../module/motion.h"
30
-#include "../../Marlin.h" // for IsRunning()
30
+#include "../../MarlinCore.h" // for IsRunning()
31
 
31
 
32
 inline bool SCARA_move_to_cal(const uint8_t delta_a, const uint8_t delta_b) {
32
 inline bool SCARA_move_to_cal(const uint8_t delta_a, const uint8_t delta_b) {
33
   if (IsRunning()) {
33
   if (IsRunning()) {

+ 1
- 1
Marlin/src/gcode/sdcard/M24_M25.cpp 查看文件

42
   #include "../../feature/power_loss_recovery.h"
42
   #include "../../feature/power_loss_recovery.h"
43
 #endif
43
 #endif
44
 
44
 
45
-#include "../../Marlin.h" // for startOrResumeJob
45
+#include "../../MarlinCore.h" // for startOrResumeJob
46
 
46
 
47
 /**
47
 /**
48
  * M24: Start or Resume SD Print
48
  * M24: Start or Resume SD Print

+ 1
- 1
Marlin/src/gcode/sdcard/M32.cpp 查看文件

28
 #include "../../sd/cardreader.h"
28
 #include "../../sd/cardreader.h"
29
 #include "../../module/planner.h" // for synchronize()
29
 #include "../../module/planner.h" // for synchronize()
30
 
30
 
31
-#include "../../Marlin.h" // for startOrResumeJob
31
+#include "../../MarlinCore.h" // for startOrResumeJob
32
 
32
 
33
 /**
33
 /**
34
  * M32: Select file and start SD Print
34
  * M32: Select file and start SD Print

+ 1
- 1
Marlin/src/gcode/stats/M75-M78.cpp 查看文件

24
 #include "../../module/printcounter.h"
24
 #include "../../module/printcounter.h"
25
 #include "../../lcd/ultralcd.h"
25
 #include "../../lcd/ultralcd.h"
26
 
26
 
27
-#include "../../Marlin.h" // for startOrResumeJob
27
+#include "../../MarlinCore.h" // for startOrResumeJob
28
 
28
 
29
 /**
29
 /**
30
  * M75: Start print timer
30
  * M75: Start print timer

+ 1
- 1
Marlin/src/gcode/temperature/M104_M109.cpp 查看文件

30
 #include "../../module/planner.h"
30
 #include "../../module/planner.h"
31
 #include "../../lcd/ultralcd.h"
31
 #include "../../lcd/ultralcd.h"
32
 
32
 
33
-#include "../../Marlin.h" // for startOrResumeJob, etc.
33
+#include "../../MarlinCore.h" // for startOrResumeJob, etc.
34
 
34
 
35
 #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
35
 #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
36
   #include "../../module/printcounter.h"
36
   #include "../../module/printcounter.h"

+ 1
- 1
Marlin/src/gcode/temperature/M140_M190.cpp 查看文件

37
   #include "../../feature/leds/leds.h"
37
   #include "../../feature/leds/leds.h"
38
 #endif
38
 #endif
39
 
39
 
40
-#include "../../Marlin.h" // for wait_for_heatup, idle, startOrResumeJob
40
+#include "../../MarlinCore.h" // for wait_for_heatup, idle, startOrResumeJob
41
 
41
 
42
 /**
42
 /**
43
  * M140: Set bed temperature
43
  * M140: Set bed temperature

+ 1
- 1
Marlin/src/gcode/temperature/M141_M191.cpp 查看文件

38
   #include "../../feature/leds/leds.h"
38
   #include "../../feature/leds/leds.h"
39
 #endif
39
 #endif
40
 
40
 
41
-#include "../../Marlin.h" // for wait_for_heatup, idle, startOrResumeJob
41
+#include "../../MarlinCore.h" // for wait_for_heatup, idle, startOrResumeJob
42
 
42
 
43
 /**
43
 /**
44
  * M141: Set chamber temperature
44
  * M141: Set chamber temperature

+ 1
- 1
Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp 查看文件

17
 #if HAS_CHARACTER_LCD
17
 #if HAS_CHARACTER_LCD
18
 
18
 
19
 #include "../ultralcd.h"
19
 #include "../ultralcd.h"
20
-#include "../../Marlin.h"
20
+#include "../../MarlinCore.h"
21
 
21
 
22
 #include "ultralcd_HD44780.h"
22
 #include "ultralcd_HD44780.h"
23
 
23
 

+ 1
- 1
Marlin/src/lcd/dogm/lcdprint_u8g.cpp 查看文件

14
 #include "ultralcd_DOGM.h"
14
 #include "ultralcd_DOGM.h"
15
 
15
 
16
 #include "../ultralcd.h"
16
 #include "../ultralcd.h"
17
-#include "../../Marlin.h"
17
+#include "../../MarlinCore.h"
18
 
18
 
19
 #include "../fontutils.h"
19
 #include "../fontutils.h"
20
 #include "u8g_fontutf8.h"
20
 #include "u8g_fontutf8.h"

+ 1
- 1
Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp 查看文件

60
 #endif
60
 #endif
61
 
61
 
62
 #if ENABLED(LCD_SHOW_E_TOTAL)
62
 #if ENABLED(LCD_SHOW_E_TOTAL)
63
-  #include "../../Marlin.h" // for printingIsActive
63
+  #include "../../MarlinCore.h" // for printingIsActive
64
 #endif
64
 #endif
65
 
65
 
66
 #define TEXT_MODE_LCD_WIDTH 16
66
 #define TEXT_MODE_LCD_WIDTH 16

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp 查看文件

32
 
32
 
33
 #include "../../ui_api.h"
33
 #include "../../ui_api.h"
34
 
34
 
35
-#include "../../../../Marlin.h"
35
+#include "../../../../MarlinCore.h"
36
 #include "../../../../module/temperature.h"
36
 #include "../../../../module/temperature.h"
37
 #include "../../../../module/motion.h"
37
 #include "../../../../module/motion.h"
38
 #include "../../../../gcode/queue.h"
38
 #include "../../../../gcode/queue.h"

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h 查看文件

25
 
25
 
26
 #include "../../../../inc/MarlinConfigPre.h"
26
 #include "../../../../inc/MarlinConfigPre.h"
27
 
27
 
28
-#include "../../../../Marlin.h"
28
+#include "../../../../MarlinCore.h"
29
 #include "DGUSVPVariable.h"
29
 #include "DGUSVPVariable.h"
30
 
30
 
31
 enum DGUSLCD_Screens : uint8_t;
31
 enum DGUSLCD_Screens : uint8_t;

+ 1
- 1
Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language.cpp 查看文件

20
  ****************************************************************************/
20
  ****************************************************************************/
21
 
21
 
22
 
22
 
23
-#include "../../../../../Marlin.h"
23
+#include "../../../../../MarlinCore.h"
24
 
24
 
25
 #include "language.h"
25
 #include "language.h"
26
 
26
 

+ 1
- 1
Marlin/src/lcd/fontutils.cpp 查看文件

11
 
11
 
12
 #if HAS_SPI_LCD
12
 #if HAS_SPI_LCD
13
   #include "ultralcd.h"
13
   #include "ultralcd.h"
14
-  #include "../Marlin.h"
14
+  #include "../MarlinCore.h"
15
 #endif
15
 #endif
16
 
16
 
17
 #include "fontutils.h"
17
 #include "fontutils.h"

+ 1
- 1
Marlin/src/lcd/menu/menu.cpp 查看文件

213
 ///////////////// Menu Tree ////////////////
213
 ///////////////// Menu Tree ////////////////
214
 ////////////////////////////////////////////
214
 ////////////////////////////////////////////
215
 
215
 
216
-#include "../../Marlin.h"
216
+#include "../../MarlinCore.h"
217
 
217
 
218
 bool printer_busy() {
218
 bool printer_busy() {
219
   return planner.movesplanned() || printingIsActive();
219
   return planner.movesplanned() || printingIsActive();

+ 1
- 1
Marlin/src/lcd/menu/menu_tune.cpp 查看文件

32
 #include "../../module/motion.h"
32
 #include "../../module/motion.h"
33
 #include "../../module/planner.h"
33
 #include "../../module/planner.h"
34
 #include "../../module/temperature.h"
34
 #include "../../module/temperature.h"
35
-#include "../../Marlin.h"
35
+#include "../../MarlinCore.h"
36
 
36
 
37
 #if HAS_LEVELING
37
 #if HAS_LEVELING
38
   #include "../../feature/bedlevel/bedlevel.h"
38
   #include "../../feature/bedlevel/bedlevel.h"

+ 3
- 7
Marlin/src/lcd/ultralcd.cpp 查看文件

30
   #include "../feature/host_actions.h"
30
   #include "../feature/host_actions.h"
31
 #endif
31
 #endif
32
 
32
 
33
+// All displays share the MarlinUI class
33
 #include "ultralcd.h"
34
 #include "ultralcd.h"
34
 MarlinUI ui;
35
 MarlinUI ui;
35
 
36
 
36
-// All displays share the MarlinUI class
37
 #if HAS_DISPLAY
37
 #if HAS_DISPLAY
38
+  #include "../module/printcounter.h"
39
+  #include "../MarlinCore.h"
38
   #include "../gcode/queue.h"
40
   #include "../gcode/queue.h"
39
   #include "fontutils.h"
41
   #include "fontutils.h"
40
   #include "../sd/cardreader.h"
42
   #include "../sd/cardreader.h"
91
 #include "../sd/cardreader.h"
93
 #include "../sd/cardreader.h"
92
 #include "../module/temperature.h"
94
 #include "../module/temperature.h"
93
 #include "../module/planner.h"
95
 #include "../module/planner.h"
94
-#include "../module/printcounter.h"
95
 #include "../module/motion.h"
96
 #include "../module/motion.h"
96
 
97
 
97
-#include "../Marlin.h"
98
-
99
 #if ENABLED(POWER_LOSS_RECOVERY)
98
 #if ENABLED(POWER_LOSS_RECOVERY)
100
   #include "../feature/power_loss_recovery.h"
99
   #include "../feature/power_loss_recovery.h"
101
 #endif
100
 #endif
1443
     #endif
1442
     #endif
1444
   }
1443
   }
1445
 
1444
 
1446
-  #include "../Marlin.h"
1447
-  #include "../module/printcounter.h"
1448
-
1449
   PGM_P print_paused = GET_TEXT(MSG_PRINT_PAUSED);
1445
   PGM_P print_paused = GET_TEXT(MSG_PRINT_PAUSED);
1450
 
1446
 
1451
   /**
1447
   /**

+ 1
- 1
Marlin/src/lcd/ultralcd.h 查看文件

37
 
37
 
38
 #if HAS_SPI_LCD
38
 #if HAS_SPI_LCD
39
 
39
 
40
-  #include "../Marlin.h"
40
+  #include "../MarlinCore.h"
41
 
41
 
42
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
42
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
43
     #include "../feature/pause.h"
43
     #include "../feature/pause.h"

+ 1
- 1
Marlin/src/libs/nozzle.cpp 查看文件

28
 
28
 
29
 Nozzle nozzle;
29
 Nozzle nozzle;
30
 
30
 
31
-#include "../Marlin.h"
31
+#include "../MarlinCore.h"
32
 #include "../module/motion.h"
32
 #include "../module/motion.h"
33
 
33
 
34
 #if ENABLED(NOZZLE_CLEAN_FEATURE)
34
 #if ENABLED(NOZZLE_CLEAN_FEATURE)

+ 1
- 1
Marlin/src/module/configuration_store.cpp 查看文件

54
 #include "../core/language.h"
54
 #include "../core/language.h"
55
 #include "../libs/vector_3.h"   // for matrix_3x3
55
 #include "../libs/vector_3.h"   // for matrix_3x3
56
 #include "../gcode/gcode.h"
56
 #include "../gcode/gcode.h"
57
-#include "../Marlin.h"
57
+#include "../MarlinCore.h"
58
 
58
 
59
 #if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
59
 #if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
60
   #include "../HAL/shared/persistent_store_api.h"
60
   #include "../HAL/shared/persistent_store_api.h"

+ 1
- 1
Marlin/src/module/delta.cpp 查看文件

35
 #include "planner.h"
35
 #include "planner.h"
36
 #include "endstops.h"
36
 #include "endstops.h"
37
 #include "../lcd/ultralcd.h"
37
 #include "../lcd/ultralcd.h"
38
-#include "../Marlin.h"
38
+#include "../MarlinCore.h"
39
 
39
 
40
 #if HAS_BED_PROBE
40
 #if HAS_BED_PROBE
41
   #include "probe.h"
41
   #include "probe.h"

+ 1
- 1
Marlin/src/module/endstops.cpp 查看文件

27
 #include "endstops.h"
27
 #include "endstops.h"
28
 #include "stepper.h"
28
 #include "stepper.h"
29
 
29
 
30
-#include "../Marlin.h"
30
+#include "../MarlinCore.h"
31
 #include "../sd/cardreader.h"
31
 #include "../sd/cardreader.h"
32
 #include "temperature.h"
32
 #include "temperature.h"
33
 #include "../lcd/ultralcd.h"
33
 #include "../lcd/ultralcd.h"

+ 1
- 1
Marlin/src/module/planner.cpp 查看文件

70
 #include "../core/language.h"
70
 #include "../core/language.h"
71
 #include "../gcode/parser.h"
71
 #include "../gcode/parser.h"
72
 
72
 
73
-#include "../Marlin.h"
73
+#include "../MarlinCore.h"
74
 
74
 
75
 #if HAS_LEVELING
75
 #if HAS_LEVELING
76
   #include "../feature/bedlevel/bedlevel.h"
76
   #include "../feature/bedlevel/bedlevel.h"

+ 1
- 1
Marlin/src/module/planner.h 查看文件

30
  * Copyright (c) 2009-2011 Simen Svale Skogsrud
30
  * Copyright (c) 2009-2011 Simen Svale Skogsrud
31
  */
31
  */
32
 
32
 
33
-#include "../Marlin.h"
33
+#include "../MarlinCore.h"
34
 
34
 
35
 #include "motion.h"
35
 #include "motion.h"
36
 #include "../gcode/queue.h"
36
 #include "../gcode/queue.h"

+ 1
- 1
Marlin/src/module/planner_bezier.cpp 查看文件

35
 #include "motion.h"
35
 #include "motion.h"
36
 #include "temperature.h"
36
 #include "temperature.h"
37
 
37
 
38
-#include "../Marlin.h"
38
+#include "../MarlinCore.h"
39
 #include "../core/language.h"
39
 #include "../core/language.h"
40
 #include "../gcode/queue.h"
40
 #include "../gcode/queue.h"
41
 
41
 

+ 1
- 1
Marlin/src/module/printcounter.cpp 查看文件

34
 #endif
34
 #endif
35
 
35
 
36
 #include "printcounter.h"
36
 #include "printcounter.h"
37
-#include "../Marlin.h"
37
+#include "../MarlinCore.h"
38
 #include "../HAL/shared/persistent_store_api.h"
38
 #include "../HAL/shared/persistent_store_api.h"
39
 
39
 
40
 #if HAS_BUZZER && SERVICE_WARNING_BUZZES > 0
40
 #if HAS_BUZZER && SERVICE_WARNING_BUZZES > 0

+ 1
- 1
Marlin/src/module/probe.cpp 查看文件

38
 #include "../gcode/gcode.h"
38
 #include "../gcode/gcode.h"
39
 #include "../lcd/ultralcd.h"
39
 #include "../lcd/ultralcd.h"
40
 
40
 
41
-#include "../Marlin.h" // for stop(), disable_e_steppers, wait_for_user
41
+#include "../MarlinCore.h" // for stop(), disable_e_steppers, wait_for_user
42
 
42
 
43
 #if HAS_LEVELING
43
 #if HAS_LEVELING
44
   #include "../feature/bedlevel/bedlevel.h"
44
   #include "../feature/bedlevel/bedlevel.h"

+ 1
- 1
Marlin/src/module/stepper.cpp 查看文件

98
 #include "../core/language.h"
98
 #include "../core/language.h"
99
 #include "../gcode/queue.h"
99
 #include "../gcode/queue.h"
100
 #include "../sd/cardreader.h"
100
 #include "../sd/cardreader.h"
101
-#include "../Marlin.h"
101
+#include "../MarlinCore.h"
102
 #include "../HAL/shared/Delay.h"
102
 #include "../HAL/shared/Delay.h"
103
 
103
 
104
 #if MB(ALLIGATOR)
104
 #if MB(ALLIGATOR)

+ 1
- 1
Marlin/src/module/temperature.cpp 查看文件

27
 #include "temperature.h"
27
 #include "temperature.h"
28
 #include "endstops.h"
28
 #include "endstops.h"
29
 
29
 
30
-#include "../Marlin.h"
30
+#include "../MarlinCore.h"
31
 #include "../lcd/ultralcd.h"
31
 #include "../lcd/ultralcd.h"
32
 #include "planner.h"
32
 #include "planner.h"
33
 #include "../core/language.h"
33
 #include "../core/language.h"

+ 1
- 1
Marlin/src/module/tool_change.cpp 查看文件

29
 #include "planner.h"
29
 #include "planner.h"
30
 #include "temperature.h"
30
 #include "temperature.h"
31
 
31
 
32
-#include "../Marlin.h"
32
+#include "../MarlinCore.h"
33
 
33
 
34
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
34
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
35
 #include "../core/debug_out.h"
35
 #include "../core/debug_out.h"

+ 1
- 1
Marlin/src/sd/Sd2Card.cpp 查看文件

38
 
38
 
39
 #include "Sd2Card.h"
39
 #include "Sd2Card.h"
40
 
40
 
41
-#include "../Marlin.h"
41
+#include "../MarlinCore.h"
42
 
42
 
43
 #if ENABLED(SD_CHECK_AND_RETRY)
43
 #if ENABLED(SD_CHECK_AND_RETRY)
44
   static bool crcSupported = true;
44
   static bool crcSupported = true;

+ 1
- 1
Marlin/src/sd/SdBaseFile.cpp 查看文件

33
 
33
 
34
 #include "SdBaseFile.h"
34
 #include "SdBaseFile.h"
35
 
35
 
36
-#include "../Marlin.h"
36
+#include "../MarlinCore.h"
37
 SdBaseFile* SdBaseFile::cwd_ = 0;   // Pointer to Current Working Directory
37
 SdBaseFile* SdBaseFile::cwd_ = 0;   // Pointer to Current Working Directory
38
 
38
 
39
 // callback function for date/time
39
 // callback function for date/time

+ 1
- 1
Marlin/src/sd/SdVolume.cpp 查看文件

33
 
33
 
34
 #include "SdVolume.h"
34
 #include "SdVolume.h"
35
 
35
 
36
-#include "../Marlin.h"
36
+#include "../MarlinCore.h"
37
 
37
 
38
 #if !USE_MULTIPLE_CARDS
38
 #if !USE_MULTIPLE_CARDS
39
   // raw block cache
39
   // raw block cache

+ 1
- 1
Marlin/src/sd/cardreader.cpp 查看文件

26
 
26
 
27
 #include "cardreader.h"
27
 #include "cardreader.h"
28
 
28
 
29
-#include "../Marlin.h"
29
+#include "../MarlinCore.h"
30
 #include "../lcd/ultralcd.h"
30
 #include "../lcd/ultralcd.h"
31
 #include "../module/planner.h"
31
 #include "../module/planner.h"
32
 #include "../module/printcounter.h"
32
 #include "../module/printcounter.h"

+ 1
- 1
Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp 查看文件

40
 
40
 
41
 #if ENABLED(USB_FLASH_DRIVE_SUPPORT)
41
 #if ENABLED(USB_FLASH_DRIVE_SUPPORT)
42
 
42
 
43
-#include "../../Marlin.h"
43
+#include "../../MarlinCore.h"
44
 #include "../../core/serial.h"
44
 #include "../../core/serial.h"
45
 #include "../../module/temperature.h"
45
 #include "../../module/temperature.h"
46
 
46
 

+ 1
- 1
buildroot/share/scripts/createSpeedLookupTable.py 查看文件

22
 print("#ifndef SPEED_LOOKUPTABLE_H")
22
 print("#ifndef SPEED_LOOKUPTABLE_H")
23
 print("#define SPEED_LOOKUPTABLE_H")
23
 print("#define SPEED_LOOKUPTABLE_H")
24
 print()
24
 print()
25
-print('#include "Marlin.h"')
25
+print('#include "MarlinCore.h"')
26
 print()
26
 print()
27
 
27
 
28
 print("const uint16_t speed_lookuptable_fast[256][2] PROGMEM = {")
28
 print("const uint16_t speed_lookuptable_fast[256][2] PROGMEM = {")

Loading…
取消
儲存