Skip to content

[2.0.x] Migrate Marlin to a new TMC library #11943

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

Merged
thinkyhead merged 5 commits into from
Oct 3, 2018
Merged

[2.0.x] Migrate Marlin to a new TMC library #11943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
796d766
Use new TMC library
teemuatlut Sep 10, 2018
f6dc394
Implement inherited TMCMarlin class
teemuatlut Jul 5, 2018
c2565e2
M911 and M912 need MONITOR_DRIVER_STATUS to work
teemuatlut Oct 1, 2018
b295980
Use structs for TMC EEPROM
teemuatlut Oct 1, 2018
0d96d4f
Tweaks to EEPROM code
teemuatlut Oct 2, 2018
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
3 changes: 3 additions & 0 deletions Marlin/src/Marlin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,6 +736,9 @@ void setup() {
SERIAL_ECHO_START();

#if HAS_DRIVER(TMC2130)
#if DISABLED(TMC_USE_SW_SPI)
SPI.begin();
#endif
tmc_init_cs_pins();
#endif
#if HAS_DRIVER(TMC2208)
Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/core/drivers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
#define TB6560 0x006
#define TB6600 0x007
#define TMC2100 0x008
#define TMC2130 0x109
#define TMC2130 2130
#define TMC2130_STANDALONE 0x009
#define TMC2208 0x10A
#define TMC2208 2208
#define TMC2208_STANDALONE 0x00A
#define TMC26X 0x10B
#define TMC26X_STANDALONE 0x00B
Expand All @@ -45,7 +45,7 @@
#define AXIS_DRIVER_TYPE_X(T) _AXIS_DRIVER_TYPE(X,T)
#define AXIS_DRIVER_TYPE_Y(T) _AXIS_DRIVER_TYPE(Y,T)
#define AXIS_DRIVER_TYPE_Z(T) _AXIS_DRIVER_TYPE(Z,T)
#define AXIS_DRIVER_TYPE_X2(T) (ENABLED(X_DUAL_STEPPER_DRIVERS) || ENABLED(DUAL_X_CARRIAGE)) && _AXIS_DRIVER_TYPE(X2,T)
#define AXIS_DRIVER_TYPE_X2(T) ((ENABLED(X_DUAL_STEPPER_DRIVERS) || ENABLED(DUAL_X_CARRIAGE)) && _AXIS_DRIVER_TYPE(X2,T))
#define AXIS_DRIVER_TYPE_Y2(T) (ENABLED(Y_DUAL_STEPPER_DRIVERS) && _AXIS_DRIVER_TYPE(Y2,T))
#define AXIS_DRIVER_TYPE_Z2(T) (Z_MULTI_STEPPER_DRIVERS && _AXIS_DRIVER_TYPE(Z2,T))
#define AXIS_DRIVER_TYPE_Z3(T) (ENABLED(Z_TRIPLE_STEPPER_DRIVERS) && _AXIS_DRIVER_TYPE(Z3,T))
Expand Down
5 changes: 5 additions & 0 deletions Marlin/src/core/language.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,10 @@
#define MSG_B "Y"
#define MSG_C "Z"
#endif
#define MSG_X2 "X2"
#define MSG_Y2 "Y2"
#define MSG_Z2 "Z2"
#define MSG_Z3 "Z3"
#define MSG_H1 "1"
#define MSG_H2 "2"
#define MSG_H3 "3"
Expand All @@ -296,6 +300,7 @@
#define MSG_N4 " 4"
#define MSG_N5 " 5"
#define MSG_N6 " 6"
#define MSG_E0 "E0"
#define MSG_E1 "E1"
#define MSG_E2 "E2"
#define MSG_E3 "E3"
Expand Down
Loading