CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dirk O. Kaar 2020-01-03 02:01:38 +01:00 committed by Scott Lahteine
parent 5b75a018b7
commit d0e1166cce
80 changed files with 81 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp
View File

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

2
Marlin/src/HAL/HAL_AVR/watchdog.cpp
View File

@ -28,7 +28,7 @@
#include "watchdog.h" #include "watchdog.h"
#include "../../Marlin.h" #include "../../MarlinCore.h"
// Initialize watchdog with 8s timeout, if possible. Otherwise, make it 4s. // Initialize watchdog with 8s timeout, if possible. Otherwise, make it 4s.
void watchdog_init() { void watchdog_init() {

2
Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp
View File

@ -31,7 +31,7 @@
#include "MarlinSerial.h" #include "MarlinSerial.h"
#include "InterruptVectors.h" #include "InterruptVectors.h"
#include "../../Marlin.h" #include "../../MarlinCore.h"
template<typename Cfg> typename MarlinSerial<Cfg>::ring_buffer_r MarlinSerial<Cfg>::rx_buffer = { 0, 0, { 0 } }; template<typename Cfg> typename MarlinSerial<Cfg>::ring_buffer_r MarlinSerial<Cfg>::rx_buffer = { 0, 0, { 0 } };
template<typename Cfg> typename MarlinSerial<Cfg>::ring_buffer_t MarlinSerial<Cfg>::tx_buffer = { 0 }; template<typename Cfg> typename MarlinSerial<Cfg>::ring_buffer_t MarlinSerial<Cfg>::tx_buffer = { 0 };

2
Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
View File

@ -63,7 +63,7 @@
#include <U8glib.h> #include <U8glib.h>
#include "../../../Marlin.h" #include "../../../MarlinCore.h"
void spiBegin(); void spiBegin();
void spiInit(uint8_t spiRate); void spiInit(uint8_t spiRate);

2
Marlin/src/HAL/HAL_DUE/watchdog.cpp
View File

@ -23,7 +23,7 @@
#ifdef ARDUINO_ARCH_SAM #ifdef ARDUINO_ARCH_SAM
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"
#include "../../Marlin.h" #include "../../MarlinCore.h"
#include "watchdog.h" #include "watchdog.h"
// Override Arduino runtime to either config or disable the watchdog // Override Arduino runtime to either config or disable the watchdog

2
Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.cpp
View File

@ -36,7 +36,7 @@
#include "TMC2660.h" #include "TMC2660.h"
#include "../../../inc/MarlinConfig.h" #include "../../../inc/MarlinConfig.h"
#include "../../../Marlin.h" #include "../../../MarlinCore.h"
#include "../../../module/stepper/indirection.h" #include "../../../module/stepper/indirection.h"
#include "../../../module/printcounter.h" #include "../../../module/printcounter.h"
#include "../../../libs/duration_t.h" #include "../../../libs/duration_t.h"

2
Marlin/src/Marlin.cpp → Marlin/src/MarlinCore.cpp
View File

@ -28,7 +28,7 @@
* - https://github.com/grbl/grbl * - https://github.com/grbl/grbl
*/ */
#include "Marlin.h" #include "MarlinCore.h"
#include "core/utility.h" #include "core/utility.h"
#include "lcd/ultralcd.h" #include "lcd/ultralcd.h"

0
Marlin/src/Marlin.h → Marlin/src/MarlinCore.h
View File

2
Marlin/src/core/utility.cpp
View File

@ -22,7 +22,7 @@
#include "utility.h" #include "utility.h"
#include "../Marlin.h" #include "../MarlinCore.h"
#include "../module/temperature.h" #include "../module/temperature.h"
void safe_delay(millis_t ms) { void safe_delay(millis_t ms) {

2
Marlin/src/feature/Max7219_Debug_LEDs.cpp
View File

@ -45,7 +45,7 @@
#include "../module/planner.h" #include "../module/planner.h"
#include "../module/stepper.h" #include "../module/stepper.h"
#include "../Marlin.h" #include "../MarlinCore.h"
#include "../HAL/shared/Delay.h" #include "../HAL/shared/Delay.h"
#define HAS_SIDE_BY_SIDE (ENABLED(MAX7219_SIDE_BY_SIDE) && MAX7219_NUMBER_UNITS > 1) #define HAS_SIDE_BY_SIDE (ENABLED(MAX7219_SIDE_BY_SIDE) && MAX7219_NUMBER_UNITS > 1)

2
Marlin/src/feature/babystep.cpp
View File

@ -25,7 +25,7 @@
#if ENABLED(BABYSTEPPING) #if ENABLED(BABYSTEPPING)
#include "babystep.h" #include "babystep.h"
#include "../Marlin.h" #include "../MarlinCore.h"
#include "../module/planner.h" #include "../module/planner.h"
#include "../module/stepper.h" #include "../module/stepper.h"

2
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View File

@ -26,7 +26,7 @@
#include "../bedlevel.h" #include "../bedlevel.h"
#include "../../../Marlin.h" #include "../../../MarlinCore.h"
#include "../../../HAL/shared/persistent_store_api.h" #include "../../../HAL/shared/persistent_store_api.h"
#include "../../../libs/hex_print_routines.h" #include "../../../libs/hex_print_routines.h"
#include "../../../module/configuration_store.h" #include "../../../module/configuration_store.h"

2
Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
View File

@ -32,7 +32,7 @@
#include "../../../module/delta.h" #include "../../../module/delta.h"
#endif #endif
#include "../../../Marlin.h" #include "../../../MarlinCore.h"
#include <math.h> #include <math.h>
#if !UBL_SEGMENTED #if !UBL_SEGMENTED

2
Marlin/src/feature/dac/dac_dac084s085.cpp
View File

@ -10,7 +10,7 @@
#include "dac_dac084s085.h" #include "dac_dac084s085.h"
#include "../../Marlin.h" #include "../../MarlinCore.h"
#include "../../module/stepper.h" #include "../../module/stepper.h"
#include "../../HAL/shared/Delay.h" #include "../../HAL/shared/Delay.h"

2
Marlin/src/feature/pause.cpp
View File

@ -29,7 +29,7 @@
#if ENABLED(ADVANCED_PAUSE_FEATURE) #if ENABLED(ADVANCED_PAUSE_FEATURE)
#include "../Marlin.h" #include "../MarlinCore.h"
#include "../gcode/gcode.h" #include "../gcode/gcode.h"
#include "../module/motion.h" #include "../module/motion.h"
#include "../module/planner.h" #include "../module/planner.h"

2
Marlin/src/feature/power.cpp
View File

@ -31,7 +31,7 @@
#include "power.h" #include "power.h"
#include "../module/temperature.h" #include "../module/temperature.h"
#include "../module/stepper/indirection.h" #include "../module/stepper/indirection.h"
#include "../Marlin.h" #include "../MarlinCore.h"
Power powerManager; Power powerManager;

2
Marlin/src/feature/prusa_MMU2/mmu2.cpp
View File

@ -36,7 +36,7 @@ MMU2 mmu2;
#include "../../module/temperature.h" #include "../../module/temperature.h"
#include "../../module/planner.h" #include "../../module/planner.h"
#include "../../module/stepper/indirection.h" #include "../../module/stepper/indirection.h"
#include "../../Marlin.h" #include "../../MarlinCore.h"
#if ENABLED(HOST_PROMPT_SUPPORT) #if ENABLED(HOST_PROMPT_SUPPORT)
#include "../../feature/host_actions.h" #include "../../feature/host_actions.h"

2
Marlin/src/feature/runout.cpp
View File

@ -61,7 +61,7 @@ void FilamentSensorBase::filament_present(const uint8_t extruder) {
// //
// Filament Runout event handler // Filament Runout event handler
// //
#include "../Marlin.h" #include "../MarlinCore.h"
#include "../gcode/queue.h" #include "../gcode/queue.h"
#if ENABLED(HOST_ACTION_COMMANDS) #if ENABLED(HOST_ACTION_COMMANDS)

2
Marlin/src/feature/tmc_util.cpp
View File

@ -25,7 +25,7 @@
#if HAS_TRINAMIC #if HAS_TRINAMIC
#include "tmc_util.h" #include "tmc_util.h"
#include "../Marlin.h" #include "../MarlinCore.h"
#include "../module/stepper/indirection.h" #include "../module/stepper/indirection.h"
#include "../module/printcounter.h" #include "../module/printcounter.h"

2
Marlin/src/gcode/bedlevel/G26.cpp
View File

@ -34,7 +34,7 @@
#include "../../gcode/gcode.h" #include "../../gcode/gcode.h"
#include "../../feature/bedlevel/bedlevel.h" #include "../../feature/bedlevel/bedlevel.h"
#include "../../Marlin.h" #include "../../MarlinCore.h"
#include "../../module/planner.h" #include "../../module/planner.h"
#include "../../module/stepper.h" #include "../../module/stepper.h"
#include "../../module/motion.h" #include "../../module/motion.h"

2
Marlin/src/gcode/bedlevel/G42.cpp
View File

@ -25,7 +25,7 @@
#if HAS_MESH #if HAS_MESH
#include "../gcode.h" #include "../gcode.h"
#include "../../Marlin.h" // for IsRunning() #include "../../MarlinCore.h" // for IsRunning()
#include "../../module/motion.h" #include "../../module/motion.h"
#include "../../module/probe.h" // for probe_offset #include "../../module/probe.h" // for probe_offset
#include "../../feature/bedlevel/bedlevel.h" #include "../../feature/bedlevel/bedlevel.h"

2
Marlin/src/gcode/calibrate/G425.cpp
View File

@ -20,7 +20,7 @@
* *
*/ */
#include "../../Marlin.h" #include "../../MarlinCore.h"
#if ENABLED(CALIBRATION_GCODE) #if ENABLED(CALIBRATION_GCODE)

2
Marlin/src/gcode/calibrate/M100.cpp
View File

@ -28,7 +28,7 @@
#include "../queue.h" #include "../queue.h"
#include "../../libs/hex_print_routines.h" #include "../../libs/hex_print_routines.h"
#include "../../Marlin.h" // for idle() #include "../../MarlinCore.h" // for idle()
/** /**
* M100 Free Memory Watcher * M100 Free Memory Watcher

2
Marlin/src/gcode/config/M200-M205.cpp
View File

@ -21,7 +21,7 @@
*/ */
#include "../gcode.h" #include "../gcode.h"
#include "../../Marlin.h" #include "../../MarlinCore.h"
#include "../../module/planner.h" #include "../../module/planner.h"
#if DISABLED(NO_VOLUMETRICS) #if DISABLED(NO_VOLUMETRICS)

2
Marlin/src/gcode/config/M217.cpp
View File

@ -27,7 +27,7 @@
#include "../gcode.h" #include "../gcode.h"
#include "../../module/tool_change.h" #include "../../module/tool_change.h"
#include "../../Marlin.h" // for SP_X_STR, etc. #include "../../MarlinCore.h" // for SP_X_STR, etc.
extern const char SP_X_STR[], SP_Y_STR[], SP_Z_STR[]; extern const char SP_X_STR[], SP_Y_STR[], SP_Z_STR[];

2
Marlin/src/gcode/config/M43.cpp
View File

@ -25,7 +25,7 @@
#if ENABLED(PINS_DEBUGGING) #if ENABLED(PINS_DEBUGGING)
#include "../gcode.h" #include "../gcode.h"
#include "../../Marlin.h" // for pin_is_protected #include "../../MarlinCore.h" // for pin_is_protected
#include "../../pins/pinsDebug.h" #include "../../pins/pinsDebug.h"
#include "../../module/endstops.h" #include "../../module/endstops.h"

2
Marlin/src/gcode/control/M108_M112_M410.cpp
View File

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

2
Marlin/src/gcode/control/M17_M18_M84.cpp
View File

@ -21,7 +21,7 @@
*/ */
#include "../gcode.h" #include "../gcode.h"
#include "../../Marlin.h" // for stepper_inactive_time, disable_e_steppers #include "../../MarlinCore.h" // for stepper_inactive_time, disable_e_steppers
#include "../../lcd/ultralcd.h" #include "../../lcd/ultralcd.h"
#include "../../module/stepper.h" #include "../../module/stepper.h"

2
Marlin/src/gcode/control/M226.cpp
View File

@ -21,7 +21,7 @@
*/ */
#include "../gcode.h" #include "../gcode.h"
#include "../../Marlin.h" // for pin_is_protected and idle() #include "../../MarlinCore.h" // for pin_is_protected and idle()
#include "../../module/stepper.h" #include "../../module/stepper.h"
/** /**

2
Marlin/src/gcode/control/M42.cpp
View File

@ -21,7 +21,7 @@
*/ */
#include "../gcode.h" #include "../gcode.h"
#include "../../Marlin.h" // for pin_is_protected #include "../../MarlinCore.h" // for pin_is_protected
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"
#if FAN_COUNT > 0 #if FAN_COUNT > 0

2
Marlin/src/gcode/control/M80_M81.cpp
View File

@ -32,7 +32,7 @@
#endif #endif
#if HAS_SUICIDE #if HAS_SUICIDE
#include "../../Marlin.h" #include "../../MarlinCore.h"
#endif #endif
#if ENABLED(PSU_CONTROL) #if ENABLED(PSU_CONTROL)

2
Marlin/src/gcode/control/M85.cpp
View File

@ -21,7 +21,7 @@
*/ */
#include "../gcode.h" #include "../gcode.h"
#include "../../Marlin.h" // for max_inactive_time #include "../../MarlinCore.h" // for max_inactive_time
/** /**
* M85: Set inactivity shutdown timer with parameter S<seconds>. To disable set zero (default) * M85: Set inactivity shutdown timer with parameter S<seconds>. To disable set zero (default)

2
Marlin/src/gcode/control/M999.cpp
View File

@ -23,7 +23,7 @@
#include "../gcode.h" #include "../gcode.h"
#include "../../lcd/ultralcd.h" // for lcd_reset_alert_level #include "../../lcd/ultralcd.h" // for lcd_reset_alert_level
#include "../../Marlin.h" // for Running #include "../../MarlinCore.h" // for Running
#include "../queue.h" // for flush_and_request_resend #include "../queue.h" // for flush_and_request_resend
/** /**

2
Marlin/src/gcode/feature/camera/M240.cpp
View File

@ -32,7 +32,7 @@
#endif #endif
#if defined(PHOTO_POSITION) && PHOTO_DELAY_MS > 0 #if defined(PHOTO_POSITION) && PHOTO_DELAY_MS > 0
#include "../../../Marlin.h" // for idle() #include "../../../MarlinCore.h" // for idle()
#endif #endif
#ifdef PHOTO_RETRACT_MM #ifdef PHOTO_RETRACT_MM

2
Marlin/src/gcode/feature/filwidth/M404-M407.cpp
View File

@ -27,7 +27,7 @@
#include "../../../feature/filwidth.h" #include "../../../feature/filwidth.h"
#include "../../../module/planner.h" #include "../../../module/planner.h"
#include "../../../module/temperature.h" #include "../../../module/temperature.h"
#include "../../../Marlin.h" #include "../../../MarlinCore.h"
#include "../../gcode.h" #include "../../gcode.h"
/** /**

2
Marlin/src/gcode/feature/i2c/M260_M261.cpp
View File

@ -26,7 +26,7 @@
#include "../../gcode.h" #include "../../gcode.h"
#include "../../../Marlin.h" // for i2c #include "../../../MarlinCore.h" // for i2c
/** /**
* M260: Send data to a I2C slave device * M260: Send data to a I2C slave device

2
Marlin/src/gcode/feature/pause/M701_M702.cpp
View File

@ -25,7 +25,7 @@
#if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES) #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
#include "../../gcode.h" #include "../../gcode.h"
#include "../../../Marlin.h" #include "../../../MarlinCore.h"
#include "../../../module/motion.h" #include "../../../module/motion.h"
#include "../../../module/temperature.h" #include "../../../module/temperature.h"
#include "../../../feature/pause.h" #include "../../../feature/pause.h"

2
Marlin/src/gcode/gcode.cpp
View File

@ -49,7 +49,7 @@ GcodeSuite gcode;
#include "../feature/cancel_object.h" #include "../feature/cancel_object.h"
#endif #endif
#include "../Marlin.h" // for idle() and suspend_auto_report #include "../MarlinCore.h" // for idle() and suspend_auto_report
millis_t GcodeSuite::previous_move_ms; millis_t GcodeSuite::previous_move_ms;

2
Marlin/src/gcode/host/M16.cpp
View File

@ -25,7 +25,7 @@
#if ENABLED(EXPECTED_PRINTER_CHECK) #if ENABLED(EXPECTED_PRINTER_CHECK)
#include "../gcode.h" #include "../gcode.h"
#include "../../Marlin.h" #include "../../MarlinCore.h"
/** /**
* M16: Expected Printer Check * M16: Expected Printer Check

2
Marlin/src/gcode/host/M876.cpp
View File

@ -25,7 +25,7 @@
#include "../../feature/host_actions.h" #include "../../feature/host_actions.h"
#include "../gcode.h" #include "../gcode.h"
#include "../../Marlin.h" #include "../../MarlinCore.h"
/** /**
* M876: Handle Prompt Response * M876: Handle Prompt Response

2
Marlin/src/gcode/motion/G0_G1.cpp
View File

@ -23,7 +23,7 @@
#include "../gcode.h" #include "../gcode.h"
#include "../../module/motion.h" #include "../../module/motion.h"
#include "../../Marlin.h" #include "../../MarlinCore.h"
#if BOTH(FWRETRACT, FWRETRACT_AUTORETRACT) #if BOTH(FWRETRACT, FWRETRACT_AUTORETRACT)
#include "../../feature/fwretract.h" #include "../../feature/fwretract.h"

2
Marlin/src/gcode/motion/G5.cpp
View File

@ -35,7 +35,7 @@
*/ */
#include "../gcode.h" #include "../gcode.h"
#include "../../Marlin.h" // for IsRunning() #include "../../MarlinCore.h" // for IsRunning()
/** /**
* G5: Cubic B-spline * G5: Cubic B-spline

2
Marlin/src/gcode/parser.cpp
View File

@ -26,7 +26,7 @@
#include "parser.h" #include "parser.h"
#include "../Marlin.h" #include "../MarlinCore.h"
#if NUM_SERIAL > 1 #if NUM_SERIAL > 1
#include "queue.h" #include "queue.h"

2
Marlin/src/gcode/queue.cpp
View File

@ -33,7 +33,7 @@ GCodeQueue queue;
#include "../sd/cardreader.h" #include "../sd/cardreader.h"
#include "../module/planner.h" #include "../module/planner.h"
#include "../module/temperature.h" #include "../module/temperature.h"
#include "../Marlin.h" #include "../MarlinCore.h"
#if ENABLED(PRINTER_EVENT_LEDS) #if ENABLED(PRINTER_EVENT_LEDS)
#include "../feature/leds/printer_event_leds.h" #include "../feature/leds/printer_event_leds.h"

2
Marlin/src/gcode/scara/M360-M364.cpp
View File

@ -27,7 +27,7 @@
#include "../gcode.h" #include "../gcode.h"
#include "../../module/scara.h" #include "../../module/scara.h"
#include "../../module/motion.h" #include "../../module/motion.h"
#include "../../Marlin.h" // for IsRunning() #include "../../MarlinCore.h" // for IsRunning()
inline bool SCARA_move_to_cal(const uint8_t delta_a, const uint8_t delta_b) { inline bool SCARA_move_to_cal(const uint8_t delta_a, const uint8_t delta_b) {
if (IsRunning()) { if (IsRunning()) {

2
Marlin/src/gcode/sdcard/M24_M25.cpp
View File

@ -42,7 +42,7 @@
#include "../../feature/power_loss_recovery.h" #include "../../feature/power_loss_recovery.h"
#endif #endif
#include "../../Marlin.h" // for startOrResumeJob #include "../../MarlinCore.h" // for startOrResumeJob
/** /**
* M24: Start or Resume SD Print * M24: Start or Resume SD Print

2
Marlin/src/gcode/sdcard/M32.cpp
View File

@ -28,7 +28,7 @@
#include "../../sd/cardreader.h" #include "../../sd/cardreader.h"
#include "../../module/planner.h" // for synchronize() #include "../../module/planner.h" // for synchronize()
#include "../../Marlin.h" // for startOrResumeJob #include "../../MarlinCore.h" // for startOrResumeJob
/** /**
* M32: Select file and start SD Print * M32: Select file and start SD Print

2
Marlin/src/gcode/stats/M75-M78.cpp
View File

@ -24,7 +24,7 @@
#include "../../module/printcounter.h" #include "../../module/printcounter.h"
#include "../../lcd/ultralcd.h" #include "../../lcd/ultralcd.h"
#include "../../Marlin.h" // for startOrResumeJob #include "../../MarlinCore.h" // for startOrResumeJob
/** /**
* M75: Start print timer * M75: Start print timer

2
Marlin/src/gcode/temperature/M104_M109.cpp
View File

@ -30,7 +30,7 @@
#include "../../module/planner.h" #include "../../module/planner.h"
#include "../../lcd/ultralcd.h" #include "../../lcd/ultralcd.h"
#include "../../Marlin.h" // for startOrResumeJob, etc. #include "../../MarlinCore.h" // for startOrResumeJob, etc.
#if ENABLED(PRINTJOB_TIMER_AUTOSTART) #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
#include "../../module/printcounter.h" #include "../../module/printcounter.h"

2
Marlin/src/gcode/temperature/M140_M190.cpp
View File

@ -37,7 +37,7 @@
#include "../../feature/leds/leds.h" #include "../../feature/leds/leds.h"
#endif #endif
#include "../../Marlin.h" // for wait_for_heatup, idle, startOrResumeJob #include "../../MarlinCore.h" // for wait_for_heatup, idle, startOrResumeJob
/** /**
* M140: Set bed temperature * M140: Set bed temperature

2
Marlin/src/gcode/temperature/M141_M191.cpp
View File

@ -38,7 +38,7 @@
#include "../../feature/leds/leds.h" #include "../../feature/leds/leds.h"
#endif #endif
#include "../../Marlin.h" // for wait_for_heatup, idle, startOrResumeJob #include "../../MarlinCore.h" // for wait_for_heatup, idle, startOrResumeJob
/** /**
* M141: Set chamber temperature * M141: Set chamber temperature

2
Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
View File

@ -17,7 +17,7 @@
#if HAS_CHARACTER_LCD #if HAS_CHARACTER_LCD
#include "../ultralcd.h" #include "../ultralcd.h"
#include "../../Marlin.h" #include "../../MarlinCore.h"
#include "ultralcd_HD44780.h" #include "ultralcd_HD44780.h"

2
Marlin/src/lcd/dogm/lcdprint_u8g.cpp
View File

@ -14,7 +14,7 @@
#include "ultralcd_DOGM.h" #include "ultralcd_DOGM.h"
#include "../ultralcd.h" #include "../ultralcd.h"
#include "../../Marlin.h" #include "../../MarlinCore.h"
#include "../fontutils.h" #include "../fontutils.h"
#include "u8g_fontutf8.h" #include "u8g_fontutf8.h"

2
Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
View File

@ -60,7 +60,7 @@
#endif #endif
#if ENABLED(LCD_SHOW_E_TOTAL) #if ENABLED(LCD_SHOW_E_TOTAL)
#include "../../Marlin.h" // for printingIsActive #include "../../MarlinCore.h" // for printingIsActive
#endif #endif
#define TEXT_MODE_LCD_WIDTH 16 #define TEXT_MODE_LCD_WIDTH 16

2
Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp
View File

@ -32,7 +32,7 @@
#include "../../ui_api.h" #include "../../ui_api.h"
#include "../../../../Marlin.h" #include "../../../../MarlinCore.h"
#include "../../../../module/temperature.h" #include "../../../../module/temperature.h"
#include "../../../../module/motion.h" #include "../../../../module/motion.h"
#include "../../../../gcode/queue.h" #include "../../../../gcode/queue.h"

2
Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.h
View File

@ -25,7 +25,7 @@
#include "../../../../inc/MarlinConfigPre.h" #include "../../../../inc/MarlinConfigPre.h"
#include "../../../../Marlin.h" #include "../../../../MarlinCore.h"
#include "DGUSVPVariable.h" #include "DGUSVPVariable.h"
enum DGUSLCD_Screens : uint8_t; enum DGUSLCD_Screens : uint8_t;

2
Marlin/src/lcd/extensible_ui/lib/ftdi_eve_touch_ui/language/language.cpp
View File

@ -20,7 +20,7 @@
****************************************************************************/ ****************************************************************************/
#include "../../../../../Marlin.h" #include "../../../../../MarlinCore.h"
#include "language.h" #include "language.h"

2
Marlin/src/lcd/fontutils.cpp
View File

@ -11,7 +11,7 @@
#if HAS_SPI_LCD #if HAS_SPI_LCD
#include "ultralcd.h" #include "ultralcd.h"
#include "../Marlin.h" #include "../MarlinCore.h"
#endif #endif
#include "fontutils.h" #include "fontutils.h"

2
Marlin/src/lcd/menu/menu.cpp
View File

@ -213,7 +213,7 @@ void MenuItem_bool::action(PGM_P const, bool * const ptr, screenFunc_t callback)
///////////////// Menu Tree //////////////// ///////////////// Menu Tree ////////////////
//////////////////////////////////////////// ////////////////////////////////////////////
#include "../../Marlin.h" #include "../../MarlinCore.h"
bool printer_busy() { bool printer_busy() {
return planner.movesplanned() || printingIsActive(); return planner.movesplanned() || printingIsActive();

2
Marlin/src/lcd/menu/menu_tune.cpp
View File

@ -32,7 +32,7 @@
#include "../../module/motion.h" #include "../../module/motion.h"
#include "../../module/planner.h" #include "../../module/planner.h"
#include "../../module/temperature.h" #include "../../module/temperature.h"
#include "../../Marlin.h" #include "../../MarlinCore.h"
#if HAS_LEVELING #if HAS_LEVELING
#include "../../feature/bedlevel/bedlevel.h" #include "../../feature/bedlevel/bedlevel.h"

10
Marlin/src/lcd/ultralcd.cpp
View File

@ -30,11 +30,13 @@
#include "../feature/host_actions.h" #include "../feature/host_actions.h"
#endif #endif
// All displays share the MarlinUI class
#include "ultralcd.h" #include "ultralcd.h"
MarlinUI ui; MarlinUI ui;
// All displays share the MarlinUI class
#if HAS_DISPLAY #if HAS_DISPLAY
#include "../module/printcounter.h"
#include "../MarlinCore.h"
#include "../gcode/queue.h" #include "../gcode/queue.h"
#include "fontutils.h" #include "fontutils.h"
#include "../sd/cardreader.h" #include "../sd/cardreader.h"
@ -91,11 +93,8 @@ MarlinUI ui;
#include "../sd/cardreader.h" #include "../sd/cardreader.h"
#include "../module/temperature.h" #include "../module/temperature.h"
#include "../module/planner.h" #include "../module/planner.h"
#include "../module/printcounter.h"
#include "../module/motion.h" #include "../module/motion.h"
#include "../Marlin.h"
#if ENABLED(POWER_LOSS_RECOVERY) #if ENABLED(POWER_LOSS_RECOVERY)
#include "../feature/power_loss_recovery.h" #include "../feature/power_loss_recovery.h"
#endif #endif
@ -1443,9 +1442,6 @@ void MarlinUI::update() {
#endif #endif
} }
#include "../Marlin.h"
#include "../module/printcounter.h"
PGM_P print_paused = GET_TEXT(MSG_PRINT_PAUSED); PGM_P print_paused = GET_TEXT(MSG_PRINT_PAUSED);
/** /**

2
Marlin/src/lcd/ultralcd.h
View File

@ -37,7 +37,7 @@
#if HAS_SPI_LCD #if HAS_SPI_LCD
#include "../Marlin.h" #include "../MarlinCore.h"
#if ENABLED(ADVANCED_PAUSE_FEATURE) #if ENABLED(ADVANCED_PAUSE_FEATURE)
#include "../feature/pause.h" #include "../feature/pause.h"

2
Marlin/src/libs/nozzle.cpp
View File

@ -28,7 +28,7 @@
Nozzle nozzle; Nozzle nozzle;
#include "../Marlin.h" #include "../MarlinCore.h"
#include "../module/motion.h" #include "../module/motion.h"
#if ENABLED(NOZZLE_CLEAN_FEATURE) #if ENABLED(NOZZLE_CLEAN_FEATURE)

2
Marlin/src/module/configuration_store.cpp
View File

@ -54,7 +54,7 @@
#include "../core/language.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 "../Marlin.h" #include "../MarlinCore.h"
#if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE) #if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
#include "../HAL/shared/persistent_store_api.h" #include "../HAL/shared/persistent_store_api.h"

2
Marlin/src/module/delta.cpp
View File

@ -35,7 +35,7 @@
#include "planner.h" #include "planner.h"
#include "endstops.h" #include "endstops.h"
#include "../lcd/ultralcd.h" #include "../lcd/ultralcd.h"
#include "../Marlin.h" #include "../MarlinCore.h"
#if HAS_BED_PROBE #if HAS_BED_PROBE
#include "probe.h" #include "probe.h"

2
Marlin/src/module/endstops.cpp
View File

@ -27,7 +27,7 @@
#include "endstops.h" #include "endstops.h"
#include "stepper.h" #include "stepper.h"
#include "../Marlin.h" #include "../MarlinCore.h"
#include "../sd/cardreader.h" #include "../sd/cardreader.h"
#include "temperature.h" #include "temperature.h"
#include "../lcd/ultralcd.h" #include "../lcd/ultralcd.h"

2
Marlin/src/module/planner.cpp
View File

@ -70,7 +70,7 @@
#include "../core/language.h" #include "../core/language.h"
#include "../gcode/parser.h" #include "../gcode/parser.h"
#include "../Marlin.h" #include "../MarlinCore.h"
#if HAS_LEVELING #if HAS_LEVELING
#include "../feature/bedlevel/bedlevel.h" #include "../feature/bedlevel/bedlevel.h"

2
Marlin/src/module/planner.h
View File

@ -30,7 +30,7 @@
* Copyright (c) 2009-2011 Simen Svale Skogsrud * Copyright (c) 2009-2011 Simen Svale Skogsrud
*/ */
#include "../Marlin.h" #include "../MarlinCore.h"
#include "motion.h" #include "motion.h"
#include "../gcode/queue.h" #include "../gcode/queue.h"

2
Marlin/src/module/planner_bezier.cpp
View File

@ -35,7 +35,7 @@
#include "motion.h" #include "motion.h"
#include "temperature.h" #include "temperature.h"
#include "../Marlin.h" #include "../MarlinCore.h"
#include "../core/language.h" #include "../core/language.h"
#include "../gcode/queue.h" #include "../gcode/queue.h"

2
Marlin/src/module/printcounter.cpp
View File

@ -34,7 +34,7 @@ Stopwatch print_job_timer; // Global Print Job Timer instance
#endif #endif
#include "printcounter.h" #include "printcounter.h"
#include "../Marlin.h" #include "../MarlinCore.h"
#include "../HAL/shared/persistent_store_api.h" #include "../HAL/shared/persistent_store_api.h"
#if HAS_BUZZER && SERVICE_WARNING_BUZZES > 0 #if HAS_BUZZER && SERVICE_WARNING_BUZZES > 0

2
Marlin/src/module/probe.cpp
View File

@ -38,7 +38,7 @@
#include "../gcode/gcode.h" #include "../gcode/gcode.h"
#include "../lcd/ultralcd.h" #include "../lcd/ultralcd.h"
#include "../Marlin.h" // for stop(), disable_e_steppers, wait_for_user #include "../MarlinCore.h" // for stop(), disable_e_steppers, wait_for_user
#if HAS_LEVELING #if HAS_LEVELING
#include "../feature/bedlevel/bedlevel.h" #include "../feature/bedlevel/bedlevel.h"

2
Marlin/src/module/stepper.cpp
View File

@ -98,7 +98,7 @@ Stepper stepper; // Singleton
#include "../core/language.h" #include "../core/language.h"
#include "../gcode/queue.h" #include "../gcode/queue.h"
#include "../sd/cardreader.h" #include "../sd/cardreader.h"
#include "../Marlin.h" #include "../MarlinCore.h"
#include "../HAL/shared/Delay.h" #include "../HAL/shared/Delay.h"
#if MB(ALLIGATOR) #if MB(ALLIGATOR)

2
Marlin/src/module/temperature.cpp
View File

@ -27,7 +27,7 @@
#include "temperature.h" #include "temperature.h"
#include "endstops.h" #include "endstops.h"
#include "../Marlin.h" #include "../MarlinCore.h"
#include "../lcd/ultralcd.h" #include "../lcd/ultralcd.h"
#include "planner.h" #include "planner.h"
#include "../core/language.h" #include "../core/language.h"

2
Marlin/src/module/tool_change.cpp
View File

@ -29,7 +29,7 @@
#include "planner.h" #include "planner.h"
#include "temperature.h" #include "temperature.h"
#include "../Marlin.h" #include "../MarlinCore.h"
#define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE) #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
#include "../core/debug_out.h" #include "../core/debug_out.h"

2
Marlin/src/sd/Sd2Card.cpp
View File

@ -38,7 +38,7 @@
#include "Sd2Card.h" #include "Sd2Card.h"
#include "../Marlin.h" #include "../MarlinCore.h"
#if ENABLED(SD_CHECK_AND_RETRY) #if ENABLED(SD_CHECK_AND_RETRY)
static bool crcSupported = true; static bool crcSupported = true;

2
Marlin/src/sd/SdBaseFile.cpp
View File

@ -33,7 +33,7 @@
#include "SdBaseFile.h" #include "SdBaseFile.h"
#include "../Marlin.h" #include "../MarlinCore.h"
SdBaseFile* SdBaseFile::cwd_ = 0; // Pointer to Current Working Directory SdBaseFile* SdBaseFile::cwd_ = 0; // Pointer to Current Working Directory
// callback function for date/time // callback function for date/time

2
Marlin/src/sd/SdVolume.cpp
View File

@ -33,7 +33,7 @@
#include "SdVolume.h" #include "SdVolume.h"
#include "../Marlin.h" #include "../MarlinCore.h"
#if !USE_MULTIPLE_CARDS #if !USE_MULTIPLE_CARDS
// raw block cache // raw block cache

2
Marlin/src/sd/cardreader.cpp
View File

@ -26,7 +26,7 @@
#include "cardreader.h" #include "cardreader.h"
#include "../Marlin.h" #include "../MarlinCore.h"
#include "../lcd/ultralcd.h" #include "../lcd/ultralcd.h"
#include "../module/planner.h" #include "../module/planner.h"
#include "../module/printcounter.h" #include "../module/printcounter.h"

2
Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
View File

@ -40,7 +40,7 @@
#if ENABLED(USB_FLASH_DRIVE_SUPPORT) #if ENABLED(USB_FLASH_DRIVE_SUPPORT)
#include "../../Marlin.h" #include "../../MarlinCore.h"
#include "../../core/serial.h" #include "../../core/serial.h"
#include "../../module/temperature.h" #include "../../module/temperature.h"

2
buildroot/share/scripts/createSpeedLookupTable.py
View File

@ -22,7 +22,7 @@ timer_freq = cpu_freq / args.divider
print("#ifndef SPEED_LOOKUPTABLE_H") print("#ifndef SPEED_LOOKUPTABLE_H")
print("#define SPEED_LOOKUPTABLE_H") print("#define SPEED_LOOKUPTABLE_H")
print() print()
print('#include "Marlin.h"') print('#include "MarlinCore.h"')
print() print()
print("const uint16_t speed_lookuptable_fast[256][2] PROGMEM = {") print("const uint16_t speed_lookuptable_fast[256][2] PROGMEM = {")