Browse Source

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

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

+ 6
- 0
Marlin/Configuration.h View File

@@ -1552,6 +1552,12 @@
1552 1552
 //
1553 1553
 //#define MKS_12864OLED
1554 1554
 
1555
+//
1556
+// AZSMZ 12864 LCD with SD
1557
+// 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
1558
+//
1559
+//#define AZSMZ_12864
1560
+
1555 1561
 //=============================================================================
1556 1562
 //=============================== Extra Features ==============================
1557 1563
 //=============================================================================

+ 6
- 0
Marlin/src/config/default/Configuration.h View File

@@ -1552,6 +1552,12 @@
1552 1552
 //
1553 1553
 //#define MKS_12864OLED
1554 1554
 
1555
+//
1556
+// AZSMZ 12864 LCD with SD
1557
+// 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
1558
+//
1559
+//#define AZSMZ_12864
1560
+
1555 1561
 //=============================================================================
1556 1562
 //=============================== Extra Features ==============================
1557 1563
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h View File

@@ -1572,6 +1572,12 @@
1572 1572
 //
1573 1573
 //#define MKS_12864OLED
1574 1574
 
1575
+//
1576
+// AZSMZ 12864 LCD with SD
1577
+// 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
1578
+//
1579
+//#define AZSMZ_12864
1580
+
1575 1581
 //=============================================================================
1576 1582
 //=============================== Extra Features ==============================
1577 1583
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h View File

@@ -1552,6 +1552,12 @@
1552 1552
 //
1553 1553
 //#define MKS_12864OLED
1554 1554
 
1555
+//
1556
+// AZSMZ 12864 LCD with SD
1557
+// 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
1558
+//
1559
+//#define AZSMZ_12864
1560
+
1555 1561
 //=============================================================================
1556 1562
 //=============================== Extra Features ==============================
1557 1563
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/Anet/A6/Configuration.h View File

@@ -1711,6 +1711,12 @@
1711 1711
 //
1712 1712
 //#define MKS_12864OLED
1713 1713
 
1714
+//
1715
+// AZSMZ 12864 LCD with SD
1716
+// 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
1717
+//
1718
+//#define AZSMZ_12864
1719
+
1714 1720
 //=============================================================================
1715 1721
 //=============================== Extra Features ==============================
1716 1722
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/Anet/A8/Configuration.h View File

@@ -1560,6 +1560,12 @@
1560 1560
 //
1561 1561
 //#define MKS_12864OLED
1562 1562
 
1563
+//
1564
+// AZSMZ 12864 LCD with SD
1565
+// 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
1566
+//
1567
+//#define AZSMZ_12864
1568
+
1563 1569
 //=============================================================================
1564 1570
 //=============================== Extra Features ==============================
1565 1571
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/BQ/Hephestos/Configuration.h View File

@@ -1543,6 +1543,12 @@
1543 1543
 //
1544 1544
 //#define MKS_12864OLED
1545 1545
 
1546
+//
1547
+// AZSMZ 12864 LCD with SD
1548
+// 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
1549
+//
1550
+//#define AZSMZ_12864
1551
+
1546 1552
 //=============================================================================
1547 1553
 //=============================== Extra Features ==============================
1548 1554
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h View File

@@ -1553,6 +1553,12 @@
1553 1553
 //
1554 1554
 //#define MKS_12864OLED
1555 1555
 
1556
+//
1557
+// AZSMZ 12864 LCD with SD
1558
+// 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
1559
+//
1560
+//#define AZSMZ_12864
1561
+
1556 1562
 //=============================================================================
1557 1563
 //=============================== Extra Features ==============================
1558 1564
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/BQ/WITBOX/Configuration.h View File

@@ -1543,6 +1543,12 @@
1543 1543
 //
1544 1544
 //#define MKS_12864OLED
1545 1545
 
1546
+//
1547
+// AZSMZ 12864 LCD with SD
1548
+// 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
1549
+//
1550
+//#define AZSMZ_12864
1551
+
1546 1552
 //=============================================================================
1547 1553
 //=============================== Extra Features ==============================
1548 1554
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/Cartesio/Configuration.h View File

@@ -1551,6 +1551,12 @@
1551 1551
 //
1552 1552
 //#define MKS_12864OLED
1553 1553
 
1554
+//
1555
+// AZSMZ 12864 LCD with SD
1556
+// 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
1557
+//
1558
+//#define AZSMZ_12864
1559
+
1554 1560
 //=============================================================================
1555 1561
 //=============================== Extra Features ==============================
1556 1562
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/Creality/CR-10/Configuration.h View File

@@ -1562,6 +1562,12 @@
1562 1562
 //
1563 1563
 //#define MKS_12864OLED
1564 1564
 
1565
+//
1566
+// AZSMZ 12864 LCD with SD
1567
+// 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
1568
+//
1569
+//#define AZSMZ_12864
1570
+
1565 1571
 //=============================================================================
1566 1572
 //=============================== Extra Features ==============================
1567 1573
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/Felix/Configuration.h View File

@@ -1534,6 +1534,12 @@
1534 1534
 //
1535 1535
 //#define MKS_12864OLED
1536 1536
 
1537
+//
1538
+// AZSMZ 12864 LCD with SD
1539
+// 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
1540
+//
1541
+//#define AZSMZ_12864
1542
+
1537 1543
 //=============================================================================
1538 1544
 //=============================== Extra Features ==============================
1539 1545
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/Felix/DUAL/Configuration.h View File

@@ -1534,6 +1534,12 @@
1534 1534
 //
1535 1535
 //#define MKS_12864OLED
1536 1536
 
1537
+//
1538
+// AZSMZ 12864 LCD with SD
1539
+// 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
1540
+//
1541
+//#define AZSMZ_12864
1542
+
1537 1543
 //=============================================================================
1538 1544
 //=============================== Extra Features ==============================
1539 1545
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/Folger Tech/i3-2020/Configuration.h View File

@@ -1558,6 +1558,12 @@
1558 1558
 //
1559 1559
 //#define MKS_12864OLED
1560 1560
 
1561
+//
1562
+// AZSMZ 12864 LCD with SD
1563
+// 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
1564
+//
1565
+//#define AZSMZ_12864
1566
+
1561 1567
 //=============================================================================
1562 1568
 //=============================== Extra Features ==============================
1563 1569
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h View File

@@ -1567,6 +1567,12 @@
1567 1567
 //
1568 1568
 //#define MKS_12864OLED
1569 1569
 
1570
+//
1571
+// AZSMZ 12864 LCD with SD
1572
+// 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
1573
+//
1574
+//#define AZSMZ_12864
1575
+
1570 1576
 //=============================================================================
1571 1577
 //=============================== Extra Features ==============================
1572 1578
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h View File

@@ -1552,6 +1552,12 @@
1552 1552
 //
1553 1553
 //#define MKS_12864OLED
1554 1554
 
1555
+//
1556
+// AZSMZ 12864 LCD with SD
1557
+// 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
1558
+//
1559
+//#define AZSMZ_12864
1560
+
1555 1561
 //=============================================================================
1556 1562
 //=============================== Extra Features ==============================
1557 1563
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h View File

@@ -1556,6 +1556,12 @@
1556 1556
 //
1557 1557
 //#define MKS_12864OLED
1558 1558
 
1559
+//
1560
+// AZSMZ 12864 LCD with SD
1561
+// 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
1562
+//
1563
+//#define AZSMZ_12864
1564
+
1559 1565
 //=============================================================================
1560 1566
 //=============================== Extra Features ==============================
1561 1567
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/Malyan/M150/Configuration.h View File

@@ -1580,6 +1580,12 @@
1580 1580
 //
1581 1581
 //#define MKS_12864OLED
1582 1582
 
1583
+//
1584
+// AZSMZ 12864 LCD with SD
1585
+// 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
1586
+//
1587
+//#define AZSMZ_12864
1588
+
1583 1589
 //=============================================================================
1584 1590
 //=============================== Extra Features ==============================
1585 1591
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h View File

@@ -1551,6 +1551,12 @@
1551 1551
 //
1552 1552
 //#define MKS_12864OLED
1553 1553
 
1554
+//
1555
+// AZSMZ 12864 LCD with SD
1556
+// 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
1557
+//
1558
+//#define AZSMZ_12864
1559
+
1554 1560
 //=============================================================================
1555 1561
 //=============================== Extra Features ==============================
1556 1562
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h View File

@@ -1551,6 +1551,12 @@
1551 1551
 //
1552 1552
 //#define MKS_12864OLED
1553 1553
 
1554
+//
1555
+// AZSMZ 12864 LCD with SD
1556
+// 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
1557
+//
1558
+//#define AZSMZ_12864
1559
+
1554 1560
 //=============================================================================
1555 1561
 //=============================== Extra Features ==============================
1556 1562
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/Mks/Sbase/Configuration.h View File

@@ -1528,6 +1528,12 @@
1528 1528
 //
1529 1529
 //#define OLED_PANEL_TINYBOY2
1530 1530
 
1531
+//
1532
+// AZSMZ 12864 LCD with SD
1533
+// 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
1534
+//
1535
+//#define AZSMZ_12864
1536
+
1531 1537
 //=============================================================================
1532 1538
 //=============================== Extra Features ==============================
1533 1539
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h View File

@@ -1552,6 +1552,12 @@
1552 1552
 //
1553 1553
 //#define MKS_12864OLED
1554 1554
 
1555
+//
1556
+// AZSMZ 12864 LCD with SD
1557
+// 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
1558
+//
1559
+//#define AZSMZ_12864
1560
+
1555 1561
 //=============================================================================
1556 1562
 //=============================== Extra Features ==============================
1557 1563
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/RigidBot/Configuration.h View File

@@ -1552,6 +1552,12 @@
1552 1552
 //
1553 1553
 //#define MKS_12864OLED
1554 1554
 
1555
+//
1556
+// AZSMZ 12864 LCD with SD
1557
+// 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
1558
+//
1559
+//#define AZSMZ_12864
1560
+
1555 1561
 //=============================================================================
1556 1562
 //=============================== Extra Features ==============================
1557 1563
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/SCARA/Configuration.h View File

@@ -1564,6 +1564,12 @@
1564 1564
 //
1565 1565
 //#define MKS_12864OLED
1566 1566
 
1567
+//
1568
+// AZSMZ 12864 LCD with SD
1569
+// 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
1570
+//
1571
+//#define AZSMZ_12864
1572
+
1567 1573
 //=============================================================================
1568 1574
 //=============================== Extra Features ==============================
1569 1575
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/Sanguinololu/Configuration.h View File

@@ -1583,6 +1583,12 @@
1583 1583
 //
1584 1584
 //#define MKS_12864OLED
1585 1585
 
1586
+//
1587
+// AZSMZ 12864 LCD with SD
1588
+// 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
1589
+//
1590
+//#define AZSMZ_12864
1591
+
1586 1592
 //=============================================================================
1587 1593
 //=============================== Extra Features ==============================
1588 1594
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/TinyBoy2/Configuration.h View File

@@ -1608,6 +1608,12 @@
1608 1608
 //
1609 1609
 //#define MKS_12864OLED
1610 1610
 
1611
+//
1612
+// AZSMZ 12864 LCD with SD
1613
+// 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
1614
+//
1615
+//#define AZSMZ_12864
1616
+
1611 1617
 //=============================================================================
1612 1618
 //=============================== Extra Features ==============================
1613 1619
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/Velleman/K8200/Configuration.h View File

@@ -1587,6 +1587,12 @@
1587 1587
 
1588 1588
 #endif // K8200_VM8201
1589 1589
 
1590
+//
1591
+// AZSMZ 12864 LCD with SD
1592
+// 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
1593
+//
1594
+//#define AZSMZ_12864
1595
+
1590 1596
 //=============================================================================
1591 1597
 //=============================== Extra Features ==============================
1592 1598
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/Velleman/K8400/Configuration.h View File

@@ -1552,6 +1552,12 @@
1552 1552
 //
1553 1553
 //#define MKS_12864OLED
1554 1554
 
1555
+//
1556
+// AZSMZ 12864 LCD with SD
1557
+// 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
1558
+//
1559
+//#define AZSMZ_12864
1560
+
1555 1561
 //=============================================================================
1556 1562
 //=============================== Extra Features ==============================
1557 1563
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h View File

@@ -1552,6 +1552,12 @@
1552 1552
 //
1553 1553
 //#define MKS_12864OLED
1554 1554
 
1555
+//
1556
+// AZSMZ 12864 LCD with SD
1557
+// 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
1558
+//
1559
+//#define AZSMZ_12864
1560
+
1555 1561
 //=============================================================================
1556 1562
 //=============================== Extra Features ==============================
1557 1563
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/adafruit/ST7565/Configuration.h View File

@@ -1552,6 +1552,12 @@
1552 1552
 //
1553 1553
 //#define MKS_12864OLED
1554 1554
 
1555
+//
1556
+// AZSMZ 12864 LCD with SD
1557
+// 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
1558
+//
1559
+//#define AZSMZ_12864
1560
+
1555 1561
 //=============================================================================
1556 1562
 //=============================== Extra Features ==============================
1557 1563
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h View File

@@ -1680,6 +1680,12 @@
1680 1680
 //
1681 1681
 //#define MKS_12864OLED
1682 1682
 
1683
+//
1684
+// AZSMZ 12864 LCD with SD
1685
+// 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
1686
+//
1687
+//#define AZSMZ_12864
1688
+
1683 1689
 //=============================================================================
1684 1690
 //=============================== Extra Features ==============================
1685 1691
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h View File

@@ -1673,6 +1673,12 @@
1673 1673
 //
1674 1674
 //#define MKS_12864OLED
1675 1675
 
1676
+//
1677
+// AZSMZ 12864 LCD with SD
1678
+// 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
1679
+//
1680
+//#define AZSMZ_12864
1681
+
1676 1682
 //=============================================================================
1677 1683
 //=============================== Extra Features ==============================
1678 1684
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/delta/generic/Configuration.h View File

@@ -1668,6 +1668,12 @@
1668 1668
 //
1669 1669
 //#define MKS_12864OLED
1670 1670
 
1671
+//
1672
+// AZSMZ 12864 LCD with SD
1673
+// 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
1674
+//
1675
+//#define AZSMZ_12864
1676
+
1671 1677
 //=============================================================================
1672 1678
 //=============================== Extra Features ==============================
1673 1679
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/delta/kossel_mini/Configuration.h View File

@@ -1671,6 +1671,12 @@
1671 1671
 //
1672 1672
 //#define MKS_12864OLED
1673 1673
 
1674
+//
1675
+// AZSMZ 12864 LCD with SD
1676
+// 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
1677
+//
1678
+//#define AZSMZ_12864
1679
+
1674 1680
 //=============================================================================
1675 1681
 //=============================== Extra Features ==============================
1676 1682
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/delta/kossel_pro/Configuration.h View File

@@ -1671,6 +1671,12 @@
1671 1671
 //
1672 1672
 //#define MKS_12864OLED
1673 1673
 
1674
+//
1675
+// AZSMZ 12864 LCD with SD
1676
+// 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
1677
+//
1678
+//#define AZSMZ_12864
1679
+
1674 1680
 //=============================================================================
1675 1681
 //=============================== Extra Features ==============================
1676 1682
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/delta/kossel_xl/Configuration.h View File

@@ -1680,6 +1680,12 @@
1680 1680
 //
1681 1681
 //#define MKS_12864OLED
1682 1682
 
1683
+//
1684
+// AZSMZ 12864 LCD with SD
1685
+// 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
1686
+//
1687
+//#define AZSMZ_12864
1688
+
1683 1689
 //=============================================================================
1684 1690
 //=============================== Extra Features ==============================
1685 1691
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h View File

@@ -1566,6 +1566,12 @@
1566 1566
 //
1567 1567
 //#define MKS_12864OLED
1568 1568
 
1569
+//
1570
+// AZSMZ 12864 LCD with SD
1571
+// 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
1572
+//
1573
+//#define AZSMZ_12864
1574
+
1569 1575
 //=============================================================================
1570 1576
 //=============================== Extra Features ==============================
1571 1577
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/makibox/Configuration.h View File

@@ -1555,6 +1555,12 @@
1555 1555
 //
1556 1556
 //#define MKS_12864OLED
1557 1557
 
1558
+//
1559
+// AZSMZ 12864 LCD with SD
1560
+// 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
1561
+//
1562
+//#define AZSMZ_12864
1563
+
1558 1564
 //=============================================================================
1559 1565
 //=============================== Extra Features ==============================
1560 1566
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/stm32f103ret6/Configuration.h View File

@@ -1507,6 +1507,12 @@
1507 1507
 //
1508 1508
 //#define OLED_PANEL_TINYBOY2
1509 1509
 
1510
+//
1511
+// AZSMZ 12864 LCD with SD
1512
+// 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
1513
+//
1514
+//#define AZSMZ_12864
1515
+
1510 1516
 //=============================================================================
1511 1517
 //=============================== Extra Features ==============================
1512 1518
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/tvrrug/Round2/Configuration.h View File

@@ -1547,6 +1547,12 @@
1547 1547
 //
1548 1548
 //#define MKS_12864OLED
1549 1549
 
1550
+//
1551
+// AZSMZ 12864 LCD with SD
1552
+// 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
1553
+//
1554
+//#define AZSMZ_12864
1555
+
1550 1556
 //=============================================================================
1551 1557
 //=============================== Extra Features ==============================
1552 1558
 //=============================================================================

+ 6
- 0
Marlin/src/config/examples/wt150/Configuration.h View File

@@ -1557,6 +1557,12 @@
1557 1557
 //
1558 1558
 //#define MKS_12864OLED
1559 1559
 
1560
+//
1561
+// AZSMZ 12864 LCD with SD
1562
+// 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
1563
+//
1564
+//#define AZSMZ_12864
1565
+
1560 1566
 //=============================================================================
1561 1567
 //=============================== Extra Features ==============================
1562 1568
 //=============================================================================

+ 8
- 1
Marlin/src/inc/Conditionals_LCD.h View File

@@ -64,7 +64,7 @@
64 64
     #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
65 65
     #define LONG_FILENAME_HOST_SUPPORT
66 66
 
67
-  #elif ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
67
+  #elif ENABLED(miniVIKI) || ENABLED(VIKI2) || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) || ENABLED(AZSMZ_12864)
68 68
 
69 69
     #define ULTRA_LCD  //general LCD support, also 16x2
70 70
     #define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
@@ -86,6 +86,11 @@
86 86
       #define DEFAULT_LCD_CONTRAST 110
87 87
       #define U8GLIB_LM6059_AF
88 88
       #define SD_DETECT_INVERTED
89
+    #elif ENABLED(AZSMZ_12864)
90
+      #define LCD_CONTRAST_MIN  120
91
+      #define LCD_CONTRAST_MAX 255
92
+      #define DEFAULT_LCD_CONTRAST 190
93
+      #define U8GLIB_ST7565_64128N
89 94
     #endif
90 95
 
91 96
   #elif ENABLED(OLED_PANEL_TINYBOY2)
@@ -224,6 +229,7 @@
224 229
 
225 230
   #elif ENABLED(miniVIKI) || ENABLED(VIKI2) \
226 231
      || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
232
+     || ENABLED(AZSMZ_12864) \
227 233
      || ENABLED(OLED_PANEL_TINYBOY2) \
228 234
      || ENABLED(BQ_LCD_SMART_CONTROLLER) \
229 235
      || ENABLED(LCD_I2C_PANELOLU2) \
@@ -327,6 +333,7 @@
327 333
         ENABLED(MAKRPANEL) \
328 334
      || ENABLED(CARTESIO_UI) \
329 335
      || ENABLED(VIKI2) \
336
+     || ENABLED(AZSMZ_12864) \
330 337
      || ENABLED(miniVIKI) \
331 338
      || ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
332 339
     )

+ 2
- 2
Marlin/src/inc/Conditionals_post.h View File

@@ -869,9 +869,9 @@
869 869
   #endif
870 870
 
871 871
   /**
872
-   * VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
872
+   * VIKI2, miniVIKI, and AZSMZ_12864 require DOGLCD_SCK and DOGLCD_MOSI to be defined.
873 873
    */
874
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
874
+  #if ENABLED(VIKI2) || ENABLED(miniVIKI) || ENABLED(AZSMZ_12864)
875 875
     #ifndef DOGLCD_SCK
876 876
       #define DOGLCD_SCK  SCK_PIN
877 877
     #endif

+ 5
- 0
Marlin/src/inc/SanityCheck.h View File

@@ -1155,6 +1155,7 @@ static_assert(1 >= 0
1155 1155
  *       miniVIKI => ULTIMAKERCONTROLLER
1156 1156
  *       VIKI2 => ULTIMAKERCONTROLLER
1157 1157
  *       ELB_FULL_GRAPHIC_CONTROLLER => ULTIMAKERCONTROLLER
1158
+ *       AZSMZ_12864 => ULTIMAKERCONTROLLER
1158 1159
  *       PANEL_ONE => ULTIMAKERCONTROLLER
1159 1160
  */
1160 1161
 static_assert(1 >= 0
@@ -1163,6 +1164,7 @@ static_assert(1 >= 0
1163 1164
       && DISABLED(miniVIKI) \
1164 1165
       && DISABLED(VIKI2) \
1165 1166
       && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
1167
+      && DISABLED(AZSMZ_12864) \
1166 1168
       && DISABLED(PANEL_ONE) \
1167 1169
       && DISABLED(MKS_12864OLED)
1168 1170
     + 1
@@ -1208,6 +1210,9 @@ static_assert(1 >= 0
1208 1210
   #if ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
1209 1211
     + 1
1210 1212
   #endif
1213
+  #if ENABLED(AZSMZ_12864)
1214
+    + 1
1215
+  #endif
1211 1216
   #if ENABLED(G3D_PANEL)
1212 1217
     + 1
1213 1218
   #endif

+ 2
- 18
Marlin/src/pins/pins_RAMPS_SMART.h View File

@@ -84,30 +84,14 @@
84 84
 //
85 85
 // LCD / Controller
86 86
 //
87
-// Support for AZSMZ 12864 LCD with SD Card 3D printer smart controller control panel (not tested)
88
-#if ENABLED(VIKI2)
89
-  #undef BEEPER_PIN
87
+// Support for AZSMZ 12864 LCD with SD Card 3D printer smart controller control panel
88
+#if ENABLED(AZSMZ_12864)
90 89
   #define BEEPER_PIN       66
91
-
92
-  // Pins for DOGM SPI LCD Support
93
-  #undef DOGLCD_A0
94 90
   #define DOGLCD_A0        59
95
-
96
-  #undef DOGLCD_A0
97 91
   #define DOGLCD_CS        44
98
-
99
-  #undef BTN_EN1
100 92
   #define BTN_EN1          58
101
-
102
-  #undef BTN_EN2
103 93
   #define BTN_EN2          40
104
-
105
-  #undef BTN_ENC
106 94
   #define BTN_ENC          67
107
-
108
-  #undef SD_DETECT_PIN
109 95
   #define SD_DETECT_PIN    49 // Pin 49 for display sd interface, 72 for easy adapter board
110
-
111
-  #undef KILL_PIN
112 96
   #define KILL_PIN         42
113 97
 #endif

Loading…
Cancel
Save