1
0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-29 23:07:42 +00:00

Optional ADC_KEYPAD pin with ANET_10 (#13158)

This commit is contained in:
7eggert 2019-02-14 03:50:11 +01:00 committed by Scott Lahteine
parent 01674c5c8d
commit 369d756b74

View File

@ -154,31 +154,32 @@
*/ */
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
#define LCD_SDSS 28 #define LCD_SDSS 28
#if ENABLED(ADC_KEYPAD) #if ENABLED(ADC_KEYPAD)
#define SERVO0_PIN 27 // free for BLTouch/3D-Touch #define SERVO0_PIN 27 // free for BLTouch/3D-Touch
#define LCD_PINS_RS 28 #ifndef LCD_I2C_TYPE_PCF8575
#define LCD_PINS_ENABLE 29 #define LCD_PINS_RS 28
#define LCD_PINS_D4 10 #define LCD_PINS_ENABLE 29
#define LCD_PINS_D5 11 #define LCD_PINS_D4 10
#define LCD_PINS_D6 16 #define LCD_PINS_D5 11
#define LCD_PINS_D7 17 #define LCD_PINS_D6 16
#define BTN_EN1 -1 #define LCD_PINS_D7 17
#define BTN_EN2 -1 #endif
#define BTN_ENC -1 #ifndef ADC_KEYPAD_PIN
#define ADC_KEYPAD_PIN 1 #define ADC_KEYPAD_PIN 1 // Analog Input
#endif
#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
// See below for alternative pin definitions for use with https://www.thingiverse.com/thing:2103748 // See below for alternative pin definitions for use with https://www.thingiverse.com/thing:2103748
#define SERVO0_PIN 29 // free for BLTouch/3D-Touch #define SERVO0_PIN 29 // free for BLTouch/3D-Touch
#define BEEPER_PIN 17 #define BEEPER_PIN 17
#define LCD_PINS_RS 27 #define LCD_PINS_RS 27
#define LCD_PINS_ENABLE 28 #define LCD_PINS_ENABLE 28
#define LCD_PINS_D4 30 #define LCD_PINS_D4 30
#define BTN_EN1 11 #define BTN_EN1 11
#define BTN_EN2 10 #define BTN_EN2 10
#define BTN_ENC 16 #define BTN_ENC 16
#ifndef ST7920_DELAY_1 #ifndef ST7920_DELAY_1
#define ST7920_DELAY_1 DELAY_NS(0) #define ST7920_DELAY_1 DELAY_NS(0)
#endif #endif
@ -192,7 +193,7 @@
#define STD_ENCODER_STEPS_PER_MENU_ITEM 1 #define STD_ENCODER_STEPS_PER_MENU_ITEM 1
#endif #endif
#else #else
#define SERVO0_PIN 27 #define SERVO0_PIN 27
#endif #endif
/** /**