ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6717 from marcuschangarm/fix-spi-pins 

Fix NRF52 SPI pin initialization
pull/6715/merge
Martin Kojtal 2018-04-25 13:17:05 +01:00 committed by GitHub
parent beb8da965c 6db4425351
commit a858454451
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
targets/TARGET_NORDIC/TARGET_NRF5x/spi_api.c
View File

@ -156,8 +156,10 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
spi_inst->event = 0; spi_inst->event = 0;
#endif #endif
/* Configuration has changed, set flag to force update. */ /* Configure peripheral. This is called on each init to ensure all pins are set correctly
spi_inst->update = true; * according to the SPI mode before calling CS for the first time.
*/
spi_configure_driver_instance(obj);
/* Configure GPIO pin if chip select has been set. */ /* Configure GPIO pin if chip select has been set. */
if (ssel != NC) { if (ssel != NC) {
@ -223,19 +225,31 @@ void spi_format(spi_t *obj, int bits, int mode, int slave)
struct spi_s *spi_inst = obj; struct spi_s *spi_inst = obj;
#endif #endif
nrf_drv_spi_mode_t new_mode = NRF_DRV_SPI_MODE_0;
/* Convert Mbed HAL mode to Nordic mode. */ /* Convert Mbed HAL mode to Nordic mode. */
if(mode == 0) { if(mode == 0) {
spi_inst->config.mode = NRF_DRV_SPI_MODE_0; new_mode = NRF_DRV_SPI_MODE_0;
} else if(mode == 1) { } else if(mode == 1) {
spi_inst->config.mode = NRF_DRV_SPI_MODE_1; new_mode = NRF_DRV_SPI_MODE_1;
} else if(mode == 2) { } else if(mode == 2) {
spi_inst->config.mode = NRF_DRV_SPI_MODE_2; new_mode = NRF_DRV_SPI_MODE_2;
} else if(mode == 3) { } else if(mode == 3) {
spi_inst->config.mode = NRF_DRV_SPI_MODE_3; new_mode = NRF_DRV_SPI_MODE_3;
} }
/* Configuration has changed, set flag to force application. */ /* Check if configuration has changed. */
if (spi_inst->config.mode != new_mode) {
spi_inst->config.mode = new_mode;
/* Set flag to force update. */
spi_inst->update = true; spi_inst->update = true;
}
/* Configure peripheral if necessary. Must be called on each format to ensure the pins are set
* correctly according to the SPI mode.
*/
spi_configure_driver_instance(obj);
} }
/** Set the SPI baud rate /** Set the SPI baud rate
@ -253,25 +267,32 @@ void spi_frequency(spi_t *obj, int hz)
struct spi_s *spi_inst = obj; struct spi_s *spi_inst = obj;
#endif #endif
nrf_drv_spi_frequency_t new_frequency = NRF_DRV_SPI_FREQ_1M;
/* Convert frequency to Nordic enum type. */ /* Convert frequency to Nordic enum type. */
if (hz < 250000) { if (hz < 250000) {
spi_inst->config.frequency = NRF_DRV_SPI_FREQ_125K; new_frequency = NRF_DRV_SPI_FREQ_125K;
} else if (hz < 500000) { } else if (hz < 500000) {
spi_inst->config.frequency = NRF_DRV_SPI_FREQ_250K; new_frequency = NRF_DRV_SPI_FREQ_250K;
} else if (hz < 1000000) { } else if (hz < 1000000) {
spi_inst->config.frequency = NRF_DRV_SPI_FREQ_500K; new_frequency = NRF_DRV_SPI_FREQ_500K;
} else if (hz < 2000000) { } else if (hz < 2000000) {
spi_inst->config.frequency = NRF_DRV_SPI_FREQ_1M; new_frequency = NRF_DRV_SPI_FREQ_1M;
} else if (hz < 4000000) { } else if (hz < 4000000) {
spi_inst->config.frequency = NRF_DRV_SPI_FREQ_2M; new_frequency = NRF_DRV_SPI_FREQ_2M;
} else if (hz < 8000000) { } else if (hz < 8000000) {
spi_inst->config.frequency = NRF_DRV_SPI_FREQ_4M; new_frequency = NRF_DRV_SPI_FREQ_4M;
} else { } else {
spi_inst->config.frequency = NRF_DRV_SPI_FREQ_8M; new_frequency = NRF_DRV_SPI_FREQ_8M;
} }
/* Configuration has changed, set flag to force application. */ /* Check if configuration has changed. */
if (spi_inst->config.frequency != new_frequency) {
spi_inst->config.frequency = new_frequency;
/* Set flag to force update. */
spi_inst->update = true; spi_inst->update = true;
}
} }
/** Write a byte out in master mode and receive a value /** Write a byte out in master mode and receive a value
@ -290,11 +311,6 @@ int spi_master_write(spi_t *obj, int value)
int instance = spi_inst->instance; int instance = spi_inst->instance;
/* Manually clear chip select pin if defined. */
if (spi_inst->cs != NC) {
nrf_gpio_pin_clear(spi_inst->cs);
}
/* Local variables used in transfer. */ /* Local variables used in transfer. */
const uint8_t tx_buff = (uint8_t) value; const uint8_t tx_buff = (uint8_t) value;
uint8_t rx_buff; uint8_t rx_buff;
@ -302,6 +318,11 @@ int spi_master_write(spi_t *obj, int value)
/* Configure peripheral if necessary. */ /* Configure peripheral if necessary. */
spi_configure_driver_instance(obj); spi_configure_driver_instance(obj);
/* Manually clear chip select pin if defined. */
if (spi_inst->cs != NC) {
nrf_gpio_pin_clear(spi_inst->cs);
}
/* Transfer 1 byte. */ /* Transfer 1 byte. */
nrf_drv_spi_transfer(&nordic_nrf5_spi_instance[instance], &tx_buff, 1, &rx_buff, 1); nrf_drv_spi_transfer(&nordic_nrf5_spi_instance[instance], &tx_buff, 1, &rx_buff, 1);