瀏覽代碼

Merge pull request #7867 from thinkyhead/bf1_add_some_lcds

[1.1.x] Add support for 4 new LCDs
Scott Lahteine 7 年之前
父節點
當前提交
73c5675485
共有 72 個檔案被更改,包括 1587 行新增113 行删除
  1. 51
    10
      Marlin/Conditionals_LCD.h
  2. 29
    0
      Marlin/Configuration.h
  3. 6
    0
      Marlin/Marlin_main.cpp
  4. 32
    13
      Marlin/SanityCheck.h
  5. 29
    0
      Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h
  6. 1
    1
      Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h
  7. 29
    0
      Marlin/example_configurations/AliExpress/CL-260/Configuration.h
  8. 29
    0
      Marlin/example_configurations/Anet/A6/Configuration.h
  9. 1
    1
      Marlin/example_configurations/Anet/A6/Configuration_adv.h
  10. 29
    0
      Marlin/example_configurations/Anet/A8/Configuration.h
  11. 1
    1
      Marlin/example_configurations/Anet/A8/Configuration_adv.h
  12. 29
    0
      Marlin/example_configurations/BQ/Hephestos/Configuration.h
  13. 1
    1
      Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h
  14. 29
    0
      Marlin/example_configurations/BQ/Hephestos_2/Configuration.h
  15. 1
    1
      Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h
  16. 29
    0
      Marlin/example_configurations/BQ/WITBOX/Configuration.h
  17. 1
    1
      Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h
  18. 29
    0
      Marlin/example_configurations/Cartesio/Configuration.h
  19. 1
    1
      Marlin/example_configurations/Cartesio/Configuration_adv.h
  20. 30
    1
      Marlin/example_configurations/Creality/CR-10/Configuration.h
  21. 23
    1
      Marlin/example_configurations/Creality/CR-10/Configuration_adv.h
  22. 29
    0
      Marlin/example_configurations/Felix/Configuration.h
  23. 1
    1
      Marlin/example_configurations/Felix/Configuration_adv.h
  24. 29
    0
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  25. 29
    0
      Marlin/example_configurations/Folger Tech/i3-2020/Configuration.h
  26. 1
    1
      Marlin/example_configurations/Folger Tech/i3-2020/Configuration_adv.h
  27. 29
    0
      Marlin/example_configurations/Geeetech/GT2560/Configuration.h
  28. 29
    0
      Marlin/example_configurations/Geeetech/I3_Pro_X-GT2560/Configuration.h
  29. 29
    0
      Marlin/example_configurations/Infitary/i3-M508/Configuration.h
  30. 1
    1
      Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h
  31. 29
    0
      Marlin/example_configurations/Malyan/M150/Configuration.h
  32. 1
    1
      Marlin/example_configurations/Malyan/M150/Configuration_adv.h
  33. 29
    0
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  34. 29
    0
      Marlin/example_configurations/RigidBot/Configuration.h
  35. 1
    1
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  36. 29
    0
      Marlin/example_configurations/SCARA/Configuration.h
  37. 1
    1
      Marlin/example_configurations/SCARA/Configuration_adv.h
  38. 31
    1
      Marlin/example_configurations/Sanguinololu/Configuration.h
  39. 1
    1
      Marlin/example_configurations/Sanguinololu/Configuration_adv.h
  40. 29
    0
      Marlin/example_configurations/TinyBoy2/Configuration.h
  41. 1
    1
      Marlin/example_configurations/TinyBoy2/Configuration_adv.h
  42. 29
    0
      Marlin/example_configurations/Velleman/K8200/Configuration.h
  43. 1
    1
      Marlin/example_configurations/Velleman/K8200/Configuration_adv.h
  44. 29
    0
      Marlin/example_configurations/Velleman/K8400/Configuration.h
  45. 1
    1
      Marlin/example_configurations/Velleman/K8400/Configuration_adv.h
  46. 29
    0
      Marlin/example_configurations/Velleman/K8400/Dual-head/Configuration.h
  47. 29
    0
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  48. 29
    0
      Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
  49. 1
    1
      Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
  50. 29
    0
      Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
  51. 1
    1
      Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
  52. 29
    0
      Marlin/example_configurations/delta/generic/Configuration.h
  53. 1
    1
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  54. 29
    0
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  55. 1
    1
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  56. 29
    0
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  57. 1
    1
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  58. 29
    0
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  59. 1
    1
      Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
  60. 29
    0
      Marlin/example_configurations/gCreate/gMax1.5+/Configuration.h
  61. 1
    1
      Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h
  62. 29
    0
      Marlin/example_configurations/makibox/Configuration.h
  63. 1
    1
      Marlin/example_configurations/makibox/Configuration_adv.h
  64. 29
    0
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  65. 1
    1
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
  66. 29
    0
      Marlin/example_configurations/wt150/Configuration.h
  67. 1
    1
      Marlin/example_configurations/wt150/Configuration_adv.h
  68. 3
    2
      Marlin/pins_AZTEEG_X3.h
  69. 124
    46
      Marlin/pins_RAMPS.h
  70. 17
    4
      Marlin/ultralcd_impl_DOGM.h
  71. 253
    0
      Marlin/ultralcd_st7565_u8glib_VIKI.h
  72. 4
    8
      Marlin/ultralcd_st7920_u8glib_rrd.h

+ 51
- 10
Marlin/Conditionals_LCD.h 查看文件

@@ -38,11 +38,9 @@
38 38
     #define LCD_CONTRAST_MIN 60
39 39
     #define LCD_CONTRAST_MAX 140
40 40
 
41
-  #elif ENABLED(MAKRPANEL) || ENABLED(MINIPANEL)
41
+  #elif ENABLED(MAKRPANEL)
42 42
 
43
-    #define DOGLCD
44
-    #define ULTIPANEL
45
-    #define DEFAULT_LCD_CONTRAST 17
43
+    #define U8GLIB_ST7565_64128N
46 44
 
47 45
   #elif ENABLED(ANET_KEYPAD_LCD)
48 46
 
@@ -73,14 +71,18 @@
73 71
     #define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
74 72
 
75 73
     #if ENABLED(miniVIKI)
76
-      #define LCD_CONTRAST_MIN  75
77
-      #define LCD_CONTRAST_MAX 115
78
-      #define DEFAULT_LCD_CONTRAST 95
74
+      #define LCD_CONTRAST_MIN      75
75
+      #define LCD_CONTRAST_MAX     115
76
+      #define DEFAULT_LCD_CONTRAST  95
77
+      #define U8GLIB_ST7565_64128N
79 78
     #elif ENABLED(VIKI2)
80
-      #define DEFAULT_LCD_CONTRAST 40
79
+      #define LCD_CONTRAST_MIN       0
80
+      #define LCD_CONTRAST_MAX     255
81
+      #define DEFAULT_LCD_CONTRAST 140
82
+      #define U8GLIB_ST7565_64128N
81 83
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
82
-      #define LCD_CONTRAST_MIN  90
83
-      #define LCD_CONTRAST_MAX 130
84
+      #define LCD_CONTRAST_MIN      90
85
+      #define LCD_CONTRAST_MAX     130
84 86
       #define DEFAULT_LCD_CONTRAST 110
85 87
       #define U8GLIB_LM6059_AF
86 88
       #define SD_DETECT_INVERTED
@@ -105,6 +107,34 @@
105 107
     #define U8GLIB_ST7920
106 108
     #define ULTIPANEL
107 109
 
110
+  #elif ENABLED(CR10_STOCKDISPLAY)
111
+
112
+    #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
113
+    #ifndef ST7920_DELAY_1
114
+      #define ST7920_DELAY_1 DELAY_2_NOP
115
+    #endif
116
+    #ifndef ST7920_DELAY_2
117
+      #define ST7920_DELAY_2 DELAY_2_NOP
118
+    #endif
119
+    #ifndef ST7920_DELAY_3
120
+      #define ST7920_DELAY_3 DELAY_2_NOP
121
+    #endif
122
+
123
+  #elif ENABLED(MKS_12864OLED)
124
+
125
+    #define REPRAP_DISCOUNT_SMART_CONTROLLER
126
+    #define U8GLIB_SH1106
127
+
128
+  #elif ENABLED(MKS_MINI_12864)
129
+
130
+    #define MINIPANEL
131
+
132
+  #endif
133
+
134
+  #if ENABLED(MAKRPANEL) || ENABLED(MINIPANEL)
135
+    #define DOGLCD
136
+    #define ULTIPANEL
137
+    #define DEFAULT_LCD_CONTRAST 17
108 138
   #endif
109 139
 
110 140
   // Generic support for SSD1306 / SH1106 OLED based LCDs.
@@ -114,7 +144,15 @@
114 144
   #endif
115 145
 
116 146
   #if ENABLED(PANEL_ONE) || ENABLED(U8GLIB_SH1106)
147
+
117 148
     #define ULTIMAKERCONTROLLER
149
+
150
+  #elif ENABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602)
151
+
152
+    #define REPRAP_DISCOUNT_SMART_CONTROLLER
153
+    #define LCD_WIDTH 16
154
+    #define LCD_HEIGHT 2
155
+
118 156
   #endif
119 157
 
120 158
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) || ENABLED(LCD_FOR_MELZI)
@@ -206,6 +244,9 @@
206 244
   #ifndef ENCODER_STEPS_PER_MENU_ITEM
207 245
     #define ENCODER_STEPS_PER_MENU_ITEM STD_ENCODER_STEPS_PER_MENU_ITEM
208 246
   #endif
247
+  #ifndef ENCODER_FEEDRATE_DEADZONE
248
+    #define ENCODER_FEEDRATE_DEADZONE 6
249
+  #endif
209 250
 
210 251
   // Shift register panels
211 252
   // ---------------------

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

@@ -1503,6 +1503,35 @@
1503 1503
 //
1504 1504
 //#define OLED_PANEL_TINYBOY2
1505 1505
 
1506
+//
1507
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1508
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1509
+//
1510
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1511
+
1512
+//
1513
+// MKS MINI12864 with graphic controller and SD support
1514
+// http://reprap.org/wiki/MKS_MINI_12864
1515
+//
1516
+//#define MKS_MINI_12864
1517
+
1518
+//
1519
+// Factory display for Creality CR-10
1520
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1521
+//
1522
+// This is RAMPS-compatible using a single 10-pin connector.
1523
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1524
+//
1525
+//#define CR10_STOCKDISPLAY
1526
+
1527
+//
1528
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1529
+// http://reprap.org/wiki/MKS_12864OLED
1530
+//
1531
+// Tiny, but very sharp OLED display
1532
+//
1533
+//#define MKS_12864OLED
1534
+
1506 1535
 //=============================================================================
1507 1536
 //=============================== Extra Features ==============================
1508 1537
 //=============================================================================

+ 6
- 0
Marlin/Marlin_main.cpp 查看文件

@@ -13583,6 +13583,12 @@ void setup() {
13583 13583
       pe_deactivate_magnet(1);
13584 13584
     #endif
13585 13585
   #endif
13586
+  #if ENABLED(MKS_12864OLED)
13587
+    SET_OUTPUT(LCD_PINS_DC);
13588
+    OUT_WRITE(LCD_PINS_RS, LOW);
13589
+    delay(1000);
13590
+    WRITE(LCD_PINS_RS, HIGH);
13591
+  #endif
13586 13592
 }
13587 13593
 
13588 13594
 /**

+ 32
- 13
Marlin/SanityCheck.h 查看文件

@@ -301,7 +301,7 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
301 301
     #error "BABYSTEPPING is not implemented for SCARA yet."
302 302
   #elif ENABLED(DELTA) && ENABLED(BABYSTEP_XY)
303 303
     #error "BABYSTEPPING only implemented for Z axis on deltabots."
304
-  #elif ENABLED(BABYSTEP_ZPROBE_OFFSET) &&  ENABLED(MESH_BED_LEVELING)
304
+  #elif ENABLED(BABYSTEP_ZPROBE_OFFSET) && ENABLED(MESH_BED_LEVELING)
305 305
     #error "MESH_BED_LEVELING and BABYSTEP_ZPROBE_OFFSET is not a valid combination"
306 306
   #elif ENABLED(BABYSTEP_ZPROBE_OFFSET) && !HAS_BED_PROBE
307 307
     #error "BABYSTEP_ZPROBE_OFFSET requires a probe."
@@ -647,12 +647,10 @@ static_assert(1 >= 0
647 647
   /**
648 648
    * Require some kind of probe for bed leveling and probe testing
649 649
    */
650
-  #if HAS_ABL
651
-    #if ENABLED(AUTO_BED_LEVELING_UBL)
652
-      #error "Unified Bed Leveling requires a probe: FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or Z Servo."
653
-    #else
654
-      #error "Auto Bed Leveling requires one of these: PROBE_MANUALLY, FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or a Z Servo."
655
-    #endif
650
+  #if ENABLED(AUTO_BED_LEVELING_UBL)
651
+    #error "Unified Bed Leveling requires a probe: FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or Z Servo."
652
+  #elif HAS_ABL
653
+    #error "Auto Bed Leveling requires one of these: PROBE_MANUALLY, FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or a Z Servo."
656 654
   #endif
657 655
 
658 656
 #endif
@@ -1138,6 +1136,7 @@ static_assert(1 >= 0
1138 1136
  * Note: BQ_LCD_SMART_CONTROLLER => REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
1139 1137
  *       REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER => REPRAP_DISCOUNT_SMART_CONTROLLER
1140 1138
  *       SAV_3DGLCD => U8GLIB_SH1106 => ULTIMAKERCONTROLLER
1139
+ *       MKS_12864OLED => U8GLIB_SH1106 => ULTIMAKERCONTROLLER
1141 1140
  *       miniVIKI => ULTIMAKERCONTROLLER
1142 1141
  *       VIKI2 => ULTIMAKERCONTROLLER
1143 1142
  *       ELB_FULL_GRAPHIC_CONTROLLER => ULTIMAKERCONTROLLER
@@ -1145,19 +1144,34 @@ static_assert(1 >= 0
1145 1144
  */
1146 1145
 static_assert(1 >= 0
1147 1146
   #if ENABLED(ULTIMAKERCONTROLLER) \
1148
-      && DISABLED(SAV_3DGLCD) && DISABLED(miniVIKI) && DISABLED(VIKI2) \
1149
-      && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && DISABLED(PANEL_ONE)
1147
+      && DISABLED(SAV_3DGLCD) \
1148
+      && DISABLED(miniVIKI) \
1149
+      && DISABLED(VIKI2) \
1150
+      && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
1151
+      && DISABLED(PANEL_ONE) \
1152
+      && DISABLED(MKS_12864OLED)
1150 1153
     + 1
1151 1154
   #endif
1152
-  #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(LCD_FOR_MELZI)
1155
+  #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) \
1156
+      && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \
1157
+      && DISABLED(LCD_FOR_MELZI) \
1158
+      && DISABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602) \
1159
+      && DISABLED(MKS_12864OLED)
1153 1160
     + 1
1154 1161
   #endif
1155
-  #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(BQ_LCD_SMART_CONTROLLER)
1162
+  #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \
1163
+      && DISABLED(BQ_LCD_SMART_CONTROLLER)
1156 1164
     + 1
1157 1165
   #endif
1158 1166
   #if ENABLED(LCD_FOR_MELZI)
1159 1167
     + 1
1160 1168
   #endif
1169
+  #if ENABLED(MKS_12864OLED)
1170
+    + 1
1171
+  #endif
1172
+  #if ENABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602)
1173
+    + 1
1174
+  #endif
1161 1175
   #if ENABLED(CARTESIO_UI)
1162 1176
     + 1
1163 1177
   #endif
@@ -1182,10 +1196,15 @@ static_assert(1 >= 0
1182 1196
   #if ENABLED(G3D_PANEL)
1183 1197
     + 1
1184 1198
   #endif
1185
-  #if ENABLED(MINIPANEL)
1199
+  #if ENABLED(MINIPANEL) && DISABLED(MKS_MINI_12864)
1200
+    + 1
1201
+  #endif
1202
+  #if ENABLED(MKS_MINI_12864)
1186 1203
     + 1
1187 1204
   #endif
1188
-  #if ENABLED(REPRAPWORLD_KEYPAD) && DISABLED(CARTESIO_UI) && DISABLED(ANET_KEYPAD_LCD)
1205
+  #if ENABLED(REPRAPWORLD_KEYPAD) \
1206
+      && DISABLED(CARTESIO_UI) \
1207
+      && DISABLED(ANET_KEYPAD_LCD)
1189 1208
     + 1
1190 1209
   #endif
1191 1210
   #if ENABLED(RIGIDBOT_PANEL)

+ 29
- 0
Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h 查看文件

@@ -1523,6 +1523,35 @@
1523 1523
 //
1524 1524
 //#define OLED_PANEL_TINYBOY2
1525 1525
 
1526
+//
1527
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1528
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1529
+//
1530
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1531
+
1532
+//
1533
+// MKS MINI12864 with graphic controller and SD support
1534
+// http://reprap.org/wiki/MKS_MINI_12864
1535
+//
1536
+//#define MKS_MINI_12864
1537
+
1538
+//
1539
+// Factory display for Creality CR-10
1540
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1541
+//
1542
+// This is RAMPS-compatible using a single 10-pin connector.
1543
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1544
+//
1545
+//#define CR10_STOCKDISPLAY
1546
+
1547
+//
1548
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1549
+// http://reprap.org/wiki/MKS_12864OLED
1550
+//
1551
+// Tiny, but very sharp OLED display
1552
+//
1553
+//#define MKS_12864OLED
1554
+
1526 1555
 //=============================================================================
1527 1556
 //=============================== Extra Features ==============================
1528 1557
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h 查看文件

@@ -744,7 +744,7 @@
744 744
 #define MAX_CMD_SIZE 96
745 745
 #define BUFSIZE 4
746 746
 
747
-// Transfer Buffer Size
747
+// Transmission to Host Buffer Size
748 748
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
749 749
 // To buffer a simple "ok" you need 4 bytes.
750 750
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/AliExpress/CL-260/Configuration.h 查看文件

@@ -1503,6 +1503,35 @@
1503 1503
 //
1504 1504
 //#define OLED_PANEL_TINYBOY2
1505 1505
 
1506
+//
1507
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1508
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1509
+//
1510
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1511
+
1512
+//
1513
+// MKS MINI12864 with graphic controller and SD support
1514
+// http://reprap.org/wiki/MKS_MINI_12864
1515
+//
1516
+//#define MKS_MINI_12864
1517
+
1518
+//
1519
+// Factory display for Creality CR-10
1520
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1521
+//
1522
+// This is RAMPS-compatible using a single 10-pin connector.
1523
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1524
+//
1525
+//#define CR10_STOCKDISPLAY
1526
+
1527
+//
1528
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1529
+// http://reprap.org/wiki/MKS_12864OLED
1530
+//
1531
+// Tiny, but very sharp OLED display
1532
+//
1533
+//#define MKS_12864OLED
1534
+
1506 1535
 //=============================================================================
1507 1536
 //=============================== Extra Features ==============================
1508 1537
 //=============================================================================

+ 29
- 0
Marlin/example_configurations/Anet/A6/Configuration.h 查看文件

@@ -1662,6 +1662,35 @@
1662 1662
 //
1663 1663
 //#define OLED_PANEL_TINYBOY2
1664 1664
 
1665
+//
1666
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1667
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1668
+//
1669
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1670
+
1671
+//
1672
+// MKS MINI12864 with graphic controller and SD support
1673
+// http://reprap.org/wiki/MKS_MINI_12864
1674
+//
1675
+//#define MKS_MINI_12864
1676
+
1677
+//
1678
+// Factory display for Creality CR-10
1679
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1680
+//
1681
+// This is RAMPS-compatible using a single 10-pin connector.
1682
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1683
+//
1684
+//#define CR10_STOCKDISPLAY
1685
+
1686
+//
1687
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1688
+// http://reprap.org/wiki/MKS_12864OLED
1689
+//
1690
+// Tiny, but very sharp OLED display
1691
+//
1692
+//#define MKS_12864OLED
1693
+
1665 1694
 //=============================================================================
1666 1695
 //=============================== Extra Features ==============================
1667 1696
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/Anet/A6/Configuration_adv.h 查看文件

@@ -744,7 +744,7 @@
744 744
 #define MAX_CMD_SIZE 96
745 745
 #define BUFSIZE 4
746 746
 
747
-// Transfer Buffer Size
747
+// Transmission to Host Buffer Size
748 748
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
749 749
 // To buffer a simple "ok" you need 4 bytes.
750 750
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/Anet/A8/Configuration.h 查看文件

@@ -1511,6 +1511,35 @@
1511 1511
 //
1512 1512
 //#define OLED_PANEL_TINYBOY2
1513 1513
 
1514
+//
1515
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1516
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1517
+//
1518
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1519
+
1520
+//
1521
+// MKS MINI12864 with graphic controller and SD support
1522
+// http://reprap.org/wiki/MKS_MINI_12864
1523
+//
1524
+//#define MKS_MINI_12864
1525
+
1526
+//
1527
+// Factory display for Creality CR-10
1528
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1529
+//
1530
+// This is RAMPS-compatible using a single 10-pin connector.
1531
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1532
+//
1533
+//#define CR10_STOCKDISPLAY
1534
+
1535
+//
1536
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1537
+// http://reprap.org/wiki/MKS_12864OLED
1538
+//
1539
+// Tiny, but very sharp OLED display
1540
+//
1541
+//#define MKS_12864OLED
1542
+
1514 1543
 //=============================================================================
1515 1544
 //=============================== Extra Features ==============================
1516 1545
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/Anet/A8/Configuration_adv.h 查看文件

@@ -744,7 +744,7 @@
744 744
 #define MAX_CMD_SIZE 96
745 745
 #define BUFSIZE 4
746 746
 
747
-// Transfer Buffer Size
747
+// Transmission to Host Buffer Size
748 748
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
749 749
 // To buffer a simple "ok" you need 4 bytes.
750 750
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/BQ/Hephestos/Configuration.h 查看文件

@@ -1494,6 +1494,35 @@
1494 1494
 //
1495 1495
 //#define OLED_PANEL_TINYBOY2
1496 1496
 
1497
+//
1498
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1499
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1500
+//
1501
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1502
+
1503
+//
1504
+// MKS MINI12864 with graphic controller and SD support
1505
+// http://reprap.org/wiki/MKS_MINI_12864
1506
+//
1507
+//#define MKS_MINI_12864
1508
+
1509
+//
1510
+// Factory display for Creality CR-10
1511
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1512
+//
1513
+// This is RAMPS-compatible using a single 10-pin connector.
1514
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1515
+//
1516
+//#define CR10_STOCKDISPLAY
1517
+
1518
+//
1519
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1520
+// http://reprap.org/wiki/MKS_12864OLED
1521
+//
1522
+// Tiny, but very sharp OLED display
1523
+//
1524
+//#define MKS_12864OLED
1525
+
1497 1526
 //=============================================================================
1498 1527
 //=============================== Extra Features ==============================
1499 1528
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h 查看文件

@@ -744,7 +744,7 @@
744 744
 #define MAX_CMD_SIZE 96
745 745
 #define BUFSIZE 4
746 746
 
747
-// Transfer Buffer Size
747
+// Transmission to Host Buffer Size
748 748
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
749 749
 // To buffer a simple "ok" you need 4 bytes.
750 750
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/BQ/Hephestos_2/Configuration.h 查看文件

@@ -1504,6 +1504,35 @@
1504 1504
 //
1505 1505
 //#define OLED_PANEL_TINYBOY2
1506 1506
 
1507
+//
1508
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1509
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1510
+//
1511
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1512
+
1513
+//
1514
+// MKS MINI12864 with graphic controller and SD support
1515
+// http://reprap.org/wiki/MKS_MINI_12864
1516
+//
1517
+//#define MKS_MINI_12864
1518
+
1519
+//
1520
+// Factory display for Creality CR-10
1521
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1522
+//
1523
+// This is RAMPS-compatible using a single 10-pin connector.
1524
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1525
+//
1526
+//#define CR10_STOCKDISPLAY
1527
+
1528
+//
1529
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1530
+// http://reprap.org/wiki/MKS_12864OLED
1531
+//
1532
+// Tiny, but very sharp OLED display
1533
+//
1534
+//#define MKS_12864OLED
1535
+
1507 1536
 //=============================================================================
1508 1537
 //=============================== Extra Features ==============================
1509 1538
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h 查看文件

@@ -744,7 +744,7 @@
744 744
 #define MAX_CMD_SIZE 96
745 745
 #define BUFSIZE 4
746 746
 
747
-// Transfer Buffer Size
747
+// Transmission to Host Buffer Size
748 748
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
749 749
 // To buffer a simple "ok" you need 4 bytes.
750 750
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/BQ/WITBOX/Configuration.h 查看文件

@@ -1494,6 +1494,35 @@
1494 1494
 //
1495 1495
 //#define OLED_PANEL_TINYBOY2
1496 1496
 
1497
+//
1498
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1499
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1500
+//
1501
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1502
+
1503
+//
1504
+// MKS MINI12864 with graphic controller and SD support
1505
+// http://reprap.org/wiki/MKS_MINI_12864
1506
+//
1507
+//#define MKS_MINI_12864
1508
+
1509
+//
1510
+// Factory display for Creality CR-10
1511
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1512
+//
1513
+// This is RAMPS-compatible using a single 10-pin connector.
1514
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1515
+//
1516
+//#define CR10_STOCKDISPLAY
1517
+
1518
+//
1519
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1520
+// http://reprap.org/wiki/MKS_12864OLED
1521
+//
1522
+// Tiny, but very sharp OLED display
1523
+//
1524
+//#define MKS_12864OLED
1525
+
1497 1526
 //=============================================================================
1498 1527
 //=============================== Extra Features ==============================
1499 1528
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h 查看文件

@@ -744,7 +744,7 @@
744 744
 #define MAX_CMD_SIZE 96
745 745
 #define BUFSIZE 4
746 746
 
747
-// Transfer Buffer Size
747
+// Transmission to Host Buffer Size
748 748
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
749 749
 // To buffer a simple "ok" you need 4 bytes.
750 750
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/Cartesio/Configuration.h 查看文件

@@ -1502,6 +1502,35 @@
1502 1502
 //
1503 1503
 //#define OLED_PANEL_TINYBOY2
1504 1504
 
1505
+//
1506
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1507
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1508
+//
1509
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1510
+
1511
+//
1512
+// MKS MINI12864 with graphic controller and SD support
1513
+// http://reprap.org/wiki/MKS_MINI_12864
1514
+//
1515
+//#define MKS_MINI_12864
1516
+
1517
+//
1518
+// Factory display for Creality CR-10
1519
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1520
+//
1521
+// This is RAMPS-compatible using a single 10-pin connector.
1522
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1523
+//
1524
+//#define CR10_STOCKDISPLAY
1525
+
1526
+//
1527
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1528
+// http://reprap.org/wiki/MKS_12864OLED
1529
+//
1530
+// Tiny, but very sharp OLED display
1531
+//
1532
+//#define MKS_12864OLED
1533
+
1505 1534
 //=============================================================================
1506 1535
 //=============================== Extra Features ==============================
1507 1536
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/Cartesio/Configuration_adv.h 查看文件

@@ -744,7 +744,7 @@
744 744
 #define MAX_CMD_SIZE 96
745 745
 #define BUFSIZE 4
746 746
 
747
-// Transfer Buffer Size
747
+// Transmission to Host Buffer Size
748 748
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
749 749
 // To buffer a simple "ok" you need 4 bytes.
750 750
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 30
- 1
Marlin/example_configurations/Creality/CR-10/Configuration.h 查看文件

@@ -1391,7 +1391,7 @@
1391 1391
 // RepRapDiscount FULL GRAPHIC Smart Controller
1392 1392
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
1393 1393
 //
1394
-#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
1394
+//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
1395 1395
 
1396 1396
 //
1397 1397
 // MakerLab Mini Panel with graphic
@@ -1513,6 +1513,35 @@
1513 1513
 //
1514 1514
 //#define OLED_PANEL_TINYBOY2
1515 1515
 
1516
+//
1517
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1518
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1519
+//
1520
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1521
+
1522
+//
1523
+// MKS MINI12864 with graphic controller and SD support
1524
+// http://reprap.org/wiki/MKS_MINI_12864
1525
+//
1526
+//#define MKS_MINI_12864
1527
+
1528
+//
1529
+// Factory display for Creality CR-10
1530
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1531
+//
1532
+// This is RAMPS-compatible using a single 10-pin connector.
1533
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1534
+//
1535
+#define CR10_STOCKDISPLAY
1536
+
1537
+//
1538
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1539
+// http://reprap.org/wiki/MKS_12864OLED
1540
+//
1541
+// Tiny, but very sharp OLED display
1542
+//
1543
+//#define MKS_12864OLED
1544
+
1516 1545
 //=============================================================================
1517 1546
 //=============================== Extra Features ==============================
1518 1547
 //=============================================================================

+ 23
- 1
Marlin/example_configurations/Creality/CR-10/Configuration_adv.h 查看文件

@@ -744,7 +744,7 @@
744 744
 #define MAX_CMD_SIZE 96
745 745
 #define BUFSIZE 4
746 746
 
747
-// Transfer Buffer Size
747
+// Transmission to Host Buffer Size
748 748
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
749 749
 // To buffer a simple "ok" you need 4 bytes.
750 750
 // For ADVANCED_OK (M105) you need 32 bytes.
@@ -753,6 +753,28 @@
753 753
 // :[0, 2, 4, 8, 16, 32, 64, 128, 256]
754 754
 #define TX_BUFFER_SIZE 0
755 755
 
756
+// Host Receive Buffer Size
757
+// Without XON/XOFF flow control (see SERIAL_XON_XOFF below) 32 bytes should be enough.
758
+// To use flow control, set this buffer size to at least 1024 bytes.
759
+// :[0, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048]
760
+//#define RX_BUFFER_SIZE 1024
761
+
762
+#if RX_BUFFER_SIZE >= 1024
763
+  // Enable to have the controller send XON/XOFF control characters to
764
+  // the host to signal the RX buffer is becoming full.
765
+  //#define SERIAL_XON_XOFF
766
+#endif
767
+
768
+#if ENABLED(SDSUPPORT)
769
+  // Enable this option to collect and display the maximum
770
+  // RX queue usage after transferring a file to SD.
771
+  //#define SERIAL_STATS_MAX_RX_QUEUED
772
+
773
+  // Enable this option to collect and display the number
774
+  // of dropped bytes after a file transfer to SD.
775
+  //#define SERIAL_STATS_DROPPED_RX
776
+#endif
777
+
756 778
 // Enable an emergency-command parser to intercept certain commands as they
757 779
 // enter the serial receive buffer, so they cannot be blocked.
758 780
 // Currently handles M108, M112, M410

+ 29
- 0
Marlin/example_configurations/Felix/Configuration.h 查看文件

@@ -1485,6 +1485,35 @@
1485 1485
 //
1486 1486
 //#define OLED_PANEL_TINYBOY2
1487 1487
 
1488
+//
1489
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1490
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1491
+//
1492
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1493
+
1494
+//
1495
+// MKS MINI12864 with graphic controller and SD support
1496
+// http://reprap.org/wiki/MKS_MINI_12864
1497
+//
1498
+//#define MKS_MINI_12864
1499
+
1500
+//
1501
+// Factory display for Creality CR-10
1502
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1503
+//
1504
+// This is RAMPS-compatible using a single 10-pin connector.
1505
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1506
+//
1507
+//#define CR10_STOCKDISPLAY
1508
+
1509
+//
1510
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1511
+// http://reprap.org/wiki/MKS_12864OLED
1512
+//
1513
+// Tiny, but very sharp OLED display
1514
+//
1515
+//#define MKS_12864OLED
1516
+
1488 1517
 //=============================================================================
1489 1518
 //=============================== Extra Features ==============================
1490 1519
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/Felix/Configuration_adv.h 查看文件

@@ -744,7 +744,7 @@
744 744
 #define MAX_CMD_SIZE 96
745 745
 #define BUFSIZE 4
746 746
 
747
-// Transfer Buffer Size
747
+// Transmission to Host Buffer Size
748 748
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
749 749
 // To buffer a simple "ok" you need 4 bytes.
750 750
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/Felix/DUAL/Configuration.h 查看文件

@@ -1485,6 +1485,35 @@
1485 1485
 //
1486 1486
 //#define OLED_PANEL_TINYBOY2
1487 1487
 
1488
+//
1489
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1490
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1491
+//
1492
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1493
+
1494
+//
1495
+// MKS MINI12864 with graphic controller and SD support
1496
+// http://reprap.org/wiki/MKS_MINI_12864
1497
+//
1498
+//#define MKS_MINI_12864
1499
+
1500
+//
1501
+// Factory display for Creality CR-10
1502
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1503
+//
1504
+// This is RAMPS-compatible using a single 10-pin connector.
1505
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1506
+//
1507
+//#define CR10_STOCKDISPLAY
1508
+
1509
+//
1510
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1511
+// http://reprap.org/wiki/MKS_12864OLED
1512
+//
1513
+// Tiny, but very sharp OLED display
1514
+//
1515
+//#define MKS_12864OLED
1516
+
1488 1517
 //=============================================================================
1489 1518
 //=============================== Extra Features ==============================
1490 1519
 //=============================================================================

+ 29
- 0
Marlin/example_configurations/Folger Tech/i3-2020/Configuration.h 查看文件

@@ -1508,6 +1508,35 @@
1508 1508
 //
1509 1509
 //#define OLED_PANEL_TINYBOY2
1510 1510
 
1511
+//
1512
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1513
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1514
+//
1515
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1516
+
1517
+//
1518
+// MKS MINI12864 with graphic controller and SD support
1519
+// http://reprap.org/wiki/MKS_MINI_12864
1520
+//
1521
+//#define MKS_MINI_12864
1522
+
1523
+//
1524
+// Factory display for Creality CR-10
1525
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1526
+//
1527
+// This is RAMPS-compatible using a single 10-pin connector.
1528
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1529
+//
1530
+//#define CR10_STOCKDISPLAY
1531
+
1532
+//
1533
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1534
+// http://reprap.org/wiki/MKS_12864OLED
1535
+//
1536
+// Tiny, but very sharp OLED display
1537
+//
1538
+//#define MKS_12864OLED
1539
+
1511 1540
 //=============================================================================
1512 1541
 //=============================== Extra Features ==============================
1513 1542
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/Folger Tech/i3-2020/Configuration_adv.h 查看文件

@@ -744,7 +744,7 @@
744 744
 #define MAX_CMD_SIZE 96
745 745
 #define BUFSIZE 4
746 746
 
747
-// Transfer Buffer Size
747
+// Transmission to Host Buffer Size
748 748
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
749 749
 // To buffer a simple "ok" you need 4 bytes.
750 750
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/Geeetech/GT2560/Configuration.h 查看文件

@@ -1518,6 +1518,35 @@
1518 1518
 //
1519 1519
 //#define OLED_PANEL_TINYBOY2
1520 1520
 
1521
+//
1522
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1523
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1524
+//
1525
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1526
+
1527
+//
1528
+// MKS MINI12864 with graphic controller and SD support
1529
+// http://reprap.org/wiki/MKS_MINI_12864
1530
+//
1531
+//#define MKS_MINI_12864
1532
+
1533
+//
1534
+// Factory display for Creality CR-10
1535
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1536
+//
1537
+// This is RAMPS-compatible using a single 10-pin connector.
1538
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1539
+//
1540
+//#define CR10_STOCKDISPLAY
1541
+
1542
+//
1543
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1544
+// http://reprap.org/wiki/MKS_12864OLED
1545
+//
1546
+// Tiny, but very sharp OLED display
1547
+//
1548
+//#define MKS_12864OLED
1549
+
1521 1550
 //=============================================================================
1522 1551
 //=============================== Extra Features ==============================
1523 1552
 //=============================================================================

+ 29
- 0
Marlin/example_configurations/Geeetech/I3_Pro_X-GT2560/Configuration.h 查看文件

@@ -1503,6 +1503,35 @@
1503 1503
 //
1504 1504
 //#define OLED_PANEL_TINYBOY2
1505 1505
 
1506
+//
1507
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1508
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1509
+//
1510
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1511
+
1512
+//
1513
+// MKS MINI12864 with graphic controller and SD support
1514
+// http://reprap.org/wiki/MKS_MINI_12864
1515
+//
1516
+//#define MKS_MINI_12864
1517
+
1518
+//
1519
+// Factory display for Creality CR-10
1520
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1521
+//
1522
+// This is RAMPS-compatible using a single 10-pin connector.
1523
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1524
+//
1525
+//#define CR10_STOCKDISPLAY
1526
+
1527
+//
1528
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1529
+// http://reprap.org/wiki/MKS_12864OLED
1530
+//
1531
+// Tiny, but very sharp OLED display
1532
+//
1533
+//#define MKS_12864OLED
1534
+
1506 1535
 //=============================================================================
1507 1536
 //=============================== Extra Features ==============================
1508 1537
 //=============================================================================

+ 29
- 0
Marlin/example_configurations/Infitary/i3-M508/Configuration.h 查看文件

@@ -1507,6 +1507,35 @@
1507 1507
 //
1508 1508
 //#define OLED_PANEL_TINYBOY2
1509 1509
 
1510
+//
1511
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1512
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1513
+//
1514
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1515
+
1516
+//
1517
+// MKS MINI12864 with graphic controller and SD support
1518
+// http://reprap.org/wiki/MKS_MINI_12864
1519
+//
1520
+//#define MKS_MINI_12864
1521
+
1522
+//
1523
+// Factory display for Creality CR-10
1524
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1525
+//
1526
+// This is RAMPS-compatible using a single 10-pin connector.
1527
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1528
+//
1529
+//#define CR10_STOCKDISPLAY
1530
+
1531
+//
1532
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1533
+// http://reprap.org/wiki/MKS_12864OLED
1534
+//
1535
+// Tiny, but very sharp OLED display
1536
+//
1537
+//#define MKS_12864OLED
1538
+
1510 1539
 //=============================================================================
1511 1540
 //=============================== Extra Features ==============================
1512 1541
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h 查看文件

@@ -744,7 +744,7 @@
744 744
 #define MAX_CMD_SIZE 96
745 745
 #define BUFSIZE 4
746 746
 
747
-// Transfer Buffer Size
747
+// Transmission to Host Buffer Size
748 748
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
749 749
 // To buffer a simple "ok" you need 4 bytes.
750 750
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/Malyan/M150/Configuration.h 查看文件

@@ -1531,6 +1531,35 @@
1531 1531
 //
1532 1532
 //#define OLED_PANEL_TINYBOY2
1533 1533
 
1534
+//
1535
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1536
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1537
+//
1538
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1539
+
1540
+//
1541
+// MKS MINI12864 with graphic controller and SD support
1542
+// http://reprap.org/wiki/MKS_MINI_12864
1543
+//
1544
+//#define MKS_MINI_12864
1545
+
1546
+//
1547
+// Factory display for Creality CR-10
1548
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1549
+//
1550
+// This is RAMPS-compatible using a single 10-pin connector.
1551
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1552
+//
1553
+//#define CR10_STOCKDISPLAY
1554
+
1555
+//
1556
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1557
+// http://reprap.org/wiki/MKS_12864OLED
1558
+//
1559
+// Tiny, but very sharp OLED display
1560
+//
1561
+//#define MKS_12864OLED
1562
+
1534 1563
 //=============================================================================
1535 1564
 //=============================== Extra Features ==============================
1536 1565
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/Malyan/M150/Configuration_adv.h 查看文件

@@ -744,7 +744,7 @@
744 744
 #define MAX_CMD_SIZE 96
745 745
 #define BUFSIZE 4
746 746
 
747
-// Transfer Buffer Size
747
+// Transmission to Host Buffer Size
748 748
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
749 749
 // To buffer a simple "ok" you need 4 bytes.
750 750
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h 查看文件

@@ -1503,6 +1503,35 @@
1503 1503
 //
1504 1504
 //#define OLED_PANEL_TINYBOY2
1505 1505
 
1506
+//
1507
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1508
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1509
+//
1510
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1511
+
1512
+//
1513
+// MKS MINI12864 with graphic controller and SD support
1514
+// http://reprap.org/wiki/MKS_MINI_12864
1515
+//
1516
+//#define MKS_MINI_12864
1517
+
1518
+//
1519
+// Factory display for Creality CR-10
1520
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1521
+//
1522
+// This is RAMPS-compatible using a single 10-pin connector.
1523
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1524
+//
1525
+//#define CR10_STOCKDISPLAY
1526
+
1527
+//
1528
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1529
+// http://reprap.org/wiki/MKS_12864OLED
1530
+//
1531
+// Tiny, but very sharp OLED display
1532
+//
1533
+//#define MKS_12864OLED
1534
+
1506 1535
 //=============================================================================
1507 1536
 //=============================== Extra Features ==============================
1508 1537
 //=============================================================================

+ 29
- 0
Marlin/example_configurations/RigidBot/Configuration.h 查看文件

@@ -1503,6 +1503,35 @@
1503 1503
 //
1504 1504
 //#define OLED_PANEL_TINYBOY2
1505 1505
 
1506
+//
1507
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1508
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1509
+//
1510
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1511
+
1512
+//
1513
+// MKS MINI12864 with graphic controller and SD support
1514
+// http://reprap.org/wiki/MKS_MINI_12864
1515
+//
1516
+//#define MKS_MINI_12864
1517
+
1518
+//
1519
+// Factory display for Creality CR-10
1520
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1521
+//
1522
+// This is RAMPS-compatible using a single 10-pin connector.
1523
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1524
+//
1525
+//#define CR10_STOCKDISPLAY
1526
+
1527
+//
1528
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1529
+// http://reprap.org/wiki/MKS_12864OLED
1530
+//
1531
+// Tiny, but very sharp OLED display
1532
+//
1533
+//#define MKS_12864OLED
1534
+
1506 1535
 //=============================================================================
1507 1536
 //=============================== Extra Features ==============================
1508 1537
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/RigidBot/Configuration_adv.h 查看文件

@@ -744,7 +744,7 @@
744 744
 #define MAX_CMD_SIZE 96
745 745
 #define BUFSIZE 8
746 746
 
747
-// Transfer Buffer Size
747
+// Transmission to Host Buffer Size
748 748
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
749 749
 // To buffer a simple "ok" you need 4 bytes.
750 750
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/SCARA/Configuration.h 查看文件

@@ -1515,6 +1515,35 @@
1515 1515
 //
1516 1516
 //#define OLED_PANEL_TINYBOY2
1517 1517
 
1518
+//
1519
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1520
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1521
+//
1522
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1523
+
1524
+//
1525
+// MKS MINI12864 with graphic controller and SD support
1526
+// http://reprap.org/wiki/MKS_MINI_12864
1527
+//
1528
+//#define MKS_MINI_12864
1529
+
1530
+//
1531
+// Factory display for Creality CR-10
1532
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1533
+//
1534
+// This is RAMPS-compatible using a single 10-pin connector.
1535
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1536
+//
1537
+//#define CR10_STOCKDISPLAY
1538
+
1539
+//
1540
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1541
+// http://reprap.org/wiki/MKS_12864OLED
1542
+//
1543
+// Tiny, but very sharp OLED display
1544
+//
1545
+//#define MKS_12864OLED
1546
+
1518 1547
 //=============================================================================
1519 1548
 //=============================== Extra Features ==============================
1520 1549
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/SCARA/Configuration_adv.h 查看文件

@@ -744,7 +744,7 @@
744 744
 #define MAX_CMD_SIZE 96
745 745
 #define BUFSIZE 4
746 746
 
747
-// Transfer Buffer Size
747
+// Transmission to Host Buffer Size
748 748
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
749 749
 // To buffer a simple "ok" you need 4 bytes.
750 750
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 31
- 1
Marlin/example_configurations/Sanguinololu/Configuration.h 查看文件

@@ -107,8 +107,9 @@
107 107
  *
108 108
  * 250000 works in most cases, but you might try a lower speed if
109 109
  * you commonly experience drop-outs during host printing.
110
+ * You may try up to 1000000 to speed up SD file transfer.
110 111
  *
111
- * :[2400, 9600, 19200, 38400, 57600, 115200, 250000]
112
+ * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000]
112 113
  */
113 114
 #define BAUDRATE 115200
114 115
 
@@ -1533,6 +1534,35 @@
1533 1534
 //
1534 1535
 //#define OLED_PANEL_TINYBOY2
1535 1536
 
1537
+//
1538
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1539
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1540
+//
1541
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1542
+
1543
+//
1544
+// MKS MINI12864 with graphic controller and SD support
1545
+// http://reprap.org/wiki/MKS_MINI_12864
1546
+//
1547
+//#define MKS_MINI_12864
1548
+
1549
+//
1550
+// Factory display for Creality CR-10
1551
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1552
+//
1553
+// This is RAMPS-compatible using a single 10-pin connector.
1554
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1555
+//
1556
+//#define CR10_STOCKDISPLAY
1557
+
1558
+//
1559
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1560
+// http://reprap.org/wiki/MKS_12864OLED
1561
+//
1562
+// Tiny, but very sharp OLED display
1563
+//
1564
+//#define MKS_12864OLED
1565
+
1536 1566
 //=============================================================================
1537 1567
 //=============================== Extra Features ==============================
1538 1568
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/Sanguinololu/Configuration_adv.h 查看文件

@@ -733,7 +733,7 @@
733 733
 #define MAX_CMD_SIZE 96
734 734
 #define BUFSIZE 4
735 735
 
736
-// Transfer Buffer Size
736
+// Transmission to Host Buffer Size
737 737
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
738 738
 // To buffer a simple "ok" you need 4 bytes.
739 739
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/TinyBoy2/Configuration.h 查看文件

@@ -1559,6 +1559,35 @@
1559 1559
 //
1560 1560
 #define OLED_PANEL_TINYBOY2
1561 1561
 
1562
+//
1563
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1564
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1565
+//
1566
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1567
+
1568
+//
1569
+// MKS MINI12864 with graphic controller and SD support
1570
+// http://reprap.org/wiki/MKS_MINI_12864
1571
+//
1572
+//#define MKS_MINI_12864
1573
+
1574
+//
1575
+// Factory display for Creality CR-10
1576
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1577
+//
1578
+// This is RAMPS-compatible using a single 10-pin connector.
1579
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1580
+//
1581
+//#define CR10_STOCKDISPLAY
1582
+
1583
+//
1584
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1585
+// http://reprap.org/wiki/MKS_12864OLED
1586
+//
1587
+// Tiny, but very sharp OLED display
1588
+//
1589
+//#define MKS_12864OLED
1590
+
1562 1591
 //=============================================================================
1563 1592
 //=============================== Extra Features ==============================
1564 1593
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/TinyBoy2/Configuration_adv.h 查看文件

@@ -744,7 +744,7 @@
744 744
 #define MAX_CMD_SIZE 96
745 745
 #define BUFSIZE 4
746 746
 
747
-// Transfer Buffer Size
747
+// Transmission to Host Buffer Size
748 748
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
749 749
 // To buffer a simple "ok" you need 4 bytes.
750 750
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/Velleman/K8200/Configuration.h 查看文件

@@ -1536,6 +1536,35 @@
1536 1536
 //
1537 1537
 //#define OLED_PANEL_TINYBOY2
1538 1538
 
1539
+//
1540
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1541
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1542
+//
1543
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1544
+
1545
+//
1546
+// MKS MINI12864 with graphic controller and SD support
1547
+// http://reprap.org/wiki/MKS_MINI_12864
1548
+//
1549
+//#define MKS_MINI_12864
1550
+
1551
+//
1552
+// Factory display for Creality CR-10
1553
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1554
+//
1555
+// This is RAMPS-compatible using a single 10-pin connector.
1556
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1557
+//
1558
+//#define CR10_STOCKDISPLAY
1559
+
1560
+//
1561
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1562
+// http://reprap.org/wiki/MKS_12864OLED
1563
+//
1564
+// Tiny, but very sharp OLED display
1565
+//
1566
+//#define MKS_12864OLED
1567
+
1539 1568
 #endif // K8200_VM8201
1540 1569
 
1541 1570
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/Velleman/K8200/Configuration_adv.h 查看文件

@@ -757,7 +757,7 @@
757 757
 #define MAX_CMD_SIZE 96
758 758
 #define BUFSIZE 4
759 759
 
760
-// Transfer Buffer Size
760
+// Transmission to Host Buffer Size
761 761
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
762 762
 // To buffer a simple "ok" you need 4 bytes.
763 763
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/Velleman/K8400/Configuration.h 查看文件

@@ -1503,6 +1503,35 @@
1503 1503
 //
1504 1504
 //#define OLED_PANEL_TINYBOY2
1505 1505
 
1506
+//
1507
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1508
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1509
+//
1510
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1511
+
1512
+//
1513
+// MKS MINI12864 with graphic controller and SD support
1514
+// http://reprap.org/wiki/MKS_MINI_12864
1515
+//
1516
+//#define MKS_MINI_12864
1517
+
1518
+//
1519
+// Factory display for Creality CR-10
1520
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1521
+//
1522
+// This is RAMPS-compatible using a single 10-pin connector.
1523
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1524
+//
1525
+//#define CR10_STOCKDISPLAY
1526
+
1527
+//
1528
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1529
+// http://reprap.org/wiki/MKS_12864OLED
1530
+//
1531
+// Tiny, but very sharp OLED display
1532
+//
1533
+//#define MKS_12864OLED
1534
+
1506 1535
 //=============================================================================
1507 1536
 //=============================== Extra Features ==============================
1508 1537
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/Velleman/K8400/Configuration_adv.h 查看文件

@@ -744,7 +744,7 @@
744 744
 #define MAX_CMD_SIZE 96
745 745
 #define BUFSIZE 26
746 746
 
747
-// Transfer Buffer Size
747
+// Transmission to Host Buffer Size
748 748
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
749 749
 // To buffer a simple "ok" you need 4 bytes.
750 750
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/Velleman/K8400/Dual-head/Configuration.h 查看文件

@@ -1503,6 +1503,35 @@
1503 1503
 //
1504 1504
 //#define OLED_PANEL_TINYBOY2
1505 1505
 
1506
+//
1507
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1508
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1509
+//
1510
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1511
+
1512
+//
1513
+// MKS MINI12864 with graphic controller and SD support
1514
+// http://reprap.org/wiki/MKS_MINI_12864
1515
+//
1516
+//#define MKS_MINI_12864
1517
+
1518
+//
1519
+// Factory display for Creality CR-10
1520
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1521
+//
1522
+// This is RAMPS-compatible using a single 10-pin connector.
1523
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1524
+//
1525
+//#define CR10_STOCKDISPLAY
1526
+
1527
+//
1528
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1529
+// http://reprap.org/wiki/MKS_12864OLED
1530
+//
1531
+// Tiny, but very sharp OLED display
1532
+//
1533
+//#define MKS_12864OLED
1534
+
1506 1535
 //=============================================================================
1507 1536
 //=============================== Extra Features ==============================
1508 1537
 //=============================================================================

+ 29
- 0
Marlin/example_configurations/adafruit/ST7565/Configuration.h 查看文件

@@ -1503,6 +1503,35 @@
1503 1503
 //
1504 1504
 //#define OLED_PANEL_TINYBOY2
1505 1505
 
1506
+//
1507
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1508
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1509
+//
1510
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1511
+
1512
+//
1513
+// MKS MINI12864 with graphic controller and SD support
1514
+// http://reprap.org/wiki/MKS_MINI_12864
1515
+//
1516
+//#define MKS_MINI_12864
1517
+
1518
+//
1519
+// Factory display for Creality CR-10
1520
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1521
+//
1522
+// This is RAMPS-compatible using a single 10-pin connector.
1523
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1524
+//
1525
+//#define CR10_STOCKDISPLAY
1526
+
1527
+//
1528
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1529
+// http://reprap.org/wiki/MKS_12864OLED
1530
+//
1531
+// Tiny, but very sharp OLED display
1532
+//
1533
+//#define MKS_12864OLED
1534
+
1506 1535
 //=============================================================================
1507 1536
 //=============================== Extra Features ==============================
1508 1537
 //=============================================================================

+ 29
- 0
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h 查看文件

@@ -1631,6 +1631,35 @@
1631 1631
 //
1632 1632
 //#define OLED_PANEL_TINYBOY2
1633 1633
 
1634
+//
1635
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1636
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1637
+//
1638
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1639
+
1640
+//
1641
+// MKS MINI12864 with graphic controller and SD support
1642
+// http://reprap.org/wiki/MKS_MINI_12864
1643
+//
1644
+//#define MKS_MINI_12864
1645
+
1646
+//
1647
+// Factory display for Creality CR-10
1648
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1649
+//
1650
+// This is RAMPS-compatible using a single 10-pin connector.
1651
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1652
+//
1653
+//#define CR10_STOCKDISPLAY
1654
+
1655
+//
1656
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1657
+// http://reprap.org/wiki/MKS_12864OLED
1658
+//
1659
+// Tiny, but very sharp OLED display
1660
+//
1661
+//#define MKS_12864OLED
1662
+
1634 1663
 //=============================================================================
1635 1664
 //=============================== Extra Features ==============================
1636 1665
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h 查看文件

@@ -746,7 +746,7 @@
746 746
 #define MAX_CMD_SIZE 96
747 747
 #define BUFSIZE 4
748 748
 
749
-// Transfer Buffer Size
749
+// Transmission to Host Buffer Size
750 750
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
751 751
 // To buffer a simple "ok" you need 4 bytes.
752 752
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h 查看文件

@@ -1624,6 +1624,35 @@
1624 1624
 //
1625 1625
 //#define OLED_PANEL_TINYBOY2
1626 1626
 
1627
+//
1628
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1629
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1630
+//
1631
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1632
+
1633
+//
1634
+// MKS MINI12864 with graphic controller and SD support
1635
+// http://reprap.org/wiki/MKS_MINI_12864
1636
+//
1637
+//#define MKS_MINI_12864
1638
+
1639
+//
1640
+// Factory display for Creality CR-10
1641
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1642
+//
1643
+// This is RAMPS-compatible using a single 10-pin connector.
1644
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1645
+//
1646
+//#define CR10_STOCKDISPLAY
1647
+
1648
+//
1649
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1650
+// http://reprap.org/wiki/MKS_12864OLED
1651
+//
1652
+// Tiny, but very sharp OLED display
1653
+//
1654
+//#define MKS_12864OLED
1655
+
1627 1656
 //=============================================================================
1628 1657
 //=============================== Extra Features ==============================
1629 1658
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h 查看文件

@@ -746,7 +746,7 @@
746 746
 #define MAX_CMD_SIZE 96
747 747
 #define BUFSIZE 4
748 748
 
749
-// Transfer Buffer Size
749
+// Transmission to Host Buffer Size
750 750
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
751 751
 // To buffer a simple "ok" you need 4 bytes.
752 752
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/delta/generic/Configuration.h 查看文件

@@ -1619,6 +1619,35 @@
1619 1619
 //
1620 1620
 //#define OLED_PANEL_TINYBOY2
1621 1621
 
1622
+//
1623
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1624
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1625
+//
1626
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1627
+
1628
+//
1629
+// MKS MINI12864 with graphic controller and SD support
1630
+// http://reprap.org/wiki/MKS_MINI_12864
1631
+//
1632
+//#define MKS_MINI_12864
1633
+
1634
+//
1635
+// Factory display for Creality CR-10
1636
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1637
+//
1638
+// This is RAMPS-compatible using a single 10-pin connector.
1639
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1640
+//
1641
+//#define CR10_STOCKDISPLAY
1642
+
1643
+//
1644
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1645
+// http://reprap.org/wiki/MKS_12864OLED
1646
+//
1647
+// Tiny, but very sharp OLED display
1648
+//
1649
+//#define MKS_12864OLED
1650
+
1622 1651
 //=============================================================================
1623 1652
 //=============================== Extra Features ==============================
1624 1653
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/delta/generic/Configuration_adv.h 查看文件

@@ -746,7 +746,7 @@
746 746
 #define MAX_CMD_SIZE 96
747 747
 #define BUFSIZE 4
748 748
 
749
-// Transfer Buffer Size
749
+// Transmission to Host Buffer Size
750 750
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
751 751
 // To buffer a simple "ok" you need 4 bytes.
752 752
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/delta/kossel_mini/Configuration.h 查看文件

@@ -1622,6 +1622,35 @@
1622 1622
 //
1623 1623
 //#define OLED_PANEL_TINYBOY2
1624 1624
 
1625
+//
1626
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1627
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1628
+//
1629
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1630
+
1631
+//
1632
+// MKS MINI12864 with graphic controller and SD support
1633
+// http://reprap.org/wiki/MKS_MINI_12864
1634
+//
1635
+//#define MKS_MINI_12864
1636
+
1637
+//
1638
+// Factory display for Creality CR-10
1639
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1640
+//
1641
+// This is RAMPS-compatible using a single 10-pin connector.
1642
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1643
+//
1644
+//#define CR10_STOCKDISPLAY
1645
+
1646
+//
1647
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1648
+// http://reprap.org/wiki/MKS_12864OLED
1649
+//
1650
+// Tiny, but very sharp OLED display
1651
+//
1652
+//#define MKS_12864OLED
1653
+
1625 1654
 //=============================================================================
1626 1655
 //=============================== Extra Features ==============================
1627 1656
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h 查看文件

@@ -746,7 +746,7 @@
746 746
 #define MAX_CMD_SIZE 96
747 747
 #define BUFSIZE 4
748 748
 
749
-// Transfer Buffer Size
749
+// Transmission to Host Buffer Size
750 750
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
751 751
 // To buffer a simple "ok" you need 4 bytes.
752 752
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/delta/kossel_pro/Configuration.h 查看文件

@@ -1622,6 +1622,35 @@
1622 1622
 //
1623 1623
 //#define OLED_PANEL_TINYBOY2
1624 1624
 
1625
+//
1626
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1627
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1628
+//
1629
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1630
+
1631
+//
1632
+// MKS MINI12864 with graphic controller and SD support
1633
+// http://reprap.org/wiki/MKS_MINI_12864
1634
+//
1635
+//#define MKS_MINI_12864
1636
+
1637
+//
1638
+// Factory display for Creality CR-10
1639
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1640
+//
1641
+// This is RAMPS-compatible using a single 10-pin connector.
1642
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1643
+//
1644
+//#define CR10_STOCKDISPLAY
1645
+
1646
+//
1647
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1648
+// http://reprap.org/wiki/MKS_12864OLED
1649
+//
1650
+// Tiny, but very sharp OLED display
1651
+//
1652
+//#define MKS_12864OLED
1653
+
1625 1654
 //=============================================================================
1626 1655
 //=============================== Extra Features ==============================
1627 1656
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h 查看文件

@@ -751,7 +751,7 @@
751 751
 #define MAX_CMD_SIZE 96
752 752
 #define BUFSIZE 4
753 753
 
754
-// Transfer Buffer Size
754
+// Transmission to Host Buffer Size
755 755
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
756 756
 // To buffer a simple "ok" you need 4 bytes.
757 757
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/delta/kossel_xl/Configuration.h 查看文件

@@ -1631,6 +1631,35 @@
1631 1631
 //
1632 1632
 //#define OLED_PANEL_TINYBOY2
1633 1633
 
1634
+//
1635
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1636
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1637
+//
1638
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1639
+
1640
+//
1641
+// MKS MINI12864 with graphic controller and SD support
1642
+// http://reprap.org/wiki/MKS_MINI_12864
1643
+//
1644
+//#define MKS_MINI_12864
1645
+
1646
+//
1647
+// Factory display for Creality CR-10
1648
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1649
+//
1650
+// This is RAMPS-compatible using a single 10-pin connector.
1651
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1652
+//
1653
+//#define CR10_STOCKDISPLAY
1654
+
1655
+//
1656
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1657
+// http://reprap.org/wiki/MKS_12864OLED
1658
+//
1659
+// Tiny, but very sharp OLED display
1660
+//
1661
+//#define MKS_12864OLED
1662
+
1634 1663
 //=============================================================================
1635 1664
 //=============================== Extra Features ==============================
1636 1665
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h 查看文件

@@ -746,7 +746,7 @@
746 746
 #define MAX_CMD_SIZE 96
747 747
 #define BUFSIZE 4
748 748
 
749
-// Transfer Buffer Size
749
+// Transmission to Host Buffer Size
750 750
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
751 751
 // To buffer a simple "ok" you need 4 bytes.
752 752
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/gCreate/gMax1.5+/Configuration.h 查看文件

@@ -1517,6 +1517,35 @@
1517 1517
 //
1518 1518
 //#define OLED_PANEL_TINYBOY2
1519 1519
 
1520
+//
1521
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1522
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1523
+//
1524
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1525
+
1526
+//
1527
+// MKS MINI12864 with graphic controller and SD support
1528
+// http://reprap.org/wiki/MKS_MINI_12864
1529
+//
1530
+//#define MKS_MINI_12864
1531
+
1532
+//
1533
+// Factory display for Creality CR-10
1534
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1535
+//
1536
+// This is RAMPS-compatible using a single 10-pin connector.
1537
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1538
+//
1539
+//#define CR10_STOCKDISPLAY
1540
+
1541
+//
1542
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1543
+// http://reprap.org/wiki/MKS_12864OLED
1544
+//
1545
+// Tiny, but very sharp OLED display
1546
+//
1547
+//#define MKS_12864OLED
1548
+
1520 1549
 //=============================================================================
1521 1550
 //=============================== Extra Features ==============================
1522 1551
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h 查看文件

@@ -744,7 +744,7 @@
744 744
 #define MAX_CMD_SIZE 96
745 745
 #define BUFSIZE 4
746 746
 
747
-// Transfer Buffer Size
747
+// Transmission to Host Buffer Size
748 748
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
749 749
 // To buffer a simple "ok" you need 4 bytes.
750 750
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/makibox/Configuration.h 查看文件

@@ -1506,6 +1506,35 @@
1506 1506
 //
1507 1507
 //#define OLED_PANEL_TINYBOY2
1508 1508
 
1509
+//
1510
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1511
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1512
+//
1513
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1514
+
1515
+//
1516
+// MKS MINI12864 with graphic controller and SD support
1517
+// http://reprap.org/wiki/MKS_MINI_12864
1518
+//
1519
+//#define MKS_MINI_12864
1520
+
1521
+//
1522
+// Factory display for Creality CR-10
1523
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1524
+//
1525
+// This is RAMPS-compatible using a single 10-pin connector.
1526
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1527
+//
1528
+//#define CR10_STOCKDISPLAY
1529
+
1530
+//
1531
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1532
+// http://reprap.org/wiki/MKS_12864OLED
1533
+//
1534
+// Tiny, but very sharp OLED display
1535
+//
1536
+//#define MKS_12864OLED
1537
+
1509 1538
 //=============================================================================
1510 1539
 //=============================== Extra Features ==============================
1511 1540
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/makibox/Configuration_adv.h 查看文件

@@ -744,7 +744,7 @@
744 744
 #define MAX_CMD_SIZE 96
745 745
 #define BUFSIZE 4
746 746
 
747
-// Transfer Buffer Size
747
+// Transmission to Host Buffer Size
748 748
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
749 749
 // To buffer a simple "ok" you need 4 bytes.
750 750
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration.h 查看文件

@@ -1498,6 +1498,35 @@
1498 1498
 //
1499 1499
 //#define OLED_PANEL_TINYBOY2
1500 1500
 
1501
+//
1502
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1503
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1504
+//
1505
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1506
+
1507
+//
1508
+// MKS MINI12864 with graphic controller and SD support
1509
+// http://reprap.org/wiki/MKS_MINI_12864
1510
+//
1511
+//#define MKS_MINI_12864
1512
+
1513
+//
1514
+// Factory display for Creality CR-10
1515
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1516
+//
1517
+// This is RAMPS-compatible using a single 10-pin connector.
1518
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1519
+//
1520
+//#define CR10_STOCKDISPLAY
1521
+
1522
+//
1523
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1524
+// http://reprap.org/wiki/MKS_12864OLED
1525
+//
1526
+// Tiny, but very sharp OLED display
1527
+//
1528
+//#define MKS_12864OLED
1529
+
1501 1530
 //=============================================================================
1502 1531
 //=============================== Extra Features ==============================
1503 1532
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h 查看文件

@@ -744,7 +744,7 @@
744 744
 #define MAX_CMD_SIZE 96
745 745
 #define BUFSIZE 4
746 746
 
747
-// Transfer Buffer Size
747
+// Transmission to Host Buffer Size
748 748
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
749 749
 // To buffer a simple "ok" you need 4 bytes.
750 750
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 29
- 0
Marlin/example_configurations/wt150/Configuration.h 查看文件

@@ -1508,6 +1508,35 @@
1508 1508
 //
1509 1509
 //#define OLED_PANEL_TINYBOY2
1510 1510
 
1511
+//
1512
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1513
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1514
+//
1515
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1516
+
1517
+//
1518
+// MKS MINI12864 with graphic controller and SD support
1519
+// http://reprap.org/wiki/MKS_MINI_12864
1520
+//
1521
+//#define MKS_MINI_12864
1522
+
1523
+//
1524
+// Factory display for Creality CR-10
1525
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1526
+//
1527
+// This is RAMPS-compatible using a single 10-pin connector.
1528
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1529
+//
1530
+//#define CR10_STOCKDISPLAY
1531
+
1532
+//
1533
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1534
+// http://reprap.org/wiki/MKS_12864OLED
1535
+//
1536
+// Tiny, but very sharp OLED display
1537
+//
1538
+//#define MKS_12864OLED
1539
+
1511 1540
 //=============================================================================
1512 1541
 //=============================== Extra Features ==============================
1513 1542
 //=============================================================================

+ 1
- 1
Marlin/example_configurations/wt150/Configuration_adv.h 查看文件

@@ -744,7 +744,7 @@
744 744
 #define MAX_CMD_SIZE 96
745 745
 #define BUFSIZE 4
746 746
 
747
-// Transfer Buffer Size
747
+// Transmission to Host Buffer Size
748 748
 // To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0.
749 749
 // To buffer a simple "ok" you need 4 bytes.
750 750
 // For ADVANCED_OK (M105) you need 32 bytes.

+ 3
- 2
Marlin/pins_AZTEEG_X3.h 查看文件

@@ -50,6 +50,9 @@
50 50
 //
51 51
 // LCD / Controller
52 52
 //
53
+#undef STAT_LED_RED_PIN
54
+#undef STAT_LED_BLUE_PIN
55
+
53 56
 #if ENABLED(VIKI2) || ENABLED(miniVIKI)
54 57
 
55 58
   #undef DOGLCD_A0
@@ -59,8 +62,6 @@
59 62
   #define DOGLCD_CS         32
60 63
   #define BTN_ENC           12
61 64
 
62
-  #undef STAT_LED_RED_PIN
63
-  #undef STAT_LED_BLUE_PIN
64 65
   #define STAT_LED_RED_PIN  64
65 66
   #define STAT_LED_BLUE_PIN 63
66 67
 

+ 124
- 46
Marlin/pins_RAMPS.h 查看文件

@@ -237,54 +237,107 @@
237 237
 //
238 238
 // Průša i3 MK2 Multiplexer Support
239 239
 //
240
-#define E_MUX0_PIN         40   // Z_CS_PIN
241
-#define E_MUX1_PIN         42   // E0_CS_PIN
242
-#define E_MUX2_PIN         44   // E1_CS_PIN
240
+#ifndef E_MUX0_PIN
241
+  #define E_MUX0_PIN 40   // Z_CS_PIN
242
+#endif
243
+#ifndef E_MUX1_PIN
244
+  #define E_MUX1_PIN 42   // E0_CS_PIN
245
+#endif
246
+#ifndef E_MUX2_PIN
247
+  #define E_MUX2_PIN 44   // E1_CS_PIN
248
+#endif
249
+
250
+//////////////////////////
251
+// LCDs and Controllers //
252
+//////////////////////////
243 253
 
244
-//
245
-// LCD / Controller
246
-//
247 254
 #if ENABLED(ULTRA_LCD)
248 255
 
256
+  //
257
+  // LCD Display output pins
258
+  //
249 259
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
260
+
250 261
     #define LCD_PINS_RS         49 // CS chip select /SS chip slave select
251 262
     #define LCD_PINS_ENABLE     51 // SID (MOSI)
252 263
     #define LCD_PINS_D4         52 // SCK (CLK) clock
264
+
253 265
   #elif ENABLED(NEWPANEL) && ENABLED(PANEL_ONE)
266
+
254 267
     #define LCD_PINS_RS         40
255 268
     #define LCD_PINS_ENABLE     42
256 269
     #define LCD_PINS_D4         65
257 270
     #define LCD_PINS_D5         66
258 271
     #define LCD_PINS_D6         44
259 272
     #define LCD_PINS_D7         64
273
+
260 274
   #else
261
-    #define LCD_PINS_RS         16
262
-    #define LCD_PINS_ENABLE     17
263
-    #define LCD_PINS_D4         23
264
-    #define LCD_PINS_D5         25
265
-    #define LCD_PINS_D6         27
266
-    #define LCD_PINS_D7         29
275
+
276
+    #if ENABLED(CR10_STOCKDISPLAY)
277
+
278
+      #define LCD_PINS_RS       27
279
+      #define LCD_PINS_ENABLE   29
280
+      #define LCD_PINS_D4       25
281
+
282
+      #if DISABLED(NEWPANEL)
283
+        #define BEEPER_PIN      37
284
+      #endif
285
+
286
+    #else
287
+
288
+      #if ENABLED(MKS_12864OLED)
289
+        #define LCD_PINS_DC     25 // Set as output on init
290
+        #define LCD_PINS_RS     27 // Pull low for 1s to init
291
+        // DOGM SPI LCD Support
292
+        #define DOGLCD_CS       16
293
+        #define DOGLCD_MOSI     17
294
+        #define DOGLCD_SCK      23
295
+        #define DOGLCD_A0       LCD_PINS_DC
296
+      #else
297
+        #define LCD_PINS_RS     16
298
+        #define LCD_PINS_ENABLE 17
299
+        #define LCD_PINS_D4     23
300
+        #define LCD_PINS_D5     25
301
+        #define LCD_PINS_D6     27
302
+      #endif
303
+
304
+      #define LCD_PINS_D7       29
305
+
306
+      #if DISABLED(NEWPANEL)
307
+        #define BEEPER_PIN      33
308
+      #endif
309
+
310
+    #endif
311
+
267 312
     #if DISABLED(NEWPANEL)
268
-      #define BEEPER_PIN        33
269 313
       // Buttons are attached to a shift register
270 314
       // Not wired yet
271
-      //#define SHIFT_CLK 38
272
-      //#define SHIFT_LD 42
273
-      //#define SHIFT_OUT 40
274
-      //#define SHIFT_EN 17
315
+      //#define SHIFT_CLK       38
316
+      //#define SHIFT_LD        42
317
+      //#define SHIFT_OUT       40
318
+      //#define SHIFT_EN        17
275 319
     #endif
320
+
276 321
   #endif
277 322
 
323
+  //
324
+  // LCD Display input pins
325
+  //
278 326
   #if ENABLED(NEWPANEL)
279 327
 
280 328
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
281 329
 
282 330
       #define BEEPER_PIN        37
283 331
 
284
-      #define BTN_EN1           31
285
-      #define BTN_EN2           33
286
-      #define BTN_ENC           35
332
+      #if ENABLED(CR10_STOCKDISPLAY)
333
+        #define BTN_EN1         17
334
+        #define BTN_EN2         23
335
+      #else
336
+        #define BTN_EN1         31
337
+        #define BTN_EN2         33
338
+      #endif
287 339
 
340
+      #define BTN_ENC           35
288 341
       #define SD_DETECT_PIN     49
289 342
       #define KILL_PIN          41
290 343
 
@@ -305,85 +358,112 @@
305 358
       #define BTN_EN2           43
306 359
       #define BTN_ENC           32
307 360
       #define LCD_SDSS          53
308
-      #define SD_DETECT_PIN     -1
309 361
       #define KILL_PIN          41
310 362
 
311 363
     #elif ENABLED(LCD_I2C_VIKI)
312 364
 
313 365
       #define BTN_EN1           22 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
314 366
       #define BTN_EN2            7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
315
-
316 367
       #define BTN_ENC           -1
368
+
317 369
       #define LCD_SDSS          53
318 370
       #define SD_DETECT_PIN     49
319 371
 
320 372
     #elif ENABLED(VIKI2) || ENABLED(miniVIKI)
321 373
 
322
-      #define BEEPER_PIN        33
323
-
324
-      // Pins for DOGM SPI LCD Support
325
-      #define DOGLCD_A0         44
326 374
       #define DOGLCD_CS         45
375
+      #define DOGLCD_A0         44
327 376
       #define LCD_SCREEN_ROT_180
328 377
 
378
+      #define BEEPER_PIN        33
379
+      #define STAT_LED_RED_PIN  32
380
+      #define STAT_LED_BLUE_PIN 35
381
+
329 382
       #define BTN_EN1           22
330 383
       #define BTN_EN2            7
331 384
       #define BTN_ENC           39
332 385
 
333 386
       #define SDSS              53
334 387
       #define SD_DETECT_PIN     -1 // Pin 49 for display sd interface, 72 for easy adapter board
335
-
336 388
       #define KILL_PIN          31
337 389
 
338
-      #define STAT_LED_RED_PIN  32
339
-      #define STAT_LED_BLUE_PIN 35
340
-
341 390
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
391
+
392
+      #define DOGLCD_CS         29
393
+      #define DOGLCD_A0         27
394
+
395
+      #define BEEPER_PIN        23
396
+      #define LCD_BACKLIGHT_PIN 33
397
+
342 398
       #define BTN_EN1           35
343 399
       #define BTN_EN2           37
344 400
       #define BTN_ENC           31
345
-      #define SD_DETECT_PIN     49
401
+
346 402
       #define LCD_SDSS          53
403
+      #define SD_DETECT_PIN     49
347 404
       #define KILL_PIN          41
348
-      #define BEEPER_PIN        23
349
-      #define DOGLCD_CS         29
405
+
406
+    #elif ENABLED(MKS_MINI_12864)  // Added in Marlin 1.1.6
407
+
350 408
       #define DOGLCD_A0         27
351
-      #define LCD_BACKLIGHT_PIN 33
409
+      #define DOGLCD_CS         25
410
+
411
+      // GLCD features
412
+      //#define LCD_CONTRAST   190
413
+      // Uncomment screen orientation
414
+      //#define LCD_SCREEN_ROT_90
415
+      //#define LCD_SCREEN_ROT_180
416
+      //#define LCD_SCREEN_ROT_270
417
+
418
+      #define BEEPER_PIN        37
419
+      // not connected to a pin
420
+      #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
421
+
422
+      #define BTN_EN1           31
423
+      #define BTN_EN2           33
424
+      #define BTN_ENC           35
425
+
426
+      #define SDSS              53
427
+      #define SD_DETECT_PIN     49
428
+      #define KILL_PIN          64
429
+
352 430
     #elif ENABLED(MINIPANEL)
431
+
353 432
       #define BEEPER_PIN        42
354
-      // Pins for DOGM SPI LCD Support
433
+      // not connected to a pin
434
+      #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
435
+
355 436
       #define DOGLCD_A0         44
356 437
       #define DOGLCD_CS         66
357
-      #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
358
-      #define SDSS              53
359 438
 
360
-      #define KILL_PIN          64
361 439
       // GLCD features
362 440
       //#define LCD_CONTRAST   190
363 441
       // Uncomment screen orientation
364 442
       //#define LCD_SCREEN_ROT_90
365 443
       //#define LCD_SCREEN_ROT_180
366 444
       //#define LCD_SCREEN_ROT_270
367
-      // The encoder and click button
445
+
368 446
       #define BTN_EN1           40
369 447
       #define BTN_EN2           63
370 448
       #define BTN_ENC           59
371
-      // not connected to a pin
449
+
450
+      #define SDSS              53
372 451
       #define SD_DETECT_PIN     49
452
+      #define KILL_PIN          64
373 453
 
374 454
     #else
375 455
 
376 456
       // Beeper on AUX-4
377 457
       #define BEEPER_PIN        33
378 458
 
379
-      // buttons are directly attached using AUX-2
459
+      // Buttons are directly attached using AUX-2
380 460
       #if ENABLED(REPRAPWORLD_KEYPAD)
381
-        #define BTN_EN1         64
382
-        #define BTN_EN2         59
383
-        #define BTN_ENC         63
384 461
         #define SHIFT_OUT       40
385 462
         #define SHIFT_CLK       44
386 463
         #define SHIFT_LD        42
464
+        #define BTN_EN1         64
465
+        #define BTN_EN2         59
466
+        #define BTN_ENC         63
387 467
       #elif ENABLED(PANEL_ONE)
388 468
         #define BTN_EN1         59 // AUX2 PIN 3
389 469
         #define BTN_EN2         63 // AUX2 PIN 4
@@ -397,8 +477,6 @@
397 477
       #if ENABLED(G3D_PANEL)
398 478
         #define SD_DETECT_PIN   49
399 479
         #define KILL_PIN        41
400
-      #else
401
-        //#define SD_DETECT_PIN -1 // Ramps doesn't use this
402 480
       #endif
403 481
 
404 482
     #endif

+ 17
- 4
Marlin/ultralcd_impl_DOGM.h 查看文件

@@ -43,7 +43,15 @@
43 43
  * These are common LCD 128x64 pixel graphic displays.
44 44
  */
45 45
 #include "ultralcd.h"
46
-#include "ultralcd_st7920_u8glib_rrd.h"
46
+
47
+#if ENABLED(U8GLIB_ST7920)
48
+  #include "ultralcd_st7920_u8glib_rrd.h"
49
+#endif
50
+
51
+#if ENABLED(U8GLIB_ST7565_64128N)
52
+  #include "ultralcd_st7565_u8glib_VIKI.h"
53
+#endif
54
+
47 55
 #include "dogm_bitmaps.h"
48 56
 #include "utility.h"
49 57
 #include "duration_t.h"
@@ -174,14 +182,19 @@
174 182
   // Based on the Adafruit ST7565 (http://www.adafruit.com/products/250)
175 183
   //U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0);  // 8 stripes
176 184
   U8GLIB_LM6059_2X u8g(DOGLCD_CS, DOGLCD_A0); // 4 stripes
177
-#elif ENABLED(MAKRPANEL) || ENABLED(VIKI2) || ENABLED(miniVIKI)
185
+#elif ENABLED(U8GLIB_ST7565_64128N)
178 186
   // The MaKrPanel, Mini Viki, and Viki 2.0, ST7565 controller as well
179
-  //U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0);  // 8 stripes
180
-  U8GLIB_NHD_C12864_2X u8g(DOGLCD_CS, DOGLCD_A0); // 4 stripes
187
+  // U8GLIB_ST7565_64128n_2x_VIKI u8g(0);  // using SW-SPI DOGLCD_MOSI != -1 && DOGLCD_SCK
188
+  U8GLIB_ST7565_64128n_2x_VIKI u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0);  // using SW-SPI
189
+  //U8GLIB_NHD_C12864_2X u8g(DOGLCD_CS, DOGLCD_A0); // 4 stripes  HWSPI
181 190
 #elif ENABLED(U8GLIB_SSD1306)
182 191
   // Generic support for SSD1306 OLED I2C LCDs
183 192
   //U8GLIB_SSD1306_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST);  // 8 stripes
184 193
   U8GLIB_SSD1306_128X64_2X u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST); // 4 stripes
194
+#elif ENABLED(MKS_12864OLED)
195
+  // MKS 128x64 (SH1106) OLED I2C LCD
196
+  U8GLIB_SH1106_128X64 u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0);      // 8 stripes
197
+  //U8GLIB_SH1106_128X64_2X u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0); // 4 stripes
185 198
 #elif ENABLED(U8GLIB_SH1106)
186 199
   // Generic support for SH1106 OLED I2C LCDs
187 200
   //U8GLIB_SH1106_128X64 u8g(U8G_I2C_OPT_NONE | U8G_I2C_OPT_FAST);  // 8 stripes

+ 253
- 0
Marlin/ultralcd_st7565_u8glib_VIKI.h 查看文件

@@ -0,0 +1,253 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (C) 2016, 2017 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ *
5
+ * Based on Sprinter and grbl.
6
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
7
+ *
8
+ * This program is free software: you can redistribute it and/or modify
9
+ * it under the terms of the GNU General Public License as published by
10
+ * the Free Software Foundation, either version 3 of the License, or
11
+ * (at your option) any later version.
12
+ *
13
+ * This program is distributed in the hope that it will be useful,
14
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
+ * GNU General Public License for more details.
17
+ *
18
+ * You should have received a copy of the GNU General Public License
19
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+
23
+#ifndef ULCDST7565_H
24
+#define ULCDST7565_H
25
+
26
+#include <U8glib.h>
27
+
28
+#define ST7565_CLK_PIN  DOGLCD_SCK
29
+#define ST7565_DAT_PIN  DOGLCD_MOSI
30
+#define ST7565_CS_PIN   DOGLCD_CS
31
+#define ST7565_A0_PIN   DOGLCD_A0
32
+
33
+#define LCD_PIXEL_WIDTH 128
34
+#define LCD_PIXEL_HEIGHT 64
35
+#define PAGE_HEIGHT 8
36
+
37
+//set optimization so ARDUINO optimizes this file
38
+#pragma GCC optimize (3)
39
+
40
+// If you want you can define your own set of delays in Configuration.h
41
+//#define ST7565_DELAY_1 DELAY_0_NOP
42
+//#define ST7565_DELAY_2 DELAY_0_NOP
43
+//#define ST7565_DELAY_3 DELAY_0_NOP
44
+
45
+/*
46
+#define ST7565_DELAY_1 u8g_10MicroDelay()
47
+#define ST7565_DELAY_2 u8g_10MicroDelay()
48
+#define ST7565_DELAY_3 u8g_10MicroDelay()
49
+*/
50
+
51
+#if F_CPU >= 20000000
52
+  #define CPU_ST7565_DELAY_1 DELAY_0_NOP
53
+  #define CPU_ST7565_DELAY_2 DELAY_0_NOP
54
+  #define CPU_ST7565_DELAY_3 DELAY_1_NOP
55
+#elif (MOTHERBOARD == BOARD_3DRAG) || (MOTHERBOARD == BOARD_K8200) || (MOTHERBOARD == BOARD_K8400)
56
+  #define CPU_ST7565_DELAY_1 DELAY_0_NOP
57
+  #define CPU_ST7565_DELAY_2 DELAY_3_NOP
58
+  #define CPU_ST7565_DELAY_3 DELAY_0_NOP
59
+#elif (MOTHERBOARD == BOARD_MINIRAMBO)
60
+  #define CPU_ST7565_DELAY_1 DELAY_0_NOP
61
+  #define CPU_ST7565_DELAY_2 DELAY_4_NOP
62
+  #define CPU_ST7565_DELAY_3 DELAY_0_NOP
63
+#elif (MOTHERBOARD == BOARD_RAMBO)
64
+  #define CPU_ST7565_DELAY_1 DELAY_0_NOP
65
+  #define CPU_ST7565_DELAY_2 DELAY_0_NOP
66
+  #define CPU_ST7565_DELAY_3 DELAY_0_NOP
67
+#elif F_CPU == 16000000
68
+  #define CPU_ST7565_DELAY_1 DELAY_0_NOP
69
+  #define CPU_ST7565_DELAY_2 DELAY_0_NOP
70
+  #define CPU_ST7565_DELAY_3 DELAY_1_NOP
71
+#else
72
+  #error "No valid condition for delays in 'ultralcd_st7565_u8glib_VIKI.h'"
73
+#endif
74
+
75
+#ifndef ST7565_DELAY_1
76
+  #define ST7565_DELAY_1 CPU_ST7565_DELAY_1
77
+#endif
78
+#ifndef ST7565_DELAY_2
79
+  #define ST7565_DELAY_2 CPU_ST7565_DELAY_2
80
+#endif
81
+#ifndef ST7565_DELAY_3
82
+  #define ST7565_DELAY_3 CPU_ST7565_DELAY_3
83
+#endif
84
+
85
+#if ENABLED(SHARED_SPI)  // Re-ARM requires that the LCD and the SD card share a single SPI
86
+
87
+  #define ST7565_WRITE_BYTE(a)                 { spiSend((uint8_t)a); U8G_DELAY(); }
88
+  #define ST7560_WriteSequence(count, pointer) { uint8_t *ptr = pointer; for (uint8_t i = 0; i <  count; i++) {spiSend( *ptr++);} DELAY_10US; }
89
+
90
+#else
91
+  #define ST7565_SND_BIT \
92
+    WRITE(ST7565_CLK_PIN, LOW);        ST7565_DELAY_1; \
93
+    WRITE(ST7565_DAT_PIN, val & 0x80); ST7565_DELAY_2; \
94
+    WRITE(ST7565_CLK_PIN, HIGH);       ST7565_DELAY_3; \
95
+    WRITE(ST7565_CLK_PIN, LOW);\
96
+    val <<= 1
97
+
98
+  static void ST7565_SWSPI_SND_8BIT(uint8_t val) {
99
+    ST7565_SND_BIT; // 1
100
+    ST7565_SND_BIT; // 2
101
+    ST7565_SND_BIT; // 3
102
+    ST7565_SND_BIT; // 4
103
+    ST7565_SND_BIT; // 5
104
+    ST7565_SND_BIT; // 6
105
+    ST7565_SND_BIT; // 7
106
+    ST7565_SND_BIT; // 8
107
+  }
108
+
109
+  #define ST7565_WRITE_BYTE(a)                 { ST7565_SWSPI_SND_8BIT((uint8_t)a); U8G_DELAY(); }
110
+  #define ST7560_WriteSequence(count, pointer) { uint8_t *ptr = pointer; for (uint8_t i = 0; i <  count; i++) {ST7565_SWSPI_SND_8BIT( *ptr++);} DELAY_10US; }
111
+#endif
112
+
113
+#if defined(DOGM_SPI_DELAY_US) && DOGM_SPI_DELAY_US > 0
114
+  #define U8G_DELAY() delayMicroseconds(DOGM_SPI_DELAY_US)
115
+#else
116
+  #define U8G_DELAY() u8g_10MicroDelay()
117
+#endif
118
+
119
+#define ST7565_CS()                          { WRITE(ST7565_CS_PIN,1); U8G_DELAY(); }
120
+#define ST7565_NCS()                         { WRITE(ST7565_CS_PIN,0); }
121
+#define ST7565_A0()                          { WRITE(ST7565_A0_PIN,1); U8G_DELAY(); }
122
+#define ST7565_NA0()                         { WRITE(ST7565_A0_PIN,0); }
123
+
124
+
125
+uint8_t u8g_dev_st7565_64128n_2x_VIKI_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, void *arg) {
126
+  switch (msg) {
127
+    case U8G_DEV_MSG_INIT: {
128
+      OUT_WRITE(ST7565_CS_PIN, LOW);
129
+      #if ENABLED(SHARED_SPI)
130
+        u8g_Delay(250);
131
+        spiBegin();
132
+        #ifndef SPI_SPEED
133
+          #define SPI_SPEED SPI_FULL_SPEED  // use same SPI speed as SD card
134
+        #endif
135
+        spiInit(SPI_SPEED);
136
+      #else
137
+        OUT_WRITE(ST7565_DAT_PIN, LOW);
138
+        OUT_WRITE(ST7565_CLK_PIN, LOW);
139
+      #endif
140
+      OUT_WRITE(ST7565_A0_PIN, LOW);
141
+
142
+      ST7565_CS();                      /* disable chip */
143
+      ST7565_NA0();                     /* instruction mode */
144
+      ST7565_NCS();                     /* enable chip */
145
+
146
+      ST7565_WRITE_BYTE(0x0A2);         /* 0x0A2: LCD bias 1/9 (according to Displaytech 64128N datasheet) */
147
+      ST7565_WRITE_BYTE(0x0A0);         /* Normal ADC Select (according to Displaytech 64128N datasheet) */
148
+
149
+      ST7565_WRITE_BYTE(0x0C8);         /* common output mode: set scan direction normal operation/SHL Select; 0x0C0 --> SHL = 0; normal; 0x0C8 --> SHL = 1 */
150
+      ST7565_WRITE_BYTE(0x040);         /* Display start line for Displaytech 64128N */
151
+
152
+      ST7565_WRITE_BYTE(0x028 | 0x04);  /* power control: turn on voltage converter */
153
+      //U8G_ESC_DLY(50);                /* delay 50 ms - hangs after a reset if used */
154
+
155
+      ST7565_WRITE_BYTE(0x028 | 0x06);  /* power control: turn on voltage regulator */
156
+      //U8G_ESC_DLY(50);                /* delay 50 ms - hangs after a reset if used */
157
+
158
+      ST7565_WRITE_BYTE(0x028 | 0x07);  /* power control: turn on voltage follower */
159
+      //U8G_ESC_DLY(50);                /* delay 50 ms - hangs after a reset if used */
160
+
161
+      ST7565_WRITE_BYTE(0x010);         /* Set V0 voltage resistor ratio. Setting for controlling brightness of Displaytech 64128N */
162
+
163
+      ST7565_WRITE_BYTE(0x0A6);         /* display normal, bit val 0: LCD pixel off. */
164
+
165
+      ST7565_WRITE_BYTE(0x081);         /* set contrast */
166
+      ST7565_WRITE_BYTE(0x01E);         /* Contrast value. Setting for controlling brightness of Displaytech 64128N */
167
+
168
+      ST7565_WRITE_BYTE(0x0AF);         /* display on */
169
+
170
+      U8G_ESC_DLY(100);                 /* delay 100 ms */
171
+      ST7565_WRITE_BYTE(0x0A5);         /* display all points; ST7565 */
172
+      U8G_ESC_DLY(100);                 /* delay 100 ms */
173
+      U8G_ESC_DLY(100);                 /* delay 100 ms */
174
+      ST7565_WRITE_BYTE(0x0A4);         /* normal display */
175
+      ST7565_CS();                      /* disable chip */
176
+    }                                   /* end of sequence */
177
+    break;
178
+
179
+    case U8G_DEV_MSG_STOP: break;
180
+
181
+    case U8G_DEV_MSG_PAGE_NEXT: {
182
+      u8g_pb_t *pb = (u8g_pb_t *)(dev->dev_mem);
183
+      ST7565_CS();                      /* disable chip */
184
+      ST7565_NA0();                     /* instruction mode */
185
+      ST7565_NCS();                     /* enable chip */
186
+      ST7565_WRITE_BYTE(0x010);         /* set upper 4 bit of the col adr to 0x10 */
187
+      ST7565_WRITE_BYTE(0x000);         /* set lower 4 bit of the col adr to 0x00. Changed for DisplayTech 64128N */
188
+                                        /* end of sequence */
189
+      ST7565_WRITE_BYTE(0x0B0 | (2*pb->p.page));; /* select current page (ST7565R) */
190
+      ST7565_A0();                      /* data mode */
191
+      ST7560_WriteSequence( (uint8_t) pb->width, (uint8_t *)pb->buf);
192
+      ST7565_CS();                      /* disable chip */
193
+      ST7565_NA0();                     /* instruction mode */
194
+      ST7565_NCS();                     /* enable chip */
195
+      ST7565_WRITE_BYTE(0x010);         /* set upper 4 bit of the col adr to 0x10 */
196
+      ST7565_WRITE_BYTE(0x000);         /* set lower 4 bit of the col adr to 0x00. Changed for DisplayTech 64128N */
197
+                                        /* end of sequence */
198
+      ST7565_WRITE_BYTE(0x0B0 | (2*pb->p.page+1)); /* select current page (ST7565R) */
199
+      ST7565_A0();                      /* data mode */
200
+      ST7560_WriteSequence( (uint8_t) pb->width, (uint8_t *)(pb->buf)+pb->width);
201
+      ST7565_CS();                      /* disable chip */
202
+    }
203
+    break;
204
+
205
+    case U8G_DEV_MSG_CONTRAST:
206
+      ST7565_NCS();
207
+      ST7565_NA0();                     /* instruction mode */
208
+      ST7565_WRITE_BYTE(0x081);
209
+      ST7565_WRITE_BYTE((*(uint8_t *)arg) >> 2);
210
+      ST7565_CS();                      /* disable chip */
211
+      return 1;
212
+
213
+    case U8G_DEV_MSG_SLEEP_ON:
214
+      ST7565_NA0();                     /* instruction mode */
215
+      ST7565_NCS();                     /* enable chip */
216
+      ST7565_WRITE_BYTE(0x0AC);         /* static indicator off */
217
+      ST7565_WRITE_BYTE(0x000);         /* indicator register set (not sure if this is required) */
218
+      ST7565_WRITE_BYTE(0x0AE);         /* display off */
219
+      ST7565_WRITE_BYTE(0x0A5);         /* all points on */
220
+      ST7565_CS();                      /* disable chip , bugfix 12 nov 2014 */
221
+                                        /* end of sequence */
222
+      return 1;
223
+
224
+    case U8G_DEV_MSG_SLEEP_OFF:
225
+      ST7565_NA0();                     /* instruction mode */
226
+      ST7565_NCS();                     /* enable chip */
227
+      ST7565_WRITE_BYTE(0x0A4);         /* all points off */
228
+      ST7565_WRITE_BYTE(0x0AF);         /* display on */
229
+      U8G_ESC_DLY(50);                  /* delay 50 ms */
230
+      ST7565_CS();                      /* disable chip ,  bugfix 12 nov 2014 */
231
+                                        /* end of sequence */
232
+      return 1;
233
+  }
234
+  return u8g_dev_pb16v1_base_fn(u8g, dev, msg, arg);
235
+}
236
+
237
+uint8_t u8g_dev_st7565_64128n_2x_VIKI_buf[LCD_PIXEL_WIDTH*2] U8G_NOCOMMON;
238
+u8g_pb_t u8g_dev_st7565_64128n_2x_VIKI_pb = {{16, LCD_PIXEL_HEIGHT, 0, 0, 0}, LCD_PIXEL_WIDTH, u8g_dev_st7565_64128n_2x_VIKI_buf};
239
+u8g_dev_t u8g_dev_st7565_64128n_2x_VIKI_sw_spi = {u8g_dev_st7565_64128n_2x_VIKI_fn, &u8g_dev_st7565_64128n_2x_VIKI_pb, &u8g_com_null_fn};
240
+
241
+class U8GLIB_ST7565_64128n_2x_VIKI : public U8GLIB {
242
+  public:
243
+  U8GLIB_ST7565_64128n_2x_VIKI(uint8_t dummy)
244
+    : U8GLIB(&u8g_dev_st7565_64128n_2x_VIKI_sw_spi)
245
+    {  }
246
+  U8GLIB_ST7565_64128n_2x_VIKI(uint8_t sck, uint8_t mosi, uint8_t cs, uint8_t a0, uint8_t reset = U8G_PIN_NONE)
247
+    : U8GLIB(&u8g_dev_st7565_64128n_2x_VIKI_sw_spi)
248
+    {  }
249
+};
250
+
251
+#pragma GCC reset_options
252
+
253
+#endif // ULCDST7565_H

+ 4
- 8
Marlin/ultralcd_st7920_u8glib_rrd.h 查看文件

@@ -23,9 +23,7 @@
23 23
 #ifndef ULCDST7920_H
24 24
 #define ULCDST7920_H
25 25
 
26
-#include "Marlin.h"
27
-
28
-#if ENABLED(U8GLIB_ST7920)
26
+#include <U8glib.h>
29 27
 
30 28
 #define ST7920_CLK_PIN  LCD_PINS_D4
31 29
 #define ST7920_DAT_PIN  LCD_PINS_ENABLE
@@ -38,8 +36,6 @@
38 36
 #define LCD_PIXEL_WIDTH 128
39 37
 #define LCD_PIXEL_HEIGHT 64
40 38
 
41
-#include <U8glib.h>
42
-
43 39
 //set optimization so ARDUINO optimizes this file
44 40
 #pragma GCC optimize (3)
45 41
 
@@ -139,8 +135,9 @@ uint8_t u8g_dev_rrd_st7920_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, vo
139 135
       ST7920_NCS();
140 136
     }
141 137
     break;
142
-    case U8G_DEV_MSG_STOP:
143
-      break;
138
+
139
+    case U8G_DEV_MSG_STOP: break;
140
+
144 141
     case U8G_DEV_MSG_PAGE_NEXT: {
145 142
       uint8_t* ptr;
146 143
       u8g_pb_t* pb = (u8g_pb_t*)(dev->dev_mem);
@@ -186,5 +183,4 @@ class U8GLIB_ST7920_128X64_RRD : public U8GLIB {
186 183
 
187 184
 #pragma GCC reset_options
188 185
 
189
-#endif // U8GLIB_ST7920
190 186
 #endif // ULCDST7920_H

Loading…
取消
儲存