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/stm32/pins_ARMED.h
View File

@ -31,9 +31,9 @@
#define ARMED_V1_1
#endif
#undef BOARD_NAME // Defined on the command line by Arduino Core STM32
#define BOARD_NAME "Arm'ed"
#define DEFAULT_MACHINE_NAME BOARD_NAME
#undef BOARD_INFO_NAME // Defined on the command line by Arduino Core STM32
#define BOARD_INFO_NAME "Arm'ed"
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
#define I2C_EEPROM

2
Marlin/src/pins/stm32/pins_BEAST.h
View File

@ -29,7 +29,7 @@
* 21017 Victor Perez Marlin for stm32f1 test
*/
#define BOARD_NAME "Beast STM32"
#define BOARD_INFO_NAME "Beast STM32"
#define DEFAULT_MACHINE_NAME "STM32F103RET6"
// Enable I2C_EEPROM for testing

10
Marlin/src/pins/stm32/pins_BIGTREE_BTT002_V1.0.h
View File

@ -27,7 +27,7 @@
#error "BIGTREE SKR Pro V1.1 supports up to 3 hotends / E-steppers."
#endif
#define BOARD_NAME "BIGTREE Btt002 1.0"
#define BOARD_INFO_NAME "BIGTREE Btt002 1.0"
#define SRAM_EEPROM_EMULATION
@ -35,7 +35,7 @@
//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
//
// Servos
// Servos
//
#define SERVO0_PIN PC3
@ -88,7 +88,7 @@
#endif
/*
//SKR_PRO_V1.1
//SKR_PRO_V1.1
#define E1_STEP_PIN PD15
#define E1_DIR_PIN PE7
#define E1_ENABLE_PIN PA3
@ -193,7 +193,7 @@
* -------------------------------------SKR_MK3-----------------------------------------------
* _____ _____ |
* PA3 | · · | GND 5V | · · | GND |
* NRESET | · · | PC4(SD_DET) (LCD_D7) PE13 | · · | PE12 (LCD_D6) |
* NRESET | · · | PC4(SD_DET) (LCD_D7) PE13 | · · | PE12 (LCD_D6) |
* (MOSI)PA7 | · · | PB0(BTN_EN2) (LCD_D5) PE11 | · · | PE10 (LCD_D4) |
* (SD_SS)PA4 | · · | PC5(BTN_EN1) (LCD_RS) PE8 | · · | PE9 (LCD_EN) |
* (SCK)PA5 | · · | PA6(MISO) (BTN_ENC) PB1 | · · | PE7 (BEEPER) |
@ -227,7 +227,7 @@
#define LCD_SDSS PA4
#define LCD_PINS_ENABLE PE9
#define LCD_PINS_ENABLE PE9
#define LCD_PINS_D4 PE10
#if ENABLED(ULTIPANEL)

2
Marlin/src/pins/stm32/pins_BIGTREE_SKR_E3_DIP.h
View File

@ -25,7 +25,7 @@
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
#endif
#define BOARD_NAME "BIGTREE SKR E3 DIP V1.0"
#define BOARD_INFO_NAME "BIGTREE SKR E3 DIP V1.0"
// Release PB3/PB4 (TMC_SW Pins) from JTAG pins
#define DISABLE_JTAG

2
Marlin/src/pins/stm32/pins_BIGTREE_SKR_MINI_E3.h
View File

@ -25,7 +25,7 @@
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
#endif
#define BOARD_NAME "BIGTREE SKR Mini E3"
#define BOARD_INFO_NAME "BIGTREE SKR Mini E3"
// Release PB3/PB4 (E0 STP/DIR) from JTAG pins
#define DISABLE_JTAG

2
Marlin/src/pins/stm32/pins_BIGTREE_SKR_MINI_V1_1.h
View File

@ -25,7 +25,7 @@
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
#endif
#define BOARD_NAME "BIGTREE SKR Mini 1.1"
#define BOARD_INFO_NAME "BIGTREE SKR Mini 1.1"
//#define DISABLE_DEBUG
#define DISABLE_JTAG

2
Marlin/src/pins/stm32/pins_BIGTREE_SKR_PRO_V1.1.h
View File

@ -27,7 +27,7 @@
#error "BIGTREE SKR Pro V1.1 supports up to 3 hotends / E-steppers."
#endif
#define BOARD_NAME "BIGTREE SKR Pro 1.1"
#define BOARD_INFO_NAME "BIGTREE SKR Pro 1.1" // redefined?
// Use one of these or SDCard-based Emulation will be used
//#define SRAM_EEPROM_EMULATION // Use BackSRAM-based EEPROM emulation

4
Marlin/src/pins/stm32/pins_BLACK_STM32F407VE.h
View File

@ -33,8 +33,8 @@
#error "Black STM32F4VET6 supports up to 2 hotends / E-steppers."
#endif
#ifndef BOARD_NAME
#define BOARD_NAME "Black STM32F4VET6"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "Black STM32F4VET6"
#endif
#define DEFAULT_MACHINE_NAME "STM32F407VET6"

2
Marlin/src/pins/stm32/pins_CHITU3D.h
View File

@ -29,7 +29,7 @@
* 2017 Victor Perez Marlin for stm32f1 test
*/
#define BOARD_NAME "Chitu3D"
#define BOARD_INFO_NAME "Chitu3D"
#define DEFAULT_MACHINE_NAME "STM32F103RET6"
// Enable I2C_EEPROM for testing

2
Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h
View File

@ -25,7 +25,7 @@
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
#endif
#define BOARD_NAME "FYSETC AIO II"
#define BOARD_INFO_NAME "FYSETC AIO II"
#define BOARD_WEBSITE_URL "https://fysetc.com"
#define DISABLE_JTAG

2
Marlin/src/pins/stm32/pins_FYSETC_CHEETAH.h
View File

@ -27,7 +27,7 @@
#define DEFAULT_MACHINE_NAME "3D Printer"
#define BOARD_NAME "FYSETC Cheetah"
#define BOARD_INFO_NAME "FYSETC Cheetah"
#define BOARD_WEBSITE_URL "https://fysetc.com"
// Ignore temp readings during development.

2
Marlin/src/pins/stm32/pins_GTM32_PRO_VB.h
View File

@ -30,7 +30,7 @@
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
#endif
#define BOARD_NAME "GTM32 Pro VB"
#define BOARD_INFO_NAME "GTM32 Pro VB"
#define DEFAULT_MACHINE_NAME "STM32F103VET6"
//#define DISABLE_DEBUG

2
Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h
View File

@ -33,7 +33,7 @@
#elif HOTENDS > 1 || E_STEPPERS > 1
#error "JGAurora 32-bit board only supports 1 hotend / E-stepper. Comment out this line to continue."
#endif
#define BOARD_NAME "JGAurora A5S A1 board"
#define BOARD_INFO_NAME "JGAurora A5S A1 board"
#define STM32_XL_DENSITY
// #define MCU_STM32F103ZE // not yet required

2
Marlin/src/pins/stm32/pins_LONGER3D_LK.h
View File

@ -28,7 +28,7 @@
#error "Longer3D board only supports 1 hotend / E-stepper. Comment out this line to continue."
#endif
#define BOARD_NAME "Longer3D"
#define BOARD_INFO_NAME "Longer3D"
#define ALFAWISE_UX0 // Common to all Longer3D STM32F1 boards (used for Open drain mosfets)
//#define DISABLE_DEBUG // We still want to debug with STLINK...

2
Marlin/src/pins/stm32/pins_MALYAN_M200.h
View File

@ -29,7 +29,7 @@
#error "Oops! You must be compiling for STM32."
#endif
#define BOARD_NAME "Malyan M200"
#define BOARD_INFO_NAME "Malyan M200"
// Enable EEPROM Emulation for this board
// This setting should probably be in configuration.h

2
Marlin/src/pins/stm32/pins_MKS_ROBIN.h
View File

@ -31,7 +31,7 @@
#error "MKS Robin supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "MKS Robin"
#define BOARD_INFO_NAME "MKS Robin"
//
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role

4
Marlin/src/pins/stm32/pins_MKS_ROBIN_LITE.h
View File

@ -29,8 +29,8 @@
#error "MKS Robin Lite supports up to 1 hotends / E-steppers. Comment out this line to continue."
#endif
#ifndef BOARD_NAME
#define BOARD_NAME "MKS Robin Lite"
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "MKS Robin Lite"
#endif
#define BOARD_WEBSITE_URL "https://github.com/makerbase-mks"

2
Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h
View File

@ -31,7 +31,7 @@
#error "MKS Robin mini supports up to 1 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "MKS Robin mini"
#define BOARD_INFO_NAME "MKS Robin mini"
//
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role

2
Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h
View File

@ -31,7 +31,7 @@
#error "MKS Robin nano supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_NAME "MKS Robin nano"
#define BOARD_INFO_NAME "MKS Robin nano"
//
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role

2
Marlin/src/pins/stm32/pins_MORPHEUS.h
View File

@ -34,7 +34,7 @@
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
#endif
#define BOARD_NAME "Bluepill based board"
#define BOARD_INFO_NAME "Bluepill based board"
//
// Limit Switches

2
Marlin/src/pins/stm32/pins_REMRAM_V1.h
View File

@ -25,7 +25,7 @@
#error "Oops! Select an STM32F7 board in 'Tools > Board.'"
#endif
#define BOARD_NAME "RemRam v1"
#define BOARD_INFO_NAME "RemRam v1"
#define DEFAULT_MACHINE_NAME "RemRam"
#define SRAM_EEPROM_EMULATION // Emulate the EEPROM using Backup SRAM

4
Marlin/src/pins/stm32/pins_RUMBA32.h
View File

@ -28,8 +28,8 @@
#endif
#define RUMBA32_V1_0
#define BOARD_NAME "RUMBA32"
#define DEFAULT_MACHINE_NAME BOARD_NAME
#define BOARD_INFO_NAME "RUMBA32"
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
//#define I2C_EEPROM
#define E2END 0xFFF // 4KB

2
Marlin/src/pins/stm32/pins_STM32F1R.h
View File

@ -29,7 +29,7 @@
* 21017 Victor Perez Marlin for stm32f1 test
*/
#define BOARD_NAME "Misc. STM32F1R"
#define BOARD_INFO_NAME "Misc. STM32F1R"
#define DEFAULT_MACHINE_NAME "STM32F103RET6"
// Ignore temp readings during development.

2
Marlin/src/pins/stm32/pins_STM32F4.h
View File

@ -27,7 +27,7 @@
#error "STM32F4 supports up to 2 hotends / E-steppers."
#endif
#define BOARD_NAME "Misc. STM32F4"
#define BOARD_INFO_NAME "Misc. STM32F4"
#define DEFAULT_MACHINE_NAME "STM32F407VET6"
//#define I2C_EEPROM

4
Marlin/src/pins/stm32/pins_STM3R_MINI.h
View File

@ -29,8 +29,8 @@
* 21017 Victor Perez Marlin for stm32f1 test
*/
#define BOARD_NAME "STM3R Mini"
#define DEFAULT_MACHINE_NAME BOARD_NAME
#define BOARD_INFO_NAME "STM3R Mini"
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
// Enable I2C_EEPROM for testing
#define I2C_EEPROM

4
Marlin/src/pins/stm32/pins_THE_BORG.h
View File

@ -27,8 +27,8 @@
#error "The-Borg supports up to 3 hotends / E-steppers."
#endif
#define BOARD_NAME "The-Borge"
#define DEFAULT_MACHINE_NAME BOARD_NAME
#define BOARD_INFO_NAME "The-Borge"
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
#define E2END 0xFFF // EEPROM end address