bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge pull request #9501 from thinkyhead/bf2_ulticontroller_v21

Browse Source 
[2.0.x] UltiController v2.1 support
This commit is contained in:
Scott Lahteine 2018-02-05 23:06:32 -06:00 committed by GitHub
commit db1ace5e82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
57 changed files with 346 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Configuration.h
View File

@ -1618,6 +1618,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1618,6 +1618,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1638,6 +1638,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1618,6 +1618,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1768,6 +1768,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1627,6 +1627,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

6
Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
View File

@ -1618,6 +1618,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

6
Marlin/src/config/examples/BIBO/TouchX/Configuration.h
View File

@ -1603,6 +1603,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1606,6 +1606,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1619,6 +1619,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1606,6 +1606,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1617,6 +1617,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1628,6 +1628,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1604,6 +1604,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

6
Marlin/src/config/examples/Creality/Ender/Configuration.h
View File

@ -1607,6 +1607,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1600,6 +1600,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1600,6 +1600,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

6
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
View File

@ -1624,6 +1624,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1633,6 +1633,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1618,6 +1618,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1622,6 +1622,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

6
Marlin/src/config/examples/JGAurora/A5/Configuration.h
View File

@ -1629,6 +1629,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

6
Marlin/src/config/examples/MakerParts/Configuration.h
View File

@ -1625,6 +1625,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1646,6 +1646,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

6
Marlin/src/config/examples/Malyan/M200/Configuration.h
View File

@ -1608,6 +1608,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1622,6 +1622,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1622,6 +1622,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1621,6 +1621,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1618,6 +1618,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1618,6 +1618,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1630,6 +1630,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

6
Marlin/src/config/examples/STM32F10/Configuration.h
View File

@ -1621,6 +1621,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1649,6 +1649,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

6
Marlin/src/config/examples/TheBorg/Configuration.h
View File

@ -1618,6 +1618,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1674,6 +1674,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

6
Marlin/src/config/examples/Tronxy/X1/Configuration.h
View File

@ -1603,6 +1603,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

6
Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
View File

@ -1609,6 +1609,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1651,6 +1651,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1618,6 +1618,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1612,6 +1612,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

6
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
View File

@ -1565,6 +1565,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1618,6 +1618,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1752,6 +1752,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

6
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
View File

@ -1737,6 +1737,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1750,6 +1750,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1739,6 +1739,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1742,6 +1742,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1742,6 +1742,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1751,6 +1751,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1632,6 +1632,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1621,6 +1621,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1492,6 +1492,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1613,6 +1613,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

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

@ -1623,6 +1623,12 @@
#define U8GLIB_SH1106
#endif
//
// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder
// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1)
//
//#define ULTI_CONTROLLER
//
// CONTROLLER TYPE: Shift register panels
//

20
Marlin/src/inc/Conditionals_LCD.h
View File

@ -151,10 +151,21 @@
#define DEFAULT_LCD_CONTRAST 17
#endif
// Generic support for SSD1306 / SH1106 OLED based LCDs.
#if ENABLED(U8GLIB_SSD1306) || ENABLED(U8GLIB_SH1106)
#if ENABLED(ULTI_CONTROLLER)
#define U8GLIB_SSD1309
#define REVERSE_ENCODER_DIRECTION
#define LCD_RESET_PIN LCD_PINS_D6 // This controller need a reset pin
#define LCD_CONTRAST_MIN 0
#define LCD_CONTRAST_MAX 254
#define DEFAULT_LCD_CONTRAST 127
#define ENCODER_PULSES_PER_STEP 2
#define ENCODER_STEPS_PER_MENU_ITEM 2
#endif
// Generic support for SSD1306 / SSD1309 / SH1106 OLED based LCDs.
#if ENABLED(U8GLIB_SSD1306) || ENABLED(U8GLIB_SSD1309) || ENABLED(U8GLIB_SH1106)
#define ULTRA_LCD //general LCD support, also 16x2
#define DOGLCD // Support for I2C LCD 128x64 (Controller SSD1306 / SH1106 graphic Display Family)
#define DOGLCD // Support for I2C LCD 128x64 (Controller SSD1306 / SSD1309 / SH1106 graphic Display Family)
#endif
#if ENABLED(PANEL_ONE) || ENABLED(U8GLIB_SH1106)
@ -178,7 +189,8 @@
#if ENABLED(ULTIMAKERCONTROLLER) \
|| ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) \
|| ENABLED(G3D_PANEL) \
|| ENABLED(RIGIDBOT_PANEL)
|| ENABLED(RIGIDBOT_PANEL) \
|| ENABLED(ULTI_CONTROLLER)
#define ULTIPANEL
#endif

3
Marlin/src/inc/SanityCheck.h
View File

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

3
Marlin/src/lcd/ultralcd_impl_DOGM.h
View File

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