Skip to content

chore: sync app with latest unreleased sdk + bump sdk version #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2024

Conversation

gminn
Copy link
Member

@gminn gminn commented Oct 16, 2024

Summary

Sync this app with latest (unreleased) SDK. Needed for internal CI
to pass. Additionally, the SDK has been bumped to latest (1.15.0).

Confirmed only expected differences between this app and the
current unreleased sdk:

Only in .: .git
Only in .: .github
diff --color -r /Users/gminnehan/memfault/sdk/embedded/examples/esp32/apps/memfault_demo_app/.gitignore ./.gitignore
0a1
> /build
Only in .: .gitmodules
diff --color -r /Users/gminnehan/memfault/sdk/embedded/examples/esp32/apps/memfault_demo_app/CMakeLists.txt ./CMakeLists.txt
17a18,21
> # Look for the Memfault SDK in a subdirectory first, when this app is used
> # standalone (not from within the Memfault SDK)
> get_filename_component(memfault_firmware_sdk_dir third-party/memfault-firmware-sdk ABSOLUTE)
> if(NOT EXISTS ${memfault_firmware_sdk_dir})
19,36d22
< # If we found the Memfault SDK, include it in the build
< if(EXISTS ${memfault_firmware_sdk_dir}/ports/esp_idf/memfault.cmake)
<   include(${memfault_firmware_sdk_dir}/ports/esp_idf/memfault.cmake)
< else()
<   # Otherwise, append this to the main/idf_component.yml file:
<   #   memfault/memfault-firmware-sdk: "*"
<   # Ideally we'd push an environment variable and use a conditional dependency
<   # https://docs.espressif.com/projects/idf-component-manager/en/latest/reference/manifest_file.html#conditional-dependencies
<   # But that requires idf-component-manager v2+, which is not available on all
<   # esp-idf versions
<
<   # if the string "memfault/memfault-firmware-sdk" isn't in the file, append it:
<   file(READ ${CMAKE_CURRENT_SOURCE_DIR}/main/idf_component.yml idf_component_yml)
<   if(NOT idf_component_yml MATCHES "memfault/memfault-firmware-sdk")
<     file(APPEND ${CMAKE_CURRENT_SOURCE_DIR}/main/idf_component.yml
<       "  memfault/memfault-firmware-sdk: \"*\"\n"
<     )
<   endif()
37a24
> include(${memfault_firmware_sdk_dir}/ports/esp_idf/memfault.cmake)
Only in .: sdkconfig
Only in .: third-party

Test Plan

  • CI
  • Flashed an esp32c3 devkitm

Copy link
Member Author

gminn commented Oct 16, 2024

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @gminn and the rest of your teammates on Graphite Graphite

@gminn gminn marked this pull request as ready for review October 16, 2024 15:58
@gminn gminn marked this pull request as draft October 16, 2024 16:01
@gminn gminn force-pushed the gminn/update-app-to-latest branch from 6d19278 to 22c9368 Compare October 16, 2024 19:51
@gminn gminn changed the title chore: update app to latest esp32 app chore: sync app with latest unreleased sdk Oct 16, 2024
@gminn gminn marked this pull request as ready for review October 16, 2024 20:07
@gminn gminn requested review from noahp and ejohnso49 October 16, 2024 20:08
@gminn gminn force-pushed the gminn/update-app-to-latest branch 2 times, most recently from 6976ed8 to 796de0d Compare October 22, 2024 14:10
@gminn gminn changed the title chore: sync app with latest unreleased sdk chore: sync app with latest unreleased sdk + bump sdk version Oct 22, 2024
@gminn gminn force-pushed the gminn/update-app-to-latest branch from 796de0d to afcf725 Compare October 22, 2024 14:20
@gminn gminn force-pushed the gminn/update-app-to-latest branch from afcf725 to 4572252 Compare October 22, 2024 21:01
@gminn gminn requested a review from noahp October 22, 2024 21:03
@gminn gminn merged commit c758473 into main Oct 23, 2024
2 checks passed
@gminn gminn deleted the gminn/update-app-to-latest branch October 23, 2024 13:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants