Browse Source
Merge pull request #8260 from thinkyhead/bf2_anet_keypad_ramps
[2.0] RAMPS pins for ANET_KEYPAD_LCD
pull/1/head
Scott Lahteine
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
16 additions and
3 deletions
-
Marlin/src/inc/Conditionals_LCD.h
-
Marlin/src/lcd/ultralcd.cpp
-
Marlin/src/pins/pins_ANET_10.h
-
Marlin/src/pins/pins_RAMPS.h
|
@ -53,6 +53,7 @@ |
|
|
// this helps to implement ADC_KEYPAD menus
|
|
|
// this helps to implement ADC_KEYPAD menus
|
|
|
#define ENCODER_PULSES_PER_STEP 1 |
|
|
#define ENCODER_PULSES_PER_STEP 1 |
|
|
#define ENCODER_STEPS_PER_MENU_ITEM 1 |
|
|
#define ENCODER_STEPS_PER_MENU_ITEM 1 |
|
|
|
|
|
#define ENCODER_FEEDRATE_DEADZONE 2 |
|
|
#define REVERSE_MENU_DIRECTION |
|
|
#define REVERSE_MENU_DIRECTION |
|
|
|
|
|
|
|
|
#elif ENABLED(ANET_FULL_GRAPHICS_LCD) |
|
|
#elif ENABLED(ANET_FULL_GRAPHICS_LCD) |
|
|
|
@ -4449,14 +4449,13 @@ void lcd_init() { |
|
|
); |
|
|
); |
|
|
|
|
|
|
|
|
#if ENABLED(NEWPANEL) |
|
|
#if ENABLED(NEWPANEL) |
|
|
|
|
|
|
|
|
#if BUTTON_EXISTS(EN1) |
|
|
#if BUTTON_EXISTS(EN1) |
|
|
SET_INPUT_PULLUP(BTN_EN1); |
|
|
SET_INPUT_PULLUP(BTN_EN1); |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
#if BUTTON_EXISTS(EN2) |
|
|
#if BUTTON_EXISTS(EN2) |
|
|
SET_INPUT_PULLUP(BTN_EN2); |
|
|
SET_INPUT_PULLUP(BTN_EN2); |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
#if BUTTON_EXISTS(ENC) |
|
|
#if BUTTON_EXISTS(ENC) |
|
|
SET_INPUT_PULLUP(BTN_ENC); |
|
|
SET_INPUT_PULLUP(BTN_ENC); |
|
|
#endif |
|
|
#endif |
|
|
|
@ -166,7 +166,6 @@ |
|
|
#define BTN_EN2 -1 |
|
|
#define BTN_EN2 -1 |
|
|
#define BTN_ENC -1 |
|
|
#define BTN_ENC -1 |
|
|
#define ADC_KEYPAD_PIN 1 |
|
|
#define ADC_KEYPAD_PIN 1 |
|
|
#define ENCODER_FEEDRATE_DEADZONE 2 |
|
|
|
|
|
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) || ENABLED(ANET_FULL_GRAPHICS_LCD) |
|
|
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) || ENABLED(ANET_FULL_GRAPHICS_LCD) |
|
|
// Pin definitions for the Anet A6 Full Graphics display and the RepRapDiscount Full Graphics
|
|
|
// Pin definitions for the Anet A6 Full Graphics display and the RepRapDiscount Full Graphics
|
|
|
// display using an adapter board // https://go.aisler.net/benlye/anet-lcd-adapter/pcb
|
|
|
// display using an adapter board // https://go.aisler.net/benlye/anet-lcd-adapter/pcb
|
|
|
|
@ -489,3 +489,17 @@ |
|
|
#endif // NEWPANEL
|
|
|
#endif // NEWPANEL
|
|
|
|
|
|
|
|
|
#endif // ULTRA_LCD
|
|
|
#endif // ULTRA_LCD
|
|
|
|
|
|
|
|
|
|
|
|
#if ENABLED(ANET_KEYPAD_LCD) |
|
|
|
|
|
#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 |
|
|
|
|
|
#define ADC_KEYPAD_PIN 12 |
|
|
|
|
|
#define BTN_EN1 -1 |
|
|
|
|
|
#define BTN_EN2 -1 |
|
|
|
|
|
#define BTN_ENC -1 |
|
|
|
|
|
// pin 29 N/C
|
|
|
|
|
|
#endif // ANET_KEYPAD_LCD
|
|
|