|
|
@ -133,9 +133,9 @@
|
|
|
|
|
|
|
|
|
|
|
|
// SPI for Max6675 or Max31855 Thermocouple
|
|
|
|
// SPI for Max6675 or Max31855 Thermocouple
|
|
|
|
#if DISABLED(SDSUPPORT)
|
|
|
|
#if DISABLED(SDSUPPORT)
|
|
|
|
#define MAX6675_SS_PIN 66 // Do not use pin 53 if there is even the remote possibility of using Display/SD card
|
|
|
|
#define MAX6675_SS_PIN 66 // Don't use 53 if there is even the remote possibility of using Display/SD card
|
|
|
|
#else
|
|
|
|
#else
|
|
|
|
#define MAX6675_SS_PIN 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
|
|
|
|
#define MAX6675_SS_PIN 66 // Don't use 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
//
|
|
|
@ -222,9 +222,9 @@
|
|
|
|
|
|
|
|
|
|
|
|
#if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
|
|
|
|
#if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
|
|
|
|
#if NUM_SERVOS <= 1 // try to use servo connector first
|
|
|
|
#if NUM_SERVOS <= 1 // try to use servo connector first
|
|
|
|
#define CASE_LIGHT_PIN 6 // MUST BE HARDWARE PWM
|
|
|
|
#define CASE_LIGHT_PIN 6 // Hardware PWM
|
|
|
|
#elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD)) // try to use AUX 2
|
|
|
|
#elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD)) // try to use AUX 2
|
|
|
|
#define CASE_LIGHT_PIN 44 // MUST BE HARDWARE PWM
|
|
|
|
#define CASE_LIGHT_PIN 44 // Hardware PWM
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
@ -233,12 +233,12 @@
|
|
|
|
//
|
|
|
|
//
|
|
|
|
#if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
|
|
|
|
#if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
|
|
|
|
#if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // try to use servo connector first
|
|
|
|
#if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // try to use servo connector first
|
|
|
|
#define SPINDLE_LASER_ENA_PIN 4 // Pin should have a pullup/pulldown!
|
|
|
|
#define SPINDLE_LASER_ENA_PIN 4 // Pullup or pulldown!
|
|
|
|
#define SPINDLE_LASER_PWM_PIN 6 // MUST BE HARDWARE PWM
|
|
|
|
#define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
|
|
|
|
#define SPINDLE_DIR_PIN 5
|
|
|
|
#define SPINDLE_DIR_PIN 5
|
|
|
|
#elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD)) // try to use AUX 2
|
|
|
|
#elif !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD)) // try to use AUX 2
|
|
|
|
#define SPINDLE_LASER_ENA_PIN 40 // Pin should have a pullup/pulldown!
|
|
|
|
#define SPINDLE_LASER_ENA_PIN 40 // Pullup or pulldown!
|
|
|
|
#define SPINDLE_LASER_PWM_PIN 44 // MUST BE HARDWARE PWM
|
|
|
|
#define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
|
|
|
|
#define SPINDLE_DIR_PIN 65
|
|
|
|
#define SPINDLE_DIR_PIN 65
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
@ -542,7 +542,7 @@
|
|
|
|
// Beeper on AUX-4
|
|
|
|
// Beeper on AUX-4
|
|
|
|
#define BEEPER_PIN 33
|
|
|
|
#define BEEPER_PIN 33
|
|
|
|
|
|
|
|
|
|
|
|
// Buttons are directly attached using AUX-2
|
|
|
|
// Buttons are directly attached to AUX-2
|
|
|
|
#if ENABLED(REPRAPWORLD_KEYPAD)
|
|
|
|
#if ENABLED(REPRAPWORLD_KEYPAD)
|
|
|
|
#define SHIFT_OUT 40
|
|
|
|
#define SHIFT_OUT 40
|
|
|
|
#define SHIFT_CLK 44
|
|
|
|
#define SHIFT_CLK 44
|
|
|
|