MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Apply some pins formatting

Browse Source
This commit is contained in:
Scott Lahteine 2020-11-07 16:53:37 -06:00
parent 426d555f6e
commit dfb6dd2ad2
13 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/src/pins/mega/pins_GT2560_V3_A20.h
View File

@ -25,17 +25,17 @@
* Geeetech A20M pin assignment * Geeetech A20M pin assignment
*/ */
#define LCD_PINS_RS 5 #define LCD_PINS_RS 5
#define LCD_PINS_ENABLE 36 #define LCD_PINS_ENABLE 36
#define LCD_PINS_D4 21 #define LCD_PINS_D4 21
#define LCD_PINS_D7 6 #define LCD_PINS_D7 6
#define SPEAKER // The speaker can produce tones #define SPEAKER // The speaker can produce tones
#if IS_NEWPANEL #if IS_NEWPANEL
#define BTN_EN1 16 #define BTN_EN1 16
#define BTN_EN2 17 #define BTN_EN2 17
#define BTN_ENC 19 #define BTN_ENC 19
#endif #endif
#include "pins_GT2560_V3.h" #include "pins_GT2560_V3.h"

2
Marlin/src/pins/ramps/pins_3DRAG.h
View File

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

10
Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
View File

@ -34,9 +34,9 @@
// //
// M3/M4/M5 - Spindle/Laser Control // M3/M4/M5 - Spindle/Laser Control
// //
#define SPINDLE_LASER_ENA_PIN 66 // Pullup or pulldown! #define SPINDLE_LASER_ENA_PIN 66 // Pullup or pulldown!
#define SPINDLE_DIR_PIN 67 #define SPINDLE_DIR_PIN 67
#define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM #define SPINDLE_LASER_PWM_PIN 44 // Hardware PWM
#include "pins_RAMPS.h" #include "pins_RAMPS.h"
@ -45,5 +45,5 @@
// //
#undef TEMP_0_PIN #undef TEMP_0_PIN
#undef TEMP_1_PIN #undef TEMP_1_PIN
#define TEMP_0_PIN 9 // Analog Input #define TEMP_0_PIN 9 // Analog Input
#define TEMP_1_PIN 11 // Analog Input #define TEMP_1_PIN 11 // Analog Input

10
Marlin/src/pins/ramps/pins_DAGOMA_F5.h
View File

@ -30,13 +30,13 @@
// //
// Endstops // Endstops
// //
#define X_STOP_PIN 2 #define X_STOP_PIN 2
#define Y_STOP_PIN 3 #define Y_STOP_PIN 3
#define Z_STOP_PIN 15 #define Z_STOP_PIN 15
#define FIL_RUNOUT_PIN 39 #define FIL_RUNOUT_PIN 39
#if EXTRUDERS > 1 #if EXTRUDERS > 1
#define FIL_RUNOUT2_PIN 14 #define FIL_RUNOUT2_PIN 14
#endif #endif
// //

10
Marlin/src/pins/ramps/pins_K8400.h
View File

@ -40,8 +40,8 @@
// //
// Limit Switches // Limit Switches
// //
#define X_STOP_PIN 3 #define X_STOP_PIN 3
#define Y_STOP_PIN 14 #define Y_STOP_PIN 14
#undef X_MIN_PIN #undef X_MIN_PIN
#undef X_MAX_PIN #undef X_MAX_PIN
@ -52,13 +52,13 @@
// Steppers // Steppers
// //
#undef E1_STEP_PIN #undef E1_STEP_PIN
#define E1_STEP_PIN 32 #define E1_STEP_PIN 32
// //
// Heaters / Fans // Heaters / Fans
// //
#undef HEATER_1_PIN #undef HEATER_1_PIN
#define HEATER_1_PIN 11 #define HEATER_1_PIN 11
// //
// Misc. Functions // Misc. Functions
@ -69,5 +69,5 @@
#if Z_STEP_PIN == 26 #if Z_STEP_PIN == 26
#undef Z_STEP_PIN #undef Z_STEP_PIN
#define Z_STEP_PIN 32 #define Z_STEP_PIN 32
#endif #endif

14
Marlin/src/pins/ramps/pins_MKS_BASE_16.h
View File

@ -30,30 +30,30 @@
#endif #endif
#define BOARD_INFO_NAME "MKS BASE 1.6" #define BOARD_INFO_NAME "MKS BASE 1.6"
#define MKS_BASE_VERSION 16 #define MKS_BASE_VERSION 16
// //
// Servos // Servos
// //
#define SERVO1_PIN 12 // Digital 12 / Pin 25 #define SERVO1_PIN 12 // Digital 12 / Pin 25
// //
// Omitted RAMPS pins // Omitted RAMPS pins
// //
#ifndef SERVO2_PIN #ifndef SERVO2_PIN
#define SERVO2_PIN -1 #define SERVO2_PIN -1
#endif #endif
#ifndef SERVO3_PIN #ifndef SERVO3_PIN
#define SERVO3_PIN -1 #define SERVO3_PIN -1
#endif #endif
#ifndef FILWIDTH_PIN #ifndef FILWIDTH_PIN
#define FILWIDTH_PIN -1 #define FILWIDTH_PIN -1
#endif #endif
#ifndef FIL_RUNOUT_PIN #ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN -1 #define FIL_RUNOUT_PIN -1
#endif #endif
#ifndef PS_ON_PIN #ifndef PS_ON_PIN
#define PS_ON_PIN -1 #define PS_ON_PIN -1
#endif #endif
#include "pins_MKS_BASE_common.h" #include "pins_MKS_BASE_common.h"

18
Marlin/src/pins/ramps/pins_RL200.h
View File

@ -37,16 +37,16 @@
#error "You must set ([XYZ]|Z2|E0)_DRIVER_TYPE to DRV8825 in Configuration.h for RL200." #error "You must set ([XYZ]|Z2|E0)_DRIVER_TYPE to DRV8825 in Configuration.h for RL200."
#endif #endif
#define E0_STEP_PIN 26 // (RUMBA E1 pins) #define E0_STEP_PIN 26 // (RUMBA E1 pins)
#define E0_DIR_PIN 25 #define E0_DIR_PIN 25
#define E0_ENABLE_PIN 27 #define E0_ENABLE_PIN 27
#define E1_STEP_PIN 29 // (RUMBA E2 pins) #define E1_STEP_PIN 29 // (RUMBA E2 pins)
#define E1_DIR_PIN 28 #define E1_DIR_PIN 28
#define E1_ENABLE_PIN 39 #define E1_ENABLE_PIN 39
#define Z2_STEP_PIN 23 // (RUMBA E0 pins) #define Z2_STEP_PIN 23 // (RUMBA E0 pins)
#define Z2_DIR_PIN 22 #define Z2_DIR_PIN 22
#define Z2_ENABLE_PIN 24 #define Z2_ENABLE_PIN 24
#include "pins_RUMBA.h" #include "pins_RUMBA.h"

14
Marlin/src/pins/ramps/pins_TANGO.h
View File

@ -27,26 +27,26 @@
#define BOARD_INFO_NAME "Tango" #define BOARD_INFO_NAME "Tango"
#define FAN_PIN 8 #define FAN_PIN 8
#define FAN1_PIN -1 #define FAN1_PIN -1
#ifndef E0_AUTO_FAN_PIN #ifndef E0_AUTO_FAN_PIN
#define E0_AUTO_FAN_PIN 7 #define E0_AUTO_FAN_PIN 7
#endif #endif
#ifndef TEMP_0_PIN #ifndef TEMP_0_PIN
#if TEMP_SENSOR_0 == -1 #if TEMP_SENSOR_0 == -1
#define TEMP_0_PIN 10 // Analog Input (connector *K1* on Tango thermocouple ADD ON is used) #define TEMP_0_PIN 10 // Analog Input (connector *K1* on Tango thermocouple ADD ON is used)
#else #else
#define TEMP_0_PIN 15 // Analog Input (default connector for thermistor *T0* on rumba board is used) #define TEMP_0_PIN 15 // Analog Input (default connector for thermistor *T0* on rumba board is used)
#endif #endif
#endif #endif
#ifndef TEMP_1_PIN #ifndef TEMP_1_PIN
#if TEMP_SENSOR_1 == -1 #if TEMP_SENSOR_1 == -1
#define TEMP_1_PIN 9 // Analog Input (connector *K2* on Tango thermocouple ADD ON is used) #define TEMP_1_PIN 9 // Analog Input (connector *K2* on Tango thermocouple ADD ON is used)
#else #else
#define TEMP_1_PIN 14 // Analog Input (default connector for thermistor *T1* on rumba board is used) #define TEMP_1_PIN 14 // Analog Input (default connector for thermistor *T1* on rumba board is used)
#endif #endif
#endif #endif

10
Marlin/src/pins/ramps/pins_VORON.h
View File

@ -28,7 +28,7 @@
#define BOARD_INFO_NAME "VORON Design v2" #define BOARD_INFO_NAME "VORON Design v2"
#define RAMPS_D8_PIN 11 #define RAMPS_D8_PIN 11
#include "pins_RAMPS.h" #include "pins_RAMPS.h"
@ -36,17 +36,17 @@
// Heaters / Fans // Heaters / Fans
// //
#undef FAN_PIN #undef FAN_PIN
#define FAN_PIN 5 // Using the pin for the controller fan since controller fan is always on. #define FAN_PIN 5 // Using the pin for the controller fan since controller fan is always on.
#define CONTROLLER_FAN_PIN 8 #define CONTROLLER_FAN_PIN 8
// //
// Auto fans // Auto fans
// //
#ifndef E0_AUTO_FAN_PIN #ifndef E0_AUTO_FAN_PIN
#define E0_AUTO_FAN_PIN 6 // Servo pin 6 for E3D Fan #define E0_AUTO_FAN_PIN 6 // Servo pin 6 for E3D Fan
#endif #endif
#ifndef E1_AUTO_FAN_PIN #ifndef E1_AUTO_FAN_PIN
#define E1_AUTO_FAN_PIN 6 // Servo pin 6 for E3D Fan (same pin for both extruders since it's the same fan) #define E1_AUTO_FAN_PIN 6 // Servo pin 6 for E3D Fan (same pin for both extruders since it's the same fan)
#endif #endif
// //

14
Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
View File

@ -62,17 +62,17 @@
#undef LCD_PINS_D6 #undef LCD_PINS_D6
#undef LCD_PINS_D7 #undef LCD_PINS_D7
#define LCD_SDSS 31 // Smart Controller SD card reader (rather than the Melzi) #define LCD_SDSS 31 // Smart Controller SD card reader (rather than the Melzi)
#define LCD_PINS_RS 28 // ST9720 CS #define LCD_PINS_RS 28 // ST9720 CS
#define LCD_PINS_ENABLE 17 // ST9720 DAT #define LCD_PINS_ENABLE 17 // ST9720 DAT
#define LCD_PINS_D4 30 // ST9720 CLK #define LCD_PINS_D4 30 // ST9720 CLK
#if ENABLED(BLTOUCH) #if ENABLED(BLTOUCH)
#define SERVO0_PIN 27 #define SERVO0_PIN 27
#undef BEEPER_PIN #undef BEEPER_PIN
#elif ENABLED(FILAMENT_RUNOUT_SENSOR) #elif ENABLED(FILAMENT_RUNOUT_SENSOR)
#ifndef FIL_RUNOUT_PIN #ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN 27 #define FIL_RUNOUT_PIN 27
#endif #endif
#if FIL_RUNOUT_PIN == BEEPER_PIN #if FIL_RUNOUT_PIN == BEEPER_PIN
#undef BEEPER_PIN #undef BEEPER_PIN
@ -81,7 +81,7 @@
#if ENABLED(MINIPANEL) #if ENABLED(MINIPANEL)
#undef DOGLCD_CS #undef DOGLCD_CS
#define DOGLCD_CS LCD_PINS_RS #define DOGLCD_CS LCD_PINS_RS
#endif #endif
/** /**

12
Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
View File

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

18
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h
View File

@ -25,7 +25,7 @@
#define BOARD_INFO_NAME "BTT SKR Mini E3 V1.2" #define BOARD_INFO_NAME "BTT SKR Mini E3 V1.2"
#define NEOPIXEL_PIN PC7 // LED driving pin #define NEOPIXEL_PIN PC7 // LED driving pin
/** /**
* TMC2208/TMC2209 stepper drivers * TMC2208/TMC2209 stepper drivers
@ -34,17 +34,17 @@
// //
// Software serial // Software serial
// //
#define X_SERIAL_TX_PIN PB15 #define X_SERIAL_TX_PIN PB15
#define X_SERIAL_RX_PIN PB15 #define X_SERIAL_RX_PIN PB15
#define Y_SERIAL_TX_PIN PC6 #define Y_SERIAL_TX_PIN PC6
#define Y_SERIAL_RX_PIN PC6 #define Y_SERIAL_RX_PIN PC6
#define Z_SERIAL_TX_PIN PC10 #define Z_SERIAL_TX_PIN PC10
#define Z_SERIAL_RX_PIN PC10 #define Z_SERIAL_RX_PIN PC10
#define E0_SERIAL_TX_PIN PC11 #define E0_SERIAL_TX_PIN PC11
#define E0_SERIAL_RX_PIN PC11 #define E0_SERIAL_RX_PIN PC11
// Reduce baud rate to improve software serial reliability // Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200 #define TMC_BAUD_RATE 19200

18
Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH_V12.h
View File

@ -36,7 +36,7 @@
#undef RGB_LED_G_PIN #undef RGB_LED_G_PIN
#undef RGB_LED_B_PIN #undef RGB_LED_B_PIN
#define FAN1_PIN PB0 // Fan1 #define FAN1_PIN PB0 // Fan1
#if HAS_TMC_UART #if HAS_TMC_UART
@ -47,17 +47,17 @@
// //
// Software serial // Software serial
// //
#define X_SERIAL_TX_PIN PA11 #define X_SERIAL_TX_PIN PA11
#define X_SERIAL_RX_PIN PA12 #define X_SERIAL_RX_PIN PA12
#define Y_SERIAL_TX_PIN PB6 #define Y_SERIAL_TX_PIN PB6
#define Y_SERIAL_RX_PIN PB7 #define Y_SERIAL_RX_PIN PB7
#define Z_SERIAL_TX_PIN PB10 #define Z_SERIAL_TX_PIN PB10
#define Z_SERIAL_RX_PIN PB11 #define Z_SERIAL_RX_PIN PB11
#define E0_SERIAL_TX_PIN PA2 #define E0_SERIAL_TX_PIN PA2
#define E0_SERIAL_RX_PIN PA3 #define E0_SERIAL_RX_PIN PA3
// Reduce baud rate to improve software serial reliability // Reduce baud rate to improve software serial reliability
#define TMC_BAUD_RATE 19200 #define TMC_BAUD_RATE 19200