Merge pull request #8452 from tcm0116/1.1.x-pio_deps

[1.1.x] Fix PlatformIO dependencies

.gitignore

@@ -118,6 +118,8 @@ tags
 
 # PlatformIO files/dirs
 .pio*
+.pioenvs
+.piolibdeps
 lib/readme.txt
 
 #Visual Studio
@@ -132,6 +134,7 @@ vc-fileutils.settings
 
 #VScode
 .vscode
+.vscode/c_cpp_properties.json
 
 #cmake
 CMakeLists.txt

Marlin/MarlinSPI.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef __SPI_H__
+#ifndef __MARLIN_SPI_H__
-#define __SPI_H__
+#define __MARLIN_SPI_H__
 
 #include <stdint.h>
 #include "softspi.h"
@@ -54,4 +54,4 @@ class SPI<MISO_PIN, MOSI_PIN, SCK_PIN> {
 
 };
 
-#endif // __SPI_H__
+#endif // __MARLIN_SPI_H__

Marlin/Marlin_main.cpp

@@ -10325,25 +10325,30 @@ inline void gcode_M502() {
     SERIAL_ECHOLNPGM(" prewarn flag cleared");
   }
 
-  static void tmc2130_get_pwmthrs(TMC2130Stepper &st, const char name, const uint16_t spmm) {
+  #if ENABLED(HYBRID_THRESHOLD)
-    SERIAL_CHAR(name);
+    static void tmc2130_get_pwmthrs(TMC2130Stepper &st, const char name, const uint16_t spmm) {
-    SERIAL_ECHOPGM(" stealthChop max speed set to ");
+      SERIAL_CHAR(name);
-    SERIAL_ECHOLN(12650000UL * st.microsteps() / (256 * st.stealth_max_speed() * spmm));
+      SERIAL_ECHOPGM(" stealthChop max speed set to ");
-  }
+      SERIAL_ECHOLN(12650000UL * st.microsteps() / (256 * st.stealth_max_speed() * spmm));
-  static void tmc2130_set_pwmthrs(TMC2130Stepper &st, const char name, const int32_t thrs, const uint32_t spmm) {
+    }
-    st.stealth_max_speed(12650000UL * st.microsteps() / (256 * thrs * spmm));
-    tmc2130_get_pwmthrs(st, name, spmm);
-  }
 
-  static void tmc2130_get_sgt(TMC2130Stepper &st, const char name) {
+    static void tmc2130_set_pwmthrs(TMC2130Stepper &st, const char name, const int32_t thrs, const uint32_t spmm) {
-    SERIAL_CHAR(name);
+      st.stealth_max_speed(12650000UL * st.microsteps() / (256 * thrs * spmm));
-    SERIAL_ECHOPGM(" driver homing sensitivity set to ");
+      tmc2130_get_pwmthrs(st, name, spmm);
-    SERIAL_ECHOLN(st.sgt());
+    }
-  }
+  #endif
-  static void tmc2130_set_sgt(TMC2130Stepper &st, const char name, const int8_t sgt_val) {
+
-    st.sgt(sgt_val);
+  #if ENABLED(SENSORLESS_HOMING)
-    tmc2130_get_sgt(st, name);
+    static void tmc2130_get_sgt(TMC2130Stepper &st, const char name) {
-  }
+      SERIAL_CHAR(name);
+      SERIAL_ECHOPGM(" driver homing sensitivity set to ");
+      SERIAL_ECHOLN(st.sgt());
+    }
+    static void tmc2130_set_sgt(TMC2130Stepper &st, const char name, const int8_t sgt_val) {
+      st.sgt(sgt_val);
+      tmc2130_get_sgt(st, name);
+    }
+  #endif
 
   /**
    * M906: Set motor current in milliamps using axis codes X, Y, Z, E

Marlin/temperature.cpp

@@ -32,7 +32,7 @@
 #include "language.h"
 
 #if ENABLED(HEATER_0_USES_MAX6675)
-  #include "spi.h"
+  #include "MarlinSPI.h"
 #endif
 
 #if ENABLED(BABYSTEPPING)

platformio.ini

@@ -19,7 +19,12 @@ libdeps_dir = .piolibdeps
 env_default = megaatmega2560
 
 [common]
-lib_deps = U8glib@1.19.1
+lib_deps =
+  U8glib@1.19.1
+  TMC2130Stepper
+  Adafruit NeoPixel
+  https://github.com/lincomatic/LiquidTWI2.git
+  https://github.com/trinamic/TMC26XStepper.git
 
 [env:megaatmega2560]
 platform = atmelavr