summaryrefslogtreecommitdiff
path: root/src/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/BufferProvider.h11
-rw-r--r--src/drivers/SpiMaster.cpp139
-rw-r--r--src/drivers/SpiMaster.h15
-rw-r--r--src/drivers/St7789.cpp23
-rw-r--r--src/drivers/St7789.h8
5 files changed, 139 insertions, 57 deletions
diff --git a/src/drivers/BufferProvider.h b/src/drivers/BufferProvider.h
new file mode 100644
index 00000000..50fa253e
--- /dev/null
+++ b/src/drivers/BufferProvider.h
@@ -0,0 +1,11 @@
+#pragma once
+#include <cstddef>
+
+namespace Pinetime {
+ namespace Drivers {
+ class BufferProvider {
+ public:
+ virtual bool GetNextBuffer(uint8_t** buffer, size_t& size) = 0;
+ };
+ }
+} \ No newline at end of file
diff --git a/src/drivers/SpiMaster.cpp b/src/drivers/SpiMaster.cpp
index 42d3d77b..4a875b9e 100644
--- a/src/drivers/SpiMaster.cpp
+++ b/src/drivers/SpiMaster.cpp
@@ -1,23 +1,27 @@
#include <hal/nrf_gpio.h>
+#include <hal/nrf_spim.h>
#include "SpiMaster.h"
-
+#include <algorithm>
using namespace Pinetime::Drivers;
SpiMaster::SpiMaster(const SpiMaster::SpiModule spi, const SpiMaster::Parameters &params) :
spi{spi}, params{params} {
+
}
bool SpiMaster::Init() {
/* Configure GPIO pins used for pselsck, pselmosi, pselmiso and pselss for SPI0 */
+ nrf_gpio_pin_set(params.pinSCK);
nrf_gpio_cfg_output(params.pinSCK);
+ nrf_gpio_pin_clear(params.pinMOSI);
nrf_gpio_cfg_output(params.pinMOSI);
nrf_gpio_cfg_input(params.pinMISO, NRF_GPIO_PIN_NOPULL);
nrf_gpio_cfg_output(params.pinCSN);
pinCsn = params.pinCSN;
switch(spi) {
- case SpiModule::SPI0: spiBaseAddress = NRF_SPI0; break;
- case SpiModule::SPI1: spiBaseAddress = NRF_SPI1; break;
+ case SpiModule::SPI0: spiBaseAddress = NRF_SPIM0; break;
+ case SpiModule::SPI1: spiBaseAddress = NRF_SPIM1; break;
default: return false;
}
@@ -49,51 +53,130 @@ bool SpiMaster::Init() {
}
spiBaseAddress->CONFIG = regConfig;
- spiBaseAddress->EVENTS_READY = 0;
- spiBaseAddress->ENABLE = (SPI_ENABLE_ENABLE_Enabled << SPI_ENABLE_ENABLE_Pos);
+ spiBaseAddress->EVENTS_ENDRX = 0;
+ spiBaseAddress->EVENTS_ENDTX = 0;
+ spiBaseAddress->EVENTS_END = 0;
+
+ spiBaseAddress->INTENSET = ((unsigned)1 << (unsigned)6);
+ spiBaseAddress->INTENSET = ((unsigned)1 << (unsigned)1);
+ spiBaseAddress->INTENSET = ((unsigned)1 << (unsigned)19);
+ spiBaseAddress->ENABLE = (SPIM_ENABLE_ENABLE_Enabled << SPIM_ENABLE_ENABLE_Pos);
+
+ NRFX_IRQ_PRIORITY_SET(SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0_IRQn,2);
+ NRFX_IRQ_ENABLE(SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0_IRQn);
return true;
}
-bool SpiMaster::Write(const uint8_t *data, size_t size) {
- volatile uint32_t dummyread;
- if(data == nullptr) return false;
+void SpiMaster::SetupWorkaroundForFtpan58(NRF_SPIM_Type *spim, uint32_t ppi_channel, uint32_t gpiote_channel) {
+ // Create an event when SCK toggles.
+ NRF_GPIOTE->CONFIG[gpiote_channel] = (GPIOTE_CONFIG_MODE_Event << GPIOTE_CONFIG_MODE_Pos) |
+ (spim->PSEL.SCK << GPIOTE_CONFIG_PSEL_Pos) |
+ (GPIOTE_CONFIG_POLARITY_Toggle << GPIOTE_CONFIG_POLARITY_Pos);
- /* enable slave (slave select active low) */
- nrf_gpio_pin_clear(pinCsn);
+ // Stop the spim instance when SCK toggles.
+ NRF_PPI->CH[ppi_channel].EEP = (uint32_t) &NRF_GPIOTE->EVENTS_IN[gpiote_channel];
+ NRF_PPI->CH[ppi_channel].TEP = (uint32_t) &spim->TASKS_STOP;
+ NRF_PPI->CHENSET = 1U << ppi_channel;
- spiBaseAddress->EVENTS_READY = 0;
+ // Disable IRQ
+ spim->INTENCLR = (1<<6);
+ spim->INTENCLR = (1<<1);
+ spim->INTENCLR = (1<<19);
+}
- spiBaseAddress->TXD = (uint32_t)*data++;
+void SpiMaster::DisableWorkaroundForFtpan58(NRF_SPIM_Type *spim, uint32_t ppi_channel, uint32_t gpiote_channel) {
+ NRF_GPIOTE->CONFIG[gpiote_channel] = 0;
+ NRF_PPI->CH[ppi_channel].EEP = 0;
+ NRF_PPI->CH[ppi_channel].TEP = 0;
+ NRF_PPI->CHENSET = ppi_channel;
+ spim->INTENSET = (1<<6);
+ spim->INTENSET = (1<<1);
+ spim->INTENSET = (1<<19);
+}
- while(--size)
- {
- spiBaseAddress->TXD = (uint32_t)*data++;
+void SpiMaster::OnEndEvent(BufferProvider& provider) {
+ if(!busy) return;
+
+ auto s = currentBufferSize;
+ if(s > 0) {
+ auto currentSize = std::min((size_t) 255, s);
+ PrepareTx(currentBufferAddr, currentSize);
+ currentBufferAddr += currentSize;
+ currentBufferSize -= currentSize;
+
+ spiBaseAddress->TASKS_START = 1;
+ } else {
+ uint8_t* buffer = nullptr;
+ size_t size = 0;
+ if(provider.GetNextBuffer(&buffer, size)) {
+ currentBufferAddr = (uint32_t) buffer;
+ currentBufferSize = size;
+ auto s = currentBufferSize;
+ auto currentSize = std::min((size_t)255, s);
+ PrepareTx(currentBufferAddr, currentSize);
+ currentBufferAddr += currentSize;
+ currentBufferSize -= currentSize;
+
+ spiBaseAddress->TASKS_START = 1;
+ } else {
+ busy = false;
+ nrf_gpio_pin_set(pinCsn);
+ }
+ }
+}
- /* Wait for the transaction complete or timeout (about 10ms - 20 ms) */
- while (spiBaseAddress->EVENTS_READY == 0);
+void SpiMaster::OnStartedEvent(BufferProvider& provider) {
+ if(!busy) return;
+}
- /* clear the event to be ready to receive next messages */
- spiBaseAddress->EVENTS_READY = 0;
+void SpiMaster::PrepareTx(const volatile uint32_t bufferAddress, const volatile size_t size) {
+ spiBaseAddress->TXD.PTR = bufferAddress;
+ spiBaseAddress->TXD.MAXCNT = size;
+ spiBaseAddress->TXD.LIST = 0;
+ spiBaseAddress->RXD.PTR = 0;
+ spiBaseAddress->RXD.MAXCNT = 0;
+ spiBaseAddress->RXD.LIST = 0;
+ spiBaseAddress->EVENTS_END = 0;
+}
+
+bool SpiMaster::Write(const uint8_t *data, size_t size) {
+ if(data == nullptr) return false;
- dummyread = spiBaseAddress->RXD;
+ while(busy) {
+ asm("nop");
}
- /* Wait for the transaction complete or timeout (about 10ms - 20 ms) */
- while (spiBaseAddress->EVENTS_READY == 0);
+ if(size == 1) {
+ SetupWorkaroundForFtpan58(spiBaseAddress, 0,0);
+ } else {
+ DisableWorkaroundForFtpan58(spiBaseAddress, 0, 0);
+ }
- dummyread = spiBaseAddress->RXD;
+ nrf_gpio_pin_clear(pinCsn);
- /* disable slave (slave select active low) */
- nrf_gpio_pin_set(pinCsn);
+ currentBufferAddr = (uint32_t)data;
+ currentBufferSize = size;
+ busy = true;
+
+ auto currentSize = std::min((size_t)255, (size_t)currentBufferSize);
+ PrepareTx(currentBufferAddr, currentSize);
+ currentBufferSize -= currentSize;
+ currentBufferAddr += currentSize;
+ spiBaseAddress->TASKS_START = 1;
+
+ if(size == 1) {
+ while (spiBaseAddress->EVENTS_END == 0);
+ busy = false;
+ }
return true;
}
void SpiMaster::Sleep() {
- while(NRF_SPI0->ENABLE != 0) {
- NRF_SPI0->ENABLE = (SPIM_ENABLE_ENABLE_Disabled << SPIM_ENABLE_ENABLE_Pos);
+ while(spiBaseAddress->ENABLE != 0) {
+ spiBaseAddress->ENABLE = (SPIM_ENABLE_ENABLE_Disabled << SPIM_ENABLE_ENABLE_Pos);
}
nrf_gpio_cfg_default(params.pinSCK);
nrf_gpio_cfg_default(params.pinMOSI);
@@ -104,3 +187,5 @@ void SpiMaster::Sleep() {
void SpiMaster::Wakeup() {
Init();
}
+
+
diff --git a/src/drivers/SpiMaster.h b/src/drivers/SpiMaster.h
index 073501a8..60013242 100644
--- a/src/drivers/SpiMaster.h
+++ b/src/drivers/SpiMaster.h
@@ -2,7 +2,9 @@
#include <cstdint>
#include <cstddef>
#include <array>
+#include <atomic>
+#include "BufferProvider.h"
namespace Pinetime {
namespace Drivers {
class SpiMaster {
@@ -25,15 +27,26 @@ namespace Pinetime {
bool Init();
bool Write(const uint8_t* data, size_t size);
+ void OnStartedEvent(BufferProvider& provider);
+ void OnEndEvent(BufferProvider& provider);
+
void Sleep();
void Wakeup();
private:
- NRF_SPI_Type * spiBaseAddress;
+ void SetupWorkaroundForFtpan58(NRF_SPIM_Type *spim, uint32_t ppi_channel, uint32_t gpiote_channel);
+ void DisableWorkaroundForFtpan58(NRF_SPIM_Type *spim, uint32_t ppi_channel, uint32_t gpiote_channel);
+ void PrepareTx(const volatile uint32_t bufferAddress, const volatile size_t size);
+
+ NRF_SPIM_Type * spiBaseAddress;
uint8_t pinCsn;
SpiMaster::SpiModule spi;
SpiMaster::Parameters params;
+
+ volatile bool busy = false;
+ volatile uint32_t currentBufferAddr = 0;
+ volatile size_t currentBufferSize = 0;
};
}
}
diff --git a/src/drivers/St7789.cpp b/src/drivers/St7789.cpp
index ac813064..39595dc9 100644
--- a/src/drivers/St7789.cpp
+++ b/src/drivers/St7789.cpp
@@ -38,7 +38,7 @@ void St7789::WriteData(uint8_t data) {
void St7789::WriteSpi(const uint8_t* data, size_t size) {
- spi.Write(data, size);
+ spi.Write(data, size);
}
void St7789::SoftwareReset() {
@@ -95,20 +95,6 @@ void St7789::DisplayOn() {
WriteCommand(static_cast<uint8_t>(Commands::DisplayOn));
}
-void St7789::FillRectangle(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t color) {
- BeginDrawBuffer(x, y, width, height);
-
- uint32_t c = color + (color << 16);
- uint8_t w = width/2;
-
- for(y=height+ST7789_ROW_OFFSET; y>ST7789_ROW_OFFSET; y--) {
- for(x=w; x>0; x--) {
- NextDrawBuffer(reinterpret_cast<const uint8_t *>(&c), 4);
- }
- }
- EndDrawBuffer();
-}
-
void St7789::SetAddrWindow(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1) {
WriteCommand(static_cast<uint8_t>(Commands::ColumnAddressSet));
WriteData(x0 >> 8);
@@ -156,11 +142,8 @@ void St7789::BeginDrawBuffer(uint16_t x, uint16_t y, uint16_t width, uint16_t he
nrf_gpio_pin_set(pinDataCommand);
}
-void St7789::EndDrawBuffer() {
-}
-
void St7789::NextDrawBuffer(const uint8_t *data, size_t size) {
- spi.Write(data, size);
+ WriteSpi(data, size);
}
void St7789::HardwareReset() {
@@ -191,5 +174,3 @@ void St7789::Wakeup() {
NormalModeOn();
DisplayOn();
}
-
-
diff --git a/src/drivers/St7789.h b/src/drivers/St7789.h
index a32a96f9..9ecf9f27 100644
--- a/src/drivers/St7789.h
+++ b/src/drivers/St7789.h
@@ -10,19 +10,15 @@ namespace Pinetime {
void Init();
void Uninit();
void DrawPixel(uint16_t x, uint16_t y, uint32_t color);
- void FillRectangle(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t color);
void BeginDrawBuffer(uint16_t x, uint16_t y, uint16_t width, uint16_t height);
void NextDrawBuffer(const uint8_t* data, size_t size);
- void EndDrawBuffer();
void DisplayOn();
void DisplayOff();
void Sleep();
void Wakeup();
-
-
private:
SpiMaster& spi;
uint8_t pinDataCommand;
@@ -36,10 +32,7 @@ namespace Pinetime {
void DisplayInversionOn();
void NormalModeOn();
void WriteToRam();
-
-
void SetAddrWindow(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1);
-
void WriteCommand(uint8_t cmd);
void WriteSpi(const uint8_t* data, size_t size);
@@ -63,7 +56,6 @@ namespace Pinetime {
static constexpr uint16_t Width = 240;
static constexpr uint16_t Height = 240;
void RowAddressSet();
-
};
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 04:48:29 +0000