Memfault Firmware SDK 0.43.3 (Build 2200)

Memfault Inc · Memfault Inc · commit efd97b97a314 · 2023-05-22T14:19:24.000Z
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,28 @@
+### Changes between Memfault SDK 0.43.3 and 0.43.2 - May 22, 2023
+
+#### :chart_with_upwards_trend: Improvements
+
+- Zephyr:
+
+  - Add more granular Kconfig settings to control what's collected in
+    [`memfault_zephyr_coredump_get_regions()`](ports/zephyr/common/memfault_platform_coredump_regions.c).
+    Default settings are identical to before this change.
+
+    - `CONFIG_MEMFAULT_COREDUMP_COLLECT_STACK_REGIONS`
+    - `CONFIG_MEMFAULT_COREDUMP_COLLECT_KERNEL_REGION`
+    - `CONFIG_MEMFAULT_COREDUMP_COLLECT_TASKS_REGIONS`
+
+  - Fix a build error when an application is configured without
+    `CONFIG_HEAP_MEM_POOL_SIZE=y` (i.e. no `kmalloc` in use).
+
+- Fix a build error when building the
+  [nRF9160 example](examples/nrf-connect-sdk/nrf9160) on nRF-Connect SDK v2.3.0.
+
+- ESP-IDF:
+
+  - Add support for upcoming v5.1 release of the ESP-IDF SDK
+  - Add support in the [ESP32 example app](examples/esp32) for the ESP32-C6 chip
+
 ### Changes between Memfault SDK 0.43.2 and 0.43.1 - May 3, 2023
 
 #### :chart_with_upwards_trend: Improvements
diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-BUILD ID: 2071
-GIT COMMIT: b1c0f7c97
+BUILD ID: 2200
+GIT COMMIT: dd058e1ee
diff --git a/components/include/memfault/version.h b/components/include/memfault/version.h
@@ -19,7 +19,7 @@ typedef struct {
   uint8_t patch;
 } sMfltSdkVersion;
 
-#define MEMFAULT_SDK_VERSION   { .major = 0, .minor = 43, .patch = 2 }
+#define MEMFAULT_SDK_VERSION   { .major = 0, .minor = 43, .patch = 3 }
 
 #ifdef __cplusplus
 }
diff --git a/examples/esp32/apps/memfault_demo_app/main/Kconfig.projbuild b/examples/esp32/apps/memfault_demo_app/main/Kconfig.projbuild
@@ -33,7 +33,7 @@ config MEMFAULT_APP_WIFI_AUTOJOIN
 
 choice BLINK_LED
     prompt "Blink LED type"
-    default BLINK_LED_GPIO if IDF_TARGET_ESP32
+    default BLINK_LED_GPIO if IDF_TARGET_ESP32 || !SOC_RMT_SUPPORTED
     default BLINK_LED_RMT
     help
         Defines the default peripheral for blink example
@@ -50,6 +50,7 @@ config BLINK_LED_RMT_CHANNEL
     range 0 7
     default 0
     help
+        Note: this is only used if ESP-IDF version is < 5.0. See led.c.
         Set the RMT peripheral channel.
         ESP32 RMT channel from 0 to 7
         ESP32-S2 RMT channel from 0 to 3
@@ -59,16 +60,16 @@ config BLINK_LED_RMT_CHANNEL
 config BLINK_GPIO
     int "Blink GPIO number"
     range 0 48
-    default 8 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32H2
+    default 5 if IDF_TARGET_ESP32
     default 18 if IDF_TARGET_ESP32S2
     default 48 if IDF_TARGET_ESP32S3
-    default 5
+    default 8
     help
         GPIO number (IOxx) to blink on and off or the RMT signal for the addressable LED.
         Some GPIOs are used for other purposes (flash connections, etc.) and cannot be used to blink.
 
 # esp32c3 specific settings
-if IDF_TARGET_ESP32C3
+if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C6
     # Default optimize for size due to increase in binary size
     # This can be changed in root -> Compiler Options
     # The choice and prompt lines are required and must match the esp-idf definition
diff --git a/examples/esp32/apps/memfault_demo_app/main/cmd_system.c b/examples/esp32/apps/memfault_demo_app/main/cmd_system.c
@@ -21,7 +21,6 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "sdkconfig.h"
-#include "soc/rtc_cntl_reg.h"
 
 #ifdef CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS
   #define WITH_TASKS_INFO 1
@@ -30,7 +29,6 @@
 static void register_free();
 static void register_heap_dump();
 static void register_restart();
-static void register_make();
 #if WITH_TASKS_INFO
 static void register_tasks();
 #endif
@@ -39,7 +37,6 @@ void register_system() {
   register_free();
   register_heap_dump();
   register_restart();
-  register_make();
 #if WITH_TASKS_INFO
   register_tasks();
 #endif
@@ -122,105 +119,3 @@ static void register_tasks() {
 }
 
 #endif  // WITH_TASKS_INFO
-
-/** This command helps maintain sanity when testing console example from a console */
-
-static int make(int argc, char** argv) {
-  int count = REG_READ(RTC_CNTL_STORE0_REG);
-  if (++count >= 3) {
-    printf("This is not the console you are looking for.\n");
-    return 0;
-  }
-  REG_WRITE(RTC_CNTL_STORE0_REG, count);
-
-  const char* make_output =
-    R"(LD build/console.elf
-esptool.py v2.1-beta1
-)";
-
-  const char* flash_output[] = {
-    R"(Flashing binaries to serial port (*) (app at offset 0x10000)...
-esptool.py v2.1-beta1
-Connecting....
-)",
-    R"(Chip is ESP32D0WDQ6 (revision 0)
-Uploading stub...
-Running stub...
-Stub running...
-Changing baud rate to 921600
-Changed.
-Configuring flash size...
-Auto-detected Flash size: 4MB
-Flash params set to 0x0220
-Compressed 15712 bytes to 9345...
-)",
-    R"(Wrote 15712 bytes (9345 compressed) at 0x00001000 in 0.1 seconds (effective 1126.9 kbit/s)...
-Hash of data verified.
-Compressed 333776 bytes to 197830...
-)",
-    R"(Wrote 333776 bytes (197830 compressed) at 0x00010000 in 3.3 seconds (effective 810.3 kbit/s)...
-Hash of data verified.
-Compressed 3072 bytes to 82...
-)",
-    R"(Wrote 3072 bytes (82 compressed) at 0x00008000 in 0.0 seconds (effective 1588.4 kbit/s)...
-Hash of data verified.
-Leaving...
-Hard resetting...
-)"};
-
-  const char* monitor_output =
-    R"(MONITOR
-)" LOG_COLOR_W R"(--- idf_monitor on (*) 115200 ---
---- Quit: Ctrl+] | Menu: Ctrl+T | Help: Ctrl+T followed by Ctrl+H --
-)" LOG_RESET_COLOR;
-
-  bool need_make = false;
-  bool need_flash = false;
-  bool need_monitor = false;
-  for (int i = 1; i < argc; ++i) {
-    if (strcmp(argv[i], "all") == 0) {
-      need_make = true;
-    } else if (strcmp(argv[i], "flash") == 0) {
-      need_make = true;
-      need_flash = true;
-    } else if (strcmp(argv[i], "monitor") == 0) {
-      need_monitor = true;
-    } else if (argv[i][0] == '-') {
-      /* probably -j option */
-    } else if (isdigit((int)argv[i][0])) {
-      /* might be an argument to -j */
-    } else {
-      printf("make: *** No rule to make target `%s'.  Stop.\n", argv[i]);
-      /* Technically this is an error, but let's not spoil the output */
-      return 0;
-    }
-  }
-  if (argc == 1) {
-    need_make = true;
-  }
-  if (need_make) {
-    printf("%s", make_output);
-  }
-  if (need_flash) {
-    size_t n_items = sizeof(flash_output) / sizeof(flash_output[0]);
-    for (int i = 0; i < n_items; ++i) {
-      printf("%s", flash_output[i]);
-      vTaskDelay(200 / portTICK_PERIOD_MS);
-    }
-  }
-  if (need_monitor) {
-    printf("%s", monitor_output);
-    esp_restart();
-  }
-  return 0;
-}
-
-static void register_make() {
-  const esp_console_cmd_t cmd = {
-    .command = "make",
-    .help = NULL, /* hide from 'help' output */
-    .hint = "all | flash | monitor",
-    .func = &make,
-  };
-  ESP_ERROR_CHECK(esp_console_cmd_register(&cmd));
-}
diff --git a/examples/esp32/apps/memfault_demo_app/main/idf_component.yml b/examples/esp32/apps/memfault_demo_app/main/idf_component.yml
@@ -9,4 +9,4 @@ dependencies:
     version: "^2.0.0"
     rules: # will add dependency only when all if clauses are True
       - if: "idf_version >=5.0" # supports all SimpleSpec grammars (https://python-semanticversion.readthedocs.io/en/latest/reference.html#semantic_version.SimpleSpec)
-      - if: "target in [esp32s2, esp32s3, esp32c3]" # supports boolean operator ==, !=, in, not in.
+      - if: "target not in [esp32]" # supports boolean operator ==, !=, in, not in.
diff --git a/examples/nrf-connect-sdk/nrf9160/memfault_demo_app/CMakeLists.txt b/examples/nrf-connect-sdk/nrf9160/memfault_demo_app/CMakeLists.txt
@@ -92,10 +92,14 @@ else() # nRF Connect SDK Version >= 1.8.0
   # in v1.8+, use the modem_info library to get the IMEI for device_serial
   set(CONFIG_MODEM_INFO y CACHE INTERNAL "")
 
-  # 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 "")
+  # pre-2.3.0, SPM (Secure Partition Manager) can be used instead of the default
+  # TFM, and results in nicer backtraces in certain cases, so select it here.
+  if (${NCS_VERSION_MAJOR}.${NCS_VERSION_MINOR}.${NCS_VERSION_PATCH} VERSION_LESS 2.2.99)
+    # 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()
 endif()
 
 # Required for app to compile against nRF Connect SDK <= v1.2
diff --git a/examples/nrf-connect-sdk/nrf9160/memfault_demo_app/west.yml b/examples/nrf-connect-sdk/nrf9160/memfault_demo_app/west.yml
@@ -2,7 +2,7 @@ manifest:
   projects:
     - name: nrf
       url: https://github.com/nrfconnect/sdk-nrf
-      revision: v2.0.2
+      revision: v2.2.0
       import: true
       import:
         path-blocklist: modules/lib/memfault-firmware-sdk
diff --git a/examples/zephyr/qemu/qemu-app/Kconfig b/examples/zephyr/qemu/qemu-app/Kconfig
@@ -13,7 +13,13 @@ config ZEPHYR_MEMFAULT_EXAMPLE_THREAD_TOGGLE
 config ZEPHYR_MEMFAULT_EXAMPLE_MEMORY_METRICS
     bool "Use metrics to monitor memory usage in the example app"
     default y
-    depends on MEMFAULT && THREAD_STACK_INFO
+    depends on MEMFAULT && MEMFAULT_HEAP_STATS && THREAD_STACK_INFO
+
+config ZEPHYR_MEMFAULT_EXAMPLE_SOFTWARE_VERSION
+    string "Software Version"
+    default "1.0.0"
+    help
+      The software version to report to Memfault.
 
 endmenu
 
diff --git a/examples/zephyr/qemu/qemu-app/prj.conf b/examples/zephyr/qemu/qemu-app/prj.conf
@@ -22,9 +22,14 @@ CONFIG_LOG_BACKEND_UART=y
 # be useful if the board doesn't have a UART available.
 CONFIG_SHELL_LOG_BACKEND=n
 
-CONFIG_SYS_HEAP_RUNTIME_STATS=y
+# Enable heap stats explicitly. It's enabled by default when heap is enabled,
+# see below, but in a default app, it won't be enabled because heap is disabled.
+# For this reference example, we select it explicitly.
+CONFIG_MEMFAULT_HEAP_STATS=y
 
-# Increase the heap pool and main stack sizes for the example app
+# Increase the heap pool and main stack sizes for the example app. Setting a
+# non-zero memory pool size is required for heap stats, otherwise there's no
+# k_malloc used
 CONFIG_HEAP_MEM_POOL_SIZE=4096
 CONFIG_MAIN_STACK_SIZE=4096
 
diff --git a/examples/zephyr/qemu/qemu-app/src/main.c b/examples/zephyr/qemu/qemu-app/src/main.c
@@ -61,7 +61,8 @@ void memfault_platform_get_device_info(sMemfaultDeviceInfo *info) {
   *info = (sMemfaultDeviceInfo){
     .device_serial = "DEMOSERIAL",
     .software_type = "zephyr-app",
-    .software_version = "1.0.0+" ZEPHYR_MEMFAULT_EXAMPLE_GIT_SHA1,
+    .software_version =
+      CONFIG_ZEPHYR_MEMFAULT_EXAMPLE_SOFTWARE_VERSION "+" ZEPHYR_MEMFAULT_EXAMPLE_GIT_SHA1,
     .hardware_version = CONFIG_BOARD,
   };
 }
diff --git a/ports/esp_idf/memfault/CMakeLists.txt b/ports/esp_idf/memfault/CMakeLists.txt
@@ -119,10 +119,11 @@ list(APPEND COMPONENT_REQUIRES
     soc
     spi_flash
     console
+    driver
 )
 
 if($ENV{MEMFAULT_ESP_HTTP_CLIENT_ENABLE})
-list(APPEND COMPONENT_REQUIRES esp_http_client)
+list(APPEND COMPONENT_REQUIRES esp_http_client esp_https_ota)
 endif()
 register_component()
 
diff --git a/ports/esp_idf/memfault/common/memfault_platform_demo_cli_cmds.c b/ports/esp_idf/memfault/common/memfault_platform_demo_cli_cmds.c
@@ -37,6 +37,11 @@ static void IRAM_ATTR prv_recursive_crash(int depth) {
     MEMFAULT_ASSERT_RECORD(depth);
   }
 
+  if (depth == 15) {
+    // unreachable; this is to silence -Winfinite-recursion
+    return;
+  }
+
   // an array to create some stack depth variability
   int dummy_array[depth + 1];
   for (size_t i = 0; i < MEMFAULT_ARRAY_SIZE(dummy_array); i++) {
diff --git a/ports/esp_idf/memfault/v4.x/Memfault-esp-idf-compat.cmake b/ports/esp_idf/memfault/v4.x/Memfault-esp-idf-compat.cmake
@@ -2,4 +2,9 @@ function(mflt_esp32_component_get_target var component_dir)
     set(${var} ${COMPONENT_LIB} PARENT_SCOPE)
 endfunction()
 
-set(MEMFAULT_ESP_IDF_VERSION_SPECIFIC_REQUIRES esp32 espcoredump)
+set(MEMFAULT_ESP_IDF_VERSION_SPECIFIC_REQUIRES
+    esp32
+    espcoredump
+    esp_timer
+    esp_wifi
+)
diff --git a/ports/esp_idf/memfault/v5.x/Memfault-esp-idf-compat.cmake b/ports/esp_idf/memfault/v5.x/Memfault-esp-idf-compat.cmake
@@ -2,4 +2,9 @@ function(mflt_esp32_component_get_target var component_dir)
     set(${var} ${COMPONENT_LIB} PARENT_SCOPE)
 endfunction()
 
-set(MEMFAULT_ESP_IDF_VERSION_SPECIFIC_REQUIRES espcoredump)
+set(MEMFAULT_ESP_IDF_VERSION_SPECIFIC_REQUIRES
+    espcoredump
+    esp_partition
+    esp_timer
+    esp_wifi
+)
diff --git a/ports/freertos/src/memfault_freertos_ram_regions.c b/ports/freertos/src/memfault_freertos_ram_regions.c
diff --git a/ports/zephyr/Kconfig b/ports/zephyr/Kconfig
diff --git a/ports/zephyr/common/memfault_demo_cli.c b/ports/zephyr/common/memfault_demo_cli.c
diff --git a/ports/zephyr/common/memfault_platform_coredump_regions.c b/ports/zephyr/common/memfault_platform_coredump_regions.c
diff --git a/ports/zephyr/include/memfault/ports/zephyr/coredump.h b/ports/zephyr/include/memfault/ports/zephyr/coredump.h
diff --git a/requirements.txt b/requirements.txt
diff --git a/scripts/cmsis_pack_bundle.py b/scripts/cmsis_pack_bundle.py

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ typedef struct {`
`19`	`19`	`uint8_t patch;`
`20`	`20`	`} sMfltSdkVersion;`
`21`	`21`
`22`		`-#define MEMFAULT_SDK_VERSION { .major = 0, .minor = 43, .patch = 2 }`
	`22`	`+#define MEMFAULT_SDK_VERSION { .major = 0, .minor = 43, .patch = 3 }`
`23`	`23`
`24`	`24`	`#ifdef __cplusplus`
`25`	`25`	`}`