Skip to content

Commit ae77446

Browse files
author
Memfault Inc
committed
Memfault Firmware SDK 1.5.1 (Build 4929)
1 parent 8cd5dc1 commit ae77446

File tree

8 files changed

+37
-20
lines changed

8 files changed

+37
-20
lines changed

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
# Memfault Firmware SDK Changelog
22

3+
## [1.5.1] - 2023-12-07
4+
5+
### :chart_with_upwards_trend: Improvements
6+
7+
- nRF-Connect SDK:
8+
9+
- Correct a build error that occurs when `CONFIG_DOWNLOAD_CLIENT=y` +
10+
`CONFIG_MEMFAULT_FOTA=n`. This fixes the second issue reported in
11+
[#66](https://github.com/memfault/memfault-firmware-sdk/issues/66#issuecomment-1845301737)
12+
13+
### :boom: Breaking Changes
14+
15+
- General:
16+
17+
- The SDK config flag `MEMFAULT_EVENT_STORAGE_NV_SUPPORT_ENABLED` now defaults
18+
to `0`, disabled. This saves a minor amount of code space. Most
19+
implementations don't need the feature; for users that require it, the flag
20+
will now need to be set in `memfault_platform_config.h` as
21+
`#define MEMFAULT_EVENT_STORAGE_NV_SUPPORT_ENABLED 1`.
22+
323
## [1.5.0] - 2023-11-29
424

525
### :rocket: New Features

VERSION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
BUILD ID: 4793
2-
GIT COMMIT: 06d69b79b
3-
VERSION: 1.5.0
1+
BUILD ID: 4929
2+
GIT COMMIT: 138e44883
3+
VERSION: 1.5.1

components/include/memfault/default_config.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,11 @@ extern "C" {
161161
#define MEMFAULT_EVENT_STORAGE_READ_BATCHING_ENABLED 0
162162
#endif
163163

164-
//! Enables support for the non-volatile event storage at compile time
165-
//! instead of dynamically at runtime
166-
//!
167-
//! Disabling this feature saves several hundred bytes of codespace and can be useful to enable for
168-
//! extremely constrained environments
164+
//! Enables support for non-volatile event storage. At run-time the non-volatile
165+
//! storage must be enabled before use. See nonvolatile_event_storage.h for
166+
//! details.
169167
#ifndef MEMFAULT_EVENT_STORAGE_NV_SUPPORT_ENABLED
170-
#define MEMFAULT_EVENT_STORAGE_NV_SUPPORT_ENABLED 1
168+
#define MEMFAULT_EVENT_STORAGE_NV_SUPPORT_ENABLED 0
171169
#endif
172170

173171
#if MEMFAULT_EVENT_STORAGE_READ_BATCHING_ENABLED != 0

components/include/memfault/version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ typedef struct {
1919
uint8_t patch;
2020
} sMfltSdkVersion;
2121

22-
#define MEMFAULT_SDK_VERSION { .major = 1, .minor = 5, .patch = 0 }
23-
#define MEMFAULT_SDK_VERSION_STR "1.5.0"
22+
#define MEMFAULT_SDK_VERSION { .major = 1, .minor = 5, .patch = 1 }
23+
#define MEMFAULT_SDK_VERSION_STR "1.5.1"
2424

2525
#ifdef __cplusplus
2626
}

examples/nrf-connect-sdk/nrf9160/memfault_demo_app/west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ manifest:
22
projects:
33
- name: nrf
44
url: https://github.com/nrfconnect/sdk-nrf
5-
revision: v2.2.0
5+
revision: v2.4.0
66
import: true
77
import:
88
path-blocklist: modules/lib/memfault-firmware-sdk

ports/zephyr/ncs/CMakeLists.txt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@ if(CONFIG_MEMFAULT_NRF_CONNECT_SDK)
1212
add_subdirectory(src)
1313
zephyr_include_directories(include)
1414

15-
if (NCS_VERSION_MAJOR)
16-
# Note: Starting in nRF Connect SDK >= 1.3, NCS_VERSION_* fields are exposed
17-
if (${NCS_VERSION_MAJOR}.${NCS_VERSION_MINOR}.${NCS_VERSION_PATCH} GREATER_EQUAL 2.4.0)
18-
# We wrap download_client_get() in order to register multiple root certificates
19-
# See comment in src/memfault_fota.c for more details
20-
zephyr_ld_options(-Wl,--wrap=download_client_get)
21-
endif()
15+
# Note: Starting in nRF Connect SDK >= 1.3, NCS_VERSION_* fields are exposed.
16+
# Prior to that, they're unset and cause the GREATER_EQUAL check to be falsy
17+
if (CONFIG_MEMFAULT_FOTA AND (${NCS_VERSION_MAJOR}.${NCS_VERSION_MINOR}.${NCS_VERSION_PATCH} GREATER_EQUAL 2.4.0))
18+
# We wrap download_client_get() in order to register multiple root certificates
19+
# See comment in src/memfault_fota.c for more details
20+
zephyr_ld_options(-Wl,--wrap=download_client_get)
2221
endif()
2322

2423
endif()

tests/makefiles/Makefile_memfault_event_storage.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ TEST_SRC_FILES = \
1414

1515
CPPUTEST_CPPFLAGS += -DMEMFAULT_TEST_PERSISTENT_EVENT_STORAGE_DISABLE=0
1616
CPPUTEST_CPPFLAGS += -DMEMFAULT_EVENT_STORAGE_READ_BATCHING_ENABLED=0
17+
CPPUTEST_CPPFLAGS += -DMEMFAULT_EVENT_STORAGE_NV_SUPPORT_ENABLED=1
1718

1819
include $(CPPUTEST_MAKFILE_INFRA)

tests/makefiles/Makefile_memfault_event_storage_no_persistent_storage.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@ TEST_SRC_FILES = \
1414

1515
CPPUTEST_CPPFLAGS += -DMEMFAULT_TEST_PERSISTENT_EVENT_STORAGE_DISABLE=1
1616
CPPUTEST_CPPFLAGS += -DMEMFAULT_EVENT_STORAGE_READ_BATCHING_ENABLED=0
17-
CPPUTEST_CPPFLAGS += -DMEMFAULT_EVENT_STORAGE_NV_SUPPORT_ENABLED=0
1817

1918
include $(CPPUTEST_MAKFILE_INFRA)

0 commit comments

Comments
 (0)