Merge upstream changes from Marlin 2.1.2
This commit is contained in:
@@ -101,9 +101,9 @@
|
||||
// LCD Display input pins
|
||||
//
|
||||
#define BTN_UP 25
|
||||
#define BTN_DWN 26
|
||||
#define BTN_LFT 27
|
||||
#define BTN_RT 28
|
||||
#define BTN_DOWN 26
|
||||
#define BTN_LEFT 27
|
||||
#define BTN_RIGHT 28
|
||||
|
||||
// 'OK' button
|
||||
#define BTN_ENC 29
|
||||
|
@@ -203,14 +203,13 @@
|
||||
|
||||
#define BTN_EN2 75 // J4, UP
|
||||
#define BTN_EN1 73 // J3, DOWN
|
||||
//STOP button connected as KILL_PIN
|
||||
#define KILL_PIN 14 // J1, RIGHT
|
||||
//KILL - not connected
|
||||
// STOP button connected as KILL_PIN
|
||||
#define KILL_PIN 14 // J1, RIGHT (not connected)
|
||||
|
||||
#define BEEPER_PIN 8 // H5, SD_WP
|
||||
|
||||
//on board leds
|
||||
#define STAT_LED_RED_LED SERVO0_PIN // C1 (1280-EX1, DEBUG2)
|
||||
// Onboard leds
|
||||
#define STAT_LED_RED_PIN SERVO0_PIN // C1 (1280-EX1, DEBUG2)
|
||||
#define STAT_LED_BLUE_PIN SERVO1_PIN // C0 (1280-EX2, DEBUG3)
|
||||
|
||||
#else
|
||||
@@ -220,9 +219,9 @@
|
||||
#define SR_STROBE_PIN 33 // C4
|
||||
|
||||
#define BTN_UP 75 // J4
|
||||
#define BTN_DWN 73 // J3
|
||||
#define BTN_LFT 72 // J2
|
||||
#define BTN_RT 14 // J1
|
||||
#define BTN_DOWN 73 // J3
|
||||
#define BTN_LEFT 72 // J2
|
||||
#define BTN_RIGHT 14 // J1
|
||||
|
||||
// Disable encoder
|
||||
#undef BTN_EN1
|
||||
|
@@ -135,7 +135,7 @@
|
||||
#if IS_NEWPANEL
|
||||
#define BTN_ENC 16 // Enter Pin
|
||||
#define BTN_UP 19 // Button UP Pin
|
||||
#define BTN_DWN 17 // Button DOWN Pin
|
||||
#define BTN_DOWN 17 // Button DOWN Pin
|
||||
#endif
|
||||
|
||||
// Additional connectors/pins on the Overlord V1.X board
|
||||
|
Reference in New Issue
Block a user