Memfault Firmware SDK 0.33.5 (Build 161)

Author: Memfault Inc

CHANGES.md

@@ -1,3 +1,24 @@
+### Changes between Memfault SDK 0.33.4 and SDK 0.33.5 - Oct 19, 2022
+
+#### :chart_with_upwards_trend: Improvements
+
+- nRF-Connect: Update the nRF9160 example application,
+  `examples/nrf-connect-sdk/nrf9160`, to build and run correctly with
+  nRF-Connect SDK v2.1.0
+- Zephyr: Add an example Zephyr application targeting the QEMU board
+- ESP-IDF:
+  - Add a configuration option for setting the ESP-IDF HTTP client timeout value
+  - Fix compilation for the ESP32-S3. _Note: coredumps are currently only
+    supported on the ESP32, not the ESP32-S2, -S3, or -C3. This change only
+    fixes compiling for the -S3 platform_
+  - Add support for ESP-IDF v4.2.3
+
+#### :house: Internal
+
+- Support building the unit tests with GCC 12
+- Miscellaneous fixes to unit test infrastructure to better support building in
+  Mac OSX
+
 ### Changes between Memfault SDK 0.33.3 and SDK 0.33.4 - Sept 15, 2022
 
 #### :chart_with_upwards_trend: Improvements

VERSION

@@ -1,2 +1,2 @@
-BUILD ID: 518181
-GIT COMMIT: 091f1bf24
+BUILD ID: 161
+GIT COMMIT: d4c377659

components/include/memfault/version.h

@@ -19,7 +19,7 @@ typedef struct {
   uint8_t patch;
 } sMfltSdkVersion;
 
-#define MEMFAULT_SDK_VERSION   { .major = 0, .minor = 33, .patch = 4 }
+#define MEMFAULT_SDK_VERSION   { .major = 0, .minor = 33, .patch = 5 }
 
 #ifdef __cplusplus
 }

examples/esp32/README.md

@@ -10,7 +10,7 @@ The Memfault SDK has been tested to be compatible with these versions of
 ESP-IDF:
 
 - v3.x release series
-- v4.x release series through v4.4.1
+- v4.x release series through v4.4.2
 
 Other versions may be also be compatible but have not been verified by Memfault.
 
@@ -59,7 +59,7 @@ We assume you have a working setup for the
    ```bash
    cd examples/esp32/
    rm -rf esp-idf
-   git clone -b v4.2.2 --recursive https://github.com/espressif/esp-idf.git esp-idf
+   git clone -b v4.2.4 --recursive https://github.com/espressif/esp-idf.git esp-idf
    cd esp-idf
    export IDF_TOOLS_PATH=$(pwd)
    # you may need to install the sdk tools by running ./install.sh here

examples/nrf-connect-sdk/nrf9160/memfault_demo_app/CMakeLists.txt

@@ -94,6 +94,8 @@ else() # nRF Connect SDK Version >= 1.8.0
 
   # Use SPM instead of TFM for Secure Firmware as TFM does not (yet) support forwarding of fault handlers
   set(CONFIG_BUILD_WITH_TFM n CACHE INTERNAL "")
+  # Explicitly set SPM=y because as of nRF Connect >= 2.1.0 it is marked as deprecated and no longer enabled by default
+  set(CONFIG_SPM y CACHE INTERNAL "")
 endif()
 
 # Required for app to compile against nRF Connect SDK <= v1.2

examples/nrf-connect-sdk/nrf9160/memfault_demo_app/src/watchdog.c

@@ -13,7 +13,9 @@
 #include <version.h>
 #include <zephyr.h>
 
-#include "memfault/core/debug_log.h"
+#include "memfault/components.h"
+
+#include "memfault/ports/zephyr/version.h"
 
 //! Note: The timeout must be large enough to give us enough time to capture a coredump
 //! before the system resets
@@ -25,10 +27,18 @@
 K_THREAD_STACK_DEFINE(s_wdt_task_stack_area, WATCHDOG_TASK_STACK_SIZE);
 struct k_thread my_thread_data;
 
-#if KERNEL_VERSION_MAJOR == 2 && KERNEL_VERSION_MINOR < 2
-static struct device *s_wdt = NULL;
-#else
+#if MEMFAULT_ZEPHYR_VERSION_GT(3,1)
+// Between Zephyr 3.1 and 3.2, "label" properties in DTS started to get phased out:
+//   https://github.com/zephyrproject-rtos/zephyr/pull/48360
+//
+// This breaks support for accessing device tree information via device_get_binding / DT_LABEL
+// properties. The new preferred approach is accessing resources via the DEVICE_DT_GET macro
+static const struct device *s_wdt = DEVICE_DT_GET(DT_NODELABEL(wdt));
+
+#elif MEMFAULT_ZEPHYR_VERSION_GT(2,1)
 static const struct device *s_wdt = NULL;
+#else // Zephyr Kernel <= 2.1
+static struct device *s_wdt = NULL;
 #endif
 
 #if KERNEL_VERSION_MAJOR == 2 && KERNEL_VERSION_MINOR < 3
@@ -75,11 +85,18 @@ static void prv_wdt_task(void *arg1, void *arg2, void *arg3) {
 void memfault_demo_app_watchdog_boot(void) {
   MEMFAULT_LOG_DEBUG("Initializing WDT Subsystem");
 
+#if MEMFAULT_ZEPHYR_VERSION_GT(3,1)
+  if (!device_is_ready(s_wdt)) {
+    printk("Watchdog device not ready");
+    return;
+  }
+#else // Zephyr <= 3.1
   s_wdt = device_get_binding(WDT_DEV_NAME);
   if (s_wdt == NULL) {
     printk("No WDT device available\n");
     return;
   }
+#endif
 
   struct wdt_timeout_cfg wdt_config = {
     /* Reset SoC when watchdog timer expires. */

examples/zephyr/.gitignore

@@ -0,0 +1,6 @@
+/.west
+/bootloader
+/build
+/modules
+/tools
+/zephyr

examples/zephyr/qemu/.gitignore

@@ -0,0 +1,30 @@
+# Example Memfault Zephyr QEMU application
+
+Based on https://github.com/zephyrproject-rtos/example-application , this
+provides a minimal reference for Memfault integration.
+
+## Usage
+
+After setting up a zephyr development environment
+(https://docs.zephyrproject.org/latest/getting_started/index.html), you can run
+the following commands to test the application:
+
+```shell
+# initialize this project
+❯ west init -l qemu-app
+❯ west update
+
+# build the target program
+# highly recommend '-DCONFIG_QEMU_ICOUNT=n' otherwise the guest runs too fast
+❯ west build -b qemu_cortex_m3 --pristine=always zephyr-memfault-example/app -- -DCONFIG_QEMU_ICOUNT=n
+❯ west build -t run
+
+*** Booting Zephyr OS build zephyr-v3.1.0  ***
+[00:00:00.000,000] <inf> mflt: GNU Build ID: a3f2f5da83bc62ceb0351f88a8b30d5cdab59ae9
+[00:00:00.000,000] <inf> main: Memfault Demo App! Board qemu_cortex_m3
+
+[00:00:00.000,000] <inf> mflt: S/N: DEMOSERIAL
+[00:00:00.000,000] <inf> mflt: SW type: zephyr-app
+[00:00:00.000,000] <inf> mflt: SW version: 1.0.0-dev
+[00:00:00.000,000] <inf> mflt: HW version: qemu_cortex_m3
+```

examples/zephyr/qemu/README.md

@@ -0,0 +1,31 @@
+# This CMake file is picked by the Zephyr build system because it is defined as
+# the module CMake entry point (see zephyr/module.yml).
+
+# The Zephyr includes moved from /include to /include/zephyr in Zephyr 3.2:
+# https://github.com/zephyrproject-rtos/zephyr/commit/53ef68d4598b2f9005c5da3fc0b860ca1999d350
+# Add the old path for backwards compatibility. Note that Zephyr itself supports
+# the Kconfig option 'CONFIG_LEGACY_INCLUDE_PATH' to enable the same
+# compatibility behavior, but it's marked as deprecated and to be removed in the
+# future, so just apply the compatibiltiy fix here.
+if(${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}.${KERNEL_PATCHLEVEL}
+   VERSION_GREATER_EQUAL
+   "3.1.99"
+)
+  zephyr_include_directories(${ZEPHYR_BASE}/include/zephyr)
+  # Set this to suppress a nuisance error warning about deprecated include paths
+  zephyr_compile_options(-DCONFIG_LEGACY_INCLUDE_PATH=y)
+endif()
+
+
+EXECUTE_PROCESS(
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  COMMAND git rev-parse --short HEAD
+  RESULT_VARIABLE commit_sha1
+  OUTPUT_VARIABLE ZEPHYR_MEMFAULT_EXAMPLE_GIT_SHA1
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+  COMMAND_ERROR_IS_FATAL ANY
+)
+
+zephyr_compile_definitions(
+  ZEPHYR_MEMFAULT_EXAMPLE_GIT_SHA1=\"${ZEPHYR_MEMFAULT_EXAMPLE_GIT_SHA1}\"
+)