forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

LCD_FOR_MELZI

Browse Source
master
Scott Lahteine 8 years ago
parent 76c92a1fab
commit 232a10410d
35 changed files with 189 additions and 3 deletions
Show Stats Download Patch File Download Diff File

2
Marlin/Conditionals_LCD.h
Unescape View File

@ -120,7 +120,7 @@
#define ULTIMAKERCONTROLLER #define ULTIMAKERCONTROLLER
#endif #endif
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) || ENABLED(LCD_FOR_MELZI)
#define DOGLCD #define DOGLCD
#define U8GLIB_ST7920 #define U8GLIB_ST7920
#define REPRAP_DISCOUNT_SMART_CONTROLLER #define REPRAP_DISCOUNT_SMART_CONTROLLER

5
Marlin/Configuration.h
Unescape View File

@ -1402,6 +1402,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

3
Marlin/SanityCheck.h
Unescape View File

@ -1086,6 +1086,9 @@ static_assert(1 >= 0
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(BQ_LCD_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(BQ_LCD_SMART_CONTROLLER)
+ 1 + 1
#endif #endif
#if ENABLED(LCD_FOR_MELZI)
+ 1
#endif
#if ENABLED(CARTESIO_UI) #if ENABLED(CARTESIO_UI)
+ 1 + 1
#endif #endif

5
Marlin/example_configurations/Anet/A6/Configuration.h
Unescape View File

@ -1560,6 +1560,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/Anet/A8/Configuration.h
Unescape View File

@ -1410,6 +1410,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

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

@ -1399,6 +1399,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/Cartesio/Configuration.h
Unescape View File

@ -1396,6 +1396,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/Felix/Configuration.h
Unescape View File

@ -1380,6 +1380,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/Felix/DUAL/Configuration.h
Unescape View File

@ -1380,6 +1380,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

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

@ -1402,6 +1402,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/Hephestos/Configuration.h
Unescape View File

@ -1388,6 +1388,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/Hephestos_2/Configuration.h
Unescape View File

@ -1391,6 +1391,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

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

@ -1372,6 +1372,11 @@
// //
//#define BQ_LCD_SMART_CONTROLLER //#define BQ_LCD_SMART_CONTROLLER
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/K8200/Configuration.h
Unescape View File

@ -1430,6 +1430,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/K8400/Configuration.h
Unescape View File

@ -1398,6 +1398,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

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

@ -1398,6 +1398,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/M150/Configuration.h
Unescape View File

@ -1425,6 +1425,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
Unescape View File

@ -1398,6 +1398,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/RigidBot/Configuration.h
Unescape View File

@ -1398,6 +1398,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/SCARA/Configuration.h
Unescape View File

@ -1410,6 +1410,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/TAZ4/Configuration.h
Unescape View File

@ -1417,6 +1417,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/TinyBoy2/Configuration.h
Unescape View File

@ -1454,6 +1454,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/WITBOX/Configuration.h
Unescape View File

@ -1388,6 +1388,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/adafruit/ST7565/Configuration.h
Unescape View File

@ -1398,6 +1398,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
Unescape View File

@ -1519,6 +1519,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
Unescape View File

@ -1520,6 +1520,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/delta/generic/Configuration.h
Unescape View File

@ -1509,6 +1509,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/delta/kossel_mini/Configuration.h
Unescape View File

@ -1512,6 +1512,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/delta/kossel_pro/Configuration.h
Unescape View File

@ -1517,6 +1517,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/delta/kossel_xl/Configuration.h
Unescape View File

@ -1575,6 +1575,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h
Unescape View File

@ -1414,6 +1414,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/makibox/Configuration.h
Unescape View File

@ -1401,6 +1401,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/tvrrug/Round2/Configuration.h
Unescape View File

@ -1393,6 +1393,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

5
Marlin/example_configurations/wt150/Configuration.h
Unescape View File

@ -1404,6 +1404,11 @@
// A clone of the RepRapDiscount full graphics display but with // A clone of the RepRapDiscount full graphics display but with
// different pins/wiring (see pins_ANET_10.h). // different pins/wiring (see pins_ANET_10.h).
//
// LCD for Melzi Card with Graphical LCD
//
//#define LCD_FOR_MELZI
// //
// CONTROLLER TYPE: I2C // CONTROLLER TYPE: I2C
// //

27
Marlin/pins_SANGUINOLOLU_11.h
Unescape View File

@ -209,16 +209,39 @@
#define BTN_EN2 10 #define BTN_EN2 10
#if ENABLED(LCD_I2C_PANELOLU2) #if ENABLED(LCD_I2C_PANELOLU2)
#if IS_MELZI #if IS_MELZI
#define BTN_ENC 29 #define BTN_ENC 29
#define LCD_SDSS 30 // Panelolu2 SD card reader rather than the Melzi #define LCD_SDSS 30 // Panelolu2 SD card reader rather than the Melzi
#else #else
#define BTN_ENC 30 #define BTN_ENC 30
#endif #endif
#else // !Panelolu2
#elif ENABLED(LCD_FOR_MELZI)
#define LCD_PINS_RS 17
#define LCD_PINS_ENABLE 16
#define LCD_PINS_D4 11
#define BTN_ENC 28
#define BTN_EN1 29
#define BTN_EN2 30
#ifndef ST7920_DELAY_1
#define ST7920_DELAY_1 DELAY_0_NOP
#endif
#ifndef ST7920_DELAY_3
#define ST7920_DELAY_2 DELAY_3_NOP
#endif
#ifndef ST7920_DELAY_3
#define ST7920_DELAY_3 DELAY_0_NOP
#endif
#else // !LCD_I2C_PANELOLU2 && !LCD_FOR_MELZI
#define BTN_ENC 16 #define BTN_ENC 16
#define LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi #define LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi
#endif // !Panelolu2
#endif
#define SD_DETECT_PIN -1 #define SD_DETECT_PIN -1

Write Preview
Loading…
Cancel
Save