upgrade to Idf v5.3.2, added esp32c6

.github/workflows/build.yml

@@ -13,50 +13,55 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
+env:
+  IDF_VERSION: v5.3.2
+
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        config:
-          - 'release'
-          - 'debug'
+        board:
+          - 'esp32'
+          - 'fruitjam_c6'
+        build_type:
+          - 'Release'
+          - 'Debug'
     steps:
-    - name: Setup Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.x'
-
     - name: Pull ESP-IDF docker
-      run: docker pull espressif/idf:v3.3.1
+      run: docker pull espressif/idf:$IDF_VERSION
 
     - name: Checkout
       uses: actions/checkout@v4
 
     - name: Checkout submodules
-      run: git submodule update --init --depth 1 certificates
+      run: git submodule update --init --depth 1 certificates components/arduino-esp32
 
     - name: Build
-      if: matrix.config == 'release'
-      run: docker run --rm -v $PWD:/project -w /project espressif/idf:v3.3.1 make firmware
-
-    - name: Build for Debug
-      if: matrix.config == 'debug'
       run: |
-        docker run --rm -v $PWD:/project -w /project espressif/idf:v3.3.1 make NINA_DEBUG=1 firmware
-        mv NINA_W102*.bin "$(echo NINA_W102*.bin | sed 's/.bin/_debug.bin/')"
+        docker run --rm -v $PWD:/project -w /project espressif/idf:$IDF_VERSION /bin/bash -c "git config --global --add safe.directory /project && idf.py -DBOARD=${{ matrix.board }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} build"
+        # combine.py is auto run as postbuild
+        if [ "${{ matrix.build_type }}" == "Debug" ]; then
+          # add debug suffix to the bin file
+          mv NINA_ADAFRUIT*.bin "$(echo NINA_ADAFRUIT*.bin | sed 's/.bin/_Debug.bin/')"
+        fi
 
     - name: Upload Artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: NINA_W102-${{ matrix.config }}-${{ github.sha }}
+        #name: nina-fw-${{ matrix.board }}${{ matrix.build_type == 'Debug' && format('-{0}', matrix.build_type) || '' }}
+        name: NINA_ADAFRUIT-${{ matrix.board }}-${{ matrix.build_type }}
         path: |
-          NINA_W102*.bin
+          NINA_ADAFRUIT*.bin
+
+#    - name: Prepare Release Asset
+#      if: github.event_name == 'release' && matrix.build_type == 'Release'
+#      run: cp build/nina-fw.bin nina-fw-${{ matrix.board }}-${{ github.event.release.tag_name }}-${{ matrix.build_type }}.bin
 
     - name: Upload Release Asset
       uses: softprops/action-gh-release@v1
-      if: github.event_name == 'release' && matrix.config == 'release'
+      if: github.event_name == 'release'
       with:
         files: |
-          NINA_W102*.bin
+          NINA_ADAFRUIT*.bin

.gitignore

@@ -1,3 +1,8 @@
 build/
 *.bin
+# Regenerate sdkconfig from the sdkconfig.defaults* files.
+sdkconfig.esp32
+sdkconfig.esp32c6
+sdkconfig.*.old
 sdkconfig.old
+managed_components/

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "certificates"]
 	path = certificates
 	url = https://github.com/adafruit/certificates
+[submodule "esp-idf"]
+	path = esp-idf
+	url = https://github.com/espressif/esp-idf
+[submodule "arduino-esp32"]
+	path = components/arduino-esp32
+	url = https://github.com/espressif/arduino-esp32

CMakeLists.txt

@@ -0,0 +1,44 @@
+# The following five lines of boilerplate have to be in your project's
+# CMakeLists in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.16)
+
+if (BOARD STREQUAL "fruitjam_c6")
+  set(IDF_TARGET esp32c6 CACHE STRING "Target ESP-IDF board")
+elseif (BOARD STREQUAL "esp32")
+  set(IDF_TARGET esp32 CACHE STRING "Target ESP-IDF board")
+else ()
+  message(FATAL_ERROR "Unsupported BOARD: ${BOARD}. Supported boards are: fruitjam_c6, esp32")
+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_DEFAULTS sdkconfig.defaults ${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}/sdkconfig)
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+  list(APPEND SDKCONFIG_DEFAULTS sdkconfig.debug)
+endif ()
+
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+  add_compile_definitions(CMAKE_BUILD_TYPE_DEBUG)
+endif ()
+
+STRING(TOUPPER ${BOARD} BOARD_UPPER)
+add_compile_definitions(
+  BOARD_${BOARD_UPPER}
+  )
+set(EXTRA_COMPONENT_DIRS ${CMAKE_CURRENT_LIST_DIR}/boards)
+
+project(nina-fw)
+
+# Post build to run combine.py
+add_custom_command(TARGET app POST_BUILD
+  COMMAND python ${CMAKE_CURRENT_LIST_DIR}/combine.py -b ${CMAKE_BINARY_DIR} NINA_ADAFRUIT-${BOARD}
+  WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+  VERBATIM
+  )

Makefile

@@ -19,12 +19,6 @@ CFLAGS += -DNDEBUG -DCONFIG_FREERTOS_ASSERT_DISABLE -Os -DLOG_LOCAL_LEVEL=0
 CPPFLAGS += -DNDEBUG -Os
 endif
 
-NINA_DEBUG ?= 0
-ifeq ($(NINA_DEBUG),1)
-CFLAGS += -DNINA_DEBUG
-CPPFLAGS += -DNINA_DEBUG
-endif
-
 ifeq ($(UNO_WIFI_REV2),1)
 CFLAGS += -DUNO_WIFI_REV2
 CPPFLAGS += -DUNO_WIFI_REV2