build need -DBOARD= instead of IDF_TARGET to allow flexible pinout for variant

Author: hathach

.github/workflows/build.yml

@@ -22,9 +22,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        esp_target:
+        board:
           - 'esp32'
-          - 'esp32c6'
+          - 'fruitjam_c6'
         build_type:
           - 'Release'
           - 'Debug'
@@ -40,8 +40,7 @@ jobs:
 
     - name: Build
       run: |
-        docker run --rm -v $PWD:/project -w /project espressif/idf:$IDF_VERSION cmake -B build -G Ninja -DIDF_TARGET=${{ matrix.esp_target }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-        docker run --rm -v $PWD:/project -w /project espressif/idf:$IDF_VERSION cmake --build build
+        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 }}
         python combine.py
         if [ "${{ matrix.build_type }}" == "Debug" ]; then
           # add debug suffix to the bin file
@@ -51,14 +50,14 @@ jobs:
     - name: Upload Artifacts
       uses: actions/upload-artifact@v4
       with:
-        #name: nina-fw-${{ matrix.esp_target }}${{ matrix.build_type == 'Debug' && format('-{0}', matrix.build_type) || '' }}
-        name: NINA_ADAFRUIT-${{ matrix.esp_target }}-${{ matrix.build_type }}
+        #name: nina-fw-${{ matrix.board }}${{ matrix.build_type == 'Debug' && format('-{0}', matrix.build_type) || '' }}
+        name: NINA_ADAFRUIT-${{ matrix.board }}-${{ matrix.build_type }}
         path: |
           NINA_ADAFRUIT*.bin
 
 #    - name: Prepare Release Asset
-#      if: github.event_name == 'release'
-#      run: cp build/nina-fw.bin nina-fw-${{ matrix.esp_target }}-${{ github.event.release.tag_name }}-${{ matrix.build_type }}.bin
+#      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

CMakeLists.txt

@@ -2,10 +2,24 @@
 # 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 ()
+
 # SDKCONFIG & SDKCONFIG_DEFAULTS for each target
 set(SDKCONFIG ${CMAKE_SOURCE_DIR}/sdkconfig.${IDF_TARGET})
 
-set(SDKCONFIG_DEFAULTS sdkconfig.defaults sdkconfig.defaults.${IDF_TARGET})
+# 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_DEFAULTS sdkconfig.defaults sdkconfig.defaults.${BOARD})
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
   list(APPEND SDKCONFIG_DEFAULTS sdkconfig.debug)
 endif ()
@@ -16,10 +30,9 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
   add_compile_definitions(CMAKE_BUILD_TYPE_DEBUG)
 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 ()
+STRING(TOUPPER ${BOARD} BOARD_UPPER)
+add_compile_definitions(
+  BOARD_${BOARD_UPPER}
+  )
 
 project(nina-fw)

main/sketch.ino.cpp

@@ -78,30 +78,33 @@ SPISClass SPIS(VSPI_HOST, 1, AIRLIFT_MOSI, AIRLIFT_MISO, AIRLIFT_SCK, AIRLIFT_CS
 #endif
 
 #if defined(CONFIG_IDF_TARGET_ESP32C6)
-// SPIS for WiFi
-#define AIRLIFT_MOSI  21
-#define AIRLIFT_MISO  6
-#define AIRLIFT_SCK   22
-#define AIRLIFT_CS    7
-#define AIRLIFT_BUSY  18 // ready
 
 // UART for BLE HCI
-// CONFIG_BT_LE_HCI_UART_RTS_PIN and CONFIG_BT_LE_HCI_UART_CTS_PIN are defined in sdkconfig.defaults.esp32c6
+// CONFIG_BT_LE_HCI_UART_RTS_PIN and CONFIG_BT_LE_HCI_UART_CTS_PIN are defined in sdkconfig.defaults.BOARD
 // and used by hci_driver_uart_config() in hci_driver_uart.c. It should matches with BUSY and BOOT pins.
 #ifndef CONFIG_BT_LE_HCI_INTERFACE_USE_UART
 #error "Please Enable Uart for HCI"
 #endif
 
-#if CONFIG_BT_LE_HCI_UART_RTS_PIN != AIRLIFT_BUSY
-#error "RTS pin must be the same as ready pin"
-#endif
-
 #if CONFIG_BT_LE_HCI_UART_CTS_PIN != 9
 #error "CTS pin must be the same as BOOT pin"
 #endif
 
+// SPIS for WiFi
+#define AIRLIFT_BUSY  CONFIG_BT_LE_HCI_UART_RTS_PIN // ready
+
+#if defined(BOARD_FRUITJAM_C6)
+  #define AIRLIFT_MOSI  21
+  #define AIRLIFT_MISO  6
+  #define AIRLIFT_SCK   22
+  #define AIRLIFT_CS    7
+#else
+  #error "Board is not supported, please add -DBOARD=<board_name> to the build command"
+#endif
+
 // dev, dma, mosi, miso, sclk, cs, ready
-SPISClass SPIS(SPI2_HOST, SPI_DMA_CH_AUTO, AIRLIFT_MOSI, AIRLIFT_MISO, AIRLIFT_SCK, AIRLIFT_CS, AIRLIFT_BUSY);
+SPISClass SPIS(SPI2_HOST, SPI_DMA_CH_AUTO,
+               AIRLIFT_MOSI, AIRLIFT_MISO, AIRLIFT_SCK, AIRLIFT_CS, AIRLIFT_BUSY);
 #endif
 
 // prevent initArduino() to release BT memory