From d320218d18ca75649c61405e2fd9fbe5e1d3dbb2 Mon Sep 17 00:00:00 2001 From: Yufeng Wang Date: Wed, 28 Aug 2024 09:07:59 -0700 Subject: [PATCH 1/2] Move DeviceSynchronization from pairing command to device_manager --- examples/fabric-admin/BUILD.gn | 4 ++-- examples/fabric-admin/commands/pairing/PairingCommand.cpp | 2 +- .../pairing => device_manager}/DeviceSynchronization.cpp | 0 .../pairing => device_manager}/DeviceSynchronization.h | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename examples/fabric-admin/{commands/pairing => device_manager}/DeviceSynchronization.cpp (100%) rename examples/fabric-admin/{commands/pairing => device_manager}/DeviceSynchronization.h (100%) diff --git a/examples/fabric-admin/BUILD.gn b/examples/fabric-admin/BUILD.gn index 77e851a53c36d2..8f3a224e9732ee 100644 --- a/examples/fabric-admin/BUILD.gn +++ b/examples/fabric-admin/BUILD.gn @@ -76,14 +76,14 @@ static_library("fabric-admin-utils") { "commands/common/StayActiveSender.cpp", "commands/common/StayActiveSender.h", "commands/fabric-sync/FabricSyncCommand.cpp", - "commands/pairing/DeviceSynchronization.cpp", - "commands/pairing/DeviceSynchronization.h", "commands/pairing/OpenCommissioningWindowCommand.cpp", "commands/pairing/OpenCommissioningWindowCommand.h", "commands/pairing/PairingCommand.cpp", "commands/pairing/ToTLVCert.cpp", "device_manager/DeviceManager.cpp", "device_manager/DeviceManager.h", + "device_manager/DeviceSynchronization.cpp", + "device_manager/DeviceSynchronization.h", ] deps = [ "${chip_root}/src/app:events" ] diff --git a/examples/fabric-admin/commands/pairing/PairingCommand.cpp b/examples/fabric-admin/commands/pairing/PairingCommand.cpp index aecd259d373d3f..9a7adfa3f910e5 100644 --- a/examples/fabric-admin/commands/pairing/PairingCommand.cpp +++ b/examples/fabric-admin/commands/pairing/PairingCommand.cpp @@ -21,9 +21,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/examples/fabric-admin/commands/pairing/DeviceSynchronization.cpp b/examples/fabric-admin/device_manager/DeviceSynchronization.cpp similarity index 100% rename from examples/fabric-admin/commands/pairing/DeviceSynchronization.cpp rename to examples/fabric-admin/device_manager/DeviceSynchronization.cpp diff --git a/examples/fabric-admin/commands/pairing/DeviceSynchronization.h b/examples/fabric-admin/device_manager/DeviceSynchronization.h similarity index 100% rename from examples/fabric-admin/commands/pairing/DeviceSynchronization.h rename to examples/fabric-admin/device_manager/DeviceSynchronization.h From 6501a574c159874419eb53a3415015cbd29c3a91 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Wed, 28 Aug 2024 16:14:50 +0000 Subject: [PATCH 2/2] Restyled by gn --- examples/fabric-admin/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/fabric-admin/BUILD.gn b/examples/fabric-admin/BUILD.gn index 8f3a224e9732ee..51e6bc60daa306 100644 --- a/examples/fabric-admin/BUILD.gn +++ b/examples/fabric-admin/BUILD.gn @@ -83,7 +83,7 @@ static_library("fabric-admin-utils") { "device_manager/DeviceManager.cpp", "device_manager/DeviceManager.h", "device_manager/DeviceSynchronization.cpp", - "device_manager/DeviceSynchronization.h", + "device_manager/DeviceSynchronization.h", ] deps = [ "${chip_root}/src/app:events" ]