adafruit-mirror/nina-fw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update to esp-idf v5.5 and arduino-esp32 v3.3.0

Browse source
This commit is contained in:
hathach 2025-07-25 23:21:43 +07:00
parent 36c78d4d4a
commit 54ee662201
No known key found for this signature in database
GPG key ID: 26FAB84F615C3C52
4 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View file

@ -14,7 +14,7 @@ concurrency:
cancel-in-progress: true cancel-in-progress: true
env: env:
IDF_VERSION: v5.3.2 IDF_VERSION: v5.5
jobs: jobs:
build: build:

9
CMakeLists.txt
View file

@ -10,12 +10,6 @@ else ()
message(FATAL_ERROR "Unsupported BOARD: ${BOARD}. Supported boards are: fruitjam_c6, esp32") message(FATAL_ERROR "Unsupported BOARD: ${BOARD}. Supported boards are: fruitjam_c6, esp32")
endif () endif ()
# caused by esp-idf/components/bt/controller/esp32c6/bt.c:253:11: In function 'esp_bt_controller_log_init':
# error: 'task_create' may be used uninitialized [-Werror=maybe-uninitialized]
if (IDF_TARGET STREQUAL "esp32c6")
add_compile_options(-Wno-maybe-uninitialized)
endif ()
set(SDKCONFIG ${CMAKE_BINARY_DIR}/sdkconfig) set(SDKCONFIG ${CMAKE_BINARY_DIR}/sdkconfig)
set(SDKCONFIG_DEFAULTS sdkconfig.defaults ${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}/sdkconfig) set(SDKCONFIG_DEFAULTS sdkconfig.defaults ${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}/sdkconfig)
if (CMAKE_BUILD_TYPE STREQUAL "Debug") if (CMAKE_BUILD_TYPE STREQUAL "Debug")
@ -34,6 +28,9 @@ add_compile_definitions(
) )
set(EXTRA_COMPONENT_DIRS ${CMAKE_CURRENT_LIST_DIR}/boards) set(EXTRA_COMPONENT_DIRS ${CMAKE_CURRENT_LIST_DIR}/boards)
# required when upgrading to esp-idf v5.5 and arduino-esp32 v3.3.0
add_link_options("-Wl,-u,__wrap_esp_log_writev")
project(nina-fw) project(nina-fw)
# Post build to run combine.py # Post build to run combine.py

2
components/arduino-esp32

@ -1 +1 @@
Subproject commit 988dbe29731e2a2d09db2ed642c06271afa93705 Subproject commit dbaf6a3226317a7c5e452e7b8a15e54c86bc2b6a

1
esp-idf

@ -1 +0,0 @@
Subproject commit 9d7f2d69f50d1288526d4f1027108e314e8c879f