Browse Source

Adding support for the Tronxy and Zonestar LCD

Scott Lahteine 7 years ago
parent
commit
15d05748df

+ 4
- 2
Marlin/Configuration.h View File

1516
 //#define CARTESIO_UI
1516
 //#define CARTESIO_UI
1517
 
1517
 
1518
 //
1518
 //
1519
-// ANET_10 Controller supported displays.
1519
+// ANET and Tronxy Controller supported displays.
1520
 //
1520
 //
1521
-//#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1521
+//#define ZONESTAR_LCD            // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1522
                                   // This LCD is known to be susceptible to electrical interference
1522
                                   // This LCD is known to be susceptible to electrical interference
1523
                                   // which scrambles the display.  Pressing any button clears it up.
1523
                                   // which scrambles the display.  Pressing any button clears it up.
1524
+                                  // This is a LCD2004 display with 5 analog buttons.
1525
+
1524
 //#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1526
 //#define ANET_FULL_GRAPHICS_LCD  // Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6
1525
                                   // A clone of the RepRapDiscount full graphics display but with
1527
                                   // A clone of the RepRapDiscount full graphics display but with
1526
                                   // different pins/wiring (see pins_ANET_10.h).
1528
                                   // different pins/wiring (see pins_ANET_10.h).

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

42
 
42
 
43
   #define U8GLIB_ST7565_64128N
43
   #define U8GLIB_ST7565_64128N
44
 
44
 
45
-#elif ENABLED(ANET_KEYPAD_LCD)
45
+#elif ENABLED(ZONESTAR_LCD)
46
 
46
 
47
   #define REPRAPWORLD_KEYPAD
47
   #define REPRAPWORLD_KEYPAD
48
   #define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0
48
   #define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0

+ 4
- 2
Marlin/src/inc/SanityCheck.h View File

229
   #error "K1 is now PID_K1. Please update your configuration."
229
   #error "K1 is now PID_K1. Please update your configuration."
230
 #elif defined(PROBE_DOUBLE_TOUCH)
230
 #elif defined(PROBE_DOUBLE_TOUCH)
231
   #error "PROBE_DOUBLE_TOUCH is now MULTIPLE_PROBING. Please update your configuration."
231
   #error "PROBE_DOUBLE_TOUCH is now MULTIPLE_PROBING. Please update your configuration."
232
+#elif defined(ANET_KEYPAD_LCD)
233
+  #error "ANET_KEYPAD_LCD is now ZONESTAR_LCD. Please update your configuration."
232
 #endif
234
 #endif
233
 
235
 
234
 /**
236
 /**
1359
   #endif
1361
   #endif
1360
   #if ENABLED(REPRAPWORLD_KEYPAD) \
1362
   #if ENABLED(REPRAPWORLD_KEYPAD) \
1361
       && DISABLED(CARTESIO_UI) \
1363
       && DISABLED(CARTESIO_UI) \
1362
-      && DISABLED(ANET_KEYPAD_LCD)
1364
+      && DISABLED(ZONESTAR_LCD)
1363
     + 1
1365
     + 1
1364
   #endif
1366
   #endif
1365
   #if ENABLED(RIGIDBOT_PANEL)
1367
   #if ENABLED(RIGIDBOT_PANEL)
1395
   #if ENABLED(OLED_PANEL_TINYBOY2)
1397
   #if ENABLED(OLED_PANEL_TINYBOY2)
1396
     + 1
1398
     + 1
1397
   #endif
1399
   #endif
1398
-  #if ENABLED(ANET_KEYPAD_LCD)
1400
+  #if ENABLED(ZONESTAR_LCD)
1399
     + 1
1401
     + 1
1400
   #endif
1402
   #endif
1401
   , "Please select no more than one LCD controller option."
1403
   , "Please select no more than one LCD controller option."

+ 2
- 2
Marlin/src/pins/pins_ANET_10.h View File

145
  * LCD / Controller
145
  * LCD / Controller
146
  *
146
  *
147
  * Only the following displays are supported:
147
  * Only the following displays are supported:
148
- *  ANET_KEYPAD_LCD
148
+ *  ZONESTAR_LCD
149
  *  ANET_FULL_GRAPHICS_LCD
149
  *  ANET_FULL_GRAPHICS_LCD
150
  *  REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
150
  *  REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
151
 */
151
 */
209
  * ===================== LCD PINOUTS ==================================
209
  * ===================== LCD PINOUTS ==================================
210
  * ====================================================================
210
  * ====================================================================
211
  *
211
  *
212
- *   Anet V1.0 controller           | ANET_KEYPAD_LCD   | ANET_FULL_      | RepRapDiscount Full      | Thingiverse RepRap wiring
212
+ *   Anet V1.0 controller           | ZONESTAR_LCD      | ANET_FULL_      | RepRapDiscount Full      | Thingiverse RepRap wiring
213
  *   physical   logical   alt       |                   | GRAPHICS_LCD    | Graphics Display Wiring  | http://www.thingiverse
213
  *   physical   logical   alt       |                   | GRAPHICS_LCD    | Graphics Display Wiring  | http://www.thingiverse
214
  *     pin        pin     functions |                   |                 |                          | .com/thing:2103748
214
  *     pin        pin     functions |                   |                 |                          | .com/thing:2103748
215
  *------------------------------------------------------------------------------------------------------------------------
215
  *------------------------------------------------------------------------------------------------------------------------

+ 2
- 2
Marlin/src/pins/pins_RAMPS.h View File

538
 
538
 
539
 #endif // ULTRA_LCD
539
 #endif // ULTRA_LCD
540
 
540
 
541
-#if ENABLED(ANET_KEYPAD_LCD)
541
+#if ENABLED(ZONESTAR_LCD)
542
   #define LCD_PINS_RS        64
542
   #define LCD_PINS_RS        64
543
   #define LCD_PINS_ENABLE    44
543
   #define LCD_PINS_ENABLE    44
544
   #define LCD_PINS_D4        63
544
   #define LCD_PINS_D4        63
550
   #define BTN_EN2            -1
550
   #define BTN_EN2            -1
551
   #define BTN_ENC            -1
551
   #define BTN_ENC            -1
552
   // pin 29 N/C
552
   // pin 29 N/C
553
-#endif // ANET_KEYPAD_LCD
553
+#endif // ZONESTAR_LCD

+ 15
- 1
Marlin/src/pins/pins_SANGUINOLOLU_11.h View File

243
       #define ST7920_DELAY_3 DELAY_0_NOP
243
       #define ST7920_DELAY_3 DELAY_0_NOP
244
     #endif
244
     #endif
245
 
245
 
246
-  #else  // !LCD_I2C_PANELOLU2 && !LCD_FOR_MELZI
246
+  #elif ENABLED(ZONESTAR_LCD) // For the Tronxy Melzi boards
247
+
248
+    #define LCD_PINS_RS         28
249
+    #define LCD_PINS_ENABLE     29
250
+    #define LCD_PINS_D4         10
251
+    #define LCD_PINS_D5         11
252
+    #define LCD_PINS_D6         16
253
+    #define LCD_PINS_D7         17
254
+    #define ADC_KEYPAD_PIN       1
255
+
256
+    // Not used
257
+    #define BTN_EN1             -1
258
+    #define BTN_EN2             -1
259
+
260
+  #else  // !LCD_I2C_PANELOLU2 && !LCD_FOR_MELZI && !ZONESTAR_LCD
247
 
261
 
248
     #define BTN_ENC             16
262
     #define BTN_ENC             16
249
     #define LCD_SDSS            28 // Smart Controller SD card reader rather than the Melzi
263
     #define LCD_SDSS            28 // Smart Controller SD card reader rather than the Melzi

Loading…
Cancel
Save