bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Prevent BOARD_NAME conflict with env

Browse Source
This commit is contained in:
Scott Lahteine
2019-08-20 19:08:58 -05:00
parent 33f6d77281
commit 0cc524b84f
164 changed files with 212 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/pins/mega/pins_CHEAPTRONIC.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Cheaptronic v1.0"
#define BOARD_INFO_NAME "Cheaptronic v1.0"
//
// Limit Switches
//

2
Marlin/src/pins/mega/pins_CHEAPTRONICv2.h
View File

@ -31,7 +31,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Cheaptronic v2.0"
#define BOARD_INFO_NAME "Cheaptronic v2.0"
//
// Limit Switches

2
Marlin/src/pins/mega/pins_CNCONTROLS_11.h
View File

@ -6,7 +6,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "CN Controls V11"
#define BOARD_INFO_NAME "CN Controls V11"
//
// Limit Switches

2
Marlin/src/pins/mega/pins_CNCONTROLS_12.h
View File

@ -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_INFO_NAME "CN Controls V12"
//
// Limit Switches

2
Marlin/src/pins/mega/pins_CNCONTROLS_15.h
View File

@ -6,7 +6,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "CN Controls V15"
#define BOARD_INFO_NAME "CN Controls V15"
//
// Servos

2
Marlin/src/pins/mega/pins_EINSTART-S.h
View File

@ -30,7 +30,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Einstart-S"
#define BOARD_INFO_NAME "Einstart-S"
//
// Limit Switches

2
Marlin/src/pins/mega/pins_ELEFU_3.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Elefu Ra v3"
#define BOARD_INFO_NAME "Elefu Ra v3"
//
// Limit Switches

4
Marlin/src/pins/mega/pins_GT2560_REV_A.h
View File

@ -31,8 +31,8 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#ifndef BOARD_NAME
#define BOARD_NAME "GT2560 Rev.A"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "GT2560 Rev.A"
#endif
#define DEFAULT_MACHINE_NAME "Prusa i3 Pro B"

2
Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h
View File

@ -25,7 +25,7 @@
* Geeetech GT2560 Revision A+ board pin assignments
*/
#define BOARD_NAME "GT2560 Rev.A+"
#define BOARD_INFO_NAME "GT2560 Rev.A+"
#include "pins_GT2560_REV_A.h"

4
Marlin/src/pins/mega/pins_GT2560_V3.h
View File

@ -29,8 +29,8 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#ifndef BOARD_NAME
#define BOARD_NAME "GT2560 V3.0"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "GT2560 V3.0"
#endif
//

2
Marlin/src/pins/mega/pins_GT2560_V3_MC2.h
View File

@ -25,7 +25,7 @@
* GT2560 V3.0 pin assignment (for Mecreator 2)
*****************************************************************/
#define BOARD_NAME "GT2560 V3.0 (MC2)"
#define BOARD_INFO_NAME "GT2560 V3.0 (MC2)"
#define X_MIN_PIN 22
#define X_MAX_PIN 24

2
Marlin/src/pins/mega/pins_LEAPFROG.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Mega 1280' or 'Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Leapfrog"
#define BOARD_INFO_NAME "Leapfrog"
//
// Limit Switches

2
Marlin/src/pins/mega/pins_MEGACONTROLLER.h
View File

@ -31,7 +31,7 @@
#error "Mega Controller supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "Mega Controller"
#define BOARD_INFO_NAME "Mega Controller"
//
// Servos

2
Marlin/src/pins/mega/pins_MEGATRONICS.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Megatronics"
#define BOARD_INFO_NAME "Megatronics"
//
// Limit Switches
//

2
Marlin/src/pins/mega/pins_MEGATRONICS_2.h
View File

@ -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_INFO_NAME "Megatronics v2.0"
//
// Limit Switches
//

6
Marlin/src/pins/mega/pins_MEGATRONICS_3.h
View File

@ -30,11 +30,11 @@
#endif
#if MB(MEGATRONICS_32)
#define BOARD_NAME "Megatronics v3.2"
#define BOARD_INFO_NAME "Megatronics v3.2"
#elif MB(MEGATRONICS_31)
#define BOARD_NAME "Megatronics v3.1"
#define BOARD_INFO_NAME "Megatronics v3.1"
#else
#define BOARD_NAME "Megatronics v3.0"
#define BOARD_INFO_NAME "Megatronics v3.0"
#endif
//

2
Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
View File

@ -41,7 +41,7 @@
#error "Oops! Select 'Mega 1280' or 'Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Mightyboard"
#define BOARD_INFO_NAME "Mightyboard"
#define DEFAULT_MACHINE_NAME "MB Replicator"
//

2
Marlin/src/pins/mega/pins_MINITRONICS.h
View File

@ -38,7 +38,7 @@
#error "Minitronics supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "Minitronics v1.0/1.1"
#define BOARD_INFO_NAME "Minitronics v1.0/1.1"
//
// Limit Switches
//

4
Marlin/src/pins/mega/pins_OVERLORD.h
View File

@ -31,8 +31,8 @@
#error "Overlord Controller supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "OVERLORD"
#define DEFAULT_MACHINE_NAME BOARD_NAME
#define BOARD_INFO_NAME "OVERLORD"
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
//
// Limit Switches

2
Marlin/src/pins/mega/pins_SILVER_GATE.h
View File

@ -25,7 +25,7 @@
#error "Oops! Select 'Silvergate' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Silver Gate"
#define BOARD_INFO_NAME "Silver Gate"
#define X_STEP_PIN 43
#define X_DIR_PIN 44

2
Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Wanhao i3 Mini 0ne+"
#define BOARD_INFO_NAME "Wanhao i3 Mini 0ne+"
#define DEFAULT_MACHINE_NAME "i3 Mini"
#define BOARD_WEBSITE_URL "https://tinyurl.com/yyxw7se7"