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

Merge pull request #3654 from thinkyhead/rc_cleanup_pins

Browse source 
Pins cleanups
This commit is contained in:
Scott Lahteine 2016-05-01 13:56:04 -07:00
commit 196af30467
4 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/macros.h
View file

@ -60,4 +60,6 @@
#define PENDING(NOW,SOON) ((long)(NOW-(SOON))<0) #define PENDING(NOW,SOON) ((long)(NOW-(SOON))<0)
#define ELAPSED(NOW,SOON) (!PENDING(NOW,SOON)) #define ELAPSED(NOW,SOON) (!PENDING(NOW,SOON))
#define NOOP do{}while(0)
#endif //__MACROS_H #endif //__MACROS_H

3
Marlin/pins.h
View file

@ -270,7 +270,8 @@
X_STEP_PIN, X_DIR_PIN, X_ENABLE_PIN, X_MIN_PIN, X_MAX_PIN, \ X_STEP_PIN, X_DIR_PIN, X_ENABLE_PIN, X_MIN_PIN, X_MAX_PIN, \
Y_STEP_PIN, Y_DIR_PIN, Y_ENABLE_PIN, Y_MIN_PIN, Y_MAX_PIN, \ Y_STEP_PIN, Y_DIR_PIN, Y_ENABLE_PIN, Y_MIN_PIN, Y_MAX_PIN, \
Z_STEP_PIN, Z_DIR_PIN, Z_ENABLE_PIN, Z_MIN_PIN, Z_MAX_PIN, Z_MIN_PROBE_PIN, \ Z_STEP_PIN, Z_DIR_PIN, Z_ENABLE_PIN, Z_MIN_PIN, Z_MAX_PIN, Z_MIN_PROBE_PIN, \
PS_ON_PIN, HEATER_BED_PIN, FAN_PIN, \ PS_ON_PIN, HEATER_BED_PIN, FAN_PIN, CONTROLLERFAN_PIN, \
EXTRUDER_0_AUTO_FAN_PIN, EXTRUDER_1_AUTO_FAN_PIN, EXTRUDER_2_AUTO_FAN_PIN, EXTRUDER_3_AUTO_FAN_PIN, \
_E0_PINS _E1_PINS _E2_PINS _E3_PINS \ _E0_PINS _E1_PINS _E2_PINS _E3_PINS \
analogInputToDigitalPin(TEMP_BED_PIN) \ analogInputToDigitalPin(TEMP_BED_PIN) \
} }

12
Marlin/pins_AZTEEG_X3_PRO.h
View file

@ -28,6 +28,8 @@
#undef FAN_PIN #undef FAN_PIN
#define FAN_PIN 6 //Part Cooling System #define FAN_PIN 6 //Part Cooling System
#undef BEEPER_PIN
#define BEEPER_PIN 33 #define BEEPER_PIN 33
#define CONTROLLERFAN_PIN 4 //Pin used for the fan to cool motherboard (-1 to disable) #define CONTROLLERFAN_PIN 4 //Pin used for the fan to cool motherboard (-1 to disable)
//Fans/Water Pump to cool the hotend cool side. //Fans/Water Pump to cool the hotend cool side.
@ -55,7 +57,8 @@
#define Z_MIN_PIN 19 #define Z_MIN_PIN 19
#define Z_MAX_PIN 18 #define Z_MAX_PIN 18
#endif #endif
//
#if ENABLED(Z_MIN_PROBE_ENDSTOP) #if ENABLED(Z_MIN_PROBE_ENDSTOP)
//#undef Z_MIN_PIN //#undef Z_MIN_PIN
//#define Z_MIN_PIN 15 //#define Z_MIN_PIN 15
@ -95,10 +98,11 @@
#define TC2 5 // ANALOG NUMBERING Thermo couple on Azteeg X3Pro #define TC2 5 // ANALOG NUMBERING Thermo couple on Azteeg X3Pro
// //
//These Servo pins are for when they are defined. Tested for usage with bed leveling // These Servo pins are for when they are defined. Tested for usage with bed leveling
//on a Delta with 1 servo. Running through the Z servo endstop in code. // on a Delta with 1 servo. Running through the Z servo endstop in code.
//Physical wire attachment was done on EXT1 on the GND, 5V, and D47 pins. // Physical wire attachment was done on EXT1 on the GND, 5V, and D47 pins.
// //
#undef SERVO0_PIN
#define SERVO0_PIN 47 #define SERVO0_PIN 47
//LCD Pins// //LCD Pins//

4
Marlin/ultralcd.h
View file

@ -156,8 +156,8 @@
FORCE_INLINE void lcd_reset_alert_level() {} FORCE_INLINE void lcd_reset_alert_level() {}
FORCE_INLINE bool lcd_detected(void) { return true; } FORCE_INLINE bool lcd_detected(void) { return true; }
#define LCD_MESSAGEPGM(x) do{}while(0) #define LCD_MESSAGEPGM(x) NOOP
#define LCD_ALERTMESSAGEPGM(x) do{}while(0) #define LCD_ALERTMESSAGEPGM(x) NOOP
#endif //ULTRA_LCD #endif //ULTRA_LCD