aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormrfaptastic <12006953+mrfaptastic@users.noreply.github.com>2023-10-24 23:51:21 +0100
committerGitHub <noreply@github.com>2023-10-24 23:51:21 +0100
commit8e6c69716c69d8f34709b6aa1c54ab7a26f2ae78 (patch)
treebdeb014dd6fcd8204e7798ae01f5b9964d8d1025 /src
parent3c7173ababb246971ac6d57ac378bee8cdd2cce3 (diff)
parenta468ea9d6767881452b5a69d1442d347b6562482 (diff)
Merge pull request #515 from dorianim-forks/fix/espidf-v5
Fix: compile issues on ESP-idf v5
Diffstat (limited to 'src')
-rw-r--r--src/platforms/esp32/esp32_i2s_parallel_dma.cpp5
-rw-r--r--src/platforms/esp32/esp32_i2s_parallel_dma.hpp1
2 files changed, 4 insertions, 2 deletions
diff --git a/src/platforms/esp32/esp32_i2s_parallel_dma.cpp b/src/platforms/esp32/esp32_i2s_parallel_dma.cpp
index 181503c..96aac07 100644
--- a/src/platforms/esp32/esp32_i2s_parallel_dma.cpp
+++ b/src/platforms/esp32/esp32_i2s_parallel_dma.cpp
@@ -27,6 +27,7 @@ Modified heavily for the ESP32 HUB75 DMA library by:
#include <driver/gpio.h>
#include <driver/periph_ctrl.h>
#include <soc/gpio_sig_map.h>
+#include <soc/i2s_periph.h>
#if defined (ARDUINO_ARCH_ESP32)
#include <Arduino.h>
@@ -199,7 +200,7 @@ Modified heavily for the ESP32 HUB75 DMA library by:
////////////////////////////// Clock configuration //////////////////////////////
auto freq = (_cfg.bus_freq);
- ESP_LOGD("ESP32/S2", "Requested output clock frequency: %d Mhz", (freq/1000000));
+ ESP_LOGD("ESP32/S2", "Requested output clock frequency: %ld Mhz", (freq/1000000));
// What is the current CPU frequency?
@@ -487,7 +488,7 @@ Modified heavily for the ESP32 HUB75 DMA library by:
if ( !dmadesc_b )
{
if ( (_dmadesc_a_idx+1) > _dmadesc_count) {
- ESP_LOGE("ESP32/S2", "Attempted to create more DMA descriptors than allocated memory for. Expecting a maximum of %d DMA descriptors", _dmadesc_count);
+ ESP_LOGE("ESP32/S2", "Attempted to create more DMA descriptors than allocated memory for. Expecting a maximum of %ld DMA descriptors", _dmadesc_count);
return;
}
}
diff --git a/src/platforms/esp32/esp32_i2s_parallel_dma.hpp b/src/platforms/esp32/esp32_i2s_parallel_dma.hpp
index b0d3642..a8ab305 100644
--- a/src/platforms/esp32/esp32_i2s_parallel_dma.hpp
+++ b/src/platforms/esp32/esp32_i2s_parallel_dma.hpp
@@ -44,6 +44,7 @@ Contributors:
#include <sys/types.h>
#include <freertos/FreeRTOS.h>
#include <driver/i2s.h>
+#include <soc/i2s_struct.h>
#include <rom/lldesc.h>
#include <rom/gpio.h>