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/sam/pins_ADSK.h
View File

@ -25,7 +25,7 @@
* Arduino DUE Shield Kit (ADSK) pin assignments
*/
#define BOARD_NAME "ADSK"
#define BOARD_INFO_NAME "ADSK"
#if !defined(__SAM3X8E__) && !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
#error "Oops! Select 'Arduino Due or Mega' in 'Tools > Board.'"

2
Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
View File

@ -30,7 +30,7 @@
#error "Oops! Select 'Arduino Due' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Alligator Board R2"
#define BOARD_INFO_NAME "Alligator Board R2"
//
// Servos

2
Marlin/src/pins/sam/pins_ARCHIM1.h
View File

@ -41,7 +41,7 @@
#error "Oops! Select 'Archim' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Archim 1.0"
#define BOARD_INFO_NAME "Archim 1.0"
//
// Items marked * have been altered from Archim v1.0

2
Marlin/src/pins/sam/pins_ARCHIM2.h
View File

@ -43,7 +43,7 @@
#error "Archim2 requires Software SPI. Enable TMC_USE_SW_SPI in Configuration_adv.h."
#endif
#define BOARD_NAME "Archim 2.0"
#define BOARD_INFO_NAME "Archim 2.0"
//
// Items marked * have been altered from Archim v1.0

2
Marlin/src/pins/sam/pins_DUE3DOM.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino Due' in 'Tools > Board.'"
#endif
#define BOARD_NAME "DUE3DOM"
#define BOARD_INFO_NAME "DUE3DOM"
//
// Servos

2
Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino Due' in 'Tools > Board.'"
#endif
#define BOARD_NAME "DUE3DOM MINI"
#define BOARD_INFO_NAME "DUE3DOM MINI"
//
// Servos

4
Marlin/src/pins/sam/pins_PRINTRBOARD_G2.h
View File

@ -29,8 +29,8 @@
#error "Oops! Select 'Arduino Due' in 'Tools > Board.'"
#endif
#ifndef BOARD_NAME
#define BOARD_NAME "PRINTRBOARD_G2"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "PRINTRBOARD_G2"
#endif
//

2
Marlin/src/pins/sam/pins_RADDS.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino Due' in 'Tools > Board.'"
#endif
#define BOARD_NAME "RADDS"
#define BOARD_INFO_NAME "RADDS"
//
// Servos

2
Marlin/src/pins/sam/pins_RAMPS4DUE.h
View File

@ -43,7 +43,7 @@
#error "Oops! Select 'Arduino Due' or 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "RAMPS4DUE"
#define BOARD_INFO_NAME "RAMPS4DUE"
#define IS_RAMPS4DUE
//

2
Marlin/src/pins/sam/pins_RAMPS_DUO.h
View File

@ -47,7 +47,7 @@
#error "Oops! Select 'Arduino Due' or 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif
#define BOARD_NAME "RAMPS Duo"
#define BOARD_INFO_NAME "RAMPS Duo"
#define IS_RAMPS_DUO
#include "pins_RAMPS.h"

4
Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
View File

@ -32,8 +32,8 @@
#error "Oops! Select 'Arduino Due' in 'Tools > Board.'"
#endif
#ifndef BOARD_NAME
#define BOARD_NAME "RAMPS-FD v1"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "RAMPS-FD v1"
#endif
#define INVERTED_HEATER_PINS

2
Marlin/src/pins/sam/pins_RAMPS_FD_V2.h
View File

@ -28,7 +28,7 @@
* Use 1k thermistor tables
*/
#define BOARD_NAME "RAMPS-FD v2"
#define BOARD_INFO_NAME "RAMPS-FD v2"
#ifndef E0_CS_PIN
#define E0_CS_PIN 69 // moved from A13 to A15 on v2.2, if not earlier

2
Marlin/src/pins/sam/pins_RAMPS_SMART.h
View File

@ -64,7 +64,7 @@
#error "Oops! Select 'Arduino Due' in 'Tools > Board.'"
#endif
#define BOARD_NAME "RAMPS-SMART"
#define BOARD_INFO_NAME "RAMPS-SMART"
#define IS_RAMPS_SMART
#include "pins_RAMPS.h"

2
Marlin/src/pins/sam/pins_RURAMPS4D_11.h
View File

@ -36,7 +36,7 @@
#error "Oops! Select 'Arduino Due' in 'Tools > Board.'"
#endif
#define BOARD_NAME "RuRAMPS4Due v1.1"
#define BOARD_INFO_NAME "RuRAMPS4Due v1.1"
//
// Servos

2
Marlin/src/pins/sam/pins_RURAMPS4D_13.h
View File

@ -36,7 +36,7 @@
#error "Oops! Select 'Arduino Due' in 'Tools > Board.'"
#endif
#define BOARD_NAME "RuRAMPS4Due v1.3"
#define BOARD_INFO_NAME "RuRAMPS4Due v1.3"
//
// Servos

2
Marlin/src/pins/sam/pins_ULTRATRONICS_PRO.h
View File

@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino Due' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Ultratronics v1.0"
#define BOARD_INFO_NAME "Ultratronics v1.0"
//
// Servos