From ba43277429c9b807c636d7155e7017708c4823d1 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 24 Sep 2016 16:26:41 -0500 Subject: [PATCH] Always define status LED pins --- Marlin/pins_AZTEEG_X3.h | 16 +++++++--------- Marlin/pins_AZTEEG_X3_PRO.h | 4 ++-- Marlin/pins_CNCONTROLS_11.h | 4 ++-- Marlin/pins_CNCONTROLS_12.h | 4 ++-- Marlin/pins_MKS_13.h | 4 ++-- Marlin/pins_PRINTRBOARD.h | 8 ++++---- Marlin/pins_PRINTRBOARD_REVF.h | 11 ++++------- Marlin/pins_RAMBO.h | 6 ++---- Marlin/pins_RAMPS.h | 7 +++---- 9 files changed, 28 insertions(+), 36 deletions(-) diff --git a/Marlin/pins_AZTEEG_X3.h b/Marlin/pins_AZTEEG_X3.h index 1d2ebf74e..b7d1e726f 100644 --- a/Marlin/pins_AZTEEG_X3.h +++ b/Marlin/pins_AZTEEG_X3.h @@ -41,16 +41,14 @@ #define DOGLCD_CS 32 #define BTN_ENC 12 - #if ENABLED(TEMP_STAT_LEDS) - #undef STAT_LED_RED_PIN - #undef STAT_LED_BLUE_PIN - #define STAT_LED_RED_PIN 64 - #define STAT_LED_BLUE_PIN 63 - #endif + #undef STAT_LED_RED_PIN + #undef STAT_LED_BLUE_PIN + #define STAT_LED_RED_PIN 64 + #define STAT_LED_BLUE_PIN 63 -#elif ENABLED(TEMP_STAT_LEDS) +#else - #define STAT_LED_RED_PIN 6 - #define STAT_LED_BLUE_PIN 11 + #define STAT_LED_RED_PIN 6 + #define STAT_LED_BLUE_PIN 11 #endif diff --git a/Marlin/pins_AZTEEG_X3_PRO.h b/Marlin/pins_AZTEEG_X3_PRO.h index 4e64e75a7..e59279bd0 100644 --- a/Marlin/pins_AZTEEG_X3_PRO.h +++ b/Marlin/pins_AZTEEG_X3_PRO.h @@ -117,6 +117,6 @@ #undef SD_DETECT_PIN #define SD_DETECT_PIN 49 // For easy adapter board #else - #define STAT_LED_RED_PIN 32 - #define STAT_LED_BLUE_PIN 35 + #define STAT_LED_RED_PIN 32 + #define STAT_LED_BLUE_PIN 35 #endif diff --git a/Marlin/pins_CNCONTROLS_11.h b/Marlin/pins_CNCONTROLS_11.h index 25be66bcc..cd3ce0a11 100644 --- a/Marlin/pins_CNCONTROLS_11.h +++ b/Marlin/pins_CNCONTROLS_11.h @@ -115,5 +115,5 @@ // // Misc. Functions // -#define STAT_LED_BLUE_PIN -1 -#define STAT_LED_RED_PIN 31 +#define STAT_LED_BLUE_PIN -1 +#define STAT_LED_RED_PIN 31 diff --git a/Marlin/pins_CNCONTROLS_12.h b/Marlin/pins_CNCONTROLS_12.h index a64b28a0d..30809c39c 100644 --- a/Marlin/pins_CNCONTROLS_12.h +++ b/Marlin/pins_CNCONTROLS_12.h @@ -111,8 +111,8 @@ //#define UI1 43 //#define UI2 37 -#define STAT_LED_BLUE_PIN -1 -#define STAT_LED_RED_PIN 10 // TOOL_0_PWM_PIN +#define STAT_LED_BLUE_PIN -1 +#define STAT_LED_RED_PIN 10 // TOOL_0_PWM_PIN // // SD Card diff --git a/Marlin/pins_MKS_13.h b/Marlin/pins_MKS_13.h index 94099cb68..0457be78c 100644 --- a/Marlin/pins_MKS_13.h +++ b/Marlin/pins_MKS_13.h @@ -120,9 +120,9 @@ #define BEEPER_PIN 25 // yellow RED-LED - #define STAT_LED_RED_PIN 16 + #define STAT_LED_RED_PIN 16 // white BLUE-LED - #define STAT_LED_BLUE_PIN 17 + #define STAT_LED_BLUE_PIN 17 #endif diff --git a/Marlin/pins_PRINTRBOARD.h b/Marlin/pins_PRINTRBOARD.h index c51a87a58..82b2cdc1c 100644 --- a/Marlin/pins_PRINTRBOARD.h +++ b/Marlin/pins_PRINTRBOARD.h @@ -131,8 +131,8 @@ #define SDSS 45 #define SD_DETECT_PIN -1 // FastIO (Manual says 72 I'm not certain cause I can't test) - #if ENABLED(TEMP_STAT_LEDS) - #define STAT_LED_RED_PIN 12 //Non-FastIO - #define STAT_LED_BLUE_PIN 10 //Non-FastIO - #endif + + #define STAT_LED_RED_PIN 12 //Non-FastIO + #define STAT_LED_BLUE_PIN 10 //Non-FastIO + #endif diff --git a/Marlin/pins_PRINTRBOARD_REVF.h b/Marlin/pins_PRINTRBOARD_REVF.h index 31098e937..548b50612 100644 --- a/Marlin/pins_PRINTRBOARD_REVF.h +++ b/Marlin/pins_PRINTRBOARD_REVF.h @@ -117,21 +117,18 @@ #if ENABLED(VIKI2) || ENABLED(miniVIKI) #define BEEPER_PIN 32 //FastIO - // Pins for DOGM SPI LCD Support #define DOGLCD_A0 42 //Non-FastIO #define DOGLCD_CS 43 //Non-FastIO #define LCD_SCREEN_ROT_180 - //The encoder and click button (FastIO Pins) + // (FastIO Pins) #define BTN_EN1 26 #define BTN_EN2 27 #define BTN_ENC 47 #define SDSS 45 - #define SD_DETECT_PIN -1 // FastIO (Manual says 72 I'm not certain cause I can't test) + #define SD_DETECT_PIN -1 // FastIO (Manual says 72) - #if ENABLED(TEMP_STAT_LEDS) - #define STAT_LED_RED_PIN 12 //Non-FastIO - #define STAT_LED_BLUE_PIN 10 //Non-FastIO - #endif + #define STAT_LED_RED_PIN 12 //Non-FastIO + #define STAT_LED_BLUE_PIN 10 //Non-FastIO #endif diff --git a/Marlin/pins_RAMBO.h b/Marlin/pins_RAMBO.h index 22a28fa17..3379e479a 100755 --- a/Marlin/pins_RAMBO.h +++ b/Marlin/pins_RAMBO.h @@ -169,10 +169,8 @@ #define SD_DETECT_PIN -1 // Pin 72 if using easy adapter board - #if ENABLED(TEMP_STAT_LEDS) - #define STAT_LED_RED_PIN 22 - #define STAT_LED_BLUE_PIN 32 - #endif + #define STAT_LED_RED_PIN 22 + #define STAT_LED_BLUE_PIN 32 #else diff --git a/Marlin/pins_RAMPS.h b/Marlin/pins_RAMPS.h index 9a1b54a13..fdeff374f 100644 --- a/Marlin/pins_RAMPS.h +++ b/Marlin/pins_RAMPS.h @@ -280,10 +280,9 @@ #define KILL_PIN 31 - #if ENABLED(TEMP_STAT_LEDS) - #define STAT_LED_RED_PIN 32 - #define STAT_LED_BLUE_PIN 35 - #endif + #define STAT_LED_RED_PIN 32 + #define STAT_LED_BLUE_PIN 35 + #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) #define BTN_EN1 35 // reverse if the encoder turns the wrong way. #define BTN_EN2 37