Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Jan 3, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89f6812
Visual Micro's Arduino IDE for Visual Studio won't build Marlin V2. T…
dok-net Jan 1, 2020
db4e55e
Update MarlinCore.h
thinkyhead Jan 2, 2020
fe14ca8
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bf2_visualm…
thinkyhead Jan 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#if !defined(USBCON) && (defined(UBRRH) || defined(UBRR0H) || defined(UBRR1H) || defined(UBRR2H) || defined(UBRR3H))

#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_t MarlinSerial<Cfg>::tx_buffer = { 0 };
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_AVR/watchdog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

#include "watchdog.h"

#include "../../Marlin.h"
#include "../../MarlinCore.h"

// Initialize watchdog with 8s timeout, if possible. Otherwise, make it 4s.
void watchdog_init() {
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#include "MarlinSerial.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_t MarlinSerial<Cfg>::tx_buffer = { 0 };
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@

#include <U8glib.h>

#include "../../../Marlin.h"
#include "../../../MarlinCore.h"

void spiBegin();
void spiInit(uint8_t spiRate);
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_DUE/watchdog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#ifdef ARDUINO_ARCH_SAM

#include "../../inc/MarlinConfig.h"
#include "../../Marlin.h"
#include "../../MarlinCore.h"
#include "watchdog.h"

// Override Arduino runtime to either config or disable the watchdog
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "TMC2660.h"

#include "../../../inc/MarlinConfig.h"
#include "../../../Marlin.h"
#include "../../../MarlinCore.h"
#include "../../../module/stepper/indirection.h"
#include "../../../module/printcounter.h"
#include "../../../libs/duration_t.h"
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/Marlin.cpp → Marlin/src/MarlinCore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* - https://github.com/grbl/grbl
*/

#include "Marlin.h"
#include "MarlinCore.h"

#include "core/utility.h"
#include "lcd/ultralcd.h"
Expand Down
0 Marlin/src/Marlin.h → Marlin/src/MarlinCore.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Marlin/src/core/utility.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#include "utility.h"

#include "../Marlin.h"
#include "../MarlinCore.h"
#include "../module/temperature.h"

void safe_delay(millis_t ms) {
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/feature/Max7219_Debug_LEDs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@

#include "../module/planner.h"
#include "../module/stepper.h"
#include "../Marlin.h"
#include "../MarlinCore.h"
#include "../HAL/shared/Delay.h"

#define HAS_SIDE_BY_SIDE (ENABLED(MAX7219_SIDE_BY_SIDE) && MAX7219_NUMBER_UNITS > 1)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/feature/babystep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#if ENABLED(BABYSTEPPING)

#include "babystep.h"
#include "../Marlin.h"
#include "../MarlinCore.h"
#include "../module/planner.h"
#include "../module/stepper.h"

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include "../bedlevel.h"

#include "../../../Marlin.h"
#include "../../../MarlinCore.h"
#include "../../../HAL/shared/persistent_store_api.h"
#include "../../../libs/hex_print_routines.h"
#include "../../../module/configuration_store.h"
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/feature/bedlevel/ubl/ubl_motion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include "../../../module/delta.h"
#endif

#include "../../../Marlin.h"
#include "../../../MarlinCore.h"
#include <math.h>

#if !UBL_SEGMENTED
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/feature/dac/dac_dac084s085.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "dac_dac084s085.h"

#include "../../Marlin.h"
#include "../../MarlinCore.h"
#include "../../module/stepper.h"
#include "../../HAL/shared/Delay.h"

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/feature/pause.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

#if ENABLED(ADVANCED_PAUSE_FEATURE)

#include "../Marlin.h"
#include "../MarlinCore.h"
#include "../gcode/gcode.h"
#include "../module/motion.h"
#include "../module/planner.h"
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/feature/power.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include "power.h"
#include "../module/temperature.h"
#include "../module/stepper/indirection.h"
#include "../Marlin.h"
#include "../MarlinCore.h"

Power powerManager;

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/feature/prusa_MMU2/mmu2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ MMU2 mmu2;
#include "../../module/temperature.h"
#include "../../module/planner.h"
#include "../../module/stepper/indirection.h"
#include "../../Marlin.h"
#include "../../MarlinCore.h"

#if ENABLED(HOST_PROMPT_SUPPORT)
#include "../../feature/host_actions.h"
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/feature/runout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ void FilamentSensorBase::filament_present(const uint8_t extruder) {
//
// Filament Runout event handler
//
#include "../Marlin.h"
#include "../MarlinCore.h"
#include "../gcode/queue.h"

#if ENABLED(HOST_ACTION_COMMANDS)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/feature/tmc_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#if HAS_TRINAMIC

#include "tmc_util.h"
#include "../Marlin.h"
#include "../MarlinCore.h"

#include "../module/stepper/indirection.h"
#include "../module/printcounter.h"
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/bedlevel/G26.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "../../gcode/gcode.h"
#include "../../feature/bedlevel/bedlevel.h"

#include "../../Marlin.h"
#include "../../MarlinCore.h"
#include "../../module/planner.h"
#include "../../module/stepper.h"
#include "../../module/motion.h"
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/bedlevel/G42.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#if HAS_MESH

#include "../gcode.h"
#include "../../Marlin.h" // for IsRunning()
#include "../../MarlinCore.h" // for IsRunning()
#include "../../module/motion.h"
#include "../../module/probe.h" // for probe_offset
#include "../../feature/bedlevel/bedlevel.h"
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/calibrate/G425.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
*/

#include "../../Marlin.h"
#include "../../MarlinCore.h"

#if ENABLED(CALIBRATION_GCODE)

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/calibrate/M100.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "../queue.h"
#include "../../libs/hex_print_routines.h"

#include "../../Marlin.h" // for idle()
#include "../../MarlinCore.h" // for idle()

/**
* M100 Free Memory Watcher
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/config/M200-M205.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

#include "../gcode.h"
#include "../../Marlin.h"
#include "../../MarlinCore.h"
#include "../../module/planner.h"

#if DISABLED(NO_VOLUMETRICS)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/config/M217.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "../gcode.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[];

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/config/M43.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#if ENABLED(PINS_DEBUGGING)

#include "../gcode.h"
#include "../../Marlin.h" // for pin_is_protected
#include "../../MarlinCore.h" // for pin_is_protected
#include "../../pins/pinsDebug.h"
#include "../../module/endstops.h"

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/control/M108_M112_M410.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#if DISABLED(EMERGENCY_PARSER)

#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.
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/control/M17_M18_M84.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

#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 "../../module/stepper.h"

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/control/M226.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

#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"

/**
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/control/M42.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

#include "../gcode.h"
#include "../../Marlin.h" // for pin_is_protected
#include "../../MarlinCore.h" // for pin_is_protected
#include "../../inc/MarlinConfig.h"

#if FAN_COUNT > 0
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/control/M80_M81.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#endif

#if HAS_SUICIDE
#include "../../Marlin.h"
#include "../../MarlinCore.h"
#endif

#if ENABLED(PSU_CONTROL)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/control/M85.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

#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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/control/M999.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "../gcode.h"

#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

/**
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/feature/camera/M240.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#endif

#if defined(PHOTO_POSITION) && PHOTO_DELAY_MS > 0
#include "../../../Marlin.h" // for idle()
#include "../../../MarlinCore.h" // for idle()
#endif

#ifdef PHOTO_RETRACT_MM
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/feature/filwidth/M404-M407.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "../../../feature/filwidth.h"
#include "../../../module/planner.h"
#include "../../../module/temperature.h"
#include "../../../Marlin.h"
#include "../../../MarlinCore.h"
#include "../../gcode.h"

/**
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/feature/i2c/M260_M261.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include "../../gcode.h"

#include "../../../Marlin.h" // for i2c
#include "../../../MarlinCore.h" // for i2c

/**
* M260: Send data to a I2C slave device
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/feature/pause/M701_M702.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)

#include "../../gcode.h"
#include "../../../Marlin.h"
#include "../../../MarlinCore.h"
#include "../../../module/motion.h"
#include "../../../module/temperature.h"
#include "../../../feature/pause.h"
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/gcode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ GcodeSuite gcode;
#include "../feature/cancel_object.h"
#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;

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/host/M16.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#if ENABLED(EXPECTED_PRINTER_CHECK)

#include "../gcode.h"
#include "../../Marlin.h"
#include "../../MarlinCore.h"

/**
* M16: Expected Printer Check
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/host/M876.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#include "../../feature/host_actions.h"
#include "../gcode.h"
#include "../../Marlin.h"
#include "../../MarlinCore.h"

/**
* M876: Handle Prompt Response
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/motion/G0_G1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "../gcode.h"
#include "../../module/motion.h"

#include "../../Marlin.h"
#include "../../MarlinCore.h"

#if BOTH(FWRETRACT, FWRETRACT_AUTORETRACT)
#include "../../feature/fwretract.h"
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/motion/G5.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
*/

#include "../gcode.h"
#include "../../Marlin.h" // for IsRunning()
#include "../../MarlinCore.h" // for IsRunning()

/**
* G5: Cubic B-spline
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include "parser.h"

#include "../Marlin.h"
#include "../MarlinCore.h"

#if NUM_SERIAL > 1
#include "queue.h"
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/queue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ GCodeQueue queue;
#include "../sd/cardreader.h"
#include "../module/planner.h"
#include "../module/temperature.h"
#include "../Marlin.h"
#include "../MarlinCore.h"

#if ENABLED(PRINTER_EVENT_LEDS)
#include "../feature/leds/printer_event_leds.h"
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/scara/M360-M364.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "../gcode.h"
#include "../../module/scara.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) {
if (IsRunning()) {
Expand Down
Loading