3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-27 13:56:24 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
[1.1.x] Fix PlatformIO dependencies
This commit is contained in:
Scott Lahteine 2017-11-16 22:54:15 -06:00 committed by GitHub
commit aa612124f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

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

6
Marlin/spi.h → Marlin/MarlinSPI.h
View File

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

5
Marlin/Marlin_main.cpp
View File

@ -10325,16 +10325,20 @@ inline void gcode_M502() {
SERIAL_ECHOLNPGM(" prewarn flag cleared"); SERIAL_ECHOLNPGM(" prewarn flag cleared");
} }
#if ENABLED(HYBRID_THRESHOLD)
static void tmc2130_get_pwmthrs(TMC2130Stepper &st, const char name, const uint16_t spmm) { static void tmc2130_get_pwmthrs(TMC2130Stepper &st, const char name, const uint16_t spmm) {
SERIAL_CHAR(name); SERIAL_CHAR(name);
SERIAL_ECHOPGM(" stealthChop max speed set to "); SERIAL_ECHOPGM(" stealthChop max speed set to ");
SERIAL_ECHOLN(12650000UL * st.microsteps() / (256 * st.stealth_max_speed() * spmm)); 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) { 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)); st.stealth_max_speed(12650000UL * st.microsteps() / (256 * thrs * spmm));
tmc2130_get_pwmthrs(st, name, spmm); tmc2130_get_pwmthrs(st, name, spmm);
} }
#endif
#if ENABLED(SENSORLESS_HOMING)
static void tmc2130_get_sgt(TMC2130Stepper &st, const char name) { static void tmc2130_get_sgt(TMC2130Stepper &st, const char name) {
SERIAL_CHAR(name); SERIAL_CHAR(name);
SERIAL_ECHOPGM(" driver homing sensitivity set to "); SERIAL_ECHOPGM(" driver homing sensitivity set to ");
@ -10344,6 +10348,7 @@ inline void gcode_M502() {
st.sgt(sgt_val); st.sgt(sgt_val);
tmc2130_get_sgt(st, name); tmc2130_get_sgt(st, name);
} }
#endif
/** /**
* M906: Set motor current in milliamps using axis codes X, Y, Z, E * M906: Set motor current in milliamps using axis codes X, Y, Z, E

2
Marlin/temperature.cpp
View File

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

7
platformio.ini
View File

@ -19,7 +19,12 @@ libdeps_dir = .piolibdeps
env_default = megaatmega2560 env_default = megaatmega2560
[common] [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] [env:megaatmega2560]
platform = atmelavr platform = atmelavr