Addressed review comments

* Moved MINIMAL_LIBC config to mcuboot defaults * Brought back setting lock feature map, but changed the value from 0x101 to 0x181 (added COTA support) Additionally fixed Zephyr unit tests: * Changed main return type from void to main for Zephyr unit tests runner. * Added decreasing pool size conditionally to not affect tests * Fixed exiting the tests to prevent abort.
project-chip · Nov 2, 2023 · ed91a79 · ed91a79
1 parent 9df56c0
commit ed91a79
Show file tree

Hide file tree

Showing 20 changed files with 14 additions and 50 deletions.
diff --git a/config/nrfconnect/chip-module/Kconfig.mcuboot.defaults b/config/nrfconnect/chip-module/Kconfig.mcuboot.defaults
@@ -43,6 +43,10 @@ config FLASH
 config FPROTECT
     default y
 
+choice LIBC_IMPLEMENTATION
+    default MINIMAL_LIBC
+endchoice
+
 # nRF7002DK uses SPI NOR external flash
 if BOARD_NRF7002DK_NRF5340_CPUAPP
 

diff --git a/examples/all-clusters-app/nrfconnect/child_image/mcuboot/prj_dfu.conf b/examples/all-clusters-app/nrfconnect/child_image/mcuboot/prj_dfu.conf
@@ -28,6 +28,3 @@ CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_USE_SEGGER_RTT=n
-
-# Use minimal C library instead of the Picolib
-CONFIG_MINIMAL_LIBC=y
diff --git a/examples/all-clusters-app/nrfconnect/child_image/mcuboot/prj_release.conf b/examples/all-clusters-app/nrfconnect/child_image/mcuboot/prj_release.conf
@@ -28,6 +28,3 @@ CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_USE_SEGGER_RTT=n
-
-# Use minimal C library instead of the Picolib
-CONFIG_MINIMAL_LIBC=y
diff --git a/examples/all-clusters-minimal-app/nrfconnect/child_image/mcuboot/prj_dfu.conf b/examples/all-clusters-minimal-app/nrfconnect/child_image/mcuboot/prj_dfu.conf
@@ -28,6 +28,3 @@ CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_USE_SEGGER_RTT=n
-
-# Use minimal C library instead of the Picolib
-CONFIG_MINIMAL_LIBC=y
diff --git a/examples/all-clusters-minimal-app/nrfconnect/child_image/mcuboot/prj_release.conf b/examples/all-clusters-minimal-app/nrfconnect/child_image/mcuboot/prj_release.conf
@@ -28,6 +28,3 @@ CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_USE_SEGGER_RTT=n
-
-# Use minimal C library instead of the Picolib
-CONFIG_MINIMAL_LIBC=y
diff --git a/examples/light-switch-app/nrfconnect/child_image/mcuboot/prj.conf b/examples/light-switch-app/nrfconnect/child_image/mcuboot/prj.conf
@@ -28,6 +28,3 @@ CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_GPIO=n
-
-# Use minimal C library instead of the Picolib
-CONFIG_MINIMAL_LIBC=y
diff --git a/examples/light-switch-app/nrfconnect/child_image/mcuboot/prj_release.conf b/examples/light-switch-app/nrfconnect/child_image/mcuboot/prj_release.conf
@@ -28,6 +28,3 @@ CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_GPIO=n
-
-# Use minimal C library instead of the Picolib
-CONFIG_MINIMAL_LIBC=y
diff --git a/examples/lighting-app/nrfconnect/child_image/mcuboot/prj.conf b/examples/lighting-app/nrfconnect/child_image/mcuboot/prj.conf
@@ -28,6 +28,3 @@ CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_GPIO=n
-
-# Use minimal C library instead of the Picolib
-CONFIG_MINIMAL_LIBC=y
diff --git a/examples/lighting-app/nrfconnect/child_image/mcuboot/prj_release.conf b/examples/lighting-app/nrfconnect/child_image/mcuboot/prj_release.conf
@@ -28,6 +28,3 @@ CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_GPIO=n
-
-# Use minimal C library instead of the Picolib
-CONFIG_MINIMAL_LIBC=y
diff --git a/examples/lock-app/nrfconnect/child_image/mcuboot/prj.conf b/examples/lock-app/nrfconnect/child_image/mcuboot/prj.conf
@@ -28,6 +28,3 @@ CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_GPIO=n
-
-# Use minimal C library instead of the Picolib
-CONFIG_MINIMAL_LIBC=y
diff --git a/examples/lock-app/nrfconnect/child_image/mcuboot/prj_release.conf b/examples/lock-app/nrfconnect/child_image/mcuboot/prj_release.conf
@@ -28,6 +28,3 @@ CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_GPIO=n
-
-# Use minimal C library instead of the Picolib
-CONFIG_MINIMAL_LIBC=y
diff --git a/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp b/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp
@@ -126,5 +126,9 @@ void emberAfDoorLockClusterInitCallback(EndpointId endpoint)
     logOnFailure(DoorLock::Attributes::NumberOfCredentialsSupportedPerUser::Set(endpoint, CONFIG_LOCK_NUM_CREDENTIALS_PER_USER),
                  "number of credentials per user");
 
+    // Set FeatureMap to (kUser|kPinCredential), default is:
+    // (kUser|kAccessSchedules|kRfidCredential|kPinCredential) 0x113
+    logOnFailure(DoorLock::Attributes::FeatureMap::Set(endpoint, 0x181), "feature map");
+
     AppTask::Instance().UpdateClusterState(BoltLockMgr().GetState(), BoltLockManager::OperationSource::kUnspecified);
 }
diff --git a/examples/pump-app/nrfconnect/child_image/mcuboot/prj.conf b/examples/pump-app/nrfconnect/child_image/mcuboot/prj.conf
@@ -28,6 +28,3 @@ CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_USE_SEGGER_RTT=n
-
-# Use minimal C library instead of the Picolib
-CONFIG_MINIMAL_LIBC=y
diff --git a/examples/pump-app/nrfconnect/child_image/mcuboot/prj_release.conf b/examples/pump-app/nrfconnect/child_image/mcuboot/prj_release.conf
@@ -28,6 +28,3 @@ CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_USE_SEGGER_RTT=n
-
-# Use minimal C library instead of the Picolib
-CONFIG_MINIMAL_LIBC=y
diff --git a/examples/pump-controller-app/nrfconnect/child_image/mcuboot/prj.conf b/examples/pump-controller-app/nrfconnect/child_image/mcuboot/prj.conf
@@ -28,6 +28,3 @@ CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_USE_SEGGER_RTT=n
-
-# Use minimal C library instead of the Picolib
-CONFIG_MINIMAL_LIBC=y
diff --git a/examples/pump-controller-app/nrfconnect/child_image/mcuboot/prj_release.conf b/examples/pump-controller-app/nrfconnect/child_image/mcuboot/prj_release.conf
@@ -28,6 +28,3 @@ CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_USE_SEGGER_RTT=n
-
-# Use minimal C library instead of the Picolib
-CONFIG_MINIMAL_LIBC=y
diff --git a/examples/window-app/nrfconnect/child_image/mcuboot/prj.conf b/examples/window-app/nrfconnect/child_image/mcuboot/prj.conf
@@ -28,6 +28,3 @@ CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_USE_SEGGER_RTT=n
-
-# Use minimal C library instead of the Picolib
-CONFIG_MINIMAL_LIBC=y
diff --git a/examples/window-app/nrfconnect/child_image/mcuboot/prj_release.conf b/examples/window-app/nrfconnect/child_image/mcuboot/prj_release.conf
@@ -28,6 +28,3 @@ CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_USE_SEGGER_RTT=n
-
-# Use minimal C library instead of the Picolib
-CONFIG_MINIMAL_LIBC=y
diff --git a/src/platform/nrfconnect/SystemPlatformConfig.h b/src/platform/nrfconnect/SystemPlatformConfig.h
@@ -47,6 +47,8 @@ struct ChipDeviceEvent;
 #define CHIP_SYSTEM_CONFIG_USE_LWIP 0
 #define CHIP_SYSTEM_CONFIG_USE_SOCKETS 1
 
+#ifndef CONFIG_ARCH_POSIX
 #define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 8
+#endif
 
 // ========== Platform-specific Configuration Overrides =========
diff --git a/src/test_driver/nrfconnect/main/runner.cpp b/src/test_driver/nrfconnect/main/runner.cpp
@@ -19,6 +19,8 @@
 #include <lib/support/UnitTestRegistration.h>
 #include <platform/CHIPDeviceLayer.h>
 
+#include <unistd.h>
+
 #include <zephyr/logging/log.h>
 #include <zephyr/settings/settings.h>
 
@@ -27,13 +29,13 @@ using namespace ::chip::DeviceLayer;
 
 LOG_MODULE_REGISTER(runner, CONFIG_MATTER_LOG_LEVEL);
 
-extern "C" void main(void)
+extern "C" int main(void)
 {
     VerifyOrDie(settings_subsys_init() == 0);
 
     LOG_INF("Starting CHIP tests!");
     int status = RunRegisteredUnitTests();
     LOG_INF("CHIP test status: %d", status);
 
-    exit(status);
+    _exit(status);
 }