Prevent BOARD_NAME conflict with env

fmuntean · Aug 21, 2019 · 0cc524b · 0cc524b
1 parent 33f6d77
commit 0cc524b
Show file tree

Hide file tree

Showing 164 changed files with 212 additions and 212 deletions.
diff --git a/Marlin/src/lcd/menu/menu_info.cpp b/Marlin/src/lcd/menu/menu_info.cpp
@@ -165,7 +165,7 @@ void menu_info_thermistors() {
 void menu_info_board() {
   if (ui.use_click()) return ui.goto_previous_screen();
   START_SCREEN();
-  STATIC_ITEM(BOARD_NAME, true, true);                           // MyPrinterController
+  STATIC_ITEM(BOARD_INFO_NAME, true, true);                      // MyPrinterController
   STATIC_ITEM(MSG_INFO_BAUDRATE ": " STRINGIFY(BAUDRATE), true); // Baud: 250000
   STATIC_ITEM(MSG_INFO_PROTOCOL ": " PROTOCOL_VERSION, true);    // Protocol: 1.0
   STATIC_ITEM(MSG_INFO_PSU ": " PSU_NAME, true);

diff --git a/Marlin/src/pins/esp32/pins_ESP32.h b/Marlin/src/pins/esp32/pins_ESP32.h
@@ -29,7 +29,7 @@
   "Oops! Select an ESP32 board in 'Tools > Board.'"
 #endif
 
-#define BOARD_NAME "Espressif ESP32"
+#define BOARD_INFO_NAME "Espressif ESP32"
 
 //
 // I2S (steppers & other output-only pins)

diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h
@@ -45,8 +45,8 @@
  *         7 | 11
  */
 
-#ifndef BOARD_NAME
-  #define BOARD_NAME "RAMPS 1.4"
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "RAMPS 1.4"
 #endif
 
 #define E2END 0xFFF // 4KB

diff --git a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
@@ -29,7 +29,7 @@
   #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
 #endif
 
-#define BOARD_NAME "AZSMZ MINI"
+#define BOARD_INFO_NAME "AZSMZ MINI"
 
 //
 // Servos

diff --git a/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.1.h b/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.1.h
@@ -25,7 +25,7 @@
   #error "Oops!  Make sure you have the LPC1768 environment selected in your IDE."
 #endif
 
-#define BOARD_NAME "BIGTREE SKR 1.1"
+#define BOARD_INFO_NAME "BIGTREE SKR 1.1"
 
 //
 // Limit Switches

diff --git a/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h b/Marlin/src/pins/lpc1768/pins_BIGTREE_SKR_V1.3.h
@@ -25,7 +25,7 @@
   #error "Oops!  Make sure you have the LPC1768 environment selected in your IDE."
 #endif
 
-#define BOARD_NAME "BIGTREE SKR 1.3"
+#define BOARD_INFO_NAME "BIGTREE SKR 1.3"
 
 // Ignore temp readings during development.
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000

diff --git a/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h b/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
@@ -34,8 +34,8 @@
   #error "Oops!  Make sure you have the LPC1768 environment selected in your IDE."
 #endif
 
-#ifndef BOARD_NAME
-  #define BOARD_NAME "BIQU Thunder B300 V1.0"
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "BIQU Thunder B300 V1.0"
 #endif
 
 //

diff --git a/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h b/Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
@@ -34,7 +34,7 @@
   #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
 #endif
 
-#define BOARD_NAME "BIQU BQ111-A4"
+#define BOARD_INFO_NAME "BIQU BQ111-A4"
 
 //
 // Limit Switches

diff --git a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
@@ -25,7 +25,7 @@
   #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
 #endif
 
-#define BOARD_NAME "GMARSH X6 REV1"
+#define BOARD_INFO_NAME "GMARSH X6 REV1"
 
 // Ignore temp readings during develpment.
 //#define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE

diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -29,8 +29,8 @@
   #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
 #endif
 
-#ifndef BOARD_NAME
-  #define BOARD_NAME        "MKS SBASE"
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME   "MKS SBASE"
 #endif
 #ifndef BOARD_WEBSITE_URL
   #define BOARD_WEBSITE_URL "https://github.com/makerbase-mks/MKS-SBASE"

diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/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_INFO_NAME   "MKS SGen-L"
 #define BOARD_WEBSITE_URL "https://github.com/makerbase-mks/MKS-SGEN_L"
 
 //

diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -40,7 +40,7 @@
   #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
 #endif
 
-#define BOARD_NAME "Re-ARM RAMPS 1.4"
+#define BOARD_INFO_NAME "Re-ARM RAMPS 1.4"
 
 //
 // Servos

diff --git a/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h b/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
@@ -29,7 +29,7 @@
   #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
 #endif
 
-#define BOARD_NAME        "Selena Compact"
+#define BOARD_INFO_NAME   "Selena Compact"
 #define BOARD_WEBSITE_URL "https://github.com/Ales2-k/Selena"
 
 //

diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
@@ -29,7 +29,7 @@
   #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
 #endif
 
-#define BOARD_NAME        "Azteeg X5 GT"
+#define BOARD_INFO_NAME   "Azteeg X5 GT"
 #define BOARD_WEBSITE_URL "https://tinyurl.com/yx8tdqa3"
 
 //

diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
@@ -29,8 +29,8 @@
   #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
 #endif
 
-#ifndef BOARD_NAME
-  #define BOARD_NAME      "Azteeg X5 MINI"
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "Azteeg X5 MINI"
 #endif
 #define BOARD_WEBSITE_URL "http://www.panucatt.com/azteeg_X5_mini_reprap_3d_printer_controller_p/ax5mini.htm"
 

diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h b/Marlin/src/pins/lpc1769/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_INFO_NAME "Azteeg X5 MINI WIFI"
 
 //
 // DIGIPOT slave addresses

diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
@@ -29,7 +29,7 @@
   #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
 #endif
 
-#define BOARD_NAME "Cohesion3D Mini"
+#define BOARD_INFO_NAME "Cohesion3D Mini"
 
 //
 // Servos

diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
@@ -29,7 +29,7 @@
   #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
 #endif
 
-#define BOARD_NAME "Cohesion3D ReMix"
+#define BOARD_INFO_NAME "Cohesion3D ReMix"
 
 //
 // Servos

diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h b/Marlin/src/pins/lpc1769/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_INFO_NAME   "MKS SGen"
 #define BOARD_WEBSITE_URL "https://github.com/makerbase-mks/MKS-SGEN"
 
 #include "../lpc1768/pins_MKS_SBASE.h"

diff --git a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
@@ -29,7 +29,7 @@
   #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
 #endif
 
-#define BOARD_NAME        "Smoothieboard"
+#define BOARD_INFO_NAME   "Smoothieboard"
 #define BOARD_WEBSITE_URL "http://smoothieware.org/smoothieboard"
 
 //

diff --git a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
@@ -29,7 +29,7 @@
   #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
 #endif
 
-#define BOARD_NAME        "TH3D EZBoard"
+#define BOARD_INFO_NAME   "TH3D EZBoard"
 #define BOARD_WEBSITE_URL "https://www.th3dstudio.com/product/ezboard-lite/"
 
 //

diff --git a/Marlin/src/pins/mega/pins_CHEAPTRONIC.h b/Marlin/src/pins/mega/pins_CHEAPTRONIC.h
@@ -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
 //

diff --git a/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h b/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h
@@ -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

diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_11.h b/Marlin/src/pins/mega/pins_CNCONTROLS_11.h
@@ -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

diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_12.h b/Marlin/src/pins/mega/pins_CNCONTROLS_12.h
@@ -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

diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_15.h b/Marlin/src/pins/mega/pins_CNCONTROLS_15.h
@@ -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

diff --git a/Marlin/src/pins/mega/pins_EINSTART-S.h b/Marlin/src/pins/mega/pins_EINSTART-S.h
@@ -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

diff --git a/Marlin/src/pins/mega/pins_ELEFU_3.h b/Marlin/src/pins/mega/pins_ELEFU_3.h
@@ -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

diff --git a/Marlin/src/pins/mega/pins_GT2560_REV_A.h b/Marlin/src/pins/mega/pins_GT2560_REV_A.h
@@ -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"
 

diff --git a/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h b/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h
@@ -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"
 

diff --git a/Marlin/src/pins/mega/pins_GT2560_V3.h b/Marlin/src/pins/mega/pins_GT2560_V3.h
@@ -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
 
 //

diff --git a/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h b/Marlin/src/pins/mega/pins_GT2560_V3_MC2.h
@@ -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

diff --git a/Marlin/src/pins/mega/pins_LEAPFROG.h b/Marlin/src/pins/mega/pins_LEAPFROG.h
@@ -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

diff --git a/Marlin/src/pins/mega/pins_MEGACONTROLLER.h b/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
@@ -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

diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS.h b/Marlin/src/pins/mega/pins_MEGATRONICS.h
@@ -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
 //

diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS_2.h b/Marlin/src/pins/mega/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_INFO_NAME "Megatronics v2.0"
 //
 // Limit Switches
 //

diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS_3.h b/Marlin/src/pins/mega/pins_MEGATRONICS_3.h
@@ -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
 
 //

diff --git a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
@@ -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"
 
 //

diff --git a/Marlin/src/pins/mega/pins_MINITRONICS.h b/Marlin/src/pins/mega/pins_MINITRONICS.h
@@ -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
 //

diff --git a/Marlin/src/pins/mega/pins_OVERLORD.h b/Marlin/src/pins/mega/pins_OVERLORD.h
@@ -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

diff --git a/Marlin/src/pins/mega/pins_SILVER_GATE.h b/Marlin/src/pins/mega/pins_SILVER_GATE.h
@@ -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

diff --git a/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h b/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h
@@ -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"