Skip to content

Commit 3fe169d

Browse files
jadhavrohit924austina-csa
authored andcommitted
[ESP32] Remove SupportedModes implementation of ModeSelect from nvs and use all-clusters-apps common implementation (project-chip#34044)
1 parent dda34fa commit 3fe169d

File tree

6 files changed

+2
-407
lines changed

6 files changed

+2
-407
lines changed

docs/guides/esp32/providers.md

-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ Below are the providers that have been implemented:
1515
- [Device Info Provider](https://github.com/project-chip/connectedhomeip/blob/master/src/platform/ESP32/ESP32DeviceInfoProvider.h#L31)
1616
This provider provides fixed labels, supported calendar types, and supported
1717
locales from the factory partition.
18-
- [Supported Modes](https://github.com/project-chip/connectedhomeip/blob/master/examples/platform/esp32/mode-support/static-supported-modes-manager.h#L28)
19-
This provider offers the supported modes for the mode-select cluster.
2018

2119
More information can be found in the [factory data guide](factory_data.md).
2220

examples/all-clusters-app/esp32/main/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ set(SRC_DIRS_LIST
3434
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/ota"
3535
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/common"
3636
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/shell_extension"
37-
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/mode-support"
3837
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/server"
3938
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/icd/server"
4039
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/util"
@@ -106,8 +105,6 @@ set(SRC_DIRS_LIST
106105
)
107106

108107

109-
set(EXCLUDE_SRCS "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp")
110-
111108
if (CONFIG_ENABLE_PW_RPC)
112109
# Append additional directories for RPC build
113110
set(PRIV_INCLUDE_DIRS_LIST "${PRIV_INCLUDE_DIRS_LIST}"

examples/all-clusters-app/esp32/main/main.cpp

-8
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
#include <common/Esp32ThreadInit.h>
4242
#include <credentials/DeviceAttestationCredsProvider.h>
4343
#include <credentials/examples/DeviceAttestationCredsExample.h>
44-
#include <examples/platform/esp32/mode-support/static-supported-modes-manager.h>
4544
#include <platform/ESP32/ESP32Utils.h>
4645
#include <static-supported-temperature-levels.h>
4746

@@ -122,13 +121,6 @@ static void InitServer(intptr_t context)
122121
#if CONFIG_DEVICE_TYPE_M5STACK
123122
SetupPretendDevices();
124123
#endif
125-
CHIP_ERROR err =
126-
app::Clusters::ModeSelect::StaticSupportedModesManager::getStaticSupportedModesManagerInstance().InitEndpointArray(
127-
FIXED_ENDPOINT_COUNT);
128-
if (err != CHIP_NO_ERROR)
129-
{
130-
ESP_LOGE(TAG, "Failed to initialize endpoint array for supported-modes, err:%" CHIP_ERROR_FORMAT, err.Format());
131-
}
132124

133125
app::Clusters::TemperatureControl::SetInstance(&sAppSupportedTemperatureLevelsDelegate);
134126
}

examples/platform/esp32/mode-support/static-supported-modes-manager.cpp

-223
This file was deleted.

examples/platform/esp32/mode-support/static-supported-modes-manager.h

-80
This file was deleted.

0 commit comments

Comments
 (0)