Merge upstream changes from Marlin 2.1.1
This commit is contained in:
Stefan Kalscheuer
@@ -78,6 +78,31 @@
|
||||
#define SERVO3_PIN 4
|
||||
#endif
|
||||
|
||||
//
|
||||
// Foam Cutter requirements
|
||||
//
|
||||
|
||||
#if ENABLED(FOAMCUTTER_XYUV)
|
||||
#ifndef MOSFET_C_PIN
|
||||
#define MOSFET_C_PIN -1
|
||||
#endif
|
||||
#if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN) && NUM_SERVOS < 2
|
||||
#define SPINDLE_LASER_PWM_PIN 8 // Hardware PWM
|
||||
#endif
|
||||
#ifndef Z_MIN_PIN
|
||||
#define Z_MIN_PIN -1
|
||||
#endif
|
||||
#ifndef Z_MAX_PIN
|
||||
#define Z_MAX_PIN -1
|
||||
#endif
|
||||
#ifndef I_STOP_PIN
|
||||
#define I_STOP_PIN 18
|
||||
#endif
|
||||
#ifndef J_STOP_PIN
|
||||
#define J_STOP_PIN 19
|
||||
#endif
|
||||
#endif
|
||||
|
||||
//
|
||||
// Limit Switches
|
||||
//
|
||||
@@ -120,14 +145,14 @@
|
||||
#define X_DIR_PIN 55
|
||||
#define X_ENABLE_PIN 38
|
||||
#ifndef X_CS_PIN
|
||||
#define X_CS_PIN AUX3_03_PIN
|
||||
#define X_CS_PIN 53
|
||||
#endif
|
||||
|
||||
#define Y_STEP_PIN 60
|
||||
#define Y_DIR_PIN 61
|
||||
#define Y_ENABLE_PIN 56
|
||||
#ifndef Y_CS_PIN
|
||||
#define Y_CS_PIN AUX3_07_PIN
|
||||
#define Y_CS_PIN 49
|
||||
#endif
|
||||
|
||||
#ifndef Z_STEP_PIN
|
||||
@@ -189,52 +214,35 @@
|
||||
#define TEMP_0_CS_PIN 66 // Don't use 53 if using Display/SD card (SDSS) or 49 (SD_DETECT_PIN)
|
||||
#endif
|
||||
|
||||
//
|
||||
// Augmentation for auto-assigning RAMPS plugs
|
||||
//
|
||||
#if NONE(IS_RAMPS_EEB, IS_RAMPS_EEF, IS_RAMPS_EFB, IS_RAMPS_EFF, IS_RAMPS_SF) && !PIN_EXISTS(MOSFET_D)
|
||||
#if HAS_MULTI_HOTEND
|
||||
#if TEMP_SENSOR_BED
|
||||
#define IS_RAMPS_EEB
|
||||
#else
|
||||
#define IS_RAMPS_EEF
|
||||
#endif
|
||||
#elif TEMP_SENSOR_BED
|
||||
#define IS_RAMPS_EFB
|
||||
#else
|
||||
#define IS_RAMPS_EFF
|
||||
#endif
|
||||
#endif
|
||||
|
||||
//
|
||||
// Heaters / Fans
|
||||
//
|
||||
#ifndef MOSFET_A_PIN
|
||||
#define MOSFET_A_PIN 10
|
||||
#endif
|
||||
#ifndef MOSFET_B_PIN
|
||||
#define MOSFET_B_PIN 9
|
||||
#endif
|
||||
#ifndef MOSFET_C_PIN
|
||||
#define MOSFET_C_PIN 8
|
||||
#endif
|
||||
#ifndef MOSFET_D_PIN
|
||||
#define MOSFET_D_PIN -1
|
||||
#endif
|
||||
#ifndef RAMPS_D8_PIN
|
||||
#define RAMPS_D8_PIN 8
|
||||
#endif
|
||||
#ifndef RAMPS_D9_PIN
|
||||
#define RAMPS_D9_PIN 9
|
||||
#endif
|
||||
#ifndef RAMPS_D10_PIN
|
||||
#define RAMPS_D10_PIN 10
|
||||
#endif
|
||||
|
||||
#define HEATER_0_PIN RAMPS_D10_PIN
|
||||
#define HEATER_0_PIN MOSFET_A_PIN
|
||||
|
||||
#if ENABLED(IS_RAMPS_EFB) // Hotend, Fan, Bed
|
||||
#define HEATER_BED_PIN RAMPS_D8_PIN
|
||||
#elif ENABLED(IS_RAMPS_EEF) // Hotend, Hotend, Fan
|
||||
#define HEATER_1_PIN RAMPS_D9_PIN
|
||||
#elif ENABLED(IS_RAMPS_EEB) // Hotend, Hotend, Bed
|
||||
#define HEATER_1_PIN RAMPS_D9_PIN
|
||||
#define HEATER_BED_PIN RAMPS_D8_PIN
|
||||
#elif ENABLED(IS_RAMPS_EFF) // Hotend, Fan, Fan
|
||||
#define FAN1_PIN RAMPS_D8_PIN
|
||||
#elif DISABLED(IS_RAMPS_SF) // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
|
||||
#define HEATER_BED_PIN RAMPS_D8_PIN
|
||||
#if FET_ORDER_EFB // Hotend, Fan, Bed
|
||||
#define HEATER_BED_PIN MOSFET_C_PIN
|
||||
#elif FET_ORDER_EEF // Hotend, Hotend, Fan
|
||||
#define HEATER_1_PIN MOSFET_B_PIN
|
||||
#elif FET_ORDER_EEB // Hotend, Hotend, Bed
|
||||
#define HEATER_1_PIN MOSFET_B_PIN
|
||||
#define HEATER_BED_PIN MOSFET_C_PIN
|
||||
#elif FET_ORDER_EFF // Hotend, Fan, Fan
|
||||
#define FAN1_PIN MOSFET_C_PIN
|
||||
#elif DISABLED(FET_ORDER_SF) // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
|
||||
#define HEATER_BED_PIN MOSFET_C_PIN
|
||||
#if EITHER(HAS_MULTI_HOTEND, HEATERS_PARALLEL)
|
||||
#define HEATER_1_PIN MOSFET_D_PIN
|
||||
#else
|
||||
@@ -243,14 +251,14 @@
|
||||
#endif
|
||||
|
||||
#ifndef FAN_PIN
|
||||
#if EITHER(IS_RAMPS_EFB, IS_RAMPS_EFF) // Hotend, Fan, Bed or Hotend, Fan, Fan
|
||||
#define FAN_PIN RAMPS_D9_PIN
|
||||
#elif EITHER(IS_RAMPS_EEF, IS_RAMPS_SF) // Hotend, Hotend, Fan or Spindle, Fan
|
||||
#define FAN_PIN RAMPS_D8_PIN
|
||||
#elif ENABLED(IS_RAMPS_EEB) // Hotend, Hotend, Bed
|
||||
#if EITHER(FET_ORDER_EFB, FET_ORDER_EFF) // Hotend, Fan, Bed or Hotend, Fan, Fan
|
||||
#define FAN_PIN MOSFET_B_PIN
|
||||
#elif EITHER(FET_ORDER_EEF, FET_ORDER_SF) // Hotend, Hotend, Fan or Spindle, Fan
|
||||
#define FAN_PIN MOSFET_C_PIN
|
||||
#elif FET_ORDER_EEB // Hotend, Hotend, Bed
|
||||
#define FAN_PIN 4 // IO pin. Buffer needed
|
||||
#else // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
|
||||
#define FAN_PIN RAMPS_D9_PIN
|
||||
#define FAN_PIN MOSFET_B_PIN
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -258,7 +266,7 @@
|
||||
// Misc. Functions
|
||||
//
|
||||
#ifndef SDSS
|
||||
#define SDSS AUX3_03_PIN
|
||||
#define SDSS AUX3_06_PIN
|
||||
#endif
|
||||
#define LED_PIN 13
|
||||
|
||||
@@ -293,9 +301,11 @@
|
||||
// M3/M4/M5 - Spindle/Laser Control
|
||||
//
|
||||
#if HAS_CUTTER && !defined(SPINDLE_LASER_ENA_PIN)
|
||||
#if !NUM_SERVOS // Use servo connector if possible
|
||||
#if NUM_SERVOS < 2 // Use servo connector if possible
|
||||
#define SPINDLE_LASER_ENA_PIN 4 // Pullup or pulldown!
|
||||
#define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
|
||||
#ifndef SPINDLE_LASER_PWM_PIN
|
||||
#define SPINDLE_LASER_PWM_PIN 6 // Hardware PWM
|
||||
#endif
|
||||
#define SPINDLE_DIR_PIN 5
|
||||
#elif HAS_FREE_AUX2_PINS
|
||||
#define SPINDLE_LASER_ENA_PIN 40 // Pullup or pulldown!
|
||||
@@ -435,30 +445,59 @@
|
||||
//
|
||||
// Průša i3 MK2 Multiplexer Support
|
||||
//
|
||||
#ifndef E_MUX0_PIN
|
||||
#define E_MUX0_PIN 40 // Z_CS_PIN
|
||||
#endif
|
||||
#ifndef E_MUX1_PIN
|
||||
#define E_MUX1_PIN 42 // E0_CS_PIN
|
||||
#endif
|
||||
#ifndef E_MUX2_PIN
|
||||
#define E_MUX2_PIN 44 // E1_CS_PIN
|
||||
#if HAS_PRUSA_MMU1
|
||||
#ifndef E_MUX0_PIN
|
||||
#define E_MUX0_PIN 40 // Z_CS_PIN
|
||||
#endif
|
||||
#ifndef E_MUX1_PIN
|
||||
#define E_MUX1_PIN 42 // E0_CS_PIN
|
||||
#endif
|
||||
#ifndef E_MUX2_PIN
|
||||
#define E_MUX2_PIN 44 // E1_CS_PIN
|
||||
#endif
|
||||
#endif
|
||||
|
||||
//
|
||||
// AUX3 : GND D52 D50 5V
|
||||
// NC D53 D51 D49
|
||||
|
||||
#define AUX3_03_PIN 53
|
||||
#define AUX3_04_PIN 52
|
||||
#define AUX3_05_PIN 51
|
||||
#define AUX3_06_PIN 50
|
||||
#define AUX3_07_PIN 49
|
||||
// AUX1 5V GND D2 D1
|
||||
// 2 4 6 8
|
||||
// 1 3 5 7
|
||||
// 5V GND A3 A4
|
||||
//
|
||||
#define AUX1_05_PIN 57 // (A3)
|
||||
#define AUX1_06_PIN 2
|
||||
#define AUX1_07_PIN 58 // (A4)
|
||||
#define AUX1_08_PIN 1
|
||||
|
||||
//
|
||||
// AUX4 : D16 D17 D23 D25 D27 D29 D31 D33 D35 D37 D39 D41 D43 D45 D47 D32 GND 5V
|
||||
// AUX2 GND A9 D40 D42 A11
|
||||
// 2 4 6 8 10
|
||||
// 1 3 5 7 9
|
||||
// VCC A5 A10 D44 A12
|
||||
//
|
||||
#define AUX2_03_PIN 59 // (A5)
|
||||
#define AUX2_04_PIN 63 // (A9)
|
||||
#define AUX2_05_PIN 64 // (A10)
|
||||
#define AUX2_06_PIN 40
|
||||
#define AUX2_07_PIN 44
|
||||
#define AUX2_08_PIN 42
|
||||
#define AUX2_09_PIN 66 // (A12)
|
||||
#define AUX2_10_PIN 65 // (A11)
|
||||
|
||||
//
|
||||
// AUX3 GND D52 D50 5V
|
||||
// 7 5 3 1
|
||||
// 8 6 4 2
|
||||
// NC D53 D51 D49
|
||||
//
|
||||
#define AUX3_02_PIN 49
|
||||
#define AUX3_03_PIN 50
|
||||
#define AUX3_04_PIN 51
|
||||
#define AUX3_05_PIN 52
|
||||
#define AUX3_06_PIN 53
|
||||
|
||||
//
|
||||
// AUX4 5V GND D32 D47 D45 D43 D41 D39 D37 D35 D33 D31 D29 D27 D25 D23 D17 D16
|
||||
//
|
||||
#define AUX4_03_PIN 32
|
||||
#define AUX4_04_PIN 47
|
||||
#define AUX4_05_PIN 45
|
||||
@@ -477,35 +516,69 @@
|
||||
#define AUX4_18_PIN 16
|
||||
|
||||
/**
|
||||
* LCD adapter. NOTE: These come in two variants. The socket keys can be
|
||||
* LCD adapters come in different variants. The socket keys can be
|
||||
* on either side, and may be backwards on some boards / displays.
|
||||
* ------ ------
|
||||
* D37 |10 9 | D35 (MISO) D50 |10 9 | D52 (SCK)
|
||||
* D17 | 8 7 | D16 D31 | 8 7 | D53
|
||||
* D23 6 5 D25 D33 6 5 D51 (MOSI)
|
||||
* D27 | 4 3 | D29 D49 | 4 3 | D41
|
||||
* GND | 2 1 | 5V GND | 2 1 | NC
|
||||
* ------ ------
|
||||
* EXP1 EXP2
|
||||
*/
|
||||
#ifndef EXP1_03_PIN
|
||||
#define EXP1_03_PIN AUX4_13_PIN
|
||||
#define EXP1_04_PIN AUX4_14_PIN
|
||||
#define EXP1_05_PIN AUX4_15_PIN
|
||||
#define EXP1_06_PIN AUX4_16_PIN
|
||||
#define EXP1_07_PIN AUX4_18_PIN
|
||||
#define EXP1_08_PIN AUX4_17_PIN
|
||||
#define EXP1_09_PIN AUX4_10_PIN
|
||||
#define EXP1_10_PIN AUX4_09_PIN
|
||||
#ifndef EXP1_08_PIN
|
||||
|
||||
#define EXP1_03_PIN AUX4_17_PIN
|
||||
#define EXP1_04_PIN AUX4_18_PIN
|
||||
#define EXP1_05_PIN AUX4_16_PIN
|
||||
#define EXP1_06_PIN AUX4_15_PIN
|
||||
#define EXP1_07_PIN AUX4_14_PIN
|
||||
#define EXP1_08_PIN AUX4_13_PIN
|
||||
|
||||
#define EXP2_01_PIN AUX3_03_PIN
|
||||
#define EXP2_02_PIN AUX3_05_PIN
|
||||
#define EXP2_04_PIN AUX3_06_PIN
|
||||
#define EXP2_06_PIN AUX3_04_PIN
|
||||
#define EXP2_07_PIN AUX3_02_PIN
|
||||
|
||||
#if ENABLED(G3D_PANEL)
|
||||
/** Gadgets3D Smart Adapter
|
||||
* ------ ------
|
||||
* 4-11 | 1 2 | 4-12 (MISO) 3-03 | 1 2 | 3-05 (SCK)
|
||||
* 4-17 | 3 4 | 4-18 4-10 | 3 4 | 3-06
|
||||
* 4-16 5 6 | 4-15 4-09 5 6 | 3-04 (MOSI)
|
||||
* 4-14 | 7 8 | 4-13 3-02 | 7 8 | 4-07
|
||||
* (GND) 4-02 | 9 10 | 4-01 (5V) -- | 9 10 | --
|
||||
* ------ ------
|
||||
* EXP1 EXP2
|
||||
*/
|
||||
#define EXP1_01_PIN AUX4_11_PIN
|
||||
#define EXP1_02_PIN AUX4_12_PIN
|
||||
|
||||
#define EXP2_03_PIN AUX4_10_PIN
|
||||
#define EXP2_05_PIN AUX4_09_PIN
|
||||
#define EXP2_08_PIN AUX4_07_PIN
|
||||
|
||||
#else
|
||||
|
||||
/** Smart Adapter (c) RRD
|
||||
* ------ ------
|
||||
* 4-09 | 1 2 | 4-10 (MISO) 3-03 | 1 2 | 3-05 (SCK)
|
||||
* 4-17 | 3 4 | 4-18 4-12 | 3 4 | 3-06
|
||||
* 4-16 5 6 | 4-15 4-11 5 6 | 3-04 (MOSI)
|
||||
* 4-14 | 7 8 | 4-13 3-02 | 7 8 | 4-07
|
||||
* (GND) 3-07 | 9 10 | 3-01 (5V) (GND) 3-07 | 9 10 | --
|
||||
* ------ ------
|
||||
* EXP1 EXP2
|
||||
*/
|
||||
#define EXP1_01_PIN AUX4_09_PIN
|
||||
#define EXP1_02_PIN AUX4_10_PIN
|
||||
|
||||
#if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
|
||||
#define EXP2_03_PIN AUX4_11_PIN
|
||||
#define EXP2_05_PIN AUX4_12_PIN
|
||||
#define EXP2_08_PIN -1 // RESET
|
||||
#else
|
||||
#define EXP2_03_PIN AUX4_12_PIN
|
||||
#define EXP2_05_PIN AUX4_11_PIN
|
||||
#define EXP2_08_PIN AUX4_07_PIN
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#define EXP2_03_PIN AUX4_07_PIN
|
||||
#define EXP2_04_PIN AUX3_07_PIN
|
||||
#define EXP2_05_PIN AUX3_05_PIN
|
||||
#define EXP2_06_PIN AUX4_11_PIN
|
||||
#define EXP2_07_PIN AUX3_03_PIN
|
||||
#define EXP2_08_PIN AUX4_12_PIN
|
||||
#define EXP2_09_PIN AUX3_04_PIN
|
||||
#define EXP2_10_PIN AUX3_06_PIN
|
||||
#endif
|
||||
|
||||
//////////////////////////
|
||||
@@ -514,77 +587,81 @@
|
||||
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
// Uncomment screen orientation
|
||||
//#define LCD_SCREEN_ROT_90
|
||||
//#define LCD_SCREEN_ROT_180
|
||||
//#define LCD_SCREEN_ROT_270
|
||||
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
|
||||
|
||||
//
|
||||
// LCD Display output pins
|
||||
//
|
||||
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
|
||||
|
||||
#define LCD_PINS_RS EXP2_04_PIN // CS chip select /SS chip slave select
|
||||
#define LCD_PINS_ENABLE EXP2_05_PIN // SID (MOSI)
|
||||
#define LCD_PINS_D4 EXP2_09_PIN // SCK (CLK) clock
|
||||
#define LCD_PINS_RS EXP2_07_PIN // CS chip select /SS chip slave select
|
||||
#define LCD_PINS_ENABLE EXP2_06_PIN // SID (MOSI)
|
||||
#define LCD_PINS_D4 EXP2_02_PIN // SCK (CLK) clock
|
||||
|
||||
#elif BOTH(IS_NEWPANEL, PANEL_ONE)
|
||||
|
||||
#define LCD_PINS_RS 40
|
||||
#define LCD_PINS_ENABLE 42
|
||||
#define LCD_PINS_D4 65
|
||||
#define LCD_PINS_D5 66
|
||||
#define LCD_PINS_D6 44
|
||||
#define LCD_PINS_D7 64
|
||||
#define LCD_PINS_RS AUX2_06_PIN
|
||||
#define LCD_PINS_ENABLE AUX2_08_PIN
|
||||
#define LCD_PINS_D4 AUX2_10_PIN
|
||||
#define LCD_PINS_D5 AUX2_09_PIN
|
||||
#define LCD_PINS_D6 AUX2_07_PIN
|
||||
#define LCD_PINS_D7 AUX2_05_PIN
|
||||
|
||||
#elif ENABLED(TFTGLCD_PANEL_SPI)
|
||||
|
||||
#define TFTGLCD_CS EXP2_06_PIN
|
||||
#define TFTGLCD_CS EXP2_05_PIN
|
||||
|
||||
#else
|
||||
|
||||
#if ENABLED(CR10_STOCKDISPLAY)
|
||||
|
||||
#define LCD_PINS_RS EXP1_04_PIN
|
||||
#define LCD_PINS_ENABLE EXP1_03_PIN
|
||||
#define LCD_PINS_D4 EXP1_05_PIN
|
||||
#define LCD_PINS_RS EXP1_07_PIN
|
||||
#define LCD_PINS_ENABLE EXP1_08_PIN
|
||||
#define LCD_PINS_D4 EXP1_06_PIN
|
||||
|
||||
#if !IS_NEWPANEL
|
||||
#define BEEPER_PIN EXP1_10_PIN
|
||||
#define BEEPER_PIN EXP1_01_PIN
|
||||
#endif
|
||||
|
||||
#elif ENABLED(ZONESTAR_LCD)
|
||||
|
||||
#error "CAUTION! ZONESTAR_LCD on RAMPS requires wiring modifications. It plugs into AUX2 but GND and 5V need to be swapped. Comment out this line to continue."
|
||||
#define LCD_PINS_RS 64
|
||||
#define LCD_PINS_ENABLE 44
|
||||
#define LCD_PINS_D4 63
|
||||
#define LCD_PINS_D5 40
|
||||
#define LCD_PINS_D6 42
|
||||
#define LCD_PINS_D7 65
|
||||
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
|
||||
#error "CAUTION! ZONESTAR_LCD on RAMPS requires wiring modifications. It plugs into AUX2 but GND and 5V need to be swapped. See 'pins_RAMPS.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
|
||||
#endif
|
||||
|
||||
#define LCD_PINS_RS AUX2_05_PIN
|
||||
#define LCD_PINS_ENABLE AUX2_07_PIN
|
||||
#define LCD_PINS_D4 AUX2_04_PIN
|
||||
#define LCD_PINS_D5 AUX2_06_PIN
|
||||
#define LCD_PINS_D6 AUX2_08_PIN
|
||||
#define LCD_PINS_D7 AUX2_10_PIN
|
||||
|
||||
#elif ENABLED(AZSMZ_12864)
|
||||
|
||||
// Pins only defined for RAMPS_SMART currently
|
||||
|
||||
#else
|
||||
|
||||
#if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
|
||||
#define LCD_PINS_DC EXP1_05_PIN // Set as output on init
|
||||
#define LCD_PINS_RS EXP1_04_PIN // Pull low for 1s to init
|
||||
#define LCD_PINS_DC EXP1_06_PIN // Set as output on init
|
||||
#define LCD_PINS_RS EXP1_07_PIN // Pull low for 1s to init
|
||||
// DOGM SPI LCD Support
|
||||
#define DOGLCD_A0 LCD_PINS_DC
|
||||
#define DOGLCD_CS EXP1_07_PIN
|
||||
#define DOGLCD_MOSI EXP1_08_PIN
|
||||
#define DOGLCD_SCK EXP1_06_PIN
|
||||
#define DOGLCD_CS EXP1_04_PIN
|
||||
#define DOGLCD_MOSI EXP1_03_PIN
|
||||
#define DOGLCD_SCK EXP1_05_PIN
|
||||
#else
|
||||
#define LCD_PINS_RS EXP1_07_PIN
|
||||
#define LCD_PINS_ENABLE EXP1_08_PIN
|
||||
#define LCD_PINS_D4 EXP1_06_PIN
|
||||
#define LCD_PINS_D5 EXP1_05_PIN
|
||||
#define LCD_PINS_D6 EXP1_04_PIN
|
||||
#define LCD_PINS_RS EXP1_04_PIN
|
||||
#define LCD_PINS_ENABLE EXP1_03_PIN
|
||||
#define LCD_PINS_D4 EXP1_05_PIN
|
||||
#define LCD_PINS_D5 EXP1_06_PIN
|
||||
#define LCD_PINS_D6 EXP1_07_PIN
|
||||
#endif
|
||||
|
||||
#define LCD_PINS_D7 EXP1_03_PIN
|
||||
#define LCD_PINS_D7 EXP1_08_PIN
|
||||
|
||||
#if !IS_NEWPANEL
|
||||
#define BEEPER_PIN EXP2_06_PIN
|
||||
#define BEEPER_PIN EXP2_05_PIN
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@@ -593,9 +670,9 @@
|
||||
// Buttons attached to a shift register
|
||||
// Not wired yet
|
||||
//#define SHIFT_CLK_PIN 38
|
||||
//#define SHIFT_LD_PIN 42
|
||||
//#define SHIFT_OUT_PIN 40
|
||||
//#define SHIFT_EN_PIN EXP1_08_PIN
|
||||
//#define SHIFT_LD_PIN AUX2_08_PIN
|
||||
//#define SHIFT_OUT_PIN AUX2_06_PIN
|
||||
//#define SHIFT_EN_PIN EXP1_03_PIN
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@@ -611,22 +688,22 @@
|
||||
|
||||
#if IS_RRD_SC
|
||||
|
||||
#define BEEPER_PIN EXP1_10_PIN
|
||||
#define BEEPER_PIN EXP1_01_PIN
|
||||
|
||||
#if ENABLED(CR10_STOCKDISPLAY)
|
||||
#define BTN_EN1 EXP1_08_PIN
|
||||
#define BTN_EN2 EXP1_06_PIN
|
||||
#define BTN_EN1 EXP1_03_PIN
|
||||
#define BTN_EN2 EXP1_05_PIN
|
||||
#else
|
||||
#define BTN_EN1 EXP2_08_PIN
|
||||
#define BTN_EN2 EXP2_06_PIN
|
||||
#define BTN_EN1 EXP2_03_PIN
|
||||
#define BTN_EN2 EXP2_05_PIN
|
||||
#endif
|
||||
|
||||
#define BTN_ENC EXP1_09_PIN
|
||||
#define BTN_ENC EXP1_02_PIN
|
||||
#ifndef SD_DETECT_PIN
|
||||
#define SD_DETECT_PIN EXP2_04_PIN
|
||||
#define SD_DETECT_PIN EXP2_07_PIN
|
||||
#endif
|
||||
#ifndef KILL_PIN
|
||||
#define KILL_PIN EXP2_03_PIN
|
||||
#define KILL_PIN EXP2_08_PIN
|
||||
#endif
|
||||
|
||||
#if ENABLED(BQ_LCD_SMART_CONTROLLER)
|
||||
@@ -635,10 +712,10 @@
|
||||
|
||||
#elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
|
||||
|
||||
#define BTN_EN1 64
|
||||
#define BTN_EN2 59
|
||||
#define BTN_ENC 63
|
||||
#define SD_DETECT_PIN 42
|
||||
#define BTN_EN1 AUX2_05_PIN
|
||||
#define BTN_EN2 AUX2_03_PIN
|
||||
#define BTN_ENC AUX2_04_PIN
|
||||
#define SD_DETECT_PIN AUX2_08_PIN
|
||||
|
||||
#elif ENABLED(LCD_I2C_PANELOLU2)
|
||||
|
||||
@@ -646,119 +723,118 @@
|
||||
#define BTN_EN2 AUX4_06_PIN
|
||||
#define BTN_ENC AUX4_03_PIN
|
||||
#define LCD_SDSS SDSS
|
||||
#define KILL_PIN EXP2_03_PIN
|
||||
#define KILL_PIN EXP2_08_PIN
|
||||
|
||||
#elif ENABLED(LCD_I2C_VIKI)
|
||||
|
||||
#define BTN_EN1 40 // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
|
||||
#define BTN_EN2 42
|
||||
#define BTN_EN1 AUX2_06_PIN // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains AUX2-06 and AUX2-08.
|
||||
#define BTN_EN2 AUX2_08_PIN
|
||||
#define BTN_ENC -1
|
||||
|
||||
#define LCD_SDSS SDSS
|
||||
#define SD_DETECT_PIN EXP2_04_PIN
|
||||
#define SD_DETECT_PIN EXP2_07_PIN
|
||||
|
||||
#elif ANY(VIKI2, miniVIKI)
|
||||
#elif EITHER(VIKI2, miniVIKI)
|
||||
|
||||
#define DOGLCD_CS 45
|
||||
#define DOGLCD_A0 44
|
||||
#define LCD_SCREEN_ROT_180
|
||||
#define DOGLCD_CS AUX4_05_PIN
|
||||
#define DOGLCD_A0 AUX2_07_PIN
|
||||
#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
|
||||
|
||||
#define BEEPER_PIN EXP2_06_PIN
|
||||
#define STAT_LED_RED_PIN 32
|
||||
#define STAT_LED_BLUE_PIN EXP1_09_PIN
|
||||
#define BEEPER_PIN EXP2_05_PIN
|
||||
#define STAT_LED_RED_PIN AUX4_03_PIN
|
||||
#define STAT_LED_BLUE_PIN EXP1_02_PIN
|
||||
|
||||
#define BTN_EN1 22
|
||||
#define BTN_EN2 7
|
||||
#define BTN_ENC 39
|
||||
#define BTN_ENC AUX4_08_PIN
|
||||
|
||||
#define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board
|
||||
#define KILL_PIN EXP2_08_PIN
|
||||
#define KILL_PIN EXP2_03_PIN
|
||||
|
||||
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
|
||||
|
||||
#define DOGLCD_CS EXP1_03_PIN
|
||||
#define DOGLCD_A0 EXP1_04_PIN
|
||||
#define DOGLCD_CS EXP1_08_PIN
|
||||
#define DOGLCD_A0 EXP1_07_PIN
|
||||
|
||||
#define BEEPER_PIN EXP1_06_PIN
|
||||
#define LCD_BACKLIGHT_PIN EXP2_06_PIN
|
||||
#define BEEPER_PIN EXP1_05_PIN
|
||||
#define LCD_BACKLIGHT_PIN EXP2_05_PIN
|
||||
|
||||
#define BTN_EN1 EXP1_09_PIN
|
||||
#define BTN_EN2 EXP1_10_PIN
|
||||
#define BTN_ENC EXP2_08_PIN
|
||||
#define BTN_EN1 EXP1_02_PIN
|
||||
#define BTN_EN2 EXP1_01_PIN
|
||||
#define BTN_ENC EXP2_03_PIN
|
||||
|
||||
#define LCD_SDSS SDSS
|
||||
#define SD_DETECT_PIN EXP2_04_PIN
|
||||
#define KILL_PIN EXP2_03_PIN
|
||||
#define SD_DETECT_PIN EXP2_07_PIN
|
||||
#define KILL_PIN EXP2_08_PIN
|
||||
|
||||
#elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
|
||||
|
||||
#define BEEPER_PIN EXP1_10_PIN
|
||||
#define BTN_ENC EXP1_09_PIN
|
||||
#define BEEPER_PIN EXP1_01_PIN
|
||||
#define BTN_ENC EXP1_02_PIN
|
||||
#ifndef SD_DETECT_PIN
|
||||
#define SD_DETECT_PIN EXP2_04_PIN
|
||||
#define SD_DETECT_PIN EXP2_07_PIN
|
||||
#endif
|
||||
|
||||
#ifndef KILL_PIN
|
||||
#define KILL_PIN EXP2_03_PIN
|
||||
#define KILL_PIN EXP2_08_PIN
|
||||
#endif
|
||||
|
||||
#if ENABLED(MKS_MINI_12864)
|
||||
|
||||
#define DOGLCD_A0 EXP1_04_PIN
|
||||
#define DOGLCD_CS EXP1_05_PIN
|
||||
#define DOGLCD_A0 EXP1_07_PIN
|
||||
#define DOGLCD_CS EXP1_06_PIN
|
||||
|
||||
// not connected to a pin
|
||||
#define LCD_BACKLIGHT_PIN -1 // 65 (MKS mini12864 can't adjust backlight by software!)
|
||||
|
||||
#define BTN_EN1 EXP2_08_PIN
|
||||
#define BTN_EN2 EXP2_06_PIN
|
||||
#define BTN_EN1 EXP2_03_PIN
|
||||
#define BTN_EN2 EXP2_05_PIN
|
||||
|
||||
#elif ENABLED(FYSETC_MINI_12864)
|
||||
|
||||
// From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
|
||||
// From https://wiki.fysetc.com/Mini12864_Panel/
|
||||
|
||||
#define DOGLCD_A0 EXP1_07_PIN
|
||||
#define DOGLCD_CS EXP1_08_PIN
|
||||
#define DOGLCD_A0 EXP1_04_PIN
|
||||
#define DOGLCD_CS EXP1_03_PIN
|
||||
|
||||
#define BTN_EN1 EXP2_06_PIN
|
||||
#define BTN_EN2 EXP2_08_PIN
|
||||
#define BTN_EN1 EXP2_05_PIN
|
||||
#define BTN_EN2 EXP2_03_PIN
|
||||
|
||||
//#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
|
||||
// results in LCD soft SPI mode 3, SD soft SPI mode 0
|
||||
|
||||
#define LCD_RESET_PIN EXP1_06_PIN // Must be high or open for LCD to operate normally.
|
||||
#define LCD_RESET_PIN EXP1_05_PIN // Must be high or open for LCD to operate normally.
|
||||
|
||||
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
|
||||
#ifndef RGB_LED_R_PIN
|
||||
#define RGB_LED_R_PIN EXP1_05_PIN
|
||||
#define RGB_LED_R_PIN EXP1_06_PIN
|
||||
#endif
|
||||
#ifndef RGB_LED_G_PIN
|
||||
#define RGB_LED_G_PIN EXP1_04_PIN
|
||||
#define RGB_LED_G_PIN EXP1_07_PIN
|
||||
#endif
|
||||
#ifndef RGB_LED_B_PIN
|
||||
#define RGB_LED_B_PIN EXP1_03_PIN
|
||||
#define RGB_LED_B_PIN EXP1_08_PIN
|
||||
#endif
|
||||
#elif ENABLED(FYSETC_MINI_12864_2_1)
|
||||
#define NEOPIXEL_PIN EXP1_05_PIN
|
||||
#define NEOPIXEL_PIN EXP1_06_PIN
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#elif ENABLED(MINIPANEL)
|
||||
|
||||
#define BEEPER_PIN 42
|
||||
// not connected to a pin
|
||||
#define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
|
||||
#define BEEPER_PIN AUX2_08_PIN
|
||||
#define LCD_BACKLIGHT_PIN AUX2_10_PIN
|
||||
|
||||
#define DOGLCD_A0 44
|
||||
#define DOGLCD_CS 66
|
||||
#define DOGLCD_A0 AUX2_07_PIN
|
||||
#define DOGLCD_CS AUX2_09_PIN
|
||||
|
||||
#define BTN_EN1 40
|
||||
#define BTN_EN2 63
|
||||
#define BTN_ENC 59
|
||||
#define BTN_EN1 AUX2_06_PIN
|
||||
#define BTN_EN2 AUX2_04_PIN
|
||||
#define BTN_ENC AUX2_03_PIN
|
||||
|
||||
#define SD_DETECT_PIN EXP2_04_PIN
|
||||
#define KILL_PIN 64
|
||||
#define SD_DETECT_PIN AUX3_02_PIN
|
||||
#define KILL_PIN AUX2_05_PIN
|
||||
|
||||
#elif ENABLED(ZONESTAR_LCD)
|
||||
|
||||
@@ -770,32 +846,31 @@
|
||||
|
||||
#elif ENABLED(G3D_PANEL)
|
||||
|
||||
#define BEEPER_PIN EXP2_06_PIN
|
||||
#define BEEPER_PIN EXP1_01_PIN
|
||||
|
||||
#define SD_DETECT_PIN EXP2_04_PIN
|
||||
#define KILL_PIN EXP2_03_PIN
|
||||
#define SD_DETECT_PIN EXP2_07_PIN
|
||||
#define KILL_PIN EXP2_08_PIN
|
||||
|
||||
#define BTN_EN1 EXP1_10_PIN
|
||||
#define BTN_EN2 EXP1_09_PIN
|
||||
#define BTN_ENC EXP2_08_PIN
|
||||
#define BTN_EN1 EXP2_05_PIN
|
||||
#define BTN_EN2 EXP2_03_PIN
|
||||
#define BTN_ENC EXP1_02_PIN
|
||||
|
||||
#elif IS_TFTGLCD_PANEL
|
||||
|
||||
#define SD_DETECT_PIN EXP2_04_PIN
|
||||
#define SD_DETECT_PIN EXP2_07_PIN
|
||||
|
||||
#else
|
||||
|
||||
#define BEEPER_PIN EXP2_06_PIN
|
||||
#define BEEPER_PIN EXP2_05_PIN
|
||||
|
||||
// Buttons are directly attached to AUX-2
|
||||
#if ENABLED(PANEL_ONE)
|
||||
#define BTN_EN1 59 // AUX2 PIN 3
|
||||
#define BTN_EN2 63 // AUX2 PIN 4
|
||||
#define BTN_ENC EXP2_04_PIN
|
||||
#if ENABLED(PANEL_ONE) // Buttons connect directly to AUX-2
|
||||
#define BTN_EN1 AUX2_03_PIN
|
||||
#define BTN_EN2 AUX2_04_PIN
|
||||
#define BTN_ENC AUX3_02_PIN
|
||||
#else
|
||||
#define BTN_EN1 EXP1_10_PIN
|
||||
#define BTN_EN2 EXP1_09_PIN
|
||||
#define BTN_ENC EXP2_08_PIN
|
||||
#define BTN_EN1 EXP1_01_PIN
|
||||
#define BTN_EN2 EXP1_02_PIN
|
||||
#define BTN_ENC EXP2_03_PIN
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@@ -804,60 +879,63 @@
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
#if IS_RRW_KEYPAD && !HAS_ADC_BUTTONS
|
||||
#define SHIFT_OUT_PIN 40
|
||||
#define SHIFT_CLK_PIN 44
|
||||
#define SHIFT_LD_PIN 42
|
||||
#define SHIFT_OUT_PIN AUX2_06_PIN
|
||||
#define SHIFT_CLK_PIN AUX2_07_PIN
|
||||
#define SHIFT_LD_PIN AUX2_08_PIN
|
||||
#ifndef BTN_EN1
|
||||
#define BTN_EN1 64
|
||||
#define BTN_EN1 AUX2_05_PIN
|
||||
#endif
|
||||
#ifndef BTN_EN2
|
||||
#define BTN_EN2 59
|
||||
#define BTN_EN2 AUX2_03_PIN
|
||||
#endif
|
||||
#ifndef BTN_ENC
|
||||
#define BTN_ENC 63
|
||||
#define BTN_ENC AUX2_04_PIN
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
|
||||
|
||||
#error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_RAMPS.h' for details. Comment out this line to continue."
|
||||
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
|
||||
#error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_RAMPS.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
|
||||
#endif
|
||||
|
||||
/**
|
||||
* FYSETC TFT-81050 display pinout
|
||||
*
|
||||
* Board Display
|
||||
* ----- -----
|
||||
* (SCK) D52 | 1 2 | D50 (MISO) MISO | 1 2 | SCK
|
||||
* (SD_CS) D53 | 3 4 | D33 (BNT_EN2) (BNT_EN2) MOD_RESET | 3 4 | SD_CS
|
||||
* (MOSI) D51 | 5 6 D31 (BNT_EN1) (BNT_EN1) LCD_CS | 5 6 MOSI
|
||||
* RESET | 7 8 | D49 (SD_DET) SD_DET | 7 8 | RESET
|
||||
* NC | 9 10| GND GND | 9 10| 5V
|
||||
* ----- -----
|
||||
* EXP2 EXP1
|
||||
* Board Display
|
||||
* ------ ------
|
||||
* (MISO) 50 | 1 2 | 52 (SCK) 5V |10 9 | GND
|
||||
* (LCD_CS) 33 | 3 4 | 53 (SD_CS) RESET | 8 7 | (SD_DET)
|
||||
* 31 5 6 | 51 (MOSI) (MOSI) 6 5 | (LCD_CS)
|
||||
* (SD_DET) 49 | 7 8 | RESET (SD_CS) | 4 3 | (MOD_RESET)
|
||||
* GND | 9 10 | -- (SCK) | 2 1 | (MISO)
|
||||
* ------ ------
|
||||
* EXP2 EXP1
|
||||
*
|
||||
* Needs custom cable:
|
||||
*
|
||||
* Board Adapter Display
|
||||
* _________
|
||||
* EXP2-1 ----------- EXP1-10
|
||||
* EXP2-2 ----------- EXP1-9
|
||||
* EXP2-4 ----------- EXP1-8
|
||||
* EXP2-4 ----------- EXP1-7
|
||||
* EXP2-3 ----------- EXP1-6
|
||||
* EXP2-6 ----------- EXP1-5
|
||||
* EXP2-7 ----------- EXP1-4
|
||||
* EXP2-8 ----------- EXP1-3
|
||||
* EXP2-1 ----------- EXP1-2
|
||||
* EXP1-10 ---------- EXP1-1
|
||||
* ----------------------------------
|
||||
* EXP2-1 <--diode--- EXP1-1 MISO
|
||||
* EXP2-2 ----------- EXP1-2 SCK
|
||||
* EXP2-4 ----------- EXP1-3 MOD_RST
|
||||
* EXP2-4 ----------- EXP1-4 SD_CS
|
||||
* EXP2-3 ----------- EXP1-5 LCD_CS
|
||||
* EXP2-6 ----------- EXP1-6 MOSI
|
||||
* EXP2-7 ----------- EXP1-7 SD DET
|
||||
* EXP2-8 ----------- EXP1-8 RESET
|
||||
* EXP2-1 ----------- EXP1-9 MISO->GND
|
||||
* EXP1-10 ---------- EXP1-10 5V
|
||||
*
|
||||
* NOTE: The MISO pin should not get a 5V signal.
|
||||
* To fix, insert a 1N4148 diode in the MISO line.
|
||||
*/
|
||||
|
||||
#define BEEPER_PIN EXP1_10_PIN
|
||||
#define BEEPER_PIN EXP1_01_PIN
|
||||
|
||||
#define SD_DETECT_PIN EXP2_04_PIN
|
||||
#define SD_DETECT_PIN EXP2_07_PIN
|
||||
|
||||
#define CLCD_MOD_RESET EXP2_05_PIN
|
||||
#define CLCD_SPI_CS EXP2_03_PIN
|
||||
|
||||
#define CLCD_MOD_RESET EXP2_08_PIN
|
||||
#define CLCD_SPI_CS EXP2_06_PIN
|
||||
#endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050
|
||||
|
||||
Reference in New Issue
Block a user