Browse Source

Apply spacing in pins files

pull/1/head
Scott Lahteine 6 years ago
parent
commit
436e5b7ea3
  1. 4
      Marlin/src/pins/pins_AZTEEG_X3.h
  2. 5
      Marlin/src/pins/pins_AZTEEG_X3_PRO.h
  3. 12
      Marlin/src/pins/pins_BIQU_BQ111_A4.h
  4. 0
      Marlin/src/pins/pins_BRAINWAVE.h
  5. 0
      Marlin/src/pins/pins_BRAINWAVE_PRO.h
  6. 26
      Marlin/src/pins/pins_ELEFU_3.h
  7. 1
      Marlin/src/pins/pins_GEN3_MONOLITHIC.h
  8. 6
      Marlin/src/pins/pins_MELZI_CREALITY.h
  9. 6
      Marlin/src/pins/pins_MELZI_MALYAN.h
  10. 2
      Marlin/src/pins/pins_MIGHTYBOARD_REVE.h
  11. 2
      Marlin/src/pins/pins_MINITRONICS.h
  12. 12
      Marlin/src/pins/pins_MKS_SBASE.h
  13. 0
      Marlin/src/pins/pins_PRINTRBOARD.h
  14. 2
      Marlin/src/pins/pins_RAMBO.h
  15. 14
      Marlin/src/pins/pins_RAMPS.h
  16. 17
      Marlin/src/pins/pins_RAMPS_RE_ARM.h
  17. 0
      Marlin/src/pins/pins_SAV_MKI.h
  18. 1
      Marlin/src/pins/pins_STM32F1R.h
  19. 1
      Marlin/src/pins/pins_STM3R_MINI.h
  20. 0
      Marlin/src/pins/pins_TEENSY2.h
  21. 40
      Marlin/src/pins/pins_THE_BORG.h
  22. 2
      Marlin/src/pins/pins_ULTIMAKER.h

4
Marlin/src/pins/pins_AZTEEG_X3.h

@ -33,7 +33,7 @@
#endif
#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
#define CASE_LIGHT_PIN 6 // must define it here or else RAMPS will define it
#define CASE_LIGHT_PIN 6 // Define before RAMPS pins include
#endif
#define BOARD_NAME "Azteeg X3"
@ -91,7 +91,7 @@
#undef SCL
#if SERVO0_PIN == 7
#undef SERVO0_PIN
#def SERVO0_PIN 11
#define SERVO0_PIN 11
#endif
#define SPINDLE_LASER_PWM_PIN 7 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 20 // Pin should have a pullup!

5
Marlin/src/pins/pins_AZTEEG_X3_PRO.h

@ -29,10 +29,9 @@
#endif
#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
#define CASE_LIGHT_PIN 44 // must define it here or else RAMPS will define it
#define CASE_LIGHT_PIN 44 // Define before RAMPS pins include
#endif
#define BOARD_NAME "Azteeg X3 Pro"
#include "pins_RAMPS.h"
@ -162,7 +161,7 @@
#undef SPINDLE_LASER_ENABLE_PIN
#undef SPINDLE_DIR_PIN
#if ENABLED(SPINDLE_LASER_ENABLE) // use EXP2 header
#if ENABLED(SPINDLE_LASER_ENABLE) // EXP2 header
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
#undef BTN_EN2
#define BTN_EN2 31 // need 7 for the spindle speed PWM

12
Marlin/src/pins/pins_BIQU_BQ111_A4.h

@ -41,12 +41,12 @@
//
// Limit Switches
//
#define X_MIN_PIN P1_24 //10k pullup to 3.3V, 1K series
#define X_MAX_PIN P1_25 //10k pullup to 3.3V, 1K series
#define Y_MIN_PIN P1_26 //10k pullup to 3.3V, 1K series
#define Y_MAX_PIN P1_27 //10k pullup to 3.3V, 1K series
#define Z_MIN_PIN P1_28 //10k pullup to 3.3V, 1K series
#define Z_MAX_PIN P1_29 //10k pullup to 3.3V, 1K series
#define X_MIN_PIN P1_24 // 10k pullup to 3.3V, 1K series
#define X_MAX_PIN P1_25 // 10k pullup to 3.3V, 1K series
#define Y_MIN_PIN P1_26 // 10k pullup to 3.3V, 1K series
#define Y_MAX_PIN P1_27 // 10k pullup to 3.3V, 1K series
#define Z_MIN_PIN P1_28 // 10k pullup to 3.3V, 1K series
#define Z_MAX_PIN P1_29 // 10k pullup to 3.3V, 1K series
//

0
Marlin/src/pins/pins_BRAINWAVE.h

0
Marlin/src/pins/pins_BRAINWAVE_PRO.h

26
Marlin/src/pins/pins_ELEFU_3.h

@ -122,21 +122,21 @@
#define TLC_XLAT_PIN 22
#define TLC_DATA_PIN 24
// We also need to define pin to port number mapping for the 2560 to match the pins listed above. If you change the TLC pins, update this as well per the 2560 datasheet!
// This currently only works with the RA Board.
#define TLC_CLOCK_BIT 3 // bit 3 on port A
#define TLC_CLOCK_PORT &PORTA // bit 3 on port A
// We also need to define pin to port number mapping for the 2560 to match the pins listed above.
// If you change the TLC pins, update this as well per the 2560 datasheet! This currently only works with the RA Board.
#define TLC_CLOCK_BIT 3
#define TLC_CLOCK_PORT &PORTA
#define TLC_BLANK_BIT 1 // bit 1 on port A
#define TLC_BLANK_PORT &PORTA // bit 1 on port A
#define TLC_BLANK_BIT 1
#define TLC_BLANK_PORT &PORTA
#define TLC_DATA_BIT 2 // bit 2 on port A
#define TLC_DATA_PORT &PORTA // bit 2 on port A
#define TLC_DATA_BIT 2
#define TLC_DATA_PORT &PORTA
#define TLC_XLAT_BIT 0 // bit 0 on port A
#define TLC_XLAT_PORT &PORTA // bit 0 on port A
#define TLC_XLAT_BIT 0
#define TLC_XLAT_PORT &PORTA
// change this to match your situation. Lots of TLCs takes up the arduino SRAM very quickly, so be careful
// Change this to match your situation. Lots of TLCs takes up the arduino SRAM very quickly, so be careful
// Leave it at at least 1 if you have enabled RA_LIGHTING
// The number of TLC5947 boards chained together for use with the animation, additional ones will repeat the animation on them, but are not individually addressable and mimic those before them. You can leave the default at 2 even if you only have 1 TLC5947 module.
#define NUM_TLCS 2
@ -144,6 +144,6 @@
// These TRANS_ARRAY values let you change the order the LEDs on the lighting modules will animate for chase functions.
// Modify them according to your specific situation.
// NOTE: the array should be 8 long for every TLC you have. These defaults assume (2) TLCs.
#define TRANS_ARRAY {0, 1, 2, 3, 4, 5, 6, 7, 15, 14, 13, 12, 11, 10, 9, 8} //forwards
//#define TRANS_ARRAY {7, 6, 5, 4, 3, 2, 1, 0, 8, 9, 10, 11, 12, 13, 14, 15} //backwards
#define TRANS_ARRAY { 0, 1, 2, 3, 4, 5, 6, 7, 15, 14, 13, 12, 11, 10, 9, 8 } // forward
//#define TRANS_ARRAY { 7, 6, 5, 4, 3, 2, 1, 0, 8, 9, 10, 11, 12, 13, 14, 15 } // backward
#endif // RA_DISCO

1
Marlin/src/pins/pins_GEN3_MONOLITHIC.h

@ -98,4 +98,3 @@
#define PS_ON_PIN 14 // Alex, does this work on the card?
// Alex extras from Gen3+

6
Marlin/src/pins/pins_MELZI_CREALITY.h

@ -48,9 +48,9 @@
#undef FIL_RUNOUT_PIN
#define LCD_SDSS 31 // Smart Controller SD card reader (rather than the Melzi)
#define LCD_PINS_RS 28 // st9720 CS
#define LCD_PINS_ENABLE 17 // st9720 DAT
#define LCD_PINS_D4 30 // st9720 CLK
#define LCD_PINS_RS 28 // ST9720 CS
#define LCD_PINS_ENABLE 17 // ST9720 DAT
#define LCD_PINS_D4 30 // ST9720 CLK
#define FIL_RUNOUT_PIN -1 // Uses Beeper/LED Pin Pulled to GND
// Alter timing for graphical display

6
Marlin/src/pins/pins_MELZI_MALYAN.h

@ -35,9 +35,9 @@
#undef BTN_EN2
#undef BTN_ENC
#define LCD_PINS_RS 17 // st9720 CS
#define LCD_PINS_ENABLE 16 // st9720 DAT
#define LCD_PINS_D4 11 // st9720 CLK
#define LCD_PINS_RS 17 // ST9720 CS
#define LCD_PINS_ENABLE 16 // ST9720 DAT
#define LCD_PINS_D4 11 // ST9720 CLK
#define BTN_EN1 30
#define BTN_EN2 29
#define BTN_ENC 28

2
Marlin/src/pins/pins_MIGHTYBOARD_REVE.h

@ -272,8 +272,6 @@
#define SPINDLE_DIR_PIN 67 // K5
// Check if all pins are defined in mega/pins_arduino.h
#include <Arduino.h>
static_assert(NUM_DIGITAL_PINS > MAX_PIN, "add missing pins to [arduino dir]/hardware/arduino/avr/variants/mega/pins_arduino.h based on fastio.h"

2
Marlin/src/pins/pins_MINITRONICS.h

@ -136,7 +136,7 @@
#define HEATER_BED_PIN 4 // won't compile
#define TEMP_BED_PIN 50
#define TEMP_0_PIN 51
#define SPINDLE_LASER_ENABLE_PIN 52 // using A6 because it already has a pull up on it
#define SPINDLE_LASER_ENABLE_PIN 52 // using A6 because it already has a pullup
#define SPINDLE_LASER_PWM_PIN 3 // WARNING - LED & resistor pull up to +12/+24V stepper voltage
#define SPINDLE_DIR_PIN 53
#endif

12
Marlin/src/pins/pins_MKS_SBASE.h

@ -52,12 +52,12 @@
//
// Limit Switches
//
#define X_MIN_PIN P1_24 //10k pullup to 3.3V, 1K series
#define X_MAX_PIN P1_25 //10k pullup to 3.3V, 1K series
#define Y_MIN_PIN P1_26 //10k pullup to 3.3V, 1K series
#define Y_MAX_PIN P1_27 //10k pullup to 3.3V, 1K series
#define Z_MIN_PIN P1_28 //The original Mks Sbase DIO19 has a 10k pullup to 3.3V or 5V, 1K series, so when using a Zprobe we must use DIO41 (J8 P1.22)
#define Z_MAX_PIN P1_29 //10k pullup to 3.3V, 1K series
#define X_MIN_PIN P1_24 // 10k pullup to 3.3V, 1K series
#define X_MAX_PIN P1_25 // 10k pullup to 3.3V, 1K series
#define Y_MIN_PIN P1_26 // 10k pullup to 3.3V, 1K series
#define Y_MAX_PIN P1_27 // 10k pullup to 3.3V, 1K series
#define Z_MIN_PIN P1_28 // The original Mks Sbase DIO19 has a 10k pullup to 3.3V or 5V, 1K series, so when using a Zprobe we must use DIO41 (J8 P1.22)
#define Z_MAX_PIN P1_29 // 10k pullup to 3.3V, 1K series
//
// Steppers

0
Marlin/src/pins/pins_PRINTRBOARD.h

2
Marlin/src/pins/pins_RAMBO.h

@ -107,7 +107,7 @@
#define E1_MS2_PIN 64
#define DIGIPOTSS_PIN 38
#define DIGIPOT_CHANNELS {4,5,3,0,1} // X Y Z E0 E1 digipot channels to stepper driver mapping
#define DIGIPOT_CHANNELS { 4,5,3,0,1 } // X Y Z E0 E1 digipot channels to stepper driver mapping
#ifndef DIGIPOT_MOTOR_CURRENT
#define DIGIPOT_MOTOR_CURRENT { 135,135,135,135,135 } // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
#endif

14
Marlin/src/pins/pins_RAMPS.h

@ -44,16 +44,8 @@
* 7 | 11
*/
#if ENABLED(TARGET_LPC1768)
#error "Oops! Set MOTHERBOARD to an LPC1768-based board when building for LPC1768."
#elif defined(__STM32F1__)
#error "Oops! Set MOTHERBOARD to an STM32F1-based board when building for STM32F1."
#endif
#if DISABLED(IS_RAMPS_SMART) && DISABLED(IS_RAMPS_DUO) && DISABLED(IS_RAMPS4DUE) && DISABLED(TARGET_LPC1768)
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
#error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu."
#endif
#endif
#ifndef BOARD_NAME
@ -547,10 +539,6 @@
#define ADC_KEYPAD_PIN 12
#elif ENABLED(AZSMZ_12864)
// Pins only defined for RAMPS_SMART currently
#else
// Beeper on AUX-4

17
Marlin/src/pins/pins_RAMPS_RE_ARM.h

@ -120,15 +120,14 @@
// Temperature Sensors
// 3.3V max when defined as an analog input
//
#define TEMP_0_PIN 0 //A0 (T0) - (67) - TEMP_0_PIN
#define TEMP_BED_PIN 1 //A1 (T1) - (68) - TEMP_BED_PIN
#define TEMP_1_PIN 2 //A2 (T2) - (69) - TEMP_1_PIN
#define TEMP_2_PIN 3 //A3 - (63) - J5-3 & AUX-2
#define TEMP_3_PIN 4 //A4 - (37) - BUZZER_PIN
//#define TEMP_4_PIN 5 //A5 - (49) - SD_DETECT_PIN
//#define ?? 6 //A6 - ( 0) - RXD0 - J4-4 & AUX-1
#define FILWIDTH_PIN 7 //A7 - ( 1) - TXD0 - J4-5 & AUX-1
#define TEMP_0_PIN 0 // A0 (T0) - (67) - TEMP_0_PIN
#define TEMP_BED_PIN 1 // A1 (T1) - (68) - TEMP_BED_PIN
#define TEMP_1_PIN 2 // A2 (T2) - (69) - TEMP_1_PIN
#define TEMP_2_PIN 3 // A3 - (63) - J5-3 & AUX-2
#define TEMP_3_PIN 4 // A4 - (37) - BUZZER_PIN
//#define TEMP_4_PIN 5 // A5 - (49) - SD_DETECT_PIN
//#define ?? 6 // A6 - ( 0) - RXD0 - J4-4 & AUX-1
#define FILWIDTH_PIN 7 // A7 - ( 1) - TXD0 - J4-5 & AUX-1
//
// Augmentation for auto-assigning RAMPS plugs

0
Marlin/src/pins/pins_SAV_MKI.h

1
Marlin/src/pins/pins_STM32F1R.h

@ -280,4 +280,3 @@
#define U_MIN_PIN -1
#define V_MIN_PIN -1
#define W_MIN_PIN -1

1
Marlin/src/pins/pins_STM3R_MINI.h

@ -289,4 +289,3 @@
#define U_MIN_PIN -1
#define V_MIN_PIN -1
#define W_MIN_PIN -1

0
Marlin/src/pins/pins_TEENSY2.h

40
Marlin/src/pins/pins_THE_BORG.h

@ -72,7 +72,7 @@
//
#define STEPPER_ENABLE_PIN _STM32_PIN(PORTE, 0)
#define X_STEP_PIN _STM32_PIN(PORTC, 6) //96, 39 in arduino
#define X_STEP_PIN _STM32_PIN(PORTC, 6) // 96, 39 in Arduino
#define X_DIR_PIN _STM32_PIN(PORTC, 7)
#define X_ENABLE_PIN _STM32_PIN(PORTC, 8)
@ -147,8 +147,8 @@
// Misc. Functions
//
//#define CASE_LIGHT_PIN_CI _STM32_PIN(PORTF, 13) //
//#define CASE_LIGHT_PIN_DO _STM32_PIN(PORTF, 14) //
//#define CASE_LIGHT_PIN_CI _STM32_PIN(PORTF, 13)
//#define CASE_LIGHT_PIN_DO _STM32_PIN(PORTF, 14)
//#define NEOPIXEL_PIN _STM32_PIN(PORTF, 13)
//
@ -168,29 +168,29 @@
#define SDSS _STM32_PIN(PORTA, 8)
#define SS_PIN _STM32_PIN(PORTA, 8)
#define LED_PIN _STM32_PIN(PORTA, 2) //Alive
#define LED_PIN _STM32_PIN(PORTA, 2) // Alive
#define PS_ON_PIN _STM32_PIN(PORTA, 3)
#define KILL_PIN -1//_STM32_PIN(PORTD, 5) //EXP2-10
#define PWR_LOSS _STM32_PIN(PORTG, 5) //Power loss / nAC_FAULT
#define KILL_PIN -1//_STM32_PIN(PORTD, 5) // EXP2-10
#define PWR_LOSS _STM32_PIN(PORTG, 5) // Power loss / nAC_FAULT
//
// MAX7219_DEBUG
//
#define MAX7219_CLK_PIN _STM32_PIN(PORTG, 10) //EXP1-1
#define MAX7219_DIN_PIN _STM32_PIN(PORTD, 7) //EXP1-3
#define MAX7219_LOAD_PIN _STM32_PIN(PORTD, 1) //EXP1-5
#define MAX7219_CLK_PIN _STM32_PIN(PORTG, 10) // EXP1-1
#define MAX7219_DIN_PIN _STM32_PIN(PORTD, 7) // EXP1-3
#define MAX7219_LOAD_PIN _STM32_PIN(PORTD, 1) // EXP1-5
//
// LCD / Controller
//
//#define SD_DETECT_PIN -1 //_STM32_PIN(PORTB, 6)) //EXP2-4
#define BEEPER_PIN _STM32_PIN(PORTG, 10) //EXP1-1
#define LCD_PINS_RS _STM32_PIN(PORTG, 9) //EXP1-4
#define LCD_PINS_ENABLE _STM32_PIN(PORTD, 7) //EXP1-3
#define LCD_PINS_D4 _STM32_PIN(PORTD, 1) //EXP1-5
#define LCD_PINS_D5 _STM32_PIN(PORTF, 0) //EXP1-6
#define LCD_PINS_D6 _STM32_PIN(PORTD, 3) //EXP1-7
#define LCD_PINS_D7 _STM32_PIN(PORTD, 4) //EXP1-8
#define BTN_EN1 _STM32_PIN(PORTD, 6) //EXP2-5
#define BTN_EN2 _STM32_PIN(PORTD, 0) //EXP2-3
#define BTN_ENC _STM32_PIN(PORTG, 11) //EXP1-2
//#define SD_DETECT_PIN -1 //_STM32_PIN(PORTB, 6)) // EXP2-4
#define BEEPER_PIN _STM32_PIN(PORTG, 10) // EXP1-1
#define LCD_PINS_RS _STM32_PIN(PORTG, 9) // EXP1-4
#define LCD_PINS_ENABLE _STM32_PIN(PORTD, 7) // EXP1-3
#define LCD_PINS_D4 _STM32_PIN(PORTD, 1) // EXP1-5
#define LCD_PINS_D5 _STM32_PIN(PORTF, 0) // EXP1-6
#define LCD_PINS_D6 _STM32_PIN(PORTD, 3) // EXP1-7
#define LCD_PINS_D7 _STM32_PIN(PORTD, 4) // EXP1-8
#define BTN_EN1 _STM32_PIN(PORTD, 6) // EXP2-5
#define BTN_EN2 _STM32_PIN(PORTD, 0) // EXP2-3
#define BTN_ENC _STM32_PIN(PORTG, 11) // EXP1-2

2
Marlin/src/pins/pins_ULTIMAKER.h

@ -43,7 +43,7 @@
//
// Servos
//
#define SERVO0_PIN 13 // untested
#define SERVO0_PIN 13 // UNTESTED
//
// Limit Switches

Loading…
Cancel
Save