Skip to content

Commit 0cc524b

Browse files
thinkyheadthinkyhead
committed
Prevent BOARD_NAME conflict with env
1 parent 33f6d77 commit 0cc524b

File tree

164 files changed

+212
-212
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+212
-212
lines changed

‎Marlin/src/lcd/menu/menu_info.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ void menu_info_thermistors() {
165165
void menu_info_board() {
166166
if (ui.use_click()) return ui.goto_previous_screen();
167167
START_SCREEN();
168-
STATIC_ITEM(BOARD_NAME, true, true); // MyPrinterController
168+
STATIC_ITEM(BOARD_INFO_NAME, true, true); // MyPrinterController
169169
STATIC_ITEM(MSG_INFO_BAUDRATE ": " STRINGIFY(BAUDRATE), true); // Baud: 250000
170170
STATIC_ITEM(MSG_INFO_PROTOCOL ": " PROTOCOL_VERSION, true); // Protocol: 1.0
171171
STATIC_ITEM(MSG_INFO_PSU ": " PSU_NAME, true);

‎Marlin/src/pins/esp32/pins_ESP32.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"Oops! Select an ESP32 board in 'Tools > Board.'"
3030
#endif
3131

32-
#define BOARD_NAME "Espressif ESP32"
32+
#define BOARD_INFO_NAME "Espressif ESP32"
3333

3434
//
3535
// I2S (steppers & other output-only pins)

‎Marlin/src/pins/linux/pins_RAMPS_LINUX.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
* 7 | 11
4646
*/
4747

48-
#ifndef BOARD_NAME
49-
#define BOARD_NAME "RAMPS 1.4"
48+
#ifndef BOARD_INFO_NAME
49+
#define BOARD_INFO_NAME "RAMPS 1.4"
5050
#endif
5151

5252
#define E2END 0xFFF // 4KB

‎Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
3030
#endif
3131

32-
#define BOARD_NAME "AZSMZ MINI"
32+
#define BOARD_INFO_NAME "AZSMZ MINI"
3333

3434
//
3535
// Servos

‎Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.1.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
2626
#endif
2727

28-
#define BOARD_NAME "BIGTREE SKR 1.1"
28+
#define BOARD_INFO_NAME "BIGTREE SKR 1.1"
2929

3030
//
3131
// Limit Switches

‎Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
2626
#endif
2727

28-
#define BOARD_NAME "BIGTREE SKR 1.3"
28+
#define BOARD_INFO_NAME "BIGTREE SKR 1.3"
2929

3030
// Ignore temp readings during development.
3131
//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000

‎Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
3535
#endif
3636

37-
#ifndef BOARD_NAME
38-
#define BOARD_NAME "BIQU Thunder B300 V1.0"
37+
#ifndef BOARD_INFO_NAME
38+
#define BOARD_INFO_NAME "BIQU Thunder B300 V1.0"
3939
#endif
4040

4141
//

‎Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
3535
#endif
3636

37-
#define BOARD_NAME "BIQU BQ111-A4"
37+
#define BOARD_INFO_NAME "BIQU BQ111-A4"
3838

3939
//
4040
// Limit Switches

‎Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
2626
#endif
2727

28-
#define BOARD_NAME "GMARSH X6 REV1"
28+
#define BOARD_INFO_NAME "GMARSH X6 REV1"
2929

3030
// Ignore temp readings during develpment.
3131
//#define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE

‎Marlin/src/pins/lpc1768/pins_MKS_SBASE.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
3030
#endif
3131

32-
#ifndef BOARD_NAME
33-
#define BOARD_NAME "MKS SBASE"
32+
#ifndef BOARD_INFO_NAME
33+
#define BOARD_INFO_NAME "MKS SBASE"
3434
#endif
3535
#ifndef BOARD_WEBSITE_URL
3636
#define BOARD_WEBSITE_URL "https://github.com/makerbase-mks/MKS-SBASE"

‎Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
3030
#endif
3131

32-
#define BOARD_NAME "MKS SGen-L"
32+
#define BOARD_INFO_NAME "MKS SGen-L"
3333
#define BOARD_WEBSITE_URL "https://github.com/makerbase-mks/MKS-SGEN_L"
3434

3535
//

‎Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
4141
#endif
4242

43-
#define BOARD_NAME "Re-ARM RAMPS 1.4"
43+
#define BOARD_INFO_NAME "Re-ARM RAMPS 1.4"
4444

4545
//
4646
// Servos

‎Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
3030
#endif
3131

32-
#define BOARD_NAME "Selena Compact"
32+
#define BOARD_INFO_NAME "Selena Compact"
3333
#define BOARD_WEBSITE_URL "https://github.com/Ales2-k/Selena"
3434

3535
//

‎Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
3030
#endif
3131

32-
#define BOARD_NAME "Azteeg X5 GT"
32+
#define BOARD_INFO_NAME "Azteeg X5 GT"
3333
#define BOARD_WEBSITE_URL "https://tinyurl.com/yx8tdqa3"
3434

3535
//

‎Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
3030
#endif
3131

32-
#ifndef BOARD_NAME
33-
#define BOARD_NAME "Azteeg X5 MINI"
32+
#ifndef BOARD_INFO_NAME
33+
#define BOARD_INFO_NAME "Azteeg X5 MINI"
3434
#endif
3535
#define BOARD_WEBSITE_URL "http://www.panucatt.com/azteeg_X5_mini_reprap_3d_printer_controller_p/ax5mini.htm"
3636

‎Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
3030
#endif
3131

32-
#define BOARD_NAME "Azteeg X5 MINI WIFI"
32+
#define BOARD_INFO_NAME "Azteeg X5 MINI WIFI"
3333

3434
//
3535
// DIGIPOT slave addresses

‎Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
3030
#endif
3131

32-
#define BOARD_NAME "Cohesion3D Mini"
32+
#define BOARD_INFO_NAME "Cohesion3D Mini"
3333

3434
//
3535
// Servos

‎Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
3030
#endif
3131

32-
#define BOARD_NAME "Cohesion3D ReMix"
32+
#define BOARD_INFO_NAME "Cohesion3D ReMix"
3333

3434
//
3535
// Servos

‎Marlin/src/pins/lpc1769/pins_MKS_SGEN.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
3030
#endif
3131

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

3535
#include "../lpc1768/pins_MKS_SBASE.h"

‎Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
3030
#endif
3131

32-
#define BOARD_NAME "Smoothieboard"
32+
#define BOARD_INFO_NAME "Smoothieboard"
3333
#define BOARD_WEBSITE_URL "http://smoothieware.org/smoothieboard"
3434

3535
//

‎Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
3030
#endif
3131

32-
#define BOARD_NAME "TH3D EZBoard"
32+
#define BOARD_INFO_NAME "TH3D EZBoard"
3333
#define BOARD_WEBSITE_URL "https://www.th3dstudio.com/product/ezboard-lite/"
3434

3535
//

‎Marlin/src/pins/mega/pins_CHEAPTRONIC.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
3030
#endif
3131

32-
#define BOARD_NAME "Cheaptronic v1.0"
32+
#define BOARD_INFO_NAME "Cheaptronic v1.0"
3333
//
3434
// Limit Switches
3535
//

‎Marlin/src/pins/mega/pins_CHEAPTRONICv2.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
3232
#endif
3333

34-
#define BOARD_NAME "Cheaptronic v2.0"
34+
#define BOARD_INFO_NAME "Cheaptronic v2.0"
3535

3636
//
3737
// Limit Switches

‎Marlin/src/pins/mega/pins_CNCONTROLS_11.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
77
#endif
88

9-
#define BOARD_NAME "CN Controls V11"
9+
#define BOARD_INFO_NAME "CN Controls V11"
1010

1111
//
1212
// Limit Switches

‎Marlin/src/pins/mega/pins_CNCONTROLS_12.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
77
#endif
88

9-
#define BOARD_NAME "CN Controls V12"
9+
#define BOARD_INFO_NAME "CN Controls V12"
1010

1111
//
1212
// Limit Switches

‎Marlin/src/pins/mega/pins_CNCONTROLS_15.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
77
#endif
88

9-
#define BOARD_NAME "CN Controls V15"
9+
#define BOARD_INFO_NAME "CN Controls V15"
1010

1111
//
1212
// Servos

‎Marlin/src/pins/mega/pins_EINSTART-S.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
3131
#endif
3232

33-
#define BOARD_NAME "Einstart-S"
33+
#define BOARD_INFO_NAME "Einstart-S"
3434

3535
//
3636
// Limit Switches

‎Marlin/src/pins/mega/pins_ELEFU_3.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
3030
#endif
3131

32-
#define BOARD_NAME "Elefu Ra v3"
32+
#define BOARD_INFO_NAME "Elefu Ra v3"
3333

3434
//
3535
// Limit Switches

‎Marlin/src/pins/mega/pins_GT2560_REV_A.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
3232
#endif
3333

34-
#ifndef BOARD_NAME
35-
#define BOARD_NAME "GT2560 Rev.A"
34+
#ifndef BOARD_INFO_NAME
35+
#define BOARD_INFO_NAME "GT2560 Rev.A"
3636
#endif
3737
#define DEFAULT_MACHINE_NAME "Prusa i3 Pro B"
3838

‎Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* Geeetech GT2560 Revision A+ board pin assignments
2626
*/
2727

28-
#define BOARD_NAME "GT2560 Rev.A+"
28+
#define BOARD_INFO_NAME "GT2560 Rev.A+"
2929

3030
#include "pins_GT2560_REV_A.h"
3131

‎Marlin/src/pins/mega/pins_GT2560_V3.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
3030
#endif
3131

32-
#ifndef BOARD_NAME
33-
#define BOARD_NAME "GT2560 V3.0"
32+
#ifndef BOARD_INFO_NAME
33+
#define BOARD_INFO_NAME "GT2560 V3.0"
3434
#endif
3535

3636
//

‎Marlin/src/pins/mega/pins_GT2560_V3_MC2.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* GT2560 V3.0 pin assignment (for Mecreator 2)
2626
*****************************************************************/
2727

28-
#define BOARD_NAME "GT2560 V3.0 (MC2)"
28+
#define BOARD_INFO_NAME "GT2560 V3.0 (MC2)"
2929

3030
#define X_MIN_PIN 22
3131
#define X_MAX_PIN 24

‎Marlin/src/pins/mega/pins_LEAPFROG.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#error "Oops! Select 'Mega 1280' or 'Mega 2560' in 'Tools > Board.'"
3030
#endif
3131

32-
#define BOARD_NAME "Leapfrog"
32+
#define BOARD_INFO_NAME "Leapfrog"
3333

3434
//
3535
// Limit Switches

‎Marlin/src/pins/mega/pins_MEGACONTROLLER.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#error "Mega Controller supports up to 2 hotends / E-steppers. Comment out this line to continue."
3232
#endif
3333

34-
#define BOARD_NAME "Mega Controller"
34+
#define BOARD_INFO_NAME "Mega Controller"
3535

3636
//
3737
// Servos

‎Marlin/src/pins/mega/pins_MEGATRONICS.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
3030
#endif
3131

32-
#define BOARD_NAME "Megatronics"
32+
#define BOARD_INFO_NAME "Megatronics"
3333
//
3434
// Limit Switches
3535
//

‎Marlin/src/pins/mega/pins_MEGATRONICS_2.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
3030
#endif
3131

32-
#define BOARD_NAME "Megatronics v2.0"
32+
#define BOARD_INFO_NAME "Megatronics v2.0"
3333
//
3434
// Limit Switches
3535
//

‎Marlin/src/pins/mega/pins_MEGATRONICS_3.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
#endif
3131

3232
#if MB(MEGATRONICS_32)
33-
#define BOARD_NAME "Megatronics v3.2"
33+
#define BOARD_INFO_NAME "Megatronics v3.2"
3434
#elif MB(MEGATRONICS_31)
35-
#define BOARD_NAME "Megatronics v3.1"
35+
#define BOARD_INFO_NAME "Megatronics v3.1"
3636
#else
37-
#define BOARD_NAME "Megatronics v3.0"
37+
#define BOARD_INFO_NAME "Megatronics v3.0"
3838
#endif
3939

4040
//

‎Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#error "Oops! Select 'Mega 1280' or 'Mega 2560' in 'Tools > Board.'"
4242
#endif
4343

44-
#define BOARD_NAME "Mightyboard"
44+
#define BOARD_INFO_NAME "Mightyboard"
4545
#define DEFAULT_MACHINE_NAME "MB Replicator"
4646

4747
//

‎Marlin/src/pins/mega/pins_MINITRONICS.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#error "Minitronics supports up to 2 hotends / E-steppers. Comment out this line to continue."
3939
#endif
4040

41-
#define BOARD_NAME "Minitronics v1.0/1.1"
41+
#define BOARD_INFO_NAME "Minitronics v1.0/1.1"
4242
//
4343
// Limit Switches
4444
//

‎Marlin/src/pins/mega/pins_OVERLORD.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#error "Overlord Controller supports up to 2 hotends / E-steppers. Comment out this line to continue."
3232
#endif
3333

34-
#define BOARD_NAME "OVERLORD"
35-
#define DEFAULT_MACHINE_NAME BOARD_NAME
34+
#define BOARD_INFO_NAME "OVERLORD"
35+
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
3636

3737
//
3838
// Limit Switches

‎Marlin/src/pins/mega/pins_SILVER_GATE.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#error "Oops! Select 'Silvergate' in 'Tools > Board.'"
2626
#endif
2727

28-
#define BOARD_NAME "Silver Gate"
28+
#define BOARD_INFO_NAME "Silver Gate"
2929

3030
#define X_STEP_PIN 43
3131
#define X_DIR_PIN 44

‎Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
3030
#endif
3131

32-
#define BOARD_NAME "Wanhao i3 Mini 0ne+"
32+
#define BOARD_INFO_NAME "Wanhao i3 Mini 0ne+"
3333
#define DEFAULT_MACHINE_NAME "i3 Mini"
3434
#define BOARD_WEBSITE_URL "https://tinyurl.com/yyxw7se7"
3535

0 commit comments

Comments
 (0)