Skip to content

Commit

Permalink
Remove leftover rendezvous bypass bits. (#16597)
Browse files Browse the repository at this point in the history
We no longer really support this non-spec-compliant mode of operation;
remove the bits of it still scattered around the tree.
bzbarsky-apple authored Mar 24, 2022
1 parent 2eafcfb commit 4d6858b
Showing 47 changed files with 15 additions and 223 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/examples-linux-standalone.yaml
Original file line number Diff line number Diff line change
@@ -90,8 +90,7 @@ jobs:
- name: Build example Standalone All Clusters Server
timeout-minutes: 5
run: |
scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/all_clusters_debug \
chip_bypass_rendezvous=true
scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/all_clusters_debug
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
linux debug all-clusters-app \
out/all_clusters_debug/chip-all-clusters-app \
1 change: 0 additions & 1 deletion config/ameba/args.gni
Original file line number Diff line number Diff line change
@@ -29,7 +29,6 @@ chip_build_tests = false
chip_inet_config_enable_tcp_endpoint = true
chip_inet_config_enable_udp_endpoint = true

chip_bypass_rendezvous = false
chip_config_network_layer_ble = true

custom_toolchain = "//third_party/connectedhomeip/config/ameba/toolchain:ameba"
1 change: 0 additions & 1 deletion config/mbed/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -275,7 +275,6 @@ chip_gn_arg_bool ("chip_build_tests" CONFIG_CHIP_BUILD_TEST
chip_gn_arg_bool ("chip_monolithic_tests" CONFIG_CHIP_BUILD_TESTS)
chip_gn_arg_bool ("chip_build_libshell" CONFIG_CHIP_LIB_SHELL)
chip_gn_arg_bool ("chip_with_platform_mbedtls" CONFIG_CHIP_WITH_EXTERNAL_MBEDTLS)
chip_gn_arg_bool ("chip_bypass_rendezvous" CONFIG_CHIP_BYPASS_RENDEZVOUS)
chip_gn_arg_bool ("chip_build_pw_rpc_lib" CONFIG_CHIP_PW_RPC)
chip_gn_arg_bool ("chip_enable_data_model" CONFIG_CHIP_DATA_MODEL)
if (CONFIG_CHIP_PW_RPC)
2 changes: 0 additions & 2 deletions examples/all-clusters-app/ameba/README.md
Original file line number Diff line number Diff line change
@@ -65,7 +65,6 @@ There are two commissioning modes supported by Ameba platform:

1. In "connectedhomeip/config/ameba/args.gni"

- set `chip_bypass_rendezvous = false`
- Set `chip_config_network_layer_ble = true`

2. In "connectedhomeip/src/platform/Ameba/CHIPDevicePlatformConfig.h"
@@ -82,7 +81,6 @@ There are two commissioning modes supported by Ameba platform:

1. In "connectedhomeip/config/ameba/args.gni"

- set `chip_bypass_rendezvous = false`
- Set `chip_config_network_layer_ble = false`

2. In "connectedhomeip/src/platform/Ameba/CHIPDevicePlatformConfig.h"
8 changes: 2 additions & 6 deletions examples/all-clusters-app/esp32/README.md
Original file line number Diff line number Diff line change
@@ -148,18 +148,14 @@ that are currently supported include `ESP32-DevKitC` (default),

## Commissioning and cluster control

Commissioning can be carried out using WiFi, BLE or Bypass.
Commissioning can be carried out using WiFi or BLE.

1. Set the `Rendezvous Mode` for commissioning using menuconfig; the default
Rendezvous mode is BLE.

$ idf.py menuconfig

Select the Rendezvous Mode via `Demo -> Rendezvous Mode`. If Rendezvous Mode is
ByPass then set the credentials of the WiFi Network (i.e. SSID and Password from
menuconfig).

`idf.py menuconfig -> Component config -> CHIP Device Layer -> WiFi Station Options`
Select the Rendezvous Mode via `Demo -> Rendezvous Mode`.

NOTE: to avoid build error
`undefined reference to 'chip::DevelopmentCerts::kDacPublicKey'`, set VID to
6 changes: 0 additions & 6 deletions examples/all-clusters-app/esp32/main/CHIPDeviceManager.cpp
Original file line number Diff line number Diff line change
@@ -74,12 +74,6 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
ConnectivityMgr().SetBLEAdvertisingEnabled(false);
ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
}
else
{
// If rendezvous is bypassed, enable SoftAP so that the device can still
// be communicated with via its SoftAP as needed.
ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
}

// Register a function to receive events from the CHIP device layer. Note that calls to
// this function will happen on the CHIP event loop thread, not the app_main thread.
3 changes: 0 additions & 3 deletions examples/all-clusters-app/esp32/main/Kconfig.projbuild
Original file line number Diff line number Diff line change
@@ -51,8 +51,6 @@ menu "Demo"
help
Specifies the Rendezvous mode of the peripheral.

config RENDEZVOUS_MODE_BYPASS
bool "Bypass"
config RENDEZVOUS_MODE_SOFTAP
bool "Soft-AP"
config RENDEZVOUS_MODE_BLE
@@ -87,7 +85,6 @@ menu "Demo"
config RENDEZVOUS_MODE
int
range 0 8
default 0 if RENDEZVOUS_MODE_BYPASS
default 1 if RENDEZVOUS_MODE_SOFTAP
default 2 if RENDEZVOUS_MODE_BLE
default 4 if RENDEZVOUS_MODE_ON_NETWORK
1 change: 0 additions & 1 deletion examples/all-clusters-app/mbed/config.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
CONFIG_CHIP_BUILD_TESTS=n
CONFIG_CHIP_WITH_EXTERNAL_MBEDTLS=y
CONFIG_CHIP_PROJECT_CONFIG=main/include/CHIPProjectConfig.h
CONFIG_CHIP_BYPASS_RENDEZVOUS=n
CONFIG_MBED_BSD_SOCKET_TRACE=n
CONFIG_CHIP_OTA_REQUESTOR=y
CONFIG_CHIP_DATA_MODEL=y
8 changes: 2 additions & 6 deletions examples/bridge-app/esp32/README.md
Original file line number Diff line number Diff line change
@@ -155,18 +155,14 @@ make sure the IDF_PATH has been exported(See the manual setup steps above).

## Commissioning and cluster control

Commissioning can be carried out using WiFi, BLE or Bypass.
Commissioning can be carried out using WiFi or BLE.

1. Set the `Rendezvous Mode` for commissioning using menuconfig; the default
Rendezvous mode is BLE.

$ idf.py menuconfig

Select the Rendezvous Mode via `Demo -> Rendezvous Mode`. If Rendezvous Mode is
Bypass then set the credentials of the WiFi Network (i.e. SSID and Password from
menuconfig).

`idf.py menuconfig -> Component config -> CHIP Device Layer -> WiFi Station Options`
Select the Rendezvous Mode via `Demo -> Rendezvous Mode`.

2. Now flash the device with the same command as before. (Use the right `/dev`
device)
6 changes: 0 additions & 6 deletions examples/bridge-app/esp32/main/CHIPDeviceManager.cpp
Original file line number Diff line number Diff line change
@@ -69,12 +69,6 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
ConnectivityMgr().SetBLEAdvertisingEnabled(false);
ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
}
else
{
// If rendezvous is bypassed, enable SoftAP so that the device can still
// be communicated with via its SoftAP as needed.
ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
}

// Register a function to receive events from the CHIP device layer. Note that calls to
// this function will happen on the CHIP event loop thread, not the app_main thread.
3 changes: 0 additions & 3 deletions examples/bridge-app/esp32/main/Kconfig.projbuild
Original file line number Diff line number Diff line change
@@ -6,8 +6,6 @@ menu "Demo"
help
Specifies the Rendezvous mode of the peripheral.

config RENDEZVOUS_MODE_BYPASS
bool "Bypass"
config RENDEZVOUS_MODE_WIFI
bool "Wi-Fi"
config RENDEZVOUS_MODE_BLE
@@ -21,7 +19,6 @@ menu "Demo"
config RENDEZVOUS_MODE
int
range 0 8
default 0 if RENDEZVOUS_MODE_BYPASS
default 1 if RENDEZVOUS_MODE_WIFI
default 2 if RENDEZVOUS_MODE_BLE
default 4 if RENDEZVOUS_MODE_THREAD
2 changes: 0 additions & 2 deletions examples/lighting-app/ameba/README.md
Original file line number Diff line number Diff line change
@@ -63,7 +63,6 @@ There are two commissioning modes supported by Ameba platform:

1. In "connectedhomeip/config/ameba/args.gni"

- set `chip_bypass_rendezvous = false`
- Set `chip_config_network_layer_ble = true`

2. In "connectedhomeip/src/platform/Ameba/CHIPDevicePlatformConfig.h"
@@ -79,7 +78,6 @@ There are two commissioning modes supported by Ameba platform:

1. In "connectedhomeip/config/ameba/args.gni"

- set `chip_bypass_rendezvous = false`
- Set `chip_config_network_layer_ble = false`

2. In "connectedhomeip/src/platform/Ameba/CHIPDevicePlatformConfig.h"
10 changes: 1 addition & 9 deletions examples/lighting-app/cyw30739/src/main.cpp
Original file line number Diff line number Diff line change
@@ -156,15 +156,7 @@ void EventHandler(const ChipDeviceEvent * event, intptr_t arg)
}
}

void HandleThreadStateChangeEvent(const ChipDeviceEvent * event)
{
#if CHIP_BYPASS_RENDEZVOUS
if (event->ThreadStateChange.NetDataChanged && !ConnectivityMgr().IsThreadProvisioned())
{
ThreadStackMgr().JoinerStart();
}
#endif /* CHIP_BYPASS_RENDEZVOUS */
}
void HandleThreadStateChangeEvent(const ChipDeviceEvent * event) {}

void LightManagerCallback(LightingManager::Actor_t actor, LightingManager::Action_t action, uint8_t level)
{
6 changes: 0 additions & 6 deletions examples/lighting-app/esp32/main/CHIPDeviceManager.cpp
Original file line number Diff line number Diff line change
@@ -69,12 +69,6 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
ConnectivityMgr().SetBLEAdvertisingEnabled(false);
ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
}
else
{
// If rendezvous is bypassed, enable SoftAP so that the device can still
// be communicated with via its SoftAP as needed.
ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
}

// Register a function to receive events from the CHIP device layer. Note that calls to
// this function will happen on the CHIP event loop thread, not the app_main thread.
3 changes: 0 additions & 3 deletions examples/lighting-app/esp32/main/Kconfig.projbuild
Original file line number Diff line number Diff line change
@@ -85,8 +85,6 @@ menu "Demo"
help
Specifies the Rendezvous mode of the peripheral.

config RENDEZVOUS_MODE_BYPASS
bool "Bypass"
config RENDEZVOUS_MODE_WIFI
bool "Wi-Fi"
config RENDEZVOUS_MODE_BLE
@@ -100,7 +98,6 @@ menu "Demo"
config RENDEZVOUS_MODE
int
range 0 8
default 0 if RENDEZVOUS_MODE_BYPASS
default 1 if RENDEZVOUS_MODE_WIFI
default 2 if RENDEZVOUS_MODE_BLE
default 4 if RENDEZVOUS_MODE_THREAD
1 change: 0 additions & 1 deletion examples/lighting-app/mbed/config.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
CONFIG_CHIP_BUILD_TESTS=n
CONFIG_CHIP_WITH_EXTERNAL_MBEDTLS=y
CONFIG_CHIP_PROJECT_CONFIG=main/include/CHIPProjectConfig.h
CONFIG_CHIP_BYPASS_RENDEZVOUS=n
CONFIG_MBED_BSD_SOCKET_TRACE=n
CONFIG_CHIP_PW_RPC=y
CONFIG_CHIP_OTA_REQUESTOR=y
5 changes: 0 additions & 5 deletions examples/lighting-app/nrfconnect/main/AppTask.cpp
Original file line number Diff line number Diff line change
@@ -400,11 +400,6 @@ void AppTask::StartThreadHandler(AppEvent * aEvent)
if (aEvent->ButtonEvent.PinNo != THREAD_START_BUTTON)
return;

if (chip::Server::GetInstance().AddTestCommissioning() != CHIP_NO_ERROR)
{
LOG_ERR("Failed to add test pairing");
}

if (!chip::DeviceLayer::ConnectivityMgr().IsThreadProvisioned())
{
StartDefaultThreadNetwork();
7 changes: 0 additions & 7 deletions examples/lighting-app/telink/src/AppTask.cpp
Original file line number Diff line number Diff line change
@@ -105,13 +105,6 @@ CHIP_ERROR AppTask::Init()
ConfigurationMgr().LogDeviceConfig();
PrintOnboardingCodes(chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kBLE));

ret = chip::Server::GetInstance().AddTestCommissioning();
if (ret != CHIP_NO_ERROR)
{
LOG_ERR("Failed to add test pairing");
return ret;
}

return CHIP_NO_ERROR;
}

1 change: 0 additions & 1 deletion examples/lock-app/cc13x2x7_26x2x7/args.gni
Original file line number Diff line number Diff line change
@@ -34,7 +34,6 @@ chip_enable_ota_requestor = true

# BLE options
chip_config_network_layer_ble = true
chip_bypass_rendezvous = false

# Disable lock tracking, since our FreeRTOS configuration does not set
# INCLUDE_xSemaphoreGetMutexHolder
10 changes: 1 addition & 9 deletions examples/lock-app/cyw30739/src/main.cpp
Original file line number Diff line number Diff line change
@@ -170,15 +170,7 @@ void EventHandler(const ChipDeviceEvent * event, intptr_t arg)
}
}

void HandleThreadStateChangeEvent(const ChipDeviceEvent * event)
{
#if CHIP_BYPASS_RENDEZVOUS
if (event->ThreadStateChange.NetDataChanged && !ConnectivityMgr().IsThreadProvisioned())
{
ThreadStackMgr().JoinerStart();
}
#endif /* CHIP_BYPASS_RENDEZVOUS */
}
void HandleThreadStateChangeEvent(const ChipDeviceEvent * event) {}

void ActionInitiated(BoltLockManager::Action_t aAction, int32_t aActor)
{
8 changes: 2 additions & 6 deletions examples/lock-app/esp32/README.md
Original file line number Diff line number Diff line change
@@ -97,18 +97,14 @@ make sure the IDF_PATH has been exported(See the manual setup steps above).

## Commissioning and cluster control

Commissioning can be carried out using WiFi, BLE or Bypass.
Commissioning can be carried out using WiFi or BLE.

1. Set the `Rendezvous Mode` for commissioning using menuconfig; the default
Rendezvous mode is BLE.

$ idf.py menuconfig

Select the Rendezvous Mode via `Demo -> Rendezvous Mode`. If Rendezvous Mode is
Bypass then set the credentials of the WiFi Network (i.e. SSID and Password from
menuconfig).

`idf.py menuconfig -> Component config -> CHIP Device Layer -> WiFi Station Options`
Select the Rendezvous Mode via `Demo -> Rendezvous Mode`.

2. Now flash the device with the same command as before. (Use the right `/dev`
device)
6 changes: 0 additions & 6 deletions examples/lock-app/esp32/main/CHIPDeviceManager.cpp
Original file line number Diff line number Diff line change
@@ -69,12 +69,6 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
ConnectivityMgr().SetBLEAdvertisingEnabled(false);
ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
}
else
{
// If rendezvous is bypassed, enable SoftAP so that the device can still
// be communicated with via its SoftAP as needed.
ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
}

// Register a function to receive events from the CHIP device layer. Note that calls to
// this function will happen on the CHIP event loop thread, not the app_main thread.
3 changes: 0 additions & 3 deletions examples/lock-app/esp32/main/Kconfig.projbuild
Original file line number Diff line number Diff line change
@@ -26,8 +26,6 @@ menu "Demo"
help
Specifies the Rendezvous mode of the peripheral.

config RENDEZVOUS_MODE_BYPASS
bool "Bypass"
config RENDEZVOUS_MODE_WIFI
bool "Wi-Fi"
config RENDEZVOUS_MODE_BLE
@@ -55,7 +53,6 @@ menu "Demo"
config RENDEZVOUS_MODE
int
range 0 8
default 0 if RENDEZVOUS_MODE_BYPASS
default 1 if RENDEZVOUS_MODE_WIFI
default 2 if RENDEZVOUS_MODE_BLE
default 4 if RENDEZVOUS_MODE_THREAD
1 change: 0 additions & 1 deletion examples/lock-app/mbed/config.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
CONFIG_CHIP_BUILD_TESTS=n
CONFIG_CHIP_WITH_EXTERNAL_MBEDTLS=y
CONFIG_CHIP_PROJECT_CONFIG=main/include/CHIPProjectConfig.h
CONFIG_CHIP_BYPASS_RENDEZVOUS=n
CONFIG_MBED_BSD_SOCKET_TRACE=n
CONFIG_CHIP_PW_RPC=y
CONFIG_CHIP_OTA_REQUESTOR=n
5 changes: 0 additions & 5 deletions examples/lock-app/nrfconnect/main/AppTask.cpp
Original file line number Diff line number Diff line change
@@ -376,11 +376,6 @@ void AppTask::StartThreadHandler(AppEvent * aEvent)
if (aEvent->ButtonEvent.PinNo != THREAD_START_BUTTON)
return;

if (chip::Server::GetInstance().AddTestCommissioning() != CHIP_NO_ERROR)
{
LOG_ERR("Failed to add test pairing");
}

if (!ConnectivityMgr().IsThreadProvisioned())
{
StartDefaultThreadNetwork();
6 changes: 0 additions & 6 deletions examples/ota-provider-app/esp32/main/CHIPDeviceManager.cpp
Original file line number Diff line number Diff line change
@@ -69,12 +69,6 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
ConnectivityMgr().SetBLEAdvertisingEnabled(false);
ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
}
else
{
// If rendezvous is bypassed, enable SoftAP so that the device can still
// be communicated with via its SoftAP as needed.
ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
}

// Register a function to receive events from the CHIP device layer. Note that calls to
// this function will happen on the CHIP event loop thread, not the app_main thread.
3 changes: 0 additions & 3 deletions examples/ota-provider-app/esp32/main/Kconfig.projbuild
Original file line number Diff line number Diff line change
@@ -26,8 +26,6 @@ menu "Demo"
help
Specifies the Rendezvous mode of the peripheral.

config RENDEZVOUS_MODE_BYPASS
bool "Bypass"
config RENDEZVOUS_MODE_WIFI
bool "Wi-Fi"
config RENDEZVOUS_MODE_BLE
@@ -41,7 +39,6 @@ menu "Demo"
config RENDEZVOUS_MODE
int
range 0 8
default 0 if RENDEZVOUS_MODE_BYPASS
default 1 if RENDEZVOUS_MODE_WIFI
default 2 if RENDEZVOUS_MODE_BLE
default 4 if RENDEZVOUS_MODE_THREAD
6 changes: 0 additions & 6 deletions examples/ota-requestor-app/esp32/main/CHIPDeviceManager.cpp
Original file line number Diff line number Diff line change
@@ -69,12 +69,6 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
ConnectivityMgr().SetBLEAdvertisingEnabled(false);
ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
}
else
{
// If rendezvous is bypassed, enable SoftAP so that the device can still
// be communicated with via its SoftAP as needed.
ConnectivityMgr().SetWiFiAPMode(ConnectivityManager::kWiFiAPMode_Enabled);
}

// Register a function to receive events from the CHIP device layer. Note that calls to
// this function will happen on the CHIP event loop thread, not the app_main thread.
Loading

0 comments on commit 4d6858b

Please sign in to comment.