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

Fixes for APA102 on S3 #49

Merged
merged 3 commits into from
Nov 25, 2024
Merged

Fixes for APA102 on S3 #49

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a4663e
fix: DMA channel picking on S3
Tasssadar Nov 25, 2024
4c21e75
fix: make Apa102 clock speed configurable
Tasssadar Nov 25, 2024
088fcb9
fix: init _transCount in Apa102
Tasssadar Nov 25, 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
11 changes: 7 additions & 4 deletions src/SmartLeds.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,10 @@ class SmartLed {

#if defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C3)
#define _SMARTLEDS_SPI_HOST SPI2_HOST
#define _SMARTLEDS_SPI_DMA_CHAN SPI_DMA_CH_AUTO
#else
#define _SMARTLEDS_SPI_HOST HSPI_HOST
#define _SMARTLEDS_SPI_DMA_CHAN 1
#endif

class Apa102 {
Expand Down Expand Up @@ -225,10 +227,11 @@ class Apa102 {
static const int FINAL_FRAME_SIZE = 4;
static const int TRANS_COUNT = 2 + 8;

Apa102(int count, int clkpin, int datapin, BufferType doubleBuffer = SingleBuffer)
Apa102(int count, int clkpin, int datapin, BufferType doubleBuffer = SingleBuffer, int clock_speed_hz = 1000000)
: _count(count)
, _firstBuffer(new ApaRgb[count])
, _secondBuffer(doubleBuffer ? new ApaRgb[count] : nullptr)
, _transCount(0)
, _initFrame(0) {
spi_bus_config_t buscfg;
memset(&buscfg, 0, sizeof(buscfg));
Expand All @@ -241,13 +244,13 @@ class Apa102 {

spi_device_interface_config_t devcfg;
memset(&devcfg, 0, sizeof(devcfg));
devcfg.clock_speed_hz = 1000000;
devcfg.clock_speed_hz = clock_speed_hz;
devcfg.mode = 0;
devcfg.spics_io_num = -1;
devcfg.queue_size = TRANS_COUNT;
devcfg.pre_cb = nullptr;

auto ret = spi_bus_initialize(_SMARTLEDS_SPI_HOST, &buscfg, 1);
auto ret = spi_bus_initialize(_SMARTLEDS_SPI_HOST, &buscfg, _SMARTLEDS_SPI_DMA_CHAN);
assert(ret == ESP_OK);

ret = spi_bus_add_device(_SMARTLEDS_SPI_HOST, &devcfg, &_spi);
Expand Down Expand Up @@ -375,7 +378,7 @@ class LDP8806 {
devcfg.queue_size = TRANS_COUNT_MAX;
devcfg.pre_cb = nullptr;

auto ret = spi_bus_initialize(_SMARTLEDS_SPI_HOST, &buscfg, 1);
auto ret = spi_bus_initialize(_SMARTLEDS_SPI_HOST, &buscfg, _SMARTLEDS_SPI_DMA_CHAN);
assert(ret == ESP_OK);

ret = spi_bus_add_device(_SMARTLEDS_SPI_HOST, &devcfg, &_spi);
Expand Down
Loading