Memfault Firmware SDK 1.2.3 (Build 3471)

Author: Memfault Inc

CHANGES.md

@@ -1,5 +1,16 @@
 # Memfault Firmware SDK Changelog
 
+## 1.2.3 - Sept 12, 2023
+
+- General:
+  - Include the current MCU SDK version in the http client user agent header
+- Zephyr:
+  - Update include paths for CMSIS headers for upcoming Zephyr support. Thanks
+    @gmarull for the patch!
+- Modus Toolbox:
+  - Allow a user application to override
+    `memfault_metrics_heartbeat_collect_data`.
+
 ## 1.2.2 - Sept 5, 2023
 
 ### :chart_with_upwards_trend: Improvements

VERSION

@@ -1,2 +1,2 @@
-BUILD ID: 3403
-GIT COMMIT: 6563e08b6
+BUILD ID: 3471
+GIT COMMIT: 3ebeeaa65

components/http/src/memfault_http_utils.c

@@ -19,6 +19,7 @@
 #include "memfault/core/math.h"
 #include "memfault/core/platform/device_info.h"
 #include "memfault/http/http_client.h"
+#include "memfault/version.h"
 
 //! Default buffer size for the URL-encoded device info parameters. This may
 //! need to be set higher by the user if there are particularly long device info
@@ -60,7 +61,7 @@ static bool prv_write_host_hdr(MfltHttpClientSendCb write_callback, void *ctx,
 }
 
 static bool prv_write_user_agent_hdr(MfltHttpClientSendCb write_callback, void *ctx) {
-  #define USER_AGENT_HDR "User-Agent:MemfaultSDK/0.4.2\r\n"
+  #define USER_AGENT_HDR "User-Agent:MemfaultSDK/" MEMFAULT_SDK_VERSION_STR "\r\n"
   const size_t user_agent_hdr_len = MEMFAULT_STATIC_STRLEN(USER_AGENT_HDR);
   return write_callback(USER_AGENT_HDR, user_agent_hdr_len, ctx);
 }

components/include/memfault/version.h

@@ -19,8 +19,8 @@ typedef struct {
   uint8_t patch;
 } sMfltSdkVersion;
 
-#define MEMFAULT_SDK_VERSION   { .major = 1, .minor = 2, .patch = 2 }
-#define MEMFAULT_SDK_VERSION_STR "1.2.2"
+#define MEMFAULT_SDK_VERSION   { .major = 1, .minor = 2, .patch = 3 }
+#define MEMFAULT_SDK_VERSION_STR "1.2.3"
 
 #ifdef __cplusplus
 }

ports/cypress/psoc6/memfault_platform_core.c

@@ -33,7 +33,7 @@
 static cy_wcm_wlan_statistics_t s_last_wlan_statistics = { 0 };
 #endif
 
-void memfault_metrics_heartbeat_port_collect_data(void) {
+void memfault_metrics_heartbeat_collect_sdk_data(void) {
 #if MEMFAULT_PORT_MEMORY_TRACKING_ENABLED
 #if defined(__GNUC__) && !defined(__ARMCC_VERSION)
 
@@ -81,7 +81,6 @@ void memfault_metrics_heartbeat_port_collect_data(void) {
 #endif /* MEMFAULT_PORT_WIFI_TRACKING_ENABLED */
 }
 
-
 #if MEMFAULT_PORT_WIFI_TRACKING_ENABLED
 
 static void prv_wcm_event_cb(cy_wcm_event_t event, cy_wcm_event_data_t *event_data) {
@@ -135,11 +134,6 @@ void memfault_wcm_metrics_boot(void) {
 
 #endif /* MEMFAULT_PORT_WIFI_TRACKING_ENABLED */
 
-void memfault_metrics_heartbeat_collect_data(void) {
-  memfault_metrics_heartbeat_port_collect_data();
-}
-
-
 MEMFAULT_WEAK
 void memfault_platform_reboot(void) {
   NVIC_SystemReset();

ports/zephyr/common/memfault_platform_coredump_regions.c

@@ -15,7 +15,9 @@
 #include "memfault/panics/platform/coredump.h"
 #include "memfault/ports/zephyr/version.h"
 
-#if MEMFAULT_ZEPHYR_VERSION_GT(2, 1)
+#if MEMFAULT_ZEPHYR_VERSION_GT(3, 4)
+  #include <cmsis_core.h>
+#elif MEMFAULT_ZEPHYR_VERSION_GT(2, 1)
   #include MEMFAULT_ZEPHYR_INCLUDE(arch/arm/aarch32/cortex_m/cmsis.h)
 #else
   #include MEMFAULT_ZEPHYR_INCLUDE(arch/arm/cortex_m/cmsis.h)

tests/src/test_memfault_http_utils.cpp

@@ -97,7 +97,7 @@ TEST(MfltHttpClientUtils, Test_MfltHttpClientPost) {
   const char *expected_string =
       "POST /api/v0/chunks/DEMOSERIAL HTTP/1.1\r\n"
       "Host:chunks.memfault.com\r\n"
-      "User-Agent:MemfaultSDK/0.4.2\r\n"
+      "User-Agent:MemfaultSDK/0.0.0\r\n"
       "Memfault-Project-Key:00112233445566778899aabbccddeeff\r\n"
       "Content-Type:application/octet-stream\r\n"
       "Content-Length:123\r\n\r\n";
@@ -129,7 +129,7 @@ TEST(MfltHttpClientUtils, Test_MfltHttpClientGetOtaPayloadUrl) {
   const char *expected_string =
       "GET /api/v0/releases/latest/url?&device_serial=DEMOSERIAL&hardware_version=main-proto&software_type=main&current_version=1.0.0 HTTP/1.1\r\n"
       "Host:device.memfault.com\r\n"
-      "User-Agent:MemfaultSDK/0.4.2\r\n"
+      "User-Agent:MemfaultSDK/0.0.0\r\n"
       "Memfault-Project-Key:00112233445566778899aabbccddeeff\r\n"
       "\r\n";
 
@@ -172,7 +172,7 @@ TEST(MfltHttpClientUtils, Test_MfltHttpClientGetOtaPayload) {
   const char *expected_string =
       "GET /path/to/ota/payload/yay HTTP/1.1\r\n"
       "Host:example.ota.payload.com\r\n"
-      "User-Agent:MemfaultSDK/0.4.2\r\n"
+      "User-Agent:MemfaultSDK/0.0.0\r\n"
       "\r\n";
 
   STRCMP_EQUAL(expected_string, ctx.buf);
@@ -190,7 +190,7 @@ TEST(MfltHttpClientUtils, Test_MfltHttpClientGetOtaPayloadNoPath) {
   const char *expected_string =
       "GET / HTTP/1.1\r\n"
       "Host:example.ota.payload.com\r\n"
-      "User-Agent:MemfaultSDK/0.4.2\r\n"
+      "User-Agent:MemfaultSDK/0.0.0\r\n"
       "\r\n";
 
   STRCMP_EQUAL(expected_string, ctx.buf);