Browse Source

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

Dirk O. Kaar 5 years ago
parent
commit
d0e1166cce

+ 1 - 1
Marlin/src/HAL/HAL_AVR/MarlinSerial.cpp

@@ -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 };

+ 1 - 1
Marlin/src/HAL/HAL_AVR/watchdog.cpp

@@ -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() {

+ 1 - 1
Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp

@@ -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 };

+ 1 - 1
Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp

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

+ 1 - 1
Marlin/src/HAL/HAL_DUE/watchdog.cpp

@@ -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

+ 1 - 1
Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.cpp

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

+ 1 - 1
Marlin/src/Marlin.cpp → Marlin/src/MarlinCore.cpp

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

+ 0 - 0
Marlin/src/Marlin.h → Marlin/src/MarlinCore.h


+ 1 - 1
Marlin/src/core/utility.cpp

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

+ 1 - 1
Marlin/src/feature/Max7219_Debug_LEDs.cpp

@@ -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)

Some files were not shown because too many files changed in this diff