Skip to content

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

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

Closed
teemuatlut wants to merge 4 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a18467e
Support for manually deployed fixed probes (#11899)
brandstaetter Sep 23, 2018
286f3ab
Use new TMC library
teemuatlut Sep 10, 2018
e92cf0f
Implement inherited TMCMarlin class
teemuatlut Jul 5, 2018
17e3d27
Update config files
teemuatlut Sep 10, 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/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
#define MANUAL_DEPLOY_STOW
#endif

/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
Expand Down
4 changes: 2 additions & 2 deletions Marlin/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@
#if ENABLED(SENSORLESS_HOMING)
#define X_HOMING_SENSITIVITY 8
#define Y_HOMING_SENSITIVITY 8
#define Z_HOMING_SENSITIVITY 8
//#define Z_HOMING_SENSITIVITY 8
#endif

/**
Expand Down Expand Up @@ -1307,7 +1307,7 @@
*/
#define TMC_ADV() { }

#endif // TMC2130 || TMC2208
#endif // HAS_TRINAMIC

// @section L6470

Expand Down
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 @@ -724,6 +724,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
3 changes: 3 additions & 0 deletions Marlin/src/config/default/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
#define MANUAL_DEPLOY_STOW
#endif

/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/config/default/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@
#if ENABLED(SENSORLESS_HOMING)
#define X_HOMING_SENSITIVITY 8
#define Y_HOMING_SENSITIVITY 8
#define Z_HOMING_SENSITIVITY 8
//#define Z_HOMING_SENSITIVITY 8
#endif

/**
Expand Down Expand Up @@ -1307,7 +1307,7 @@
*/
#define TMC_ADV() { }

#endif // TMC2130 || TMC2208
#endif // HAS_TRINAMIC

// @section L6470

Expand Down
3 changes: 3 additions & 0 deletions Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,6 +773,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
#define MANUAL_DEPLOY_STOW
#endif

/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@
#if ENABLED(SENSORLESS_HOMING)
#define X_HOMING_SENSITIVITY 8
#define Y_HOMING_SENSITIVITY 8
#define Z_HOMING_SENSITIVITY 8
//#define Z_HOMING_SENSITIVITY 8
#endif

/**
Expand Down Expand Up @@ -1307,7 +1307,7 @@
*/
#define TMC_ADV() { }

#endif // TMC2130 || TMC2208
#endif // HAS_TRINAMIC

// @section L6470

Expand Down
3 changes: 3 additions & 0 deletions Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
#define MANUAL_DEPLOY_STOW
#endif

/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
Expand Down
3 changes: 3 additions & 0 deletions Marlin/src/config/examples/Anet/A2/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,6 +736,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
#define MANUAL_DEPLOY_STOW
#endif

/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/config/examples/Anet/A2/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,7 +1250,7 @@
#if ENABLED(SENSORLESS_HOMING)
#define X_HOMING_SENSITIVITY 8
#define Y_HOMING_SENSITIVITY 8
#define Z_HOMING_SENSITIVITY 8
//#define Z_HOMING_SENSITIVITY 8
#endif

/**
Expand Down Expand Up @@ -1289,7 +1289,7 @@
*/
#define TMC_ADV() { }

#endif // TMC2130 || TMC2208
#endif // HAS_TRINAMIC

// @section L6470

Expand Down
3 changes: 3 additions & 0 deletions Marlin/src/config/examples/Anet/A2plus/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,6 +736,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
#define MANUAL_DEPLOY_STOW
#endif

/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,7 +1250,7 @@
#if ENABLED(SENSORLESS_HOMING)
#define X_HOMING_SENSITIVITY 8
#define Y_HOMING_SENSITIVITY 8
#define Z_HOMING_SENSITIVITY 8
//#define Z_HOMING_SENSITIVITY 8
#endif

/**
Expand Down Expand Up @@ -1289,7 +1289,7 @@
*/
#define TMC_ADV() { }

#endif // TMC2130 || TMC2208
#endif // HAS_TRINAMIC

// @section L6470

Expand Down
3 changes: 3 additions & 0 deletions Marlin/src/config/examples/Anet/A6/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
#define MANUAL_DEPLOY_STOW
#endif

/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/config/examples/Anet/A6/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@
#if ENABLED(SENSORLESS_HOMING)
#define X_HOMING_SENSITIVITY 8
#define Y_HOMING_SENSITIVITY 8
#define Z_HOMING_SENSITIVITY 8
//#define Z_HOMING_SENSITIVITY 8
#endif

/**
Expand Down Expand Up @@ -1307,7 +1307,7 @@
*/
#define TMC_ADV() { }

#endif // TMC2130 || TMC2208
#endif // HAS_TRINAMIC

// @section L6470

Expand Down
3 changes: 3 additions & 0 deletions Marlin/src/config/examples/Anet/A8/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
#define MANUAL_DEPLOY_STOW
#endif

/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/config/examples/Anet/A8/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@
#if ENABLED(SENSORLESS_HOMING)
#define X_HOMING_SENSITIVITY 8
#define Y_HOMING_SENSITIVITY 8
#define Z_HOMING_SENSITIVITY 8
//#define Z_HOMING_SENSITIVITY 8
#endif

/**
Expand Down Expand Up @@ -1307,7 +1307,7 @@
*/
#define TMC_ADV() { }

#endif // TMC2130 || TMC2208
#endif // HAS_TRINAMIC

// @section L6470

Expand Down
3 changes: 3 additions & 0 deletions Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,6 +753,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
#define MANUAL_DEPLOY_STOW
#endif

/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@
#if ENABLED(SENSORLESS_HOMING)
#define X_HOMING_SENSITIVITY 8
#define Y_HOMING_SENSITIVITY 8
#define Z_HOMING_SENSITIVITY 8
//#define Z_HOMING_SENSITIVITY 8
#endif

/**
Expand Down Expand Up @@ -1307,7 +1307,7 @@
*/
#define TMC_ADV() { }

#endif // TMC2130 || TMC2208
#endif // HAS_TRINAMIC

// @section L6470

Expand Down
3 changes: 3 additions & 0 deletions Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
#define MANUAL_DEPLOY_STOW
#endif

/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@
#if ENABLED(SENSORLESS_HOMING)
#define X_HOMING_SENSITIVITY 8
#define Y_HOMING_SENSITIVITY 8
#define Z_HOMING_SENSITIVITY 8
//#define Z_HOMING_SENSITIVITY 8
#endif

/**
Expand Down Expand Up @@ -1307,7 +1307,7 @@
*/
#define TMC_ADV() { }

#endif // TMC2130 || TMC2208
#endif // HAS_TRINAMIC

// @section L6470

Expand Down
3 changes: 3 additions & 0 deletions Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
#define MANUAL_DEPLOY_STOW
#endif

/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@
#if ENABLED(SENSORLESS_HOMING)
#define X_HOMING_SENSITIVITY 8
#define Y_HOMING_SENSITIVITY 8
#define Z_HOMING_SENSITIVITY 8
//#define Z_HOMING_SENSITIVITY 8
#endif

/**
Expand Down Expand Up @@ -1307,7 +1307,7 @@
*/
#define TMC_ADV() { }

#endif // TMC2130 || TMC2208
#endif // HAS_TRINAMIC

// @section L6470

Expand Down
3 changes: 3 additions & 0 deletions Marlin/src/config/examples/BQ/Hephestos/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
#define MANUAL_DEPLOY_STOW
#endif

/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@
#if ENABLED(SENSORLESS_HOMING)
#define X_HOMING_SENSITIVITY 8
#define Y_HOMING_SENSITIVITY 8
#define Z_HOMING_SENSITIVITY 8
//#define Z_HOMING_SENSITIVITY 8
#endif

/**
Expand Down Expand Up @@ -1307,7 +1307,7 @@
*/
#define TMC_ADV() { }

#endif // TMC2130 || TMC2208
#endif // HAS_TRINAMIC

// @section L6470

Expand Down
3 changes: 3 additions & 0 deletions Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
#define MANUAL_DEPLOY_STOW
#endif

/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,7 +1276,7 @@
#if ENABLED(SENSORLESS_HOMING)
#define X_HOMING_SENSITIVITY 8
#define Y_HOMING_SENSITIVITY 8
#define Z_HOMING_SENSITIVITY 8
//#define Z_HOMING_SENSITIVITY 8
#endif

/**
Expand Down Expand Up @@ -1315,7 +1315,7 @@
*/
#define TMC_ADV() { }

#endif // TMC2130 || TMC2208
#endif // HAS_TRINAMIC

// @section L6470

Expand Down
3 changes: 3 additions & 0 deletions Marlin/src/config/examples/BQ/WITBOX/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
#define MANUAL_DEPLOY_STOW
#endif

/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@
#if ENABLED(SENSORLESS_HOMING)
#define X_HOMING_SENSITIVITY 8
#define Y_HOMING_SENSITIVITY 8
#define Z_HOMING_SENSITIVITY 8
//#define Z_HOMING_SENSITIVITY 8
#endif

/**
Expand Down Expand Up @@ -1307,7 +1307,7 @@
*/
#define TMC_ADV() { }

#endif // TMC2130 || TMC2208
#endif // HAS_TRINAMIC

// @section L6470

Expand Down
3 changes: 3 additions & 0 deletions Marlin/src/config/examples/Cartesio/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,6 +752,9 @@
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
//#define FIX_MOUNTED_PROBE
#if ENABLED(FIX_MOUNTED_PROBE)
#define MANUAL_DEPLOY_STOW
#endif

/**
* Z Servo Probe, such as an endstop switch on a rotating arm.
Expand Down
Loading