bump esp-idf to 5.2.1

custom
jacqueline 1 year ago
parent dd3346d381
commit 239e6d8950
  1. 4
      dependencies.lock
  2. 2
      lib/esp-idf
  3. 1
      lib/libtags/CMakeLists.txt
  4. 1
      src/audio/audio_converter.cpp
  5. 1
      src/audio/audio_fsm.cpp
  6. 1
      src/audio/fatfs_audio_input.cpp
  7. 1
      src/audio/include/audio_sink.hpp
  8. 1
      src/audio/readahead_source.cpp
  9. 3
      src/drivers/include/haptics.hpp
  10. 1
      src/main/main.cpp
  11. 3
      tools/cmake/common.cmake

@ -3,7 +3,7 @@ dependencies:
component_hash: null component_hash: null
source: source:
type: idf type: idf
version: 5.1.1 version: 5.2.1
manifest_hash: b9761e0028130d307b778c710e5dd39fb3c942d8084ed429d448d938957fb0e6 manifest_hash: 9e4320e6f25503854c6c93bcbfa9b80f780485bcf066bdbad31a820544492538
target: esp32 target: esp32
version: 1.0.0 version: 1.0.0

@ -1 +1 @@
Subproject commit b6a66b7d8c6295765da3cd8df4cef93359f16363 Subproject commit a322e6bdad4b6675d4597fb2722eea2851ba88cb

@ -3,3 +3,4 @@ idf_component_register(
s3m.c tags.c utf16.c vorbis.c wav.c xm.c s3m.c tags.c utf16.c vorbis.c wav.c xm.c
INCLUDE_DIRS . INCLUDE_DIRS .
) )
target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-array-bounds)

@ -19,7 +19,6 @@
#include "freertos/portmacro.h" #include "freertos/portmacro.h"
#include "freertos/projdefs.h" #include "freertos/projdefs.h"
#include "i2s_dac.hpp" #include "i2s_dac.hpp"
#include "idf_additions.h"
#include "resample.hpp" #include "resample.hpp"
#include "sample.hpp" #include "sample.hpp"

@ -31,7 +31,6 @@
#include "future_fetcher.hpp" #include "future_fetcher.hpp"
#include "i2s_audio_output.hpp" #include "i2s_audio_output.hpp"
#include "i2s_dac.hpp" #include "i2s_dac.hpp"
#include "idf_additions.h"
#include "nvs.hpp" #include "nvs.hpp"
#include "sample.hpp" #include "sample.hpp"
#include "service_locator.hpp" #include "service_locator.hpp"

@ -22,7 +22,6 @@
#include "ff.h" #include "ff.h"
#include "freertos/portmacro.h" #include "freertos/portmacro.h"
#include "freertos/projdefs.h" #include "freertos/projdefs.h"
#include "idf_additions.h"
#include "readahead_source.hpp" #include "readahead_source.hpp"
#include "span.hpp" #include "span.hpp"

@ -11,7 +11,6 @@
#include "esp_heap_caps.h" #include "esp_heap_caps.h"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "idf_additions.h"
namespace audio { namespace audio {

@ -17,7 +17,6 @@
#include "audio_source.hpp" #include "audio_source.hpp"
#include "codec.hpp" #include "codec.hpp"
#include "freertos/portmacro.h" #include "freertos/portmacro.h"
#include "idf_additions.h"
#include "spi.hpp" #include "spi.hpp"
#include "tasks.hpp" #include "tasks.hpp"
#include "types.hpp" #include "types.hpp"

@ -6,10 +6,11 @@
#pragma once #pragma once
#include <stdint.h> #include <cstdint>
#include <initializer_list> #include <initializer_list>
#include <mutex> #include <mutex>
#include <optional> #include <optional>
#include <string>
namespace drivers { namespace drivers {

@ -4,6 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * SPDX-License-Identifier: GPL-3.0-only
*/ */
#include "freertos/FreeRTOS.h"
#include "freertos/portmacro.h" #include "freertos/portmacro.h"
#include "i2c.hpp" #include "i2c.hpp"

@ -45,7 +45,8 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake)
set(EXTRA_WARNINGS "-Wshadow" "-Wnon-virtual-dtor" "-Wunused" set(EXTRA_WARNINGS "-Wshadow" "-Wnon-virtual-dtor" "-Wunused"
"-Woverloaded-virtual" "-Wmisleading-indentation" "-Wduplicated-cond" "-Woverloaded-virtual" "-Wmisleading-indentation" "-Wduplicated-cond"
"-Wduplicated-branches" "-Wlogical-op" "-Wnull-dereference" "-Wduplicated-branches" "-Wlogical-op" "-Wnull-dereference"
"-Wdouble-promotion" "-Wformat=2" "-Wimplicit-fallthrough") "-Wdouble-promotion" "-Wformat=2" "-Wimplicit-fallthrough"
"-Wno-deprecated-enum-enum-conversion" "-Wno-array-bounds")
# Extra build flags that should apply to the entire build. This should mostly # Extra build flags that should apply to the entire build. This should mostly
# just be used to setting flags that our external dependencies requires. # just be used to setting flags that our external dependencies requires.

Loading…
Cancel
Save