From f03e06375068643d640dee4a2bed9f8f9e383589 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 30 Jul 2015 23:19:11 -0700 Subject: [PATCH] Rename BEEPER to BEEPER_PIN For consistency with other pins, allowing use of `PIN_EXISTS` macro. --- Marlin/pins_GEN7_CUSTOM.h | 20 ++++++++++---------- Marlin/pins_OMCA_A.h | 28 ++++++++++++++-------------- Marlin/pins_RAMPS_13.h | 6 +++--- Marlin/pins_RUMBA.h | 34 +++++++++++++++++----------------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/Marlin/pins_GEN7_CUSTOM.h b/Marlin/pins_GEN7_CUSTOM.h index 2183291b4..51aaac095 100644 --- a/Marlin/pins_GEN7_CUSTOM.h +++ b/Marlin/pins_GEN7_CUSTOM.h @@ -13,34 +13,34 @@ #define X_STEP_PIN 21 // different from standard GEN7 #define X_DIR_PIN 20 // different from standard GEN7 #define X_ENABLE_PIN 24 -#define X_STOP_PIN 0 +#define X_STOP_PIN 0 //y axis pins #define Y_STEP_PIN 23 #define Y_DIR_PIN 22 #define Y_ENABLE_PIN 24 -#define Y_STOP_PIN 1 +#define Y_STOP_PIN 1 //z axis pins #define Z_STEP_PIN 26 #define Z_DIR_PIN 25 #define Z_ENABLE_PIN 24 -#define Z_STOP_PIN 2 +#define Z_STOP_PIN 2 //extruder pins #define E0_STEP_PIN 28 #define E0_DIR_PIN 27 #define E0_ENABLE_PIN 24 -#define TEMP_0_PIN 2 +#define TEMP_0_PIN 2 #define TEMP_1_PIN -1 #define TEMP_2_PIN -1 -#define TEMP_BED_PIN 1 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 34 bed) +#define TEMP_BED_PIN 1 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 34 bed) -#define HEATER_0_PIN 4 +#define HEATER_0_PIN 4 #define HEATER_1_PIN -1 #define HEATER_2_PIN -1 -#define HEATER_BED_PIN 3 // (bed) +#define HEATER_BED_PIN 3 // (bed) #define SDPOWER -1 #define SDSS 31 // SCL pin of I2C header || CS Pin for SD Card support @@ -56,9 +56,9 @@ //#define TX_ENABLE_PIN 12 //#define RX_ENABLE_PIN 13 -#define BEEPER_PIN -1 -#define SD_DETECT_PIN -1 -#define SUICIDE_PIN -1 //has to be defined; otherwise Power_off doesn't work +#define BEEPER_PIN -1 +#define SD_DETECT_PIN -1 +#define SUICIDE_PIN -1 //has to be defined; otherwise Power_off doesn't work #define KILL_PIN -1 //Pins for 4bit LCD Support diff --git a/Marlin/pins_OMCA_A.h b/Marlin/pins_OMCA_A.h index 618de120c..d5f863b00 100644 --- a/Marlin/pins_OMCA_A.h +++ b/Marlin/pins_OMCA_A.h @@ -35,39 +35,39 @@ #define X_STEP_PIN 21 #define X_DIR_PIN 20 #define X_ENABLE_PIN 24 -#define X_STOP_PIN 0 +#define X_STOP_PIN 0 #define Y_STEP_PIN 23 #define Y_DIR_PIN 22 #define Y_ENABLE_PIN 24 -#define Y_STOP_PIN 1 +#define Y_STOP_PIN 1 #define Z_STEP_PIN 26 #define Z_DIR_PIN 25 #define Z_ENABLE_PIN 24 -#define Z_STOP_PIN 2 +#define Z_STOP_PIN 2 -#define E0_STEP_PIN 28 -#define E0_DIR_PIN 27 -#define E0_ENABLE_PIN 24 +#define E0_STEP_PIN 28 +#define E0_DIR_PIN 27 +#define E0_ENABLE_PIN 24 -#define E1_STEP_PIN -1 // 19 -#define E1_DIR_PIN -1 // 18 -#define E1_ENABLE_PIN 24 +#define E1_STEP_PIN -1 // 19 +#define E1_DIR_PIN -1 // 18 +#define E1_ENABLE_PIN 24 -#define E2_STEP_PIN -1 // 17 -#define E2_DIR_PIN -1 // 16 -#define E2_ENABLE_PIN 24 +#define E2_STEP_PIN -1 // 17 +#define E2_DIR_PIN -1 // 16 +#define E2_ENABLE_PIN 24 #define SDPOWER -1 #define SDSS 11 #define SD_DETECT_PIN -1 // 10 optional also used as mode pin #define LED_PIN -1 -#define FAN_PIN 3 +#define FAN_PIN 3 #define PS_ON_PIN -1 #define KILL_PIN -1 -#define HEATER_0_PIN 4 +#define HEATER_0_PIN 4 #define HEATER_1_PIN -1 // 12 #define HEATER_2_PIN -1 // 13 #define TEMP_0_PIN 0 //D27 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! diff --git a/Marlin/pins_RAMPS_13.h b/Marlin/pins_RAMPS_13.h index c2b4af185..be3d105c3 100644 --- a/Marlin/pins_RAMPS_13.h +++ b/Marlin/pins_RAMPS_13.h @@ -117,10 +117,10 @@ #if MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF) #define HEATER_BED_PIN -1 // NO BED #else - #define HEATER_BED_PIN 8 // BED + #define HEATER_BED_PIN 8 // BED #endif -#define TEMP_BED_PIN 14 // ANALOG NUMBERING +#define TEMP_BED_PIN 14 // ANALOG NUMBERING #if HAS_SERVOS #define SERVO0_PIN 11 @@ -136,7 +136,7 @@ #endif #if ENABLED(Z_PROBE_SLED) - #define SLED_PIN -1 + #define SLED_PIN -1 #endif #if ENABLED(ULTRA_LCD) diff --git a/Marlin/pins_RUMBA.h b/Marlin/pins_RUMBA.h index 8f114a846..3b6c7adf6 100644 --- a/Marlin/pins_RUMBA.h +++ b/Marlin/pins_RUMBA.h @@ -42,41 +42,41 @@ #define LED_PIN 13 -#define FAN_PIN 7 -#define FAN1_PIN 8 +#define FAN_PIN 7 +#define FAN1_PIN 8 #define PS_ON_PIN 45 #define KILL_PIN 46 #if (TEMP_SENSOR_0==0) - #define TEMP_0_PIN -1 - #define HEATER_0_PIN -1 + #define TEMP_0_PIN -1 + #define HEATER_0_PIN -1 #else - #define HEATER_0_PIN 2 // EXTRUDER 1 + #define HEATER_0_PIN 2 // EXTRUDER 1 #if (TEMP_SENSOR_0==-1) - #define TEMP_0_PIN 6 // ANALOG NUMBERING - connector *K1* on RUMBA thermocouple ADD ON is used + #define TEMP_0_PIN 6 // ANALOG NUMBERING - connector *K1* on RUMBA thermocouple ADD ON is used #else #define TEMP_0_PIN 15 // ANALOG NUMBERING - default connector for thermistor *T0* on rumba board is used #endif #endif #if (TEMP_SENSOR_1==0) - #define TEMP_1_PIN -1 - #define HEATER_1_PIN -1 + #define TEMP_1_PIN -1 + #define HEATER_1_PIN -1 #else - #define HEATER_1_PIN 3 // EXTRUDER 2 + #define HEATER_1_PIN 3 // EXTRUDER 2 #if (TEMP_SENSOR_1==-1) - #define TEMP_1_PIN 5 // ANALOG NUMBERING - connector *K2* on RUMBA thermocouple ADD ON is used + #define TEMP_1_PIN 5 // ANALOG NUMBERING - connector *K2* on RUMBA thermocouple ADD ON is used #else #define TEMP_1_PIN 14 // ANALOG NUMBERING - default connector for thermistor *T1* on rumba board is used #endif #endif #if (TEMP_SENSOR_2==0) - #define TEMP_2_PIN -1 - #define HEATER_2_PIN -1 + #define TEMP_2_PIN -1 + #define HEATER_2_PIN -1 #else - #define HEATER_2_PIN 6 // EXTRUDER 3 + #define HEATER_2_PIN 6 // EXTRUDER 3 #if (TEMP_SENSOR_2==-1) #define TEMP_2_PIN 7 // ANALOG NUMBERING - connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_BED is defined as thermocouple #else @@ -88,14 +88,14 @@ //optional FAN1 can be used as 4th heater output: #define HEATER_3_PIN 8 // EXTRUDER 4 #if (TEMP_SENSOR_BED==0) - #define TEMP_BED_PIN -1 - #define HEATER_BED_PIN -1 + #define TEMP_BED_PIN -1 + #define HEATER_BED_PIN -1 #else - #define HEATER_BED_PIN 9 // BED + #define HEATER_BED_PIN 9 // BED #if (TEMP_SENSOR_BED==-1) #define TEMP_BED_PIN 7 // ANALOG NUMBERING - connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_2 is defined as thermocouple #else - #define TEMP_BED_PIN 11 // ANALOG NUMBERING - default connector for thermistor *THB* on rumba board is used + #define TEMP_BED_PIN 11 // ANALOG NUMBERING - default connector for thermistor *THB* on rumba board is used #endif #endif