Skip to content

Commit 5fa7466

Browse files
j-ororkej-ororke
authored
Merge branch 'master' into remove_PICS_from_PWRTL_tests
2 parents 80faf03 + d033f8b commit 5fa7466

File tree

149 files changed

+3880
-903
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+3880
-903
lines changed

‎.github/workflows/tests.yaml

+26-24
Large diffs are not rendered by default.

‎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/chef/chef.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -878,7 +878,7 @@ def main() -> int:
878878
"""))
879879
if options.do_clean:
880880
shell.run_cmd("rm -rf out")
881-
shell.run_cmd("gn gen out")
881+
shell.run_cmd("gn gen --export-compile-commands out")
882882
shell.run_cmd("ninja -C out")
883883

884884
#

‎examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter

+4-2
Original file line numberDiff line numberDiff line change
@@ -1681,17 +1681,19 @@ endpoint 1 {
16811681
callback attribute attributeList;
16821682
callback attribute featureMap;
16831683
ram attribute clusterRevision default = 1;
1684+
1685+
handle command ResetCondition;
16841686
}
16851687

16861688
server cluster FanControl {
16871689
ram attribute fanMode default = 0;
16881690
ram attribute fanModeSequence default = 2;
16891691
ram attribute percentSetting default = 0;
16901692
ram attribute percentCurrent default = 0;
1691-
ram attribute speedMax default = 100;
1693+
ram attribute speedMax default = 10;
16921694
ram attribute speedSetting default = 0;
16931695
ram attribute speedCurrent default = 0;
1694-
ram attribute rockSupport default = 0x03;
1696+
ram attribute rockSupport default = 0x07;
16951697
ram attribute rockSetting default = 0x00;
16961698
ram attribute windSupport default = 0x03;
16971699
ram attribute windSetting default = 0x00;

‎examples/chef/devices/rootnode_airpurifier_73a6fe2651.zap

+23-13
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
"package": [
2020
{
2121
"pathRelativity": "relativeToZap",
22-
"path": "../../../src/app/zap-templates/zcl/zcl.json",
23-
"type": "zcl-properties",
22+
"path": "../../../src/app/zap-templates/app-templates.json",
23+
"type": "gen-templates-json",
2424
"category": "matter",
25-
"version": 1,
26-
"description": "Matter SDK ZCL data"
25+
"version": "chip-v1"
2726
},
2827
{
2928
"pathRelativity": "relativeToZap",
30-
"path": "../../../src/app/zap-templates/app-templates.json",
31-
"type": "gen-templates-json",
29+
"path": "../../../src/app/zap-templates/zcl/zcl.json",
30+
"type": "zcl-properties",
3231
"category": "matter",
33-
"version": "chip-v1"
32+
"version": 1,
33+
"description": "Matter SDK ZCL data"
3434
}
3535
],
3636
"endpointTypes": [
@@ -2529,7 +2529,7 @@
25292529
"storageOption": "External",
25302530
"singleton": 0,
25312531
"bounded": 0,
2532-
"defaultValue": "",
2532+
"defaultValue": null,
25332533
"reportable": 1,
25342534
"minInterval": 1,
25352535
"maxInterval": 65534,
@@ -2545,7 +2545,7 @@
25452545
"storageOption": "External",
25462546
"singleton": 0,
25472547
"bounded": 0,
2548-
"defaultValue": "",
2548+
"defaultValue": null,
25492549
"reportable": 1,
25502550
"minInterval": 1,
25512551
"maxInterval": 65534,
@@ -2561,7 +2561,7 @@
25612561
"storageOption": "External",
25622562
"singleton": 0,
25632563
"bounded": 0,
2564-
"defaultValue": "",
2564+
"defaultValue": null,
25652565
"reportable": 1,
25662566
"minInterval": 1,
25672567
"maxInterval": 65534,
@@ -2577,7 +2577,7 @@
25772577
"storageOption": "External",
25782578
"singleton": 0,
25792579
"bounded": 0,
2580-
"defaultValue": "",
2580+
"defaultValue": null,
25812581
"reportable": 1,
25822582
"minInterval": 1,
25832583
"maxInterval": 65534,
@@ -3006,6 +3006,16 @@
30063006
"define": "ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER",
30073007
"side": "server",
30083008
"enabled": 1,
3009+
"commands": [
3010+
{
3011+
"name": "ResetCondition",
3012+
"code": 0,
3013+
"mfgCode": null,
3014+
"source": "client",
3015+
"isIncoming": 1,
3016+
"isEnabled": 1
3017+
}
3018+
],
30093019
"attributes": [
30103020
{
30113021
"name": "Condition",
@@ -3293,7 +3303,7 @@
32933303
"storageOption": "RAM",
32943304
"singleton": 0,
32953305
"bounded": 0,
3296-
"defaultValue": "100",
3306+
"defaultValue": "10",
32973307
"reportable": 1,
32983308
"minInterval": 1,
32993309
"maxInterval": 65534,
@@ -3341,7 +3351,7 @@
33413351
"storageOption": "RAM",
33423352
"singleton": 0,
33433353
"bounded": 0,
3344-
"defaultValue": "0x03",
3354+
"defaultValue": "0x07",
33453355
"reportable": 1,
33463356
"minInterval": 1,
33473357
"maxInterval": 65534,

0 commit comments

Comments
 (0)