djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32/spi: If MICROPY_HW_SPIn_MISO undefined, do not claim pin on init.

Browse Source 
This permits output-only SPI use.
This commit is contained in:
Peter D. Gray 2017-12-20 10:39:30 -05:00 committed by Damien George
parent b25f92160b
commit dfe8980acf
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ports/stm32/spi.c
View File

@ -243,8 +243,7 @@ STATIC void spi_set_params(SPI_HandleTypeDef *spi, uint32_t prescale, int32_t ba
// TODO allow to take a list of pins to use // TODO allow to take a list of pins to use
void spi_init(SPI_HandleTypeDef *spi, bool enable_nss_pin) { void spi_init(SPI_HandleTypeDef *spi, bool enable_nss_pin) {
const pyb_spi_obj_t *self; const pyb_spi_obj_t *self;
const pin_obj_t *pins[4]; const pin_obj_t *pins[4] = { NULL, NULL, NULL, NULL };
pins[0] = NULL;
if (0) { if (0) {
#if defined(MICROPY_HW_SPI1_SCK) #if defined(MICROPY_HW_SPI1_SCK)
@ -254,7 +253,9 @@ void spi_init(SPI_HandleTypeDef *spi, bool enable_nss_pin) {
pins[0] = &MICROPY_HW_SPI1_NSS; pins[0] = &MICROPY_HW_SPI1_NSS;
#endif #endif
pins[1] = &MICROPY_HW_SPI1_SCK; pins[1] = &MICROPY_HW_SPI1_SCK;
#if defined(MICROPY_HW_SPI1_MISO)
pins[2] = &MICROPY_HW_SPI1_MISO; pins[2] = &MICROPY_HW_SPI1_MISO;
#endif
pins[3] = &MICROPY_HW_SPI1_MOSI; pins[3] = &MICROPY_HW_SPI1_MOSI;
// enable the SPI clock // enable the SPI clock
__SPI1_CLK_ENABLE(); __SPI1_CLK_ENABLE();
@ -266,7 +267,9 @@ void spi_init(SPI_HandleTypeDef *spi, bool enable_nss_pin) {
pins[0] = &MICROPY_HW_SPI2_NSS; pins[0] = &MICROPY_HW_SPI2_NSS;
#endif #endif
pins[1] = &MICROPY_HW_SPI2_SCK; pins[1] = &MICROPY_HW_SPI2_SCK;
#if defined(MICROPY_HW_SPI2_MISO)
pins[2] = &MICROPY_HW_SPI2_MISO; pins[2] = &MICROPY_HW_SPI2_MISO;
#endif
pins[3] = &MICROPY_HW_SPI2_MOSI; pins[3] = &MICROPY_HW_SPI2_MOSI;
// enable the SPI clock // enable the SPI clock
__SPI2_CLK_ENABLE(); __SPI2_CLK_ENABLE();
@ -278,7 +281,9 @@ void spi_init(SPI_HandleTypeDef *spi, bool enable_nss_pin) {
pins[0] = &MICROPY_HW_SPI3_NSS; pins[0] = &MICROPY_HW_SPI3_NSS;
#endif #endif
pins[1] = &MICROPY_HW_SPI3_SCK; pins[1] = &MICROPY_HW_SPI3_SCK;
#if defined(MICROPY_HW_SPI3_MISO)
pins[2] = &MICROPY_HW_SPI3_MISO; pins[2] = &MICROPY_HW_SPI3_MISO;
#endif
pins[3] = &MICROPY_HW_SPI3_MOSI; pins[3] = &MICROPY_HW_SPI3_MOSI;
// enable the SPI clock // enable the SPI clock
__SPI3_CLK_ENABLE(); __SPI3_CLK_ENABLE();
@ -290,7 +295,9 @@ void spi_init(SPI_HandleTypeDef *spi, bool enable_nss_pin) {
pins[0] = &MICROPY_HW_SPI4_NSS; pins[0] = &MICROPY_HW_SPI4_NSS;
#endif #endif
pins[1] = &MICROPY_HW_SPI4_SCK; pins[1] = &MICROPY_HW_SPI4_SCK;
#if defined(MICROPY_HW_SPI4_MISO)
pins[2] = &MICROPY_HW_SPI4_MISO; pins[2] = &MICROPY_HW_SPI4_MISO;
#endif
pins[3] = &MICROPY_HW_SPI4_MOSI; pins[3] = &MICROPY_HW_SPI4_MOSI;
// enable the SPI clock // enable the SPI clock
__SPI4_CLK_ENABLE(); __SPI4_CLK_ENABLE();
@ -302,7 +309,9 @@ void spi_init(SPI_HandleTypeDef *spi, bool enable_nss_pin) {
pins[0] = &MICROPY_HW_SPI5_NSS; pins[0] = &MICROPY_HW_SPI5_NSS;
#endif #endif
pins[1] = &MICROPY_HW_SPI5_SCK; pins[1] = &MICROPY_HW_SPI5_SCK;
#if defined(MICROPY_HW_SPI5_MISO)
pins[2] = &MICROPY_HW_SPI5_MISO; pins[2] = &MICROPY_HW_SPI5_MISO;
#endif
pins[3] = &MICROPY_HW_SPI5_MOSI; pins[3] = &MICROPY_HW_SPI5_MOSI;
// enable the SPI clock // enable the SPI clock
__SPI5_CLK_ENABLE(); __SPI5_CLK_ENABLE();
@ -314,7 +323,9 @@ void spi_init(SPI_HandleTypeDef *spi, bool enable_nss_pin) {
pins[0] = &MICROPY_HW_SPI6_NSS; pins[0] = &MICROPY_HW_SPI6_NSS;
#endif #endif
pins[1] = &MICROPY_HW_SPI6_SCK; pins[1] = &MICROPY_HW_SPI6_SCK;
#if defined(MICROPY_HW_SPI6_MISO)
pins[2] = &MICROPY_HW_SPI6_MISO; pins[2] = &MICROPY_HW_SPI6_MISO;
#endif
pins[3] = &MICROPY_HW_SPI6_MOSI; pins[3] = &MICROPY_HW_SPI6_MOSI;
// enable the SPI clock // enable the SPI clock
__SPI6_CLK_ENABLE(); __SPI6_CLK_ENABLE();
@ -327,7 +338,10 @@ void spi_init(SPI_HandleTypeDef *spi, bool enable_nss_pin) {
// init the GPIO lines // init the GPIO lines
uint32_t mode = MP_HAL_PIN_MODE_ALT; uint32_t mode = MP_HAL_PIN_MODE_ALT;
uint32_t pull = spi->Init.CLKPolarity == SPI_POLARITY_LOW ? MP_HAL_PIN_PULL_DOWN : MP_HAL_PIN_PULL_UP; uint32_t pull = spi->Init.CLKPolarity == SPI_POLARITY_LOW ? MP_HAL_PIN_PULL_DOWN : MP_HAL_PIN_PULL_UP;
for (uint i = (enable_nss_pin && pins[0] ? 0 : 1); i < 4; i++) { for (uint i = (enable_nss_pin ? 0 : 1); i < 4; i++) {
if (pins[i] == NULL) {
continue;
}
mp_hal_pin_config_alt(pins[i], mode, pull, AF_FN_SPI, (self - &pyb_spi_obj[0]) + 1); mp_hal_pin_config_alt(pins[i], mode, pull, AF_FN_SPI, (self - &pyb_spi_obj[0]) + 1);
} }