Clean up pins files

2018-11-14 00:23:18 -06:00 · 2018-11-14 00:23:18 -06:00 · 664e20754d
commit 664e20754d
parent 1eb5249598
46 changed files with 62 additions and 110 deletions
--- 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
--- 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

 //
 // Servos
--- 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

 //
 //  Set CPU
--- 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

 //
 // LED
--- 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

 //
 // Limit Switches
--- 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

 //
 // Servos
--- 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

 //
 // Servos
--- 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
--- 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

 //
 // Limit Switches
--- 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
--- 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
 //
--- 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 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
 *
--- a/Marlin/src/pins/pins_PRINTRBOARD_REVF.h
+++ b/Marlin/src/pins/pins_PRINTRBOARD_REVF.h
@ -71,6 +71,7 @@
 #endif

 #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
--- 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 IS_RAMPS4DUE
 #include "pins_RAMPS.h"
--- 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 IS_RAMPS_DUO
 #include "pins_RAMPS.h"
--- 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
--- 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
--- 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 RAMPS_D8_PIN  10
 #define RAMPS_D10_PIN  8
--- 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

 //
 // Servos
--- 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 IS_RAMPS_SMART
 #include "pins_RAMPS.h"
--- 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

 //
 // Servos
--- 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

 //
 // Servos
--- 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

 //
 // Limit Switches
--- 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 X_STEP_PIN         43
 #define X_DIR_PIN          44
--- 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

 #undef F_CPU
 #define F_CPU 120000000
--- 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 IS_RAMPS_EFB
 #define RAMPS_D9_PIN         44
--- 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

 // Labeled pins
 #define TRIGORILLA_HEATER_BED_PIN  8
--- 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
 //