Skip to content

Commit e97d27d

Browse files
committed
Revert "[nrf toup][nrfconnect] Introduced Kconfigs to configure few params"
This reverts commit 2b9dc09. Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
1 parent 616c07d commit e97d27d

File tree

2 files changed

+3
-55
lines changed

2 files changed

+3
-55
lines changed

config/nrfconnect/chip-module/Kconfig

-36
Original file line numberDiff line numberDiff line change
@@ -302,42 +302,6 @@ config CHIP_PERSISTENT_SUBSCRIPTIONS
302302
# selecting experimental for this feature since there is an issue with multiple controllers.
303303
select EXPERIMENTAL
304304

305-
config CHIP_MAX_FABRICS
306-
int "Maximum number of Matter fabrics"
307-
default 5
308-
help
309-
The maximum number of Matter fabrics that device can be joined to.
310-
311-
config CHIP_MAX_ACTIVE_CASE_CLIENTS
312-
int "Maximum number of outgoing CASE sessions"
313-
default CHIP_MAX_FABRICS if CHIP_PERSISTENT_SUBSCRIPTIONS
314-
default 2
315-
help
316-
The maximum number of outgoing CASE sessions that can be simutaneously handled by the end device.
317-
318-
config CHIP_MAX_ACTIVE_DEVICES
319-
int "Maximum number of simultaneous connections over CASE"
320-
default CHIP_MAX_FABRICS if CHIP_PERSISTENT_SUBSCRIPTIONS
321-
default 4
322-
help
323-
The maximum number of devices to which the Server implementers will be able to
324-
concurrently connect over CASE and interact with.
325-
326-
config CHIP_SUBSCRIPTION_RESUMPTION_MIN_RETRY_INTERVAL
327-
int "Minimum subscrpition resumption interval in seconds"
328-
default 20 if CHIP_PERSISTENT_SUBSCRIPTIONS
329-
default 300
330-
help
331-
The minimum interval in seconds before resuming a subsciption that timed out.
332-
333-
config CHIP_SUBSCRIPTION_RESUMPTION_RETRY_MULTIPLIER
334-
int "The multiplier for suscription resumption retry in seconds"
335-
default 40 if CHIP_PERSISTENT_SUBSCRIPTIONS
336-
default 300
337-
help
338-
The multiplier per subscription resumption retry attempt that is multiplied by the index of Fibonacci sequence
339-
and added to CHIP_SUBSCRIPTION_RESUMPTION_MIN_RETRY_INTERVAL to obtain final wait time for next retry.
340-
341305
config CHIP_ENABLE_BDX_LOG_TRANSFER
342306
bool "Enable BDX transfer for diagnostic logs"
343307
help

src/platform/nrfconnect/CHIPPlatformConfig.h

+3-19
Original file line numberDiff line numberDiff line change
@@ -77,25 +77,9 @@
7777
#define CHIP_CONFIG_BDX_MAX_NUM_TRANSFERS 1
7878
#endif // CHIP_CONFIG_BDX_MAX_NUM_TRANSFERS
7979

80-
#ifdef CONFIG_CHIP_MAX_FABRICS
81-
#define CHIP_CONFIG_MAX_FABRICS CONFIG_CHIP_MAX_FABRICS
82-
#endif // CONFIG_CHIP_MAX_FABRICS
83-
84-
#ifdef CONFIG_CHIP_MAX_ACTIVE_CASE_CLIENTS
85-
#define CHIP_CONFIG_DEVICE_MAX_ACTIVE_CASE_CLIENTS CONFIG_CHIP_MAX_ACTIVE_CASE_CLIENTS
86-
#endif // CONFIG_CHIP_MAX_ACTIVE_CASE_CLIENTS
87-
88-
#ifdef CONFIG_CHIP_MAX_ACTIVE_DEVICES
89-
#define CHIP_CONFIG_DEVICE_MAX_ACTIVE_DEVICES CONFIG_CHIP_MAX_ACTIVE_DEVICES
90-
#endif // CONFIG_CHIP_MAX_ACTIVE_DEVICES
91-
92-
#ifdef CONFIG_CHIP_SUBSCRIPTION_RESUMPTION_MIN_RETRY_INTERVAL
93-
#define CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION_MIN_RETRY_INTERVAL_SECS CONFIG_CHIP_SUBSCRIPTION_RESUMPTION_MIN_RETRY_INTERVAL
94-
#endif // CONFIG_CHIP_SUBSCRIPTION_RESUMPTION_MIN_RETRY_INTERVAL
95-
96-
#ifdef CONFIG_CHIP_SUBSCRIPTION_RESUMPTION_RETRY_MULTIPLIER
97-
#define CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION_WAIT_TIME_MULTIPLIER_SECS CONFIG_CHIP_SUBSCRIPTION_RESUMPTION_RETRY_MULTIPLIER
98-
#endif // CONFIG_CHIP_SUBSCRIPTION_RESUMPTION_RETRY_MULTIPLIER
80+
#ifndef CHIP_CONFIG_MAX_FABRICS
81+
#define CHIP_CONFIG_MAX_FABRICS 5
82+
#endif
9983

10084
#ifdef CONFIG_CHIP_LOG_SIZE_OPTIMIZATION
10185
// Disable some of the too detailed log modules to save flash

0 commit comments

Comments
 (0)