Skip to content

Commit c4429fe

Browse files
mkardous-silabsmkardous-silabs
authored
Sync csa branch with main (#302)
2 parents acf5aad + 506e795 commit c4429fe

File tree

85 files changed

+1478
-1580
lines changed

Some content is hidden

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

85 files changed

+1478
-1580
lines changed

‎.github/workflows/examples-nrfconnect.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ jobs:
198198
run: |
199199
# Temporarily fix link issue
200200
sed -i '151s/<LINK_FLAGS> //' /opt/NordicSemiconductor/nrfconnect/zephyr/cmake/linker/ld/target.cmake
201-
scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target nrf-native-posix-64-tests build"
201+
scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target nrf-native-sim-tests build"
202202
- name: Uploading Failed Test Logs
203203
uses: actions/upload-artifact@v4
204204
if: ${{ failure() && !env.ACT }}

‎.github/workflows/pr-validation.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
# })
4646

4747
- name: Fail if PR instructions were not deleted
48-
if: steps.check-instructions.outcome == 'failure'
48+
if: (steps.check-instructions.outcome == 'failure') && (github.event.pull_request.user.login != 'dependabot[bot]')
4949
run: |
5050
python -c 'import sys; print("PR instructions were not replaced"); sys.exit(1)'
5151
@@ -63,7 +63,8 @@ jobs:
6363
# })
6464

6565
- name: Fail if `### Testing` section not in PR
66-
if: steps.check-testing.outcome == 'failure'
66+
if: (steps.check-testing.outcome == 'failure') && (github.event.pull_request.user.login != 'dependabot[bot]')
67+
6768
run: |
6869
python -c 'import sys; print("Testing section missing (test failed)"); sys.exit(1)'
6970

‎.github/workflows/third-party-check.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ jobs:
2828
name: Check For Submodule Update Label
2929
runs-on: ubuntu-latest
3030
steps:
31-
- if: ${{ !contains(github.event.pull_request.labels.*.name, 'changing-submodules-on-purpose') }}
32-
name: Fail
31+
- name: Fail
32+
if: (github.event.pull_request.user.login != 'dependabot[bot]') && !contains(github.event.pull_request.labels.*.name, 'changing-submodules-on-purpose')
3333
run: |
3434
echo This pull request attempts to update submodules without the changing-submodules-on-purpose label. Please apply that label if the changes are intentional, or remove those changes.
3535
exit 1
36-
- if: ${{ contains(github.event.pull_request.labels.*.name, 'changing-submodules-on-purpose') }}
37-
name: Success
36+
- name: Success
37+
if: contains(github.event.pull_request.labels.*.name, 'changing-submodules-on-purpose')
3838
run: |
3939
echo PR looks good.
4040
exit 0

‎config/nrfconnect/chip-module/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,9 @@ if (CONFIG_CHIP_CRYPTO_PSA)
186186
matter_add_gn_arg_bool ("chip_crypto_psa_spake2p" CONFIG_PSA_WANT_ALG_SPAKE2P_MATTER)
187187
endif()
188188

189-
if (BOARD STREQUAL "native_posix")
189+
if (BOARD STREQUAL "native_sim")
190190
matter_add_gn_arg_string("target_cpu" "x86")
191-
elseif (BOARD STREQUAL "native_posix_64")
191+
elseif (BOARD STREQUAL "native_sim/native/64")
192192
matter_add_gn_arg_string("target_cpu" "x64")
193193
endif()
194194

‎config/nxp/chip-module/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ else()
122122
endif()
123123

124124

125-
# if (BOARD STREQUAL "native_posix")
125+
# if (BOARD STREQUAL "native_sim")
126126
# matter_add_gn_arg_string("target_cpu" "x86")
127-
# elseif (BOARD STREQUAL "native_posix_64")
127+
# elseif (BOARD STREQUAL "native_sim/native/64")
128128
# matter_add_gn_arg_string("target_cpu" "x64")
129129
# endif()
130130

‎config/zephyr/chip-module/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ if(CONFIG_CHIP)
101101
matter_add_gn_arg_bool("chip_inet_config_enable_tcp_endpoint" FALSE)
102102
matter_add_gn_arg_bool("chip_enable_read_client" CONFIG_CHIP_ENABLE_READ_CLIENT)
103103

104-
if(BOARD STREQUAL "native_posix")
104+
if(BOARD STREQUAL "native_sim")
105105
matter_add_gn_arg_string("target_cpu" "x86")
106-
elseif(BOARD STREQUAL "native_posix_64")
106+
elseif(BOARD STREQUAL "native_sim/native/64")
107107
matter_add_gn_arg_string("target_cpu" "x64")
108108
endif()
109109

‎docs/development_controllers/chip-repl/index.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
```
1010

1111
- [Matter REPL](./matter-repl.md)
12-
- [Intro](./Matter_REPL_Intro.ipynb)
13-
- [Access Control](./Matter_Access_Control.ipynb)
14-
- [Basic interactions](./Matter_Basic_Interactions.ipynb)
15-
- [Fabric Commissioning](./Matter_Multi_Fabric_Commissioning.ipynb)
12+
- [Intro](https://github.com/project-chip/connectedhomeip/blob/master/docs/development_controllers/chip-repl/Matter_REPL_Intro.ipynb)
13+
- [Basic interactions](https://github.com/project-chip/connectedhomeip/blob/master/docs/development_controllers/chip-repl/Matter_Basic_Interactions.ipynb)
14+
- [Access Control](https://github.com/project-chip/connectedhomeip/blob/master/docs/development_controllers/chip-repl/Matter_Access_Control.ipynb)
15+
- [Multi Fabric Commissioning](https://github.com/project-chip/connectedhomeip/blob/master/docs/development_controllers/chip-repl/Matter_Multi_Fabric_Commissioning.ipynb)

‎docs/development_controllers/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ chip-repl/index
99
chip-tool/index
1010
```
1111

12-
- [chip-tool](./chip-tool)
13-
- [chip-repl](./chip-repl)
12+
- [chip-tool](./chip-tool/index.md)
13+
- [chip-repl](./chip-repl/index.md)

‎docs/platforms/esp32/vs_code_development.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ Follow
1818
[these](https://github.com/project-chip/connectedhomeip/edit/master/docs/VSCODE_DEVELOPMENT.md)
1919
steps to set up Visual Studio Code for Matter development.
2020

21-
### Linux <a name="linux">
21+
(linux)=
22+
23+
### Linux
2224

2325
For Espressif esp32 devices:
2426

@@ -68,4 +70,4 @@ For Espressif esp32 devices:
6870

6971
1. Open connectedhomeip within WSL on Visual Studio Code.
7072

71-
1. Perform step 2 onwards from [Linux](#linux) guide.
73+
1. Perform step 2 onwards from {ref}`linux` guide.

‎docs/requirements.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
docutils==0.17.1
2-
Sphinx>=4.5
1+
docutils==0.21.2
2+
Sphinx==8.2.0
33
sphinx-book-theme
4-
myst-parser
4+
myst-parser>=2.0.0
55
breathe>=4.34
6-
pydata-sphinx-theme==0.14.4
6+
pydata-sphinx-theme==0.16.1

‎examples/chef/common/chef-rvc-mode-delegate.cpp

+38
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,21 @@ using ModeTagStructType = chip::app::Clusters::detail::Structs::ModeTagStruct::T
2929

3030
#ifdef MATTER_DM_PLUGIN_RVC_RUN_MODE_SERVER
3131
#include <chef-rvc-mode-delegate.h>
32+
33+
#ifdef MATTER_DM_PLUGIN_RVC_OPERATIONAL_STATE_SERVER
34+
#include <chef-rvc-operational-state-delegate.h>
35+
#endif // MATTER_DM_PLUGIN_RVC_OPERATIONAL_STATE_SERVER
36+
3237
using namespace chip::app::Clusters::RvcRunMode;
3338

3439
static std::unique_ptr<RvcRunModeDelegate> gRvcRunModeDelegate;
3540
static std::unique_ptr<ModeBase::Instance> gRvcRunModeInstance;
3641

42+
chip::app::Clusters::ModeBase::Instance * getRvcRunModeInstance()
43+
{
44+
return gRvcRunModeInstance.get();
45+
}
46+
3747
CHIP_ERROR RvcRunModeDelegate::Init()
3848
{
3949
return CHIP_NO_ERROR;
@@ -51,7 +61,35 @@ void RvcRunModeDelegate::HandleChangeToMode(uint8_t NewMode, ModeBase::Commands:
5161
return;
5262
}
5363

64+
#ifdef MATTER_DM_PLUGIN_RVC_OPERATIONAL_STATE_SERVER
65+
OperationalState::GenericOperationalError err(to_underlying(OperationalState::ErrorStateEnum::kNoError));
66+
if (NewMode == RvcRunMode::ModeIdle)
67+
{
68+
if (currentMode != RvcRunMode::ModeIdle)
69+
{ // Stop existing cycle when going from cleaning/mapping to idle.
70+
ChipLogProgress(DeviceLayer, "Stopping RVC cycle: %d", currentMode);
71+
getRvcOperationalStateDelegate()->HandleStopStateCallback(err);
72+
}
73+
}
74+
else
75+
{
76+
if (currentMode == RvcRunMode::ModeIdle)
77+
{ // Start a new cycle when going from idle to clening/mapping.
78+
ChipLogProgress(DeviceLayer, "Starting new RVC cycle: %d", NewMode);
79+
getRvcOperationalStateDelegate()->HandleStartStateCallback(err);
80+
}
81+
}
82+
if (err.IsEqual(OperationalState::GenericOperationalError(to_underlying(OperationalState::ErrorStateEnum::kNoError))))
83+
{
84+
response.status = to_underlying(ModeBase::StatusCode::kSuccess);
85+
}
86+
else
87+
{
88+
response.status = to_underlying(ModeBase::StatusCode::kGenericFailure);
89+
}
90+
#else
5491
response.status = to_underlying(ModeBase::StatusCode::kSuccess);
92+
#endif // MATTER_DM_PLUGIN_RVC_OPERATIONAL_STATE_SERVER
5593
}
5694

5795
CHIP_ERROR RvcRunModeDelegate::GetModeLabelByIndex(uint8_t modeIndex, chip::MutableCharSpan & label)

‎examples/chef/common/chef-rvc-mode-delegate.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class RvcRunModeDelegate : public ModeBase::Delegate
4242
using ModeTagStructType = detail::Structs::ModeTagStruct::Type;
4343
ModeTagStructType ModeTagsIdle[1] = { { .value = to_underlying(ModeTag::kIdle) } };
4444
ModeTagStructType ModeTagsCleaning[1] = { { .value = to_underlying(ModeTag::kCleaning) } };
45+
ModeTagStructType ModeTagsMapping[1] = { { .value = to_underlying(ModeTag::kMapping) } };
4546

4647
const detail::Structs::ModeOptionStruct::Type kModeOptions[3] = {
4748
detail::Structs::ModeOptionStruct::Type{ .label = CharSpan::fromCharString("Idle"),
@@ -52,7 +53,7 @@ class RvcRunModeDelegate : public ModeBase::Delegate
5253
.modeTags = DataModel::List<const ModeTagStructType>(ModeTagsCleaning) },
5354
detail::Structs::ModeOptionStruct::Type{ .label = CharSpan::fromCharString("Mapping"),
5455
.mode = ModeMapping,
55-
.modeTags = DataModel::List<const ModeTagStructType>(ModeTagsIdle) },
56+
.modeTags = DataModel::List<const ModeTagStructType>(ModeTagsMapping) },
5657
};
5758

5859
CHIP_ERROR Init() override;
@@ -122,6 +123,8 @@ void Shutdown();
122123
} // namespace chip
123124

124125
#ifdef MATTER_DM_PLUGIN_RVC_RUN_MODE_SERVER
126+
chip::app::Clusters::ModeBase::Instance * getRvcRunModeInstance();
127+
125128
chip::Protocols::InteractionModel::Status chefRvcRunModeWriteCallback(chip::EndpointId endpoint, chip::ClusterId clusterId,
126129
const EmberAfAttributeMetadata * attributeMetadata,
127130
uint8_t * buffer);

‎examples/chef/common/chef-rvc-operational-state-delegate.cpp

+18
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,18 @@ using namespace chip::app::Clusters::OperationalState;
2828
using namespace chip::app::Clusters::RvcOperationalState;
2929
using chip::Protocols::InteractionModel::Status;
3030

31+
#ifdef MATTER_DM_PLUGIN_RVC_RUN_MODE_SERVER
32+
#include <chef-rvc-mode-delegate.h>
33+
#endif // MATTER_DM_PLUGIN_RVC_RUN_MODE_SERVER
34+
3135
static std::unique_ptr<RvcOperationalStateDelegate> gRvcOperationalStateDelegate;
3236
static std::unique_ptr<RvcOperationalState::Instance> gRvcOperationalStateInstance;
3337

38+
RvcOperationalStateDelegate * getRvcOperationalStateDelegate()
39+
{
40+
return gRvcOperationalStateDelegate.get();
41+
}
42+
3443
static void onOperationalStateTimerTick(System::Layer * systemLayer, void * data);
3544

3645
DataModel::Nullable<uint32_t> RvcOperationalStateDelegate::GetCountdownTime()
@@ -176,6 +185,11 @@ static void onOperationalStateTimerTick(System::Layer * systemLayer, void * data
176185
OperationalState::OperationalStateEnum state =
177186
static_cast<OperationalState::OperationalStateEnum>(instance->GetCurrentOperationalState());
178187

188+
if (state == OperationalState::OperationalStateEnum::kStopped) // Do not continue the timer when RVC has stopped.
189+
{
190+
return;
191+
}
192+
179193
if (gRvcOperationalStateDelegate->mCountdownTime.IsNull())
180194
{
181195
if (state == OperationalState::OperationalStateEnum::kRunning)
@@ -223,6 +237,10 @@ static void onOperationalStateTimerTick(System::Layer * systemLayer, void * data
223237
gRvcOperationalStateDelegate->mRunningTime = 0;
224238
gRvcOperationalStateDelegate->mPausedTime = 0;
225239
gRvcOperationalStateDelegate->mCountdownTime.SetNull();
240+
241+
#ifdef MATTER_DM_PLUGIN_RVC_RUN_MODE_SERVER
242+
getRvcRunModeInstance()->UpdateCurrentMode(RvcRunMode::ModeIdle);
243+
#endif // MATTER_DM_PLUGIN_RVC_RUN_MODE_SERVER
226244
}
227245
}
228246
}

‎examples/chef/common/chef-rvc-operational-state-delegate.h

+2
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ void Shutdown();
122122
} // namespace app
123123
} // namespace chip
124124

125+
chip::app::Clusters::RvcOperationalState::RvcOperationalStateDelegate * getRvcOperationalStateDelegate();
126+
125127
chip::Protocols::InteractionModel::Status chefRvcOperationalStateWriteCallback(chip::EndpointId endpoint, chip::ClusterId clusterId,
126128
const EmberAfAttributeMetadata * attributeMetadata,
127129
uint8_t * buffer);

‎examples/chef/devices/rootnode_rainsensor_a7aa5d7738.matter

+3
Original file line numberDiff line numberDiff line change
@@ -1759,6 +1759,9 @@ endpoint 0 {
17591759
handle command UpdateFabricLabel;
17601760
handle command RemoveFabric;
17611761
handle command AddTrustedRootCertificate;
1762+
handle command SetVidVerificationStatement;
1763+
handle command SignVidVerificationRequest;
1764+
handle command SignVidVerificationResponse;
17621765
}
17631766

17641767
server cluster GroupKeyManagement {

‎examples/chef/devices/rootnode_rainsensor_a7aa5d7738.zap

+32-8
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717
}
1818
],
1919
"package": [
20-
{
21-
"pathRelativity": "relativeToZap",
22-
"path": "../../../src/app/zap-templates/app-templates.json",
23-
"type": "gen-templates-json",
24-
"category": "matter",
25-
"version": "chip-v1"
26-
},
2720
{
2821
"pathRelativity": "relativeToZap",
2922
"path": "../../../src/app/zap-templates/zcl/zcl.json",
3023
"type": "zcl-properties",
3124
"category": "matter",
3225
"version": 1,
3326
"description": "Matter SDK ZCL data"
27+
},
28+
{
29+
"pathRelativity": "relativeToZap",
30+
"path": "../../../src/app/zap-templates/app-templates.json",
31+
"type": "gen-templates-json",
32+
"category": "matter",
33+
"version": "chip-v1"
3434
}
3535
],
3636
"endpointTypes": [
@@ -1584,6 +1584,30 @@
15841584
"source": "client",
15851585
"isIncoming": 1,
15861586
"isEnabled": 1
1587+
},
1588+
{
1589+
"name": "SetVidVerificationStatement",
1590+
"code": 12,
1591+
"mfgCode": null,
1592+
"source": "client",
1593+
"isIncoming": 1,
1594+
"isEnabled": 1
1595+
},
1596+
{
1597+
"name": "SignVidVerificationRequest",
1598+
"code": 13,
1599+
"mfgCode": null,
1600+
"source": "client",
1601+
"isIncoming": 1,
1602+
"isEnabled": 1
1603+
},
1604+
{
1605+
"name": "SignVidVerificationResponse",
1606+
"code": 14,
1607+
"mfgCode": null,
1608+
"source": "server",
1609+
"isIncoming": 0,
1610+
"isEnabled": 1
15871611
}
15881612
],
15891613
"attributes": [
@@ -2738,4 +2762,4 @@
27382762
"parentEndpointIdentifier": 0
27392763
}
27402764
]
2741-
}
2765+
}

‎examples/energy-management-app/linux/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ data (e.g. fabric info).
241241

242242
- See chip-repl documentation in:
243243
- [Working with Python CHIP Controller](../../../docs/development_controllers/chip-repl/python_chip_controller_building.md)
244-
- [Matter_REPL_Intro](../../../docs/development_controllers/chip-repl/Matter_REPL_Intro.ipynb)
244+
- [Matter_REPL_Intro](https://github.com/project-chip/connectedhomeip/blob/master/docs/development_controllers/chip-repl/Matter_REPL_Intro.ipynb)
245245

246246
### Building chip-repl:
247247

‎examples/laundry-washer-app/nxp/zephyr/prj_ota.conf

+3
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,6 @@ CONFIG_CHIP_OTA_IMAGE_BUILD=y
2929
# Note: You need to use the same signature key used by MCUBOOT, i.e BOOT_SIGNATURE_KEY_FILE.
3030
# Default CONFIG_BOOT_SIGNATURE_KEY_FILE is defined in config/nxp/app/bootloader.conf
3131
CONFIG_MCUBOOT_SIGNATURE_KEY_FILE="./bootloader/mcuboot/root-rsa-2048.pem"
32+
33+
# To enable SoftwareDiagnostics cluster's feature WTRMRK on endpoint 0
34+
CONFIG_CHIP_MALLOC_SYS_HEAP_WATERMARKS_SUPPORT=y

‎examples/light-switch-app/esp32/sdkconfig.defaults.esp32h2

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
CONFIG_IDF_TARGET="esp32h2"
2+
3+
# Enable OpenThread
4+
CONFIG_OPENTHREAD_ENABLED=y
5+
CONFIG_OPENTHREAD_SRP_CLIENT=y
6+
CONFIG_OPENTHREAD_LOG_LEVEL_DYNAMIC=n
7+
CONFIG_OPENTHREAD_LOG_LEVEL_NOTE=y
8+
CONFIG_OPENTHREAD_CLI=n
9+
CONFIG_OPENTHREAD_DNS_CLIENT=y
10+
11+
# Disable lwip ipv6 autoconfig
12+
CONFIG_LWIP_IPV6_AUTOCONFIG=n
13+
14+
# LwIP config for OpenThread
15+
CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
16+
CONFIG_LWIP_MULTICAST_PING=y
17+
18+
# MDNS platform
19+
CONFIG_USE_MINIMAL_MDNS=n
20+
CONFIG_ENABLE_EXTENDED_DISCOVERY=y
21+
22+
# Disable STA for ESP32H2
23+
CONFIG_ENABLE_WIFI_STATION=n
24+
25+
# Enable nano format
26+
CONFIG_NEWLIB_NANO_FORMAT=y

0 commit comments

Comments
 (0)