Skip to content

Commit e927c12

Browse files
adabreutiadabreuti
authored
Merge branch 'master' into UpdateTIApplications_OTA_Documentation
2 parents 81a1a09 + 99e20a9 commit e927c12

File tree

187 files changed

+16140
-2695
lines changed

Some content is hidden

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

187 files changed

+16140
-2695
lines changed

‎.github/workflows/examples-efr32.yaml

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

4242
container:
43-
image: ghcr.io/project-chip/chip-build-efr32:54
43+
image: ghcr.io/project-chip/chip-build-efr32:56
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

‎.github/workflows/release_artifacts.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
runs-on: ubuntu-latest
6565

6666
container:
67-
image: ghcr.io/project-chip/chip-build-efr32:54
67+
image: ghcr.io/project-chip/chip-build-efr32:56
6868
steps:
6969
- name: Checkout
7070
uses: actions/checkout@v4

‎.github/workflows/tests.yaml

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

‎.gitmodules

+5-5
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,10 @@
231231
url = https://github.com/SiliconLabs/sdk_support.git
232232
branch = main
233233
platforms = silabs,silabs_docker
234-
[submodule "third_party/silabs/gecko_sdk"]
235-
path = third_party/silabs/gecko_sdk
236-
url = https://github.com/SiliconLabs/gecko_sdk.git
237-
branch = v4.4.2
234+
[submodule "third_party/silabs/simplicity_sdk"]
235+
path = third_party/silabs/simplicity_sdk
236+
url = https://github.com/SiliconLabs/simplicity_sdk.git
237+
branch = v2024.6.0
238238
platforms = silabs
239239
[submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
240240
path = third_party/silabs/wiseconnect-wifi-bt-sdk
@@ -244,7 +244,7 @@
244244
[submodule "third_party/silabs/wifi_sdk"]
245245
path = third_party/silabs/wifi_sdk
246246
url = https://github.com/SiliconLabs/wiseconnect.git
247-
branch = v3.1.3-matter-hotfix.4
247+
branch = v3.3.0
248248
platforms = silabs
249249
[submodule "editline"]
250250
path = third_party/editline/repo

‎docs/zap_clusters.md

+1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ Generally regenerate using one of:
9090
| 257 | 0x101 | DoorLock |
9191
| 258 | 0x102 | WindowCovering |
9292
| 259 | 0x103 | BarrierControl |
93+
| 336 | 0x150 | ServiceArea |
9394
| 512 | 0x200 | PumpConfigurationAndControl |
9495
| 513 | 0x201 | Thermostat |
9596
| 514 | 0x202 | FanControl |

‎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,

‎examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter

+42-17
Original file line numberDiff line numberDiff line change
@@ -2326,7 +2326,7 @@ endpoint 0 {
23262326
callback attribute windowStatus;
23272327
callback attribute adminFabricIndex;
23282328
callback attribute adminVendorId;
2329-
ram attribute featureMap default = 0;
2329+
ram attribute featureMap default = 0x0001;
23302330
ram attribute clusterRevision default = 0x0001;
23312331

23322332
handle command OpenCommissioningWindow;
@@ -2386,7 +2386,7 @@ endpoint 1 {
23862386
callback attribute eventList;
23872387
callback attribute attributeList;
23882388
ram attribute featureMap default = 0;
2389-
ram attribute clusterRevision default = 2;
2389+
ram attribute clusterRevision default = 4;
23902390

23912391
handle command Identify;
23922392
handle command TriggerEffect;
@@ -2399,7 +2399,7 @@ endpoint 1 {
23992399
callback attribute eventList;
24002400
callback attribute attributeList;
24012401
ram attribute featureMap default = 0;
2402-
ram attribute clusterRevision default = 3;
2402+
ram attribute clusterRevision default = 4;
24032403

24042404
handle command AddGroup;
24052405
handle command AddGroupResponse;
@@ -2431,25 +2431,33 @@ endpoint 1 {
24312431
callback attribute degradationDirection;
24322432
callback attribute changeIndication;
24332433
callback attribute inPlaceIndicator;
2434+
callback attribute lastChangedTime;
2435+
callback attribute replacementProductList;
24342436
callback attribute generatedCommandList;
24352437
callback attribute acceptedCommandList;
24362438
callback attribute eventList;
24372439
callback attribute attributeList;
24382440
callback attribute featureMap;
24392441
ram attribute clusterRevision default = 1;
2442+
2443+
handle command ResetCondition;
24402444
}
24412445

24422446
server cluster ActivatedCarbonFilterMonitoring {
24432447
callback attribute condition;
24442448
callback attribute degradationDirection;
24452449
callback attribute changeIndication;
24462450
callback attribute inPlaceIndicator;
2451+
callback attribute lastChangedTime;
2452+
callback attribute replacementProductList;
24472453
callback attribute generatedCommandList;
24482454
callback attribute acceptedCommandList;
24492455
callback attribute eventList;
24502456
callback attribute attributeList;
24512457
callback attribute featureMap;
24522458
ram attribute clusterRevision default = 1;
2459+
2460+
handle command ResetCondition;
24532461
}
24542462

24552463
server cluster FanControl {
@@ -2460,7 +2468,7 @@ endpoint 1 {
24602468
ram attribute speedMax default = 10;
24612469
ram attribute speedSetting default = 0;
24622470
ram attribute speedCurrent default = 0;
2463-
ram attribute rockSupport default = 0x01;
2471+
ram attribute rockSupport default = 0x07;
24642472
ram attribute rockSetting default = 0x00;
24652473
ram attribute windSupport default = 0x03;
24662474
ram attribute windSetting default = 0x00;
@@ -2469,8 +2477,10 @@ endpoint 1 {
24692477
callback attribute acceptedCommandList;
24702478
callback attribute eventList;
24712479
callback attribute attributeList;
2472-
ram attribute featureMap default = 0;
2480+
ram attribute featureMap default = 0x3F;
24732481
ram attribute clusterRevision default = 4;
2482+
2483+
handle command Step;
24742484
}
24752485
}
24762486
endpoint 2 {
@@ -2521,6 +2531,7 @@ endpoint 2 {
25212531
callback attribute peakMeasuredValueWindow;
25222532
callback attribute averageMeasuredValue;
25232533
callback attribute averageMeasuredValueWindow;
2534+
callback attribute uncertainty;
25242535
callback attribute measurementUnit;
25252536
callback attribute measurementMedium;
25262537
callback attribute levelValue;
@@ -2540,6 +2551,7 @@ endpoint 2 {
25402551
callback attribute peakMeasuredValueWindow;
25412552
callback attribute averageMeasuredValue;
25422553
callback attribute averageMeasuredValueWindow;
2554+
callback attribute uncertainty;
25432555
callback attribute measurementUnit;
25442556
callback attribute measurementMedium;
25452557
callback attribute levelValue;
@@ -2548,7 +2560,7 @@ endpoint 2 {
25482560
callback attribute eventList;
25492561
callback attribute attributeList;
25502562
callback attribute featureMap;
2551-
ram attribute clusterRevision default = 1;
2563+
ram attribute clusterRevision default = 3;
25522564
}
25532565

25542566
server cluster NitrogenDioxideConcentrationMeasurement {
@@ -2559,6 +2571,7 @@ endpoint 2 {
25592571
callback attribute peakMeasuredValueWindow;
25602572
callback attribute averageMeasuredValue;
25612573
callback attribute averageMeasuredValueWindow;
2574+
callback attribute uncertainty;
25622575
callback attribute measurementUnit;
25632576
callback attribute measurementMedium;
25642577
callback attribute levelValue;
@@ -2578,6 +2591,7 @@ endpoint 2 {
25782591
callback attribute peakMeasuredValueWindow;
25792592
callback attribute averageMeasuredValue;
25802593
callback attribute averageMeasuredValueWindow;
2594+
callback attribute uncertainty;
25812595
callback attribute measurementUnit;
25822596
callback attribute measurementMedium;
25832597
callback attribute levelValue;
@@ -2597,6 +2611,7 @@ endpoint 2 {
25972611
callback attribute peakMeasuredValueWindow;
25982612
callback attribute averageMeasuredValue;
25992613
callback attribute averageMeasuredValueWindow;
2614+
callback attribute uncertainty;
26002615
callback attribute measurementUnit;
26012616
callback attribute measurementMedium;
26022617
callback attribute levelValue;
@@ -2616,6 +2631,7 @@ endpoint 2 {
26162631
callback attribute peakMeasuredValueWindow;
26172632
callback attribute averageMeasuredValue;
26182633
callback attribute averageMeasuredValueWindow;
2634+
callback attribute uncertainty;
26192635
callback attribute measurementUnit;
26202636
callback attribute measurementMedium;
26212637
callback attribute levelValue;
@@ -2635,6 +2651,7 @@ endpoint 2 {
26352651
callback attribute peakMeasuredValueWindow;
26362652
callback attribute averageMeasuredValue;
26372653
callback attribute averageMeasuredValueWindow;
2654+
callback attribute uncertainty;
26382655
callback attribute measurementUnit;
26392656
callback attribute measurementMedium;
26402657
callback attribute levelValue;
@@ -2654,6 +2671,7 @@ endpoint 2 {
26542671
callback attribute peakMeasuredValueWindow;
26552672
callback attribute averageMeasuredValue;
26562673
callback attribute averageMeasuredValueWindow;
2674+
callback attribute uncertainty;
26572675
callback attribute measurementUnit;
26582676
callback attribute measurementMedium;
26592677
callback attribute levelValue;
@@ -2673,6 +2691,7 @@ endpoint 2 {
26732691
callback attribute peakMeasuredValueWindow;
26742692
callback attribute averageMeasuredValue;
26752693
callback attribute averageMeasuredValueWindow;
2694+
callback attribute uncertainty;
26762695
callback attribute measurementUnit;
26772696
callback attribute measurementMedium;
26782697
callback attribute levelValue;
@@ -2692,6 +2711,7 @@ endpoint 2 {
26922711
callback attribute peakMeasuredValueWindow;
26932712
callback attribute averageMeasuredValue;
26942713
callback attribute averageMeasuredValueWindow;
2714+
callback attribute uncertainty;
26952715
callback attribute measurementUnit;
26962716
callback attribute measurementMedium;
26972717
callback attribute levelValue;
@@ -2735,15 +2755,16 @@ endpoint 3 {
27352755
}
27362756

27372757
server cluster TemperatureMeasurement {
2738-
ram attribute measuredValue;
2739-
ram attribute minMeasuredValue default = 0x8000;
2740-
ram attribute maxMeasuredValue default = 0x8000;
2758+
persist attribute measuredValue default = 0;
2759+
persist attribute minMeasuredValue default = -5000;
2760+
persist attribute maxMeasuredValue default = 7500;
2761+
persist attribute tolerance default = 10;
27412762
callback attribute generatedCommandList;
27422763
callback attribute acceptedCommandList;
27432764
callback attribute eventList;
27442765
callback attribute attributeList;
27452766
ram attribute featureMap default = 0;
2746-
ram attribute clusterRevision default = 1;
2767+
ram attribute clusterRevision default = 4;
27472768
}
27482769
}
27492770
endpoint 4 {
@@ -2778,9 +2799,10 @@ endpoint 4 {
27782799
}
27792800

27802801
server cluster RelativeHumidityMeasurement {
2781-
ram attribute measuredValue;
2782-
ram attribute minMeasuredValue;
2783-
ram attribute maxMeasuredValue;
2802+
ram attribute measuredValue default = 4600;
2803+
ram attribute minMeasuredValue default = 0;
2804+
ram attribute maxMeasuredValue default = 10000;
2805+
ram attribute tolerance default = 1;
27842806
callback attribute generatedCommandList;
27852807
callback attribute acceptedCommandList;
27862808
callback attribute eventList;
@@ -2821,12 +2843,15 @@ endpoint 5 {
28212843
}
28222844

28232845
server cluster Thermostat {
2824-
ram attribute localTemperature;
2846+
ram attribute localTemperature default = 2000;
2847+
ram attribute absMinHeatSetpointLimit default = 700;
2848+
ram attribute absMaxHeatSetpointLimit default = 3000;
2849+
persist attribute PIHeatingDemand default = 0;
28252850
ram attribute occupiedHeatingSetpoint default = 2000;
2826-
ram attribute minHeatSetpointLimit default = 1700;
2851+
ram attribute minHeatSetpointLimit default = 700;
28272852
ram attribute maxHeatSetpointLimit default = 3000;
2828-
ram attribute controlSequenceOfOperation default = 0x02;
2829-
ram attribute systemMode default = 0x00;
2853+
ram attribute controlSequenceOfOperation default = 2;
2854+
ram attribute systemMode default = 4;
28302855
callback attribute generatedCommandList;
28312856
callback attribute acceptedCommandList;
28322857
callback attribute eventList;

0 commit comments

Comments
 (0)