SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix automatic stepper assignment for X/Y/Z dual stepper drivers (#8130)

Browse source
This commit is contained in:
Thomas Moore 2017-10-28 19:45:07 -05:00 committed by Roxy-3D
parent 50b4f9cbf7
commit 325233b454
2 changed files with 48 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/module/temperature.h
View file

@ -29,8 +29,6 @@
#include "thermistor/thermistors.h" #include "thermistor/thermistors.h"
#include "../inc/MarlinConfig.h"
#if ENABLED(BABYSTEPPING) #if ENABLED(BABYSTEPPING)
extern bool axis_known_position[XYZ]; extern bool axis_known_position[XYZ];
#endif #endif

51
Marlin/src/pins/pins.h
View file

@ -329,18 +329,63 @@
#ifndef Z_MS2_PIN #ifndef Z_MS2_PIN
#define Z_MS2_PIN -1 #define Z_MS2_PIN -1
#endif #endif
#ifndef E0_STEP_PIN
#define E0_STEP_PIN -1
#endif
#ifndef E0_DIR_PIN
#define E0_DIR_PIN -1
#endif
#ifndef E0_ENABLE_PIN
#define E0_ENABLE_PIN -1
#endif
#ifndef E0_MS1_PIN #ifndef E0_MS1_PIN
#define E0_MS1_PIN -1 #define E0_MS1_PIN -1
#endif #endif
#ifndef E0_MS2_PIN #ifndef E0_MS2_PIN
#define E0_MS2_PIN -1 #define E0_MS2_PIN -1
#endif #endif
#ifndef E1_STEP_PIN
#define E1_STEP_PIN -1
#endif
#ifndef E1_DIR_PIN
#define E1_DIR_PIN -1
#endif
#ifndef E1_ENABLE_PIN
#define E1_ENABLE_PIN -1
#endif
#ifndef E1_MS1_PIN #ifndef E1_MS1_PIN
#define E1_MS1_PIN -1 #define E1_MS1_PIN -1
#endif #endif
#ifndef E1_MS2_PIN #ifndef E1_MS2_PIN
#define E1_MS2_PIN -1 #define E1_MS2_PIN -1
#endif #endif
#ifndef E2_STEP_PIN
#define E2_STEP_PIN -1
#endif
#ifndef E2_DIR_PIN
#define E2_DIR_PIN -1
#endif
#ifndef E2_ENABLE_PIN
#define E2_ENABLE_PIN -1
#endif
#ifndef E3_STEP_PIN
#define E3_STEP_PIN -1
#endif
#ifndef E3_DIR_PIN
#define E3_DIR_PIN -1
#endif
#ifndef E3_ENABLE_PIN
#define E3_ENABLE_PIN -1
#endif
#ifndef E4_STEP_PIN
#define E4_STEP_PIN -1
#endif
#ifndef E4_DIR_PIN
#define E4_DIR_PIN -1
#endif
#ifndef E4_ENABLE_PIN
#define E4_ENABLE_PIN -1
#endif
#ifndef FAN_PIN #ifndef FAN_PIN
#define FAN_PIN -1 #define FAN_PIN -1
@ -623,7 +668,7 @@
#define X2_STEP_PIN _EPIN(E_STEPPERS, STEP) #define X2_STEP_PIN _EPIN(E_STEPPERS, STEP)
#define X2_DIR_PIN _EPIN(E_STEPPERS, DIR) #define X2_DIR_PIN _EPIN(E_STEPPERS, DIR)
#define X2_ENABLE_PIN _EPIN(E_STEPPERS, ENABLE) #define X2_ENABLE_PIN _EPIN(E_STEPPERS, ENABLE)
#if X2_ENABLE_PIN == 0 #if E_STEPPERS > 4 || !PIN_EXISTS(X2_ENABLE)
#error "No E stepper plug left for X2!" #error "No E stepper plug left for X2!"
#endif #endif
#endif #endif
@ -640,7 +685,7 @@
#define Y2_STEP_PIN _EPIN(Y2_E_INDEX, STEP) #define Y2_STEP_PIN _EPIN(Y2_E_INDEX, STEP)
#define Y2_DIR_PIN _EPIN(Y2_E_INDEX, DIR) #define Y2_DIR_PIN _EPIN(Y2_E_INDEX, DIR)
#define Y2_ENABLE_PIN _EPIN(Y2_E_INDEX, ENABLE) #define Y2_ENABLE_PIN _EPIN(Y2_E_INDEX, ENABLE)
#if Y2_ENABLE_PIN == 0 #if Y2_E_INDEX > 4 || !PIN_EXISTS(Y2_ENABLE)
#error "No E stepper plug left for Y2!" #error "No E stepper plug left for Y2!"
#endif #endif
#endif #endif
@ -657,7 +702,7 @@
#define Z2_STEP_PIN _EPIN(Z2_E_INDEX, STEP) #define Z2_STEP_PIN _EPIN(Z2_E_INDEX, STEP)
#define Z2_DIR_PIN _EPIN(Z2_E_INDEX, DIR) #define Z2_DIR_PIN _EPIN(Z2_E_INDEX, DIR)
#define Z2_ENABLE_PIN _EPIN(Z2_E_INDEX, ENABLE) #define Z2_ENABLE_PIN _EPIN(Z2_E_INDEX, ENABLE)
#if Z2_ENABLE_PIN == 0 #if Z2_E_INDEX > 4 || !PIN_EXISTS(Z2_ENABLE)
#error "No E stepper plug left for Z2!" #error "No E stepper plug left for Z2!"
#endif #endif
#endif #endif