Clean up BOARD_NAME in pins

2019-07-09 21:29:14 -05:00 · 2019-07-09 21:29:14 -05:00 · cb60001784
parent c0e917ea83
commit cb60001784
38 changed files with 69 additions and 71 deletions
--- a/Marlin/src/pins/pins_3DRAG.h
+++ b/Marlin/src/pins/pins_3DRAG.h
@ -30,7 +30,7 @@
 #endif

 #ifndef DEFAULT_MACHINE_NAME
-  #define DEFAULT_MACHINE_NAME "3Drag"
+  #define DEFAULT_MACHINE_NAME BOARD_NAME
 #endif

 #ifndef DEFAULT_SOURCE_CODE_URL
--- a/Marlin/src/pins/pins_ARMED.h
+++ b/Marlin/src/pins/pins_ARMED.h
@ -25,14 +25,10 @@
  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
 #endif

-#ifndef ARMED_V1_0
-  #define ARMED_V1_1
-#endif
+#define ARMED_V1_1

-#define DEFAULT_MACHINE_NAME "Arm'ed"
-
-#undef BOARD_NAME
-#define BOARD_NAME "Arm'ed"
+#define BOARD_NAME           "Arm'ed"
+#define DEFAULT_MACHINE_NAME BOARD_NAME

 #define I2C_EEPROM

@ -90,10 +86,10 @@
 #define E0_DIR_PIN         PB6
 #define E0_CS_PIN          PB4

-#ifdef ARMED_V1_0
-  #define E0_ENABLE_PIN    PB3
-#else
+#ifdef ARMED_V1_1
  #define E0_ENABLE_PIN    PC12
+#else
+  #define E0_ENABLE_PIN    PB3
 #endif

 #ifdef ARMED_SWAP_X_E1
--- a/Marlin/src/pins/pins_AZTEEG_X5_GT.h
+++ b/Marlin/src/pins/pins_AZTEEG_X5_GT.h
@ -30,7 +30,7 @@
 #endif

 #define BOARD_NAME        "Azteeg X5 GT"
-#define BOARD_WEBSITE_URL "https://www.panucatt.com/azteeg_X5_GT_reprap_3d_printer_controller_p/ax5gt.htm"
+#define BOARD_WEBSITE_URL "https://tinyurl.com/yx8tdqa3"

 //
 //  Set CPU
--- a/Marlin/src/pins/pins_AZTEEG_X5_MINI_WIFI.h
+++ b/Marlin/src/pins/pins_AZTEEG_X5_MINI_WIFI.h
@ -29,7 +29,7 @@
  #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
 #endif

-#define BOARD_NAME        "Azteeg X5 MINI WIFI"
+#define BOARD_NAME "Azteeg X5 MINI WIFI"

 //
 // DIGIPOT slave addresses
--- a/Marlin/src/pins/pins_BEAST.h
+++ b/Marlin/src/pins/pins_BEAST.h
@ -29,8 +29,8 @@
 * 21017 Victor Perez Marlin for stm32f1 test
 */

+#define BOARD_NAME "Beast STM32"
 #define DEFAULT_MACHINE_NAME "STM32F103RET6"
-#define BOARD_NAME "Marlin for STM32"

 // Enable I2C_EEPROM for testing
 #define I2C_EEPROM
--- a/Marlin/src/pins/pins_BLACK_STM32F407VE.h
+++ b/Marlin/src/pins/pins_BLACK_STM32F407VE.h
@ -33,8 +33,11 @@
  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
 #endif

+#ifndef BOARD_NAME
+  #define BOARD_NAME "Black STM32F4VET6"
+#endif
+
 #define DEFAULT_MACHINE_NAME "STM32F407VET6"
-//#define BOARD_NAME "Black STM32F4VET6"

 //#define I2C_EEPROM
 //#define E2END 0x1FFF // EEPROM end address (8kB)
--- a/Marlin/src/pins/pins_CHITU3D.h
+++ b/Marlin/src/pins/pins_CHITU3D.h
@ -29,8 +29,8 @@
 * 2017 Victor Perez Marlin for stm32f1 test
 */

+#define BOARD_NAME           "Chitu3D"
 #define DEFAULT_MACHINE_NAME "STM32F103RET6"
-#define BOARD_NAME "Chitu3d Marlin"

 // Enable I2C_EEPROM for testing
 //#define I2C_EEPROM
--- a/Marlin/src/pins/pins_DUPLICATOR_I3_PLUS.h
+++ b/Marlin/src/pins/pins_DUPLICATOR_I3_PLUS.h
@ -29,7 +29,7 @@
  #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
 #endif

-#define BOARD_NAME         "Duplicator i3 Plus"
+#define BOARD_NAME "Duplicator i3 Plus"

 //
 // Limit Switches
--- a/Marlin/src/pins/pins_FORMBOT_RAPTOR.h
+++ b/Marlin/src/pins/pins_FORMBOT_RAPTOR.h
@ -33,12 +33,8 @@
  #error "Formbot supports up to 3 hotends / E-steppers. Comment this line to keep going."
 #endif

-#ifndef DEFAULT_MACHINE_NAME
-  #define DEFAULT_MACHINE_NAME "Formbot Raptor"
-#endif
-#ifndef BOARD_NAME
-  #define BOARD_NAME           "Formbot Raptor"
-#endif
+#define BOARD_NAME           "Formbot Raptor"
+#define DEFAULT_MACHINE_NAME BOARD_NAME

 //
 // Servos
--- a/Marlin/src/pins/pins_FORMBOT_RAPTOR2.h
+++ b/Marlin/src/pins/pins_FORMBOT_RAPTOR2.h
@ -25,8 +25,8 @@
 * Formbot Raptor 2 pin assignments
 */

-#define DEFAULT_MACHINE_NAME "Formbot Raptor2"
 #define BOARD_NAME           "Formbot Raptor2"
+#define DEFAULT_MACHINE_NAME BOARD_NAME

 #define FAN_PIN             6

--- a/Marlin/src/pins/pins_FORMBOT_TREX2PLUS.h
+++ b/Marlin/src/pins/pins_FORMBOT_TREX2PLUS.h
@ -33,8 +33,8 @@
  #error "Formbot supports up to 2 hotends / E-steppers. Comment this line to keep going."
 #endif

-#define DEFAULT_MACHINE_NAME "Formbot"
 #define BOARD_NAME           "Formbot"
+#define DEFAULT_MACHINE_NAME BOARD_NAME

 //
 // Servos
--- a/Marlin/src/pins/pins_FORMBOT_TREX3.h
+++ b/Marlin/src/pins/pins_FORMBOT_TREX3.h
@ -33,8 +33,8 @@
  #error "Formbot supports up to 2 hotends / E-steppers. Comment this line to keep going."
 #endif

-#define DEFAULT_MACHINE_NAME "Formbot"
 #define BOARD_NAME           "Formbot"
+#define DEFAULT_MACHINE_NAME BOARD_NAME

 //
 // Servos
--- a/Marlin/src/pins/pins_FYSETC_CHEETAH.h
+++ b/Marlin/src/pins/pins_FYSETC_CHEETAH.h
@ -27,7 +27,7 @@

 #define DEFAULT_MACHINE_NAME "3D Printer"

-#define BOARD_NAME "FYSETC CHEETAH"
+#define BOARD_NAME        "FYSETC Cheetah"
 #define BOARD_WEBSITE_URL "https://fysetc.com"

 // Ignore temp readings during develpment.
--- a/Marlin/src/pins/pins_GTM32_PRO_VB.h
+++ b/Marlin/src/pins/pins_GTM32_PRO_VB.h
@ -30,8 +30,8 @@
  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
 #endif

+#define BOARD_NAME           "GTM32 Pro VB"
 #define DEFAULT_MACHINE_NAME "STM32F103VET6"
-#define BOARD_NAME "GTM32 Pro VB"

 //#define DISABLE_DEBUG

--- a/Marlin/src/pins/pins_K8400.h
+++ b/Marlin/src/pins/pins_K8400.h
@ -32,8 +32,8 @@
 *  - Second heater has moved pin
 */

-#define DEFAULT_MACHINE_NAME    "Vertex"
 #define BOARD_NAME              "K8400"
+#define DEFAULT_MACHINE_NAME    "Vertex"

 #include "pins_3DRAG.h"

--- a/Marlin/src/pins/pins_K8800.h
+++ b/Marlin/src/pins/pins_K8800.h
@ -29,8 +29,8 @@
  #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
 #endif

-#define DEFAULT_MACHINE_NAME "Vertex Delta"
 #define BOARD_NAME           "K8800"
+#define DEFAULT_MACHINE_NAME "Vertex Delta"

 //#define LCD_SCREEN_ROT_180

--- a/Marlin/src/pins/pins_MAKEBOARD_MINI.h
+++ b/Marlin/src/pins/pins_MAKEBOARD_MINI.h
@ -21,20 +21,13 @@
 */
 #pragma once

-#include "pins_RAMPS.h"
-
-#undef BOARD_NAME
-#define BOARD_NAME "MAKEBOARD_MINI"
+#define BOARD_NAME "MAKEboard Mini"

 //
 // Only 3 Limit Switch plugs on Micromake C1
 //
-#undef X_MIN_PIN
-#undef Y_MIN_PIN
-#undef Z_MIN_PIN
-#undef X_MAX_PIN
-#undef Y_MAX_PIN
-#undef Z_MAX_PIN
 #define X_STOP_PIN          2
 #define Y_STOP_PIN         15
 #define Z_STOP_PIN         19
+
+#include "pins_RAMPS.h"
--- a/Marlin/src/pins/pins_MALYAN_M200.h
+++ b/Marlin/src/pins/pins_MALYAN_M200.h
@ -29,7 +29,7 @@
  #error "Oops! You must be compiling for STM32."
 #endif

-#define BOARD_NAME "MALYANM200"
+#define BOARD_NAME "Malyan M200"

 // Enable EEPROM Emulation for this board
 // This setting should probably be in configuration.h
--- a/Marlin/src/pins/pins_MEGATRONICS_2.h
+++ b/Marlin/src/pins/pins_MEGATRONICS_2.h
@ -29,7 +29,7 @@
  #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
 #endif

-#define BOARD_NAME         "Megatronics v2.0"
+#define BOARD_NAME "Megatronics v2.0"
 //
 // Limit Switches
 //
--- a/Marlin/src/pins/pins_MIGHTYBOARD_REVE.h
+++ b/Marlin/src/pins/pins_MIGHTYBOARD_REVE.h
@ -41,8 +41,8 @@
  #error "Oops! Select 'Mega 1280' or 'Mega 2560' in 'Tools > Board.'"
 #endif

-#define DEFAULT_MACHINE_NAME    "MB Replicator"
-#define BOARD_NAME              "Mightyboard"
+#define BOARD_NAME           "Mightyboard"
+#define DEFAULT_MACHINE_NAME "MB Replicator"

 //
 // Servos
--- a/Marlin/src/pins/pins_MKS_SGEN.h
+++ b/Marlin/src/pins/pins_MKS_SGEN.h
@ -29,7 +29,7 @@
  #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
 #endif

-#define BOARD_NAME        "MKS SGEN"
+#define BOARD_NAME        "MKS SGen"
 #define BOARD_WEBSITE_URL "https://github.com/makerbase-mks/MKS-SGEN"

 #include "pins_MKS_SBASE.h"
--- a/Marlin/src/pins/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/pins_MKS_SGEN_L.h
@ -29,7 +29,7 @@
  #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
 #endif

-#define BOARD_NAME        "MKS SGEN-L"
+#define BOARD_NAME        "MKS SGen-L"
 #define BOARD_WEBSITE_URL "https://github.com/makerbase-mks/MKS-SGEN_L"

 //
--- a/Marlin/src/pins/pins_REMRAM_V1.h
+++ b/Marlin/src/pins/pins_REMRAM_V1.h
@ -25,10 +25,10 @@
  #error "Oops! Select an STM32F7 board in 'Tools > Board.'"
 #endif

+#define BOARD_NAME           "RemRam v1"
 #define DEFAULT_MACHINE_NAME "RemRam"
-#define BOARD_NAME "RemRam v1"

-#define EEPROM_EMULATED_WITH_SRAM // Emulate the EEPROM using Backup SRAM
+#define SRAM_EEPROM_EMULATION // Emulate the EEPROM using Backup SRAM

 #if HOTENDS > 1 || E_STEPPERS > 1
  #error "RemRam supports only one hotend / E-stepper."
--- a/Marlin/src/pins/pins_RIGIDBOARD.h
+++ b/Marlin/src/pins/pins_RIGIDBOARD.h
@ -25,7 +25,9 @@
 * RIGIDBOARD Arduino Mega with RAMPS v1.4 pin assignments
 */

-#define BOARD_NAME "RigidBoard"
+#ifndef BOARD_NAME
+  #define BOARD_NAME "RigidBoard"
+#endif

 //
 // Z Probe (when not Z_MIN_PIN)
--- a/Marlin/src/pins/pins_RIGIDBOARD_V2.h
+++ b/Marlin/src/pins/pins_RIGIDBOARD_V2.h
@ -25,11 +25,10 @@
 * RIGIDBOARD V2 Arduino Mega with RAMPS v1.4 pin assignments
 */

-#include "pins_RIGIDBOARD.h"
-
-#undef BOARD_NAME
 #define BOARD_NAME "RigidBoard V2"

+#include "pins_RIGIDBOARD.h"
+
 //
 // Steppers
 //
--- a/Marlin/src/pins/pins_RL200.h
+++ b/Marlin/src/pins/pins_RL200.h
@ -26,8 +26,8 @@
 * extruder motors due to dual Z motors. Pinout therefore based on pins_RUMBA.h.
 */

-#define DEFAULT_MACHINE_NAME "Rapide Lite 200"
 #define BOARD_NAME "RL200"
+#define DEFAULT_MACHINE_NAME "Rapide Lite 200"

 #if HOTENDS > 2 || E_STEPPERS > 2
  #error "RL200v1 supports up to 2 hotends / E-steppers. Comment out this line to continue."
--- a/Marlin/src/pins/pins_RUMBA.h
+++ b/Marlin/src/pins/pins_RUMBA.h
@ -33,12 +33,12 @@
  #error "RUMBA supports up to 3 hotends / E-steppers. Comment out this line to continue."
 #endif

-#ifndef DEFAULT_MACHINE_NAME
-  #define DEFAULT_MACHINE_NAME "Rumba"
-#endif
 #ifndef BOARD_NAME
  #define BOARD_NAME "Rumba"
 #endif
+#ifndef DEFAULT_MACHINE_NAME
+  #define DEFAULT_MACHINE_NAME BOARD_NAME
+#endif

 //
 // Servos
--- a/Marlin/src/pins/pins_RUMBA32.h
+++ b/Marlin/src/pins/pins_RUMBA32.h
@ -26,8 +26,8 @@
 #endif

 #define RUMBA32_V1_0
-#define DEFAULT_MACHINE_NAME "RUMBA32"
-#define BOARD_NAME "RUMBA32"
+#define BOARD_NAME           "RUMBA32"
+#define DEFAULT_MACHINE_NAME BOARD_NAME

 //#define I2C_EEPROM

--- a/Marlin/src/pins/pins_RUMBA_RAISE3D.h
+++ b/Marlin/src/pins/pins_RUMBA_RAISE3D.h
@ -21,8 +21,8 @@
 */
 #pragma once

-#define DEFAULT_MACHINE_NAME "Raise3D N Series"
 #define BOARD_NAME           "Raise3D Rumba"
+#define DEFAULT_MACHINE_NAME "Raise3D N Series"

 // Raise3D uses thermocouples on the standard input pins
 #define TEMP_0_PIN         15   // Analog Input
--- a/Marlin/src/pins/pins_SAV_MKI.h
+++ b/Marlin/src/pins/pins_SAV_MKI.h
@ -66,9 +66,9 @@
  #error "Oops! Select 'Teensy++ 2.0' or 'Printrboard' in 'Tools > Board.'"
 #endif

-#define DEFAULT_MACHINE_NAME    "SAV MkI"
-#define DEFAULT_SOURCE_CODE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
 #define BOARD_NAME              "SAV MkI"
+#define DEFAULT_MACHINE_NAME    BOARD_NAME
+#define DEFAULT_SOURCE_CODE_URL "https://tinyurl.com/onru38b"

 //
 // Servos
--- a/Marlin/src/pins/pins_STB_11.h
+++ b/Marlin/src/pins/pins_STB_11.h
@ -26,4 +26,5 @@
 */

 #define BOARD_NAME "STB V1.1"
+
 #include "pins_SANGUINOLOLU_12.h"
--- a/Marlin/src/pins/pins_STM32F1R.h
+++ b/Marlin/src/pins/pins_STM32F1R.h
@ -29,8 +29,8 @@
 * 21017 Victor Perez Marlin for stm32f1 test
 */

+#define BOARD_NAME           "Misc. STM32F1R"
 #define DEFAULT_MACHINE_NAME "STM32F103RET6"
-#define BOARD_NAME "Marlin for STM32"

 // Ignore temp readings during develpment.
 #define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
--- a/Marlin/src/pins/pins_STM32F4.h
+++ b/Marlin/src/pins/pins_STM32F4.h
@ -25,8 +25,8 @@
  #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
 #endif

+#define BOARD_NAME           "Misc. STM32F4"
 #define DEFAULT_MACHINE_NAME "STM32F407VET6"
-#define BOARD_NAME "STM32F4 Board"

 //#define I2C_EEPROM

--- a/Marlin/src/pins/pins_STM3R_MINI.h
+++ b/Marlin/src/pins/pins_STM3R_MINI.h
@ -29,8 +29,8 @@
 * 21017 Victor Perez Marlin for stm32f1 test
 */

-#define DEFAULT_MACHINE_NAME "STM3R Mini"
-#define BOARD_NAME "Marlin for STM32"
+#define BOARD_NAME           "STM3R Mini"
+#define DEFAULT_MACHINE_NAME BOARD_NAME

 // Enable I2C_EEPROM for testing
 #define I2C_EEPROM
--- a/Marlin/src/pins/pins_THE_BORG.h
+++ b/Marlin/src/pins/pins_THE_BORG.h
@ -25,8 +25,8 @@
  #error "Oops! Select an STM32F7 board in 'Tools > Board.'"
 #endif

-#define DEFAULT_MACHINE_NAME "The-Borge"
-#define BOARD_NAME "The-Borge"
+#define BOARD_NAME           "The-Borge"
+#define DEFAULT_MACHINE_NAME BOARD_NAME

 #define E2END 0xFFF   // EEPROM end address

--- a/Marlin/src/pins/pins_ULTIMAIN_2.h
+++ b/Marlin/src/pins/pins_ULTIMAIN_2.h
@ -37,9 +37,9 @@
  #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
 #endif

+#define BOARD_NAME              "Ultimaker 2.x"
 #define DEFAULT_MACHINE_NAME    "Ultimaker"
 #define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"
-#define BOARD_NAME              "Ultimaker 2.x"

 //
 // Limit Switches
--- a/Marlin/src/pins/pins_ULTIMAKER.h
+++ b/Marlin/src/pins/pins_ULTIMAKER.h
@ -37,9 +37,9 @@
  #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
 #endif

-#define DEFAULT_MACHINE_NAME    "Ultimaker"
-#define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"
 #define BOARD_NAME              "Ultimaker"
+#define DEFAULT_MACHINE_NAME    BOARD_NAME
+#define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"

 //
 // Servos
--- a/Marlin/src/pins/pins_ULTIMAKER_OLD.h
+++ b/Marlin/src/pins/pins_ULTIMAKER_OLD.h
@ -64,9 +64,17 @@
  #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
 #endif

+#ifdef BOARD_REV_1_1_TO_1_3
+  #define BOARD_NAME            "Ultimaker 1.1-1.3"
+#elif defined(BOARD_REV_1_0)
+  #define BOARD_NAME            "Ultimaker 1.0"
+#elif defined(BOARD_REV_1_5)
+  #define BOARD_NAME            "Ultimaker 1.5"
+#else
+  #define BOARD_NAME            "Ultimaker 1.5.4+"
+#endif
 #define DEFAULT_MACHINE_NAME    "Ultimaker"
 #define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"
-#define BOARD_NAME              "Ultimaker <1.5.4"

 //
 // Limit Switches