From 664e20754d67a2d04261b0bdfcc87802cec7d84c Mon Sep 17 00:00:00 2001 From: Scott Lahteine <github@thinkyhead.com> Date: Wed, 14 Nov 2018 00:23:18 -0600 Subject: [PATCH] Clean up pins files --- Marlin/src/pins/pins_ANET_10.h | 4 +--- Marlin/src/pins/pins_AZSMZ_MINI.h | 4 +--- Marlin/src/pins/pins_AZTEEG_X5_GT.h | 6 ++---- Marlin/src/pins/pins_AZTEEG_X5_MINI_WIFI.h | 6 ++---- Marlin/src/pins/pins_BIQU_BQ111_A4.h | 4 +--- Marlin/src/pins/pins_BRAINWAVE.h | 2 +- Marlin/src/pins/pins_BRAINWAVE_PRO.h | 2 +- Marlin/src/pins/pins_CHEAPTRONIC.h | 2 +- Marlin/src/pins/pins_CHEAPTRONICv2.h | 2 +- Marlin/src/pins/pins_CNCONTROLS_12.h | 2 +- Marlin/src/pins/pins_COHESION3D_MINI.h | 4 +--- Marlin/src/pins/pins_COHESION3D_REMIX.h | 4 +--- Marlin/src/pins/pins_EINSTART-S.h | 6 ++---- Marlin/src/pins/pins_EINSY_RAMBO.h | 2 +- Marlin/src/pins/pins_EINSY_RETRO.h | 2 +- Marlin/src/pins/pins_ESP32.h | 4 +--- Marlin/src/pins/pins_FYSETC_F6_13.h | 6 ++---- Marlin/src/pins/pins_GEN3_PLUS.h | 2 +- Marlin/src/pins/pins_GEN7_CUSTOM.h | 2 +- Marlin/src/pins/pins_LEAPFROG.h | 2 +- Marlin/src/pins/pins_MEGATRONICS.h | 2 +- Marlin/src/pins/pins_MINITRONICS.h | 2 +- Marlin/src/pins/pins_MKS_SBASE.h | 20 ++++++++------------ Marlin/src/pins/pins_OMCA.h | 2 +- Marlin/src/pins/pins_OMCA_A.h | 2 +- Marlin/src/pins/pins_PRINTRBOARD.h | 2 +- Marlin/src/pins/pins_PRINTRBOARD_REVF.h | 3 ++- Marlin/src/pins/pins_RADDS.h | 2 +- Marlin/src/pins/pins_RAMPS4DUE.h | 4 +--- Marlin/src/pins/pins_RAMPS_DUO.h | 4 +--- Marlin/src/pins/pins_RAMPS_FD_V1.h | 2 +- Marlin/src/pins/pins_RAMPS_FD_V2.h | 2 +- Marlin/src/pins/pins_RAMPS_OLD.h | 2 +- Marlin/src/pins/pins_RAMPS_PLUS.h | 4 +--- Marlin/src/pins/pins_RAMPS_RE_ARM.h | 6 ++---- Marlin/src/pins/pins_RAMPS_SMART.h | 4 +--- Marlin/src/pins/pins_RURAMPS4D_11.h | 4 +--- Marlin/src/pins/pins_RURAMPS4D_13.h | 4 +--- Marlin/src/pins/pins_SELENA_COMPACT.h | 6 ++---- Marlin/src/pins/pins_SILVER_GATE.h | 4 +--- Marlin/src/pins/pins_SMOOTHIEBOARD.h | 6 ++---- Marlin/src/pins/pins_TEENSY2.h | 2 +- Marlin/src/pins/pins_TEENSYLU.h | 2 +- Marlin/src/pins/pins_TRIGORILLA_13.h | 4 +--- Marlin/src/pins/pins_TRIGORILLA_14.h | 4 +--- Marlin/src/pins/pins_ULTRATRONICS_PRO.h | 5 ++--- 46 files changed, 62 insertions(+), 110 deletions(-) diff --git a/Marlin/src/pins/pins_ANET_10.h b/Marlin/src/pins/pins_ANET_10.h index cf26ff6467..51d9392642 100644 --- a/Marlin/src/pins/pins_ANET_10.h +++ b/Marlin/src/pins/pins_ANET_10.h @@ -92,9 +92,7 @@ #error "Oops! Select 'Anet V1.0', 'Anet V1.0 (Optiboot)' or 'Sanguino' in 'Tools > Board' and 'ATmega1284P' in 'Tools > Processor.'" #endif -#ifndef BOARD_NAME - #define BOARD_NAME "Anet" -#endif +#define BOARD_NAME "Anet 1.0" // // Limit Switches diff --git a/Marlin/src/pins/pins_AZSMZ_MINI.h b/Marlin/src/pins/pins_AZSMZ_MINI.h index 2fef32bda7..e83ebf46a2 100644 --- a/Marlin/src/pins/pins_AZSMZ_MINI.h +++ b/Marlin/src/pins/pins_AZSMZ_MINI.h @@ -28,9 +28,7 @@ #error "Oops! Make sure you have the LPC1768 environment selected in your IDE." #endif -#ifndef BOARD_NAME - #define BOARD_NAME "AZSMZ MINI" -#endif +#define BOARD_NAME "AZSMZ MINI" // // Servos diff --git a/Marlin/src/pins/pins_AZTEEG_X5_GT.h b/Marlin/src/pins/pins_AZTEEG_X5_GT.h index 76e1fed268..4d1d824eb3 100755 --- a/Marlin/src/pins/pins_AZTEEG_X5_GT.h +++ b/Marlin/src/pins/pins_AZTEEG_X5_GT.h @@ -29,10 +29,8 @@ #error "Oops! Make sure you have the LPC1768 environment selected in your IDE." #endif -#ifndef BOARD_NAME - #define BOARD_NAME "Azteeg X5 GT" - #define DEFAULT_WEBSITE_URL "https://www.panucatt.com/azteeg_X5_GT_reprap_3d_printer_controller_p/ax5gt.htm" -#endif +#define BOARD_NAME "Azteeg X5 GT" +#define DEFAULT_WEBSITE_URL "https://www.panucatt.com/azteeg_X5_GT_reprap_3d_printer_controller_p/ax5gt.htm" // // Set CPU diff --git a/Marlin/src/pins/pins_AZTEEG_X5_MINI_WIFI.h b/Marlin/src/pins/pins_AZTEEG_X5_MINI_WIFI.h index dbc86b829b..dee7a783ac 100644 --- a/Marlin/src/pins/pins_AZTEEG_X5_MINI_WIFI.h +++ b/Marlin/src/pins/pins_AZTEEG_X5_MINI_WIFI.h @@ -29,10 +29,8 @@ #error "Oops! Make sure you have the LPC1768 environment selected in your IDE." #endif -#ifndef BOARD_NAME - #define BOARD_NAME "Azteeg X5 MINI WIFI" - #define DEFAULT_WEBSITE_URL "http://www.panucatt.com/azteeg_X5_mini_reprap_3d_printer_controller_p/ax5mini.htm" -#endif +#define BOARD_NAME "Azteeg X5 MINI WIFI" +#define DEFAULT_WEBSITE_URL "http://www.panucatt.com/azteeg_X5_mini_reprap_3d_printer_controller_p/ax5mini.htm" // // LED diff --git a/Marlin/src/pins/pins_BIQU_BQ111_A4.h b/Marlin/src/pins/pins_BIQU_BQ111_A4.h index bc5c07f107..f499241ab9 100644 --- a/Marlin/src/pins/pins_BIQU_BQ111_A4.h +++ b/Marlin/src/pins/pins_BIQU_BQ111_A4.h @@ -34,9 +34,7 @@ #error "Oops! Make sure you have the LPC1768 environment selected in your IDE." #endif -#ifndef BOARD_NAME - #define BOARD_NAME "BIQU BQ111-A4" -#endif +#define BOARD_NAME "BIQU BQ111-A4" // // Limit Switches diff --git a/Marlin/src/pins/pins_BRAINWAVE.h b/Marlin/src/pins/pins_BRAINWAVE.h index 2bb3e6d461..e798dfb890 100644 --- a/Marlin/src/pins/pins_BRAINWAVE.h +++ b/Marlin/src/pins/pins_BRAINWAVE.h @@ -71,7 +71,7 @@ #error "Oops! Select 'AT90USB646_TEENSYPP' in 'Tools > Board.'" #endif -#define BOARD_NAME "Brainwave" +#define BOARD_NAME "Brainwave" // // Limit Switches diff --git a/Marlin/src/pins/pins_BRAINWAVE_PRO.h b/Marlin/src/pins/pins_BRAINWAVE_PRO.h index ec27f4a9cb..84542f69fe 100644 --- a/Marlin/src/pins/pins_BRAINWAVE_PRO.h +++ b/Marlin/src/pins/pins_BRAINWAVE_PRO.h @@ -78,7 +78,7 @@ #error "Oops! Select 'Teensy++ 2.0' or 'Printrboard' in 'Tools > Board.'" #endif -#define BOARD_NAME "Brainwave Pro" +#define BOARD_NAME "Brainwave Pro" // // Limit Switches diff --git a/Marlin/src/pins/pins_CHEAPTRONIC.h b/Marlin/src/pins/pins_CHEAPTRONIC.h index f484a897bb..65e81ae45d 100644 --- a/Marlin/src/pins/pins_CHEAPTRONIC.h +++ b/Marlin/src/pins/pins_CHEAPTRONIC.h @@ -28,7 +28,7 @@ #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'" #endif -#define BOARD_NAME "Cheaptronic v1.0" +#define BOARD_NAME "Cheaptronic v1.0" // // Limit Switches // diff --git a/Marlin/src/pins/pins_CHEAPTRONICv2.h b/Marlin/src/pins/pins_CHEAPTRONICv2.h index 1b93c1b04c..56617c537e 100644 --- a/Marlin/src/pins/pins_CHEAPTRONICv2.h +++ b/Marlin/src/pins/pins_CHEAPTRONICv2.h @@ -30,7 +30,7 @@ #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'" #endif -#define BOARD_NAME "Cheaptronic v2.0" +#define BOARD_NAME "Cheaptronic v2.0" // // Limit Switches diff --git a/Marlin/src/pins/pins_CNCONTROLS_12.h b/Marlin/src/pins/pins_CNCONTROLS_12.h index a7bb0ecf6f..a7fcb18162 100644 --- a/Marlin/src/pins/pins_CNCONTROLS_12.h +++ b/Marlin/src/pins/pins_CNCONTROLS_12.h @@ -6,7 +6,7 @@ #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'" #endif -#define BOARD_NAME "CN Controls V12" +#define BOARD_NAME "CN Controls V12" // // Limit Switches diff --git a/Marlin/src/pins/pins_COHESION3D_MINI.h b/Marlin/src/pins/pins_COHESION3D_MINI.h index 1348650504..649403b7bb 100644 --- a/Marlin/src/pins/pins_COHESION3D_MINI.h +++ b/Marlin/src/pins/pins_COHESION3D_MINI.h @@ -29,9 +29,7 @@ #error "Oops! Make sure you have the LPC1768 environment selected in your IDE." #endif -#ifndef BOARD_NAME - #define BOARD_NAME "Cohesion3D Mini" -#endif +#define BOARD_NAME "Cohesion3D Mini" // // Servos diff --git a/Marlin/src/pins/pins_COHESION3D_REMIX.h b/Marlin/src/pins/pins_COHESION3D_REMIX.h index 0810199384..23e8d21d02 100644 --- a/Marlin/src/pins/pins_COHESION3D_REMIX.h +++ b/Marlin/src/pins/pins_COHESION3D_REMIX.h @@ -29,9 +29,7 @@ #error "Oops! Make sure you have the LPC1768 environment selected in your IDE." #endif -#ifndef BOARD_NAME - #define BOARD_NAME "Cohesion3D ReMix" -#endif +#define BOARD_NAME "Cohesion3D ReMix" // // Servos diff --git a/Marlin/src/pins/pins_EINSTART-S.h b/Marlin/src/pins/pins_EINSTART-S.h index 87a29dc501..59fa5b0c66 100755 --- a/Marlin/src/pins/pins_EINSTART-S.h +++ b/Marlin/src/pins/pins_EINSTART-S.h @@ -21,7 +21,7 @@ */ /** - * Einstart S pin assignments + * Einstart-S pin assignments * PCB Silkscreen: 3DPrinterCon_v3.5 */ @@ -37,9 +37,7 @@ #endif #endif -#ifndef BOARD_NAME - #define BOARD_NAME "EINSTART_S" -#endif +#define BOARD_NAME "Einstart-S" // // Limit Switches diff --git a/Marlin/src/pins/pins_EINSY_RAMBO.h b/Marlin/src/pins/pins_EINSY_RAMBO.h index e87076ea23..420edfd65f 100644 --- a/Marlin/src/pins/pins_EINSY_RAMBO.h +++ b/Marlin/src/pins/pins_EINSY_RAMBO.h @@ -28,7 +28,7 @@ #error "Oops! Select 'Arduino Mega 2560 or Rambo' in 'Tools > Board.'" #endif -#define BOARD_NAME "Einsy Rambo" +#define BOARD_NAME "Einsy Rambo" // // TMC2130 Configuration_adv defaults for EinsyRambo diff --git a/Marlin/src/pins/pins_EINSY_RETRO.h b/Marlin/src/pins/pins_EINSY_RETRO.h index 2056ba1c22..23cf3da91e 100644 --- a/Marlin/src/pins/pins_EINSY_RETRO.h +++ b/Marlin/src/pins/pins_EINSY_RETRO.h @@ -28,7 +28,7 @@ #error "Oops! Select 'Arduino Mega 2560 or Rambo' in 'Tools > Board.'" #endif -#define BOARD_NAME "Einsy Retro" +#define BOARD_NAME "Einsy Retro" // // TMC2130 Configuration_adv defaults for EinsyRetro diff --git a/Marlin/src/pins/pins_ESP32.h b/Marlin/src/pins/pins_ESP32.h index ffad5890b2..681b89b0ac 100644 --- a/Marlin/src/pins/pins_ESP32.h +++ b/Marlin/src/pins/pins_ESP32.h @@ -24,9 +24,7 @@ * Espressif ESP32 (Tensilica Xtensa LX6) pin assignments */ -#ifndef BOARD_NAME - #define BOARD_NAME "Espressif ESP32" -#endif +#define BOARD_NAME "Espressif ESP32" // // Limit Switches diff --git a/Marlin/src/pins/pins_FYSETC_F6_13.h b/Marlin/src/pins/pins_FYSETC_F6_13.h index c08a23424b..d343e82f5e 100644 --- a/Marlin/src/pins/pins_FYSETC_F6_13.h +++ b/Marlin/src/pins/pins_FYSETC_F6_13.h @@ -25,12 +25,10 @@ // #ifndef __AVR_ATmega2560__ - #error "Oops! Select 'FYSETC_F6' in 'Tools > Board.'" + #error "Oops! Select 'FYSETC F6' in 'Tools > Board.'" #endif -#ifndef BOARD_NAME - #define BOARD_NAME "FYSETC_F6_13" -#endif +#define BOARD_NAME "FYSETC F6 1.3" // // Servos diff --git a/Marlin/src/pins/pins_GEN3_PLUS.h b/Marlin/src/pins/pins_GEN3_PLUS.h index af0524a22b..e30fee2c30 100644 --- a/Marlin/src/pins/pins_GEN3_PLUS.h +++ b/Marlin/src/pins/pins_GEN3_PLUS.h @@ -54,7 +54,7 @@ #error "Oops! Select 'Sanguino' in 'Tools > Boards' and 'ATmega644P' or 'ATmega1284P' in 'Tools > Processor.'" #endif -#define BOARD_NAME "Gen3+" +#define BOARD_NAME "Gen3+" // // Limit Switches diff --git a/Marlin/src/pins/pins_GEN7_CUSTOM.h b/Marlin/src/pins/pins_GEN7_CUSTOM.h index 8f7d75fd1f..7d0f44d7f3 100644 --- a/Marlin/src/pins/pins_GEN7_CUSTOM.h +++ b/Marlin/src/pins/pins_GEN7_CUSTOM.h @@ -58,7 +58,7 @@ #error "Oops! Select 'Sanguino' in 'Tools > Boards' and 'ATmega644', 'ATmega644P', or 'ATmega1284P' in 'Tools > Processor.'" #endif -#define BOARD_NAME "Gen7 Custom" +#define BOARD_NAME "Gen7 Custom" // // Limit Switches diff --git a/Marlin/src/pins/pins_LEAPFROG.h b/Marlin/src/pins/pins_LEAPFROG.h index 3cd9d75a38..946e20eef5 100644 --- a/Marlin/src/pins/pins_LEAPFROG.h +++ b/Marlin/src/pins/pins_LEAPFROG.h @@ -28,7 +28,7 @@ #error "Oops! Select 'Mega 1280' or 'Mega 2560' in 'Tools > Board.'" #endif -#define BOARD_NAME "Leapfrog" +#define BOARD_NAME "Leapfrog" // // Limit Switches diff --git a/Marlin/src/pins/pins_MEGATRONICS.h b/Marlin/src/pins/pins_MEGATRONICS.h index fef44366f1..781529020d 100644 --- a/Marlin/src/pins/pins_MEGATRONICS.h +++ b/Marlin/src/pins/pins_MEGATRONICS.h @@ -28,7 +28,7 @@ #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'" #endif -#define BOARD_NAME "Megatronics" +#define BOARD_NAME "Megatronics" // // Limit Switches // diff --git a/Marlin/src/pins/pins_MINITRONICS.h b/Marlin/src/pins/pins_MINITRONICS.h index feea8165ed..7ebaf1c4a1 100644 --- a/Marlin/src/pins/pins_MINITRONICS.h +++ b/Marlin/src/pins/pins_MINITRONICS.h @@ -39,7 +39,7 @@ #error "Minitronics supports up to 2 hotends / E-steppers. Comment out this line to continue." #endif -#define BOARD_NAME "Minitronics v1.0 / v1.1" +#define BOARD_NAME "Minitronics v1.0/1.1" // // Limit Switches // diff --git a/Marlin/src/pins/pins_MKS_SBASE.h b/Marlin/src/pins/pins_MKS_SBASE.h index e5e91be893..4784a8c2a0 100644 --- a/Marlin/src/pins/pins_MKS_SBASE.h +++ b/Marlin/src/pins/pins_MKS_SBASE.h @@ -29,18 +29,8 @@ #error "Oops! Make sure you have the LPC1768 environment selected in your IDE." #endif -#ifndef BOARD_NAME - #define BOARD_NAME "MKS SBASE" - #define DEFAULT_WEBSITE_URL "https://github.com/makerbase-mks/MKS-SBASE" -#endif - -// unused -/* -#define PIN_P0_27 P0_27 // EXP2/Onboard SD -#define PIN_P0_28 P0_28 // EXP2 -#define PIN_P0_02 P0_02 // AUX1 (Interrupt Capable/ADC/Serial Port 0) -#define PIN_P0_03 P0_03 // AUX1 (Interrupt Capable/ADC/Serial Port 0) -*/ +#define BOARD_NAME "MKS SBASE" +#define DEFAULT_WEBSITE_URL "https://github.com/makerbase-mks/MKS-SBASE" #define LED_PIN P1_18 // Used as a status indicator #define LED2_PIN P1_19 @@ -303,6 +293,12 @@ #define E0_SERIAL_RX_PIN P0_26 // TH4 #endif +// UNUSED +#define PIN_P0_27 P0_27 // EXP2/Onboard SD +#define PIN_P0_28 P0_28 // EXP2 +#define PIN_P0_02 P0_02 // AUX1 (Interrupt Capable/ADC/Serial Port 0) +#define PIN_P0_03 P0_03 // AUX1 (Interrupt Capable/ADC/Serial Port 0) + /** * PWMs * diff --git a/Marlin/src/pins/pins_OMCA.h b/Marlin/src/pins/pins_OMCA.h index 45daa1b87b..85d8faa224 100644 --- a/Marlin/src/pins/pins_OMCA.h +++ b/Marlin/src/pins/pins_OMCA.h @@ -80,7 +80,7 @@ #error "Oops! Select 'Sanguino' in 'Tools > Board' and 'ATmega644' or 'ATmega644P' in 'Tools > Processor.'" #endif -#define BOARD_NAME "Final OMCA" +#define BOARD_NAME "Final OMCA" // // Limit Switches diff --git a/Marlin/src/pins/pins_OMCA_A.h b/Marlin/src/pins/pins_OMCA_A.h index d89ad6970c..19f0e43f92 100644 --- a/Marlin/src/pins/pins_OMCA_A.h +++ b/Marlin/src/pins/pins_OMCA_A.h @@ -79,7 +79,7 @@ #error "Oops! Select 'Sanguino' in 'Tools > Board' and ATmega644 in 'Tools > Processor.'" #endif -#define BOARD_NAME "Alpha OMCA" +#define BOARD_NAME "Alpha OMCA" // // Limit Switches diff --git a/Marlin/src/pins/pins_PRINTRBOARD.h b/Marlin/src/pins/pins_PRINTRBOARD.h index 313bf78d88..a6193d6466 100644 --- a/Marlin/src/pins/pins_PRINTRBOARD.h +++ b/Marlin/src/pins/pins_PRINTRBOARD.h @@ -65,7 +65,7 @@ #error "Oops! Select 'Teensy++ 2.0' or 'Printrboard' in 'Tools > Board.'" #endif -#define BOARD_NAME "Printrboard" +#define BOARD_NAME "Printrboard" // Disable JTAG pins so they can be used for the Extrudrboard #define DISABLE_JTAG diff --git a/Marlin/src/pins/pins_PRINTRBOARD_REVF.h b/Marlin/src/pins/pins_PRINTRBOARD_REVF.h index 0b772cf588..e7249702cc 100644 --- a/Marlin/src/pins/pins_PRINTRBOARD_REVF.h +++ b/Marlin/src/pins/pins_PRINTRBOARD_REVF.h @@ -70,7 +70,8 @@ #error "USBCON should be defined by the platform for this board." #endif -#define BOARD_NAME "Printrboard Rev.F" +#define BOARD_NAME "Printrboard Rev.F" + // Disable JTAG pins so EXP1 pins work correctly // (Its pins are used for the Extrudrboard and filament sensor, for example). #define DISABLE_JTAG diff --git a/Marlin/src/pins/pins_RADDS.h b/Marlin/src/pins/pins_RADDS.h index 6e935dcd3d..f143443408 100644 --- a/Marlin/src/pins/pins_RADDS.h +++ b/Marlin/src/pins/pins_RADDS.h @@ -28,7 +28,7 @@ #error "Oops! Select 'Arduino Due' in 'Tools > Board.'" #endif -#define BOARD_NAME "RADDS" +#define BOARD_NAME "RADDS" // // Servos diff --git a/Marlin/src/pins/pins_RAMPS4DUE.h b/Marlin/src/pins/pins_RAMPS4DUE.h index 717a12c742..dc56d814dc 100644 --- a/Marlin/src/pins/pins_RAMPS4DUE.h +++ b/Marlin/src/pins/pins_RAMPS4DUE.h @@ -42,9 +42,7 @@ #error "Oops! Select 'Arduino Due' or 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'" #endif -#ifndef BOARD_NAME - #define BOARD_NAME "RAMPS4DUE" -#endif +#define BOARD_NAME "RAMPS4DUE" #define IS_RAMPS4DUE #include "pins_RAMPS.h" diff --git a/Marlin/src/pins/pins_RAMPS_DUO.h b/Marlin/src/pins/pins_RAMPS_DUO.h index 264882d8ae..87683f07cc 100644 --- a/Marlin/src/pins/pins_RAMPS_DUO.h +++ b/Marlin/src/pins/pins_RAMPS_DUO.h @@ -46,9 +46,7 @@ #error "Oops! Select 'Arduino Due' or 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'" #endif -#ifndef BOARD_NAME - #define BOARD_NAME "RAMPS Duo" -#endif +#define BOARD_NAME "RAMPS Duo" #define IS_RAMPS_DUO #include "pins_RAMPS.h" diff --git a/Marlin/src/pins/pins_RAMPS_FD_V1.h b/Marlin/src/pins/pins_RAMPS_FD_V1.h index 160b091d57..f365add05b 100644 --- a/Marlin/src/pins/pins_RAMPS_FD_V1.h +++ b/Marlin/src/pins/pins_RAMPS_FD_V1.h @@ -32,7 +32,7 @@ #endif #ifndef BOARD_NAME - #define BOARD_NAME "RAMPS-FD" + #define BOARD_NAME "RAMPS-FD v1" #endif #define INVERTED_HEATER_PINS diff --git a/Marlin/src/pins/pins_RAMPS_FD_V2.h b/Marlin/src/pins/pins_RAMPS_FD_V2.h index dec5cf4d53..d4d7012557 100644 --- a/Marlin/src/pins/pins_RAMPS_FD_V2.h +++ b/Marlin/src/pins/pins_RAMPS_FD_V2.h @@ -27,7 +27,7 @@ * Use 1k thermistor tables */ -#define BOARD_NAME "RAMPS-FD v2" +#define BOARD_NAME "RAMPS-FD v2" #ifndef E0_CS_PIN #define E0_CS_PIN 69 // moved from A13 to A15 on v2.2, if not earlier diff --git a/Marlin/src/pins/pins_RAMPS_OLD.h b/Marlin/src/pins/pins_RAMPS_OLD.h index 81f930e956..630ac970c0 100644 --- a/Marlin/src/pins/pins_RAMPS_OLD.h +++ b/Marlin/src/pins/pins_RAMPS_OLD.h @@ -28,7 +28,7 @@ #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'" #endif -#define BOARD_NAME "MEGA/RAMPS <1.2" +#define BOARD_NAME "RAMPS <1.2" // Uncomment the following line for RAMPS v1.0 //#define RAMPS_V_1_0 diff --git a/Marlin/src/pins/pins_RAMPS_PLUS.h b/Marlin/src/pins/pins_RAMPS_PLUS.h index 5169c1e679..3a945353cc 100644 --- a/Marlin/src/pins/pins_RAMPS_PLUS.h +++ b/Marlin/src/pins/pins_RAMPS_PLUS.h @@ -41,9 +41,7 @@ #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'" #endif -#ifndef BOARD_NAME - #define BOARD_NAME "RAMPS 1.4 Plus" -#endif +#define BOARD_NAME "RAMPS 1.4 Plus" #define RAMPS_D8_PIN 10 #define RAMPS_D10_PIN 8 diff --git a/Marlin/src/pins/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/pins_RAMPS_RE_ARM.h index 79e8c8d7c1..1d583cbafa 100644 --- a/Marlin/src/pins/pins_RAMPS_RE_ARM.h +++ b/Marlin/src/pins/pins_RAMPS_RE_ARM.h @@ -34,15 +34,13 @@ * */ -// numbers in parenthesis () are the mega2560 equivalent pin numbers +// Numbers in parentheses () are the corresponding mega2560 pin numbers #ifndef TARGET_LPC1768 #error "Oops! Make sure you have the LPC1768 environment selected in your IDE." #endif -#ifndef BOARD_NAME - #define BOARD_NAME "Re-ARM RAMPS 1.4" -#endif +#define BOARD_NAME "Re-ARM RAMPS 1.4" // // Servos diff --git a/Marlin/src/pins/pins_RAMPS_SMART.h b/Marlin/src/pins/pins_RAMPS_SMART.h index 8788d03b52..b85bf8df03 100644 --- a/Marlin/src/pins/pins_RAMPS_SMART.h +++ b/Marlin/src/pins/pins_RAMPS_SMART.h @@ -63,9 +63,7 @@ #error "Oops! Select 'Arduino Due' in 'Tools > Board.'" #endif -#ifndef BOARD_NAME - #define BOARD_NAME "RAMPS-SMART" -#endif +#define BOARD_NAME "RAMPS-SMART" #define IS_RAMPS_SMART #include "pins_RAMPS.h" diff --git a/Marlin/src/pins/pins_RURAMPS4D_11.h b/Marlin/src/pins/pins_RURAMPS4D_11.h index 564fbb5149..c1fff4786a 100644 --- a/Marlin/src/pins/pins_RURAMPS4D_11.h +++ b/Marlin/src/pins/pins_RURAMPS4D_11.h @@ -36,9 +36,7 @@ #error "Oops! Select 'Arduino Due' in 'Tools > Board.'" #endif -#ifndef BOARD_NAME - #define BOARD_NAME "RuRAMPS4Due v1.1" -#endif +#define BOARD_NAME "RuRAMPS4Due v1.1" // // Servos diff --git a/Marlin/src/pins/pins_RURAMPS4D_13.h b/Marlin/src/pins/pins_RURAMPS4D_13.h index 521f0e99ab..c15b7fffca 100644 --- a/Marlin/src/pins/pins_RURAMPS4D_13.h +++ b/Marlin/src/pins/pins_RURAMPS4D_13.h @@ -36,9 +36,7 @@ #error "Oops! Select 'Arduino Due' in 'Tools > Board.'" #endif -#ifndef BOARD_NAME - #define BOARD_NAME "RuRAMPS4Due v1.3" -#endif +#define BOARD_NAME "RuRAMPS4Due v1.3" // // Servos diff --git a/Marlin/src/pins/pins_SELENA_COMPACT.h b/Marlin/src/pins/pins_SELENA_COMPACT.h index 14c5f05975..ce2324c30e 100644 --- a/Marlin/src/pins/pins_SELENA_COMPACT.h +++ b/Marlin/src/pins/pins_SELENA_COMPACT.h @@ -29,10 +29,8 @@ #error "Oops! Make sure you have the LPC1768 environment selected in your IDE." #endif -#ifndef BOARD_NAME - #define BOARD_NAME "Selena Compact" - #define DEFAULT_WEBSITE_URL "https://github.com/Ales2-k/Selena" -#endif +#define BOARD_NAME "Selena Compact" +#define DEFAULT_WEBSITE_URL "https://github.com/Ales2-k/Selena" // // Limit Switches diff --git a/Marlin/src/pins/pins_SILVER_GATE.h b/Marlin/src/pins/pins_SILVER_GATE.h index 372a22459d..09bd33024c 100644 --- a/Marlin/src/pins/pins_SILVER_GATE.h +++ b/Marlin/src/pins/pins_SILVER_GATE.h @@ -24,9 +24,7 @@ #error "Oops! Select 'Silvergate' in 'Tools > Board.'" #endif -#ifndef BOARD_NAME - #define BOARD_NAME "Silver Gate" -#endif +#define BOARD_NAME "Silver Gate" #define X_STEP_PIN 43 #define X_DIR_PIN 44 diff --git a/Marlin/src/pins/pins_SMOOTHIEBOARD.h b/Marlin/src/pins/pins_SMOOTHIEBOARD.h index f10771780a..7e12ec66f2 100644 --- a/Marlin/src/pins/pins_SMOOTHIEBOARD.h +++ b/Marlin/src/pins/pins_SMOOTHIEBOARD.h @@ -29,10 +29,8 @@ #error "Oops! Make sure you have the LPC1768 environment selected in your IDE." #endif -#ifndef BOARD_NAME - #define BOARD_NAME "Smoothieboard" - #define DEFAULT_WEBSITE_URL "http://smoothieware.org/smoothieboard" -#endif +#define BOARD_NAME "Smoothieboard" +#define DEFAULT_WEBSITE_URL "http://smoothieware.org/smoothieboard" #undef F_CPU #define F_CPU 120000000 diff --git a/Marlin/src/pins/pins_TEENSY2.h b/Marlin/src/pins/pins_TEENSY2.h index 714d15ebed..beb7ca0011 100644 --- a/Marlin/src/pins/pins_TEENSY2.h +++ b/Marlin/src/pins/pins_TEENSY2.h @@ -110,7 +110,7 @@ #error "Oops! Select 'Teensy++ 2.0' or 'Printrboard' in 'Tools > Board.'" #endif -#define BOARD_NAME "Teensy++2.0" +#define BOARD_NAME "Teensy++2.0" // // Limit Switches diff --git a/Marlin/src/pins/pins_TEENSYLU.h b/Marlin/src/pins/pins_TEENSYLU.h index d3195105a6..13002607ac 100755 --- a/Marlin/src/pins/pins_TEENSYLU.h +++ b/Marlin/src/pins/pins_TEENSYLU.h @@ -77,7 +77,7 @@ #error "Oops! Select 'Teensy++ 2.0' or 'Printrboard' in 'Tools > Board.'" #endif -#define BOARD_NAME "Teensylu" +#define BOARD_NAME "Teensylu" // // Limit Switch definitions that match the SCHEMATIC diff --git a/Marlin/src/pins/pins_TRIGORILLA_13.h b/Marlin/src/pins/pins_TRIGORILLA_13.h index 0907eaf286..ee0687439e 100644 --- a/Marlin/src/pins/pins_TRIGORILLA_13.h +++ b/Marlin/src/pins/pins_TRIGORILLA_13.h @@ -24,9 +24,7 @@ * Arduino Mega with RAMPS v1.3 for Anycubic */ -#ifndef BOARD_NAME - #define BOARD_NAME "Anycubic RAMPS 1.3" -#endif +#define BOARD_NAME "Anycubic RAMPS 1.3" #define IS_RAMPS_EFB #define RAMPS_D9_PIN 44 diff --git a/Marlin/src/pins/pins_TRIGORILLA_14.h b/Marlin/src/pins/pins_TRIGORILLA_14.h index afadbe0d55..5e9b58be7d 100644 --- a/Marlin/src/pins/pins_TRIGORILLA_14.h +++ b/Marlin/src/pins/pins_TRIGORILLA_14.h @@ -24,9 +24,7 @@ * Arduino Mega with RAMPS v1.4 for Anycubic */ -#ifndef BOARD_NAME - #define BOARD_NAME "Anycubic RAMPS 1.4" -#endif +#define BOARD_NAME "Anycubic RAMPS 1.4" // Labeled pins #define TRIGORILLA_HEATER_BED_PIN 8 diff --git a/Marlin/src/pins/pins_ULTRATRONICS_PRO.h b/Marlin/src/pins/pins_ULTRATRONICS_PRO.h index 832a7e20e8..1a3f90e7b4 100644 --- a/Marlin/src/pins/pins_ULTRATRONICS_PRO.h +++ b/Marlin/src/pins/pins_ULTRATRONICS_PRO.h @@ -24,13 +24,12 @@ * ReprapWorld ULTRATRONICS v1.0 */ -#define KNOWN_BOARD -#define BOARD_NAME "Ultratronics v1.0" - #ifndef ARDUINO_ARCH_SAM #error "Oops! Select 'Arduino Due' in 'Tools > Board.'" #endif +#define BOARD_NAME "Ultratronics v1.0" + // // Servos // -- GitLab