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

6
Marlin/src/pins/ramps/pins_3DRAG.h
View File

@ -25,12 +25,12 @@
* 3DRAG (and K8200 / K8400) Arduino Mega with RAMPS v1.4 pin assignments
*/
#ifndef BOARD_NAME
#define BOARD_NAME "3Drag"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "3Drag"
#endif
#ifndef DEFAULT_MACHINE_NAME
#define DEFAULT_MACHINE_NAME BOARD_NAME
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
#endif
#ifndef DEFAULT_SOURCE_CODE_URL

2
Marlin/src/pins/ramps/pins_AZTEEG_X3.h
View File

@ -34,7 +34,7 @@
#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT)
#define CASE_LIGHT_PIN 6 // Define before RAMPS pins include
#endif
#define BOARD_NAME "Azteeg X3"
#define BOARD_INFO_NAME "Azteeg X3"
//
// Servos

2
Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
View File

@ -31,7 +31,7 @@
#error "Azteeg X3 Pro supports up to 5 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "Azteeg X3 Pro"
#define BOARD_INFO_NAME "Azteeg X3 Pro"
//
// RAMPS pins overrides

2
Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
View File

@ -29,7 +29,7 @@
#error "2PrintBeta Due supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "2PrintBeta Due"
#define BOARD_INFO_NAME "2PrintBeta Due"
//
// M3/M4/M5 - Spindle/Laser Control

2
Marlin/src/pins/ramps/pins_BIQU_KFB_2.h
View File

@ -29,7 +29,7 @@
#error "KFB 2.0 supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "KFB 2.0"
#define BOARD_INFO_NAME "KFB 2.0"
//
// Heaters / Fans

2
Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "ZUM Mega 3D"
#define BOARD_INFO_NAME "ZUM Mega 3D"
//
// Heaters / Fans

2
Marlin/src/pins/ramps/pins_DUPLICATOR_I3_PLUS.h
View File

@ -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_INFO_NAME "Duplicator i3 Plus"
//
// Limit Switches

2
Marlin/src/pins/ramps/pins_FELIX2.h
View File

@ -29,7 +29,7 @@
#error "Felix 2.0+ supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "Felix 2.0+"
#define BOARD_INFO_NAME "Felix 2.0+"
//
// Heaters / Fans

4
Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
View File

@ -31,8 +31,8 @@
#error "Formbot supports up to 3 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "Formbot Raptor"
#define DEFAULT_MACHINE_NAME BOARD_NAME
#define BOARD_INFO_NAME "Formbot Raptor"
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
//
// Servos

4
Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR2.h
View File

@ -25,8 +25,8 @@
* Formbot Raptor 2 pin assignments
*/
#define BOARD_NAME "Formbot Raptor2"
#define DEFAULT_MACHINE_NAME BOARD_NAME
#define BOARD_INFO_NAME "Formbot Raptor2"
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
#define FAN_PIN 6

4
Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
View File

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

4
Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
View File

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

2
Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
View File

@ -33,7 +33,7 @@
//#error "SD_DETECT_INVERTED must be disabled for the FYSETC_F6_13 board."
#endif
#define BOARD_NAME "FYSETC F6 1.3"
#define BOARD_INFO_NAME "FYSETC F6 1.3"
#define RESET_PIN 30
#define SPI_FLASH_CS 83

2
Marlin/src/pins/ramps/pins_K8200.h
View File

@ -26,7 +26,7 @@
* Identical to 3DRAG
*/
#define BOARD_NAME "Velleman K8200"
#define BOARD_INFO_NAME "Velleman K8200"
#define DEFAULT_MACHINE_NAME "K8200"
#define DEFAULT_SOURCE_CODE_URL "https://github.com/CONSULitAS/Marlin-K8200"

2
Marlin/src/pins/ramps/pins_K8400.h
View File

@ -32,7 +32,7 @@
* - Second heater has moved pin
*/
#define BOARD_NAME "K8400"
#define BOARD_INFO_NAME "K8400"
#define DEFAULT_MACHINE_NAME "Vertex"
#include "pins_3DRAG.h"

2
Marlin/src/pins/ramps/pins_K8800.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "K8800"
#define BOARD_INFO_NAME "K8800"
#define DEFAULT_MACHINE_NAME "Vertex Delta"
//#define LCD_SCREEN_ROT_180

2
Marlin/src/pins/ramps/pins_MAKEBOARD_MINI.h
View File

@ -21,7 +21,7 @@
*/
#pragma once
#define BOARD_NAME "MAKEboard Mini"
#define BOARD_INFO_NAME "MAKEboard Mini"
//
// Only 3 Limit Switch plugs on Micromake C1

2
Marlin/src/pins/ramps/pins_MKS_BASE.h
View File

@ -31,7 +31,7 @@
#error "MKS BASE 1.0 supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "MKS BASE 1.0"
#define BOARD_INFO_NAME "MKS BASE 1.0"
//
// Heaters / Fans

2
Marlin/src/pins/ramps/pins_MKS_BASE_14.h
View File

@ -29,7 +29,7 @@
#error "MKS BASE 1.4 only supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "MKS BASE 1.4"
#define BOARD_INFO_NAME "MKS BASE 1.4"
//
// Heaters / Fans

2
Marlin/src/pins/ramps/pins_MKS_GEN_13.h
View File

@ -34,7 +34,7 @@
#error "MKS GEN 1.3/1.4 supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "MKS GEN >= v1.3"
#define BOARD_INFO_NAME "MKS GEN >= v1.3"
//
// Heaters / Fans

2
Marlin/src/pins/ramps/pins_MKS_GEN_L.h
View File

@ -29,7 +29,7 @@
#error "MKS GEN L supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "MKS GEN L"
#define BOARD_INFO_NAME "MKS GEN L"
//
// Heaters / Fans

4
Marlin/src/pins/ramps/pins_RAMPS.h
View File

@ -57,8 +57,8 @@
#endif
#endif
#ifndef BOARD_NAME
#define BOARD_NAME "RAMPS 1.4"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "RAMPS 1.4"
#endif
//

4
Marlin/src/pins/ramps/pins_RAMPS_13.h
View File

@ -34,8 +34,8 @@
*
*/
#ifndef BOARD_NAME
#define BOARD_NAME "RAMPS 1.3"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "RAMPS 1.3"
#endif
#define IS_RAMPS_13

2
Marlin/src/pins/ramps/pins_RAMPS_CREALITY.h
View File

@ -25,7 +25,7 @@
#error "Creality3D RAMPS supports only 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "Creality3D RAMPS"
#define BOARD_INFO_NAME "Creality3D RAMPS"
//
// Heaters / Fans

2
Marlin/src/pins/ramps/pins_RAMPS_DAGOMA.h
View File

@ -25,7 +25,7 @@
#error "Dagoma3D F5 RAMPS supports only 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "Dagoma3D F5 RAMPS"
#define BOARD_INFO_NAME "Dagoma3D F5 RAMPS"
#define X_STOP_PIN 2
#define Y_STOP_PIN 3

2
Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h
View File

@ -25,7 +25,7 @@
#error "Ender-4 supports only 1 hotend / E-stepper. Comment out this line to continue."
#endif
#define BOARD_NAME "Ender-4"
#define BOARD_INFO_NAME "Ender-4"
#include "pins_RAMPS.h"

2
Marlin/src/pins/ramps/pins_RAMPS_OLD.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "RAMPS <1.2"
#define BOARD_INFO_NAME "RAMPS <1.2"
// Uncomment the following line for RAMPS v1.0
//#define RAMPS_V_1_0

2
Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
View File

@ -42,7 +42,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "RAMPS 1.4 Plus"
#define BOARD_INFO_NAME "RAMPS 1.4 Plus"
#define RAMPS_D8_PIN 10
#define RAMPS_D10_PIN 8

4
Marlin/src/pins/ramps/pins_RIGIDBOARD.h
View File

@ -25,8 +25,8 @@
* RIGIDBOARD Arduino Mega with RAMPS v1.4 pin assignments
*/
#ifndef BOARD_NAME
#define BOARD_NAME "RigidBoard"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "RigidBoard"
#endif
//

2
Marlin/src/pins/ramps/pins_RIGIDBOARD_V2.h
View File

@ -25,7 +25,7 @@
* RIGIDBOARD V2 Arduino Mega with RAMPS v1.4 pin assignments
*/
#define BOARD_NAME "RigidBoard V2"
#define BOARD_INFO_NAME "RigidBoard V2"
#include "pins_RIGIDBOARD.h"

2
Marlin/src/pins/ramps/pins_RL200.h
View File

@ -26,7 +26,7 @@
* extruder motors due to dual Z motors. Pinout therefore based on pins_RUMBA.h.
*/
#define BOARD_NAME "RL200"
#define BOARD_INFO_NAME "RL200"
#define DEFAULT_MACHINE_NAME "Rapide Lite 200"
#if HOTENDS > 2 || E_STEPPERS > 2

6
Marlin/src/pins/ramps/pins_RUMBA.h
View File

@ -31,11 +31,11 @@
#error "RUMBA supports up to 3 hotends / E-steppers. Comment out this line to continue."
#endif
#ifndef BOARD_NAME
#define BOARD_NAME "Rumba"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "Rumba"
#endif
#ifndef DEFAULT_MACHINE_NAME
#define DEFAULT_MACHINE_NAME BOARD_NAME
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
#endif
//

2
Marlin/src/pins/ramps/pins_RUMBA_RAISE3D.h
View File

@ -21,7 +21,7 @@
*/
#pragma once
#define BOARD_NAME "Raise3D Rumba"
#define BOARD_INFO_NAME "Raise3D Rumba"
#define DEFAULT_MACHINE_NAME "Raise3D N Series"
// Raise3D uses thermocouples on the standard input pins

2
Marlin/src/pins/ramps/pins_SAINSMART_2IN1.h
View File

@ -29,7 +29,7 @@
#error "Sainsmart 2-in-1 supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "Sainsmart"
#define BOARD_INFO_NAME "Sainsmart"
//
// Heaters / Fans

2
Marlin/src/pins/ramps/pins_TRIGORILLA_13.h
View File

@ -25,7 +25,7 @@
* Arduino Mega with RAMPS v1.3 for Anycubic
*/
#define BOARD_NAME "Anycubic RAMPS 1.3"
#define BOARD_INFO_NAME "Anycubic RAMPS 1.3"
#define IS_RAMPS_EFB
#define RAMPS_D9_PIN 44

2
Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
View File

@ -25,7 +25,7 @@
* Arduino Mega with RAMPS v1.4 for Anycubic
*/
#define BOARD_NAME "Anycubic RAMPS 1.4"
#define BOARD_INFO_NAME "Anycubic RAMPS 1.4"
//
// Servos

2
Marlin/src/pins/ramps/pins_TRONXY_V3_1_0.h
View File

@ -31,7 +31,7 @@
#error "TRONXY-V3-1.0 supports only 2 hotends/E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "TRONXY-V3-1.0"
#define BOARD_INFO_NAME "TRONXY-V3-1.0"
//
// Servos

4
Marlin/src/pins/ramps/pins_TT_OSCAR.h
View File

@ -28,8 +28,8 @@
#error "TTOSCAR supports up to 5 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "TT OSCAR"
#define DEFAULT_MACHINE_NAME BOARD_NAME
#define BOARD_INFO_NAME "TT OSCAR"
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
//
// Servos

2
Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
View File

@ -37,7 +37,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Ultimaker 2.x"
#define BOARD_INFO_NAME "Ultimaker 2.x"
#define DEFAULT_MACHINE_NAME "Ultimaker"
#define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"

4
Marlin/src/pins/ramps/pins_ULTIMAKER.h
View File

@ -37,8 +37,8 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Ultimaker"
#define DEFAULT_MACHINE_NAME BOARD_NAME
#define BOARD_INFO_NAME "Ultimaker"
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
#define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"
//

10
Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
View File

@ -36,7 +36,7 @@
* the revisions provided inconsistent information.
*
* As best I can determine:
* 1.5.3 boards should use the pins_ULTIMAKER.h file which means the BOARD_NAME
* 1.5.3 boards should use the pins_ULTIMAKER.h file which means the BOARD_INFO_NAME
* define in this file should say 1.5.3 rather than 1.5.4
* This file is meant for 1.1 - 1.3 boards.
* The endstops for the 1.0 boards use different definitions than on the 1.1 - 1.3
@ -65,13 +65,13 @@
#endif
#ifdef BOARD_REV_1_1_TO_1_3
#define BOARD_NAME "Ultimaker 1.1-1.3"
#define BOARD_INFO_NAME "Ultimaker 1.1-1.3"
#elif defined(BOARD_REV_1_0)
#define BOARD_NAME "Ultimaker 1.0"
#define BOARD_INFO_NAME "Ultimaker 1.0"
#elif defined(BOARD_REV_1_5)
#define BOARD_NAME "Ultimaker 1.5"
#define BOARD_INFO_NAME "Ultimaker 1.5"
#else
#define BOARD_NAME "Ultimaker 1.5.4+"
#define BOARD_INFO_NAME "Ultimaker 1.5.4+"
#endif
#define DEFAULT_MACHINE_NAME "Ultimaker"
#define DEFAULT_SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"

2
Marlin/src/pins/ramps/pins_VORON.h
View File

@ -26,7 +26,7 @@
* See https://github.com/mzbotreprap/VORON/blob/master/Firmware/Marlin/pins_RAMPS_VORON.h
*/
#define BOARD_NAME "VORON Design v2"
#define BOARD_INFO_NAME "VORON Design v2"
#define RAMPS_D8_PIN 11

2
Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h
View File

@ -31,7 +31,7 @@
#error "Z-Bolt X Series board supports up to 4 hotends / E-steppers."
#endif
#define BOARD_NAME "Z-Bolt X Series"
#define BOARD_INFO_NAME "Z-Bolt X Series"
//
// Servos