Browse Source

Merge pull request #7993 from jeffyl/bugfix-2.0.x

[2.0.x] Proper support for AZSMZ 12864 LCD on SmartRAMPS
pull/1/head
Scott Lahteine 7 years ago
committed by GitHub
parent
commit
3b7b0492f8
  1. 6
      Marlin/Configuration.h
  2. 6
      Marlin/src/config/default/Configuration.h
  3. 6
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
  4. 6
      Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
  5. 6
      Marlin/src/config/examples/Anet/A6/Configuration.h
  6. 6
      Marlin/src/config/examples/Anet/A8/Configuration.h
  7. 6
      Marlin/src/config/examples/BQ/Hephestos/Configuration.h
  8. 6
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
  9. 6
      Marlin/src/config/examples/BQ/WITBOX/Configuration.h
  10. 6
      Marlin/src/config/examples/Cartesio/Configuration.h
  11. 6
      Marlin/src/config/examples/Creality/CR-10/Configuration.h
  12. 6
      Marlin/src/config/examples/Felix/Configuration.h
  13. 6
      Marlin/src/config/examples/Felix/DUAL/Configuration.h
  14. 6
      Marlin/src/config/examples/Folger Tech/i3-2020/Configuration.h
  15. 6
      Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
  16. 6
      Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
  17. 6
      Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
  18. 6
      Marlin/src/config/examples/Malyan/M150/Configuration.h
  19. 6
      Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
  20. 6
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
  21. 6
      Marlin/src/config/examples/Mks/Sbase/Configuration.h
  22. 6
      Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
  23. 6
      Marlin/src/config/examples/RigidBot/Configuration.h
  24. 6
      Marlin/src/config/examples/SCARA/Configuration.h
  25. 6
      Marlin/src/config/examples/Sanguinololu/Configuration.h
  26. 6
      Marlin/src/config/examples/TinyBoy2/Configuration.h
  27. 6
      Marlin/src/config/examples/Velleman/K8200/Configuration.h
  28. 6
      Marlin/src/config/examples/Velleman/K8400/Configuration.h
  29. 6
      Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
  30. 6
      Marlin/src/config/examples/adafruit/ST7565/Configuration.h
  31. 6
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
  32. 6
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
  33. 6
      Marlin/src/config/examples/delta/generic/Configuration.h
  34. 6
      Marlin/src/config/examples/delta/kossel_mini/Configuration.h
  35. 6
      Marlin/src/config/examples/delta/kossel_pro/Configuration.h
  36. 6
      Marlin/src/config/examples/delta/kossel_xl/Configuration.h
  37. 6
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
  38. 6
      Marlin/src/config/examples/makibox/Configuration.h
  39. 6
      Marlin/src/config/examples/stm32f103ret6/Configuration.h
  40. 6
      Marlin/src/config/examples/tvrrug/Round2/Configuration.h
  41. 6
      Marlin/src/config/examples/wt150/Configuration.h
  42. 9
      Marlin/src/inc/Conditionals_LCD.h
  43. 4
      Marlin/src/inc/Conditionals_post.h
  44. 5
      Marlin/src/inc/SanityCheck.h
  45. 20
      Marlin/src/pins/pins_RAMPS_SMART.h

6
Marlin/Configuration.h

@ -1552,6 +1552,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/default/Configuration.h

@ -1552,6 +1552,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h

@ -1572,6 +1572,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h

@ -1552,6 +1552,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/Anet/A6/Configuration.h

@ -1711,6 +1711,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/Anet/A8/Configuration.h

@ -1560,6 +1560,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/BQ/Hephestos/Configuration.h

@ -1543,6 +1543,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h

@ -1553,6 +1553,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/BQ/WITBOX/Configuration.h

@ -1543,6 +1543,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/Cartesio/Configuration.h

@ -1551,6 +1551,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/Creality/CR-10/Configuration.h

@ -1562,6 +1562,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/Felix/Configuration.h

@ -1534,6 +1534,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/Felix/DUAL/Configuration.h

@ -1534,6 +1534,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/Folger Tech/i3-2020/Configuration.h

@ -1558,6 +1558,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h

@ -1567,6 +1567,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h

@ -1552,6 +1552,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h

@ -1556,6 +1556,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/Malyan/M150/Configuration.h

@ -1580,6 +1580,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h

@ -1551,6 +1551,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h

@ -1551,6 +1551,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/Mks/Sbase/Configuration.h

@ -1528,6 +1528,12 @@
//
//#define OLED_PANEL_TINYBOY2
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h

@ -1552,6 +1552,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/RigidBot/Configuration.h

@ -1552,6 +1552,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/SCARA/Configuration.h

@ -1564,6 +1564,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/Sanguinololu/Configuration.h

@ -1583,6 +1583,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/TinyBoy2/Configuration.h

@ -1608,6 +1608,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/Velleman/K8200/Configuration.h

@ -1587,6 +1587,12 @@
#endif // K8200_VM8201
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/Velleman/K8400/Configuration.h

@ -1552,6 +1552,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h

@ -1552,6 +1552,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/adafruit/ST7565/Configuration.h

@ -1552,6 +1552,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h

@ -1680,6 +1680,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h

@ -1673,6 +1673,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/delta/generic/Configuration.h

@ -1668,6 +1668,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/delta/kossel_mini/Configuration.h

@ -1671,6 +1671,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/delta/kossel_pro/Configuration.h

@ -1671,6 +1671,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/delta/kossel_xl/Configuration.h

@ -1680,6 +1680,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h

@ -1566,6 +1566,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/makibox/Configuration.h

@ -1555,6 +1555,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/stm32f103ret6/Configuration.h

@ -1507,6 +1507,12 @@
//
//#define OLED_PANEL_TINYBOY2
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/tvrrug/Round2/Configuration.h

@ -1547,6 +1547,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

6
Marlin/src/config/examples/wt150/Configuration.h

@ -1557,6 +1557,12 @@
//
//#define MKS_12864OLED
//
// AZSMZ 12864 LCD with SD
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
//
//#define AZSMZ_12864
//=============================================================================
//=============================== Extra Features ==============================
//=============================================================================

9
Marlin/src/inc/Conditionals_LCD.h

@ -64,7 +64,7 @@
#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
#define LONG_FILENAME_HOST_SUPPORT
#elif ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#elif ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) || ENABLED(AZSMZ_12864)
#define ULTRA_LCD //general LCD support, also 16x2
#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
@ -86,6 +86,11 @@
#define DEFAULT_LCD_CONTRAST 110
#define U8GLIB_LM6059_AF
#define SD_DETECT_INVERTED
#elif ENABLED(AZSMZ_12864)
#define LCD_CONTRAST_MIN 120
#define LCD_CONTRAST_MAX 255
#define DEFAULT_LCD_CONTRAST 190
#define U8GLIB_ST7565_64128N
#endif
#elif ENABLED(OLED_PANEL_TINYBOY2)
@ -224,6 +229,7 @@
#elif ENABLED(miniVIKI) || ENABLED(VIKI2) \
|| ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
|| ENABLED(AZSMZ_12864) \
|| ENABLED(OLED_PANEL_TINYBOY2) \
|| ENABLED(BQ_LCD_SMART_CONTROLLER) \
|| ENABLED(LCD_I2C_PANELOLU2) \
@ -327,6 +333,7 @@
ENABLED(MAKRPANEL) \
|| ENABLED(CARTESIO_UI) \
|| ENABLED(VIKI2) \
|| ENABLED(AZSMZ_12864) \
|| ENABLED(miniVIKI) \
|| ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
)

4
Marlin/src/inc/Conditionals_post.h

@ -869,9 +869,9 @@
#endif
/**
* VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
* VIKI2, miniVIKI, and AZSMZ_12864 require DOGLCD_SCK and DOGLCD_MOSI to be defined.
*/
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
#if ENABLED(VIKI2) || ENABLED(miniVIKI) || ENABLED(AZSMZ_12864)
#ifndef DOGLCD_SCK
#define DOGLCD_SCK SCK_PIN
#endif

5
Marlin/src/inc/SanityCheck.h

@ -1155,6 +1155,7 @@ static_assert(1 >= 0
* miniVIKI => ULTIMAKERCONTROLLER
* VIKI2 => ULTIMAKERCONTROLLER
* ELB_FULL_GRAPHIC_CONTROLLER => ULTIMAKERCONTROLLER
* AZSMZ_12864 => ULTIMAKERCONTROLLER
* PANEL_ONE => ULTIMAKERCONTROLLER
*/
static_assert(1 >= 0
@ -1163,6 +1164,7 @@ static_assert(1 >= 0
&& DISABLED(miniVIKI) \
&& DISABLED(VIKI2) \
&& DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
&& DISABLED(AZSMZ_12864) \
&& DISABLED(PANEL_ONE) \
&& DISABLED(MKS_12864OLED)
+ 1
@ -1208,6 +1210,9 @@ static_assert(1 >= 0
#if ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
+ 1
#endif
#if ENABLED(AZSMZ_12864)
+ 1
#endif
#if ENABLED(G3D_PANEL)
+ 1
#endif

20
Marlin/src/pins/pins_RAMPS_SMART.h

@ -84,30 +84,14 @@
//
// LCD / Controller
//
// Support for AZSMZ 12864 LCD with SD Card 3D printer smart controller control panel (not tested)
#if ENABLED(VIKI2)
#undef BEEPER_PIN
// Support for AZSMZ 12864 LCD with SD Card 3D printer smart controller control panel
#if ENABLED(AZSMZ_12864)
#define BEEPER_PIN 66
// Pins for DOGM SPI LCD Support
#undef DOGLCD_A0
#define DOGLCD_A0 59
#undef DOGLCD_A0
#define DOGLCD_CS 44
#undef BTN_EN1
#define BTN_EN1 58
#undef BTN_EN2
#define BTN_EN2 40
#undef BTN_ENC
#define BTN_ENC 67
#undef SD_DETECT_PIN
#define SD_DETECT_PIN 49 // Pin 49 for display sd interface, 72 for easy adapter board
#undef KILL_PIN
#define KILL_PIN 42
#endif

Loading…
Cancel
Save