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/sanguino/pins_ANET_10.h
View File

@@ -93,7 +93,7 @@
#error "Oops! Select 'Sanguino' in 'Tools > Board' and 'ATmega1284P' in 'Tools > Processor.' (For PlatformIO, use 'melzi' or 'melzi_optiboot.')"
#endif
#define BOARD_NAME "Anet 1.0"
#define BOARD_INFO_NAME "Anet 1.0"
//
// Limit Switches

2
Marlin/src/pins/sanguino/pins_AZTEEG_X1.h
View File

@@ -25,6 +25,6 @@
* Azteeg X1 pin assignments
*/
#define BOARD_NAME "Azteeg X1"
#define BOARD_INFO_NAME "Azteeg X1"
#include "pins_SANGUINOLOLU_12.h"

2
Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h
View File

@@ -54,7 +54,7 @@
#error "Oops! Select 'Sanguino' in 'Tools > Board.'"
#endif
#define BOARD_NAME "Gen3 Monolithic"
#define BOARD_INFO_NAME "Gen3 Monolithic"
#define DEBUG_PIN 0
//

2
Marlin/src/pins/sanguino/pins_GEN3_PLUS.h
View File

@@ -55,7 +55,7 @@
#error "Oops! Select 'Sanguino' in 'Tools > Boards' and 'ATmega644P' or 'ATmega1284P' in 'Tools > Processor.'"
#endif
#define BOARD_NAME "Gen3+"
#define BOARD_INFO_NAME "Gen3+"
//
// Limit Switches

4
Marlin/src/pins/sanguino/pins_GEN6.h
View File

@@ -56,8 +56,8 @@
#error "Oops! Select 'Sanguino' in 'Tools > Boards' and 'ATmega644P' or 'ATmega1284P' in 'Tools > Processor.'"
#endif
#ifndef BOARD_NAME
#define BOARD_NAME "Gen6"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "Gen6"
#endif
//

2
Marlin/src/pins/sanguino/pins_GEN6_DELUXE.h
View File

@@ -51,6 +51,6 @@
*/
#define BOARD_NAME "Gen6 Deluxe"
#define BOARD_INFO_NAME "Gen6 Deluxe"
#include "pins_GEN6.h"

4
Marlin/src/pins/sanguino/pins_GEN7_12.h
View File

@@ -56,8 +56,8 @@
#error "Oops! Select 'Sanguino' in 'Tools > Boards' and 'ATmega644', 'ATmega644P', or 'ATmega1284P' in 'Tools > Processor.'"
#endif
#ifndef BOARD_NAME
#define BOARD_NAME "Gen7 v1.1 / 1.2"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "Gen7 v1.1 / 1.2"
#endif
#ifndef GEN7_VERSION

2
Marlin/src/pins/sanguino/pins_GEN7_13.h
View File

@@ -50,7 +50,7 @@
*
*/
#define BOARD_NAME "Gen7 v1.3"
#define BOARD_INFO_NAME "Gen7 v1.3"
#define GEN7_VERSION 13 // v1.3
#include "pins_GEN7_12.h"

2
Marlin/src/pins/sanguino/pins_GEN7_14.h
View File

@@ -56,7 +56,7 @@
#error "Oops! Select 'Sanguino' in 'Tools > Boards' and 'ATmega644', 'ATmega644P', or 'ATmega1284P' in 'Tools > Processor.'"
#endif
#define BOARD_NAME "Gen7 v1.4"
#define BOARD_INFO_NAME "Gen7 v1.4"
#define GEN7_VERSION 14 // v1.4

2
Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h
View File

@@ -59,7 +59,7 @@
#error "Oops! Select 'Sanguino' in 'Tools > Boards' and 'ATmega644', 'ATmega644P', or 'ATmega1284P' in 'Tools > Processor.'"
#endif
#define BOARD_NAME "Gen7 Custom"
#define BOARD_INFO_NAME "Gen7 Custom"
//
// Limit Switches

4
Marlin/src/pins/sanguino/pins_MELZI.h
View File

@@ -25,8 +25,8 @@
* Melzi pin assignments
*/
#ifndef BOARD_NAME
#define BOARD_NAME "Melzi"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "Melzi"
#endif
#define IS_MELZI

2
Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
View File

@@ -31,7 +31,7 @@
* See http://www.instructables.com/id/Burn-Arduino-Bootloader-with-Arduino-MEGA/
*/
#define BOARD_NAME "Melzi (Creality)"
#define BOARD_INFO_NAME "Melzi (Creality)"
#include "pins_MELZI.h"

2
Marlin/src/pins/sanguino/pins_MELZI_MAKR3D.h
View File

@@ -25,5 +25,5 @@
* Melzi with ATmega1284 (MaKr3d version) pin assignments
*/
#define BOARD_NAME "Melzi (ATmega1284)"
#define BOARD_INFO_NAME "Melzi (ATmega1284)"
#include "pins_MELZI.h"

2
Marlin/src/pins/sanguino/pins_MELZI_MALYAN.h
View File

@@ -25,7 +25,7 @@
* Melzi (Malyan M150) pin assignments
*/
#define BOARD_NAME "Melzi (Malyan)"
#define BOARD_INFO_NAME "Melzi (Malyan)"
#include "pins_MELZI.h"
#undef LCD_SDSS

2
Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
View File

@@ -25,7 +25,7 @@
* Melzi pin assignments
*/
#define BOARD_NAME "Melzi (Tronxy)"
#define BOARD_INFO_NAME "Melzi (Tronxy)"
#include "pins_MELZI.h"
#undef Z_ENABLE_PIN

2
Marlin/src/pins/sanguino/pins_OMCA.h
View File

@@ -81,7 +81,7 @@
#error "Oops! Select 'Sanguino' in 'Tools > Board' and 'ATmega644' or 'ATmega644P' in 'Tools > Processor.'"
#endif
#define BOARD_NAME "Final OMCA"
#define BOARD_INFO_NAME "Final OMCA"
//
// Limit Switches

2
Marlin/src/pins/sanguino/pins_OMCA_A.h
View File

@@ -80,7 +80,7 @@
#error "Oops! Select 'Sanguino' in 'Tools > Board' and ATmega644 in 'Tools > Processor.'"
#endif
#define BOARD_NAME "Alpha OMCA"
#define BOARD_INFO_NAME "Alpha OMCA"
//
// Limit Switches

4
Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
View File

@@ -56,8 +56,8 @@
#error "Oops! Select 'Sanguino' in 'Tools > Boards' and 'ATmega644P' or 'ATmega1284P' in 'Tools > Processor.'"
#endif
#ifndef BOARD_NAME
#define BOARD_NAME "Sanguinololu <1.2"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "Sanguinololu <1.2"
#endif
//

4
Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h
View File

@@ -34,8 +34,8 @@
* STB_11
*/
#ifndef BOARD_NAME
#define BOARD_NAME "Sanguinololu 1.2"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "Sanguinololu 1.2"
#endif
#define SANGUINOLOLU_V_1_2

2
Marlin/src/pins/sanguino/pins_SETHI.h
View File

@@ -54,7 +54,7 @@
#error "Oops! Select 'Sanguino' in 'Tools > Boards' and 'ATmega644', 'ATmega644P', or 'ATmega1284P' in 'Tools > Processor.'"
#endif
#define BOARD_NAME "Sethi 3D_1"
#define BOARD_INFO_NAME "Sethi 3D_1"
#ifndef GEN7_VERSION
#define GEN7_VERSION 12 // v1.x

2
Marlin/src/pins/sanguino/pins_STB_11.h
View File

@@ -25,6 +25,6 @@
* STB V1.1 pin assignments
*/
#define BOARD_NAME "STB V1.1"
#define BOARD_INFO_NAME "STB V1.1"
#include "pins_SANGUINOLOLU_12.h"