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

Merge pull request #5813 from thinkyhead/rc_fix_makrpanel

Browse source 
Fix MAKRPANEL assignments
This commit is contained in:
Scott Lahteine 2017-03-03 21:40:49 -06:00 committed by GitHub
commit b27f69ba51
1 changed files with 18 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
Marlin/pins_SANGUINOLOLU_11.h
View file

@ -121,10 +121,6 @@
//
#if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
// No buzzer installed
#define BEEPER_PIN -1
// LCD Pins
#if ENABLED(DOGLCD)
#if ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
@ -149,9 +145,20 @@
#else // DOGM SPI LCD Support
#define DOGLCD_A0 30
#define DOGLCD_CS 29
#define LCD_CONTRAST 1
#if ENABLED(MAKRPANEL)
#define BEEPER_PIN 29
#define DOGLCD_CS 17
#define LCD_BACKLIGHT_PIN 28 // PA3
#else // !MAKRPANEL
#define DOGLCD_CS 29
#endif
#endif
// Uncomment screen orientation
@ -160,7 +167,7 @@
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
#else // !DOGLCD - Standard Hitachi LCD controller
#else // !DOGLCD
#define LCD_PINS_RS 4
#define LCD_PINS_ENABLE 17
@ -171,9 +178,9 @@
#endif // !DOGLCD
//The encoder and click button
#define BTN_EN1 11
#define BTN_EN2 10
#if ENABLED(LCD_I2C_PANELOLU2)
#if IS_MELZI
#define BTN_ENC 29
@ -181,33 +188,11 @@
#else
#define BTN_ENC 30
#endif
#else
#else // !Panelolu2
#define BTN_ENC 16
#define LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi
#endif // Panelolu2
#endif // !Panelolu2
#define SD_DETECT_PIN -1
#elif ENABLED(MAKRPANEL)
#define BEEPER_PIN 29
// Pins for DOGM SPI LCD Support
#define DOGLCD_A0 30
#define DOGLCD_CS 17
#define LCD_BACKLIGHT_PIN 28 // backlight LED on PA3
// GLCD features
#define LCD_CONTRAST 1
// Uncomment screen orientation
#define LCD_SCREEN_ROT_0
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
//The encoder and click button
#define BTN_EN1 11
#define BTN_EN2 10
#define BTN_ENC 16
#define SD_DETECT_PIN -1
#endif // MAKRPANEL
#endif // ULTRA_LCD && NEWPANEL