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

Remove DeviceNetworkProvisioningDelegate interface to force vendor to use NetworkCommissioning interface… #23391

Merged
merged 2 commits into from
Nov 3, 2022
Merged

Remove DeviceNetworkProvisioningDelegate interface to force vendor to use NetworkCommissioning interface… #23391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d1314e
Remove intermediate CRTP layer from DeviceNetworkProvisioningDelegate
yufengwangca Oct 28, 2022
8f14737
Remove DeviceNetworkProvisioningDelegate interface
yufengwangca Nov 1, 2022
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
57 changes: 0 additions & 57 deletions src/include/platform/internal/DeviceNetworkProvisioning.h
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions src/include/platform/internal/GenericDeviceNetworkProvisioningDelegateImpl.h
View file
Open in desktop

This file was deleted.

12 changes: 3 additions & 9 deletions src/lib/shell/commands/WiFi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,6 @@
#include <platform/CHIPDeviceLayer.h>
#include <platform/ConnectivityManager.h>

// Include DeviceNetworkProvisioningDelegateImpl for WiFi provisioning.
// TODO: Enable wifi network should be done by ConnectivityManager. (Or other platform neutral interfaces)
#if defined(CHIP_DEVICE_LAYER_TARGET)
#define DEVICENETWORKPROVISIONING_HEADER <platform/CHIP_DEVICE_LAYER_TARGET/DeviceNetworkProvisioningDelegateImpl.h>
#include DEVICENETWORKPROVISIONING_HEADER
#endif

using chip::DeviceLayer::ConnectivityManager;
using chip::DeviceLayer::ConnectivityMgr;

Expand Down Expand Up @@ -115,8 +108,9 @@ static CHIP_ERROR WiFiConnectHandler(int argc, char ** argv)
{
return CHIP_ERROR_INVALID_ARGUMENT;
}
DeviceLayer::DeviceNetworkProvisioningDelegateImpl deviceDelegate;
return deviceDelegate.ProvisionWiFi(argv[0], argv[1]);

// TODO:Provision WiFi using WirelessDriver
return CHIP_ERROR_NOT_IMPLEMENTED;
}

static CHIP_ERROR WiFiDispatch(int argc, char ** argv)
Expand Down
2 changes: 0 additions & 2 deletions src/platform/Ameba/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ static_library("Ameba") {
"ConfigurationManagerImpl.h",
"ConnectivityManagerImpl.cpp",
"ConnectivityManagerImpl.h",
"DeviceNetworkProvisioningDelegateImpl.cpp",
"DeviceNetworkProvisioningDelegateImpl.h",
"DiagnosticDataProviderImpl.cpp",
"DiagnosticDataProviderImpl.h",
"FactoryDataProvider.cpp",
Expand Down
43 changes: 0 additions & 43 deletions src/platform/Ameba/DeviceNetworkProvisioningDelegateImpl.cpp
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions src/platform/Ameba/DeviceNetworkProvisioningDelegateImpl.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/platform/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,6 @@ if (chip_device_platform != "none") {
"../include/platform/internal/BLEManager.h",
"../include/platform/internal/CHIPDeviceLayerInternal.h",
"../include/platform/internal/DeviceNetworkInfo.h",
"../include/platform/internal/DeviceNetworkProvisioning.h",
"../include/platform/internal/EventLogging.h",
"../include/platform/internal/GenericConfigurationManagerImpl.h",
"../include/platform/internal/GenericConfigurationManagerImpl.ipp",
Expand Down
43 changes: 0 additions & 43 deletions src/platform/Darwin/DeviceNetworkProvisioningDelegateImpl.h
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/platform/EFR32/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ static_library("EFR32") {
"ConfigurationManagerImpl.cpp",
"ConfigurationManagerImpl.h",
"ConnectivityManagerImpl.h",
"DeviceNetworkProvisioningDelegateImpl.cpp",
"DeviceNetworkProvisioningDelegateImpl.h",
"DiagnosticDataProviderImpl.cpp",
"DiagnosticDataProviderImpl.h",
"EFR32Config.cpp",
Expand Down
64 changes: 0 additions & 64 deletions src/platform/EFR32/DeviceNetworkProvisioningDelegateImpl.cpp
View file
Open in desktop

This file was deleted.

Loading