Merge pull request #7208 from thinkyhead/bf_lcd_for_melzi

LCD for Melzi support
This commit is contained in:
Scott Lahteine 2017-07-02 00:32:13 -05:00 committed by GitHub
commit 41e0955c27
39 changed files with 194 additions and 8 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -38,7 +38,7 @@
#if ENABLED(DEBUG_GCODE_PARSER)
#if ENABLED(AUTO_BED_LEVELING_UBL)
extern char* hex_address(const void * const w);
#else
#else
#include "hex_print_routines.h"
#endif
#include "serial.h"

View File

@ -209,16 +209,39 @@
#define BTN_EN2 10
#if ENABLED(LCD_I2C_PANELOLU2)
#if IS_MELZI
#define BTN_ENC 29
#define LCD_SDSS 30 // Panelolu2 SD card reader rather than the Melzi
#else
#define BTN_ENC 30
#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 LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi
#endif // !Panelolu2
#endif
#define SD_DETECT_PIN -1

View File

@ -48,8 +48,8 @@ typedef void (*twiRequestFunc_t)();
* for the host to interpret.
*
* For more information see
* - http://marlinfw.org/docs/gcode/M260.html
* - http://marlinfw.org/docs/gcode/M261.html
* - http://marlinfw.org/docs/gcode/M260.html
* - http://marlinfw.org/docs/gcode/M261.html
*
*/
class TWIBus {

View File

@ -31,7 +31,7 @@
#include <math.h>
extern float destination[XYZE];
#if AVR_AT90USB1286_FAMILY // Teensyduino & Printrboard IDE extensions have compile errors without this
inline void set_current_to_destination() { COPY(current_position, destination); }
#else

View File

@ -1085,7 +1085,7 @@ static void lcd_implementation_status_screen() {
#if ENABLED(AUTO_BED_LEVELING_UBL)
/*
/**
* These are just basic data for the 20x4 LCD work that
* is coming up very soon.
* Soon this will morph into a map code.