Skip to content

Commit 36a6345

Browse files
author
Memfault Inc
committed
Memfault Firmware SDK 0.32.2 (Build 494632)
1 parent 7eafab4 commit 36a6345

File tree

4 files changed

+18
-4
lines changed

4 files changed

+18
-4
lines changed

CHANGES.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
### Changes between Memfault SDK 0.32.2 and SDK 0.32.1 - Aug 16, 2022
2+
3+
#### :chart_with_upwards_trend: Improvements
4+
5+
- Zephyr port: added a fix for upcoming Zephyr 3.2 compatibility, thanks
6+
@nordicjm for the fix!
7+
18
### Changes between Memfault SDK 0.32.1 and SDK 0.32.0 - Aug 8, 2022
29

310
#### :house: Internal

VERSION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
BUILD ID: 490385
2-
GIT COMMIT: aeb8e3734
1+
BUILD ID: 494632
2+
GIT COMMIT: b2b683510

components/include/memfault/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ typedef struct {
1919
uint8_t patch;
2020
} sMfltSdkVersion;
2121

22-
#define MEMFAULT_SDK_VERSION { .major = 0, .minor = 32, .patch = 1 }
22+
#define MEMFAULT_SDK_VERSION { .major = 0, .minor = 32, .patch = 2 }
2323

2424
#ifdef __cplusplus
2525
}

ports/zephyr/common/memfault_logging.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,16 @@ static void prv_log_panic(struct log_backend const *const backend);
5555
// -Wincompatible-pointer-types between versions
5656
static void prv_log_init();
5757

58+
5859
// LOG2 was added in Zephyr 2.6:
5960
// https://github.com/zephyrproject-rtos/zephyr/commit/f1bb20f6b43b8b241e45f3f132f0e7bbfc65401b
60-
#if MEMFAULT_ZEPHYR_VERSION_GT(2, 5)
61+
// LOG2 was moved to LOG in Zephyr 3.2
62+
// https://github.com/zephyrproject-rtos/zephyr/issues/46500
63+
#if MEMFAULT_ZEPHYR_VERSION_GT(3, 1)
64+
static void prv_log_process(const struct log_backend *const backend, union log_msg_generic *msg) {
65+
log_output_msg_process(&s_log_output_mflt, &msg->log, g_flags);
66+
}
67+
#elif MEMFAULT_ZEPHYR_VERSION_GT(2, 5)
6168
// Additional processing for log2 output
6269
static void prv_log_process(const struct log_backend *const backend, union log_msg2_generic *msg) {
6370
log_output_msg2_process(&s_log_output_mflt, &msg->log, g_flags);

0 commit comments

Comments
 (0)