Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SSD1307 dma #626

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

SSD1307 dma #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8c70475
Add SSD1307Driver
AndrewCapon Apr 28, 2024
a353229
fix lint madness
AndrewCapon Apr 28, 2024
65231b9
fix even more lint madness
AndrewCapon Apr 28, 2024
765f483
fix even more lint madness
AndrewCapon Apr 28, 2024
e11cb31
Add DMA chained transfer data for SSD1307
AndrewCapon Apr 29, 2024
729729e
Make code more unreadable with clang-format
AndrewCapon Apr 29, 2024
8a602c9
Remove timing code.
AndrewCapon Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
259 changes: 259 additions & 0 deletions src/dev/oled_ssd130x.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "per/spi.h"
#include "per/gpio.h"
#include "sys/system.h"
#include "stm32h7xx_hal.h"

namespace daisy
{
Expand Down Expand Up @@ -78,6 +79,7 @@ class SSD130x4WireSpiTransport
dsy_gpio_pin dc; /**< & */
dsy_gpio_pin reset; /**< & */
} pin_config;
bool useDma;
void Defaults()
{
// SPI peripheral config
Expand All @@ -98,6 +100,8 @@ class SSD130x4WireSpiTransport
// SSD130x control pin config
pin_config.dc = {DSY_GPIOB, 4};
pin_config.reset = {DSY_GPIOB, 15};
// Using DMA off by default
useDma = false;
}
};
void Init(const Config& config)
Expand All @@ -119,18 +123,35 @@ class SSD130x4WireSpiTransport
dsy_gpio_write(&pin_reset_, 1);
System::Delay(10);
};

void SendCommand(uint8_t cmd)
{
dsy_gpio_write(&pin_dc_, 0);
spi_.BlockingTransmit(&cmd, 1);
};

void SendCommands(uint8_t* buff, size_t size)
{
dsy_gpio_write(&pin_dc_, 0);
spi_.BlockingTransmit(buff, size);
};

void SendData(uint8_t* buff, size_t size)
{
dsy_gpio_write(&pin_dc_, 1);
spi_.BlockingTransmit(buff, size);
};

void SendDataDma(uint8_t* buff,
size_t size,
SpiHandle::EndCallbackFunctionPtr end_callback,
void* context)
{
SCB_CleanInvalidateDCache_by_Addr(buff, size);
dsy_gpio_write(&pin_dc_, 1);
spi_.DmaTransmit(buff, size, NULL, end_callback, context);
};

private:
SpiHandle spi_;
dsy_gpio pin_reset_;
Expand Down Expand Up @@ -389,6 +410,11 @@ class SSD130xDriver
}
};

/**
* Has update finished
*/
bool UpdateFinished() { return true; }

protected:
Transport transport_;
uint8_t buffer_[width * height / 8];
Expand Down Expand Up @@ -457,6 +483,239 @@ using SSD130xI2c64x32Driver = daisy::SSD130xDriver<64, 32, SSD130xI2CTransport>;
using SSD130x4WireSoftSpi128x64Driver
= daisy::SSD130xDriver<128, 64, SSD130x4WireSoftSpiTransport>;


/**
* A driver implementation for the SSD1307
*/
template <size_t width, size_t height, typename Transport>
class SSD1307Driver
{
public:
struct Config
{
typename Transport::Config transport_config;
};

void Init(Config config)
{
transport_.Init(config.transport_config);

useDma_ = config.transport_config.useDma;

// Init routine...
uint8_t uDispayOffset;
uint8_t uMultiplex;
switch(height)
{
case 64:
uDispayOffset = 0x60;
uMultiplex = 0x7F;
break;

case 80:
uDispayOffset = 0x68;
uMultiplex = 0x4F;
break;

case 128:
default:
uDispayOffset = 0x00;
uMultiplex = 0x7F;
break;
}

// Display Off
transport_.SendCommand(0xaE);

// Memory Mode
transport_.SendCommand(0x20);

// Normal Display
transport_.SendCommand(0xA6);

// Multiplex Ratio
transport_.SendCommand(0xA8);
transport_.SendCommand(uMultiplex);

// All On Resume
transport_.SendCommand(0xA4);

// Display Offset
transport_.SendCommand(0xD3);
transport_.SendCommand(uDispayOffset);

// Display Clock Divide Ratio
transport_.SendCommand(0xD5);
transport_.SendCommand(0x80);

// Pre Charge
transport_.SendCommand(0xD9);
transport_.SendCommand(0x22);

// Com Pins
transport_.SendCommand(0xDA);
transport_.SendCommand(0x12);

// VCOM Detect
transport_.SendCommand(0xDB);
transport_.SendCommand(0x35);

// Contrast Control
transport_.SendCommand(0x81);
transport_.SendCommand(0x80);

// Display On
transport_.SendCommand(0xAF);
};

size_t Width() const { return width; };
size_t Height() const { return height; };

void DrawPixel(uint_fast8_t x, uint_fast8_t y, bool on)
{
if(x >= width || y >= height)
return;
if(on)
buffer_[x + (y / 8) * width] |= (1 << (y % 8));
else
buffer_[x + (y / 8) * width] &= ~(1 << (y % 8));
}

void Fill(bool on)
{
for(size_t i = 0; i < sizeof(buffer_); i++)
{
buffer_[i] = on ? 0xff : 0x00;
}
};

/**
* Update the display
*/
void Update()
{
if(useDma_)
{
transferPagesCount_ = (height / 8);
if(transferPagesCount_)
{
updateing_ = true;
TransferPageDma(0);
}
}
else
{
uint8_t i;
uint8_t high_column_addr;
switch(height)
{
case 32: high_column_addr = 0x12; break;

default: high_column_addr = 0x10; break;
}
for(i = 0; i < (height / 8); i++)
{
transport_.SendCommand(0xB0 + i);
transport_.SendCommand(0x00);
transport_.SendCommand(high_column_addr);
transport_.SendData(&buffer_[width * i], width);
}
updateing_ = false;
}
};

/**
* Has update finished
*/
bool UpdateFinished() { return !updateing_; }

private:
Transport transport_;
uint8_t buffer_[width * height / 8];
bool updateing_;
uint8_t transferPagesCount_;
uint8_t transferingPage_;
bool useDma_;

void TransferPageDma(uint8_t page)
{
transferingPage_ = page;

uint8_t high_column_addr;
switch(height)
{
case 32: high_column_addr = 0x12; break;

default: high_column_addr = 0x10; break;
}
uint8_t commands[] = {static_cast<uint8_t>(0xB0 + transferingPage_),
0x00,
high_column_addr};
transport_.SendCommands(commands, 3);
// transport_.SendCommand(0xB0 + transferingPage_);
// transport_.SendCommand(0x00);
// transport_.SendCommand(high_column_addr);
transport_.SendDataDma(&buffer_[width * transferingPage_],
width,
SpiPageCompleteCallback,
this);
// transport_.SendDataDma(&buffer_[width * 16], width, SpiPageCompleteCallback, this);
}

void PageTransfered(void)
{
if(transferingPage_ < transferPagesCount_ - 1)
{
TransferPageDma(transferingPage_ + 1);
}
else
updateing_ = false;
}

static void SpiPageCompleteCallback(void* context,
daisy::SpiHandle::Result result)
{
static_cast<SSD1307Driver*>(context)->PageTransfered();
}
};

/**
* A driver for the SSD1307 128x64 OLED displays connected via 4 wire SPI
*/
using SSD13074WireSpi128x64Driver
= daisy::SSD1307Driver<128, 64, SSD130x4WireSpiTransport>;

/**
* A driver for the SSD1307 128x80 OLED displays connected via 4 wire SPI
*/
using SSD13074WireSpi128x80Driver
= daisy::SSD1307Driver<128, 80, SSD130x4WireSpiTransport>;

/**
* A driver for the SSD1307 128x128 OLED displays connected via 4 wire SPI
*/
using SSD13074WireSpi128x128Driver
= daisy::SSD1307Driver<128, 128, SSD130x4WireSpiTransport>;

/**
* A driver for the SSD1307 128x64 OLED displays connected via I2C
*/
using SSD1307I2c128x64Driver
= daisy::SSD130xDriver<128, 64, SSD130xI2CTransport>;

/**
* A driver for the SSD1307 128x80 OLED displays connected via I2C
*/
using SSD1307I2c128x80Driver
= daisy::SSD1307Driver<128, 80, SSD130xI2CTransport>;

/**
* A driver for the SSD1307 128x128 OLED displays connected via I2C
*/
using SSD1307I2c128x128Driver
= daisy::SSD130xDriver<128, 128, SSD130xI2CTransport>;


}; // namespace daisy


Expand Down
5 changes: 5 additions & 0 deletions src/hid/disp/display.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,11 @@ class OneBitGraphicsDisplay
*/
virtual void Update() = 0;

/**
Returns true if the Update has finished, used for chained DMA transfers
*/
virtual bool UpdateFinished() = 0;

protected:
uint16_t currentX_;
uint16_t currentY_;
Expand Down
2 changes: 2 additions & 0 deletions src/hid/disp/oled_display.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ class OledDisplay : public OneBitGraphicsDisplayImpl<OledDisplay<DisplayDriver>>
*/
void Update() override { driver_.Update(); }

bool UpdateFinished() override { return driver_.UpdateFinished(); }

private:
DisplayDriver driver_;

Expand Down
Loading