melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use _PIN suffix on some pins

Browse Source
This commit is contained in:
Scott Lahteine 2016-09-24 16:36:12 -05:00
parent 203e519bf4
commit 07703d2bd6
5 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/SanityCheck.h
View File

@ -61,10 +61,6 @@
#error "Z_LATE_ENABLE can't be used with COREXZ." #error "Z_LATE_ENABLE can't be used with COREXZ."
#elif defined(X_HOME_RETRACT_MM) #elif defined(X_HOME_RETRACT_MM)
#error "[XYZ]_HOME_RETRACT_MM settings have been renamed [XYZ]_HOME_BUMP_MM." #error "[XYZ]_HOME_RETRACT_MM settings have been renamed [XYZ]_HOME_BUMP_MM."
#elif defined(BEEPER)
#error "BEEPER is now BEEPER_PIN. Please update your pins definitions."
#elif defined(SDCARDDETECT)
#error "SDCARDDETECT is now SD_DETECT_PIN. Please update your pins definitions."
#elif defined(SDCARDDETECTINVERTED) #elif defined(SDCARDDETECTINVERTED)
#error "SDCARDDETECTINVERTED is now SD_DETECT_INVERTED. Please update your configuration." #error "SDCARDDETECTINVERTED is now SD_DETECT_INVERTED. Please update your configuration."
#elif defined(BTENABLED) #elif defined(BTENABLED)
@ -143,6 +139,16 @@
#error "SCARA is now MORGAN_SCARA. Please update your configuration." #error "SCARA is now MORGAN_SCARA. Please update your configuration."
#elif defined(AUTO_BED_LEVELING_GRID_POINTS) #elif defined(AUTO_BED_LEVELING_GRID_POINTS)
#error "AUTO_BED_LEVELING_GRID_POINTS is now ABL_GRID_POINTS_X and ABL_GRID_POINTS_Y. Please update your configuration." #error "AUTO_BED_LEVELING_GRID_POINTS is now ABL_GRID_POINTS_X and ABL_GRID_POINTS_Y. Please update your configuration."
#elif defined(BEEPER)
#error "BEEPER is now BEEPER_PIN. Please update your pins definitions."
#elif defined(SDCARDDETECT)
#error "SDCARDDETECT is now SD_DETECT_PIN. Please update your pins definitions."
#elif defined(STAT_LED_RED) || defined(STAT_LED_BLUE)
#error "STAT_LED_RED/STAT_LED_BLUE are now STAT_LED_RED_PIN/STAT_LED_BLUE_PIN. Please update your pins definitions."
#elif defined(LCD_PIN_BL)
#error "LCD_PIN_BL is now LCD_BACKLIGHT_PIN. Please update your pins definitions."
#elif defined(LCD_PIN_RESET)
#error "LCD_PIN_RESET is now LCD_RESET_PIN. Please update your pins definitions."
#endif #endif
/** /**

2
Marlin/pins_MEGACONTROLLER.h
View File

@ -134,7 +134,7 @@
// Pins for DOGM SPI LCD Support // Pins for DOGM SPI LCD Support
#define DOGLCD_A0 47 #define DOGLCD_A0 47
#define DOGLCD_CS 45 #define DOGLCD_CS 45
#define LCD_PIN_BL 44 // backlight LED on PA3 #define LCD_BACKLIGHT_PIN 44 // backlight LED on PA3
#define KILL_PIN 12 #define KILL_PIN 12
// GLCD features // GLCD features

6
Marlin/pins_RAMPS.h
View File

@ -240,7 +240,7 @@
#define KILL_PIN 41 #define KILL_PIN 41
#if ENABLED(BQ_LCD_SMART_CONTROLLER) #if ENABLED(BQ_LCD_SMART_CONTROLLER)
#define LCD_PIN_BL 39 #define LCD_BACKLIGHT_PIN 39
#endif #endif
#elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD) #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
@ -293,13 +293,13 @@
#define BEEPER_PIN 23 #define BEEPER_PIN 23
#define DOGLCD_CS 29 #define DOGLCD_CS 29
#define DOGLCD_A0 27 #define DOGLCD_A0 27
#define LCD_PIN_BL 33 #define LCD_BACKLIGHT_PIN 33
#elif ENABLED(MINIPANEL) #elif ENABLED(MINIPANEL)
#define BEEPER_PIN 42 #define BEEPER_PIN 42
// Pins for DOGM SPI LCD Support // Pins for DOGM SPI LCD Support
#define DOGLCD_A0 44 #define DOGLCD_A0 44
#define DOGLCD_CS 66 #define DOGLCD_CS 66
#define LCD_PIN_BL 65 // backlight LED on A11/D65 #define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
#define SDSS 53 #define SDSS 53
#define KILL_PIN 64 #define KILL_PIN 64

4
Marlin/pins_SANGUINOLOLU_11.h
View File

@ -56,7 +56,7 @@
#if IS_MELZI #if IS_MELZI
#define LED_PIN 27 // On some broken versions of the Sanguino libraries the pin definitions are wrong, so LED_PIN needs to be 28. But you should upgrade your Sanguino libraries! See #368. #define LED_PIN 27 // On some broken versions of the Sanguino libraries the pin definitions are wrong, so LED_PIN needs to be 28. But you should upgrade your Sanguino libraries! See #368.
#elif MB(STB_11) #elif MB(STB_11)
#define LCD_PIN_BL 17 // LCD backlight LED #define LCD_BACKLIGHT_PIN 17 // LCD backlight LED
#endif #endif
#if ENABLED(Z_PROBE_SLED) #if ENABLED(Z_PROBE_SLED)
@ -173,7 +173,7 @@
// Pins for DOGM SPI LCD Support // Pins for DOGM SPI LCD Support
#define DOGLCD_A0 30 #define DOGLCD_A0 30
#define DOGLCD_CS 17 #define DOGLCD_CS 17
#define LCD_PIN_BL 28 // backlight LED on PA3 #define LCD_BACKLIGHT_PIN 28 // backlight LED on PA3
// GLCD features // GLCD features
#define LCD_CONTRAST 1 #define LCD_CONTRAST 1
// Uncomment screen orientation // Uncomment screen orientation

12
Marlin/ultralcd_impl_DOGM.h
View File

@ -220,14 +220,14 @@ void lcd_printPGM(const char* str) {
// Initialize or re-initializw the LCD // Initialize or re-initializw the LCD
static void lcd_implementation_init() { static void lcd_implementation_init() {
#if defined(LCD_PIN_BL) && LCD_PIN_BL > -1 // Enable LCD backlight #if PIN_EXISTS(LCD_BACKLIGHT) // Enable LCD backlight
pinMode(LCD_PIN_BL, OUTPUT); pinMode(LCD_BACKLIGHT_PIN, OUTPUT);
digitalWrite(LCD_PIN_BL, HIGH); digitalWrite(LCD_BACKLIGHT_PIN, HIGH);
#endif #endif
#if defined(LCD_PIN_RESET) && LCD_PIN_RESET > -1 #if PIN_EXISTS(LCD_RESET)
pinMode(LCD_PIN_RESET, OUTPUT); pinMode(LCD_RESET_PIN, OUTPUT);
digitalWrite(LCD_PIN_RESET, HIGH); digitalWrite(LCD_RESET_PIN, HIGH);
#endif #endif
#if DISABLED(MINIPANEL) // setContrast not working for Mini Panel #if DISABLED(MINIPANEL) // setContrast not working for Mini Panel