Skip to content

Commit 43bb001

Browse files
[controller] Remove deprecated controller interface (#5392)
Now that all controller applications have been migrated to the new CHIP controller interface, the deprecated controller classes can be removed.
1 parent c715269 commit 43bb001

6 files changed

+5
-476
lines changed

docs/dots/Rendezvous/RendezvousSessionGeneral.dot

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ digraph RendezvousSession
66
subgraph cluster_controller {
77
label=<<b>Controller</b>>
88

9-
ChipDeviceController [shape=record label=<{ChipDeviceController|<font point-size="11">RendezvousSessionDelegate</font>}>, URL="@ref chip::DeviceController::ChipDeviceController"]
9+
DeviceCommissioner [shape=record label=<{DeviceCommissioner|<font point-size="11">RendezvousSessionDelegate</font>}>, URL="@ref chip::Controller::DeviceCommissioner"]
1010
}
1111

1212
# This section represents device-only elements
@@ -29,9 +29,9 @@ digraph RendezvousSession
2929
# Main relationships
3030
#############################
3131
RendezvousParameters [shape=ellipse, URL="@ref chip::RendezvousParameters"]
32-
RendezvousParameters -> { ChipDeviceController, RendezvousDeviceDelegate} [arrowhead=none]
32+
RendezvousParameters -> { DeviceCommissioner, RendezvousDeviceDelegate} [arrowhead=none]
3333

34-
{ChipDeviceController, RendezvousDeviceDelegate} -> RendezvousSession
34+
{DeviceCommissioner, RendezvousDeviceDelegate} -> RendezvousSession
3535
RendezvousSession -> TransportBle
3636
RendezvousSession -> TransportInet [style=dashed, color=gray]
3737
}

docs/dots/Rendezvous/RendezvousSessionInit.dot

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ digraph RendezvousSession
77
label=<<b>Controller</b>>
88
node [fillcolor="white:gray", gradientangle=90]
99

10-
ChipDeviceController [shape=record label=<{ChipDeviceController|<font point-size="11">RendezvousSessionDelegate</font>}>, URL="@ref chip::DeviceController::ChipDeviceController"]
10+
DeviceCommissioner [shape=record label=<{DeviceCommissioner|<font point-size="11">RendezvousSessionDelegate</font>}>, URL="@ref chip::Controller::DeviceCommissioner"]
1111
}
1212

1313
# This section represents device-only elements
@@ -66,7 +66,7 @@ digraph RendezvousSession
6666
#############################
6767
# Main relationships
6868
#############################
69-
{ChipDeviceController, RendezvousDeviceDelegate} -> RendezvousSession
69+
{DeviceCommissioner, RendezvousDeviceDelegate} -> RendezvousSession
7070

7171
RendezvousSession -> HasDiscriminator
7272

src/controller/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ static_library("controller") {
2929
"CHIPDevice.h",
3030
"CHIPDeviceController.cpp",
3131
"CHIPDeviceController.h",
32-
"CHIPDeviceController_deprecated.cpp",
33-
"CHIPDeviceController_deprecated.h",
3432
"DeviceAddressUpdater.cpp",
3533
"DeviceAddressUpdater.h",
3634
]

src/controller/CHIPDeviceController_deprecated.cpp

-245
This file was deleted.

0 commit comments

Comments
 (0)