bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Improve TMC config organization, naming

Browse Source
This commit is contained in:
Scott Lahteine
2018-03-13 02:06:40 -05:00
parent 34f656decd
commit e7570f3195
49 changed files with 1578 additions and 1629 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/module/stepper.cpp
View File

@ -922,8 +922,8 @@ void Stepper::init() {
#endif
// Init TMC Steppers
#if ENABLED(HAVE_TMCDRIVER)
tmc_init();
#if ENABLED(HAVE_TMC26X)
tmc26x_init();
#endif
// Init TMC2130 Steppers

51
Marlin/src/module/stepper_indirection.cpp
View File

@ -38,8 +38,7 @@
//
// TMC26X Driver objects and inits
//
#if ENABLED(HAVE_TMCDRIVER)
#if ENABLED(HAVE_TMC26X)
#include <SPI.h>
#ifdef STM32F7
@ -50,37 +49,37 @@
#define _TMC_DEFINE(ST) TMC26XStepper stepper##ST(200, ST##_ENABLE_PIN, ST##_STEP_PIN, ST##_DIR_PIN, ST##_MAX_CURRENT, ST##_SENSE_RESISTOR)
#if ENABLED(X_IS_TMC)
#if ENABLED(X_IS_TMC26X)
_TMC_DEFINE(X);
#endif
#if ENABLED(X2_IS_TMC)
#if ENABLED(X2_IS_TMC26X)
_TMC_DEFINE(X2);
#endif
#if ENABLED(Y_IS_TMC)
#if ENABLED(Y_IS_TMC26X)
_TMC_DEFINE(Y);
#endif
#if ENABLED(Y2_IS_TMC)
#if ENABLED(Y2_IS_TMC26X)
_TMC_DEFINE(Y2);
#endif
#if ENABLED(Z_IS_TMC)
#if ENABLED(Z_IS_TMC26X)
_TMC_DEFINE(Z);
#endif
#if ENABLED(Z2_IS_TMC)
#if ENABLED(Z2_IS_TMC26X)
_TMC_DEFINE(Z2);
#endif
#if ENABLED(E0_IS_TMC)
#if ENABLED(E0_IS_TMC26X)
_TMC_DEFINE(E0);
#endif
#if ENABLED(E1_IS_TMC)
#if ENABLED(E1_IS_TMC26X)
_TMC_DEFINE(E1);
#endif
#if ENABLED(E2_IS_TMC)
#if ENABLED(E2_IS_TMC26X)
_TMC_DEFINE(E2);
#endif
#if ENABLED(E3_IS_TMC)
#if ENABLED(E3_IS_TMC26X)
_TMC_DEFINE(E3);
#endif
#if ENABLED(E4_IS_TMC)
#if ENABLED(E4_IS_TMC26X)
_TMC_DEFINE(E4);
#endif
@ -89,43 +88,43 @@
stepper##A.start(); \
}while(0)
void tmc_init() {
#if ENABLED(X_IS_TMC)
void tmc26x_init() {
#if ENABLED(X_IS_TMC26X)
_TMC_INIT(X);
#endif
#if ENABLED(X2_IS_TMC)
#if ENABLED(X2_IS_TMC26X)
_TMC_INIT(X2);
#endif
#if ENABLED(Y_IS_TMC)
#if ENABLED(Y_IS_TMC26X)
_TMC_INIT(Y);
#endif
#if ENABLED(Y2_IS_TMC)
#if ENABLED(Y2_IS_TMC26X)
_TMC_INIT(Y2);
#endif
#if ENABLED(Z_IS_TMC)
#if ENABLED(Z_IS_TMC26X)
_TMC_INIT(Z);
#endif
#if ENABLED(Z2_IS_TMC)
#if ENABLED(Z2_IS_TMC26X)
_TMC_INIT(Z2);
#endif
#if ENABLED(E0_IS_TMC)
#if ENABLED(E0_IS_TMC26X)
_TMC_INIT(E0);
#endif
#if ENABLED(E1_IS_TMC)
#if ENABLED(E1_IS_TMC26X)
_TMC_INIT(E1);
#endif
#if ENABLED(E2_IS_TMC)
#if ENABLED(E2_IS_TMC26X)
_TMC_INIT(E2);
#endif
#if ENABLED(E3_IS_TMC)
#if ENABLED(E3_IS_TMC26X)
_TMC_INIT(E3);
#endif
#if ENABLED(E4_IS_TMC)
#if ENABLED(E4_IS_TMC26X)
_TMC_INIT(E4);
#endif
}
#endif // HAVE_TMCDRIVER
#endif // HAVE_TMC26X
//
// TMC2130 Driver objects and inits

26
Marlin/src/module/stepper_indirection.h
View File

@ -47,14 +47,14 @@
#include "../inc/MarlinConfig.h"
// TMC26X drivers have STEP/DIR on normal pins, but ENABLE via SPI
#if ENABLED(HAVE_TMCDRIVER)
#if ENABLED(HAVE_TMC26X)
#include <SPI.h>
#ifdef STM32F7
#include "../HAL/HAL_STM32F7/TMC2660.h"
#else
#include <TMC26XStepper.h>
#endif
void tmc_init();
void tmc26x_init();
#endif
#if ENABLED(HAVE_TMC2130)
@ -85,7 +85,7 @@
#define X_DIR_WRITE(STATE) stepperX.Step_Clock(STATE)
#define X_DIR_READ (stepperX.getStatus() & STATUS_DIR)
#else
#if ENABLED(HAVE_TMCDRIVER) && ENABLED(X_IS_TMC)
#if ENABLED(X_IS_TMC26X)
extern TMC26XStepper stepperX;
#define X_ENABLE_INIT NOOP
#define X_ENABLE_WRITE(STATE) stepperX.setEnabled(STATE)
@ -118,7 +118,7 @@
#define Y_DIR_WRITE(STATE) stepperY.Step_Clock(STATE)
#define Y_DIR_READ (stepperY.getStatus() & STATUS_DIR)
#else
#if ENABLED(HAVE_TMCDRIVER) && ENABLED(Y_IS_TMC)
#if ENABLED(Y_IS_TMC26X)
extern TMC26XStepper stepperY;
#define Y_ENABLE_INIT NOOP
#define Y_ENABLE_WRITE(STATE) stepperY.setEnabled(STATE)
@ -151,7 +151,7 @@
#define Z_DIR_WRITE(STATE) stepperZ.Step_Clock(STATE)
#define Z_DIR_READ (stepperZ.getStatus() & STATUS_DIR)
#else
#if ENABLED(HAVE_TMCDRIVER) && ENABLED(Z_IS_TMC)
#if ENABLED(Z_IS_TMC26X)
extern TMC26XStepper stepperZ;
#define Z_ENABLE_INIT NOOP
#define Z_ENABLE_WRITE(STATE) stepperZ.setEnabled(STATE)
@ -185,7 +185,7 @@
#define X2_DIR_WRITE(STATE) stepperX2.Step_Clock(STATE)
#define X2_DIR_READ (stepperX2.getStatus() & STATUS_DIR)
#else
#if ENABLED(HAVE_TMCDRIVER) && ENABLED(X2_IS_TMC)
#if ENABLED(X2_IS_TMC26X)
extern TMC26XStepper stepperX2;
#define X2_ENABLE_INIT NOOP
#define X2_ENABLE_WRITE(STATE) stepperX2.setEnabled(STATE)
@ -220,7 +220,7 @@
#define Y2_DIR_WRITE(STATE) stepperY2.Step_Clock(STATE)
#define Y2_DIR_READ (stepperY2.getStatus() & STATUS_DIR)
#else
#if ENABLED(HAVE_TMCDRIVER) && ENABLED(Y2_IS_TMC)
#if ENABLED(Y2_IS_TMC26X)
extern TMC26XStepper stepperY2;
#define Y2_ENABLE_INIT NOOP
#define Y2_ENABLE_WRITE(STATE) stepperY2.setEnabled(STATE)
@ -255,7 +255,7 @@
#define Z2_DIR_WRITE(STATE) stepperZ2.Step_Clock(STATE)
#define Z2_DIR_READ (stepperZ2.getStatus() & STATUS_DIR)
#else
#if ENABLED(HAVE_TMCDRIVER) && ENABLED(Z2_IS_TMC)
#if ENABLED(Z2_IS_TMC26X)
extern TMC26XStepper stepperZ2;
#define Z2_ENABLE_INIT NOOP
#define Z2_ENABLE_WRITE(STATE) stepperZ2.setEnabled(STATE)
@ -289,7 +289,7 @@
#define E0_DIR_WRITE(STATE) stepperE0.Step_Clock(STATE)
#define E0_DIR_READ (stepperE0.getStatus() & STATUS_DIR)
#else
#if ENABLED(HAVE_TMCDRIVER) && ENABLED(E0_IS_TMC)
#if ENABLED(E0_IS_TMC26X)
extern TMC26XStepper stepperE0;
#define E0_ENABLE_INIT NOOP
#define E0_ENABLE_WRITE(STATE) stepperE0.setEnabled(STATE)
@ -322,7 +322,7 @@
#define E1_DIR_WRITE(STATE) stepperE1.Step_Clock(STATE)
#define E1_DIR_READ (stepperE1.getStatus() & STATUS_DIR)
#else
#if ENABLED(HAVE_TMCDRIVER) && ENABLED(E1_IS_TMC)
#if ENABLED(E1_IS_TMC26X)
extern TMC26XStepper stepperE1;
#define E1_ENABLE_INIT NOOP
#define E1_ENABLE_WRITE(STATE) stepperE1.setEnabled(STATE)
@ -355,7 +355,7 @@
#define E2_DIR_WRITE(STATE) stepperE2.Step_Clock(STATE)
#define E2_DIR_READ (stepperE2.getStatus() & STATUS_DIR)
#else
#if ENABLED(HAVE_TMCDRIVER) && ENABLED(E2_IS_TMC)
#if ENABLED(E2_IS_TMC26X)
extern TMC26XStepper stepperE2;
#define E2_ENABLE_INIT NOOP
#define E2_ENABLE_WRITE(STATE) stepperE2.setEnabled(STATE)
@ -388,7 +388,7 @@
#define E3_DIR_WRITE(STATE) stepperE3.Step_Clock(STATE)
#define E3_DIR_READ (stepperE3.getStatus() & STATUS_DIR)
#else
#if ENABLED(HAVE_TMCDRIVER) && ENABLED(E3_IS_TMC)
#if ENABLED(E3_IS_TMC26X)
extern TMC26XStepper stepperE3;
#define E3_ENABLE_INIT NOOP
#define E3_ENABLE_WRITE(STATE) stepperE3.setEnabled(STATE)
@ -421,7 +421,7 @@
#define E4_DIR_WRITE(STATE) stepperE4.Step_Clock(STATE)
#define E4_DIR_READ (stepperE4.getStatus() & STATUS_DIR)
#else
#if ENABLED(HAVE_TMCDRIVER) && ENABLED(E4_IS_TMC)
#if ENABLED(E4_IS_TMC26X)
extern TMC26XStepper stepperE4;
#define E4_ENABLE_INIT NOOP
#define E4_ENABLE_WRITE(STATE) stepperE4.setEnabled(STATE)