From 087af4d0b6ae093318230054ef71ea595b685c6c Mon Sep 17 00:00:00 2001
From: Memfault Inc <hello@memfault.com>
Date: Fri, 7 Mar 2025 01:02:03 +0000
Subject: [PATCH] Memfault Firmware SDK 1.21.1 (Build 12975)

---
 CHANGELOG.md                                 | 12 ++++++++++++
 VERSION                                      |  6 +++---
 components/include/memfault/default_config.h |  5 +++--
 components/include/memfault/version.h        |  4 ++--
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1edf0a935..b6c9648bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.21.1] - 2025-03-07
+
+### 🐛 Fixed
+
+- General:
+
+  - Disable `MEMFAULT_LOG_TIMESTAMPS_ENABLE` by default. The new timestamped log
+    feature was enabled by default in the previous release, but only logs
+    embedded in coredumps are fully supported. Logs captured with
+    `memfault_log_trigger_collection()` do not yet support timestamps, so the
+    feature should not be used in production until that support is added.
+
 ## [1.21.0] - 2025-03-06
 
 ### 📈 Added
diff --git a/VERSION b/VERSION
index 42368d4d3..8e32d36bf 100644
--- a/VERSION
+++ b/VERSION
@@ -1,3 +1,3 @@
-BUILD ID: 12963
-GIT COMMIT: 3dabeb442c
-VERSION: 1.21.0
+BUILD ID: 12975
+GIT COMMIT: b107685f75
+VERSION: 1.21.1
diff --git a/components/include/memfault/default_config.h b/components/include/memfault/default_config.h
index 8bb35782c..e13a54c9e 100644
--- a/components/include/memfault/default_config.h
+++ b/components/include/memfault/default_config.h
@@ -166,9 +166,10 @@ extern "C" {
 #endif
 
 //! Enable log line timestamps, when memfault_platform_time_get_current() is
-//! available.
+//! available. Currently timestamps are only decoded from logs embedded in
+//! coredumps.
 #ifndef MEMFAULT_LOG_TIMESTAMPS_ENABLE
-  #define MEMFAULT_LOG_TIMESTAMPS_ENABLE 1
+  #define MEMFAULT_LOG_TIMESTAMPS_ENABLE 0
 #endif
 
 //! Controls whether or not multiple events will be batched into a single
diff --git a/components/include/memfault/version.h b/components/include/memfault/version.h
index f9e920cfd..ea8758ff9 100644
--- a/components/include/memfault/version.h
+++ b/components/include/memfault/version.h
@@ -20,8 +20,8 @@ typedef struct {
 } sMfltSdkVersion;
 
 #define MEMFAULT_SDK_VERSION \
-  { .major = 1, .minor = 21, .patch = 0 }
-#define MEMFAULT_SDK_VERSION_STR "1.21.0"
+  { .major = 1, .minor = 21, .patch = 1 }
+#define MEMFAULT_SDK_VERSION_STR "1.21.1"
 
 #ifdef __cplusplus
 }