From cb600017845f82abc9f6d20d72af13e98589b67f Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 9 Jul 2019 21:29:14 -0500 Subject: [PATCH] Clean up BOARD_NAME in pins --- Marlin/src/pins/pins_3DRAG.h | 2 +- Marlin/src/pins/pins_ARMED.h | 16 ++++++---------- Marlin/src/pins/pins_AZTEEG_X5_GT.h | 2 +- Marlin/src/pins/pins_AZTEEG_X5_MINI_WIFI.h | 2 +- Marlin/src/pins/pins_BEAST.h | 2 +- Marlin/src/pins/pins_BLACK_STM32F407VE.h | 5 ++++- Marlin/src/pins/pins_CHITU3D.h | 2 +- Marlin/src/pins/pins_DUPLICATOR_I3_PLUS.h | 2 +- Marlin/src/pins/pins_FORMBOT_RAPTOR.h | 8 ++------ Marlin/src/pins/pins_FORMBOT_RAPTOR2.h | 2 +- Marlin/src/pins/pins_FORMBOT_TREX2PLUS.h | 2 +- Marlin/src/pins/pins_FORMBOT_TREX3.h | 2 +- Marlin/src/pins/pins_FYSETC_CHEETAH.h | 2 +- Marlin/src/pins/pins_GTM32_PRO_VB.h | 2 +- Marlin/src/pins/pins_K8400.h | 2 +- Marlin/src/pins/pins_K8800.h | 2 +- Marlin/src/pins/pins_MAKEBOARD_MINI.h | 13 +++---------- Marlin/src/pins/pins_MALYAN_M200.h | 2 +- Marlin/src/pins/pins_MEGATRONICS_2.h | 2 +- Marlin/src/pins/pins_MIGHTYBOARD_REVE.h | 4 ++-- Marlin/src/pins/pins_MKS_SGEN.h | 2 +- Marlin/src/pins/pins_MKS_SGEN_L.h | 2 +- Marlin/src/pins/pins_REMRAM_V1.h | 4 ++-- Marlin/src/pins/pins_RIGIDBOARD.h | 4 +++- Marlin/src/pins/pins_RIGIDBOARD_V2.h | 5 ++--- Marlin/src/pins/pins_RL200.h | 2 +- Marlin/src/pins/pins_RUMBA.h | 6 +++--- Marlin/src/pins/pins_RUMBA32.h | 4 ++-- Marlin/src/pins/pins_RUMBA_RAISE3D.h | 2 +- Marlin/src/pins/pins_SAV_MKI.h | 4 ++-- Marlin/src/pins/pins_STB_11.h | 1 + Marlin/src/pins/pins_STM32F1R.h | 2 +- Marlin/src/pins/pins_STM32F4.h | 2 +- Marlin/src/pins/pins_STM3R_MINI.h | 4 ++-- Marlin/src/pins/pins_THE_BORG.h | 4 ++-- Marlin/src/pins/pins_ULTIMAIN_2.h | 2 +- Marlin/src/pins/pins_ULTIMAKER.h | 4 ++-- Marlin/src/pins/pins_ULTIMAKER_OLD.h | 10 +++++++++- 38 files changed, 69 insertions(+), 71 deletions(-) diff --git a/Marlin/src/pins/pins_3DRAG.h b/Marlin/src/pins/pins_3DRAG.h index a7e686eef..ad35968fd 100644 --- 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 diff --git a/Marlin/src/pins/pins_ARMED.h b/Marlin/src/pins/pins_ARMED.h index 396495ea8..5f2a5df04 100644 --- 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 diff --git a/Marlin/src/pins/pins_AZTEEG_X5_GT.h b/Marlin/src/pins/pins_AZTEEG_X5_GT.h index 11dd45a6a..fed88b465 100755 --- 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 diff --git a/Marlin/src/pins/pins_AZTEEG_X5_MINI_WIFI.h b/Marlin/src/pins/pins_AZTEEG_X5_MINI_WIFI.h index 03005ecb4..6cbdb335f 100644 --- 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 diff --git a/Marlin/src/pins/pins_BEAST.h b/Marlin/src/pins/pins_BEAST.h index 57efda845..efbc732e5 100644 --- 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 diff --git a/Marlin/src/pins/pins_BLACK_STM32F407VE.h b/Marlin/src/pins/pins_BLACK_STM32F407VE.h index 026648589..516d310f1 100644 --- 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) diff --git a/Marlin/src/pins/pins_CHITU3D.h b/Marlin/src/pins/pins_CHITU3D.h index 59f6b66bb..3fa5338c1 100644 --- 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 diff --git a/Marlin/src/pins/pins_DUPLICATOR_I3_PLUS.h b/Marlin/src/pins/pins_DUPLICATOR_I3_PLUS.h index 94585715e..290637eb7 100644 --- 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 diff --git a/Marlin/src/pins/pins_FORMBOT_RAPTOR.h b/Marlin/src/pins/pins_FORMBOT_RAPTOR.h index 1c121cc3f..a6bd6ed63 100644 --- 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 diff --git a/Marlin/src/pins/pins_FORMBOT_RAPTOR2.h b/Marlin/src/pins/pins_FORMBOT_RAPTOR2.h index e89167e98..5bc70cf0f 100644 --- 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 diff --git a/Marlin/src/pins/pins_FORMBOT_TREX2PLUS.h b/Marlin/src/pins/pins_FORMBOT_TREX2PLUS.h index f1dfd3188..6b7e7f67c 100644 --- 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 diff --git a/Marlin/src/pins/pins_FORMBOT_TREX3.h b/Marlin/src/pins/pins_FORMBOT_TREX3.h index 4ca2556d8..8866be7de 100644 --- 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 diff --git a/Marlin/src/pins/pins_FYSETC_CHEETAH.h b/Marlin/src/pins/pins_FYSETC_CHEETAH.h index c3be9431a..6562a1bb8 100644 --- 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. diff --git a/Marlin/src/pins/pins_GTM32_PRO_VB.h b/Marlin/src/pins/pins_GTM32_PRO_VB.h index 82a8e3955..4b195bf3d 100644 --- 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 diff --git a/Marlin/src/pins/pins_K8400.h b/Marlin/src/pins/pins_K8400.h index c3dd647d6..908b6e61e 100644 --- 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" diff --git a/Marlin/src/pins/pins_K8800.h b/Marlin/src/pins/pins_K8800.h index 98fcde5bc..22b5081db 100644 --- 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 diff --git a/Marlin/src/pins/pins_MAKEBOARD_MINI.h b/Marlin/src/pins/pins_MAKEBOARD_MINI.h index 30807d2a1..03f6ca039 100644 --- 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" diff --git a/Marlin/src/pins/pins_MALYAN_M200.h b/Marlin/src/pins/pins_MALYAN_M200.h index 63d0b8f9a..0d15441ad 100644 --- 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 diff --git a/Marlin/src/pins/pins_MEGATRONICS_2.h b/Marlin/src/pins/pins_MEGATRONICS_2.h index fa154555f..9a9b34d5f 100644 --- 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 // diff --git a/Marlin/src/pins/pins_MIGHTYBOARD_REVE.h b/Marlin/src/pins/pins_MIGHTYBOARD_REVE.h index 4cb493525..4b93add4c 100644 --- 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 diff --git a/Marlin/src/pins/pins_MKS_SGEN.h b/Marlin/src/pins/pins_MKS_SGEN.h index 330fee2dc..c0363a765 100644 --- 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" diff --git a/Marlin/src/pins/pins_MKS_SGEN_L.h b/Marlin/src/pins/pins_MKS_SGEN_L.h index c43ed141a..564cee19b 100644 --- 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" // diff --git a/Marlin/src/pins/pins_REMRAM_V1.h b/Marlin/src/pins/pins_REMRAM_V1.h index 409d47b2c..6e72bdc2e 100644 --- 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." diff --git a/Marlin/src/pins/pins_RIGIDBOARD.h b/Marlin/src/pins/pins_RIGIDBOARD.h index 4b472b652..f4b38d630 100644 --- 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) diff --git a/Marlin/src/pins/pins_RIGIDBOARD_V2.h b/Marlin/src/pins/pins_RIGIDBOARD_V2.h index 419726883..b9ccd45f1 100644 --- 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 // diff --git a/Marlin/src/pins/pins_RL200.h b/Marlin/src/pins/pins_RL200.h index af03ee8c4..381b882e9 100644 --- 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." diff --git a/Marlin/src/pins/pins_RUMBA.h b/Marlin/src/pins/pins_RUMBA.h index db3dff3c7..7f0af9b61 100644 --- 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 diff --git a/Marlin/src/pins/pins_RUMBA32.h b/Marlin/src/pins/pins_RUMBA32.h index f3fb0a3d4..4a6f4795e 100644 --- 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 diff --git a/Marlin/src/pins/pins_RUMBA_RAISE3D.h b/Marlin/src/pins/pins_RUMBA_RAISE3D.h index 8d5297c1b..d04695e29 100644 --- 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 diff --git a/Marlin/src/pins/pins_SAV_MKI.h b/Marlin/src/pins/pins_SAV_MKI.h index 82d763031..17928cd13 100644 --- 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 diff --git a/Marlin/src/pins/pins_STB_11.h b/Marlin/src/pins/pins_STB_11.h index 9f14f1b42..511b938c4 100644 --- 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" diff --git a/Marlin/src/pins/pins_STM32F1R.h b/Marlin/src/pins/pins_STM32F1R.h index 91de11a95..e202862d3 100644 --- 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 diff --git a/Marlin/src/pins/pins_STM32F4.h b/Marlin/src/pins/pins_STM32F4.h index 7ce1d2d6c..53bfd3de2 100644 --- 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 diff --git a/Marlin/src/pins/pins_STM3R_MINI.h b/Marlin/src/pins/pins_STM3R_MINI.h index acf2dfaf2..08f2a3a5d 100644 --- 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 diff --git a/Marlin/src/pins/pins_THE_BORG.h b/Marlin/src/pins/pins_THE_BORG.h index 141320f88..afefc788a 100644 --- 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 diff --git a/Marlin/src/pins/pins_ULTIMAIN_2.h b/Marlin/src/pins/pins_ULTIMAIN_2.h index f61f16c2f..fad53c87f 100644 --- 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 diff --git a/Marlin/src/pins/pins_ULTIMAKER.h b/Marlin/src/pins/pins_ULTIMAKER.h index d89505898..8d330ca7a 100644 --- 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 diff --git a/Marlin/src/pins/pins_ULTIMAKER_OLD.h b/Marlin/src/pins/pins_ULTIMAKER_OLD.h index f0c048f5a..fa14b740f 100644 --- 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