Browse Source

Patch up digital microstepping and SPI CS pins

pull/1/head
Scott Lahteine 7 years ago
parent
commit
582d073de1
  1. 25
      Marlin/src/inc/SanityCheck.h
  2. 68
      Marlin/src/pins/pins.h
  3. 12
      Marlin/src/pins/pinsDebug_list.h

25
Marlin/src/inc/SanityCheck.h

@ -1467,6 +1467,31 @@ static_assert(1 >= 0
#elif defined(AUTOMATIC_CURRENT_CONTROL) #elif defined(AUTOMATIC_CURRENT_CONTROL)
#error "AUTOMATIC_CURRENT_CONTROL is now MONITOR_DRIVER_STATUS. Please update your configuration." #error "AUTOMATIC_CURRENT_CONTROL is now MONITOR_DRIVER_STATUS. Please update your configuration."
#endif #endif
#if ENABLED(X_IS_TMC2130) && !PIN_EXISTS(X_CS)
#error "X_CS_PIN is required for X_IS_TMC2130. Define X_CS_PIN in Configuration_adv.h."
#elif ENABLED(X2_IS_TMC2130) && !PIN_EXISTS(X2_CS)
#error "X2_CS_PIN is required for X2_IS_TMC2130. Define X2_CS_PIN in Configuration_adv.h."
#elif ENABLED(Y_IS_TMC2130) && !PIN_EXISTS(Y_CS)
#error "Y_CS_PIN is required for Y_IS_TMC2130. Define Y_CS_PIN in Configuration_adv.h."
#elif ENABLED(Y2_IS_TMC2130) && !PIN_EXISTS(Y2_CS)
#error "Y2_CS_PIN is required for Y2_IS_TMC2130. Define Y2_CS_PIN in Configuration_adv.h."
#elif ENABLED(Z_IS_TMC2130) && !PIN_EXISTS(Z_CS)
#error "Z_CS_PIN is required for Z_IS_TMC2130. Define Z_CS_PIN in Configuration_adv.h."
#elif ENABLED(Z2_IS_TMC2130) && !PIN_EXISTS(Z2_CS)
#error "Z2_CS_PIN is required for Z2_IS_TMC2130. Define Z2_CS_PIN in Configuration_adv.h."
#elif ENABLED(E0_IS_TMC2130) && !PIN_EXISTS(E0_CS)
#error "E0_CS_PIN is required for E0_IS_TMC2130. Define E0_CS_PIN in Configuration_adv.h."
#elif ENABLED(E1_IS_TMC2130) && !PIN_EXISTS(E1_CS)
#error "E1_CS_PIN is required for E1_IS_TMC2130. Define E1_CS_PIN in Configuration_adv.h."
#elif ENABLED(E2_IS_TMC2130) && !PIN_EXISTS(E2_CS)
#error "E2_CS_PIN is required for E2_IS_TMC2130. Define E2_CS_PIN in Configuration_adv.h."
#elif ENABLED(E3_IS_TMC2130) && !PIN_EXISTS(E3_CS)
#error "E3_CS_PIN is required for E3_IS_TMC2130. Define E3_CS_PIN in Configuration_adv.h."
#elif ENABLED(E4_IS_TMC2130) && !PIN_EXISTS(E4_CS)
#error "E4_CS_PIN is required for E4_IS_TMC2130. Define E4_CS_PIN in Configuration_adv.h."
#endif
#endif #endif
/** /**

68
Marlin/src/pins/pins.h

@ -364,6 +364,46 @@
#ifndef Z_MS2_PIN #ifndef Z_MS2_PIN
#define Z_MS2_PIN -1 #define Z_MS2_PIN -1
#endif #endif
#ifndef Z_MS3_PIN
#define Z_MS3_PIN -1
#endif
#ifndef E0_MS1_PIN
#define E0_MS1_PIN -1
#endif
#ifndef E0_MS2_PIN
#define E0_MS2_PIN -1
#endif
#ifndef E1_MS1_PIN
#define E1_MS1_PIN -1
#endif
#ifndef E1_MS2_PIN
#define E1_MS2_PIN -1
#endif
#ifndef E2_MS1_PIN
#define E2_MS1_PIN -1
#endif
#ifndef E2_MS2_PIN
#define E2_MS2_PIN -1
#endif
#ifndef E3_MS1_PIN
#define E3_MS1_PIN -1
#endif
#ifndef E3_MS2_PIN
#define E3_MS2_PIN -1
#endif
#ifndef E3_MS3_PIN
#define E3_MS3_PIN -1
#endif
#ifndef E4_MS1_PIN
#define E4_MS1_PIN -1
#endif
#ifndef E4_MS2_PIN
#define E4_MS2_PIN -1
#endif
#ifndef E4_MS3_PIN
#define E4_MS3_PIN -1
#endif
#ifndef E0_STEP_PIN #ifndef E0_STEP_PIN
#define E0_STEP_PIN -1 #define E0_STEP_PIN -1
#endif #endif
@ -373,12 +413,6 @@
#ifndef E0_ENABLE_PIN #ifndef E0_ENABLE_PIN
#define E0_ENABLE_PIN -1 #define E0_ENABLE_PIN -1
#endif #endif
#ifndef E0_MS1_PIN
#define E0_MS1_PIN -1
#endif
#ifndef E0_MS2_PIN
#define E0_MS2_PIN -1
#endif
#ifndef E1_STEP_PIN #ifndef E1_STEP_PIN
#define E1_STEP_PIN -1 #define E1_STEP_PIN -1
#endif #endif
@ -388,12 +422,6 @@
#ifndef E1_ENABLE_PIN #ifndef E1_ENABLE_PIN
#define E1_ENABLE_PIN -1 #define E1_ENABLE_PIN -1
#endif #endif
#ifndef E1_MS1_PIN
#define E1_MS1_PIN -1
#endif
#ifndef E1_MS2_PIN
#define E1_MS2_PIN -1
#endif
#ifndef E2_STEP_PIN #ifndef E2_STEP_PIN
#define E2_STEP_PIN -1 #define E2_STEP_PIN -1
#endif #endif
@ -539,7 +567,7 @@
#define _E1_PINS E1_STEP_PIN, E1_DIR_PIN, E1_ENABLE_PIN, E1_MS1_PIN, E1_MS2_PIN, #define _E1_PINS E1_STEP_PIN, E1_DIR_PIN, E1_ENABLE_PIN, E1_MS1_PIN, E1_MS2_PIN,
#if EXTRUDERS > 4 // Tools 4 and 5 use E2 #if EXTRUDERS > 4 // Tools 4 and 5 use E2
#undef _E2_PINS #undef _E2_PINS
#define _E2_PINS E2_STEP_PIN, E2_DIR_PIN, E2_ENABLE_PIN, #define _E2_PINS E2_STEP_PIN, E2_DIR_PIN, E2_ENABLE_PIN, E2_MS1_PIN, E2_MS2_PIN,
#endif #endif
#endif #endif
#elif EXTRUDERS > 1 #elif EXTRUDERS > 1
@ -547,13 +575,13 @@
#define _E1_PINS E1_STEP_PIN, E1_DIR_PIN, E1_ENABLE_PIN, E1_MS1_PIN, E1_MS2_PIN, #define _E1_PINS E1_STEP_PIN, E1_DIR_PIN, E1_ENABLE_PIN, E1_MS1_PIN, E1_MS2_PIN,
#if EXTRUDERS > 2 #if EXTRUDERS > 2
#undef _E2_PINS #undef _E2_PINS
#define _E2_PINS E2_STEP_PIN, E2_DIR_PIN, E2_ENABLE_PIN, #define _E2_PINS E2_STEP_PIN, E2_DIR_PIN, E2_ENABLE_PIN, E2_MS1_PIN, E2_MS2_PIN,
#if EXTRUDERS > 3 #if EXTRUDERS > 3
#undef _E3_PINS #undef _E3_PINS
#define _E3_PINS E3_STEP_PIN, E3_DIR_PIN, E3_ENABLE_PIN, #define _E3_PINS E3_STEP_PIN, E3_DIR_PIN, E3_ENABLE_PIN, E3_MS1_PIN, E3_MS2_PIN,
#if EXTRUDERS > 4 #if EXTRUDERS > 4
#undef _E4_PINS #undef _E4_PINS
#define _E4_PINS E4_STEP_PIN, E4_DIR_PIN, E4_ENABLE_PIN, #define _E4_PINS E4_STEP_PIN, E4_DIR_PIN, E4_ENABLE_PIN, E4_MS1_PIN, E4_MS2_PIN,
#endif // EXTRUDERS > 4 #endif // EXTRUDERS > 4
#endif // EXTRUDERS > 3 #endif // EXTRUDERS > 3
#endif // EXTRUDERS > 2 #endif // EXTRUDERS > 2
@ -582,16 +610,16 @@
#endif // HOTENDS > 2 #endif // HOTENDS > 2
#elif ENABLED(MIXING_EXTRUDER) #elif ENABLED(MIXING_EXTRUDER)
#undef _E1_PINS #undef _E1_PINS
#define _E1_PINS E1_STEP_PIN, E1_DIR_PIN, E1_ENABLE_PIN, #define _E1_PINS E1_STEP_PIN, E1_DIR_PIN, E1_ENABLE_PIN, E1_MS1_PIN, E1_MS2_PIN,
#if MIXING_STEPPERS > 2 #if MIXING_STEPPERS > 2
#undef _E2_PINS #undef _E2_PINS
#define _E2_PINS E2_STEP_PIN, E2_DIR_PIN, E2_ENABLE_PIN, #define _E2_PINS E2_STEP_PIN, E2_DIR_PIN, E2_ENABLE_PIN, E2_MS1_PIN, E2_MS2_PIN,
#if MIXING_STEPPERS > 3 #if MIXING_STEPPERS > 3
#undef _E3_PINS #undef _E3_PINS
#define _E3_PINS E3_STEP_PIN, E3_DIR_PIN, E3_ENABLE_PIN, #define _E3_PINS E3_STEP_PIN, E3_DIR_PIN, E3_ENABLE_PIN, E3_MS1_PIN, E3_MS2_PIN,
#if MIXING_STEPPERS > 4 #if MIXING_STEPPERS > 4
#undef _E4_PINS #undef _E4_PINS
#define _E4_PINS E4_STEP_PIN, E4_DIR_PIN, E4_ENABLE_PIN, #define _E4_PINS E4_STEP_PIN, E4_DIR_PIN, E4_ENABLE_PIN, E4_MS1_PIN, E4_MS2_PIN,
#endif // MIXING_STEPPERS > 4 #endif // MIXING_STEPPERS > 4
#endif // MIXING_STEPPERS > 3 #endif // MIXING_STEPPERS > 3
#endif // MIXING_STEPPERS > 2 #endif // MIXING_STEPPERS > 2

12
Marlin/src/pins/pinsDebug_list.h

@ -289,12 +289,24 @@
#if PIN_EXISTS(E3_STEP) #if PIN_EXISTS(E3_STEP)
REPORT_NAME_DIGITAL(E3_STEP_PIN, __LINE__ ) REPORT_NAME_DIGITAL(E3_STEP_PIN, __LINE__ )
#endif #endif
#if PIN_EXISTS(E4_CS)
REPORT_NAME_DIGITAL(E4_CS_PIN, __LINE__ )
#endif
#if PIN_EXISTS(E4_DIR) #if PIN_EXISTS(E4_DIR)
REPORT_NAME_DIGITAL(E4_DIR_PIN, __LINE__ ) REPORT_NAME_DIGITAL(E4_DIR_PIN, __LINE__ )
#endif #endif
#if PIN_EXISTS(E4_ENABLE) #if PIN_EXISTS(E4_ENABLE)
REPORT_NAME_DIGITAL(E4_ENABLE_PIN, __LINE__ ) REPORT_NAME_DIGITAL(E4_ENABLE_PIN, __LINE__ )
#endif #endif
#if PIN_EXISTS(E4_MS1)
REPORT_NAME_DIGITAL(E4_MS1_PIN, __LINE__ )
#endif
#if PIN_EXISTS(E4_MS2)
REPORT_NAME_DIGITAL(E4_MS2_PIN, __LINE__ )
#endif
#if PIN_EXISTS(E4_MS3)
REPORT_NAME_DIGITAL(E4_MS3_PIN, __LINE__ )
#endif
#if PIN_EXISTS(E4_STEP) #if PIN_EXISTS(E4_STEP)
REPORT_NAME_DIGITAL(E4_STEP_PIN, __LINE__ ) REPORT_NAME_DIGITAL(E4_STEP_PIN, __LINE__ )
#endif #endif

Loading…
Cancel
Save