zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add Skynet/ANET A10 support

Browse source
This commit is contained in:
Bob-the-Kuhn 2017-06-10 00:12:18 -05:00 committed by Scott Lahteine
parent eb314373bb
commit 9651d01e1a
41 changed files with 3709 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Marlin/Conditionals_LCD.h
View file

@ -46,6 +46,21 @@
#define NEWPANEL #define NEWPANEL
#define DEFAULT_LCD_CONTRAST 17 #define DEFAULT_LCD_CONTRAST 17
#elif ENABLED(ANET_KEYPAD_LCD)
#define REPRAPWORLD_KEYPAD
#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0
#define ADC_KEYPAD
#define ADC_KEY_NUM 8
#define ULTIPANEL
// this helps to implement ADC_KEYPAD menus
#define ENCODER_STEPS_PER_MENU_ITEM 1
#define REVERSE_MENU_DIRECTION
#elif ENABLED(ANET_FULL_GRAPHICS_LCD)
#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
#elif ENABLED(BQ_LCD_SMART_CONTROLLER) #elif ENABLED(BQ_LCD_SMART_CONTROLLER)
#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER

5
Marlin/SanityCheck.h
View file

@ -1102,7 +1102,7 @@ static_assert(1 >= 0
#if ENABLED(MINIPANEL) #if ENABLED(MINIPANEL)
+ 1 + 1
#endif #endif
#if ENABLED(REPRAPWORLD_KEYPAD) && DISABLED(CARTESIO_UI) #if ENABLED(REPRAPWORLD_KEYPAD) && DISABLED(CARTESIO_UI) && DISABLED(ANET_KEYPAD_LCD)
+ 1 + 1
#endif #endif
#if ENABLED(RIGIDBOT_PANEL) #if ENABLED(RIGIDBOT_PANEL)
@ -1138,6 +1138,9 @@ static_assert(1 >= 0
#if ENABLED(OLED_PANEL_TINYBOY2) #if ENABLED(OLED_PANEL_TINYBOY2)
+ 1 + 1
#endif #endif
#if ENABLED(ANET_KEYPAD_LCD)
+ 1
#endif
, "Please select no more than one LCD controller option." , "Please select no more than one LCD controller option."
); );

1
Marlin/boards.h
View file

@ -59,6 +59,7 @@
#define BOARD_MELZI_MAKR3D 66 // Melzi with ATmega1284 (MaKr3d version) #define BOARD_MELZI_MAKR3D 66 // Melzi with ATmega1284 (MaKr3d version)
#define BOARD_AZTEEG_X3 67 // Azteeg X3 #define BOARD_AZTEEG_X3 67 // Azteeg X3
#define BOARD_AZTEEG_X3_PRO 68 // Azteeg X3 Pro #define BOARD_AZTEEG_X3_PRO 68 // Azteeg X3 Pro
#define BOARD_ANET_10 69 // Anet 1.0 (Melzi clone)
#define BOARD_ULTIMAKER 7 // Ultimaker #define BOARD_ULTIMAKER 7 // Ultimaker
#define BOARD_ULTIMAKER_OLD 71 // Ultimaker (Older electronics. Pre 1.5.4. This is rare) #define BOARD_ULTIMAKER_OLD 71 // Ultimaker (Older electronics. Pre 1.5.4. This is rare)
#define BOARD_ULTIMAIN_2 72 // Ultimainboard 2.x (Uses TEMP_SENSOR 20) #define BOARD_ULTIMAIN_2 72 // Ultimainboard 2.x (Uses TEMP_SENSOR 20)

1607
Marlin/example_configurations/Anet/Configuration.h Normal file
View file

File diff suppressed because it is too large Load diff

1349
Marlin/example_configurations/Anet/Configuration_adv.h Normal file
View file

File diff suppressed because it is too large Load diff

10
Marlin/example_configurations/CL-260/Configuration.h
View file

@ -1370,6 +1370,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/Cartesio/Configuration.h
View file

@ -1367,6 +1367,16 @@
// //
#define CARTESIO_UI #define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/Felix/Configuration.h
View file

@ -1351,6 +1351,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/Felix/DUAL/Configuration.h
View file

@ -1351,6 +1351,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h
View file

@ -1373,6 +1373,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/Hephestos/Configuration.h
View file

@ -1359,6 +1359,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/Hephestos_2/Configuration.h
View file

@ -1362,6 +1362,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/K8200/Configuration.h
View file

@ -1401,6 +1401,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/K8400/Configuration.h
View file

@ -1369,6 +1369,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/K8400/Dual-head/Configuration.h
View file

@ -1369,6 +1369,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/M150/Configuration.h
View file

@ -1396,6 +1396,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View file

@ -1369,6 +1369,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/RigidBot/Configuration.h
View file

@ -1369,6 +1369,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/SCARA/Configuration.h
View file

@ -1381,6 +1381,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/TAZ4/Configuration.h
View file

@ -1388,6 +1388,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/TinyBoy2/Configuration.h
View file

@ -1425,6 +1425,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/WITBOX/Configuration.h
View file

@ -1359,6 +1359,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/adafruit/ST7565/Configuration.h
View file

@ -1369,6 +1369,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
View file

@ -1490,6 +1490,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
View file

@ -1491,6 +1491,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/delta/generic/Configuration.h
View file

@ -1480,6 +1480,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View file

@ -1483,6 +1483,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/delta/kossel_pro/Configuration.h
View file

@ -1488,6 +1488,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/delta/kossel_xl/Configuration.h
View file

@ -1546,6 +1546,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h
View file

@ -1385,6 +1385,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/makibox/Configuration.h
View file

@ -1372,6 +1372,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/tvrrug/Round2/Configuration.h
View file

@ -1364,6 +1364,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

10
Marlin/example_configurations/wt150/Configuration.h
View file

@ -1375,6 +1375,16 @@
// //
//#define CARTESIO_UI //#define CARTESIO_UI
//
// ANET_10 Controller supported displays.
//
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
// This LCD is known to be susceptible to electrical interference
// which scrambles the display. Pressing any button clears it up.
//#define ANET_FULL_GRAPHICS_LCD // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
// A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h).
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

2
Marlin/pins.h
View file

@ -107,6 +107,8 @@
#include "pins_AZTEEG_X3.h" #include "pins_AZTEEG_X3.h"
#elif MB(AZTEEG_X3_PRO) #elif MB(AZTEEG_X3_PRO)
#include "pins_AZTEEG_X3_PRO.h" #include "pins_AZTEEG_X3_PRO.h"
#elif MB(ANET_10)
#include "pins_ANET_10.h"
#elif MB(ULTIMAKER) #elif MB(ULTIMAKER)
#include "pins_ULTIMAKER.h" #include "pins_ULTIMAKER.h"
#elif MB(ULTIMAKER_OLD) #elif MB(ULTIMAKER_OLD)

5
Marlin/pinsDebug.h
View file

@ -129,6 +129,11 @@ const PinInfo pin_array[] PROGMEM = {
bool get_pinMode(int8_t pin) {return *portModeRegister(digitalPinToPort_DEBUG(pin)) & digitalPinToBitMask_DEBUG(pin); } bool get_pinMode(int8_t pin) {return *portModeRegister(digitalPinToPort_DEBUG(pin)) & digitalPinToBitMask_DEBUG(pin); }
#endif #endif
#if defined(__AVR_ATmega1284P__) // 1284 IDE extensions set this to the number of
#undef NUM_DIGITAL_PINS // digital only pins while all other CPUs have it
#define NUM_DIGITAL_PINS 32 // set to digital only + digital/analog
#endif
#define PWM_PRINT(V) do{ sprintf_P(buffer, PSTR("PWM: %4d"), V); SERIAL_ECHO(buffer); }while(0) #define PWM_PRINT(V) do{ sprintf_P(buffer, PSTR("PWM: %4d"), V); SERIAL_ECHO(buffer); }while(0)
#define PWM_CASE(N,Z) \ #define PWM_CASE(N,Z) \
case TIMER##N##Z: \ case TIMER##N##Z: \

3
Marlin/pinsDebug_list.h
View file

@ -29,6 +29,9 @@
#line 0 // set __LINE__ to a known value for both passes #line 0 // set __LINE__ to a known value for both passes
#if PIN_EXISTS(ADC_KEYPAD) && ADC_KEYPAD_PIN < NUM_ANALOG_INPUTS
REPORT_NAME_ANALOG(ADC_KEYPAD_PIN, __LINE__ )
#endif
#if defined(__FD) && __FD >= 0 #if defined(__FD) && __FD >= 0
REPORT_NAME_DIGITAL(__FD, __LINE__ ) REPORT_NAME_DIGITAL(__FD, __LINE__ )
#endif #endif

274
Marlin/pins_ANET_10.h Normal file
View file

@ -0,0 +1,274 @@
/**
* Marlin 3D Printer Firmware
* Copyright (C) 2017 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
/**
* Anet V1.0 board pin assignments
*/
/**
* Rev B 16 JUN 2017
*
* 1) no longer uses Sanguino files to define some of the pins
* 2) added pointers to useable Arduino IDE extensions
*
*/
/**
* The standard Arduino IDE extension (board manager) for this board
* is located at https://github.com/SkyNet3D/anet-board.
*
* Installation instructions are on that page.
*
* After copying the files to the appropriate location, restart Arduino and
* you'll see "Anet V1.0" and "Anet V1.0 (Optiboot)" in the boards list.
*
* "Anet V1.0" uses the bootloader that was installed on the board when
* it shipped from the factory.
*
* "Anet V1.0 (Optiboot)" frees up another 3K of FLASH. You'll need to burn
* a new bootloader to the board to be able to automatically download a
* compiled image.
*
*/
/**
* Another usable Arduino IDE extension (board manager) can be found at
* https://github.com/Lauszus/Sanguino
*
* This extension has been tested on Arduino 1.6.12 & 1.8.0
*
* Here's the JSON path:
* https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
*
* When installing select 1.0.2
*
* Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
* Just use the above JSON URL instead of Sparkfun's JSON.
*
* Once installed select the Sanguino board and then select the CPU.
*
*/
/**
* To burn a new bootloader:
*
* 1. Connect your programmer to the board.
* 2. In the Arduino IDE select the board and then select the programmer.
* 3. In the Arduino IDE click on "burn bootloader". Don't worry about the "verify failed at 1F000" error message.
* 4. The programmer is no longer needed. Remove it.
*/
/**
* Additional info:
*
* Anet Schematics - https://github.com/ralf-e/ANET-3D-Board-V1.0
* Wiring RRDFG Smart Controller - http://www.thingiverse.com/thing:2103748
* SkyNet3D Anet software development - https://github.com/SkyNet3D/Marlin/
* Anet Users / Skynet SW on Facebook - https://www.facebook.com/skynet3ddevelopment/
*
* Many thanks to Hans Raaf (@oderwat) for developing the Anet-specific software and supporting the Anet community.
*/
#if !defined(__AVR_ATmega1284P__)
#error "Oops! Make sure you have 'Anet V1.0', 'Anet V1.0 (Optiboot)' or 'Sanguino' selected from the 'Tools -> Boards' menu."
#endif
#ifndef BOARD_NAME
#define BOARD_NAME "Anet"
#endif
#define LARGE_FLASH true
//
// Limit Switches
//
#define X_STOP_PIN 18
#define Y_STOP_PIN 19
#define Z_STOP_PIN 20
//
// Steppers
//
#define X_STEP_PIN 15
#define X_DIR_PIN 21
#define X_ENABLE_PIN 14
#define Y_STEP_PIN 22
#define Y_DIR_PIN 23
#define Y_ENABLE_PIN 14
#define Z_STEP_PIN 3
#define Z_DIR_PIN 2
#define Z_ENABLE_PIN 26
#define E0_STEP_PIN 1
#define E0_DIR_PIN 0
#define E0_ENABLE_PIN 14
//
// Temperature Sensors
//
#define TEMP_0_PIN 7 // Analog Input (pin 33 extruder)
#define TEMP_BED_PIN 6 // Analog Input (pin 34 bed)
//
// Heaters / Fans
//
#define HEATER_0_PIN 13 // (extruder)
#define HEATER_BED_PIN 12 // (bed)
#define FAN_PIN 4
//
// Misc. Functions
//
#define SDSS 31
#define LED_PIN -1
/**
* LCD / Controller
*
* Only the following displays are supported:
* ANET_KEYPAD_LCD
* ANET_FULL_GRAPHICS_LCD
* REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
*/
#if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
#define LCD_SDSS 28
#if ENABLED(ADC_KEYPAD)
#define SERVO0_PIN 27 // free for BLTouch/3D-Touch
#define LCD_PINS_RS 28
#define LCD_PINS_ENABLE 29
#define LCD_PINS_D4 10
#define LCD_PINS_D5 11
#define LCD_PINS_D6 16
#define LCD_PINS_D7 17
#define BTN_EN1 -1
#define BTN_EN2 -1
#define BTN_ENC -1
#define ADC_KEYPAD_PIN 1
#define ENCODER_FEEDRATE_DEADZONE 2
#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
// 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
#define SERVO0_PIN 29 // free for BLTouch/3D-Touch
#define BEEPER_PIN 17
#define LCD_PINS_RS 27
#define LCD_PINS_ENABLE 28
#define LCD_PINS_D4 30
#define BTN_EN1 11
#define BTN_EN2 10
#define BTN_ENC 16
#define ST7920_DELAY_1 DELAY_0_NOP
#define ST7920_DELAY_2 DELAY_1_NOP
#define ST7920_DELAY_3 DELAY_2_NOP
#ifndef ENCODER_STEPS_PER_MENU_ITEM
#define ENCODER_STEPS_PER_MENU_ITEM 1
#endif
#ifndef ENCODER_PULSES_PER_STEP
#define ENCODER_PULSES_PER_STEP 4
#endif
#endif
#endif // ULTRA_LCD && NEWPANEL
/**
* ====================================================================
* =============== Alternative RepRapDiscount Wiring ==================
* ====================================================================
*
* An alternative wiring scheme for the RepRapDiscount Full Graphics Display is
* published by oderwat on Thingiverse at https://www.thingiverse.com/thing:2103748.
*
* Using that adapter requires changing the pin definition as follows:
* #define SERVO0_PIN 27 // free for BLTouch/3D-Touch
* #define BEEPER_PIN 28
* #define LCD_PINS_RS 30
* #define LCD_PINS_ENABLE 29
* #define LCD_PINS_D4 17
*
* The BLTouch pin becomes LCD:3
*/
/**
* ====================================================================
* ===================== LCD PINOUTS ==================================
* ====================================================================
*
* Anet V1.0 controller | ANET_KEYPAD_LCD | ANET_FULL_ | RepRapDiscount Full | Thingiverse RepRap wiring
* physical logical alt | | GRAPHICS_LCD | Graphics Display Wiring | http://www.thingiverse
* pin pin functions | | | | .com/thing:2103748
*------------------------------------------------------------------------------------------------------------------------
* ANET-J3.1 8 *** | N/A | J3_TX *** | |
* ANET-J3.2 9 *** | N/A | J3_RX *** | |
* ANET-J3.3 6 MISO | N/A | MISO *** | EXP2.1 MISO | EXP2.1 MISO
* ANET-J3.4 +5V | N/A | +5V | |
* ANET-J3.5 7 SCK | N/A | SCK *** | EXP2.2 SCK | EXP2.2 SCK
* ANET-J3.6 5 MOSI | N/A | MOSI *** | EXP2.6 MOSI | EXP2.6 MOSI
* ANET-J3.7 !RESET | N/A | button | EXP2.8 panel button | EXP2.8 panel button
* ANET-J3.8 GND | N/A | GND | EXP2.9 GND | EXP2.9 GND
* ANET-J3.9 4 Don't use | N/A | N/C | |
* ANET-J3.10 +3.3V | N/A | +3.3V *** | |
* | | | |
* | | | |
* ANET-LCD.1 GND | GND | GND | EXP1.9 GND | EXP1.9 GND
* ANET-LCD.2 +5V | +5V | +5V | EXP1.10 +5V | EXP1.10 +5V
* ANET-LCD.3 27 A4 | N/C * | LCD_PINS_RS | EXP1.4 LCD_PINS_RS | EXP2.4 SDSS or N/C *
* ANET-LCD.4 10 | LCD_PINS_D4 | BTN_EN2 | EXP2.3 BTN_EN2 | EXP2.3 BTN_EN2
* ANET-LCD.5 28 A3 | LCD_PINS_RS | LCD_PINS_ENABLE | EXP1.3 LCD_PINS_ENABLE | EXP1.1 BEEPER_PIN
* ANET-LCD.6 11 | LCD_PINS_D5 | BTN_EN1 | EXP2.5 BTN_EN1 | EXP2.5 BTN_EN1
* ANET-LCD.7 29 A2 | LCD_PINS_ENABLE | N/C * | EXP2.4 SDSS or N/C * | EXP1.3 LCD_PINS_ENABLE
* ANET-LCD.8 16 SCL | LCD_PINS_D6 | BTN_ENC | EXP1.2 BTN_ENC | EXP1.2 BTN_ENC
* ANET-LCD.9 30 A1 | ADC_KEYPAD_PIN ** | LCD_PINS_D4 | EXP1.5 LCD_PINS_D4 | EXP1.4 LCD_PINS_RS
* ANET-LCD.10 17 SDA | LCD_PINS_D7 | BEEPER_PIN | EXP1.1 BEEPER_PIN | EXP1.5 LCD_PINS_D4
*
* N/C * - if not connected to the LCD can be used for BLTouch servo input
* ** - analog pin -WITHOUT a pullup
* *** - only connected to something if the Bluetooth module is populated
*/
/**
* REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
* physical pin function
* EXP1.1 BEEPER
* EXP1.2 BTN_ENC
* EXP1.3 LCD_PINS_ENABLE
* EXP1.4 LCD_PINS_RS
* EXP1.5 LCD_PINS_D4
* EXP1.6 LCD_PINS_D5 (not used)
* EXP1.7 LCD_PINS_D6 (not used)
* EXP1.8 LCD_PINS_D7 (not used)
* EXP1.9 GND
* EXP1.10 VCC
*
*
* EXP2.1 MISO
* EXP2.2 SCK
* EXP2.3 BTN_EN2
* EXP2.4 SDSS
* EXP2.5 BTN_EN1
* EXP2.6 MOSI
* EXP2.7 SD_DETECT_PIN
* EXP2.8 button
* EXP2.9 GND
* EXP2.10 NC
*/

30
Marlin/temperature.cpp
View file

@ -212,6 +212,11 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS],
#endif #endif
#endif #endif
#if ENABLED(ADC_KEYPAD)
uint32_t Temperature::current_ADCKey_raw = 0;
uint8_t Temperature::ADCKey_count = 0;
#endif
#if HAS_PID_HEATING #if HAS_PID_HEATING
void Temperature::PID_autotune(float temp, int hotend, int ncycles, bool set_result/*=false*/) { void Temperature::PID_autotune(float temp, int hotend, int ncycles, bool set_result/*=false*/) {
@ -1625,6 +1630,9 @@ void Temperature::isr() {
static uint8_t pwm_count = _BV(SOFT_PWM_SCALE); static uint8_t pwm_count = _BV(SOFT_PWM_SCALE);
// avoid multiple loads of pwm_count // avoid multiple loads of pwm_count
uint8_t pwm_count_tmp = pwm_count; uint8_t pwm_count_tmp = pwm_count;
#if ENABLED(ADC_KEYPAD)
static unsigned int raw_ADCKey_value = 0;
#endif
// Static members for each heater // Static members for each heater
#if ENABLED(SLOW_PWM_HEATERS) #if ENABLED(SLOW_PWM_HEATERS)
@ -1997,9 +2005,29 @@ void Temperature::isr() {
raw_filwidth_value -= (raw_filwidth_value >> 7); // Subtract 1/128th of the raw_filwidth_value raw_filwidth_value -= (raw_filwidth_value >> 7); // Subtract 1/128th of the raw_filwidth_value
raw_filwidth_value += ((unsigned long)ADC << 7); // Add new ADC reading, scaled by 128 raw_filwidth_value += ((unsigned long)ADC << 7); // Add new ADC reading, scaled by 128
} }
break; break;
#endif #endif
#if ENABLED(ADC_KEYPAD)
case Prepare_ADC_KEY:
START_ADC(ADC_KEYPAD_PIN);
break;
case Measure_ADC_KEY:
if (ADCKey_count < 16) {
raw_ADCKey_value = ADC;
if (raw_ADCKey_value > 900) {
//ADC Key release
ADCKey_count = 0;
current_ADCKey_raw = 0;
}
else {
current_ADCKey_raw += raw_ADCKey_value;
ADCKey_count++;
}
}
break;
#endif // ADC_KEYPAD
case StartupDelay: break; case StartupDelay: break;
} // switch(adc_sensor_state) } // switch(adc_sensor_state)

8
Marlin/temperature.h
View file

@ -81,6 +81,10 @@ enum ADCSensorState {
Prepare_FILWIDTH, Prepare_FILWIDTH,
Measure_FILWIDTH, Measure_FILWIDTH,
#endif #endif
#if ENABLED(ADC_KEYPAD)
Prepare_ADC_KEY,
Measure_ADC_KEY,
#endif
SensorsReady, // Temperatures ready. Delay the next round of readings to let ADC pins settle. SensorsReady, // Temperatures ready. Delay the next round of readings to let ADC pins settle.
StartupDelay // Startup, delay initial temp reading a tiny bit so the hardware can settle StartupDelay // Startup, delay initial temp reading a tiny bit so the hardware can settle
}; };
@ -272,6 +276,10 @@ class Temperature {
#endif #endif
public: public:
#if ENABLED(ADC_KEYPAD)
static uint32_t current_ADCKey_raw;
static uint8_t ADCKey_count;
#endif
/** /**
* Instance Methods * Instance Methods

120
Marlin/ultralcd.cpp
View file

@ -3997,10 +3997,53 @@ void kill_screen(const char* lcd_msg) {
/** /**
* *
* Handlers for RepRap World Keypad input * Handlers for Keypad input
* *
*/ */
#if ENABLED(REPRAPWORLD_KEYPAD) #if ENABLED(ADC_KEYPAD)
inline void handle_adc_keypad() {
static uint8_t adc_steps = 0;
if (buttons_reprapworld_keypad) {
adc_steps++;
NOMORE(adc_steps, 20);
lcd_quick_feedback();
lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
return_to_status_ms = millis() + LCD_TIMEOUT_TO_STATUS;
if (encoderDirection == -1) { // side effect which signals we are inside a menu
if (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_DOWN)
encoderPosition -= ENCODER_STEPS_PER_MENU_ITEM;
else if (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_UP)
encoderPosition += ENCODER_STEPS_PER_MENU_ITEM;
else if (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_LEFT)
menu_action_back();
else if (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_RIGHT)
// enqueue_and_echo_commands_P(PSTR("M0 Pause"));
lcd_return_to_status();
}
else {
const int8_t step = adc_steps > 19 ? 100 : adc_steps > 10 ? 10 : 1;
if (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_DOWN)
encoderPosition += ENCODER_PULSES_PER_STEP * step;
else if (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_UP)
encoderPosition -= ENCODER_PULSES_PER_STEP * step;
else if (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_RIGHT)
encoderPosition = 0;
}
#if ENABLED(ADC_KEYPAD_DEBUG)
SERIAL_PROTOCOLLNPAIR("buttons_reprapworld_keypad = ", (uint32_t)buttons_reprapworld_keypad);
SERIAL_PROTOCOLLNPAIR("encoderPosition = ", (uint32_t)encoderPosition);
#endif
}
else if (!thermalManager.current_ADCKey_raw) {
// reset stepping acceleration
adc_steps = 0;
}
}
#elif ENABLED(REPRAPWORLD_KEYPAD)
void _reprapworld_keypad_move(const AxisEnum axis, const int16_t dir) { void _reprapworld_keypad_move(const AxisEnum axis, const int16_t dir) {
move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP; move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
encoderPosition = dir; encoderPosition = dir;
@ -4111,7 +4154,7 @@ void lcd_init() {
SET_INPUT_PULLUP(BTN_ENC); SET_INPUT_PULLUP(BTN_ENC);
#endif #endif
#if ENABLED(REPRAPWORLD_KEYPAD) #if ENABLED(REPRAPWORLD_KEYPAD) && DISABLED(ADC_KEYPAD)
SET_OUTPUT(SHIFT_CLK); SET_OUTPUT(SHIFT_CLK);
OUT_WRITE(SHIFT_LD, HIGH); OUT_WRITE(SHIFT_LD, HIGH);
SET_INPUT_PULLUP(SHIFT_OUT); SET_INPUT_PULLUP(SHIFT_OUT);
@ -4291,8 +4334,14 @@ void lcd_update() {
slow_buttons = lcd_implementation_read_slow_buttons(); // buttons which take too long to read in interrupt context slow_buttons = lcd_implementation_read_slow_buttons(); // buttons which take too long to read in interrupt context
#endif #endif
#if ENABLED(REPRAPWORLD_KEYPAD) #if ENABLED(ADC_KEYPAD)
handle_adc_keypad();
#elif ENABLED(REPRAPWORLD_KEYPAD)
handle_reprapworld_keypad(); handle_reprapworld_keypad();
#endif #endif
bool encoderPastThreshold = (abs(encoderDiff) >= ENCODER_PULSES_PER_STEP); bool encoderPastThreshold = (abs(encoderDiff) >= ENCODER_PULSES_PER_STEP);
@ -4305,10 +4354,10 @@ void lcd_update() {
if (encoderRateMultiplierEnabled) { if (encoderRateMultiplierEnabled) {
int32_t encoderMovementSteps = abs(encoderDiff) / ENCODER_PULSES_PER_STEP; int32_t encoderMovementSteps = abs(encoderDiff) / ENCODER_PULSES_PER_STEP;
if (lastEncoderMovementMillis != 0) { if (lastEncoderMovementMillis) {
// Note that the rate is always calculated between two passes through the // Note that the rate is always calculated between two passes through the
// loop and that the abs of the encoderDiff value is tracked. // loop and that the abs of the encoderDiff value is tracked.
float encoderStepRate = (float)(encoderMovementSteps) / ((float)(ms - lastEncoderMovementMillis)) * 1000.0; float encoderStepRate = float(encoderMovementSteps) / float(ms - lastEncoderMovementMillis) * 1000.0;
if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100; if (encoderStepRate >= ENCODER_100X_STEPS_PER_SEC) encoderMultiplier = 100;
else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC) encoderMultiplier = 10; else if (encoderStepRate >= ENCODER_10X_STEPS_PER_SEC) encoderMultiplier = 10;
@ -4378,6 +4427,11 @@ void lcd_update() {
break; break;
} // switch } // switch
} }
#if ENABLED(ADC_KEYPAD)
buttons_reprapworld_keypad = 0;
#endif
#if ENABLED(ULTIPANEL) #if ENABLED(ULTIPANEL)
#define CURRENTSCREEN() (*currentScreen)(), lcd_clicked = false #define CURRENTSCREEN() (*currentScreen)(), lcd_clicked = false
#else #else
@ -4625,9 +4679,23 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
#if ENABLED(LCD_HAS_SLOW_BUTTONS) #if ENABLED(LCD_HAS_SLOW_BUTTONS)
buttons |= slow_buttons; buttons |= slow_buttons;
#endif #endif
#if ENABLED(REPRAPWORLD_KEYPAD)
#if ENABLED(ADC_KEYPAD)
uint8_t newbutton_reprapworld_keypad = 0;
buttons = 0;
if (buttons_reprapworld_keypad == 0) {
newbutton_reprapworld_keypad = get_ADC_keyValue();
if (WITHIN(newbutton_reprapworld_keypad, 1, 8))
buttons_reprapworld_keypad = _BV(newbutton_reprapworld_keypad - 1);
}
#elif ENABLED(REPRAPWORLD_KEYPAD)
GET_BUTTON_STATES(buttons_reprapworld_keypad); GET_BUTTON_STATES(buttons_reprapworld_keypad);
#endif #endif
#else #else
GET_BUTTON_STATES(buttons); GET_BUTTON_STATES(buttons);
#endif // !NEWPANEL #endif // !NEWPANEL
@ -4693,4 +4761,42 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
#endif // ULTIPANEL #endif // ULTIPANEL
#if ENABLED(ADC_KEYPAD)
typedef struct {
uint16_t ADCKeyValueMin, ADCKeyValueMax;
uint8_t ADCKeyNo;
} _stADCKeypadTable_;
static const _stADCKeypadTable_ stADCKeyTable[] = PROGMEM {
// VALUE_MIN, VALUE_MAX, KEY
{ 4000, 4096, BLEN_REPRAPWORLD_KEYPAD_F1 + 1 }, // F1
{ 4000, 4096, BLEN_REPRAPWORLD_KEYPAD_F2 + 1 }, // F2
{ 4000, 4096, BLEN_REPRAPWORLD_KEYPAD_F3 + 1 }, // F3
{ 300, 500, BLEN_REPRAPWORLD_KEYPAD_LEFT + 1 }, // LEFT
{ 1900, 2200, BLEN_REPRAPWORLD_KEYPAD_RIGHT + 1 }, // RIGHT
{ 570, 870, BLEN_REPRAPWORLD_KEYPAD_UP + 1 }, // UP
{ 2670, 2870, BLEN_REPRAPWORLD_KEYPAD_DOWN + 1 }, // DOWN
{ 1150, 1450, BLEN_REPRAPWORLD_KEYPAD_MIDDLE + 1 }, // ENTER
};
uint8_t get_ADC_keyValue(void) {
if (thermalManager.ADCKey_count >= 16) {
const uint16_t currentkpADCValue = thermalManager.current_ADCKey_raw >> 2;
#if ENABLED(ADC_KEYPAD_DEBUG)
SERIAL_PROTOCOLLN(currentkpADCValue);
#endif
thermalManager.current_ADCKey_raw = 0;
thermalManager.ADCKey_count = 0;
if (currentkpADCValue < 4000)
for (uint8_t i = 0; i < ADC_KEY_NUM; i++) {
const uint16_t lo = pgm_read_word(&stADCKeyTable[i].ADCKeyValueMin),
hi = pgm_read_word(&stADCKeyTable[i].ADCKeyValueMax);
if (WITHIN(currentkpADCValue, lo, hi)) return pgm_read_byte(&stADCKeyTable[i].ADCKeyNo);
}
}
return 0;
}
#endif
#endif // ULTRA_LCD #endif // ULTRA_LCD

20
Marlin/ultralcd.h
View file

@ -57,6 +57,10 @@
void dontExpireStatus(); void dontExpireStatus();
#endif #endif
#if ENABLED(ADC_KEYPAD)
uint8_t get_ADC_keyValue();
#endif
#if ENABLED(DOGLCD) #if ENABLED(DOGLCD)
extern uint16_t lcd_contrast; extern uint16_t lcd_contrast;
void set_lcd_contrast(const uint16_t value); void set_lcd_contrast(const uint16_t value);
@ -130,6 +134,21 @@
#define REPRAPWORLD_KEYPAD_MOVE_Y_UP (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_UP) #define REPRAPWORLD_KEYPAD_MOVE_Y_UP (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_UP)
#define REPRAPWORLD_KEYPAD_MOVE_X_LEFT (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_LEFT) #define REPRAPWORLD_KEYPAD_MOVE_X_LEFT (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_LEFT)
#if ENABLED(ADC_KEYPAD)
#define REPRAPWORLD_KEYPAD_MOVE_HOME (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_F1)
#define KEYPAD_EN_C EN_REPRAPWORLD_KEYPAD_MIDDLE
#else
#define REPRAPWORLD_KEYPAD_MOVE_HOME (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_MIDDLE)
#define KEYPAD_EN_C EN_REPRAPWORLD_KEYPAD_F1
#endif
#define REPRAPWORLD_KEYPAD_MOVE_MENU (buttons_reprapworld_keypad & KEYPAD_EN_C)
#if BUTTON_EXISTS(ENC)
#define LCD_CLICKED ((buttons & EN_C) || REPRAPWORLD_KEYPAD_MOVE_MENU)
#else
#define LCD_CLICKED REPRAPWORLD_KEYPAD_MOVE_MENU
#endif
#define REPRAPWORLD_KEYPAD_PRESSED (buttons_reprapworld_keypad & ( \ #define REPRAPWORLD_KEYPAD_PRESSED (buttons_reprapworld_keypad & ( \
EN_REPRAPWORLD_KEYPAD_F3 | \ EN_REPRAPWORLD_KEYPAD_F3 | \
EN_REPRAPWORLD_KEYPAD_F2 | \ EN_REPRAPWORLD_KEYPAD_F2 | \
@ -141,7 +160,6 @@
EN_REPRAPWORLD_KEYPAD_LEFT) \ EN_REPRAPWORLD_KEYPAD_LEFT) \
) )
#define LCD_CLICKED ((buttons & EN_C) || (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_F1))
#elif ENABLED(NEWPANEL) #elif ENABLED(NEWPANEL)
#define LCD_CLICKED (buttons & EN_C) #define LCD_CLICKED (buttons & EN_C)
#else #else