Skip to content

Commit a4cb0c9

Browse files
authored
Pin all tool versions + update Memfault to 1.9.1 (#5)
Minor incompatibility issue on 1.9.3, so update to a little bit older version. Move memfault to `third-party`; the `components` folder is special, and our SDK is not (yet) and ESP-IDF component- idf.py spits out a build warning due to that.
1 parent 8b5b9e8 commit a4cb0c9

File tree

6 files changed

+18
-14
lines changed

6 files changed

+18
-14
lines changed

.gitmodules

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

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 components/memfault-firmware-sdk)
6+
set(MEMFAULT_FIRMWARE_SDK third-party/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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
" ".join(
1111
[
1212
"$PYTHONEXE",
13-
"$PROJECT_DIR/components/memfault-firmware-sdk/scripts/fw_build_id.py",
13+
"$PROJECT_DIR/third-party/memfault-firmware-sdk/scripts/fw_build_id.py",
1414
"$BUILD_DIR/${PROGNAME}.elf",
1515
]
1616
),
1717
"Adding build id to $BUILD_DIR/${PROGNAME}.elf",
1818
),
19-
)
19+
)

components/memfault-firmware-sdk

Lines changed: 0 additions & 1 deletion
This file was deleted.

platformio.ini

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,21 @@ build_cache_dir = .build_cache
1616
platform = espressif32
1717
board = esp32-c3-devkitc-02
1818

19+
; Strictly specify the versions used to build this project
20+
platform_packages =
21+
22+
23+
24+
25+
espressif/[email protected]+20221002
26+
espressif/[email protected]+20221002
27+
platformio/[email protected] ; (2.35.0)
28+
espressif/[email protected]+20230208
29+
1930
; needed to tell Memfault that we are using a platformIO project
2031
board_build.cmake_extra_args =
2132
-DPLATFORMIO_ENABLED=TRUE
2233

23-
; add linker fragment needed for ESP-IDF projects
24-
board_build.esp-idf.extra_lf_files =
25-
components/memfault-firmware-sdk/ports/esp_idf/memfault/common/memfault_esp_freertos.lf
26-
2734
; add coredump flash partition
2835
board_build.partitions = partitions_example.csv
2936

@@ -39,14 +46,11 @@ monitor_speed = 115200
3946
; manually include the freertos_trace.h
4047
build_flags =
4148
-Isrc/memfault
42-
-Icomponents/memfault-firmware-sdk/components/include
43-
-include components/memfault-firmware-sdk/ports/include/memfault/ports/freertos_trace.h
49+
-Ithird-party/memfault-firmware-sdk/components/include
50+
-include third-party/memfault-firmware-sdk/ports/include/memfault/ports/freertos_trace.h
4451

4552
[env:espidf]
4653
framework = espidf
47-
platform_packages =
48-
; get specific ESP-IDF version (5.1.2)
49-
framework-espidf@^3.50102.240122
5054

5155
[env:arduino]
5256
framework = arduino, espidf

third-party/memfault-firmware-sdk

Submodule memfault-firmware-sdk added at 130dc3a

0 commit comments

Comments
 (0)