From 2b3e6b1cde7151bea57d56f3909ff5f340c4610b Mon Sep 17 00:00:00 2001 From: JF Date: Sat, 18 Jan 2020 20:53:32 +0100 Subject: Refactor ctor() and Ini() of SpiMaster. --- src/drivers/SpiMaster.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/drivers/SpiMaster.cpp') diff --git a/src/drivers/SpiMaster.cpp b/src/drivers/SpiMaster.cpp index 5e49f2a7..42d3d77b 100644 --- a/src/drivers/SpiMaster.cpp +++ b/src/drivers/SpiMaster.cpp @@ -3,10 +3,11 @@ using namespace Pinetime::Drivers; -bool SpiMaster::Init(const SpiMaster::SpiModule spi, const SpiMaster::Parameters ¶ms) { - configSpiModule = spi; - configParams = params; +SpiMaster::SpiMaster(const SpiMaster::SpiModule spi, const SpiMaster::Parameters ¶ms) : + spi{spi}, params{params} { +} +bool SpiMaster::Init() { /* Configure GPIO pins used for pselsck, pselmosi, pselmiso and pselss for SPI0 */ nrf_gpio_cfg_output(params.pinSCK); nrf_gpio_cfg_output(params.pinMOSI); @@ -94,12 +95,12 @@ void SpiMaster::Sleep() { while(NRF_SPI0->ENABLE != 0) { NRF_SPI0->ENABLE = (SPIM_ENABLE_ENABLE_Disabled << SPIM_ENABLE_ENABLE_Pos); } - nrf_gpio_cfg_default(configParams.pinSCK); - nrf_gpio_cfg_default(configParams.pinMOSI); - nrf_gpio_cfg_default(configParams.pinMISO); - nrf_gpio_cfg_default(configParams.pinCSN); + nrf_gpio_cfg_default(params.pinSCK); + nrf_gpio_cfg_default(params.pinMOSI); + nrf_gpio_cfg_default(params.pinMISO); + nrf_gpio_cfg_default(params.pinCSN); } void SpiMaster::Wakeup() { - Init(configSpiModule, configParams); + Init(); } -- cgit v1.2.3-70-g09d2