scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

[WIP] Max SPI speed reached (119ms for a full refresh. Theo max : 240*240*16 = 115.2ms) using IRQ and DMA.

Browse source 
Code needs some cleaning before integration.
This commit is contained in:
JF 2020-01-22 21:08:53 +01:00
parent aa3e5c0c6f
commit eb7a1b3ac9
8 changed files with 114 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Components/Gfx/Gfx.cpp
View file

@ -22,9 +22,7 @@ void Gfx::ClearScreen() {
void Gfx::FillRectangle(uint8_t x, uint8_t y, uint8_t width, uint8_t height, uint16_t color) { void Gfx::FillRectangle(uint8_t x, uint8_t y, uint8_t width, uint8_t height, uint16_t color) {
SetBackgroundColor(color); SetBackgroundColor(color);
lcd.BeginDrawBuffer(0, 0, width, height); lcd.BeginDrawBuffer(0, 0, width, height);
for(int i = 0; i < height; i++) { lcd.NextDrawBuffer(reinterpret_cast<const uint8_t *>(buffer), width * 2, 240);
lcd.NextDrawBuffer(reinterpret_cast<const uint8_t *>(buffer), width * 2);
}
lcd.EndDrawBuffer(); lcd.EndDrawBuffer();
} }

22
src/DisplayApp/DisplayApp.cpp
View file

@ -65,7 +65,28 @@ void DisplayApp::InitHw() {
touchPanel.Init(); touchPanel.Init();
} }
uint32_t acc = 0;
uint32_t count = 0;
bool toggle = true;
void DisplayApp::Refresh() { void DisplayApp::Refresh() {
uint32_t before = nrf_rtc_counter_get(portNRF_RTC_REG);
if(toggle) {
gfx->FillRectangle(0,0,240,240,0x0000);
} else {
gfx->FillRectangle(0,0,240,240,0xffff);
}
uint32_t after = nrf_rtc_counter_get(portNRF_RTC_REG);
acc += (after - before);
if((count % 10) == 0) {
NRF_LOG_INFO("DRAW : %d ms", (uint32_t)(acc/10));
acc = 0;
}
count++;
toggle = !toggle;
#if 0
TickType_t queueTimeout; TickType_t queueTimeout;
switch (state) { switch (state) {
case States::Idle: case States::Idle:
@ -116,6 +137,7 @@ void DisplayApp::Refresh() {
break; break;
} }
} }
#endif
} }
void DisplayApp::RunningState() { void DisplayApp::RunningState() {

100
src/drivers/SpiMaster.cpp
View file

@ -62,6 +62,7 @@ bool SpiMaster::Init() {
NRF_SPIM0->INTENSET = ((unsigned)1 << (unsigned)6); NRF_SPIM0->INTENSET = ((unsigned)1 << (unsigned)6);
NRF_SPIM0->INTENSET = ((unsigned)1 << (unsigned)1); NRF_SPIM0->INTENSET = ((unsigned)1 << (unsigned)1);
NRF_SPIM0->INTENSET = ((unsigned)1 << (unsigned)19);
NRF_SPIM0->ENABLE = (SPIM_ENABLE_ENABLE_Enabled << SPIM_ENABLE_ENABLE_Pos); NRF_SPIM0->ENABLE = (SPIM_ENABLE_ENABLE_Enabled << SPIM_ENABLE_ENABLE_Pos);
@ -83,34 +84,61 @@ void SpiMaster::setup_workaround_for_ftpan_58(NRF_SPIM_Type *spim, uint32_t ppi_
NRF_PPI->CHENSET = 1U << ppi_channel; NRF_PPI->CHENSET = 1U << ppi_channel;
} }
void SpiMaster::irqStarted() {
void SpiMaster::irq() {
if(busy) { if(busy) {
if(bufferSize > 0) { auto s = currentBufferSize;
auto currentSize = std::min((size_t)255, bufferSize); if(s > 0) {
auto currentSize = std::min((size_t)255, s);
NRF_SPIM0->TXD.PTR = (uint32_t) bufferAddr; NRF_SPIM0->TXD.PTR = (uint32_t) currentBufferAddr;
NRF_SPIM0->TXD.MAXCNT = currentSize; NRF_SPIM0->TXD.MAXCNT = currentSize;
NRF_SPIM0->TXD.LIST = 0; NRF_SPIM0->TXD.LIST = 0;
bufferAddr += currentSize; currentBufferAddr += currentSize;
bufferSize -= currentSize; currentBufferSize -= currentSize;
NRF_SPIM0->RXD.PTR = (uint32_t) 0; NRF_SPIM0->RXD.PTR = (uint32_t) 0;
NRF_SPIM0->RXD.MAXCNT = 0; NRF_SPIM0->RXD.MAXCNT = 0;
NRF_SPIM0->RXD.LIST = 0; NRF_SPIM0->RXD.LIST = 0;
NRF_SPIM0->TASKS_START = 1;
if(repeat == 0)
NRF_SPIM0->SHORTS = 0;
return; return;
}else { }else {
if(repeat > 0) {
repeat = repeat -1;
currentBufferAddr = bufferAddr;
currentBufferSize = bufferSize;
s = currentBufferSize;
auto currentSize = std::min((size_t)255, s);
NRF_SPIM0->TXD.PTR = (uint32_t) currentBufferAddr;
NRF_SPIM0->TXD.MAXCNT = currentSize;
NRF_SPIM0->TXD.LIST = 0;
currentBufferAddr += currentSize;
currentBufferSize -= currentSize;
NRF_SPIM0->RXD.PTR = (uint32_t) 0;
NRF_SPIM0->RXD.MAXCNT = 0;
NRF_SPIM0->RXD.LIST = 0;
}
}
}
}
void SpiMaster::irqEnd() {
if(busy) {
if(repeat == 0 && currentBufferSize == 0) {
nrf_gpio_pin_set(pinCsn); nrf_gpio_pin_set(pinCsn);
busy = false; busy = false;
} }
} }
} }
bool SpiMaster::Write(const uint8_t *data, size_t size) {
bool SpiMaster::Write(const uint8_t *data, size_t size, size_t r) {
if(data == nullptr) return false; if(data == nullptr) return false;
while(busy) { while(busy) {
@ -121,7 +149,7 @@ bool SpiMaster::Write(const uint8_t *data, size_t size) {
setup_workaround_for_ftpan_58(NRF_SPIM0, 0,0); setup_workaround_for_ftpan_58(NRF_SPIM0, 0,0);
NRF_SPIM0->INTENCLR = (1<<6); NRF_SPIM0->INTENCLR = (1<<6);
NRF_SPIM0->INTENCLR = (1<<1); NRF_SPIM0->INTENCLR = (1<<1);
NRF_SPIM0->INTENCLR = (1<<19);
} else { } else {
NRF_GPIOTE->CONFIG[0] = 0; NRF_GPIOTE->CONFIG[0] = 0;
NRF_PPI->CH[0].EEP = 0; NRF_PPI->CH[0].EEP = 0;
@ -129,38 +157,38 @@ bool SpiMaster::Write(const uint8_t *data, size_t size) {
NRF_PPI->CHENSET = 0; NRF_PPI->CHENSET = 0;
NRF_SPIM0->INTENSET = (1<<6); NRF_SPIM0->INTENSET = (1<<6);
NRF_SPIM0->INTENSET = (1<<1); NRF_SPIM0->INTENSET = (1<<1);
NRF_SPIM0->INTENSET = (1<<19);
} }
nrf_gpio_pin_clear(pinCsn); nrf_gpio_pin_clear(pinCsn);
bufferAddr = (uint32_t)data; currentBufferAddr = bufferAddr = (uint32_t)data;
bufferSize = size; currentBufferSize = bufferSize = size;
repeat = r;
busy = true; busy = true;
// while(size > 0) { if(repeat > 0)
auto currentSize = std::min((size_t)255, bufferSize); NRF_SPIM0->SHORTS = (1<<17);
NRF_SPIM0->TXD.PTR = (uint32_t) data;
NRF_SPIM0->TXD.MAXCNT = currentSize;
NRF_SPIM0->TXD.LIST = 0;
bufferSize -= currentSize; auto currentSize = std::min((size_t)255, bufferSize);
bufferAddr += currentSize; NRF_SPIM0->TXD.PTR = bufferAddr;
NRF_SPIM0->TXD.MAXCNT = currentSize;
NRF_SPIM0->TXD.LIST = 0;
NRF_SPIM0->RXD.PTR = (uint32_t) 0; currentBufferSize -= currentSize;
NRF_SPIM0->RXD.MAXCNT = 0; currentBufferAddr += currentSize;
NRF_SPIM0->RXD.LIST = 0;
if(size != 1) { NRF_SPIM0->RXD.PTR = (uint32_t) 0;
NRF_SPIM0->EVENTS_END = 0; NRF_SPIM0->RXD.MAXCNT = 0;
} NRF_SPIM0->RXD.LIST = 0;
NRF_SPIM0->EVENTS_END = 0;
NRF_SPIM0->TASKS_START = 1;
NRF_SPIM0->TASKS_START = 1; if(size == 1) {
while (NRF_SPIM0->EVENTS_END == 0);
if(size == 1) { busy = false;
while (NRF_SPIM0->EVENTS_END == 0); nrf_gpio_pin_set(pinCsn);
busy = false; }
nrf_gpio_pin_set(pinCsn);
}
return true; return true;
@ -187,3 +215,9 @@ void SpiMaster::Sleep() {
void SpiMaster::Wakeup() { void SpiMaster::Wakeup() {
Init(); Init();
} }
void SpiMaster::Wait() {
while(busy) {
asm("nop");
}
}

13
src/drivers/SpiMaster.h
View file

@ -23,9 +23,9 @@ namespace Pinetime {
SpiMaster(const SpiModule spi, const Parameters& params); SpiMaster(const SpiModule spi, const Parameters& params);
bool Init(); bool Init();
bool Write(const uint8_t* data, size_t size); bool Write(const uint8_t* data, size_t size, size_t r = 0);
bool WriteRepeat(const uint8_t *data, size_t size, int repeat);
void setup_workaround_for_ftpan_58(NRF_SPIM_Type *spim, uint32_t ppi_channel, uint32_t gpiote_channel); void setup_workaround_for_ftpan_58(NRF_SPIM_Type *spim, uint32_t ppi_channel, uint32_t gpiote_channel);
void Wait();
void Sleep(); void Sleep();
void Wakeup(); void Wakeup();
@ -33,7 +33,8 @@ namespace Pinetime {
bool GetStatusEnd(); bool GetStatusEnd();
bool GetStatusStarted(); bool GetStatusStarted();
void irq(); void irqEnd();
void irqStarted();
private: private:
NRF_SPIM_Type * spiBaseAddress; NRF_SPIM_Type * spiBaseAddress;
@ -42,11 +43,13 @@ namespace Pinetime {
SpiMaster::SpiModule spi; SpiMaster::SpiModule spi;
SpiMaster::Parameters params; SpiMaster::Parameters params;
std::atomic<bool> busy {false}; volatile bool busy = false;
uint32_t bufferAddr = 0; uint32_t bufferAddr = 0;
volatile uint32_t currentBufferAddr = 0;
size_t bufferSize = 0; size_t bufferSize = 0;
volatile size_t currentBufferSize = 0;
volatile uint32_t repeat = 0;
}; };
} }
} }

9
src/drivers/St7789.cpp
View file

@ -37,8 +37,8 @@ void St7789::WriteData(uint8_t data) {
} }
void St7789::WriteSpi(const uint8_t* data, size_t size) { void St7789::WriteSpi(const uint8_t* data, size_t size, size_t repeat) {
spi.Write(data, size); spi.Write(data, size, repeat);
} }
void St7789::SoftwareReset() { void St7789::SoftwareReset() {
@ -143,10 +143,11 @@ void St7789::BeginDrawBuffer(uint16_t x, uint16_t y, uint16_t width, uint16_t he
} }
void St7789::EndDrawBuffer() { void St7789::EndDrawBuffer() {
spi.Wait();
} }
void St7789::NextDrawBuffer(const uint8_t *data, size_t size) { void St7789::NextDrawBuffer(const uint8_t *data, size_t size, size_t repeat) {
WriteSpi(data, size); WriteSpi(data, size, repeat);
} }
void St7789::HardwareReset() { void St7789::HardwareReset() {

4
src/drivers/St7789.h
View file

@ -12,7 +12,7 @@ namespace Pinetime {
void DrawPixel(uint16_t x, uint16_t y, uint32_t color); void DrawPixel(uint16_t x, uint16_t y, uint32_t color);
void BeginDrawBuffer(uint16_t x, uint16_t y, uint16_t width, uint16_t height); void BeginDrawBuffer(uint16_t x, uint16_t y, uint16_t width, uint16_t height);
void NextDrawBuffer(const uint8_t* data, size_t size); void NextDrawBuffer(const uint8_t* data, size_t size, size_t repeat = 0);
void EndDrawBuffer(); void EndDrawBuffer();
void DisplayOn(); void DisplayOn();
@ -40,7 +40,7 @@ namespace Pinetime {
void SetAddrWindow(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1); void SetAddrWindow(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1);
void WriteCommand(uint8_t cmd); void WriteCommand(uint8_t cmd);
void WriteSpi(const uint8_t* data, size_t size); void WriteSpi(const uint8_t* data, size_t size, size_t repeat = 0);
enum class Commands : uint8_t { enum class Commands : uint8_t {
SoftwareReset = 0x01, SoftwareReset = 0x01,

7
src/main.cpp
View file

@ -162,7 +162,12 @@ extern Pinetime::Drivers::SpiMaster* spiInstance;
void SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0_IRQHandler(void) { void SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0_IRQHandler(void) {
if(((NRF_SPIM0->INTENSET & (1<<6)) != 0) && NRF_SPIM0->EVENTS_END == 1) { if(((NRF_SPIM0->INTENSET & (1<<6)) != 0) && NRF_SPIM0->EVENTS_END == 1) {
NRF_SPIM0->EVENTS_END = 0; NRF_SPIM0->EVENTS_END = 0;
spiInstance->irq(); spiInstance->irqEnd();
}
if(((NRF_SPIM0->INTENSET & (1<<19)) != 0) && NRF_SPIM0->EVENTS_STARTED == 1) {
NRF_SPIM0->EVENTS_STARTED = 0;
spiInstance->irqStarted();
} }

6
src/sdk_config.h
View file

@ -8452,15 +8452,15 @@
// <e> NRF_LOG_ENABLED - nrf_log - Logger // <e> NRF_LOG_ENABLED - nrf_log - Logger
//========================================================== //==========================================================
#ifndef NRF_LOG_ENABLED #ifndef NRF_LOG_ENABLED
#define NRF_LOG_ENABLED 0 #define NRF_LOG_ENABLED 1
#endif #endif
#ifndef NRF_LOG_BACKEND_RTT_ENABLED #ifndef NRF_LOG_BACKEND_RTT_ENABLED
#define NRF_LOG_BACKEND_RTT_ENABLED 0 #define NRF_LOG_BACKEND_RTT_ENABLED 1
#endif #endif
#ifndef NRF_LOG_BACKEND_SERIAL_USES_RTT #ifndef NRF_LOG_BACKEND_SERIAL_USES_RTT
#define NRF_LOG_BACKEND_SERIAL_USES_RTT 0 #define NRF_LOG_BACKEND_SERIAL_USES_RTT 1
#endif #endif
// <h> Log message pool - Configuration of log message pool // <h> Log message pool - Configuration of log message pool