will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "More attempted SPI fixes"

Browse Source 
This reverts commit bed7e731b206961117b717adb1031ab3011e7db9.
This commit is contained in:
Tim Keller 2021-10-19 19:15:48 +00:00
parent a5a64800ed
commit f841b8c984
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/drivers/Spi.cpp
View File

@ -10,24 +10,14 @@ Spi::Spi(SpiMaster& spiMaster, uint8_t pinCsn) : spiMaster {spiMaster}, pinCsn {
} }
bool Spi::Write(const uint8_t* data, size_t size) { bool Spi::Write(const uint8_t* data, size_t size) {
if(!active){
Wakeup();
}
return spiMaster.Write(pinCsn, data, size); return spiMaster.Write(pinCsn, data, size);
} }
bool Spi::Read(uint8_t* cmd, size_t cmdSize, uint8_t* data, size_t dataSize) { bool Spi::Read(uint8_t* cmd, size_t cmdSize, uint8_t* data, size_t dataSize) {
if(!active){
Wakeup();
}
return spiMaster.Read(pinCsn, cmd, cmdSize, data, dataSize); return spiMaster.Read(pinCsn, cmd, cmdSize, data, dataSize);
} }
void Spi::Sleep() { void Spi::Sleep() {
if(!active){
return;
}
active = false;
nrf_gpio_cfg_default(pinCsn); nrf_gpio_cfg_default(pinCsn);
NRF_LOG_INFO("[SPI] Sleep") NRF_LOG_INFO("[SPI] Sleep")
} }
@ -42,11 +32,7 @@ bool Spi::Init() {
} }
void Spi::Wakeup() { void Spi::Wakeup() {
if(active){
return;
}
nrf_gpio_cfg_output(pinCsn); nrf_gpio_cfg_output(pinCsn);
nrf_gpio_pin_set(pinCsn); nrf_gpio_pin_set(pinCsn);
active=true;
NRF_LOG_INFO("[SPI] Wakeup") NRF_LOG_INFO("[SPI] Wakeup")
} }

1
src/drivers/Spi.h
View File

@ -23,7 +23,6 @@ namespace Pinetime {
private: private:
SpiMaster& spiMaster; SpiMaster& spiMaster;
uint8_t pinCsn; uint8_t pinCsn;
bool active;
}; };
} }
} }