Merge branch 'main' into fouge/zephyr-4.0.0

worldcoin · Feb 14, 2025 · 9d1ec76 · 9d1ec76
2 parents 13f8c3a + 10d44ee
commit 9d1ec76
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1,3 +1,3 @@
 VERSION_MAJOR=2
-VERSION_MINOR=2
-VERSION_PATCH=4
+VERSION_MINOR=3
+VERSION_PATCH=2
diff --git a/main_board/release.conf b/main_board/release.conf
@@ -53,4 +53,5 @@ CONFIG_MEMFAULT_COREDUMP_FULL_THREAD_STACKS=n
 CONFIG_MEMFAULT_COREDUMP_STACK_SIZE_TO_COLLECT=512
 CONFIG_MEMFAULT_COREDUMP_COLLECT_BSS_REGIONS=y
 CONFIG_MEMFAULT_COREDUMP_COLLECT_STACK_REGIONS=y
+CONFIG_MEMFAULT_PLATFORM_LOG_FALLBACK_TO_PRINTK=n
 CONFIG_THREAD_RUNTIME_STATS=y