Merge pull request #8876 from subdancer/bugfix-2.0.x

[2.0.x] RADDS LCD Display
2017-12-24 19:17:14 -06:00 · 2017-12-24 19:17:14 -06:00 · 737561c1b3
commit 737561c1b3
parent 4a8fd8ae92 1cf1cf8759
45 changed files with 268 additions and 0 deletions
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@ -1417,6 +1417,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/default/Configuration.h
+++ b/Marlin/src/config/default/Configuration.h
@ -1417,6 +1417,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
+++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
@ -1437,6 +1437,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
+++ b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
@ -1417,6 +1417,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/Anet/A6/Configuration.h
+++ b/Marlin/src/config/examples/Anet/A6/Configuration.h
@ -1574,6 +1574,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/Anet/A8/Configuration.h
+++ b/Marlin/src/config/examples/Anet/A8/Configuration.h
@ -1423,6 +1423,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
+++ b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
@ -1417,6 +1417,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h
+++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h
@ -1405,6 +1405,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
+++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
@ -1418,6 +1418,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h
+++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h
@ -1405,6 +1405,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/Cartesio/Configuration.h
+++ b/Marlin/src/config/examples/Cartesio/Configuration.h
@ -1416,6 +1416,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/Creality/CR-10/Configuration.h
+++ b/Marlin/src/config/examples/Creality/CR-10/Configuration.h
@ -1427,6 +1427,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/Felix/Configuration.h
+++ b/Marlin/src/config/examples/Felix/Configuration.h
@ -1399,6 +1399,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/Felix/DUAL/Configuration.h
+++ b/Marlin/src/config/examples/Felix/DUAL/Configuration.h
@ -1399,6 +1399,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
+++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
@ -1414,6 +1414,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
@ -1432,6 +1432,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
@ -1417,6 +1417,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
+++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
@ -1421,6 +1421,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/MakerParts/Configuration.h
+++ b/Marlin/src/config/examples/MakerParts/Configuration.h
@ -1433,6 +1433,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/Malyan/M150/Configuration.h
+++ b/Marlin/src/config/examples/Malyan/M150/Configuration.h
@ -1445,6 +1445,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/Malyan/M200/Configuration.h
+++ b/Marlin/src/config/examples/Malyan/M200/Configuration.h
@ -1416,6 +1416,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
+++ b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
@ -1421,6 +1421,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
+++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
@ -1421,6 +1421,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/Mks/Sbase/Configuration.h
+++ b/Marlin/src/config/examples/Mks/Sbase/Configuration.h
@ -1419,6 +1419,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
+++ b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
@ -1417,6 +1417,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/RigidBot/Configuration.h
+++ b/Marlin/src/config/examples/RigidBot/Configuration.h
@ -1415,6 +1415,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/SCARA/Configuration.h
+++ b/Marlin/src/config/examples/SCARA/Configuration.h
@ -1429,6 +1429,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/STM32F10/Configuration.h
+++ b/Marlin/src/config/examples/STM32F10/Configuration.h
@ -1420,6 +1420,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/Sanguinololu/Configuration.h
+++ b/Marlin/src/config/examples/Sanguinololu/Configuration.h
@ -1448,6 +1448,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/TinyBoy2/Configuration.h
+++ b/Marlin/src/config/examples/TinyBoy2/Configuration.h
@ -1473,6 +1473,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
+++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
@ -1417,6 +1417,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/Wanhao/Duplicator
+++ b/Marlin/src/config/examples/Wanhao/Duplicator
@ -1373,6 +1373,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h
+++ b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h
@ -1417,6 +1417,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
+++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
@ -1551,6 +1551,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
+++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
@ -1544,6 +1544,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/delta/generic/Configuration.h
+++ b/Marlin/src/config/examples/delta/generic/Configuration.h
@ -1538,6 +1538,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h
+++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h
@ -1541,6 +1541,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h
+++ b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h
@ -1541,6 +1541,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h
+++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h
@ -1550,6 +1550,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
+++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
@ -1431,6 +1431,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/makibox/Configuration.h
+++ b/Marlin/src/config/examples/makibox/Configuration.h
@ -1420,6 +1420,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/stm32f103ret6/Configuration.h
+++ b/Marlin/src/config/examples/stm32f103ret6/Configuration.h
@ -1300,6 +1300,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h
+++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h
@ -1412,6 +1412,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/config/examples/wt150/Configuration.h
+++ b/Marlin/src/config/examples/wt150/Configuration.h
@ -1422,6 +1422,12 @@
 // Enable one of the following options to specify your controller.
 //

+//
+// Original RADDS LCD Display+Encoder+SDCardReader
+// http://doku.radds.org/dokumentation/lcd-display/
+//
+//#define RADDS_DISPLAY
+
 //
 // ULTIMAKER Controller.
 //
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@ -56,6 +56,10 @@
  #define ENCODER_FEEDRATE_DEADZONE 2
  #define REVERSE_MENU_DIRECTION

+#elif ENABLED(RADDS_DISPLAY) 
+  #define ULTIPANEL
+  #define ENCODER_PULSES_PER_STEP 2
+
 #elif ENABLED(ANET_FULL_GRAPHICS_LCD)

  #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER