From c272f2c84eb68e1cb100a933c113fd41a8035c97 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 27 Sep 2017 05:10:57 -0500 Subject: [PATCH] Cleanup pins spacing --- Marlin/src/pins/pins.h | 2 +- Marlin/src/pins/pinsDebug_list.h | 2 +- Marlin/src/pins/pins_DUE3DOM.h | 6 +++--- Marlin/src/pins/pins_DUE3DOM_MINI.h | 6 +++--- Marlin/src/pins/pins_RAMPS.h | 4 ++-- Marlin/src/pins/pins_RAMPS_RE_ARM.h | 20 ++++++++++---------- Marlin/src/pins/pins_TEENSY35_36.h | 24 ++++++++++++------------ 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index ae2a8eae12..2ed0a5c81b 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -45,7 +45,7 @@ #define IS_RAMPS_EFF #elif MB(RAMPS_13_EEF) || MB(RAMPS_14_EEF) || MB(RAMPS_14_RE_ARM_EEF) || MB(RAMPS_SMART_EEF) || MB(RAMPS_DUO_EEF) || MB(RAMPS4DUE_EEF) #define IS_RAMPS_EEF -#elif MB(RAMPS_13_SF) || MB(RAMPS_14_SF) || MB(RAMPS_14_RE_ARM_SF) || MB(RAMPS_SMART_SF) || MB(RAMPS_DUO_SF) || MB(RAMPS4DUE_SF) +#elif MB(RAMPS_13_SF) || MB(RAMPS_14_SF) || MB(RAMPS_14_RE_ARM_SF) || MB(RAMPS_SMART_SF) || MB(RAMPS_DUO_SF) || MB(RAMPS4DUE_SF) #define IS_RAMPS_SF #endif diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h index 5e8cb96af1..d41fee578e 100644 --- a/Marlin/src/pins/pinsDebug_list.h +++ b/Marlin/src/pins/pinsDebug_list.h @@ -358,7 +358,7 @@ #endif #if PIN_EXISTS(FAN) REPORT_NAME_DIGITAL(FAN_PIN, __LINE__ ) -#endif +#endif #if PIN_EXISTS(FAN1) REPORT_NAME_DIGITAL(FAN1_PIN, __LINE__ ) #endif diff --git a/Marlin/src/pins/pins_DUE3DOM.h b/Marlin/src/pins/pins_DUE3DOM.h index 2ed2731114..06e73ac8e7 100644 --- a/Marlin/src/pins/pins_DUE3DOM.h +++ b/Marlin/src/pins/pins_DUE3DOM.h @@ -123,7 +123,7 @@ #define BTN_EN1 50 #define BTN_EN2 52 - #define BTN_ENC 48 + #define BTN_ENC 48 #define SDSS 4 #define SD_DETECT_PIN 14 @@ -135,9 +135,9 @@ #define BTN_EN1 50 #define BTN_EN2 52 #define BTN_ENC 48 - + #define BTN_BACK 71 - + #undef SDSS #define SDSS 4 #define SD_DETECT_PIN 14 diff --git a/Marlin/src/pins/pins_DUE3DOM_MINI.h b/Marlin/src/pins/pins_DUE3DOM_MINI.h index 71232ad36d..c3523fc41d 100644 --- a/Marlin/src/pins/pins_DUE3DOM_MINI.h +++ b/Marlin/src/pins/pins_DUE3DOM_MINI.h @@ -115,7 +115,7 @@ #define BTN_EN1 50 #define BTN_EN2 52 - #define BTN_ENC 48 + #define BTN_ENC 48 #define SDSS 4 #define SD_DETECT_PIN 14 @@ -127,9 +127,9 @@ #define BTN_EN1 50 #define BTN_EN2 52 #define BTN_ENC 48 - + #define BTN_BACK 71 - + #undef SDSS #define SDSS 4 #define SD_DETECT_PIN 14 diff --git a/Marlin/src/pins/pins_RAMPS.h b/Marlin/src/pins/pins_RAMPS.h index 8cc121e228..d0795ce109 100644 --- a/Marlin/src/pins/pins_RAMPS.h +++ b/Marlin/src/pins/pins_RAMPS.h @@ -46,8 +46,8 @@ #if ENABLED(IS_REARM) #error "Oops! use 'pins_RAMPS_RE_ARM.h' when Re-Arm is used." -#endif - +#endif + #if !ENABLED(IS_RAMPS_SMART) && !ENABLED(IS_RAMPS_DUO) && !ENABLED(IS_RAMPS4DUE) && !ENABLED(TARGET_LPC1768) #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) #error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu." diff --git a/Marlin/src/pins/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/pins_RAMPS_RE_ARM.h index aa4c851538..9538649944 100644 --- a/Marlin/src/pins/pins_RAMPS_RE_ARM.h +++ b/Marlin/src/pins/pins_RAMPS_RE_ARM.h @@ -248,12 +248,12 @@ #define DOGLCD_CS 63 // J5-3 & AUX-2 #ifdef ULTIPANEL - + #define LCD_PINS_D5 71 // ENET_MDIO #define LCD_PINS_D6 73 // ENET_RX_ER #define LCD_PINS_D7 75 // ENET_RXD1 #endif - + #if ENABLED(NEWPANEL) #if ENABLED(REPRAPWORLD_KEYPAD) #define SHIFT_OUT 51 // (MOSI) J3-10 & AUX-3 @@ -287,12 +287,12 @@ #if ENABLED(VIKI2) || ENABLED(miniVIKI) // #define LCD_SCREEN_ROT_180 - + #define SOFTWARE_SPI // temp to see if it fixes the "not found" error - + #undef BEEPER_PIN #define BEEPER_PIN 37 // may change if cable changes - + #define BTN_EN1 31 // J3-2 & AUX-4 #define BTN_EN2 33 // J3-4 & AUX-4 #define BTN_ENC 35 // J3-3 & AUX-4 @@ -301,7 +301,7 @@ #define KILL_PIN 41 // J5-4 & AUX-4 #undef DOGLCD_CS - #define DOGLCD_CS 16 + #define DOGLCD_CS 16 #undef LCD_BACKLIGHT_PIN //16 // J3-7 & AUX-4 - only used on DOGLCD controllers #undef LCD_PINS_ENABLE //51 // (MOSI) J3-10 & AUX-3 #undef LCD_PINS_D4 //52 // (SCK) J3-9 & AUX-3 @@ -310,9 +310,9 @@ #define DOGLCD_A0 59 // J3-8 & AUX-2 #undef LCD_PINS_D6 //63 // J5-3 & AUX-2 #undef LCD_PINS_D7 //6 // (SERVO1) J5-1 & SERVO connector - #define DOGLCD_SCK SCK_PIN + #define DOGLCD_SCK SCK_PIN #define DOGLCD_MOSI MOSI_PIN - + #define STAT_LED_BLUE_PIN 63 // may change if cable changes #define STAT_LED_RED_PIN 6 // may change if cable changes #endif @@ -320,8 +320,8 @@ //#define MOSI_PIN 51 // system defined J3-10 & AUX-3 //#define SCK_PIN 52 // system defined J3-9 & AUX-3 //#define SS_PIN 53 // system defined J3-5 & AUX-3 - sometimes called SDSS - - + + #if ENABLED(MINIPANEL) // GLCD features //#define LCD_CONTRAST 190 diff --git a/Marlin/src/pins/pins_TEENSY35_36.h b/Marlin/src/pins/pins_TEENSY35_36.h index c838d85863..b61f1ef85a 100644 --- a/Marlin/src/pins/pins_TEENSY35_36.h +++ b/Marlin/src/pins/pins_TEENSY35_36.h @@ -2,7 +2,7 @@ * Teensy 3.5 (MK64FX512) and Teensy 3.6 (MK66FX1M0) Breadboard pin assignments * Requires the Teensyduino software with Teensy 3.5 or Teensy 3.6 selected in Arduino IDE! * http://www.pjrc.com/teensy/teensyduino.html -* +* ****************************************************************************************/ #if MOTHERBOARD == 841 // BOARD_TEENSY35_36 #define KNOWN_BOARD 1 @@ -21,7 +21,7 @@ #define LARGE_FLASH true #define USBCON //1286 // Disable MarlinSerial etc. -/* +/* teemuatlut plan for Teensy3.5 and Teensy3.6: USB @@ -109,22 +109,22 @@ D8 HEATER_BED_PIN CS1 RX4 A12 31 | 46 * * 47 | 34 A15 PWM #define SOL1_PIN 28 #ifndef SDSUPPORT -// these pins are defined in the SD library if building with SD support + // these are defined in the SD library if building with SD support #define SCK_PIN 13 #define MISO_PIN 12 #define MOSI_PIN 11 #endif #ifdef ULTRA_LCD - #define LCD_PINS_RS 40 - #define LCD_PINS_ENABLE 41 - #define LCD_PINS_D4 42 - #define LCD_PINS_D5 43 - #define LCD_PINS_D6 44 - #define LCD_PINS_D7 45 - #define BTN_EN1 46 - #define BTN_EN2 47 - #define BTN_ENC 48 + #define LCD_PINS_RS 40 + #define LCD_PINS_ENABLE 41 + #define LCD_PINS_D4 42 + #define LCD_PINS_D5 43 + #define LCD_PINS_D6 44 + #define LCD_PINS_D7 45 + #define BTN_EN1 46 + #define BTN_EN2 47 + #define BTN_ENC 48 #endif #endif // MOTHERBOARD == 841 (Teensy3.5 and Teensy3.6)