From 1835bd34d7adb24d763c2134d0c011857f98666c Mon Sep 17 00:00:00 2001 From: Oleksandr Perepadia Date: Sun, 22 May 2022 15:13:39 +0300 Subject: [PATCH] Update code to compile with latest Arduino core (2.0.3) --- AMTransmitterI2S/AMTransmitterI2S.ino | 7 ++++--- AMTransmitterI2SButton/AMTransmitterI2SButton.ino | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/AMTransmitterI2S/AMTransmitterI2S.ino b/AMTransmitterI2S/AMTransmitterI2S.ino index 02ef0e8..8aed968 100644 --- a/AMTransmitterI2S/AMTransmitterI2S.ino +++ b/AMTransmitterI2S/AMTransmitterI2S.ino @@ -14,7 +14,7 @@ static const i2s_config_t i2s_config = { .sample_rate = 1000000, //not really used .bits_per_sample = (i2s_bits_per_sample_t)I2S_BITS_PER_SAMPLE_16BIT, .channel_format = I2S_CHANNEL_FMT_ONLY_RIGHT, - .communication_format = I2S_COMM_FORMAT_I2S_MSB, + .communication_format = I2S_COMM_FORMAT_STAND_MSB, .intr_alloc_flags = ESP_INTR_FLAG_LEVEL1, .dma_buf_count = 2, .dma_buf_len = 1024 //big buffers to avoid noises @@ -23,7 +23,7 @@ static const i2s_config_t i2s_config = { void setup() { Serial.begin(115200); - rtc_clk_cpu_freq_set(RTC_CPU_FREQ_240M); //highest cpu frequency + setCpuFrequencyMhz(240); //highest cpu frequency i2s_driver_install(i2s_num, &i2s_config, 0, NULL); //start i2s driver i2s_set_pin(i2s_num, NULL); //use internal DAC i2s_set_sample_rates(i2s_num, 1000000); //dummy sample rate, since the function fails at high values @@ -66,5 +66,6 @@ void loop() pos = posLow = 0; } //write the buffer (waits until a buffer is ready to be filled, that's timing for free) - i2s_write_bytes(i2s_num, (char*)buff, sizeof(buff), portMAX_DELAY); + size_t bytes_written; + i2s_write(i2s_num, (char*)buff, sizeof(buff), &bytes_written, portMAX_DELAY); } diff --git a/AMTransmitterI2SButton/AMTransmitterI2SButton.ino b/AMTransmitterI2SButton/AMTransmitterI2SButton.ino index a1bdd2f..59a3001 100644 --- a/AMTransmitterI2SButton/AMTransmitterI2SButton.ino +++ b/AMTransmitterI2SButton/AMTransmitterI2SButton.ino @@ -19,7 +19,7 @@ static const i2s_config_t i2s_config = { .sample_rate = 1000000, //not really used .bits_per_sample = (i2s_bits_per_sample_t)I2S_BITS_PER_SAMPLE_16BIT, .channel_format = I2S_CHANNEL_FMT_ONLY_RIGHT, - .communication_format = I2S_COMM_FORMAT_I2S_MSB, + .communication_format = I2S_COMM_FORMAT_STAND_MSB, .intr_alloc_flags = ESP_INTR_FLAG_LEVEL1, .dma_buf_count = 2, .dma_buf_len = 1024 //big buffers to avoid noises @@ -29,7 +29,7 @@ void setup() { pinMode(BUTTON_PIN, INPUT_PULLUP); Serial.begin(115200); - rtc_clk_cpu_freq_set(RTC_CPU_FREQ_240M); //highest cpu frequency + setCpuFrequencyMhz(240); //highest cpu frequency i2s_driver_install(i2s_num, &i2s_config, 0, NULL); //start i2s driver i2s_set_pin(i2s_num, NULL); //use internal DAC i2s_set_sample_rates(i2s_num, 1000000); //dummy sample rate, since the function fails at high values @@ -77,5 +77,6 @@ void loop() } } //write the buffer (waits until a buffer is ready to be filled, that's timing for free) - i2s_write_bytes(i2s_num, (char*)buff, sizeof(buff), portMAX_DELAY); + size_t bytes_written; + i2s_write(i2s_num, (char*)buff, sizeof(buff), &bytes_written, portMAX_DELAY); }