Skip to content

Commit 396e862

Browse files
authored
chore(submodule): move Memfault SDK to components (#3)
### Summary To align with [our PlatformIO integration guide](https://docs.memfault.com/docs/mcu/platformio-esp-idf-guide#clone-memfault-sdk), the Memfault SDK is now in `components/` instead of `src/memfault/`. Involved moving the submodule with: ``` git mv src/memfault/memfault-firmware-sdk components/memfault-firmware-sdk ``` Also, removed the specific branch from the `.gitmodules` file for the sdk since those changes are now on `master`. ### Test Plan Compiled and flashed ESP32-C3: ``` pio run pio run --target upload --target monitor ```
1 parent 783d943 commit 396e862

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

.gitmodules

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
[submodule "src/memfault/memfault-firmware-sdk"]
2-
path = src/memfault/memfault-firmware-sdk
2+
path = components/memfault-firmware-sdk
33
url = https://github.com/memfault/memfault-firmware-sdk.git
4-
branch = 1.6.2+platformio

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# is named 'main', so we need to change from the default to 'src'
44
set(MEMFAULT_PLATFORM_PORT_COMPONENTS src)
55

6-
set(MEMFAULT_FIRMWARE_SDK src/memfault/memfault-firmware-sdk)
6+
set(MEMFAULT_FIRMWARE_SDK components/memfault-firmware-sdk)
77
include(${MEMFAULT_FIRMWARE_SDK}/ports/esp_idf/memfault.cmake)
88

99
cmake_minimum_required(VERSION 3.16.0)

add_build_id.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
" ".join(
1111
[
1212
"$PYTHONEXE",
13-
"$PROJECT_DIR/src/memfault/memfault-firmware-sdk/scripts/fw_build_id.py",
13+
"$PROJECT_DIR/components/memfault-firmware-sdk/scripts/fw_build_id.py",
1414
"$BUILD_DIR/${PROGNAME}.elf",
1515
]
1616
),

platformio.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ board_build.cmake_extra_args =
1818

1919
; add linker fragment needed for ESP-IDF projects
2020
board_build.esp-idf.extra_lf_files =
21-
src/memfault/memfault-firmware-sdk/ports/esp_idf/memfault/common/memfault_esp_freertos.lf
21+
components/memfault-firmware-sdk/ports/esp_idf/memfault/common/memfault_esp_freertos.lf
2222

2323
; add coredump flash partition
2424
board_build.partitions = partitions_example.csv
@@ -40,8 +40,8 @@ monitor_speed = 115200
4040
; manually include the freertos_trace.h
4141
build_flags =
4242
-Isrc/memfault
43-
-Isrc/memfault/memfault-firmware-sdk/components/include
44-
-include src/memfault/memfault-firmware-sdk/ports/include/memfault/ports/freertos_trace.h
43+
-Icomponents/memfault-firmware-sdk/components/include
44+
-include components/memfault-firmware-sdk/ports/include/memfault/ports/freertos_trace.h
4545

4646

4747
[platformio]

0 commit comments

Comments
 (0)