From 579e4396e2d5389481090b0b0a7c0daeb2d69f46 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 6 Aug 2019 04:48:29 -0500 Subject: [PATCH] Reduce STM32_F4_F7 pin warnings --- .../HAL/HAL_STM32_F4_F7/fastio_STM32_F4_F7.h | 244 +++++++++--------- 1 file changed, 128 insertions(+), 116 deletions(-) diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/fastio_STM32_F4_F7.h b/Marlin/src/HAL/HAL_STM32_F4_F7/fastio_STM32_F4_F7.h index 4071666060..d65900540d 100644 --- a/Marlin/src/HAL/HAL_STM32_F4_F7/fastio_STM32_F4_F7.h +++ b/Marlin/src/HAL/HAL_STM32_F4_F7/fastio_STM32_F4_F7.h @@ -27,8 +27,6 @@ * These use GPIO functions instead of Direct Port Manipulation, as on AVR. */ -#define _BV(b) (1 << (b)) - #define READ(IO) digitalRead(IO) #define WRITE(IO,V) digitalWrite(IO,V) @@ -66,127 +64,141 @@ #define _STM32_PIN(P,PN) ((PORT##P * 16) + PN) -#define PA0 _STM32_PIN(A, 0) -#define PA1 _STM32_PIN(A, 1) -#define PA2 _STM32_PIN(A, 2) -#define PA3 _STM32_PIN(A, 3) -#define PA4 _STM32_PIN(A, 4) -#define PA5 _STM32_PIN(A, 5) -#define PA6 _STM32_PIN(A, 6) -#define PA7 _STM32_PIN(A, 7) -#define PA8 _STM32_PIN(A, 8) -#define PA9 _STM32_PIN(A, 9) -#define PA10 _STM32_PIN(A, 10) -#define PA11 _STM32_PIN(A, 11) -#define PA12 _STM32_PIN(A, 12) -#define PA13 _STM32_PIN(A, 13) -#define PA14 _STM32_PIN(A, 14) -#define PA15 _STM32_PIN(A, 15) +#ifndef PA0 + #define PA0 _STM32_PIN(A, 0) + #define PA1 _STM32_PIN(A, 1) + #define PA2 _STM32_PIN(A, 2) + #define PA3 _STM32_PIN(A, 3) + #define PA4 _STM32_PIN(A, 4) + #define PA5 _STM32_PIN(A, 5) + #define PA6 _STM32_PIN(A, 6) + #define PA7 _STM32_PIN(A, 7) + #define PA8 _STM32_PIN(A, 8) + #define PA9 _STM32_PIN(A, 9) + #define PA10 _STM32_PIN(A, 10) + #define PA11 _STM32_PIN(A, 11) + #define PA12 _STM32_PIN(A, 12) + #define PA13 _STM32_PIN(A, 13) + #define PA14 _STM32_PIN(A, 14) + #define PA15 _STM32_PIN(A, 15) +#endif -#define PB0 _STM32_PIN(B, 0) -#define PB1 _STM32_PIN(B, 1) -#define PB2 _STM32_PIN(B, 2) -#define PB3 _STM32_PIN(B, 3) -#define PB4 _STM32_PIN(B, 4) -#define PB5 _STM32_PIN(B, 5) -#define PB6 _STM32_PIN(B, 6) -#define PB7 _STM32_PIN(B, 7) -#define PB8 _STM32_PIN(B, 8) -#define PB9 _STM32_PIN(B, 9) -#define PB10 _STM32_PIN(B, 10) -#define PB11 _STM32_PIN(B, 11) -#define PB12 _STM32_PIN(B, 12) -#define PB13 _STM32_PIN(B, 13) -#define PB14 _STM32_PIN(B, 14) -#define PB15 _STM32_PIN(B, 15) +#ifndef PB0 + #define PB0 _STM32_PIN(B, 0) + #define PB1 _STM32_PIN(B, 1) + #define PB2 _STM32_PIN(B, 2) + #define PB3 _STM32_PIN(B, 3) + #define PB4 _STM32_PIN(B, 4) + #define PB5 _STM32_PIN(B, 5) + #define PB6 _STM32_PIN(B, 6) + #define PB7 _STM32_PIN(B, 7) + #define PB8 _STM32_PIN(B, 8) + #define PB9 _STM32_PIN(B, 9) + #define PB10 _STM32_PIN(B, 10) + #define PB11 _STM32_PIN(B, 11) + #define PB12 _STM32_PIN(B, 12) + #define PB13 _STM32_PIN(B, 13) + #define PB14 _STM32_PIN(B, 14) + #define PB15 _STM32_PIN(B, 15) +#endif -#define PC0 _STM32_PIN(C, 0) -#define PC1 _STM32_PIN(C, 1) -#define PC2 _STM32_PIN(C, 2) -#define PC3 _STM32_PIN(C, 3) -#define PC4 _STM32_PIN(C, 4) -#define PC5 _STM32_PIN(C, 5) -#define PC6 _STM32_PIN(C, 6) -#define PC7 _STM32_PIN(C, 7) -#define PC8 _STM32_PIN(C, 8) -#define PC9 _STM32_PIN(C, 9) -#define PC10 _STM32_PIN(C, 10) -#define PC11 _STM32_PIN(C, 11) -#define PC12 _STM32_PIN(C, 12) -#define PC13 _STM32_PIN(C, 13) -#define PC14 _STM32_PIN(C, 14) -#define PC15 _STM32_PIN(C, 15) +#ifndef PC0 + #define PC0 _STM32_PIN(C, 0) + #define PC1 _STM32_PIN(C, 1) + #define PC2 _STM32_PIN(C, 2) + #define PC3 _STM32_PIN(C, 3) + #define PC4 _STM32_PIN(C, 4) + #define PC5 _STM32_PIN(C, 5) + #define PC6 _STM32_PIN(C, 6) + #define PC7 _STM32_PIN(C, 7) + #define PC8 _STM32_PIN(C, 8) + #define PC9 _STM32_PIN(C, 9) + #define PC10 _STM32_PIN(C, 10) + #define PC11 _STM32_PIN(C, 11) + #define PC12 _STM32_PIN(C, 12) + #define PC13 _STM32_PIN(C, 13) + #define PC14 _STM32_PIN(C, 14) + #define PC15 _STM32_PIN(C, 15) +#endif -#define PD0 _STM32_PIN(D, 0) -#define PD1 _STM32_PIN(D, 1) -#define PD2 _STM32_PIN(D, 2) -#define PD3 _STM32_PIN(D, 3) -#define PD4 _STM32_PIN(D, 4) -#define PD5 _STM32_PIN(D, 5) -#define PD6 _STM32_PIN(D, 6) -#define PD7 _STM32_PIN(D, 7) -#define PD8 _STM32_PIN(D, 8) -#define PD9 _STM32_PIN(D, 9) -#define PD10 _STM32_PIN(D, 10) -#define PD11 _STM32_PIN(D, 11) -#define PD12 _STM32_PIN(D, 12) -#define PD13 _STM32_PIN(D, 13) -#define PD14 _STM32_PIN(D, 14) -#define PD15 _STM32_PIN(D, 15) +#ifndef PD0 + #define PD0 _STM32_PIN(D, 0) + #define PD1 _STM32_PIN(D, 1) + #define PD2 _STM32_PIN(D, 2) + #define PD3 _STM32_PIN(D, 3) + #define PD4 _STM32_PIN(D, 4) + #define PD5 _STM32_PIN(D, 5) + #define PD6 _STM32_PIN(D, 6) + #define PD7 _STM32_PIN(D, 7) + #define PD8 _STM32_PIN(D, 8) + #define PD9 _STM32_PIN(D, 9) + #define PD10 _STM32_PIN(D, 10) + #define PD11 _STM32_PIN(D, 11) + #define PD12 _STM32_PIN(D, 12) + #define PD13 _STM32_PIN(D, 13) + #define PD14 _STM32_PIN(D, 14) + #define PD15 _STM32_PIN(D, 15) +#endif -#define PE0 _STM32_PIN(E, 0) -#define PE1 _STM32_PIN(E, 1) -#define PE2 _STM32_PIN(E, 2) -#define PE3 _STM32_PIN(E, 3) -#define PE4 _STM32_PIN(E, 4) -#define PE5 _STM32_PIN(E, 5) -#define PE6 _STM32_PIN(E, 6) -#define PE7 _STM32_PIN(E, 7) -#define PE8 _STM32_PIN(E, 8) -#define PE9 _STM32_PIN(E, 9) -#define PE10 _STM32_PIN(E, 10) -#define PE11 _STM32_PIN(E, 11) -#define PE12 _STM32_PIN(E, 12) -#define PE13 _STM32_PIN(E, 13) -#define PE14 _STM32_PIN(E, 14) -#define PE15 _STM32_PIN(E, 15) +#ifndef PE0 + #define PE0 _STM32_PIN(E, 0) + #define PE1 _STM32_PIN(E, 1) + #define PE2 _STM32_PIN(E, 2) + #define PE3 _STM32_PIN(E, 3) + #define PE4 _STM32_PIN(E, 4) + #define PE5 _STM32_PIN(E, 5) + #define PE6 _STM32_PIN(E, 6) + #define PE7 _STM32_PIN(E, 7) + #define PE8 _STM32_PIN(E, 8) + #define PE9 _STM32_PIN(E, 9) + #define PE10 _STM32_PIN(E, 10) + #define PE11 _STM32_PIN(E, 11) + #define PE12 _STM32_PIN(E, 12) + #define PE13 _STM32_PIN(E, 13) + #define PE14 _STM32_PIN(E, 14) + #define PE15 _STM32_PIN(E, 15) +#endif #ifdef STM32F7 - #define PORTF 5 - #define PORTG 6 - #define PF0 _STM32_PIN(F, 0) - #define PF1 _STM32_PIN(F, 1) - #define PF2 _STM32_PIN(F, 2) - #define PF3 _STM32_PIN(F, 3) - #define PF4 _STM32_PIN(F, 4) - #define PF5 _STM32_PIN(F, 5) - #define PF6 _STM32_PIN(F, 6) - #define PF7 _STM32_PIN(F, 7) - #define PF8 _STM32_PIN(F, 8) - #define PF9 _STM32_PIN(F, 9) - #define PF10 _STM32_PIN(F, 10) - #define PF11 _STM32_PIN(F, 11) - #define PF12 _STM32_PIN(F, 12) - #define PF13 _STM32_PIN(F, 13) - #define PF14 _STM32_PIN(F, 14) - #define PF15 _STM32_PIN(F, 15) + #ifndef PF0 + #define PORTF 5 + #define PF0 _STM32_PIN(F, 0) + #define PF1 _STM32_PIN(F, 1) + #define PF2 _STM32_PIN(F, 2) + #define PF3 _STM32_PIN(F, 3) + #define PF4 _STM32_PIN(F, 4) + #define PF5 _STM32_PIN(F, 5) + #define PF6 _STM32_PIN(F, 6) + #define PF7 _STM32_PIN(F, 7) + #define PF8 _STM32_PIN(F, 8) + #define PF9 _STM32_PIN(F, 9) + #define PF10 _STM32_PIN(F, 10) + #define PF11 _STM32_PIN(F, 11) + #define PF12 _STM32_PIN(F, 12) + #define PF13 _STM32_PIN(F, 13) + #define PF14 _STM32_PIN(F, 14) + #define PF15 _STM32_PIN(F, 15) + #endif - #define PG0 _STM32_PIN(G, 0) - #define PG1 _STM32_PIN(G, 1) - #define PG2 _STM32_PIN(G, 2) - #define PG3 _STM32_PIN(G, 3) - #define PG4 _STM32_PIN(G, 4) - #define PG5 _STM32_PIN(G, 5) - #define PG6 _STM32_PIN(G, 6) - #define PG7 _STM32_PIN(G, 7) - #define PG8 _STM32_PIN(G, 8) - #define PG9 _STM32_PIN(G, 9) - #define PG10 _STM32_PIN(G, 10) - #define PG11 _STM32_PIN(G, 11) - #define PG12 _STM32_PIN(G, 12) - #define PG13 _STM32_PIN(G, 13) - #define PG14 _STM32_PIN(G, 14) - #define PG15 _STM32_PIN(G, 15) + #ifndef PG0 + #define PORTG 6 + #define PG0 _STM32_PIN(G, 0) + #define PG1 _STM32_PIN(G, 1) + #define PG2 _STM32_PIN(G, 2) + #define PG3 _STM32_PIN(G, 3) + #define PG4 _STM32_PIN(G, 4) + #define PG5 _STM32_PIN(G, 5) + #define PG6 _STM32_PIN(G, 6) + #define PG7 _STM32_PIN(G, 7) + #define PG8 _STM32_PIN(G, 8) + #define PG9 _STM32_PIN(G, 9) + #define PG10 _STM32_PIN(G, 10) + #define PG11 _STM32_PIN(G, 11) + #define PG12 _STM32_PIN(G, 12) + #define PG13 _STM32_PIN(G, 13) + #define PG14 _STM32_PIN(G, 14) + #define PG15 _STM32_PIN(G, 15) + #endif #endif // STM32GENERIC && STM32F7