diff --git a/.github/workflows/esp32_build.yml b/.github/workflows/esp32_build.yml index aa68fb0..925be93 100644 --- a/.github/workflows/esp32_build.yml +++ b/.github/workflows/esp32_build.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: idf_ver: [release-v5.4, latest] - idf_target: [esp32s3] + idf_target: [esp32c3, esp32s3, esp32p4] runs-on: ubuntu-latest timeout-minutes: 30 @@ -31,8 +31,12 @@ jobs: with: submodules: "recursive" + - name: Delete CMakeLists.txt in components (only used for simulator build) + run: rm components/CMakeLists.txt + - name: ESP-IDF build uses: espressif/esp-idf-ci-action@v1 with: esp_idf_version: ${{ matrix.idf_ver }} target: ${{ matrix.idf_target }} + command: idf.py -DSDKCONFIG_DEFAULTS="sdkconfig.defaults;sdkconfig.release" build diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 209a3f9..f987b13 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -1,11 +1,9 @@ -if (DEFINED ENV{IDF_PATH}) - return() -endif () +if (NOT DEFINED ENV{IDF_PATH}) + add_library(components INTERFACE) -add_library(components INTERFACE) + add_subdirectory(imgui) + add_subdirectory(insa) + add_subdirectory(ruth) -add_subdirectory(imgui) -add_subdirectory(insa) -add_subdirectory(ruth) - -target_link_libraries(components INTERFACE ImGui) + target_link_libraries(components INTERFACE ImGui) +endif () \ No newline at end of file diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 5b1e63f..6a9bebc 100755 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -1,4 +1,9 @@ -idf_component_register( - SRCS - "main.c" "setup.c" "button_handling.c" - INCLUDE_DIRS ".") +idf_component_register(SRCS + "main.c" + "setup.c" + "button_handling.c" + INCLUDE_DIRS "." + REQUIRES + insa + ruth +) diff --git a/sdkconfig.defaults.esp32c3 b/sdkconfig.defaults.esp32c3 new file mode 100644 index 0000000..86a5bac --- /dev/null +++ b/sdkconfig.defaults.esp32c3 @@ -0,0 +1,2 @@ +# default ESP target +CONFIG_IDF_TARGET="esp32c3" diff --git a/sdkconfig.defaults.esp32h2 b/sdkconfig.defaults.esp32h2 new file mode 100644 index 0000000..04069a9 --- /dev/null +++ b/sdkconfig.defaults.esp32h2 @@ -0,0 +1,2 @@ +# default ESP target +CONFIG_IDF_TARGET="esp32h2" diff --git a/sdkconfig.defaults.esp32p4 b/sdkconfig.defaults.esp32p4 new file mode 100644 index 0000000..091f4b8 --- /dev/null +++ b/sdkconfig.defaults.esp32p4 @@ -0,0 +1,2 @@ +# default ESP target +CONFIG_IDF_TARGET="esp32p4" diff --git a/sdkconfig.release b/sdkconfig.release new file mode 100644 index 0000000..e69de29