瀏覽代碼

Merge pull request #9501 from thinkyhead/bf2_ulticontroller_v21

[2.0.x] UltiController v2.1 support
Scott Lahteine 7 年之前
父節點
當前提交
db1ace5e82
沒有連結到貢獻者的電子郵件帳戶。
共有 57 個檔案被更改,包括 346 行新增4 行删除
  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/Azteeg/X5GT/Configuration.h
  8. 6
    0
      Marlin/src/config/examples/BIBO/TouchX/Configuration.h
  9. 6
    0
      Marlin/src/config/examples/BQ/Hephestos/Configuration.h
  10. 6
    0
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
  11. 6
    0
      Marlin/src/config/examples/BQ/WITBOX/Configuration.h
  12. 6
    0
      Marlin/src/config/examples/Cartesio/Configuration.h
  13. 6
    0
      Marlin/src/config/examples/Creality/CR-10/Configuration.h
  14. 6
    0
      Marlin/src/config/examples/Creality/CR-10S/Configuration.h
  15. 6
    0
      Marlin/src/config/examples/Creality/Ender/Configuration.h
  16. 6
    0
      Marlin/src/config/examples/Felix/Configuration.h
  17. 6
    0
      Marlin/src/config/examples/Felix/DUAL/Configuration.h
  18. 6
    0
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
  19. 6
    0
      Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
  20. 6
    0
      Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
  21. 6
    0
      Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
  22. 6
    0
      Marlin/src/config/examples/JGAurora/A5/Configuration.h
  23. 6
    0
      Marlin/src/config/examples/MakerParts/Configuration.h
  24. 6
    0
      Marlin/src/config/examples/Malyan/M150/Configuration.h
  25. 6
    0
      Marlin/src/config/examples/Malyan/M200/Configuration.h
  26. 6
    0
      Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
  27. 6
    0
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
  28. 6
    0
      Marlin/src/config/examples/Mks/Sbase/Configuration.h
  29. 6
    0
      Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
  30. 6
    0
      Marlin/src/config/examples/RigidBot/Configuration.h
  31. 6
    0
      Marlin/src/config/examples/SCARA/Configuration.h
  32. 6
    0
      Marlin/src/config/examples/STM32F10/Configuration.h
  33. 6
    0
      Marlin/src/config/examples/Sanguinololu/Configuration.h
  34. 6
    0
      Marlin/src/config/examples/TheBorg/Configuration.h
  35. 6
    0
      Marlin/src/config/examples/TinyBoy2/Configuration.h
  36. 6
    0
      Marlin/src/config/examples/Tronxy/X1/Configuration.h
  37. 6
    0
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
  38. 6
    0
      Marlin/src/config/examples/Velleman/K8200/Configuration.h
  39. 6
    0
      Marlin/src/config/examples/Velleman/K8400/Configuration.h
  40. 6
    0
      Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
  41. 6
    0
      Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
  42. 6
    0
      Marlin/src/config/examples/adafruit/ST7565/Configuration.h
  43. 6
    0
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
  44. 6
    0
      Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
  45. 6
    0
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
  46. 6
    0
      Marlin/src/config/examples/delta/generic/Configuration.h
  47. 6
    0
      Marlin/src/config/examples/delta/kossel_mini/Configuration.h
  48. 6
    0
      Marlin/src/config/examples/delta/kossel_pro/Configuration.h
  49. 6
    0
      Marlin/src/config/examples/delta/kossel_xl/Configuration.h
  50. 6
    0
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
  51. 6
    0
      Marlin/src/config/examples/makibox/Configuration.h
  52. 6
    0
      Marlin/src/config/examples/stm32f103ret6/Configuration.h
  53. 6
    0
      Marlin/src/config/examples/tvrrug/Round2/Configuration.h
  54. 6
    0
      Marlin/src/config/examples/wt150/Configuration.h
  55. 16
    4
      Marlin/src/inc/Conditionals_LCD.h
  56. 3
    0
      Marlin/src/inc/SanityCheck.h
  57. 3
    0
      Marlin/src/lcd/ultralcd_impl_DOGM.h

+ 6
- 0
Marlin/Configuration.h 查看文件

@@ -1619,6 +1619,12 @@
1619 1619
 #endif
1620 1620
 
1621 1621
 //
1622
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1623
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1624
+//
1625
+//#define ULTI_CONTROLLER
1626
+
1627
+//
1622 1628
 // CONTROLLER TYPE: Shift register panels
1623 1629
 //
1624 1630
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/default/Configuration.h 查看文件

@@ -1619,6 +1619,12 @@
1619 1619
 #endif
1620 1620
 
1621 1621
 //
1622
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1623
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1624
+//
1625
+//#define ULTI_CONTROLLER
1626
+
1627
+//
1622 1628
 // CONTROLLER TYPE: Shift register panels
1623 1629
 //
1624 1630
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h 查看文件

@@ -1639,6 +1639,12 @@
1639 1639
 #endif
1640 1640
 
1641 1641
 //
1642
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1643
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1644
+//
1645
+//#define ULTI_CONTROLLER
1646
+
1647
+//
1642 1648
 // CONTROLLER TYPE: Shift register panels
1643 1649
 //
1644 1650
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h 查看文件

@@ -1619,6 +1619,12 @@
1619 1619
 #endif
1620 1620
 
1621 1621
 //
1622
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1623
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1624
+//
1625
+//#define ULTI_CONTROLLER
1626
+
1627
+//
1622 1628
 // CONTROLLER TYPE: Shift register panels
1623 1629
 //
1624 1630
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Anet/A6/Configuration.h 查看文件

@@ -1769,6 +1769,12 @@
1769 1769
 #endif
1770 1770
 
1771 1771
 //
1772
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1773
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1774
+//
1775
+//#define ULTI_CONTROLLER
1776
+
1777
+//
1772 1778
 // CONTROLLER TYPE: Shift register panels
1773 1779
 //
1774 1780
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Anet/A8/Configuration.h 查看文件

@@ -1628,6 +1628,12 @@
1628 1628
 #endif
1629 1629
 
1630 1630
 //
1631
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1632
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1633
+//
1634
+//#define ULTI_CONTROLLER
1635
+
1636
+//
1631 1637
 // CONTROLLER TYPE: Shift register panels
1632 1638
 //
1633 1639
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Azteeg/X5GT/Configuration.h 查看文件

@@ -1619,6 +1619,12 @@
1619 1619
 #endif
1620 1620
 
1621 1621
 //
1622
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1623
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1624
+//
1625
+//#define ULTI_CONTROLLER
1626
+
1627
+//
1622 1628
 // CONTROLLER TYPE: Shift register panels
1623 1629
 //
1624 1630
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/BIBO/TouchX/Configuration.h 查看文件

@@ -1604,6 +1604,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
1604 1604
 #endif
1605 1605
 
1606 1606
 //
1607
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1608
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1609
+//
1610
+//#define ULTI_CONTROLLER
1611
+
1612
+//
1607 1613
 // CONTROLLER TYPE: Shift register panels
1608 1614
 //
1609 1615
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/BQ/Hephestos/Configuration.h 查看文件

@@ -1607,6 +1607,12 @@
1607 1607
 #endif
1608 1608
 
1609 1609
 //
1610
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1611
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1612
+//
1613
+//#define ULTI_CONTROLLER
1614
+
1615
+//
1610 1616
 // CONTROLLER TYPE: Shift register panels
1611 1617
 //
1612 1618
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h 查看文件

@@ -1620,6 +1620,12 @@
1620 1620
 #endif
1621 1621
 
1622 1622
 //
1623
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1624
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1625
+//
1626
+//#define ULTI_CONTROLLER
1627
+
1628
+//
1623 1629
 // CONTROLLER TYPE: Shift register panels
1624 1630
 //
1625 1631
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/BQ/WITBOX/Configuration.h 查看文件

@@ -1607,6 +1607,12 @@
1607 1607
 #endif
1608 1608
 
1609 1609
 //
1610
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1611
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1612
+//
1613
+//#define ULTI_CONTROLLER
1614
+
1615
+//
1610 1616
 // CONTROLLER TYPE: Shift register panels
1611 1617
 //
1612 1618
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Cartesio/Configuration.h 查看文件

@@ -1618,6 +1618,12 @@
1618 1618
 #endif
1619 1619
 
1620 1620
 //
1621
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1622
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1623
+//
1624
+//#define ULTI_CONTROLLER
1625
+
1626
+//
1621 1627
 // CONTROLLER TYPE: Shift register panels
1622 1628
 //
1623 1629
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Creality/CR-10/Configuration.h 查看文件

@@ -1629,6 +1629,12 @@
1629 1629
 #endif
1630 1630
 
1631 1631
 //
1632
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1633
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1634
+//
1635
+//#define ULTI_CONTROLLER
1636
+
1637
+//
1632 1638
 // CONTROLLER TYPE: Shift register panels
1633 1639
 //
1634 1640
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Creality/CR-10S/Configuration.h 查看文件

@@ -1605,6 +1605,12 @@
1605 1605
 #endif
1606 1606
 
1607 1607
 //
1608
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1609
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1610
+//
1611
+//#define ULTI_CONTROLLER
1612
+
1613
+//
1608 1614
 // CONTROLLER TYPE: Shift register panels
1609 1615
 //
1610 1616
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Creality/Ender/Configuration.h 查看文件

@@ -1608,6 +1608,12 @@
1608 1608
 #endif
1609 1609
 
1610 1610
 //
1611
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1612
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1613
+//
1614
+//#define ULTI_CONTROLLER
1615
+
1616
+//
1611 1617
 // CONTROLLER TYPE: Shift register panels
1612 1618
 //
1613 1619
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Felix/Configuration.h 查看文件

@@ -1601,6 +1601,12 @@
1601 1601
 #endif
1602 1602
 
1603 1603
 //
1604
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1605
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1606
+//
1607
+//#define ULTI_CONTROLLER
1608
+
1609
+//
1604 1610
 // CONTROLLER TYPE: Shift register panels
1605 1611
 //
1606 1612
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Felix/DUAL/Configuration.h 查看文件

@@ -1601,6 +1601,12 @@
1601 1601
 #endif
1602 1602
 
1603 1603
 //
1604
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1605
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1606
+//
1607
+//#define ULTI_CONTROLLER
1608
+
1609
+//
1604 1610
 // CONTROLLER TYPE: Shift register panels
1605 1611
 //
1606 1612
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h 查看文件

@@ -1625,6 +1625,12 @@
1625 1625
 #endif
1626 1626
 
1627 1627
 //
1628
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1629
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1630
+//
1631
+//#define ULTI_CONTROLLER
1632
+
1633
+//
1628 1634
 // CONTROLLER TYPE: Shift register panels
1629 1635
 //
1630 1636
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h 查看文件

@@ -1634,6 +1634,12 @@
1634 1634
 #endif
1635 1635
 
1636 1636
 //
1637
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1638
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1639
+//
1640
+//#define ULTI_CONTROLLER
1641
+
1642
+//
1637 1643
 // CONTROLLER TYPE: Shift register panels
1638 1644
 //
1639 1645
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h 查看文件

@@ -1619,6 +1619,12 @@
1619 1619
 #endif
1620 1620
 
1621 1621
 //
1622
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1623
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1624
+//
1625
+//#define ULTI_CONTROLLER
1626
+
1627
+//
1622 1628
 // CONTROLLER TYPE: Shift register panels
1623 1629
 //
1624 1630
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h 查看文件

@@ -1623,6 +1623,12 @@
1623 1623
 #endif
1624 1624
 
1625 1625
 //
1626
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1627
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1628
+//
1629
+//#define ULTI_CONTROLLER
1630
+
1631
+//
1626 1632
 // CONTROLLER TYPE: Shift register panels
1627 1633
 //
1628 1634
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/JGAurora/A5/Configuration.h 查看文件

@@ -1630,6 +1630,12 @@
1630 1630
 #endif
1631 1631
 
1632 1632
 //
1633
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1634
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1635
+//
1636
+//#define ULTI_CONTROLLER
1637
+
1638
+//
1633 1639
 // CONTROLLER TYPE: Shift register panels
1634 1640
 //
1635 1641
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/MakerParts/Configuration.h 查看文件

@@ -1626,6 +1626,12 @@
1626 1626
 #endif
1627 1627
 
1628 1628
 //
1629
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1630
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1631
+//
1632
+//#define ULTI_CONTROLLER
1633
+
1634
+//
1629 1635
 // CONTROLLER TYPE: Shift register panels
1630 1636
 //
1631 1637
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Malyan/M150/Configuration.h 查看文件

@@ -1647,6 +1647,12 @@
1647 1647
 #endif
1648 1648
 
1649 1649
 //
1650
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1651
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1652
+//
1653
+//#define ULTI_CONTROLLER
1654
+
1655
+//
1650 1656
 // CONTROLLER TYPE: Shift register panels
1651 1657
 //
1652 1658
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Malyan/M200/Configuration.h 查看文件

@@ -1609,6 +1609,12 @@
1609 1609
 #endif
1610 1610
 
1611 1611
 //
1612
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1613
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1614
+//
1615
+//#define ULTI_CONTROLLER
1616
+
1617
+//
1612 1618
 // CONTROLLER TYPE: Shift register panels
1613 1619
 //
1614 1620
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h 查看文件

@@ -1623,6 +1623,12 @@
1623 1623
 #endif
1624 1624
 
1625 1625
 //
1626
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1627
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1628
+//
1629
+//#define ULTI_CONTROLLER
1630
+
1631
+//
1626 1632
 // CONTROLLER TYPE: Shift register panels
1627 1633
 //
1628 1634
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h 查看文件

@@ -1623,6 +1623,12 @@
1623 1623
 #endif
1624 1624
 
1625 1625
 //
1626
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1627
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1628
+//
1629
+//#define ULTI_CONTROLLER
1630
+
1631
+//
1626 1632
 // CONTROLLER TYPE: Shift register panels
1627 1633
 //
1628 1634
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Mks/Sbase/Configuration.h 查看文件

@@ -1622,6 +1622,12 @@
1622 1622
 #endif
1623 1623
 
1624 1624
 //
1625
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1626
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1627
+//
1628
+//#define ULTI_CONTROLLER
1629
+
1630
+//
1625 1631
 // CONTROLLER TYPE: Shift register panels
1626 1632
 //
1627 1633
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h 查看文件

@@ -1619,6 +1619,12 @@
1619 1619
 #endif
1620 1620
 
1621 1621
 //
1622
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1623
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1624
+//
1625
+//#define ULTI_CONTROLLER
1626
+
1627
+//
1622 1628
 // CONTROLLER TYPE: Shift register panels
1623 1629
 //
1624 1630
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/RigidBot/Configuration.h 查看文件

@@ -1619,6 +1619,12 @@
1619 1619
 #endif
1620 1620
 
1621 1621
 //
1622
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1623
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1624
+//
1625
+//#define ULTI_CONTROLLER
1626
+
1627
+//
1622 1628
 // CONTROLLER TYPE: Shift register panels
1623 1629
 //
1624 1630
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/SCARA/Configuration.h 查看文件

@@ -1631,6 +1631,12 @@
1631 1631
 #endif
1632 1632
 
1633 1633
 //
1634
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1635
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1636
+//
1637
+//#define ULTI_CONTROLLER
1638
+
1639
+//
1634 1640
 // CONTROLLER TYPE: Shift register panels
1635 1641
 //
1636 1642
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/STM32F10/Configuration.h 查看文件

@@ -1622,6 +1622,12 @@
1622 1622
 #endif
1623 1623
 
1624 1624
 //
1625
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1626
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1627
+//
1628
+//#define ULTI_CONTROLLER
1629
+
1630
+//
1625 1631
 // CONTROLLER TYPE: Shift register panels
1626 1632
 //
1627 1633
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Sanguinololu/Configuration.h 查看文件

@@ -1650,6 +1650,12 @@
1650 1650
 #endif
1651 1651
 
1652 1652
 //
1653
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1654
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1655
+//
1656
+//#define ULTI_CONTROLLER
1657
+
1658
+//
1653 1659
 // CONTROLLER TYPE: Shift register panels
1654 1660
 //
1655 1661
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/TheBorg/Configuration.h 查看文件

@@ -1619,6 +1619,12 @@
1619 1619
 #endif
1620 1620
 
1621 1621
 //
1622
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1623
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1624
+//
1625
+//#define ULTI_CONTROLLER
1626
+
1627
+//
1622 1628
 // CONTROLLER TYPE: Shift register panels
1623 1629
 //
1624 1630
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/TinyBoy2/Configuration.h 查看文件

@@ -1675,6 +1675,12 @@
1675 1675
 #endif
1676 1676
 
1677 1677
 //
1678
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1679
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1680
+//
1681
+//#define ULTI_CONTROLLER
1682
+
1683
+//
1678 1684
 // CONTROLLER TYPE: Shift register panels
1679 1685
 //
1680 1686
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Tronxy/X1/Configuration.h 查看文件

@@ -1604,6 +1604,12 @@
1604 1604
 #endif
1605 1605
 
1606 1606
 //
1607
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1608
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1609
+//
1610
+//#define ULTI_CONTROLLER
1611
+
1612
+//
1607 1613
 // CONTROLLER TYPE: Shift register panels
1608 1614
 //
1609 1615
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h 查看文件

@@ -1610,6 +1610,12 @@
1610 1610
 #endif
1611 1611
 
1612 1612
 //
1613
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1614
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1615
+//
1616
+//#define ULTI_CONTROLLER
1617
+
1618
+//
1613 1619
 // CONTROLLER TYPE: Shift register panels
1614 1620
 //
1615 1621
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Velleman/K8200/Configuration.h 查看文件

@@ -1652,6 +1652,12 @@
1652 1652
 #endif
1653 1653
 
1654 1654
 //
1655
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1656
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1657
+//
1658
+//#define ULTI_CONTROLLER
1659
+
1660
+//
1655 1661
 // CONTROLLER TYPE: Shift register panels
1656 1662
 //
1657 1663
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Velleman/K8400/Configuration.h 查看文件

@@ -1619,6 +1619,12 @@
1619 1619
 #endif
1620 1620
 
1621 1621
 //
1622
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1623
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1624
+//
1625
+//#define ULTI_CONTROLLER
1626
+
1627
+//
1622 1628
 // CONTROLLER TYPE: Shift register panels
1623 1629
 //
1624 1630
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h 查看文件

@@ -1613,6 +1613,12 @@
1613 1613
 #endif
1614 1614
 
1615 1615
 //
1616
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1617
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1618
+//
1619
+//#define ULTI_CONTROLLER
1620
+
1621
+//
1616 1622
 // CONTROLLER TYPE: Shift register panels
1617 1623
 //
1618 1624
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h 查看文件

@@ -1566,6 +1566,12 @@
1566 1566
 #endif
1567 1567
 
1568 1568
 //
1569
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1570
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1571
+//
1572
+//#define ULTI_CONTROLLER
1573
+
1574
+//
1569 1575
 // CONTROLLER TYPE: Shift register panels
1570 1576
 //
1571 1577
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/adafruit/ST7565/Configuration.h 查看文件

@@ -1619,6 +1619,12 @@
1619 1619
 #endif
1620 1620
 
1621 1621
 //
1622
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1623
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1624
+//
1625
+//#define ULTI_CONTROLLER
1626
+
1627
+//
1622 1628
 // CONTROLLER TYPE: Shift register panels
1623 1629
 //
1624 1630
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h 查看文件

@@ -1753,6 +1753,12 @@
1753 1753
 #endif
1754 1754
 
1755 1755
 //
1756
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1757
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1758
+//
1759
+//#define ULTI_CONTROLLER
1760
+
1761
+//
1756 1762
 // CONTROLLER TYPE: Shift register panels
1757 1763
 //
1758 1764
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h 查看文件

@@ -1738,6 +1738,12 @@
1738 1738
 #endif
1739 1739
 
1740 1740
 //
1741
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1742
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1743
+//
1744
+//#define ULTI_CONTROLLER
1745
+
1746
+//
1741 1747
 // CONTROLLER TYPE: Shift register panels
1742 1748
 //
1743 1749
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h 查看文件

@@ -1751,6 +1751,12 @@
1751 1751
 #endif
1752 1752
 
1753 1753
 //
1754
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1755
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1756
+//
1757
+//#define ULTI_CONTROLLER
1758
+
1759
+//
1754 1760
 // CONTROLLER TYPE: Shift register panels
1755 1761
 //
1756 1762
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/delta/generic/Configuration.h 查看文件

@@ -1740,6 +1740,12 @@
1740 1740
 #endif
1741 1741
 
1742 1742
 //
1743
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1744
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1745
+//
1746
+//#define ULTI_CONTROLLER
1747
+
1748
+//
1743 1749
 // CONTROLLER TYPE: Shift register panels
1744 1750
 //
1745 1751
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/delta/kossel_mini/Configuration.h 查看文件

@@ -1743,6 +1743,12 @@
1743 1743
 #endif
1744 1744
 
1745 1745
 //
1746
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1747
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1748
+//
1749
+//#define ULTI_CONTROLLER
1750
+
1751
+//
1746 1752
 // CONTROLLER TYPE: Shift register panels
1747 1753
 //
1748 1754
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/delta/kossel_pro/Configuration.h 查看文件

@@ -1743,6 +1743,12 @@
1743 1743
 #endif
1744 1744
 
1745 1745
 //
1746
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1747
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1748
+//
1749
+//#define ULTI_CONTROLLER
1750
+
1751
+//
1746 1752
 // CONTROLLER TYPE: Shift register panels
1747 1753
 //
1748 1754
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/delta/kossel_xl/Configuration.h 查看文件

@@ -1752,6 +1752,12 @@
1752 1752
 #endif
1753 1753
 
1754 1754
 //
1755
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1756
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1757
+//
1758
+//#define ULTI_CONTROLLER
1759
+
1760
+//
1755 1761
 // CONTROLLER TYPE: Shift register panels
1756 1762
 //
1757 1763
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h 查看文件

@@ -1633,6 +1633,12 @@
1633 1633
 #endif
1634 1634
 
1635 1635
 //
1636
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1637
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1638
+//
1639
+//#define ULTI_CONTROLLER
1640
+
1641
+//
1636 1642
 // CONTROLLER TYPE: Shift register panels
1637 1643
 //
1638 1644
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/makibox/Configuration.h 查看文件

@@ -1622,6 +1622,12 @@
1622 1622
 #endif
1623 1623
 
1624 1624
 //
1625
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1626
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1627
+//
1628
+//#define ULTI_CONTROLLER
1629
+
1630
+//
1625 1631
 // CONTROLLER TYPE: Shift register panels
1626 1632
 //
1627 1633
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/stm32f103ret6/Configuration.h 查看文件

@@ -1493,6 +1493,12 @@
1493 1493
 #endif
1494 1494
 
1495 1495
 //
1496
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1497
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1498
+//
1499
+//#define ULTI_CONTROLLER
1500
+
1501
+//
1496 1502
 // CONTROLLER TYPE: Shift register panels
1497 1503
 //
1498 1504
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/tvrrug/Round2/Configuration.h 查看文件

@@ -1614,6 +1614,12 @@
1614 1614
 #endif
1615 1615
 
1616 1616
 //
1617
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1618
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1619
+//
1620
+//#define ULTI_CONTROLLER
1621
+
1622
+//
1617 1623
 // CONTROLLER TYPE: Shift register panels
1618 1624
 //
1619 1625
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 6
- 0
Marlin/src/config/examples/wt150/Configuration.h 查看文件

@@ -1624,6 +1624,12 @@
1624 1624
 #endif
1625 1625
 
1626 1626
 //
1627
+// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
1628
+// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
1629
+//
1630
+//#define ULTI_CONTROLLER
1631
+
1632
+//
1627 1633
 // CONTROLLER TYPE: Shift register panels
1628 1634
 //
1629 1635
 // 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH

+ 16
- 4
Marlin/src/inc/Conditionals_LCD.h 查看文件

@@ -151,10 +151,21 @@
151 151
   #define DEFAULT_LCD_CONTRAST 17
152 152
 #endif
153 153
 
154
-// Generic support for SSD1306 / SH1106 OLED based LCDs.
155
-#if ENABLED(U8GLIB_SSD1306) || ENABLED(U8GLIB_SH1106)
154
+#if ENABLED(ULTI_CONTROLLER)
155
+  #define U8GLIB_SSD1309
156
+  #define REVERSE_ENCODER_DIRECTION
157
+  #define LCD_RESET_PIN LCD_PINS_D6 //  This controller need a reset pin
158
+  #define LCD_CONTRAST_MIN 0
159
+  #define LCD_CONTRAST_MAX 254
160
+  #define DEFAULT_LCD_CONTRAST 127
161
+  #define ENCODER_PULSES_PER_STEP 2
162
+  #define ENCODER_STEPS_PER_MENU_ITEM 2
163
+#endif
164
+
165
+// Generic support for SSD1306 / SSD1309 / SH1106 OLED based LCDs.
166
+#if ENABLED(U8GLIB_SSD1306) || ENABLED(U8GLIB_SSD1309) || ENABLED(U8GLIB_SH1106)
156 167
   #define ULTRA_LCD  //general LCD support, also 16x2
157
-  #define DOGLCD  // Support for I2C LCD 128x64 (Controller SSD1306 / SH1106 graphic Display Family)
168
+  #define DOGLCD  // Support for I2C LCD 128x64 (Controller SSD1306 / SSD1309 / SH1106 graphic Display Family)
158 169
 #endif
159 170
 
160 171
 #if ENABLED(PANEL_ONE) || ENABLED(U8GLIB_SH1106)
@@ -178,7 +189,8 @@
178 189
 #if ENABLED(ULTIMAKERCONTROLLER)              \
179 190
  || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) \
180 191
  || ENABLED(G3D_PANEL)                        \
181
- || ENABLED(RIGIDBOT_PANEL)
192
+ || ENABLED(RIGIDBOT_PANEL)                   \
193
+ || ENABLED(ULTI_CONTROLLER)
182 194
   #define ULTIPANEL
183 195
 #endif
184 196
 

+ 3
- 0
Marlin/src/inc/SanityCheck.h 查看文件

@@ -1426,6 +1426,9 @@ static_assert(1 >= 0
1426 1426
   #if ENABLED(ZONESTAR_LCD)
1427 1427
     + 1
1428 1428
   #endif
1429
+  #if ENABLED(ULTI_CONTROLLER)
1430
+    + 1
1431
+  #endif
1429 1432
   , "Please select no more than one LCD controller option."
1430 1433
 );
1431 1434
 

+ 3
- 0
Marlin/src/lcd/ultralcd_impl_DOGM.h 查看文件

@@ -211,6 +211,9 @@
211 211
   // Generic support for SH1106 OLED I2C LCDs
212 212
     //U8GLIB_SH1106_128X64_2X_I2C_2_WIRE  u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes
213 213
     U8GLIB_SH1106_128X64_2X u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes
214
+#elif ENABLED(U8GLIB_SSD1309)
215
+  // Generic support for SSD1309 OLED I2C LCDs
216
+  U8GLIB_SSD1309_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST);
214 217
 #elif ENABLED(MINIPANEL)
215 218
   // The MINIPanel display
216 219
     //U8GLIB_MINI12864 u8g(DOGLCD_CS, DOGLCD_A0);  // 8 stripes

Loading…
取消
儲存