MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update pins.h for parity, protect MS pins

Browse Source
This commit is contained in:
Scott Lahteine 2018-01-21 19:51:23 -06:00
parent 198498b1aa
commit e8687e5b9e
2 changed files with 80 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
Marlin/pins.h
View File

@ -35,6 +35,18 @@
#ifndef __PINS_H__ #ifndef __PINS_H__
#define __PINS_H__ #define __PINS_H__
#if MB(RAMPS_13_EFB) || MB(RAMPS_14_EFB) || MB(RAMPS_PLUS_EFB)
#define IS_RAMPS_EFB
#elif MB(RAMPS_13_EEB) || MB(RAMPS_14_EEB) || MB(RAMPS_PLUS_EEB)
#define IS_RAMPS_EEB
#elif MB(RAMPS_13_EFF) || MB(RAMPS_14_EFF) || MB(RAMPS_PLUS_EFF)
#define IS_RAMPS_EFF
#elif MB(RAMPS_13_EEF) || MB(RAMPS_14_EEF) || MB(RAMPS_PLUS_EEF)
#define IS_RAMPS_EEF
#elif MB(RAMPS_13_SF) || MB(RAMPS_14_SF) || MB(RAMPS_PLUS_SF)
#define IS_RAMPS_SF
#endif
// //
// RAMPS 1.3 / 1.4 - ATmega1280, ATmega2560 // RAMPS 1.3 / 1.4 - ATmega1280, ATmega2560
// //
@ -42,49 +54,34 @@
#if MB(RAMPS_OLD) #if MB(RAMPS_OLD)
#include "pins_RAMPS_OLD.h" #include "pins_RAMPS_OLD.h"
#elif MB(RAMPS_13_EFB) #elif MB(RAMPS_13_EFB)
#define IS_RAMPS_EFB
#include "pins_RAMPS_13.h" #include "pins_RAMPS_13.h"
#elif MB(RAMPS_13_EEB) #elif MB(RAMPS_13_EEB)
#define IS_RAMPS_EEB
#include "pins_RAMPS_13.h" #include "pins_RAMPS_13.h"
#elif MB(RAMPS_13_EFF) #elif MB(RAMPS_13_EFF)
#define IS_RAMPS_EFF
#include "pins_RAMPS_13.h" #include "pins_RAMPS_13.h"
#elif MB(RAMPS_13_EEF) #elif MB(RAMPS_13_EEF)
#define IS_RAMPS_EEF
#include "pins_RAMPS_13.h" #include "pins_RAMPS_13.h"
#elif MB(RAMPS_13_SF) #elif MB(RAMPS_13_SF)
#define IS_RAMPS_SF
#include "pins_RAMPS_13.h" #include "pins_RAMPS_13.h"
#elif MB(RAMPS_14_EFB) #elif MB(RAMPS_14_EFB)
#define IS_RAMPS_EFB
#include "pins_RAMPS.h" #include "pins_RAMPS.h"
#elif MB(RAMPS_14_EEB) #elif MB(RAMPS_14_EEB)
#define IS_RAMPS_EEB
#include "pins_RAMPS.h" #include "pins_RAMPS.h"
#elif MB(RAMPS_14_EFF) #elif MB(RAMPS_14_EFF)
#define IS_RAMPS_EFF
#include "pins_RAMPS.h" #include "pins_RAMPS.h"
#elif MB(RAMPS_14_EEF) #elif MB(RAMPS_14_EEF)
#define IS_RAMPS_EEF
#include "pins_RAMPS.h" #include "pins_RAMPS.h"
#elif MB(RAMPS_14_SF) #elif MB(RAMPS_14_SF)
#define IS_RAMPS_SF
#include "pins_RAMPS.h" #include "pins_RAMPS.h"
#elif MB(RAMPS_PLUS_EFB) #elif MB(RAMPS_PLUS_EFB)
#define IS_RAMPS_EFB
#include "pins_RAMPS_PLUS.h" #include "pins_RAMPS_PLUS.h"
#elif MB(RAMPS_PLUS_EEB) #elif MB(RAMPS_PLUS_EEB)
#define IS_RAMPS_EEB
#include "pins_RAMPS_PLUS.h" #include "pins_RAMPS_PLUS.h"
#elif MB(RAMPS_PLUS_EFF) #elif MB(RAMPS_PLUS_EFF)
#define IS_RAMPS_EFF
#include "pins_RAMPS_PLUS.h" #include "pins_RAMPS_PLUS.h"
#elif MB(RAMPS_PLUS_EEF) #elif MB(RAMPS_PLUS_EEF)
#define IS_RAMPS_EEF
#include "pins_RAMPS_PLUS.h" #include "pins_RAMPS_PLUS.h"
#elif MB(RAMPS_PLUS_SF) #elif MB(RAMPS_PLUS_SF)
#define IS_RAMPS_SF
#include "pins_RAMPS_PLUS.h" #include "pins_RAMPS_PLUS.h"
// //
@ -170,8 +167,6 @@
#include "pins_GT2560_REV_A.h" // ATmega1280, ATmega2560 #include "pins_GT2560_REV_A.h" // ATmega1280, ATmega2560
#elif MB(GT2560_REV_A_PLUS) #elif MB(GT2560_REV_A_PLUS)
#include "pins_GT2560_REV_A_PLUS.h" // ATmega1280, ATmega2560 #include "pins_GT2560_REV_A_PLUS.h" // ATmega1280, ATmega2560
#elif MB(SILVER_GATE)
#include "pins_SILVER_GATE.h" // ATmega2561
// //
// ATmega1281, ATmega2561 // ATmega1281, ATmega2561
@ -179,6 +174,8 @@
#elif MB(MINITRONICS) #elif MB(MINITRONICS)
#include "pins_MINITRONICS.h" // ATmega1281 #include "pins_MINITRONICS.h" // ATmega1281
#elif MB(SILVER_GATE)
#include "pins_SILVER_GATE.h" // ATmega2561
// //
// Sanguinololu and Derivatives - ATmega644P, ATmega1284P // Sanguinololu and Derivatives - ATmega644P, ATmega1284P
@ -276,6 +273,37 @@
#ifndef Z_MS2_PIN #ifndef Z_MS2_PIN
#define Z_MS2_PIN -1 #define Z_MS2_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_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 E4_MS1_PIN
#define E4_MS1_PIN -1
#endif
#ifndef E4_MS2_PIN
#define E4_MS2_PIN -1
#endif
#ifndef E0_STEP_PIN #ifndef E0_STEP_PIN
#define E0_STEP_PIN -1 #define E0_STEP_PIN -1
#endif #endif
@ -285,12 +313,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
@ -300,12 +322,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
@ -457,7 +473,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
@ -465,13 +481,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
@ -500,16 +516,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

27
Marlin/pinsDebug_list.h
View File

@ -200,36 +200,63 @@
#if PIN_EXISTS(E2_AUTO_FAN) #if PIN_EXISTS(E2_AUTO_FAN)
REPORT_NAME_DIGITAL(E2_AUTO_FAN_PIN, __LINE__ ) REPORT_NAME_DIGITAL(E2_AUTO_FAN_PIN, __LINE__ )
#endif #endif
#if PIN_EXISTS(E2_CS)
REPORT_NAME_DIGITAL(E2_CS_PIN, __LINE__ )
#endif
#if PIN_EXISTS(E2_DIR) #if PIN_EXISTS(E2_DIR)
REPORT_NAME_DIGITAL(E2_DIR_PIN, __LINE__ ) REPORT_NAME_DIGITAL(E2_DIR_PIN, __LINE__ )
#endif #endif
#if PIN_EXISTS(E2_ENABLE) #if PIN_EXISTS(E2_ENABLE)
REPORT_NAME_DIGITAL(E2_ENABLE_PIN, __LINE__ ) REPORT_NAME_DIGITAL(E2_ENABLE_PIN, __LINE__ )
#endif #endif
#if PIN_EXISTS(E2_MS1)
REPORT_NAME_DIGITAL(E2_MS1_PIN, __LINE__ )
#endif
#if PIN_EXISTS(E2_MS2)
REPORT_NAME_DIGITAL(E2_MS2_PIN, __LINE__ )
#endif
#if PIN_EXISTS(E2_STEP) #if PIN_EXISTS(E2_STEP)
REPORT_NAME_DIGITAL(E2_STEP_PIN, __LINE__ ) REPORT_NAME_DIGITAL(E2_STEP_PIN, __LINE__ )
#endif #endif
#if PIN_EXISTS(E3_AUTO_FAN) #if PIN_EXISTS(E3_AUTO_FAN)
REPORT_NAME_DIGITAL(E3_AUTO_FAN_PIN, __LINE__ ) REPORT_NAME_DIGITAL(E3_AUTO_FAN_PIN, __LINE__ )
#endif #endif
#if PIN_EXISTS(E3_CS)
REPORT_NAME_DIGITAL(E3_CS_PIN, __LINE__ )
#endif
#if PIN_EXISTS(E3_DIR) #if PIN_EXISTS(E3_DIR)
REPORT_NAME_DIGITAL(E3_DIR_PIN, __LINE__ ) REPORT_NAME_DIGITAL(E3_DIR_PIN, __LINE__ )
#endif #endif
#if PIN_EXISTS(E3_ENABLE) #if PIN_EXISTS(E3_ENABLE)
REPORT_NAME_DIGITAL(E3_ENABLE_PIN, __LINE__ ) REPORT_NAME_DIGITAL(E3_ENABLE_PIN, __LINE__ )
#endif #endif
#if PIN_EXISTS(E3_MS1)
REPORT_NAME_DIGITAL(E3_MS1_PIN, __LINE__ )
#endif
#if PIN_EXISTS(E3_MS2)
REPORT_NAME_DIGITAL(E3_MS2_PIN, __LINE__ )
#endif
#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_AUTO_FAN) #if PIN_EXISTS(E4_AUTO_FAN)
REPORT_NAME_DIGITAL(E4_AUTO_FAN_PIN, __LINE__ ) REPORT_NAME_DIGITAL(E4_AUTO_FAN_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_STEP) #if PIN_EXISTS(E4_STEP)
REPORT_NAME_DIGITAL(E4_STEP_PIN, __LINE__ ) REPORT_NAME_DIGITAL(E4_STEP_PIN, __LINE__ )
#endif #endif