SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1386 from roglio/Development

Browse source 
Fixing a build error for melzi and gfx display
This commit is contained in:
Scott Lahteine 2015-01-23 06:00:24 -08:00
commit 9ce75ab7de
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Marlin/pins.h
View file

@ -1279,15 +1279,21 @@
#define BEEPER -1 #define BEEPER -1
//LCD Pins //LCD Pins
#ifdef DOGLCD #ifdef DOGLCD
#ifdef U8GLIB_ST7920 //SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
#define LCD_PINS_RS 30 //CS chip select /SS chip slave select
#define LCD_PINS_ENABLE 29 //SID (MOSI)
#define LCD_PINS_D4 17 //SCK (CLK) clock
#define BEEPER 27 // Pin 27 is take by LED_Pin, but Melzi LED do nothing with Marlin and I take this pin for BEEPER.... See here > [github.com] , If you want use this pin with Gcode M42 instead BEEPER
#else
// Pins for DOGM SPI LCD Support // Pins for DOGM SPI LCD Support
#define DOGLCD_A0 30 #define DOGLCD_A0 30
#define DOGLCD_CS 29 #define DOGLCD_CS 29
// GLCD features
#define LCD_CONTRAST 1 #define LCD_CONTRAST 1
#endif
// Uncomment screen orientation // Uncomment screen orientation
// #define LCD_SCREEN_ROT_0 #define LCD_SCREEN_ROT_0
// #define LCD_SCREEN_ROT_90 // #define LCD_SCREEN_ROT_90
#define LCD_SCREEN_ROT_180 // #define LCD_SCREEN_ROT_180
// #define LCD_SCREEN_ROT_270 // #define LCD_SCREEN_ROT_270
#else // standard Hitachi LCD controller #else // standard Hitachi LCD controller
#define LCD_PINS_RS 4 #define LCD_PINS_RS 4
@ -1309,6 +1315,7 @@
#endif #endif
#else #else
#define BTN_ENC 16 //the click switch #define BTN_ENC 16 //the click switch
#define LCD_SDSS 28 //to use the SD card reader on the smart controller rather than the melzi board
#endif //Panelolu2 #endif //Panelolu2
//not connected to a pin //not connected to a pin
#define SDCARDDETECT -1 #define SDCARDDETECT -1