ScStw/ESP32-HUB75-MatrixPanel-DMA
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #515 from dorianim-forks/fix/espidf-v5

Browse source 
Fix: compile issues on ESP-idf v5
This commit is contained in:
mrfaptastic 2023-10-24 23:51:21 +01:00 committed by GitHub
commit 8e6c69716c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/platforms/esp32/esp32_i2s_parallel_dma.cpp
View file

@ -27,6 +27,7 @@ Modified heavily for the ESP32 HUB75 DMA library by:
#include <driver/gpio.h> #include <driver/gpio.h>
#include <driver/periph_ctrl.h> #include <driver/periph_ctrl.h>
#include <soc/gpio_sig_map.h> #include <soc/gpio_sig_map.h>
#include <soc/i2s_periph.h>
#if defined (ARDUINO_ARCH_ESP32) #if defined (ARDUINO_ARCH_ESP32)
#include <Arduino.h> #include <Arduino.h>
@ -199,7 +200,7 @@ Modified heavily for the ESP32 HUB75 DMA library by:
////////////////////////////// Clock configuration ////////////////////////////// ////////////////////////////// Clock configuration //////////////////////////////
auto freq = (_cfg.bus_freq); 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? // What is the current CPU frequency?
@ -487,7 +488,7 @@ Modified heavily for the ESP32 HUB75 DMA library by:
if ( !dmadesc_b ) if ( !dmadesc_b )
{ {
if ( (_dmadesc_a_idx+1) > _dmadesc_count) { 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; return;
} }
} }

1
src/platforms/esp32/esp32_i2s_parallel_dma.hpp
View file

@ -44,6 +44,7 @@ Contributors:
#include <sys/types.h> #include <sys/types.h>
#include <freertos/FreeRTOS.h> #include <freertos/FreeRTOS.h>
#include <driver/i2s.h> #include <driver/i2s.h>
#include <soc/i2s_struct.h>
#include <rom/lldesc.h> #include <rom/lldesc.h>
#include <rom/gpio.h> #include <rom/gpio.h>