SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rename BOARD_STM32F4 to fix use with MB()

Browse source
This commit is contained in:
Scott Lahteine 2019-10-25 18:09:54 -05:00
parent 167ecd8620
commit f8ad15fde8
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/core/boards.h
View file

@ -289,7 +289,7 @@
// //
#define BOARD_BEAST 4200 // STM32F4xxVxT6 Libmaple-based STM32F4 controller #define BOARD_BEAST 4200 // STM32F4xxVxT6 Libmaple-based STM32F4 controller
#define BOARD_STM32F4 4201 // STM32 STM32GENERIC-based STM32F4 controller #define BOARD_GENERIC_STM32F4 4201 // STM32 STM32GENERIC-based STM32F4 controller
#define BOARD_ARMED 4202 // Arm'ed STM32F4-based controller #define BOARD_ARMED 4202 // Arm'ed STM32F4-based controller
#define BOARD_RUMBA32 4203 // RUMBA32 STM32F4-based controller #define BOARD_RUMBA32 4203 // RUMBA32 STM32F4-based controller
#define BOARD_BLACK_STM32F407VE 4204 // BLACK_STM32F407VE #define BOARD_BLACK_STM32F407VE 4204 // BLACK_STM32F407VE

4
Marlin/src/pins/pins.h
View file

@ -498,8 +498,8 @@
#elif MB(BEAST) #elif MB(BEAST)
#include "stm32/pins_BEAST.h" // STM32F4 env:STM32F4 #include "stm32/pins_BEAST.h" // STM32F4 env:STM32F4
#elif MB(STM32F4) #elif MB(GENERIC_STM32F4)
#include "stm32/pins_STM32F4.h" // STM32F4 env:STM32F4 #include "stm32/pins_GENERIC_STM32F4.h" // STM32F4 env:STM32F4
#elif MB(ARMED) #elif MB(ARMED)
#include "stm32/pins_ARMED.h" // STM32F4 env:ARMED #include "stm32/pins_ARMED.h" // STM32F4 env:ARMED
#elif MB(RUMBA32) #elif MB(RUMBA32)

0
Marlin/src/pins/stm32/pins_STM32F4.h → Marlin/src/pins/stm32/pins_GENERIC_STM32F4.h
View file

2
config/examples/STM32/STM32F4/Configuration.h
View file

@ -130,7 +130,7 @@
// Choose the name from boards.h that matches your setup // Choose the name from boards.h that matches your setup
#ifndef MOTHERBOARD #ifndef MOTHERBOARD
#define MOTHERBOARD BOARD_STM32F4 #define MOTHERBOARD BOARD_GENERIC_STM32F4
#endif #endif
// Name displayed in the LCD "Ready" message and Info menu // Name displayed in the LCD "Ready" message and Info menu