Skip to content

LEDS i2s_data_copies to output multiple copies of the data signal #119

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

Merged
SpComb merged 10 commits into from
Oct 25, 2025
Merged

LEDS i2s_data_copies to output multiple copies of the data signal #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e642f74
i2s_out: initialize DMA chain with next = NULL for last desc
SpComb Oct 25, 2025
a3f9a5a
i2s_out: DEBUG each write_desc
SpComb Oct 25, 2025
81257b9
i2s_out: add dma buffer repeat option
SpComb Oct 25, 2025
d73c164
leds: i2s_data_repeat option
SpComb Oct 25, 2025
1a8e95b
i2s_out: bugfix dma_repeat_desc
SpComb Oct 25, 2025
ac30ed9
logging: fix LOG_DEBUG_BUFFER
SpComb Oct 25, 2025
41660b8
leds: fix i2s_data_repeat description, interpret as N+1
SpComb Oct 25, 2025
a585532
leds: rename i2s_data_copies to match repeat + 1
SpComb Oct 25, 2025
dde0148
i2s_out: defensive dma_write_desc->next
SpComb Oct 25, 2025
81bc96c
i2s_out: fix esp8266 build
SpComb Oct 25, 2025
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
103 changes: 85 additions & 18 deletions components/i2s_out/esp32/dma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,11 @@ struct dma_desc *commit_dma_desc(struct dma_desc *desc)
{
desc->owner = 1;

return desc->next;
if (desc->next) {
return desc->next;
} else {
return desc;
}
}

void init_dma_eof_desc(struct dma_desc *eof_desc, uint32_t value, unsigned count)
Expand Down Expand Up @@ -107,7 +111,7 @@ void reinit_dma_desc(struct dma_desc *head, unsigned count, struct dma_desc *nex
}
}

int i2s_out_dma_init(struct i2s_out *i2s_out, size_t size, size_t align)
int i2s_out_dma_init(struct i2s_out *i2s_out, size_t size, size_t align, unsigned repeat)
{
size_t buf_size = 0;
unsigned desc_count = 0;
Expand All @@ -129,7 +133,7 @@ int i2s_out_dma_init(struct i2s_out *i2s_out, size_t size, size_t align)
}
}

LOG_DEBUG("size=%u align=%u -> desc_count=%u buf_size=%u", size, align, desc_count, buf_size);
LOG_DEBUG("size=%u align=%u repeat=%u -> desc_count=%u buf_size=%u", size, align, repeat, desc_count, buf_size);

// allocate single word-aligned buffer
if (!(i2s_out->dma_rx_buf = dma_malloc(buf_size))) {
Expand All @@ -150,16 +154,24 @@ int i2s_out_dma_init(struct i2s_out *i2s_out, size_t size, size_t align)
LOG_ERROR("dma_calloc(dma_rx_desc)");
return -1;
}
if (repeat && !(i2s_out->dma_repeat_desc = dma_calloc(desc_count * repeat, sizeof(*i2s_out->dma_rx_desc)))) {
LOG_ERROR("dma_calloc(dma_repeat_desc)");
return -1;
}
if (!(i2s_out->dma_eof_desc = dma_calloc(1, sizeof(*i2s_out->dma_eof_desc)))) {
LOG_ERROR("dma_calloc(dma_eof_desc)");
return -1;
}

// initialize linked list of DMA descriptors
init_dma_desc(i2s_out->dma_rx_desc, desc_count, i2s_out->dma_rx_buf, buf_size, align, i2s_out->dma_eof_desc);
init_dma_desc(i2s_out->dma_eof_desc, 1, i2s_out->dma_eof_buf, DMA_EOF_BUF_SIZE, sizeof(uint32_t), i2s_out->dma_eof_desc);
init_dma_desc(i2s_out->dma_rx_desc, desc_count, i2s_out->dma_rx_buf, buf_size, align, NULL);
for (unsigned i = 0; i < repeat; i++) {
init_dma_desc(i2s_out->dma_repeat_desc + i * desc_count, desc_count, i2s_out->dma_rx_buf, buf_size, align, NULL);
}
init_dma_desc(i2s_out->dma_eof_desc, 1, i2s_out->dma_eof_buf, DMA_EOF_BUF_SIZE, sizeof(uint32_t), NULL);

i2s_out->dma_rx_count = desc_count;
i2s_out->dma_rx_repeat = repeat;

return 0;
}
Expand All @@ -177,7 +189,7 @@ int i2s_out_dma_setup(struct i2s_out *i2s_out, const struct i2s_out_options *opt
init_dma_eof_desc(i2s_out->dma_eof_desc, options->eof_value, options->eof_count);

// init RX desc
reinit_dma_desc(i2s_out->dma_rx_desc, i2s_out->dma_rx_count, i2s_out->dma_eof_desc);
reinit_dma_desc(i2s_out->dma_rx_desc, i2s_out->dma_rx_count, NULL);

taskENTER_CRITICAL(&i2s_out->mux);

Expand Down Expand Up @@ -255,7 +267,7 @@ size_t i2s_out_dma_buffer(struct i2s_out *i2s_out, void **ptr, unsigned count, s
if (desc->len + size > desc->size) {
LOG_DEBUG("commit desc=%p (owner=%u eof=%u buf=%p len=%u size=%u) < size=%u -> next=%p", desc, desc->owner, desc->eof, desc->buf, desc->len, desc->size, size, desc->next);

// commit, try with the next buffer
// commit, try with the next desc, if available
i2s_out->dma_write_desc = commit_dma_desc(desc);

continue;
Expand Down Expand Up @@ -304,6 +316,39 @@ int i2s_out_dma_write(struct i2s_out *i2s_out, const void *data, size_t size)
return len;
}

void i2s_out_dma_repeat(struct i2s_out *i2s_out, unsigned count)
{
struct dma_desc **nextp = &i2s_out->dma_write_desc->next;

// commit
i2s_out->dma_write_desc->owner = 1;

for (unsigned i = 0; i < count; i++) {
for (unsigned j = 0; j < i2s_out->dma_rx_count; j++) {
struct dma_desc *s = &i2s_out->dma_rx_desc[j];
struct dma_desc *d = &i2s_out->dma_repeat_desc[i * i2s_out->dma_rx_count + j];

if (!s->owner) {
break;
}

if (nextp) {
*nextp = d;
}

d->len = s->len;
d->owner = s->owner;

nextp = &d->next;
}
}

if (nextp) {
// eof
*nextp = i2s_out->dma_eof_desc;
}
}

int i2s_out_dma_pending(struct i2s_out *i2s_out)
{
if (i2s_out->dma_start) {
Expand All @@ -321,21 +366,43 @@ int i2s_out_dma_pending(struct i2s_out *i2s_out)

void i2s_out_dma_start(struct i2s_out *i2s_out)
{
i2s_out->dma_write_desc->owner = 1;
i2s_out->dma_write_desc->next = i2s_out->dma_eof_desc;
// commit if not repeat()
if (!i2s_out->dma_write_desc->owner) {
i2s_out->dma_write_desc->owner = 1;
}

if (!i2s_out->dma_write_desc->next) {
i2s_out->dma_write_desc->next = i2s_out->dma_eof_desc;
}

i2s_out->dma_eof_desc->owner = 1;
i2s_out->dma_eof_desc->next = i2s_out->dma_eof_desc;

LOG_DEBUG("dma_write_desc=%p: owner=%d eof=%d len=%u size=%u -> buf=%p next=%p",
i2s_out->dma_write_desc,
i2s_out->dma_write_desc->owner,
i2s_out->dma_write_desc->eof,
i2s_out->dma_write_desc->len,
i2s_out->dma_write_desc->size,
i2s_out->dma_write_desc->buf,
i2s_out->dma_write_desc->next
);
for (unsigned i = 0; i < i2s_out->dma_rx_count; i++) {
LOG_DEBUG("dma_rx_desc[%u]=%p: owner=%d eof=%d len=%u size=%u buf=%p next=%p", i,
&i2s_out->dma_rx_desc[i],
i2s_out->dma_rx_desc[i].owner,
i2s_out->dma_rx_desc[i].eof,
i2s_out->dma_rx_desc[i].len,
i2s_out->dma_rx_desc[i].size,
i2s_out->dma_rx_desc[i].buf,
i2s_out->dma_rx_desc[i].next
);
}

for (unsigned i = 0; i < i2s_out->dma_rx_repeat; i++) {
for (unsigned j = 0; j < i2s_out->dma_rx_count; j++) {
LOG_DEBUG("dma_repeat_desc[%u][%u]=%p: owner=%d eof=%d len=%u size=%u buf=%p next=%p", i, j,
&i2s_out->dma_repeat_desc[i * i2s_out->dma_rx_count + j],
i2s_out->dma_repeat_desc[i * i2s_out->dma_rx_count + j].owner,
i2s_out->dma_repeat_desc[i * i2s_out->dma_rx_count + j].eof,
i2s_out->dma_repeat_desc[i * i2s_out->dma_rx_count + j].len,
i2s_out->dma_repeat_desc[i * i2s_out->dma_rx_count + j].size,
i2s_out->dma_repeat_desc[i * i2s_out->dma_rx_count + j].buf,
i2s_out->dma_repeat_desc[i * i2s_out->dma_rx_count + j].next
);
}
}

LOG_DEBUG("dma_eof_desc=%p: owner=%d eof=%d len=%u size=%u -> buf=%p next=%p",
i2s_out->dma_eof_desc,
Expand Down
103 changes: 85 additions & 18 deletions components/i2s_out/esp8266/dma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,11 @@ struct dma_desc *commit_dma_desc(struct dma_desc *desc)
{
desc->owner = 1;

return desc->next;
if (desc->next) {
return desc->next;
} else {
return desc;
}
}

void init_dma_eof_desc(struct dma_desc *eof_desc, uint32_t value, unsigned count)
Expand Down Expand Up @@ -108,7 +112,7 @@ void reinit_dma_desc(struct dma_desc *head, unsigned count, struct dma_desc *nex
}
}

int i2s_out_dma_init(struct i2s_out *i2s_out, size_t size, size_t align)
int i2s_out_dma_init(struct i2s_out *i2s_out, size_t size, size_t align, unsigned repeat)
{
size_t buf_size = 0;
unsigned desc_count = 0;
Expand All @@ -130,7 +134,7 @@ int i2s_out_dma_init(struct i2s_out *i2s_out, size_t size, size_t align)
}
}

LOG_DEBUG("size=%u align=%u -> desc_count=%u buf_size=%u", size, align, desc_count, buf_size);
LOG_DEBUG("size=%u align=%u repeat=%u -> desc_count=%u buf_size=%u", size, align, repeat, desc_count, buf_size);

// allocate single word-aligned buffer
if (!(i2s_out->dma_rx_buf = dma_malloc(buf_size))) {
Expand All @@ -151,16 +155,24 @@ int i2s_out_dma_init(struct i2s_out *i2s_out, size_t size, size_t align)
LOG_ERROR("dma_calloc(dma_rx_desc)");
return -1;
}
if (repeat && !(i2s_out->dma_repeat_desc = dma_calloc(desc_count * repeat, sizeof(*i2s_out->dma_rx_desc)))) {
LOG_ERROR("dma_calloc(dma_repeat_desc)");
return -1;
}
if (!(i2s_out->dma_eof_desc = dma_calloc(1, sizeof(*i2s_out->dma_eof_desc)))) {
LOG_ERROR("dma_calloc(dma_eof_desc)");
return -1;
}

// initialize linked list of DMA descriptors
init_dma_desc(i2s_out->dma_rx_desc, desc_count, i2s_out->dma_rx_buf, buf_size, align, i2s_out->dma_eof_desc);
init_dma_desc(i2s_out->dma_eof_desc, 1, i2s_out->dma_eof_buf, DMA_EOF_BUF_SIZE, sizeof(uint32_t), i2s_out->dma_eof_desc);
init_dma_desc(i2s_out->dma_rx_desc, desc_count, i2s_out->dma_rx_buf, buf_size, align, NULL);
for (unsigned i = 0; i < repeat; i++) {
init_dma_desc(i2s_out->dma_repeat_desc + i * desc_count, desc_count, i2s_out->dma_rx_buf, buf_size, align, NULL);
}
init_dma_desc(i2s_out->dma_eof_desc, 1, i2s_out->dma_eof_buf, DMA_EOF_BUF_SIZE, sizeof(uint32_t), NULL);

i2s_out->dma_rx_count = desc_count;
i2s_out->dma_rx_repeat = repeat;

// setup isr
slc_isr_mask();
Expand Down Expand Up @@ -218,7 +230,7 @@ int i2s_out_dma_setup(struct i2s_out *i2s_out, const struct i2s_out_options *opt
init_dma_eof_desc(i2s_out->dma_eof_desc, options->eof_value, options->eof_count);

// init RX desc
reinit_dma_desc(i2s_out->dma_rx_desc, i2s_out->dma_rx_count, i2s_out->dma_eof_desc);
reinit_dma_desc(i2s_out->dma_rx_desc, i2s_out->dma_rx_count, NULL);

taskENTER_CRITICAL();

Expand Down Expand Up @@ -295,7 +307,7 @@ size_t i2s_out_dma_buffer(struct i2s_out *i2s_out, void **ptr, unsigned count, s
if (desc->len + size > desc->size) {
LOG_DEBUG("commit desc=%p (owner=%u eof=%u buf=%p len=%u size=%u) < size=%u -> next=%p", desc, desc->owner, desc->eof, desc->buf, desc->len, desc->size, size, desc->next);

// commit, try with the next buffer
// commit, try with the next desc, if available
i2s_out->dma_write_desc = commit_dma_desc(desc);

continue;
Expand Down Expand Up @@ -343,6 +355,39 @@ int i2s_out_dma_write(struct i2s_out *i2s_out, const void *data, size_t size)
return len;
}

void i2s_out_dma_repeat(struct i2s_out *i2s_out, unsigned count)
{
struct dma_desc **nextp = &i2s_out->dma_write_desc->next;

// commit
i2s_out->dma_write_desc->owner = 1;

for (unsigned i = 0; i < count; i++) {
for (unsigned j = 0; j < i2s_out->dma_rx_count; j++) {
struct dma_desc *s = &i2s_out->dma_rx_desc[j];
struct dma_desc *d = &i2s_out->dma_repeat_desc[i * i2s_out->dma_rx_count + j];

if (!s->owner) {
break;
}

if (nextp) {
*nextp = d;
}

d->len = s->len;
d->owner = s->owner;

nextp = &d->next;
}
}

if (nextp) {
// eof
*nextp = i2s_out->dma_eof_desc;
}
}

int i2s_out_dma_pending(struct i2s_out *i2s_out)
{
if (i2s_out->dma_start) {
Expand All @@ -360,21 +405,43 @@ int i2s_out_dma_pending(struct i2s_out *i2s_out)

void i2s_out_dma_start(struct i2s_out *i2s_out)
{
i2s_out->dma_write_desc->owner = 1;
i2s_out->dma_write_desc->next = i2s_out->dma_eof_desc;
// commit if not repeat()
if (!i2s_out->dma_write_desc->owner) {
i2s_out->dma_write_desc->owner = 1;
}

if (!i2s_out->dma_write_desc->next) {
i2s_out->dma_write_desc->next = i2s_out->dma_eof_desc;
}

i2s_out->dma_eof_desc->owner = 1;
i2s_out->dma_eof_desc->next = i2s_out->dma_eof_desc;

LOG_DEBUG("dma_write_desc=%p: owner=%d eof=%d len=%u size=%u -> buf=%p next=%p",
i2s_out->dma_write_desc,
i2s_out->dma_write_desc->owner,
i2s_out->dma_write_desc->eof,
i2s_out->dma_write_desc->len,
i2s_out->dma_write_desc->size,
i2s_out->dma_write_desc->buf,
i2s_out->dma_write_desc->next
);
for (unsigned i = 0; i < i2s_out->dma_rx_count; i++) {
LOG_DEBUG("dma_rx_desc[%u]=%p: owner=%d eof=%d len=%u size=%u buf=%p next=%p", i,
&i2s_out->dma_rx_desc[i],
i2s_out->dma_rx_desc[i].owner,
i2s_out->dma_rx_desc[i].eof,
i2s_out->dma_rx_desc[i].len,
i2s_out->dma_rx_desc[i].size,
i2s_out->dma_rx_desc[i].buf,
i2s_out->dma_rx_desc[i].next
);
}

for (unsigned i = 0; i < i2s_out->dma_rx_repeat; i++) {
for (unsigned j = 0; j < i2s_out->dma_rx_count; j++) {
LOG_DEBUG("dma_repeat_desc[%u][%u]=%p: owner=%d eof=%d len=%u size=%u buf=%p next=%p", i, j,
&i2s_out->dma_repeat_desc[i * i2s_out->dma_rx_count + j],
i2s_out->dma_repeat_desc[i * i2s_out->dma_rx_count + j].owner,
i2s_out->dma_repeat_desc[i * i2s_out->dma_rx_count + j].eof,
i2s_out->dma_repeat_desc[i * i2s_out->dma_rx_count + j].len,
i2s_out->dma_repeat_desc[i * i2s_out->dma_rx_count + j].size,
i2s_out->dma_repeat_desc[i * i2s_out->dma_rx_count + j].buf,
i2s_out->dma_repeat_desc[i * i2s_out->dma_rx_count + j].next
);
}
}

LOG_DEBUG("dma_eof_desc=%p: owner=%d eof=%d len=%u size=%u -> buf=%p next=%p",
i2s_out->dma_eof_desc,
Expand Down
22 changes: 20 additions & 2 deletions components/i2s_out/i2s_out.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ int i2s_out_init(struct i2s_out *i2s_out, i2s_port_t port)
return 0;
}

int i2s_out_new(struct i2s_out **i2s_outp, i2s_port_t port, size_t buffer_size, size_t buffer_align)
int i2s_out_new(struct i2s_out **i2s_outp, i2s_port_t port, size_t buffer_size, size_t buffer_align, unsigned repeat_data_count)
{
struct i2s_out *i2s_out = NULL;
int err;
Expand All @@ -53,7 +53,7 @@ int i2s_out_new(struct i2s_out **i2s_outp, i2s_port_t port, size_t buffer_size,
goto error;
}

if ((err = i2s_out_dma_init(i2s_out, buffer_size, buffer_align))) {
if ((err = i2s_out_dma_init(i2s_out, buffer_size, buffer_align, repeat_data_count))) {
LOG_ERROR("i2s_out_dma_init");
goto error;
}
Expand Down Expand Up @@ -329,6 +329,24 @@ int i2s_out_write_serial32(struct i2s_out *i2s_out, const uint32_t *data, size_t
}
#endif

int i2s_out_repeat(struct i2s_out *i2s_out, unsigned count)
{
int err = 0;

if (!xSemaphoreTakeRecursive(i2s_out->mutex, portMAX_DELAY)) {
LOG_ERROR("xSemaphoreTakeRecursive");
return -1;
}

i2s_out_dma_repeat(i2s_out, count);

if (!xSemaphoreGiveRecursive(i2s_out->mutex)) {
LOG_WARN("xSemaphoreGiveRecursive");
}

return err;
}

int i2s_out_flush(struct i2s_out *i2s_out)
{
int err = 0;
Expand Down
Loading
Loading