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

Update i2s_stream.h - C++ / Arduino / Platformio compatibility (AUD-599) #103

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update i2s_stream.h - C++ / Arduino / Platformio compatibility (AUD-599) #103

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 40 additions & 10 deletions components/audio_stream/include/i2s_stream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,32 +55,62 @@ typedef struct {
#define I2S_STREAM_TASK_CORE (0)
#define I2S_STREAM_RINGBUFFER_SIZE (8 * 1024)

// #define I2S_STREAM_CFG_DEFAULT() { \
// .type = AUDIO_STREAM_WRITER, \
// .task_prio = I2S_STREAM_TASK_PRIO, \
// .task_core = I2S_STREAM_TASK_CORE, \
// .task_stack = I2S_STREAM_TASK_STACK, \
// .out_rb_size = I2S_STREAM_RINGBUFFER_SIZE, \
// .i2s_config = { \
// .mode = I2S_MODE_MASTER | I2S_MODE_TX | I2S_MODE_RX, \
// .sample_rate = 44100, \
// .bits_per_sample = 16, \
// .channel_format = I2S_CHANNEL_FMT_RIGHT_LEFT, \
// .communication_format = I2S_COMM_FORMAT_I2S, \
// .dma_buf_count = 3, \
// .dma_buf_len = 300, \
// .use_apll = 1, \
// .intr_alloc_flags = ESP_INTR_FLAG_LEVEL2, \
// }, \
// .i2s_pin_config = { \
// .bck_io_num = IIS_SCLK, \
// .ws_io_num = IIS_LCLK, \
// .data_out_num = IIS_DSIN, \
// .data_in_num = IIS_DOUT, \
// }, \
// .i2s_port = 0, \
// }

// FIXME OK -> C++ / Arduino / Platformio -> a value of type "int" cannot be used to initialize an entity of type "i2s_mode_t"
// -> in .platformio\packages\framework-arduinoespressif32\tools\sdk\include\driver\driver\i2s.h - i2s_mode_t - I2S_MODE_MASTER_TX_RX = 13,
// FIXME OK -> C++ / Arduino / Platformio -> non-trivial-designated-initializers-not-supported -> the order of initialization needs to be in the exact order of declaration.
#define I2S_STREAM_CFG_DEFAULT() { \
.type = AUDIO_STREAM_WRITER, \
.task_prio = I2S_STREAM_TASK_PRIO, \
.task_core = I2S_STREAM_TASK_CORE, \
.task_stack = I2S_STREAM_TASK_STACK, \
.out_rb_size = I2S_STREAM_RINGBUFFER_SIZE, \
.i2s_config = { \
.mode = I2S_MODE_MASTER | I2S_MODE_TX | I2S_MODE_RX, \
.mode = I2S_MODE_MASTER_TX_RX, \
.sample_rate = 44100, \
.bits_per_sample = 16, \
.bits_per_sample = I2S_BITS_PER_SAMPLE_16BIT, \
.channel_format = I2S_CHANNEL_FMT_RIGHT_LEFT, \
.communication_format = I2S_COMM_FORMAT_I2S, \
.intr_alloc_flags = ESP_INTR_FLAG_LEVEL2, \
.dma_buf_count = 3, \
.dma_buf_len = 300, \
.use_apll = 1, \
.intr_alloc_flags = ESP_INTR_FLAG_LEVEL2, \
}, \
.i2s_pin_config = { \
.bck_io_num = IIS_SCLK, \
.ws_io_num = IIS_LCLK, \
.data_out_num = IIS_DSIN, \
.data_in_num = IIS_DOUT, \
}, \
.i2s_port = 0, \
}

.i2s_port = I2S_NUM_0, \
.out_rb_size = I2S_STREAM_RINGBUFFER_SIZE, \
.task_stack = I2S_STREAM_TASK_STACK, \
.task_core = I2S_STREAM_TASK_CORE, \
.task_prio = I2S_STREAM_TASK_PRIO, \
}


#define I2S_STREAM_INTERNAL_DAC_CFG_DEFAULT() { \
.type = AUDIO_STREAM_WRITER, \
.task_prio = I2S_STREAM_TASK_PRIO, \
Expand Down