Sfoglia il codice sorgente

Merge pull request #8260 from thinkyhead/bf2_anet_keypad_ramps

[2.0] RAMPS pins for ANET_KEYPAD_LCD
Scott Lahteine 7 anni fa
parent
commit
47e0ee8eff
Nessun account collegato all'indirizzo email del committer

+ 1
- 0
Marlin/src/inc/Conditionals_LCD.h Vedi File

@@ -53,6 +53,7 @@
53 53
   // this helps to implement ADC_KEYPAD menus
54 54
   #define ENCODER_PULSES_PER_STEP 1
55 55
   #define ENCODER_STEPS_PER_MENU_ITEM 1
56
+  #define ENCODER_FEEDRATE_DEADZONE 2
56 57
   #define REVERSE_MENU_DIRECTION
57 58
 
58 59
 #elif ENABLED(ANET_FULL_GRAPHICS_LCD)

+ 1
- 2
Marlin/src/lcd/ultralcd.cpp Vedi File

@@ -4449,14 +4449,13 @@ void lcd_init() {
4449 4449
   );
4450 4450
 
4451 4451
   #if ENABLED(NEWPANEL)
4452
+
4452 4453
     #if BUTTON_EXISTS(EN1)
4453 4454
       SET_INPUT_PULLUP(BTN_EN1);
4454 4455
     #endif
4455
-
4456 4456
     #if BUTTON_EXISTS(EN2)
4457 4457
       SET_INPUT_PULLUP(BTN_EN2);
4458 4458
     #endif
4459
-
4460 4459
     #if BUTTON_EXISTS(ENC)
4461 4460
       SET_INPUT_PULLUP(BTN_ENC);
4462 4461
     #endif

+ 0
- 1
Marlin/src/pins/pins_ANET_10.h Vedi File

@@ -166,7 +166,6 @@
166 166
     #define BTN_EN2          -1
167 167
     #define BTN_ENC          -1
168 168
     #define ADC_KEYPAD_PIN    1
169
-    #define ENCODER_FEEDRATE_DEADZONE 2
170 169
   #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) || ENABLED(ANET_FULL_GRAPHICS_LCD)
171 170
     // Pin definitions for the Anet A6 Full Graphics display and the RepRapDiscount Full Graphics
172 171
     // display using an adapter board  // https://go.aisler.net/benlye/anet-lcd-adapter/pcb

+ 14
- 0
Marlin/src/pins/pins_RAMPS.h Vedi File

@@ -489,3 +489,17 @@
489 489
   #endif // NEWPANEL
490 490
 
491 491
 #endif // ULTRA_LCD
492
+
493
+#if ENABLED(ANET_KEYPAD_LCD)
494
+  #define LCD_PINS_RS        64
495
+  #define LCD_PINS_ENABLE    44
496
+  #define LCD_PINS_D4        63
497
+  #define LCD_PINS_D5        40
498
+  #define LCD_PINS_D6        42
499
+  #define LCD_PINS_D7        65
500
+  #define ADC_KEYPAD_PIN     12
501
+  #define BTN_EN1            -1
502
+  #define BTN_EN2            -1
503
+  #define BTN_ENC            -1
504
+  // pin 29 N/C
505
+#endif // ANET_KEYPAD_LCD

Loading…
Annulla
Salva