Browse Source

LCD_FOR_MELZI

Scott Lahteine 7 years ago
parent
commit
232a10410d
35 changed files with 189 additions and 3 deletions
  1. 1
    1
      Marlin/Conditionals_LCD.h
  2. 5
    0
      Marlin/Configuration.h
  3. 3
    0
      Marlin/SanityCheck.h
  4. 5
    0
      Marlin/example_configurations/Anet/A6/Configuration.h
  5. 5
    0
      Marlin/example_configurations/Anet/A8/Configuration.h
  6. 5
    0
      Marlin/example_configurations/CL-260/Configuration.h
  7. 5
    0
      Marlin/example_configurations/Cartesio/Configuration.h
  8. 5
    0
      Marlin/example_configurations/Felix/Configuration.h
  9. 5
    0
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  10. 5
    0
      Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h
  11. 5
    0
      Marlin/example_configurations/Hephestos/Configuration.h
  12. 5
    0
      Marlin/example_configurations/Hephestos_2/Configuration.h
  13. 5
    0
      Marlin/example_configurations/Infitary-i3-M508/Configuration.h
  14. 5
    0
      Marlin/example_configurations/K8200/Configuration.h
  15. 5
    0
      Marlin/example_configurations/K8400/Configuration.h
  16. 5
    0
      Marlin/example_configurations/K8400/Dual-head/Configuration.h
  17. 5
    0
      Marlin/example_configurations/M150/Configuration.h
  18. 5
    0
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  19. 5
    0
      Marlin/example_configurations/RigidBot/Configuration.h
  20. 5
    0
      Marlin/example_configurations/SCARA/Configuration.h
  21. 5
    0
      Marlin/example_configurations/TAZ4/Configuration.h
  22. 5
    0
      Marlin/example_configurations/TinyBoy2/Configuration.h
  23. 5
    0
      Marlin/example_configurations/WITBOX/Configuration.h
  24. 5
    0
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  25. 5
    0
      Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
  26. 5
    0
      Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
  27. 5
    0
      Marlin/example_configurations/delta/generic/Configuration.h
  28. 5
    0
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  29. 5
    0
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  30. 5
    0
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  31. 5
    0
      Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h
  32. 5
    0
      Marlin/example_configurations/makibox/Configuration.h
  33. 5
    0
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  34. 5
    0
      Marlin/example_configurations/wt150/Configuration.h
  35. 25
    2
      Marlin/pins_SANGUINOLOLU_11.h

+ 1
- 1
Marlin/Conditionals_LCD.h View File

@@ -120,7 +120,7 @@
120 120
     #define ULTIMAKERCONTROLLER
121 121
   #endif
122 122
 
123
-  #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
123
+  #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) || ENABLED(LCD_FOR_MELZI)
124 124
     #define DOGLCD
125 125
     #define U8GLIB_ST7920
126 126
     #define REPRAP_DISCOUNT_SMART_CONTROLLER

+ 5
- 0
Marlin/Configuration.h View File

@@ -1403,6 +1403,11 @@
1403 1403
                                   // different pins/wiring (see pins_ANET_10.h).
1404 1404
 
1405 1405
 //
1406
+// LCD for Melzi Card with Graphical LCD
1407
+//
1408
+//#define LCD_FOR_MELZI
1409
+
1410
+//
1406 1411
 // CONTROLLER TYPE: I2C
1407 1412
 //
1408 1413
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 3
- 0
Marlin/SanityCheck.h View File

@@ -1086,6 +1086,9 @@ static_assert(1 >= 0
1086 1086
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(BQ_LCD_SMART_CONTROLLER)
1087 1087
     + 1
1088 1088
   #endif
1089
+  #if ENABLED(LCD_FOR_MELZI)
1090
+    + 1
1091
+  #endif
1089 1092
   #if ENABLED(CARTESIO_UI)
1090 1093
     + 1
1091 1094
   #endif

+ 5
- 0
Marlin/example_configurations/Anet/A6/Configuration.h View File

@@ -1561,6 +1561,11 @@
1561 1561
                                   // different pins/wiring (see pins_ANET_10.h).
1562 1562
 
1563 1563
 //
1564
+// LCD for Melzi Card with Graphical LCD
1565
+//
1566
+//#define LCD_FOR_MELZI
1567
+
1568
+//
1564 1569
 // CONTROLLER TYPE: I2C
1565 1570
 //
1566 1571
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/Anet/A8/Configuration.h View File

@@ -1411,6 +1411,11 @@
1411 1411
                                   // different pins/wiring (see pins_ANET_10.h).
1412 1412
 
1413 1413
 //
1414
+// LCD for Melzi Card with Graphical LCD
1415
+//
1416
+//#define LCD_FOR_MELZI
1417
+
1418
+//
1414 1419
 // CONTROLLER TYPE: I2C
1415 1420
 //
1416 1421
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/CL-260/Configuration.h View File

@@ -1400,6 +1400,11 @@
1400 1400
                                   // different pins/wiring (see pins_ANET_10.h).
1401 1401
 
1402 1402
 //
1403
+// LCD for Melzi Card with Graphical LCD
1404
+//
1405
+//#define LCD_FOR_MELZI
1406
+
1407
+//
1403 1408
 // CONTROLLER TYPE: I2C
1404 1409
 //
1405 1410
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/Cartesio/Configuration.h View File

@@ -1397,6 +1397,11 @@
1397 1397
                                   // different pins/wiring (see pins_ANET_10.h).
1398 1398
 
1399 1399
 //
1400
+// LCD for Melzi Card with Graphical LCD
1401
+//
1402
+//#define LCD_FOR_MELZI
1403
+
1404
+//
1400 1405
 // CONTROLLER TYPE: I2C
1401 1406
 //
1402 1407
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/Felix/Configuration.h View File

@@ -1381,6 +1381,11 @@
1381 1381
                                   // different pins/wiring (see pins_ANET_10.h).
1382 1382
 
1383 1383
 //
1384
+// LCD for Melzi Card with Graphical LCD
1385
+//
1386
+//#define LCD_FOR_MELZI
1387
+
1388
+//
1384 1389
 // CONTROLLER TYPE: I2C
1385 1390
 //
1386 1391
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/Felix/DUAL/Configuration.h View File

@@ -1381,6 +1381,11 @@
1381 1381
                                   // different pins/wiring (see pins_ANET_10.h).
1382 1382
 
1383 1383
 //
1384
+// LCD for Melzi Card with Graphical LCD
1385
+//
1386
+//#define LCD_FOR_MELZI
1387
+
1388
+//
1384 1389
 // CONTROLLER TYPE: I2C
1385 1390
 //
1386 1391
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h View File

@@ -1403,6 +1403,11 @@
1403 1403
                                   // different pins/wiring (see pins_ANET_10.h).
1404 1404
 
1405 1405
 //
1406
+// LCD for Melzi Card with Graphical LCD
1407
+//
1408
+//#define LCD_FOR_MELZI
1409
+
1410
+//
1406 1411
 // CONTROLLER TYPE: I2C
1407 1412
 //
1408 1413
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/Hephestos/Configuration.h View File

@@ -1389,6 +1389,11 @@
1389 1389
                                   // different pins/wiring (see pins_ANET_10.h).
1390 1390
 
1391 1391
 //
1392
+// LCD for Melzi Card with Graphical LCD
1393
+//
1394
+//#define LCD_FOR_MELZI
1395
+
1396
+//
1392 1397
 // CONTROLLER TYPE: I2C
1393 1398
 //
1394 1399
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/Hephestos_2/Configuration.h View File

@@ -1392,6 +1392,11 @@
1392 1392
                                   // different pins/wiring (see pins_ANET_10.h).
1393 1393
 
1394 1394
 //
1395
+// LCD for Melzi Card with Graphical LCD
1396
+//
1397
+//#define LCD_FOR_MELZI
1398
+
1399
+//
1395 1400
 // CONTROLLER TYPE: I2C
1396 1401
 //
1397 1402
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/Infitary-i3-M508/Configuration.h View File

@@ -1373,6 +1373,11 @@
1373 1373
 //#define BQ_LCD_SMART_CONTROLLER
1374 1374
 
1375 1375
 //
1376
+// LCD for Melzi Card with Graphical LCD
1377
+//
1378
+//#define LCD_FOR_MELZI
1379
+
1380
+//
1376 1381
 // CONTROLLER TYPE: I2C
1377 1382
 //
1378 1383
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/K8200/Configuration.h View File

@@ -1431,6 +1431,11 @@
1431 1431
                                   // different pins/wiring (see pins_ANET_10.h).
1432 1432
 
1433 1433
 //
1434
+// LCD for Melzi Card with Graphical LCD
1435
+//
1436
+//#define LCD_FOR_MELZI
1437
+
1438
+//
1434 1439
 // CONTROLLER TYPE: I2C
1435 1440
 //
1436 1441
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/K8400/Configuration.h View File

@@ -1399,6 +1399,11 @@
1399 1399
                                   // different pins/wiring (see pins_ANET_10.h).
1400 1400
 
1401 1401
 //
1402
+// LCD for Melzi Card with Graphical LCD
1403
+//
1404
+//#define LCD_FOR_MELZI
1405
+
1406
+//
1402 1407
 // CONTROLLER TYPE: I2C
1403 1408
 //
1404 1409
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/K8400/Dual-head/Configuration.h View File

@@ -1399,6 +1399,11 @@
1399 1399
                                   // different pins/wiring (see pins_ANET_10.h).
1400 1400
 
1401 1401
 //
1402
+// LCD for Melzi Card with Graphical LCD
1403
+//
1404
+//#define LCD_FOR_MELZI
1405
+
1406
+//
1402 1407
 // CONTROLLER TYPE: I2C
1403 1408
 //
1404 1409
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/M150/Configuration.h View File

@@ -1426,6 +1426,11 @@
1426 1426
                                   // different pins/wiring (see pins_ANET_10.h).
1427 1427
 
1428 1428
 //
1429
+// LCD for Melzi Card with Graphical LCD
1430
+//
1431
+//#define LCD_FOR_MELZI
1432
+
1433
+//
1429 1434
 // CONTROLLER TYPE: I2C
1430 1435
 //
1431 1436
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h View File

@@ -1399,6 +1399,11 @@
1399 1399
                                   // different pins/wiring (see pins_ANET_10.h).
1400 1400
 
1401 1401
 //
1402
+// LCD for Melzi Card with Graphical LCD
1403
+//
1404
+//#define LCD_FOR_MELZI
1405
+
1406
+//
1402 1407
 // CONTROLLER TYPE: I2C
1403 1408
 //
1404 1409
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/RigidBot/Configuration.h View File

@@ -1399,6 +1399,11 @@
1399 1399
                                   // different pins/wiring (see pins_ANET_10.h).
1400 1400
 
1401 1401
 //
1402
+// LCD for Melzi Card with Graphical LCD
1403
+//
1404
+//#define LCD_FOR_MELZI
1405
+
1406
+//
1402 1407
 // CONTROLLER TYPE: I2C
1403 1408
 //
1404 1409
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/SCARA/Configuration.h View File

@@ -1411,6 +1411,11 @@
1411 1411
                                   // different pins/wiring (see pins_ANET_10.h).
1412 1412
 
1413 1413
 //
1414
+// LCD for Melzi Card with Graphical LCD
1415
+//
1416
+//#define LCD_FOR_MELZI
1417
+
1418
+//
1414 1419
 // CONTROLLER TYPE: I2C
1415 1420
 //
1416 1421
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/TAZ4/Configuration.h View File

@@ -1418,6 +1418,11 @@
1418 1418
                                   // different pins/wiring (see pins_ANET_10.h).
1419 1419
 
1420 1420
 //
1421
+// LCD for Melzi Card with Graphical LCD
1422
+//
1423
+//#define LCD_FOR_MELZI
1424
+
1425
+//
1421 1426
 // CONTROLLER TYPE: I2C
1422 1427
 //
1423 1428
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/TinyBoy2/Configuration.h View File

@@ -1455,6 +1455,11 @@
1455 1455
                                   // different pins/wiring (see pins_ANET_10.h).
1456 1456
 
1457 1457
 //
1458
+// LCD for Melzi Card with Graphical LCD
1459
+//
1460
+//#define LCD_FOR_MELZI
1461
+
1462
+//
1458 1463
 // CONTROLLER TYPE: I2C
1459 1464
 //
1460 1465
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/WITBOX/Configuration.h View File

@@ -1389,6 +1389,11 @@
1389 1389
                                   // different pins/wiring (see pins_ANET_10.h).
1390 1390
 
1391 1391
 //
1392
+// LCD for Melzi Card with Graphical LCD
1393
+//
1394
+//#define LCD_FOR_MELZI
1395
+
1396
+//
1392 1397
 // CONTROLLER TYPE: I2C
1393 1398
 //
1394 1399
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/adafruit/ST7565/Configuration.h View File

@@ -1399,6 +1399,11 @@
1399 1399
                                   // different pins/wiring (see pins_ANET_10.h).
1400 1400
 
1401 1401
 //
1402
+// LCD for Melzi Card with Graphical LCD
1403
+//
1404
+//#define LCD_FOR_MELZI
1405
+
1406
+//
1402 1407
 // CONTROLLER TYPE: I2C
1403 1408
 //
1404 1409
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h View File

@@ -1520,6 +1520,11 @@
1520 1520
                                   // different pins/wiring (see pins_ANET_10.h).
1521 1521
 
1522 1522
 //
1523
+// LCD for Melzi Card with Graphical LCD
1524
+//
1525
+//#define LCD_FOR_MELZI
1526
+
1527
+//
1523 1528
 // CONTROLLER TYPE: I2C
1524 1529
 //
1525 1530
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h View File

@@ -1521,6 +1521,11 @@
1521 1521
                                   // different pins/wiring (see pins_ANET_10.h).
1522 1522
 
1523 1523
 //
1524
+// LCD for Melzi Card with Graphical LCD
1525
+//
1526
+//#define LCD_FOR_MELZI
1527
+
1528
+//
1524 1529
 // CONTROLLER TYPE: I2C
1525 1530
 //
1526 1531
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/delta/generic/Configuration.h View File

@@ -1510,6 +1510,11 @@
1510 1510
                                   // different pins/wiring (see pins_ANET_10.h).
1511 1511
 
1512 1512
 //
1513
+// LCD for Melzi Card with Graphical LCD
1514
+//
1515
+//#define LCD_FOR_MELZI
1516
+
1517
+//
1513 1518
 // CONTROLLER TYPE: I2C
1514 1519
 //
1515 1520
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File

@@ -1513,6 +1513,11 @@
1513 1513
                                   // different pins/wiring (see pins_ANET_10.h).
1514 1514
 
1515 1515
 //
1516
+// LCD for Melzi Card with Graphical LCD
1517
+//
1518
+//#define LCD_FOR_MELZI
1519
+
1520
+//
1516 1521
 // CONTROLLER TYPE: I2C
1517 1522
 //
1518 1523
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/delta/kossel_pro/Configuration.h View File

@@ -1518,6 +1518,11 @@
1518 1518
                                   // different pins/wiring (see pins_ANET_10.h).
1519 1519
 
1520 1520
 //
1521
+// LCD for Melzi Card with Graphical LCD
1522
+//
1523
+//#define LCD_FOR_MELZI
1524
+
1525
+//
1521 1526
 // CONTROLLER TYPE: I2C
1522 1527
 //
1523 1528
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/delta/kossel_xl/Configuration.h View File

@@ -1576,6 +1576,11 @@
1576 1576
                                   // different pins/wiring (see pins_ANET_10.h).
1577 1577
 
1578 1578
 //
1579
+// LCD for Melzi Card with Graphical LCD
1580
+//
1581
+//#define LCD_FOR_MELZI
1582
+
1583
+//
1579 1584
 // CONTROLLER TYPE: I2C
1580 1585
 //
1581 1586
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h View File

@@ -1415,6 +1415,11 @@
1415 1415
                                   // different pins/wiring (see pins_ANET_10.h).
1416 1416
 
1417 1417
 //
1418
+// LCD for Melzi Card with Graphical LCD
1419
+//
1420
+//#define LCD_FOR_MELZI
1421
+
1422
+//
1418 1423
 // CONTROLLER TYPE: I2C
1419 1424
 //
1420 1425
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/makibox/Configuration.h View File

@@ -1402,6 +1402,11 @@
1402 1402
                                   // different pins/wiring (see pins_ANET_10.h).
1403 1403
 
1404 1404
 //
1405
+// LCD for Melzi Card with Graphical LCD
1406
+//
1407
+//#define LCD_FOR_MELZI
1408
+
1409
+//
1405 1410
 // CONTROLLER TYPE: I2C
1406 1411
 //
1407 1412
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File

@@ -1394,6 +1394,11 @@
1394 1394
                                   // different pins/wiring (see pins_ANET_10.h).
1395 1395
 
1396 1396
 //
1397
+// LCD for Melzi Card with Graphical LCD
1398
+//
1399
+//#define LCD_FOR_MELZI
1400
+
1401
+//
1397 1402
 // CONTROLLER TYPE: I2C
1398 1403
 //
1399 1404
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 5
- 0
Marlin/example_configurations/wt150/Configuration.h View File

@@ -1405,6 +1405,11 @@
1405 1405
                                   // different pins/wiring (see pins_ANET_10.h).
1406 1406
 
1407 1407
 //
1408
+// LCD for Melzi Card with Graphical LCD
1409
+//
1410
+//#define LCD_FOR_MELZI
1411
+
1412
+//
1408 1413
 // CONTROLLER TYPE: I2C
1409 1414
 //
1410 1415
 // Note: These controllers require the installation of Arduino's LiquidCrystal_I2C

+ 25
- 2
Marlin/pins_SANGUINOLOLU_11.h View File

@@ -209,16 +209,39 @@
209 209
   #define BTN_EN2               10
210 210
 
211 211
   #if ENABLED(LCD_I2C_PANELOLU2)
212
+
212 213
     #if IS_MELZI
213 214
       #define BTN_ENC           29
214 215
       #define LCD_SDSS          30 // Panelolu2 SD card reader rather than the Melzi
215 216
     #else
216 217
       #define BTN_ENC           30
217 218
     #endif
218
-  #else  // !Panelolu2
219
+
220
+  #elif ENABLED(LCD_FOR_MELZI)
221
+
222
+    #define LCD_PINS_RS         17
223
+    #define LCD_PINS_ENABLE     16
224
+    #define LCD_PINS_D4         11
225
+    #define BTN_ENC             28
226
+    #define BTN_EN1             29
227
+    #define BTN_EN2             30
228
+
229
+    #ifndef ST7920_DELAY_1
230
+      #define ST7920_DELAY_1 DELAY_0_NOP
231
+    #endif
232
+    #ifndef ST7920_DELAY_3
233
+      #define ST7920_DELAY_2 DELAY_3_NOP
234
+    #endif
235
+    #ifndef ST7920_DELAY_3
236
+      #define ST7920_DELAY_3 DELAY_0_NOP
237
+    #endif
238
+
239
+  #else  // !LCD_I2C_PANELOLU2 && !LCD_FOR_MELZI
240
+
219 241
     #define BTN_ENC             16
220 242
     #define LCD_SDSS            28 // Smart Controller SD card reader rather than the Melzi
221
-  #endif // !Panelolu2
243
+
244
+  #endif
222 245
 
223 246
   #define SD_DETECT_PIN         -1
224 247
 

Loading…
Cancel
Save