matter: Fix Kconfig compliance

ArekBalysNordic · ArekBalysNordic · commit 348e20ee5ef0 · 2025-10-20T09:23:47.000+02:00
Fixed several Zephyr guidelines compliance issues in Matter.

Signed-off-by: Arkadiusz Balys &lt;arkadiusz.balys@nordicsemi.no&gt;
diff --git a/applications/matter_bridge/Kconfig b/applications/matter_bridge/Kconfig
@@ -33,18 +33,18 @@ choice BRIDGED_DEVICE_IMPLEMENTATION
 	prompt "Bridged Device implementation"
 	default BRIDGED_DEVICE_SIMULATED
 
-	config BRIDGED_DEVICE_SIMULATED
-		bool "Simulated Bridged Device"
-		help
-		  Enables using simulated bridged devices that do not perform
-		  real operations, but emulate exemplary data to imitate the real
-		  device behavior.
-
-	config BRIDGED_DEVICE_BT
-		bool "Bluetooth LE Bridged Device"
-		help
-		  Enables using real bridged devices that communicate with the Matter bridge device
-		  over Bluetooth LE.
+config BRIDGED_DEVICE_SIMULATED
+	bool "Simulated Bridged Device"
+	help
+	  Enables using simulated bridged devices that do not perform
+	  real operations, but emulate exemplary data to imitate the real
+	  device behavior.
+
+config BRIDGED_DEVICE_BT
+	bool "Bluetooth LE Bridged Device"
+	help
+	  Enables using real bridged devices that communicate with the Matter bridge device
+	  over Bluetooth LE.
 
 endchoice
 
@@ -54,17 +54,17 @@ choice BRIDGED_DEVICE_SIMULATED_ONOFF_IMPLEMENTATION
 	prompt "Simulated bridged onoff device implementation"
 	default BRIDGED_DEVICE_SIMULATED_ONOFF_SHELL
 
-	config BRIDGED_DEVICE_SIMULATED_ONOFF_AUTOMATIC
-		bool "Automatically simulated bridged onoff device"
-		help
-		  Enables using simulated bridged onoff device that
-		  automatically changes its state periodically.
+config BRIDGED_DEVICE_SIMULATED_ONOFF_AUTOMATIC
+	bool "Automatically simulated bridged onoff device"
+	help
+	  Enables using simulated bridged onoff device that
+	  automatically changes its state periodically.
 
-	config BRIDGED_DEVICE_SIMULATED_ONOFF_SHELL
-		bool "Shell controlled simulated bridged onoff device"
-		help
-		  Enables using simulated bridged onoff device that is
-		  controlled by shell commands.
+config BRIDGED_DEVICE_SIMULATED_ONOFF_SHELL
+	bool "Shell controlled simulated bridged onoff device"
+	help
+	  Enables using simulated bridged onoff device that is
+	  controlled by shell commands.
 
 endchoice
 
@@ -160,8 +160,7 @@ config NCS_SAMPLE_MATTER_PERSISTENT_STORAGE
 	default y
 
 config BRIDGE_SMART_PLUG_SUPPORT
-	bool "Enables additional endpoint implementing Matter smart plug functionality"
-	default n
+	bool "Additional endpoint implementing Matter smart plug functionality"
 
 # Sample configuration used for Thread networking
 if OPENTHREAD
diff --git a/samples/matter/common/src/Kconfig b/samples/matter/common/src/Kconfig
@@ -25,7 +25,7 @@ config NCS_SAMPLE_MATTER_CUSTOM_BLUETOOTH_ADVERTISING
 	  allow to use the custom one.
 
 config NCS_SAMPLE_MATTER_OPERATIONAL_KEYS_MIGRATION_TO_ITS
-	bool "Enable operational keys migration feature"
+	bool "Operational keys migration feature"
 	depends on CHIP_CRYPTO_PSA
 	help
 	  Enables migration of the operational keys stored in the persistent storage to the PSA ITS secure storage.
@@ -41,7 +41,7 @@ config NCS_SAMPLE_MATTER_FACTORY_RESET_ON_KEY_MIGRATION_FAILURE
 	  properly to PSA ITS storage.
 
 config NCS_SAMPLE_MATTER_LEDS
-	bool "Enable LEDs usage"
+	bool "LEDs usage"
 	default y
 	depends on DK_LIBRARY
 	help
@@ -108,7 +108,7 @@ config NCS_SAMPLE_MATTER_ZAP_FILE_PATH
 	  It shall contain the file name and .zap extension.
 
 config NCS_SAMPLE_MATTER_CERTIFICATION
-	bool "Enable patches required for Matter platform certification"
+	bool "Patches for Matter platform certification"
 	help
 	  It enables including software patches required for the Matter platform certification
 	  purposes. Currently it works only with the Matter template sample.
diff --git a/samples/matter/common/src/bridge/Kconfig b/samples/matter/common/src/bridge/Kconfig
@@ -21,10 +21,10 @@ config BRIDGE_AGGREGATOR_ENDPOINT_ID
 	default 1
 
 config BRIDGE_MIGRATE_PRE_2_7_0
-	bool "Enable migration of bridged device data stored in old scheme from pre nRF SDK 2.7.0 releases"
+	bool "Migration of bridged device data stored in old scheme from pre nRF SDK 2.7.0 releases"
 
 config BRIDGE_MIGRATE_VERSION_1
-	bool "Enable migration of bridged device data stored in version 1 of new scheme"
+	bool "Migration of bridged device data stored in version 1 of new scheme"
 	default y
 
 if BRIDGED_DEVICE_BT
diff --git a/samples/matter/common/src/diagnostic/Kconfig b/samples/matter/common/src/diagnostic/Kconfig
@@ -5,7 +5,7 @@
 #
 
 menuconfig NCS_SAMPLE_MATTER_DIAGNOSTIC_LOGS
-	bool "Enable diagnostics logs support"
+	bool "Diagnostics logs support"
 	imply CHIP_ENABLE_BDX_LOG_TRANSFER
 	help
 	  Provides support for diagnostics logs. Diagnostics logs allow the Matter controller to read end-user,
diff --git a/samples/matter/common/src/watchdog/Kconfig b/samples/matter/common/src/watchdog/Kconfig
@@ -11,47 +11,47 @@ menuconfig NCS_SAMPLE_MATTER_WATCHDOG
 if NCS_SAMPLE_MATTER_WATCHDOG
 
 config NCS_SAMPLE_MATTER_WATCHDOG_PAUSE_IN_SLEEP
-    bool "Pause watchdog while CPU is in sleep state"
-    help
-        If enabled, the watchdog will be paused while the CPU is in idle (sleep) state.
+	bool "Pause watchdog while CPU is in sleep state"
+	help
+	  If enabled, the watchdog will be paused while the CPU is in idle (sleep) state.
 
 config NCS_SAMPLE_MATTER_WATCHDOG_PAUSE_ON_DEBUG
-    bool "Pause watchdog while the CPU is halted by the debugger"
-    default y
-    help
-        If disabled, the watchdog will not be paused while the CPU is halted by the debugger and
-        the device reset will be triggered, if the feeding signal is not received within the
-        specified time.
+	bool "Pause watchdog while the CPU is halted by the debugger"
+	default y
+	help
+	  If disabled, the watchdog will not be paused while the CPU is halted by the debugger and
+	  the device reset will be triggered, if the feeding signal is not received within the
+	  specified time.
 
 config NCS_SAMPLE_MATTER_WATCHDOG_DEFAULT
-    bool "Use watchdog object dedicated for Main and Matter threads"
-    default y
-    help
-        The default watchdog objects are created in the matter_init.cpp file.
-        The watchdog objects are dedicated for Main and Matter threads and are initialized
-        using the NCS_SAMPLE_MATTER_WATCHDOG_DEFAULT_FEED_TIME value.
+	bool "Use watchdog object dedicated for Main and Matter threads"
+	default y
+	help
+	  The default watchdog objects are created in the matter_init.cpp file.
+	  The watchdog objects are dedicated for Main and Matter threads and are initialized
+	  using the NCS_SAMPLE_MATTER_WATCHDOG_DEFAULT_FEED_TIME value.
 
 config NCS_SAMPLE_MATTER_WATCHDOG_TIMEOUT
-    int "Default maximum window time in milliseconds for receiving the feeding signal"
-    default 600000 # 10 minutes
-    help
-        The default maximum window time defines a time within which the feeding signal must be received
-        from all created Watchdog sources to reset the watchdog object's timer.
-        If the signals come after elapsing this time, the watchdog timer will not be reset and the
-        reboot occur.
+	int "Default maximum window time in milliseconds for receiving the feeding signal"
+	default 600000 # 10 minutes
+	help
+	  The default maximum window time defines a time within which the feeding signal must be received
+	  from all created Watchdog sources to reset the watchdog object's timer.
+	  If the signals come after elapsing this time, the watchdog timer will not be reset and the
+	  reboot occur.
 
 config NCS_SAMPLE_MATTER_WATCHDOG_DEFAULT_FEED_TIME
-    int "Default interval of feeding time in milliseconds"
-    default 300000 # 5 minutes
-    help
+	int "Default interval of feeding time in milliseconds"
+	default 300000 # 5 minutes
+	help
 	  The default interval in milliseconds for calling the feeding callback if it exists.
 
 config NCS_SAMPLE_MATTER_WATCHDOG_EVENT_TRIGGERS
-    bool "Enables default event triggers for watchdog purposes"
-    default y
-    depends on NCS_SAMPLE_MATTER_TEST_EVENT_TRIGGERS
-    help
-        Enables test event triggers to block Main and Matter stacks for the specific amount of time
-        and test Watchdog in this way.
+	bool "Default event triggers for watchdog purposes"
+	default y
+	depends on NCS_SAMPLE_MATTER_TEST_EVENT_TRIGGERS
+	help
+	  Enables test event triggers to block Main and Matter stacks for the specific amount of time
+	  and test Watchdog in this way.
 
 endif # NCS_SAMPLE_MATTER_WATCHDOG
diff --git a/samples/matter/lock/Kconfig b/samples/matter/lock/Kconfig
@@ -53,7 +53,7 @@ config LOCK_MAX_HOLIDAY_SCHEDULES
 endif
 
 config LOCK_ENABLE_DEBUG
-	bool "Enable debug features to print users and credentials"
+	bool "Debug features to print users and credentials"
 	depends on SHELL
 	help
 	  Debug features allows to checking and printing current users, their state, and
diff --git a/samples/openthread/cli/Kconfig b/samples/openthread/cli/Kconfig
@@ -13,7 +13,7 @@ module-str = ot_cli
 source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config"
 
 config CLI_SAMPLE_LOW_POWER
-	bool "Enable low power mode for the CLI sample"
+	bool "Low power mode for the CLI sample"
 
 config CLI_SAMPLE_MULTIPROTOCOL
-	bool "Enable multiprotocol for the CLI sample"
+	bool "Multiprotocol for the CLI sample"
diff --git a/samples/openthread/coprocessor/Kconfig b/samples/openthread/coprocessor/Kconfig
@@ -13,5 +13,5 @@ module-str = ot_coprocessor
 source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config"
 
 config RCP_SAMPLE_HCI
-	bool "Enable  Bluetooth HCI USB support for the coprocessor sample"
+	bool "Bluetooth HCI USB support for the coprocessor sample"
 	select EXPERIMENTAL
diff --git a/west.yml b/west.yml
@@ -157,7 +157,7 @@ manifest:
     - name: matter
       repo-path: sdk-connectedhomeip
       path: modules/lib/matter
-      revision: 0b6bdd7a8f5836d61a5be36ef4f046387ba9e7e7
+      revision: 48881b605a42d7b3e1db48a060be4ea7cdd8d65f
       west-commands: scripts/west/west-commands.yml
       submodules:
         - name: nlio

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#`
`6`	`6`
`7`	`7`	`menuconfig NCS_SAMPLE_MATTER_DIAGNOSTIC_LOGS`
`8`		`- bool "Enable diagnostics logs support"`
	`8`	`+ bool "Diagnostics logs support"`
`9`	`9`	`imply CHIP_ENABLE_BDX_LOG_TRANSFER`
`10`	`10`	`help`
`11`	`11`	`Provides support for diagnostics logs. Diagnostics logs allow the Matter controller to read end-user,`