Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nrfconnect] Added kconfig option to enable extended discovery #18367

Merged
merged 1 commit into from
May 13, 2022
Merged

[nrfconnect] Added kconfig option to enable extended discovery #18367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions config/nrfconnect/chip-module/Kconfig.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,11 @@ config CHIP_QSPI_NOR
bool
default y

# Enable extended discovery
config CHIP_EXTENDED_DISCOVERY
bool
default y
bzbarsky-apple marked this conversation as resolved.
Show resolved Hide resolved

# Enable OpenThread

config NET_L2_OPENTHREAD
Expand Down
6 changes: 6 additions & 0 deletions config/zephyr/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,12 @@ config CHIP_OTA_IMAGE_INCLUDE_MCUBOOT

endif

config CHIP_EXTENDED_DISCOVERY
bool "Enable extended discovery"
help
Enables the device to advertise commissionable service when not in the
commissioning mode.

module = MATTER
module-str = Matter
source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"
Expand Down
2 changes: 0 additions & 2 deletions examples/all-clusters-app/nrfconnect/main/include/CHIPProjectConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,3 @@
#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00

#define CHIP_DEVICE_CONFIG_SED_IDLE_INTERVAL 2000_ms32

#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
2 changes: 0 additions & 2 deletions examples/chef/nrfconnect/CHIPProjectConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,3 @@
#define CHIP_CONFIG_ENABLE_ARG_PARSER 1

#define CHIP_DEVICE_CONFIG_DISABLE_SHELL_PING 1

#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
1 change: 0 additions & 1 deletion examples/light-switch-app/nrfconnect/main/include/CHIPProjectConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,3 @@
#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00
#define CHIP_DEVICE_CONFIG_SED_IDLE_INTERVAL 2000_ms32
#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
2 changes: 0 additions & 2 deletions examples/lighting-app/nrfconnect/main/include/CHIPProjectConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,3 @@
// Use a default pairing code if one hasn't been provisioned in flash.
#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00

#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
2 changes: 0 additions & 2 deletions examples/lock-app/nrfconnect/main/include/CHIPProjectConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,3 @@
#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00

#define CHIP_DEVICE_CONFIG_SED_IDLE_INTERVAL 2000_ms32

#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
2 changes: 0 additions & 2 deletions examples/pump-app/nrfconnect/main/include/CHIPProjectConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,3 @@
// Use a default pairing code if one hasn't been provisioned in flash.
#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00

#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
2 changes: 0 additions & 2 deletions examples/pump-controller-app/nrfconnect/main/include/CHIPProjectConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,3 @@
// Use a default pairing code if one hasn't been provisioned in flash.
#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021
#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR 0xF00

#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
4 changes: 4 additions & 0 deletions src/platform/nrfconnect/CHIPDevicePlatformConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,3 +126,7 @@
#ifdef CONFIG_CHIP_DEVICE_TYPE
#define CHIP_DEVICE_CONFIG_DEVICE_TYPE CONFIG_CHIP_DEVICE_TYPE
#endif // CONFIG_CHIP_DEVICE_TYPE

#ifdef CONFIG_CHIP_EXTENDED_DISCOVERY
#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1
#endif // CONFIG_CHIP_EXTENDED_DISCOVERY