thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Apply some pins formatting

Scott Lahteine 4 years ago
parent
b5ef699523
commit
883347bc11
13 changed files with 82 additions and 82 deletions
Unified View Show Diff Stats
  1. 7
    7
      Marlin/src/pins/mega/pins_GT2560_V3_A20.h
  2. 1
    1
      Marlin/src/pins/ramps/pins_3DRAG.h
  3. 5
    5
      Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
  4. 5
    5
      Marlin/src/pins/ramps/pins_DAGOMA_F5.h
  5. 5
    5
      Marlin/src/pins/ramps/pins_K8400.h
  6. 7
    7
      Marlin/src/pins/ramps/pins_MKS_BASE_16.h
  7. 9
    9
      Marlin/src/pins/ramps/pins_RL200.h
  8. 7
    7
      Marlin/src/pins/ramps/pins_TANGO.h
  9. 5
    5
      Marlin/src/pins/ramps/pins_VORON.h
  10. 7
    7
      Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
  11. 6
    6
      Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
  12. 9
    9
      Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h
  13. 9
    9
      Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h

+ 7
- 7
Marlin/src/pins/mega/pins_GT2560_V3_A20.h View File

25 
  * Geeetech A20M pin assignment
 25 
  * Geeetech A20M pin assignment
26 
  */
 26 
  */
27
27
28 
-#define LCD_PINS_RS                           5
29 
-#define LCD_PINS_ENABLE                      36
30 
-#define LCD_PINS_D4                          21
31 
-#define LCD_PINS_D7                           6
28 
+#define LCD_PINS_RS                            5
29 
+#define LCD_PINS_ENABLE                       36
30 
+#define LCD_PINS_D4                           21
31 
+#define LCD_PINS_D7                            6
32
32
33 
 #define SPEAKER  // The speaker can produce tones
 33 
 #define SPEAKER  // The speaker can produce tones
34
34
35 
 #if IS_NEWPANEL
 35 
 #if IS_NEWPANEL
36 
-  #define BTN_EN1                            16
37 
-  #define BTN_EN2                            17
38 
-  #define BTN_ENC                            19
36 
+  #define BTN_EN1                             16
37 
+  #define BTN_EN2                             17
38 
+  #define BTN_ENC                             19
39 
 #endif
 39 
 #endif
40
40
41 
 #include "pins_GT2560_V3.h"
 41 
 #include "pins_GT2560_V3.h"

+ 1
- 1
Marlin/src/pins/ramps/pins_3DRAG.h View File

157 
     #define SPINDLE_LASER_PWM_PIN             46  // Hardware PWM
 157 
     #define SPINDLE_LASER_PWM_PIN             46  // Hardware PWM
158 
     #define SPINDLE_LASER_ENA_PIN             62  // Pullup!
 158 
     #define SPINDLE_LASER_ENA_PIN             62  // Pullup!
159 
     #define SPINDLE_DIR_PIN                   48
 159 
     #define SPINDLE_DIR_PIN                   48
160 
-  #elif !BOTH(IS_ULTRA_LCD, IS_NEWPANEL)             // use expansion header if no LCD in use
160 
+  #elif !BOTH(IS_ULTRA_LCD, IS_NEWPANEL)          // Use expansion header if no LCD in use
161 
     #define SPINDLE_LASER_ENA_PIN             16  // Pullup or pulldown!
 161 
     #define SPINDLE_LASER_ENA_PIN             16  // Pullup or pulldown!
162 
     #define SPINDLE_DIR_PIN                   17
 162 
     #define SPINDLE_DIR_PIN                   17
163 
   #endif
 163 
   #endif

+ 5
- 5
Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h View File

34 
 //
 34 
 //
35 
 // M3/M4/M5 - Spindle/Laser Control
 35 
 // M3/M4/M5 - Spindle/Laser Control
36 
 //
 36 
 //
37 
-#define SPINDLE_LASER_ENA_PIN                66   // Pullup or pulldown!
38 
-#define SPINDLE_DIR_PIN                      67
39 
-#define SPINDLE_LASER_PWM_PIN                44   // Hardware PWM
37 
+#define SPINDLE_LASER_ENA_PIN                 66  // Pullup or pulldown!
38 
+#define SPINDLE_DIR_PIN                       67
39 
+#define SPINDLE_LASER_PWM_PIN                 44  // Hardware PWM
40
40
41 
 #include "pins_RAMPS.h"
 41 
 #include "pins_RAMPS.h"
42
42
45 
 //
 45 
 //
46 
 #undef TEMP_0_PIN
 46 
 #undef TEMP_0_PIN
47 
 #undef TEMP_1_PIN
 47 
 #undef TEMP_1_PIN
48 
-#define TEMP_0_PIN                            9   // Analog Input
49 
-#define TEMP_1_PIN                           11   // Analog Input
48 
+#define TEMP_0_PIN                             9  // Analog Input
49 
+#define TEMP_1_PIN                            11  // Analog Input

+ 5
- 5
Marlin/src/pins/ramps/pins_DAGOMA_F5.h View File

30 
 //
 30 
 //
31 
 // Endstops
 31 
 // Endstops
32 
 //
 32 
 //
33 
-#define X_STOP_PIN                            2
34 
-#define Y_STOP_PIN                            3
35 
-#define Z_STOP_PIN                           15
33 
+#define X_STOP_PIN                             2
34 
+#define Y_STOP_PIN                             3
35 
+#define Z_STOP_PIN                            15
36
36
37 
-#define FIL_RUNOUT_PIN                       39
37 
+#define FIL_RUNOUT_PIN                        39
38 
 #if EXTRUDERS > 1
 38 
 #if EXTRUDERS > 1
39 
-  #define FIL_RUNOUT2_PIN                    14
39 
+  #define FIL_RUNOUT2_PIN                     14
40 
 #endif
 40 
 #endif
41
41
42 
 //
 42 
 //

+ 5
- 5
Marlin/src/pins/ramps/pins_K8400.h View File

40 
 //
 40 
 //
41 
 // Limit Switches
 41 
 // Limit Switches
42 
 //
 42 
 //
43 
-#define X_STOP_PIN                            3
44 
-#define Y_STOP_PIN                           14
43 
+#define X_STOP_PIN                             3
44 
+#define Y_STOP_PIN                            14
45
45
46 
 #undef X_MIN_PIN
 46 
 #undef X_MIN_PIN
47 
 #undef X_MAX_PIN
 47 
 #undef X_MAX_PIN
52 
 // Steppers
 52 
 // Steppers
53 
 //
 53 
 //
54 
 #undef E1_STEP_PIN
 54 
 #undef E1_STEP_PIN
55 
-#define E1_STEP_PIN                          32
55 
+#define E1_STEP_PIN                           32
56
56
57 
 //
 57 
 //
58 
 // Heaters / Fans
 58 
 // Heaters / Fans
59 
 //
 59 
 //
60 
 #undef HEATER_1_PIN
 60 
 #undef HEATER_1_PIN
61 
-#define HEATER_1_PIN                         11
61 
+#define HEATER_1_PIN                          11
62
62
63 
 //
 63 
 //
64 
 // Misc. Functions
 64 
 // Misc. Functions
69
69
70 
 #if Z_STEP_PIN == 26
 70 
 #if Z_STEP_PIN == 26
71 
   #undef Z_STEP_PIN
 71 
   #undef Z_STEP_PIN
72 
-  #define Z_STEP_PIN                         32
72 
+  #define Z_STEP_PIN                          32
73 
 #endif
 73 
 #endif

+ 7
- 7
Marlin/src/pins/ramps/pins_MKS_BASE_16.h View File

30 
 #endif
 30 
 #endif
31
31
32 
 #define BOARD_INFO_NAME "MKS BASE 1.6"
 32 
 #define BOARD_INFO_NAME "MKS BASE 1.6"
33 
-#define MKS_BASE_VERSION                     16
33 
+#define MKS_BASE_VERSION                      16
34
34
35 
 //
 35 
 //
36 
 // Servos
 36 
 // Servos
37 
 //
 37 
 //
38 
-#define SERVO1_PIN                           12   // Digital 12 / Pin 25
38 
+#define SERVO1_PIN                            12  // Digital 12 / Pin 25
39
39
40 
 //
 40 
 //
41 
 // Omitted RAMPS pins
 41 
 // Omitted RAMPS pins
42 
 //
 42 
 //
43 
 #ifndef SERVO2_PIN
 43 
 #ifndef SERVO2_PIN
44 
-  #define SERVO2_PIN                         -1
44 
+  #define SERVO2_PIN                          -1
45 
 #endif
 45 
 #endif
46 
 #ifndef SERVO3_PIN
 46 
 #ifndef SERVO3_PIN
47 
-  #define SERVO3_PIN                         -1
47 
+  #define SERVO3_PIN                          -1
48 
 #endif
 48 
 #endif
49 
 #ifndef FILWIDTH_PIN
 49 
 #ifndef FILWIDTH_PIN
50 
-  #define FILWIDTH_PIN                       -1
50 
+  #define FILWIDTH_PIN                        -1
51 
 #endif
 51 
 #endif
52 
 #ifndef FIL_RUNOUT_PIN
 52 
 #ifndef FIL_RUNOUT_PIN
53 
-  #define FIL_RUNOUT_PIN                     -1
53 
+  #define FIL_RUNOUT_PIN                      -1
54 
 #endif
 54 
 #endif
55 
 #ifndef PS_ON_PIN
 55 
 #ifndef PS_ON_PIN
56 
-  #define PS_ON_PIN                          -1
56 
+  #define PS_ON_PIN                           -1
57 
 #endif
 57 
 #endif
58
58
59 
 #include "pins_MKS_BASE_common.h"
 59 
 #include "pins_MKS_BASE_common.h"

+ 9
- 9
Marlin/src/pins/ramps/pins_RL200.h View File

37 
   #error "You must set ([XYZ]|Z2|E0)_DRIVER_TYPE to DRV8825 in Configuration.h for RL200."
 37 
   #error "You must set ([XYZ]|Z2|E0)_DRIVER_TYPE to DRV8825 in Configuration.h for RL200."
38 
 #endif
 38 
 #endif
39
39
40 
-#define E0_STEP_PIN                          26   // (RUMBA E1 pins)
41 
-#define E0_DIR_PIN                           25
42 
-#define E0_ENABLE_PIN                        27
40 
+#define E0_STEP_PIN                           26  // (RUMBA E1 pins)
41 
+#define E0_DIR_PIN                            25
42 
+#define E0_ENABLE_PIN                         27
43
43
44 
-#define E1_STEP_PIN                          29   // (RUMBA E2 pins)
45 
-#define E1_DIR_PIN                           28
46 
-#define E1_ENABLE_PIN                        39
44 
+#define E1_STEP_PIN                           29  // (RUMBA E2 pins)
45 
+#define E1_DIR_PIN                            28
46 
+#define E1_ENABLE_PIN                         39
47
47
48 
-#define Z2_STEP_PIN                          23   // (RUMBA E0 pins)
49 
-#define Z2_DIR_PIN                           22
50 
-#define Z2_ENABLE_PIN                        24
48 
+#define Z2_STEP_PIN                           23  // (RUMBA E0 pins)
49 
+#define Z2_DIR_PIN                            22
50 
+#define Z2_ENABLE_PIN                         24
51
51
52 
 #include "pins_RUMBA.h"
 52 
 #include "pins_RUMBA.h"

+ 7
- 7
Marlin/src/pins/ramps/pins_TANGO.h View File

27
27
28 
 #define BOARD_INFO_NAME "Tango"
 28 
 #define BOARD_INFO_NAME "Tango"
29
29
30 
-#define FAN_PIN                               8
31 
-#define FAN1_PIN                             -1
30 
+#define FAN_PIN                                8
31 
+#define FAN1_PIN                              -1
32
32
33 
 #ifndef E0_AUTO_FAN_PIN
 33 
 #ifndef E0_AUTO_FAN_PIN
34 
-  #define E0_AUTO_FAN_PIN                     7
34 
+  #define E0_AUTO_FAN_PIN                      7
35 
 #endif
 35 
 #endif
36
36
37 
 #ifndef TEMP_0_PIN
 37 
 #ifndef TEMP_0_PIN
38 
   #if TEMP_SENSOR_0 == -1
 38 
   #if TEMP_SENSOR_0 == -1
39 
-    #define TEMP_0_PIN                       10   // Analog Input (connector *K1* on Tango thermocouple ADD ON is used)
39 
+    #define TEMP_0_PIN                        10  // Analog Input (connector *K1* on Tango thermocouple ADD ON is used)
40 
   #else
 40 
   #else
41 
-    #define TEMP_0_PIN                       15   // Analog Input (default connector for thermistor *T0* on rumba board is used)
41 
+    #define TEMP_0_PIN                        15  // Analog Input (default connector for thermistor *T0* on rumba board is used)
42 
   #endif
 42 
   #endif
43 
 #endif
 43 
 #endif
44
44
45 
 #ifndef TEMP_1_PIN
 45 
 #ifndef TEMP_1_PIN
46 
   #if TEMP_SENSOR_1 == -1
 46 
   #if TEMP_SENSOR_1 == -1
47 
-    #define TEMP_1_PIN                        9   // Analog Input (connector *K2* on Tango thermocouple ADD ON is used)
47 
+    #define TEMP_1_PIN                         9  // Analog Input (connector *K2* on Tango thermocouple ADD ON is used)
48 
   #else
 48 
   #else
49 
-    #define TEMP_1_PIN                       14   // Analog Input (default connector for thermistor *T1* on rumba board is used)
49 
+    #define TEMP_1_PIN                        14  // Analog Input (default connector for thermistor *T1* on rumba board is used)
50 
   #endif
 50 
   #endif
51 
 #endif
 51 
 #endif
52
52

+ 5
- 5
Marlin/src/pins/ramps/pins_VORON.h View File

28
28
29 
 #define BOARD_INFO_NAME "VORON Design v2"
 29 
 #define BOARD_INFO_NAME "VORON Design v2"
30
30
31 
-#define RAMPS_D8_PIN                         11
31 
+#define RAMPS_D8_PIN                          11
32
32
33 
 #include "pins_RAMPS.h"
 33 
 #include "pins_RAMPS.h"
34
34
36 
 // Heaters / Fans
 36 
 // Heaters / Fans
37 
 //
 37 
 //
38 
 #undef FAN_PIN
 38 
 #undef FAN_PIN
39 
-#define FAN_PIN                               5   // Using the pin for the controller fan since controller fan is always on.
40 
-#define CONTROLLER_FAN_PIN                    8
39 
+#define FAN_PIN                                5  // Using the pin for the controller fan since controller fan is always on.
40 
+#define CONTROLLER_FAN_PIN                     8
41
41
42 
 //
 42 
 //
43 
 // Auto fans
 43 
 // Auto fans
44 
 //
 44 
 //
45 
 #ifndef E0_AUTO_FAN_PIN
 45 
 #ifndef E0_AUTO_FAN_PIN
46 
-  #define E0_AUTO_FAN_PIN                     6   // Servo pin 6 for E3D Fan
46 
+  #define E0_AUTO_FAN_PIN                      6  // Servo pin 6 for E3D Fan
47 
 #endif
 47 
 #endif
48 
 #ifndef E1_AUTO_FAN_PIN
 48 
 #ifndef E1_AUTO_FAN_PIN
49 
-  #define E1_AUTO_FAN_PIN                     6   // Servo pin 6 for E3D Fan (same pin for both extruders since it's the same fan)
49 
+  #define E1_AUTO_FAN_PIN                      6  // Servo pin 6 for E3D Fan (same pin for both extruders since it's the same fan)
50 
 #endif
 50 
 #endif
51
51
52 
 //
 52 
 //

+ 7
- 7
Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h View File

62 
 #undef LCD_PINS_D6
 62 
 #undef LCD_PINS_D6
63 
 #undef LCD_PINS_D7
 63 
 #undef LCD_PINS_D7
64
64
65 
-#define LCD_SDSS                             31   // Smart Controller SD card reader (rather than the Melzi)
66 
-#define LCD_PINS_RS                          28   // ST9720 CS
67 
-#define LCD_PINS_ENABLE                      17   // ST9720 DAT
68 
-#define LCD_PINS_D4                          30   // ST9720 CLK
65 
+#define LCD_SDSS                              31  // Smart Controller SD card reader (rather than the Melzi)
66 
+#define LCD_PINS_RS                           28  // ST9720 CS
67 
+#define LCD_PINS_ENABLE                       17  // ST9720 DAT
68 
+#define LCD_PINS_D4                           30  // ST9720 CLK
69
69
70 
 #if ENABLED(BLTOUCH)
 70 
 #if ENABLED(BLTOUCH)
71 
-  #define SERVO0_PIN                         27
71 
+  #define SERVO0_PIN                          27
72 
   #undef BEEPER_PIN
 72 
   #undef BEEPER_PIN
73 
 #elif ENABLED(FILAMENT_RUNOUT_SENSOR)
 73 
 #elif ENABLED(FILAMENT_RUNOUT_SENSOR)
74 
   #ifndef FIL_RUNOUT_PIN
 74 
   #ifndef FIL_RUNOUT_PIN
75 
-    #define FIL_RUNOUT_PIN                   27
75 
+    #define FIL_RUNOUT_PIN                    27
76 
   #endif
 76 
   #endif
77 
   #if FIL_RUNOUT_PIN == BEEPER_PIN
 77 
   #if FIL_RUNOUT_PIN == BEEPER_PIN
78 
     #undef BEEPER_PIN
 78 
     #undef BEEPER_PIN
81
81
82 
 #if ENABLED(MINIPANEL)
 82 
 #if ENABLED(MINIPANEL)
83 
   #undef DOGLCD_CS
 83 
   #undef DOGLCD_CS
84 
-  #define DOGLCD_CS LCD_PINS_RS
84 
+  #define DOGLCD_CS                  LCD_PINS_RS
85 
 #endif
 85 
 #endif
86
86
87 
 /**
 87 
 /**

+ 6
- 6
Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h View File

50 
 #undef BTN_EN2
 50 
 #undef BTN_EN2
51 
 #undef BTN_ENC
 51 
 #undef BTN_ENC
52
52
53 
-#define LCD_PINS_RS                          17   // ST9720 CS
54 
-#define LCD_PINS_ENABLE                      16   // ST9720 DAT
55 
-#define LCD_PINS_D4                          11   // ST9720 CLK
56 
-#define BTN_EN1                              30
57 
-#define BTN_EN2                              29
58 
-#define BTN_ENC                              28
53 
+#define LCD_PINS_RS                           17  // ST9720 CS
54 
+#define LCD_PINS_ENABLE                       16  // ST9720 DAT
55 
+#define LCD_PINS_D4                           11  // ST9720 CLK
56 
+#define BTN_EN1                               30
57 
+#define BTN_EN2                               29
58 
+#define BTN_ENC                               28

+ 9
- 9
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h View File

25
25
26 
 #define BOARD_INFO_NAME "BTT SKR Mini E3 V1.2"
 26 
 #define BOARD_INFO_NAME "BTT SKR Mini E3 V1.2"
27
27
28 
-#define NEOPIXEL_PIN                       PC7    // LED driving pin
28 
+#define NEOPIXEL_PIN                        PC7   // LED driving pin
29
29
30 
 /**
 30 
 /**
31 
  * TMC2208/TMC2209 stepper drivers
 31 
  * TMC2208/TMC2209 stepper drivers
34 
   //
 34 
   //
35 
   // Software serial
 35 
   // Software serial
36 
   //
 36 
   //
37 
-  #define X_SERIAL_TX_PIN                  PB15
38 
-  #define X_SERIAL_RX_PIN                  PB15
37 
+  #define X_SERIAL_TX_PIN                   PB15
38 
+  #define X_SERIAL_RX_PIN                   PB15
39
39
40 
-  #define Y_SERIAL_TX_PIN                  PC6
41 
-  #define Y_SERIAL_RX_PIN                  PC6
40 
+  #define Y_SERIAL_TX_PIN                   PC6
41 
+  #define Y_SERIAL_RX_PIN                   PC6
42
42
43 
-  #define Z_SERIAL_TX_PIN                  PC10
44 
-  #define Z_SERIAL_RX_PIN                  PC10
43 
+  #define Z_SERIAL_TX_PIN                   PC10
44 
+  #define Z_SERIAL_RX_PIN                   PC10
45
45
46 
-  #define E0_SERIAL_TX_PIN                 PC11
47 
-  #define E0_SERIAL_RX_PIN                 PC11
46 
+  #define E0_SERIAL_TX_PIN                  PC11
47 
+  #define E0_SERIAL_RX_PIN                  PC11
48
48
49 
   // Reduce baud rate to improve software serial reliability
 49 
   // Reduce baud rate to improve software serial reliability
50 
   #define TMC_BAUD_RATE 19200
 50 
   #define TMC_BAUD_RATE 19200

+ 9
- 9
Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h View File

36 
 #undef RGB_LED_G_PIN
 36 
 #undef RGB_LED_G_PIN
37 
 #undef RGB_LED_B_PIN
 37 
 #undef RGB_LED_B_PIN
38
38
39 
-#define FAN1_PIN                           PB0    // Fan1
39 
+#define FAN1_PIN                            PB0   // Fan1
40
40
41 
 #if HAS_TMC_UART
 41 
 #if HAS_TMC_UART
42
42
47 
   //
 47 
   //
48 
   // Software serial
 48 
   // Software serial
49 
   //
 49 
   //
50 
-  #define X_SERIAL_TX_PIN                  PA11
51 
-  #define X_SERIAL_RX_PIN                  PA12
50 
+  #define X_SERIAL_TX_PIN                   PA11
51 
+  #define X_SERIAL_RX_PIN                   PA12
52
52
53 
-  #define Y_SERIAL_TX_PIN                  PB6
54 
-  #define Y_SERIAL_RX_PIN                  PB7
53 
+  #define Y_SERIAL_TX_PIN                   PB6
54 
+  #define Y_SERIAL_RX_PIN                   PB7
55
55
56 
-  #define Z_SERIAL_TX_PIN                  PB10
57 
-  #define Z_SERIAL_RX_PIN                  PB11
56 
+  #define Z_SERIAL_TX_PIN                   PB10
57 
+  #define Z_SERIAL_RX_PIN                   PB11
58
58
59 
-  #define E0_SERIAL_TX_PIN                 PA2
60 
-  #define E0_SERIAL_RX_PIN                 PA3
59 
+  #define E0_SERIAL_TX_PIN                  PA2
60 
+  #define E0_SERIAL_RX_PIN                  PA3
61
61
62 
   // Reduce baud rate to improve software serial reliability
 62 
   // Reduce baud rate to improve software serial reliability
63 
   #define TMC_BAUD_RATE 19200
 63 
   #define TMC_BAUD_RATE 19200

Write Preview
Loading…
Cancel
Save