From f8ad15fde8ed7271ea1fe097c2d165bfd9e40ba3 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 25 Oct 2019 18:09:54 -0500 Subject: [PATCH] Rename BOARD_STM32F4 to fix use with MB() --- Marlin/src/core/boards.h | 2 +- Marlin/src/pins/pins.h | 4 ++-- .../src/pins/stm32/{pins_STM32F4.h => pins_GENERIC_STM32F4.h} | 0 config/examples/STM32/STM32F4/Configuration.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename Marlin/src/pins/stm32/{pins_STM32F4.h => pins_GENERIC_STM32F4.h} (100%) diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h index 939cf5f75..cf533739a 100644 --- a/Marlin/src/core/boards.h +++ b/Marlin/src/core/boards.h @@ -289,7 +289,7 @@ // #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_RUMBA32 4203 // RUMBA32 STM32F4-based controller #define BOARD_BLACK_STM32F407VE 4204 // BLACK_STM32F407VE diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index 83b226b86..7a3dde780 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -498,8 +498,8 @@ #elif MB(BEAST) #include "stm32/pins_BEAST.h" // STM32F4 env:STM32F4 -#elif MB(STM32F4) - #include "stm32/pins_STM32F4.h" // STM32F4 env:STM32F4 +#elif MB(GENERIC_STM32F4) + #include "stm32/pins_GENERIC_STM32F4.h" // STM32F4 env:STM32F4 #elif MB(ARMED) #include "stm32/pins_ARMED.h" // STM32F4 env:ARMED #elif MB(RUMBA32) diff --git a/Marlin/src/pins/stm32/pins_STM32F4.h b/Marlin/src/pins/stm32/pins_GENERIC_STM32F4.h similarity index 100% rename from Marlin/src/pins/stm32/pins_STM32F4.h rename to Marlin/src/pins/stm32/pins_GENERIC_STM32F4.h diff --git a/config/examples/STM32/STM32F4/Configuration.h b/config/examples/STM32/STM32F4/Configuration.h index f9e69304b..5759e87ef 100644 --- a/config/examples/STM32/STM32F4/Configuration.h +++ b/config/examples/STM32/STM32F4/Configuration.h @@ -130,7 +130,7 @@ // Choose the name from boards.h that matches your setup #ifndef MOTHERBOARD - #define MOTHERBOARD BOARD_STM32F4 + #define MOTHERBOARD BOARD_GENERIC_STM32F4 #endif // Name displayed in the LCD "Ready" message and Info menu