Skip to content

Commit 1285f6b

Browse files
authored
Rename CommissionerControl to CommissionerControlDelegate (project-chip#36280)
1 parent 4ed1e88 commit 1285f6b

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

examples/fabric-bridge-app/linux/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if (bridge_enable_pw_rpc) {
3333
executable("fabric-bridge-app") {
3434
sources = [
3535
"${chip_root}/examples/fabric-bridge-app/fabric-bridge-common/include/CHIPProjectAppConfig.h",
36-
"CommissionerControl.cpp",
36+
"CommissionerControlDelegate.cpp",
3737
"main.cpp",
3838
]
3939

examples/fabric-bridge-app/linux/CommissionerControl.cpp examples/fabric-bridge-app/linux/CommissionerControlDelegate.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* limitations under the License.
1717
*/
1818

19-
#include "CommissionerControl.h"
19+
#include "CommissionerControlDelegate.h"
2020
#include "RpcClient.h"
2121

2222
#include <app-common/zap-generated/cluster-objects.h>

examples/fabric-bridge-app/linux/main.cpp

+8-9
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "BridgedDeviceBasicInformationImpl.h"
2424
#include "BridgedDeviceManager.h"
2525
#include "CommissionableInit.h"
26-
#include "CommissionerControl.h"
26+
#include "CommissionerControlDelegate.h"
2727

2828
#include <app/AttributeAccessInterfaceRegistry.h>
2929
#include <app/CommandHandlerInterfaceRegistry.h>
@@ -35,6 +35,12 @@
3535
#include "RpcServer.h"
3636
#endif
3737

38+
using namespace chip;
39+
using namespace chip::app;
40+
using namespace chip::app::Clusters;
41+
using namespace chip::app::Clusters::AdministratorCommissioning;
42+
using namespace chip::app::Clusters::BridgedDeviceBasicInformation;
43+
3844
// This is declared here and not in a header because zap/embr assumes all clusters
3945
// are defined in a static endpoint in the .zap file. From there, the codegen will
4046
// automatically use PluginApplicationCallbacksHeader.jinja to declare and call
@@ -43,12 +49,6 @@
4349
// need to declare and call it ourselves where the application is initialized.
4450
void MatterEcosystemInformationPluginServerInitCallback();
4551

46-
using namespace chip;
47-
using namespace chip::app;
48-
using namespace chip::app::Clusters;
49-
using namespace chip::app::Clusters::AdministratorCommissioning;
50-
using namespace chip::app::Clusters::BridgedDeviceBasicInformation;
51-
5252
namespace {
5353

5454
#if defined(PW_RPC_FABRIC_BRIDGE_SERVICE) && PW_RPC_FABRIC_BRIDGE_SERVICE
@@ -58,8 +58,6 @@ constexpr uint16_t kRetryIntervalS = 3;
5858
uint16_t gFabricAdminServerPort = 33001;
5959
uint16_t gLocalServerPort = 33002;
6060

61-
BridgedDeviceBasicInformationImpl gBridgedDeviceBasicInformationAttributes;
62-
6361
constexpr uint16_t kOptionFabricAdminServerPortNumber = 0xFF01;
6462
constexpr uint16_t kOptionLocalServerPortNumber = 0xFF02;
6563

@@ -239,6 +237,7 @@ void BridgedDeviceInformationCommandHandler::InvokeCommand(HandlerContext & hand
239237
}
240238

241239
BridgedAdministratorCommissioning gBridgedAdministratorCommissioning;
240+
BridgedDeviceBasicInformationImpl gBridgedDeviceBasicInformationAttributes;
242241
AdministratorCommissioningCommandHandler gAdministratorCommissioningCommandHandler;
243242
BridgedDeviceInformationCommandHandler gBridgedDeviceInformationCommandHandler;
244243

0 commit comments

Comments
 (0)