Skip to content

Commit 0909f4c

Browse files
rogerclarkmelbournerogerclarkmelbourne
committed
Changed defines for MOSI, MISO etc into const static vars, to address compatibility issues
1 parent be6e7f0 commit 0909f4c

12 files changed

Lines changed: 72 additions & 4 deletions

File tree

‎STM32F1/cores/maple/wirish.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,7 @@
7575
#include <stdint.h>
7676

7777

78-
#define SS BOARD_SPI1_NSS_PIN
79-
#define MOSI BOARD_SPI1_MOSI_PIN
80-
#define MISO BOARD_SPI1_MISO_PIN
81-
#define SCK BOARD_SPI1_SCK_PIN
78+
8279

8380

8481
typedef unsigned int word;

‎STM32F1/variants/generic_stm32f103c/variant.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,10 @@
1111

1212
#define portConfigRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->CRL) )
1313

14+
static const uint8_t SS = BOARD_SPI1_NSS_PIN;
15+
static const uint8_t SS1 = BOARD_SPI2_NSS_PIN;
16+
static const uint8_t MOSI = BOARD_SPI1_MOSI_PIN;
17+
static const uint8_t MISO = BOARD_SPI1_MISO_PIN;
18+
static const uint8_t SCK = BOARD_SPI1_SCK_PIN;
19+
1420
#endif /* _VARIANT_ARDUINO_STM32_ */

‎STM32F1/variants/generic_stm32f103r/variant.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,11 @@
1010
#define portClearRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->BRR) )
1111

1212
#define portConfigRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->CRL) )
13+
14+
static const uint8_t SS = BOARD_SPI1_NSS_PIN;
15+
static const uint8_t SS1 = BOARD_SPI2_NSS_PIN;
16+
static const uint8_t MOSI = BOARD_SPI1_MOSI_PIN;
17+
static const uint8_t MISO = BOARD_SPI1_MISO_PIN;
18+
static const uint8_t SCK = BOARD_SPI1_SCK_PIN;
19+
1320
#endif /* _VARIANT_ARDUINO_STM32_ */

‎STM32F1/variants/generic_stm32f103r8/variant.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,10 @@
1111

1212
#define portConfigRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->CRL) )
1313

14+
static const uint8_t SS = BOARD_SPI1_NSS_PIN;
15+
static const uint8_t SS1 = BOARD_SPI2_NSS_PIN;
16+
static const uint8_t MOSI = BOARD_SPI1_MOSI_PIN;
17+
static const uint8_t MISO = BOARD_SPI1_MISO_PIN;
18+
static const uint8_t SCK = BOARD_SPI1_SCK_PIN;
19+
1420
#endif /* _VARIANT_ARDUINO_STM32_ */

‎STM32F1/variants/generic_stm32f103t/variant.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,10 @@
1111

1212
#define portConfigRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->CRL) )
1313

14+
static const uint8_t SS = BOARD_SPI1_NSS_PIN;
15+
16+
static const uint8_t MOSI = BOARD_SPI1_MOSI_PIN;
17+
static const uint8_t MISO = BOARD_SPI1_MISO_PIN;
18+
static const uint8_t SCK = BOARD_SPI1_SCK_PIN;
19+
1420
#endif /* _VARIANT_ARDUINO_STM32_ */

‎STM32F1/variants/generic_stm32f103v/variant.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,11 @@
1010
#define portClearRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->BRR) )
1111

1212
#define portConfigRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->CRL) )
13+
14+
static const uint8_t SS = BOARD_SPI1_NSS_PIN;
15+
static const uint8_t SS1 = BOARD_SPI2_NSS_PIN;
16+
static const uint8_t MOSI = BOARD_SPI1_MOSI_PIN;
17+
static const uint8_t MISO = BOARD_SPI1_MISO_PIN;
18+
static const uint8_t SCK = BOARD_SPI1_SCK_PIN;
19+
1320
#endif /* _VARIANT_ARDUINO_STM32_ */

‎STM32F1/variants/generic_stm32f103z/variant.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,11 @@
1010
#define portClearRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->BRR) )
1111

1212
#define portConfigRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->CRL) )
13+
14+
static const uint8_t SS = BOARD_SPI1_NSS_PIN;
15+
static const uint8_t SS1 = BOARD_SPI2_NSS_PIN;
16+
static const uint8_t MOSI = BOARD_SPI1_MOSI_PIN;
17+
static const uint8_t MISO = BOARD_SPI1_MISO_PIN;
18+
static const uint8_t SCK = BOARD_SPI1_SCK_PIN;
19+
1320
#endif /* _VARIANT_ARDUINO_STM32_ */

‎STM32F1/variants/maple/variant.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,11 @@
1010
#define portClearRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->BRR) )
1111

1212
#define portConfigRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->CRL) )
13+
14+
static const uint8_t SS = BOARD_SPI1_NSS_PIN;
15+
static const uint8_t SS1 = BOARD_SPI2_NSS_PIN;
16+
static const uint8_t MOSI = BOARD_SPI1_MOSI_PIN;
17+
static const uint8_t MISO = BOARD_SPI1_MISO_PIN;
18+
static const uint8_t SCK = BOARD_SPI1_SCK_PIN;
19+
1320
#endif /* _VARIANT_ARDUINO_STM32_ */

‎STM32F1/variants/maple_mini/variant.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,10 @@
1111

1212
#define portConfigRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->CRL) )
1313

14+
static const uint8_t SS = BOARD_SPI1_NSS_PIN;
15+
static const uint8_t SS1 = BOARD_SPI2_NSS_PIN;
16+
static const uint8_t MOSI = BOARD_SPI1_MOSI_PIN;
17+
static const uint8_t MISO = BOARD_SPI1_MISO_PIN;
18+
static const uint8_t SCK = BOARD_SPI1_SCK_PIN;
19+
1420
#endif /* _VARIANT_ARDUINO_STM32_ */

‎STM32F1/variants/maple_ret6/variant.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,11 @@
1010
#define portClearRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->BRR) )
1111

1212
#define portConfigRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->CRL) )
13+
14+
static const uint8_t SS = BOARD_SPI1_NSS_PIN;
15+
static const uint8_t SS1 = BOARD_SPI2_NSS_PIN;
16+
static const uint8_t MOSI = BOARD_SPI1_MOSI_PIN;
17+
static const uint8_t MISO = BOARD_SPI1_MISO_PIN;
18+
static const uint8_t SCK = BOARD_SPI1_SCK_PIN;
19+
1320
#endif /* _VARIANT_ARDUINO_STM32_ */

0 commit comments

Comments
 (0)