Просмотр исходного кода

Add proper support for the AZSMZ 12864 LCD on a SMART RAMPS

Jeffrey Li 6 лет назад
Родитель
Сommit
eeb4611606

+ 6
- 0
Marlin/Configuration.h Просмотреть файл

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

+ 8
- 1
Marlin/src/inc/Conditionals_LCD.h Просмотреть файл

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

+ 2
- 2
Marlin/src/inc/Conditionals_post.h Просмотреть файл

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

+ 5
- 0
Marlin/src/inc/SanityCheck.h Просмотреть файл

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

+ 2
- 18
Marlin/src/pins/pins_RAMPS_SMART.h Просмотреть файл

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

Загрузка…
Отмена
Сохранить