Skip to content

Commit 5fb9563

Browse files
andy31415andy31415
authored
Merge branch 'master' into topic/pucn_psoc6_release
2 parents df38ed5 + d62f5a6 commit 5fb9563

File tree

135 files changed

+2739
-1524
lines changed

Some content is hidden

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

135 files changed

+2739
-1524
lines changed

‎.github/workflows/chef.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
if: github.actor != 'restyled-io[bot]'
9999

100100
container:
101-
image: ghcr.io/project-chip/chip-build-telink:57
101+
image: ghcr.io/project-chip/chip-build-telink:65
102102
options: --user root
103103

104104
steps:

‎.github/workflows/cirque.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
# need to run with privilege, which isn't supported by job.XXX.contaner
4343
# https://github.com/actions/container-action/issues/2
4444
# container:
45-
# image: ghcr.io/project-chip/chip-build-cirque:54
45+
# image: ghcr.io/project-chip/chip-build-cirque:<VERSION_HERE>
4646
# volumes:
4747
# - "/tmp:/tmp"
4848
# - "/dev/pts:/dev/pts"

‎.github/workflows/doxygen.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181

8282
runs-on: ubuntu-latest
8383
container:
84-
image: ghcr.io/project-chip/chip-build-doxygen:54
84+
image: ghcr.io/project-chip/chip-build-doxygen:65
8585

8686
if: github.actor != 'restyled-io[bot]'
8787

‎.github/workflows/examples-linux-arm.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-crosscompile:54
39+
image: ghcr.io/project-chip/chip-build-crosscompile:65
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

‎.github/workflows/java-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
runs-on: ubuntu-latest
4343

4444
container:
45-
image: ghcr.io/project-chip/chip-build-java:54
45+
image: ghcr.io/project-chip/chip-build-java:65
4646
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
4747
net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
4848

‎config/telink/app/bootloader_usb.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616

1717
# USB DFU configuration
1818
CONFIG_USB_DFU_WILL_DETACH=n
19-
CONFIG_BOOT_USB_DFU_GPIO=y
20-
CONFIG_MCUBOOT_INDICATION_LED=y
19+
CONFIG_BOOT_USB_DFU_GPIO=n
20+
CONFIG_MCUBOOT_INDICATION_LED=n

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+4
Original file line numberDiff line numberDiff line change
@@ -8476,6 +8476,8 @@ endpoint 1 {
84768476
server cluster EnergyEvseMode {
84778477
callback attribute supportedModes;
84788478
callback attribute currentMode;
8479+
ram attribute startUpMode;
8480+
ram attribute onMode;
84798481
callback attribute generatedCommandList;
84808482
callback attribute acceptedCommandList;
84818483
callback attribute eventList;
@@ -8490,6 +8492,8 @@ endpoint 1 {
84908492
server cluster DeviceEnergyManagementMode {
84918493
callback attribute supportedModes;
84928494
callback attribute currentMode;
8495+
ram attribute startUpMode;
8496+
ram attribute onMode;
84938497
callback attribute generatedCommandList;
84948498
callback attribute acceptedCommandList;
84958499
callback attribute eventList;

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

+71-7
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-with-test-extensions.json",
3023
"type": "zcl-properties",
3124
"category": "matter",
3225
"version": 1,
3326
"description": "Matter SDK ZCL data with some extensions"
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": [
@@ -14615,6 +14615,38 @@
1461514615
"maxInterval": 65534,
1461614616
"reportableChange": 0
1461714617
},
14618+
{
14619+
"name": "StartUpMode",
14620+
"code": 2,
14621+
"mfgCode": null,
14622+
"side": "server",
14623+
"type": "int8u",
14624+
"included": 1,
14625+
"storageOption": "RAM",
14626+
"singleton": 0,
14627+
"bounded": 0,
14628+
"defaultValue": "",
14629+
"reportable": 1,
14630+
"minInterval": 1,
14631+
"maxInterval": 65534,
14632+
"reportableChange": 0
14633+
},
14634+
{
14635+
"name": "OnMode",
14636+
"code": 3,
14637+
"mfgCode": null,
14638+
"side": "server",
14639+
"type": "int8u",
14640+
"included": 1,
14641+
"storageOption": "RAM",
14642+
"singleton": 0,
14643+
"bounded": 0,
14644+
"defaultValue": "",
14645+
"reportable": 1,
14646+
"minInterval": 1,
14647+
"maxInterval": 65534,
14648+
"reportableChange": 0
14649+
},
1461814650
{
1461914651
"name": "GeneratedCommandList",
1462014652
"code": 65528,
@@ -14772,6 +14804,38 @@
1477214804
"maxInterval": 65534,
1477314805
"reportableChange": 0
1477414806
},
14807+
{
14808+
"name": "StartUpMode",
14809+
"code": 2,
14810+
"mfgCode": null,
14811+
"side": "server",
14812+
"type": "int8u",
14813+
"included": 1,
14814+
"storageOption": "RAM",
14815+
"singleton": 0,
14816+
"bounded": 0,
14817+
"defaultValue": "",
14818+
"reportable": 1,
14819+
"minInterval": 1,
14820+
"maxInterval": 65534,
14821+
"reportableChange": 0
14822+
},
14823+
{
14824+
"name": "OnMode",
14825+
"code": 3,
14826+
"mfgCode": null,
14827+
"side": "server",
14828+
"type": "int8u",
14829+
"included": 1,
14830+
"storageOption": "RAM",
14831+
"singleton": 0,
14832+
"bounded": 0,
14833+
"defaultValue": "",
14834+
"reportable": 1,
14835+
"minInterval": 1,
14836+
"maxInterval": 65534,
14837+
"reportableChange": 0
14838+
},
1477514839
{
1477614840
"name": "GeneratedCommandList",
1477714841
"code": 65528,

‎examples/energy-management-app/energy-management-common/energy-management-app.matter

+4
Original file line numberDiff line numberDiff line change
@@ -2331,6 +2331,8 @@ endpoint 1 {
23312331
server cluster EnergyEvseMode {
23322332
callback attribute supportedModes;
23332333
callback attribute currentMode;
2334+
ram attribute startUpMode;
2335+
ram attribute onMode;
23342336
callback attribute generatedCommandList;
23352337
callback attribute acceptedCommandList;
23362338
callback attribute eventList;
@@ -2345,6 +2347,8 @@ endpoint 1 {
23452347
server cluster DeviceEnergyManagementMode {
23462348
callback attribute supportedModes;
23472349
callback attribute currentMode;
2350+
ram attribute startUpMode;
2351+
ram attribute onMode;
23482352
callback attribute generatedCommandList;
23492353
callback attribute acceptedCommandList;
23502354
callback attribute eventList;

‎examples/energy-management-app/energy-management-common/energy-management-app.zap

+64
Original file line numberDiff line numberDiff line change
@@ -4679,6 +4679,38 @@
46794679
"maxInterval": 65534,
46804680
"reportableChange": 0
46814681
},
4682+
{
4683+
"name": "StartUpMode",
4684+
"code": 2,
4685+
"mfgCode": null,
4686+
"side": "server",
4687+
"type": "int8u",
4688+
"included": 1,
4689+
"storageOption": "RAM",
4690+
"singleton": 0,
4691+
"bounded": 0,
4692+
"defaultValue": "",
4693+
"reportable": 1,
4694+
"minInterval": 1,
4695+
"maxInterval": 65534,
4696+
"reportableChange": 0
4697+
},
4698+
{
4699+
"name": "OnMode",
4700+
"code": 3,
4701+
"mfgCode": null,
4702+
"side": "server",
4703+
"type": "int8u",
4704+
"included": 1,
4705+
"storageOption": "RAM",
4706+
"singleton": 0,
4707+
"bounded": 0,
4708+
"defaultValue": "",
4709+
"reportable": 1,
4710+
"minInterval": 1,
4711+
"maxInterval": 65534,
4712+
"reportableChange": 0
4713+
},
46824714
{
46834715
"name": "GeneratedCommandList",
46844716
"code": 65528,
@@ -4836,6 +4868,38 @@
48364868
"maxInterval": 65534,
48374869
"reportableChange": 0
48384870
},
4871+
{
4872+
"name": "StartUpMode",
4873+
"code": 2,
4874+
"mfgCode": null,
4875+
"side": "server",
4876+
"type": "int8u",
4877+
"included": 1,
4878+
"storageOption": "RAM",
4879+
"singleton": 0,
4880+
"bounded": 0,
4881+
"defaultValue": "",
4882+
"reportable": 1,
4883+
"minInterval": 1,
4884+
"maxInterval": 65534,
4885+
"reportableChange": 0
4886+
},
4887+
{
4888+
"name": "OnMode",
4889+
"code": 3,
4890+
"mfgCode": null,
4891+
"side": "server",
4892+
"type": "int8u",
4893+
"included": 1,
4894+
"storageOption": "RAM",
4895+
"singleton": 0,
4896+
"bounded": 0,
4897+
"defaultValue": "",
4898+
"reportable": 1,
4899+
"minInterval": 1,
4900+
"maxInterval": 65534,
4901+
"reportableChange": 0
4902+
},
48394903
{
48404904
"name": "GeneratedCommandList",
48414905
"code": 65528,

‎examples/laundry-washer-app/nxp/common/main/operational-state-delegate-impl.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ using namespace chip;
2121
using namespace chip::app;
2222
using namespace chip::app::Clusters;
2323
using namespace chip::app::Clusters::OperationalState;
24-
using namespace chip::app::Clusters::RvcOperationalState;
2524

2625
CHIP_ERROR GenericOperationalStateDelegateImpl::GetOperationalStateAtIndex(size_t index, GenericOperationalState & operationalState)
2726
{

‎examples/network-manager-app/linux/main.cpp

+11
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,14 @@
1616
*/
1717

1818
#include <AppMain.h>
19+
#include <app/clusters/thread-network-directory-server/thread-network-directory-server.h>
1920
#include <app/clusters/wifi-network-management-server/wifi-network-management-server.h>
2021
#include <lib/core/CHIPSafeCasts.h>
22+
#include <lib/support/CodeUtils.h>
2123
#include <lib/support/Span.h>
2224

25+
#include <optional>
26+
2327
using namespace chip;
2428
using namespace chip::app;
2529
using namespace chip::app::Clusters;
@@ -32,6 +36,13 @@ ByteSpan ByteSpanFromCharSpan(CharSpan span)
3236
return ByteSpan(Uint8::from_const_char(span.data()), span.size());
3337
}
3438

39+
std::optional<DefaultThreadNetworkDirectoryServer> gThreadNetworkDirectoryServer;
40+
void emberAfThreadNetworkDirectoryClusterInitCallback(chip::EndpointId endpoint)
41+
{
42+
VerifyOrDie(!gThreadNetworkDirectoryServer);
43+
gThreadNetworkDirectoryServer.emplace(endpoint).Init();
44+
}
45+
3546
int main(int argc, char * argv[])
3647
{
3748
if (ChipLinuxAppInit(argc, argv) != 0)

‎examples/network-manager-app/network-manager-common/network-manager-app.matter

+62
Original file line numberDiff line numberDiff line change
@@ -1195,6 +1195,51 @@ cluster WiFiNetworkManagement = 1105 {
11951195
command access(invoke: administer) NetworkPassphraseRequest(): NetworkPassphraseResponse = 0;
11961196
}
11971197

1198+
/** Manages the names and credentials of Thread networks visible to the user. */
1199+
cluster ThreadNetworkDirectory = 1107 {
1200+
revision 1;
1201+
1202+
struct ThreadNetworkStruct {
1203+
octet_string<8> extendedPanID = 0;
1204+
char_string<16> networkName = 1;
1205+
int16u channel = 2;
1206+
int64u activeTimestamp = 3;
1207+
}
1208+
1209+
attribute access(read: manage, write: manage) nullable octet_string<8> preferredExtendedPanID = 0;
1210+
readonly attribute access(read: operate) ThreadNetworkStruct threadNetworks[] = 1;
1211+
readonly attribute int8u threadNetworkTableSize = 2;
1212+
readonly attribute command_id generatedCommandList[] = 65528;
1213+
readonly attribute command_id acceptedCommandList[] = 65529;
1214+
readonly attribute event_id eventList[] = 65530;
1215+
readonly attribute attrib_id attributeList[] = 65531;
1216+
readonly attribute bitmap32 featureMap = 65532;
1217+
readonly attribute int16u clusterRevision = 65533;
1218+
1219+
request struct AddNetworkRequest {
1220+
octet_string<254> operationalDataset = 0;
1221+
}
1222+
1223+
request struct RemoveNetworkRequest {
1224+
octet_string<8> extendedPanID = 0;
1225+
}
1226+
1227+
request struct GetOperationalDatasetRequest {
1228+
octet_string<8> extendedPanID = 0;
1229+
}
1230+
1231+
response struct OperationalDatasetResponse = 3 {
1232+
octet_string<254> operationalDataset = 0;
1233+
}
1234+
1235+
/** Adds an entry to the ThreadNetworks list. */
1236+
timed command access(invoke: manage) AddNetwork(AddNetworkRequest): DefaultSuccess = 0;
1237+
/** Removes an entry from the ThreadNetworks list. */
1238+
timed command access(invoke: manage) RemoveNetwork(RemoveNetworkRequest): DefaultSuccess = 1;
1239+
/** Retrieves a Thread Operational Dataset from the ThreadNetworks list. */
1240+
timed command GetOperationalDataset(GetOperationalDatasetRequest): OperationalDatasetResponse = 2;
1241+
}
1242+
11981243
endpoint 0 {
11991244
device type ma_rootdevice = 22, version 1;
12001245

@@ -1473,6 +1518,23 @@ endpoint 1 {
14731518
handle command NetworkPassphraseRequest;
14741519
handle command NetworkPassphraseResponse;
14751520
}
1521+
1522+
server cluster ThreadNetworkDirectory {
1523+
callback attribute preferredExtendedPanID;
1524+
callback attribute threadNetworks;
1525+
callback attribute threadNetworkTableSize;
1526+
callback attribute generatedCommandList;
1527+
callback attribute acceptedCommandList;
1528+
callback attribute eventList;
1529+
callback attribute attributeList;
1530+
ram attribute featureMap default = 0;
1531+
ram attribute clusterRevision default = 1;
1532+
1533+
handle command AddNetwork;
1534+
handle command RemoveNetwork;
1535+
handle command GetOperationalDataset;
1536+
handle command OperationalDatasetResponse;
1537+
}
14761538
}
14771539

14781540

0 commit comments

Comments
 (0)