diff --git a/Globals.h b/Globals.h index 26599c4..02c0502 100644 --- a/Globals.h +++ b/Globals.h @@ -19,7 +19,7 @@ #if !defined(GLOBALS_H) #define GLOBALS_H -#if defined(STM32F4XX) || defined(STM32F4) +#if defined(STM32F4XX) #include "stm32f4xx.h" #elif defined(STM32F7XX) #include "stm32f7xx.h" @@ -34,7 +34,7 @@ #define ARM_MATH_CM3 #elif defined(STM32F7XX) #define ARM_MATH_CM7 -#elif defined(STM32F4XX) || defined(STM32F4) || defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__) +#elif defined(STM32F4XX) || defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__) #define ARM_MATH_CM4 #else #error "Unknown processor type" diff --git a/IOSTM.cpp b/IOSTM.cpp index be6f1ce..3abf820 100644 --- a/IOSTM.cpp +++ b/IOSTM.cpp @@ -22,7 +22,7 @@ #include "Globals.h" #include "IO.h" -#if defined(STM32F4XX) || defined(STM32F4) || defined(STM32F7XX) +#if defined(STM32F4XX) || defined(STM32F7XX) #if defined(STM32F4_DISCOVERY) /* diff --git a/MMDVM.cpp b/MMDVM.cpp index cbeeef5..12673e4 100644 --- a/MMDVM.cpp +++ b/MMDVM.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#if defined(STM32F4XX) || defined(STM32F4) || defined(STM32F7XX) || defined(STM32F105xC) +#if defined(STM32F4XX) || defined(STM32F7XX) || defined(STM32F105xC) #include "Config.h" #include "Globals.h" diff --git a/RSSIRB.h b/RSSIRB.h index 6c751bf..0f855a3 100644 --- a/RSSIRB.h +++ b/RSSIRB.h @@ -21,7 +21,7 @@ Boston, MA 02110-1301, USA. #if !defined(RSSIRB_H) #define RSSIRB_H -#if defined(STM32F4XX) || defined(STM32F4) +#if defined(STM32F4XX) #include "stm32f4xx.h" #include #elif defined(STM32F7XX) diff --git a/SampleRB.h b/SampleRB.h index 35522b3..305bf8b 100644 --- a/SampleRB.h +++ b/SampleRB.h @@ -21,7 +21,7 @@ Boston, MA 02110-1301, USA. #if !defined(SAMPLERB_H) #define SAMPLERB_H -#if defined(STM32F4XX) || defined(STM32F4) +#if defined(STM32F4XX) #include "stm32f4xx.h" #include #elif defined(STM32F7XX) diff --git a/SerialRB.h b/SerialRB.h index f669cbc..91ebcc1 100644 --- a/SerialRB.h +++ b/SerialRB.h @@ -21,7 +21,7 @@ Boston, MA 02110-1301, USA. #if !defined(SERIALRB_H) #define SERIALRB_H -#if defined(STM32F4XX) || defined(STM32F4) +#if defined(STM32F4XX) #include "stm32f4xx.h" #include #elif defined(STM32F7XX) diff --git a/SerialSTM.cpp b/SerialSTM.cpp index f813dd7..e0aa6c3 100644 --- a/SerialSTM.cpp +++ b/SerialSTM.cpp @@ -37,7 +37,7 @@ UART5 - TXD PC12 - RXD PD2 (Discovery, Pi and Nucleo with Morpho header) */ -#if defined(STM32F4XX) || defined(STM32F4) || defined(STM32F7XX) +#if defined(STM32F4XX) || defined(STM32F7XX) #define TX_SERIAL_FIFO_SIZE 512U #define RX_SERIAL_FIFO_SIZE 512U diff --git a/Utils.h b/Utils.h index 5d8c76e..7656b23 100644 --- a/Utils.h +++ b/Utils.h @@ -19,7 +19,7 @@ #if !defined(UTILS_H) #define UTILS_H -#if defined(STM32F4XX) || defined(STM32F4) +#if defined(STM32F4XX) #include "stm32f4xx.h" #include #elif defined(STM32F7XX)