From 7949860188e50b5b58e823387510e02618892bca Mon Sep 17 00:00:00 2001 From: Andrey Perminov Date: Fri, 24 Apr 2020 14:50:51 -0700 Subject: [PATCH] Moved spi_init() to HAL_Driver Change-Id: I7435744abde95cd3c2c594e7a8ff23499188ec62 --- BMLite_example/inc/bmlite_hal.h | 6 ------ HAL_Driver/src/hal_board.c | 6 ++++-- HAL_Driver/src/hal_spi.c | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/BMLite_example/inc/bmlite_hal.h b/BMLite_example/inc/bmlite_hal.h index a280d00..9fbedd8 100755 --- a/BMLite_example/inc/bmlite_hal.h +++ b/BMLite_example/inc/bmlite_hal.h @@ -25,12 +25,6 @@ void hal_board_init(uint32_t speed_hz); */ void hal_bmlite_reset(bool state); -/* - * @brief Init SPI interface - * @param[in] SPI CLK speed - */ -void hal_bmlite_spi_init(uint32_t speed_hz); - /* * @brief SPI write-read * @param[in] Write buffer diff --git a/HAL_Driver/src/hal_board.c b/HAL_Driver/src/hal_board.c index 09562dd..3ec6ecf 100755 --- a/HAL_Driver/src/hal_board.c +++ b/HAL_Driver/src/hal_board.c @@ -33,7 +33,9 @@ static volatile bool sensor_interrupt = false; -static void nordic_bmlite_gpio_init (void); +static void nordic_bmlite_gpio_init(void); +void nordic_bmlite_spi_init(uint32_t speed_hz); + void hal_board_init(uint32_t speed_hz) { @@ -50,7 +52,7 @@ void hal_board_init(uint32_t speed_hz) NRF_USBD->ENABLE = 1; nordic_bmlite_gpio_init(); - hal_bmlite_spi_init(speed_hz); + nordic_bmlite_spi_init(speed_hz); bsp_board_init(BSP_INIT_LEDS | BSP_INIT_BUTTONS); } diff --git a/HAL_Driver/src/hal_spi.c b/HAL_Driver/src/hal_spi.c index 575c00c..4338a82 100755 --- a/HAL_Driver/src/hal_spi.c +++ b/HAL_Driver/src/hal_spi.c @@ -94,7 +94,7 @@ fpc_bep_result_t hal_bmlite_spi_write_read(uint8_t *write, uint8_t *read, size_t return FPC_BEP_RESULT_OK; } -void hal_bmlite_spi_init(uint32_t speed_hz) +void nordic_bmlite_spi_init(uint32_t speed_hz) { //spi_config.ss_pin = BMLITE_CS_PIN; spi_config.miso_pin = BMLITE_MISO_PIN;