diff --git a/STM32F1/cores/maple/wirish.h b/STM32F1/cores/maple/wirish.h index 640e995..017b414 100644 --- a/STM32F1/cores/maple/wirish.h +++ b/STM32F1/cores/maple/wirish.h @@ -75,10 +75,7 @@ #include -#define SS BOARD_SPI1_NSS_PIN -#define MOSI BOARD_SPI1_MOSI_PIN -#define MISO BOARD_SPI1_MISO_PIN -#define SCK BOARD_SPI1_SCK_PIN + typedef unsigned int word; diff --git a/STM32F1/variants/generic_stm32f103c/variant.h b/STM32F1/variants/generic_stm32f103c/variant.h index 970dd96..52b39a6 100644 --- a/STM32F1/variants/generic_stm32f103c/variant.h +++ b/STM32F1/variants/generic_stm32f103c/variant.h @@ -11,4 +11,10 @@ #define portConfigRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->CRL) ) +static const uint8_t SS = BOARD_SPI1_NSS_PIN; +static const uint8_t SS1 = BOARD_SPI2_NSS_PIN; +static const uint8_t MOSI = BOARD_SPI1_MOSI_PIN; +static const uint8_t MISO = BOARD_SPI1_MISO_PIN; +static const uint8_t SCK = BOARD_SPI1_SCK_PIN; + #endif /* _VARIANT_ARDUINO_STM32_ */ \ No newline at end of file diff --git a/STM32F1/variants/generic_stm32f103r/variant.h b/STM32F1/variants/generic_stm32f103r/variant.h index 0358eb3..52b39a6 100644 --- a/STM32F1/variants/generic_stm32f103r/variant.h +++ b/STM32F1/variants/generic_stm32f103r/variant.h @@ -10,4 +10,11 @@ #define portClearRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->BRR) ) #define portConfigRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->CRL) ) + +static const uint8_t SS = BOARD_SPI1_NSS_PIN; +static const uint8_t SS1 = BOARD_SPI2_NSS_PIN; +static const uint8_t MOSI = BOARD_SPI1_MOSI_PIN; +static const uint8_t MISO = BOARD_SPI1_MISO_PIN; +static const uint8_t SCK = BOARD_SPI1_SCK_PIN; + #endif /* _VARIANT_ARDUINO_STM32_ */ \ No newline at end of file diff --git a/STM32F1/variants/generic_stm32f103r8/variant.h b/STM32F1/variants/generic_stm32f103r8/variant.h index 970dd96..52b39a6 100644 --- a/STM32F1/variants/generic_stm32f103r8/variant.h +++ b/STM32F1/variants/generic_stm32f103r8/variant.h @@ -11,4 +11,10 @@ #define portConfigRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->CRL) ) +static const uint8_t SS = BOARD_SPI1_NSS_PIN; +static const uint8_t SS1 = BOARD_SPI2_NSS_PIN; +static const uint8_t MOSI = BOARD_SPI1_MOSI_PIN; +static const uint8_t MISO = BOARD_SPI1_MISO_PIN; +static const uint8_t SCK = BOARD_SPI1_SCK_PIN; + #endif /* _VARIANT_ARDUINO_STM32_ */ \ No newline at end of file diff --git a/STM32F1/variants/generic_stm32f103t/variant.h b/STM32F1/variants/generic_stm32f103t/variant.h index 970dd96..446ee85 100644 --- a/STM32F1/variants/generic_stm32f103t/variant.h +++ b/STM32F1/variants/generic_stm32f103t/variant.h @@ -11,4 +11,10 @@ #define portConfigRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->CRL) ) +static const uint8_t SS = BOARD_SPI1_NSS_PIN; + +static const uint8_t MOSI = BOARD_SPI1_MOSI_PIN; +static const uint8_t MISO = BOARD_SPI1_MISO_PIN; +static const uint8_t SCK = BOARD_SPI1_SCK_PIN; + #endif /* _VARIANT_ARDUINO_STM32_ */ \ No newline at end of file diff --git a/STM32F1/variants/generic_stm32f103v/variant.h b/STM32F1/variants/generic_stm32f103v/variant.h index cc3e432..8a88623 100644 --- a/STM32F1/variants/generic_stm32f103v/variant.h +++ b/STM32F1/variants/generic_stm32f103v/variant.h @@ -10,4 +10,11 @@ #define portClearRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->BRR) ) #define portConfigRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->CRL) ) + +static const uint8_t SS = BOARD_SPI1_NSS_PIN; +static const uint8_t SS1 = BOARD_SPI2_NSS_PIN; +static const uint8_t MOSI = BOARD_SPI1_MOSI_PIN; +static const uint8_t MISO = BOARD_SPI1_MISO_PIN; +static const uint8_t SCK = BOARD_SPI1_SCK_PIN; + #endif /* _VARIANT_ARDUINO_STM32_ */ \ No newline at end of file diff --git a/STM32F1/variants/generic_stm32f103z/variant.h b/STM32F1/variants/generic_stm32f103z/variant.h index 0358eb3..52b39a6 100644 --- a/STM32F1/variants/generic_stm32f103z/variant.h +++ b/STM32F1/variants/generic_stm32f103z/variant.h @@ -10,4 +10,11 @@ #define portClearRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->BRR) ) #define portConfigRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->CRL) ) + +static const uint8_t SS = BOARD_SPI1_NSS_PIN; +static const uint8_t SS1 = BOARD_SPI2_NSS_PIN; +static const uint8_t MOSI = BOARD_SPI1_MOSI_PIN; +static const uint8_t MISO = BOARD_SPI1_MISO_PIN; +static const uint8_t SCK = BOARD_SPI1_SCK_PIN; + #endif /* _VARIANT_ARDUINO_STM32_ */ \ No newline at end of file diff --git a/STM32F1/variants/maple/variant.h b/STM32F1/variants/maple/variant.h index cc3e432..8a88623 100644 --- a/STM32F1/variants/maple/variant.h +++ b/STM32F1/variants/maple/variant.h @@ -10,4 +10,11 @@ #define portClearRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->BRR) ) #define portConfigRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->CRL) ) + +static const uint8_t SS = BOARD_SPI1_NSS_PIN; +static const uint8_t SS1 = BOARD_SPI2_NSS_PIN; +static const uint8_t MOSI = BOARD_SPI1_MOSI_PIN; +static const uint8_t MISO = BOARD_SPI1_MISO_PIN; +static const uint8_t SCK = BOARD_SPI1_SCK_PIN; + #endif /* _VARIANT_ARDUINO_STM32_ */ \ No newline at end of file diff --git a/STM32F1/variants/maple_mini/variant.h b/STM32F1/variants/maple_mini/variant.h index 6e399f3..8a88623 100644 --- a/STM32F1/variants/maple_mini/variant.h +++ b/STM32F1/variants/maple_mini/variant.h @@ -11,4 +11,10 @@ #define portConfigRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->CRL) ) +static const uint8_t SS = BOARD_SPI1_NSS_PIN; +static const uint8_t SS1 = BOARD_SPI2_NSS_PIN; +static const uint8_t MOSI = BOARD_SPI1_MOSI_PIN; +static const uint8_t MISO = BOARD_SPI1_MISO_PIN; +static const uint8_t SCK = BOARD_SPI1_SCK_PIN; + #endif /* _VARIANT_ARDUINO_STM32_ */ \ No newline at end of file diff --git a/STM32F1/variants/maple_ret6/variant.h b/STM32F1/variants/maple_ret6/variant.h index cc3e432..8a88623 100644 --- a/STM32F1/variants/maple_ret6/variant.h +++ b/STM32F1/variants/maple_ret6/variant.h @@ -10,4 +10,11 @@ #define portClearRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->BRR) ) #define portConfigRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->CRL) ) + +static const uint8_t SS = BOARD_SPI1_NSS_PIN; +static const uint8_t SS1 = BOARD_SPI2_NSS_PIN; +static const uint8_t MOSI = BOARD_SPI1_MOSI_PIN; +static const uint8_t MISO = BOARD_SPI1_MISO_PIN; +static const uint8_t SCK = BOARD_SPI1_SCK_PIN; + #endif /* _VARIANT_ARDUINO_STM32_ */ \ No newline at end of file diff --git a/STM32F1/variants/microduino/variant.h b/STM32F1/variants/microduino/variant.h index 6e399f3..815fa0c 100644 --- a/STM32F1/variants/microduino/variant.h +++ b/STM32F1/variants/microduino/variant.h @@ -11,4 +11,10 @@ #define portConfigRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->CRL) ) +static const uint8_t SS = BOARD_SPI1_NSS_PIN; + +static const uint8_t MOSI = BOARD_SPI1_MOSI_PIN; +static const uint8_t MISO = BOARD_SPI1_MISO_PIN; +static const uint8_t SCK = BOARD_SPI1_SCK_PIN; + #endif /* _VARIANT_ARDUINO_STM32_ */ \ No newline at end of file diff --git a/STM32F1/variants/nucleo_f103rb/variant.h b/STM32F1/variants/nucleo_f103rb/variant.h index 6e399f3..8a88623 100644 --- a/STM32F1/variants/nucleo_f103rb/variant.h +++ b/STM32F1/variants/nucleo_f103rb/variant.h @@ -11,4 +11,10 @@ #define portConfigRegister(pin) ( &(PIN_MAP[pin].gpio_device->regs->CRL) ) +static const uint8_t SS = BOARD_SPI1_NSS_PIN; +static const uint8_t SS1 = BOARD_SPI2_NSS_PIN; +static const uint8_t MOSI = BOARD_SPI1_MOSI_PIN; +static const uint8_t MISO = BOARD_SPI1_MISO_PIN; +static const uint8_t SCK = BOARD_SPI1_SCK_PIN; + #endif /* _VARIANT_ARDUINO_STM32_ */ \ No newline at end of file