Skip to content

Commit f5ba9a5

Browse files
Alami-AmineAlami-Amine
authored
Merge branch 'master' into AA/LambdaBridgeGLib
2 parents af70f8a + 648f088 commit f5ba9a5

File tree

54 files changed

+316
-323
lines changed

Some content is hidden

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

54 files changed

+316
-323
lines changed

‎.github/workflows/darwin.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
framework:
3737
name: Build framework
3838
if: github.actor != 'restyled-io[bot]'
39-
runs-on: macos-14
39+
runs-on: macos-13
4040
strategy:
4141
matrix:
4242
options: # We don't need a full matrix
@@ -73,7 +73,7 @@ jobs:
7373
name: Run framework tests
7474
if: github.actor != 'restyled-io[bot]'
7575
needs: [framework] # serialize to avoid running to many parallel macos runners
76-
runs-on: macos-14
76+
runs-on: macos-13
7777
strategy:
7878
matrix:
7979
options: # We don't need a full matrix

‎docs/guides/nxp/nxp_manufacturing_flow.md

+11-30
Original file line numberDiff line numberDiff line change
@@ -137,34 +137,14 @@ Here is the interpretation of the **optional** parameters:
137137

138138
## 3. Write provisioning data
139139

140-
For the **K32W0x1** variants, the binary needs to be written in the internal
141-
flash at location **0x9D600** using `DK6Programmer.exe`:
142-
143-
```shell
144-
DK6Programmer.exe -Y -V2 -s <COM_PORT> -P 1000000 -Y -p FLASH@0x9D600="factory_data.bin"
145-
```
146-
147-
For **K32W1** platform, the binary needs to be written in the internal flash at
148-
location given by **0xFE080**, using `JLink`:
149-
150-
```
151-
loadfile factory_data.bin 0xFE080
152-
```
153-
154-
For **RW61X** platform, the binary needs to be written in the internal flash at
155-
location given by `__MATTER_FACTORY_DATA_START`, using `JLink`:
156-
157-
```
158-
loadfile factory_data.bin 0xBFFF000
159-
```
160-
161-
where `0xBFFF000` is the value of `__FACTORY_DATA_START` in the corresponding
162-
.map file (can be different if using a custom linker script).
163-
164-
For the **RT1060** and **RT1170** platform, the binary needs to be written using
165-
`MCUXpresso Flash Tool GUI` at the address value corresponding to
166-
`__FACTORY_DATA_START` (the map file of the application should be checked to get
167-
the exact value).
140+
| platform | tool | command | details |
141+
| --------- | -------------------------------- | ------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------- |
142+
| `k32w0x1` | `DK6Programmer.exe` or `dk6prog` | `DK6Programmer.exe -Y -V2 -s <COM_PORT> -P 1000000 -Y -p FLASH@0x9D600="factory_data.bin"` | NA |
143+
| `k32w1` | `JLink` | `loadfile factory_data.bin 0xFE080` | NA |
144+
| `mcxw71` | `JLink` | `loadfile factory_data.bin 0xFE080` | NA |
145+
| `rw61x` | `JLink` | `loadfile factory_data.bin 0xBFFF000` | Here, `0xBFFF000` is the value of symbol `__FACTORY_DATA_START` from the corresponding `.map` file |
146+
| `rt1060` | `MCUXpresso Flash Tool GUI` | NA | The address is given by the `__FACTORY_DATA_START` symbol in the `.map` file |
147+
| `rt1170` | `MCUXpresso Flash Tool GUI` | NA | The address is given by the `__FACTORY_DATA_START` symbol in the `.map` file |
168148

169149
## 4. Build app and usage
170150

@@ -202,11 +182,12 @@ Also, demo **DAC**, **PAI** and **PAA** certificates needed in case
202182

203183
## 6. Increased security for DAC private key
204184

205-
### 6.1 K32W1
185+
### 6.1 SSS-based platforms
206186

207187
Supported platforms:
208188

209-
- K32W1 - `src/plaftorm/nxp/k32w1/FactoryDataProviderImpl.h`
189+
- `k32w1`
190+
- `mcxw71`
210191

211192
For platforms that have a secure subsystem (`SSS`), the DAC private key can be
212193
converted to an encrypted blob. This blob will overwrite the DAC private key in

‎examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1930,7 +1930,7 @@ endpoint 1 {
19301930
}
19311931

19321932
server cluster OnOff {
1933-
ram attribute onOff default = 0;
1933+
persist attribute onOff default = 0;
19341934
callback attribute generatedCommandList;
19351935
callback attribute acceptedCommandList;
19361936
callback attribute eventList;
@@ -1991,7 +1991,7 @@ endpoint 1 {
19911991
}
19921992

19931993
server cluster FanControl {
1994-
ram attribute fanMode default = 0;
1994+
persist attribute fanMode default = 0;
19951995
ram attribute fanModeSequence default = 2;
19961996
ram attribute percentSetting default = 0;
19971997
ram attribute percentCurrent default = 0;

‎examples/chef/devices/rootnode_airpurifier_73a6fe2651.zap

+2-2
Original file line numberDiff line numberDiff line change
@@ -2492,7 +2492,7 @@
24922492
"side": "server",
24932493
"type": "boolean",
24942494
"included": 1,
2495-
"storageOption": "RAM",
2495+
"storageOption": "NVM",
24962496
"singleton": 0,
24972497
"bounded": 0,
24982498
"defaultValue": "0",
@@ -3218,7 +3218,7 @@
32183218
"side": "server",
32193219
"type": "FanModeEnum",
32203220
"included": 1,
3221-
"storageOption": "RAM",
3221+
"storageOption": "NVM",
32223222
"singleton": 0,
32233223
"bounded": 0,
32243224
"defaultValue": "0",

‎examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter

+6-6
Original file line numberDiff line numberDiff line change
@@ -2750,7 +2750,7 @@ endpoint 1 {
27502750
}
27512751

27522752
server cluster FanControl {
2753-
ram attribute fanMode default = 0;
2753+
persist attribute fanMode default = 0;
27542754
ram attribute fanModeSequence default = 2;
27552755
ram attribute percentSetting default = 0;
27562756
ram attribute percentCurrent default = 0;
@@ -3136,11 +3136,11 @@ endpoint 5 {
31363136
ram attribute absMinHeatSetpointLimit default = 700;
31373137
ram attribute absMaxHeatSetpointLimit default = 3000;
31383138
persist attribute PIHeatingDemand default = 0;
3139-
ram attribute occupiedHeatingSetpoint default = 2000;
3140-
ram attribute minHeatSetpointLimit default = 700;
3141-
ram attribute maxHeatSetpointLimit default = 3000;
3142-
ram attribute controlSequenceOfOperation default = 2;
3143-
ram attribute systemMode default = 4;
3139+
persist attribute occupiedHeatingSetpoint default = 2000;
3140+
persist attribute minHeatSetpointLimit default = 700;
3141+
persist attribute maxHeatSetpointLimit default = 3000;
3142+
persist attribute controlSequenceOfOperation default = 2;
3143+
persist attribute systemMode default = 4;
31443144
callback attribute generatedCommandList;
31453145
callback attribute acceptedCommandList;
31463146
callback attribute eventList;

‎examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap

+6-6
Original file line numberDiff line numberDiff line change
@@ -2927,7 +2927,7 @@
29272927
"side": "server",
29282928
"type": "FanModeEnum",
29292929
"included": 1,
2930-
"storageOption": "RAM",
2930+
"storageOption": "NVM",
29312931
"singleton": 0,
29322932
"bounded": 0,
29332933
"defaultValue": "0",
@@ -7993,7 +7993,7 @@
79937993
"side": "server",
79947994
"type": "temperature",
79957995
"included": 1,
7996-
"storageOption": "RAM",
7996+
"storageOption": "NVM",
79977997
"singleton": 0,
79987998
"bounded": 0,
79997999
"defaultValue": "2000",
@@ -8009,7 +8009,7 @@
80098009
"side": "server",
80108010
"type": "temperature",
80118011
"included": 1,
8012-
"storageOption": "RAM",
8012+
"storageOption": "NVM",
80138013
"singleton": 0,
80148014
"bounded": 0,
80158015
"defaultValue": "700",
@@ -8025,7 +8025,7 @@
80258025
"side": "server",
80268026
"type": "temperature",
80278027
"included": 1,
8028-
"storageOption": "RAM",
8028+
"storageOption": "NVM",
80298029
"singleton": 0,
80308030
"bounded": 0,
80318031
"defaultValue": "3000",
@@ -8041,7 +8041,7 @@
80418041
"side": "server",
80428042
"type": "ControlSequenceOfOperationEnum",
80438043
"included": 1,
8044-
"storageOption": "RAM",
8044+
"storageOption": "NVM",
80458045
"singleton": 0,
80468046
"bounded": 0,
80478047
"defaultValue": "2",
@@ -8057,7 +8057,7 @@
80578057
"side": "server",
80588058
"type": "SystemModeEnum",
80598059
"included": 1,
8060-
"storageOption": "RAM",
8060+
"storageOption": "NVM",
80618061
"singleton": 0,
80628062
"bounded": 0,
80638063
"defaultValue": "4",

‎examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2581,7 +2581,7 @@ endpoint 1 {
25812581
emits event BatFaultChange;
25822582
emits event BatChargeFaultChange;
25832583
ram attribute status default = 1;
2584-
ram attribute order default = 1;
2584+
persist attribute order default = 1;
25852585
ram attribute description default = "Primary Battery";
25862586
ram attribute batVoltage default = 4100;
25872587
ram attribute batPercentRemaining default = 95;

‎examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -2652,7 +2652,7 @@
26522652
"side": "server",
26532653
"type": "int8u",
26542654
"included": 1,
2655-
"storageOption": "RAM",
2655+
"storageOption": "NVM",
26562656
"singleton": 0,
26572657
"bounded": 0,
26582658
"defaultValue": "1",

‎examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2484,7 +2484,7 @@ endpoint 1 {
24842484

24852485
server cluster PowerSource {
24862486
ram attribute status default = 1;
2487-
ram attribute order default = 1;
2487+
persist attribute order default = 1;
24882488
ram attribute description default = "Primary Battery";
24892489
ram attribute batVoltage default = 4100;
24902490
ram attribute batPercentRemaining default = 95;

‎examples/chef/devices/rootnode_contactsensor_27f76aeaf5.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -2660,7 +2660,7 @@
26602660
"side": "server",
26612661
"type": "int8u",
26622662
"included": 1,
2663-
"storageOption": "RAM",
2663+
"storageOption": "NVM",
26642664
"singleton": 0,
26652665
"bounded": 0,
26662666
"defaultValue": "1",

‎examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2084,7 +2084,7 @@ endpoint 1 {
20842084

20852085
server cluster PowerSource {
20862086
ram attribute status default = 1;
2087-
ram attribute order default = 1;
2087+
persist attribute order default = 1;
20882088
ram attribute description default = "Battery";
20892089
ram attribute batVoltage default = 2590;
20902090
ram attribute batPercentRemaining default = 98;

‎examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -2840,7 +2840,7 @@
28402840
"side": "server",
28412841
"type": "int8u",
28422842
"included": 1,
2843-
"storageOption": "RAM",
2843+
"storageOption": "NVM",
28442844
"singleton": 0,
28452845
"bounded": 0,
28462846
"defaultValue": "1",

‎examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter

+4-4
Original file line numberDiff line numberDiff line change
@@ -2057,11 +2057,11 @@ endpoint 1 {
20572057
}
20582058

20592059
server cluster OnOff {
2060-
ram attribute onOff default = 0;
2060+
persist attribute onOff default = 0;
20612061
ram attribute globalSceneControl default = 1;
20622062
ram attribute onTime default = 0;
20632063
ram attribute offWaitTime default = 0;
2064-
ram attribute startUpOnOff default = 0;
2064+
persist attribute startUpOnOff default = 0;
20652065
callback attribute generatedCommandList;
20662066
callback attribute acceptedCommandList;
20672067
callback attribute attributeList;
@@ -2074,13 +2074,13 @@ endpoint 1 {
20742074
}
20752075

20762076
server cluster LevelControl {
2077-
ram attribute currentLevel default = 0x01;
2077+
persist attribute currentLevel default = 0x01;
20782078
ram attribute remainingTime default = 0x0000;
20792079
ram attribute minLevel default = 0x01;
20802080
ram attribute maxLevel default = 0xFE;
20812081
ram attribute options default = 0x03;
20822082
ram attribute onLevel default = 0xFE;
2083-
ram attribute startUpCurrentLevel default = 0x00;
2083+
persist attribute startUpCurrentLevel default = 0x00;
20842084
callback attribute generatedCommandList;
20852085
callback attribute acceptedCommandList;
20862086
callback attribute attributeList;

‎examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap

+4-4
Original file line numberDiff line numberDiff line change
@@ -2704,7 +2704,7 @@
27042704
"side": "server",
27052705
"type": "boolean",
27062706
"included": 1,
2707-
"storageOption": "RAM",
2707+
"storageOption": "NVM",
27082708
"singleton": 0,
27092709
"bounded": 0,
27102710
"defaultValue": "0",
@@ -2768,7 +2768,7 @@
27682768
"side": "server",
27692769
"type": "StartUpOnOffEnum",
27702770
"included": 1,
2771-
"storageOption": "RAM",
2771+
"storageOption": "NVM",
27722772
"singleton": 0,
27732773
"bounded": 0,
27742774
"defaultValue": "0",
@@ -2940,7 +2940,7 @@
29402940
"side": "server",
29412941
"type": "int8u",
29422942
"included": 1,
2943-
"storageOption": "RAM",
2943+
"storageOption": "NVM",
29442944
"singleton": 0,
29452945
"bounded": 0,
29462946
"defaultValue": "0x01",
@@ -3036,7 +3036,7 @@
30363036
"side": "server",
30373037
"type": "int8u",
30383038
"included": 1,
3039-
"storageOption": "RAM",
3039+
"storageOption": "NVM",
30403040
"singleton": 0,
30413041
"bounded": 0,
30423042
"defaultValue": "0x00",

‎examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.matter

+4-4
Original file line numberDiff line numberDiff line change
@@ -2214,11 +2214,11 @@ endpoint 1 {
22142214
}
22152215

22162216
server cluster OnOff {
2217-
ram attribute onOff default = 0;
2217+
persist attribute onOff default = 0;
22182218
ram attribute globalSceneControl default = 1;
22192219
ram attribute onTime default = 0;
22202220
ram attribute offWaitTime default = 0;
2221-
ram attribute startUpOnOff default = 0;
2221+
persist attribute startUpOnOff default = 0;
22222222
callback attribute generatedCommandList;
22232223
callback attribute acceptedCommandList;
22242224
callback attribute eventList;
@@ -2235,13 +2235,13 @@ endpoint 1 {
22352235
}
22362236

22372237
server cluster LevelControl {
2238-
ram attribute currentLevel default = 0x01;
2238+
persist attribute currentLevel default = 0x01;
22392239
ram attribute remainingTime default = 0x0000;
22402240
ram attribute minLevel default = 0x01;
22412241
ram attribute maxLevel default = 0xFE;
22422242
ram attribute options default = 0x00;
22432243
ram attribute onLevel default = 0xFE;
2244-
ram attribute startUpCurrentLevel default = 0x00;
2244+
persist attribute startUpCurrentLevel default = 0x00;
22452245
callback attribute generatedCommandList;
22462246
callback attribute acceptedCommandList;
22472247
callback attribute eventList;

‎examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.zap

+4-4
Original file line numberDiff line numberDiff line change
@@ -2736,7 +2736,7 @@
27362736
"side": "server",
27372737
"type": "boolean",
27382738
"included": 1,
2739-
"storageOption": "RAM",
2739+
"storageOption": "NVM",
27402740
"singleton": 0,
27412741
"bounded": 0,
27422742
"defaultValue": "0",
@@ -2800,7 +2800,7 @@
28002800
"side": "server",
28012801
"type": "StartUpOnOffEnum",
28022802
"included": 1,
2803-
"storageOption": "RAM",
2803+
"storageOption": "NVM",
28042804
"singleton": 0,
28052805
"bounded": 0,
28062806
"defaultValue": "0",
@@ -2988,7 +2988,7 @@
29882988
"side": "server",
29892989
"type": "int8u",
29902990
"included": 1,
2991-
"storageOption": "RAM",
2991+
"storageOption": "NVM",
29922992
"singleton": 0,
29932993
"bounded": 0,
29942994
"defaultValue": "0x01",
@@ -3084,7 +3084,7 @@
30843084
"side": "server",
30853085
"type": "int8u",
30863086
"included": 1,
3087-
"storageOption": "RAM",
3087+
"storageOption": "NVM",
30883088
"singleton": 0,
30893089
"bounded": 0,
30903090
"defaultValue": "0x00",

‎examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2602,7 +2602,7 @@ endpoint 1 {
26022602

26032603
server cluster PowerSource {
26042604
ram attribute status default = 1;
2605-
ram attribute order default = 1;
2605+
persist attribute order default = 1;
26062606
ram attribute description default = "Battery";
26072607
ram attribute batVoltage;
26082608
ram attribute batPercentRemaining;

‎examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap

+1-1
Original file line numberDiff line numberDiff line change
@@ -2676,7 +2676,7 @@
26762676
"side": "server",
26772677
"type": "int8u",
26782678
"included": 1,
2679-
"storageOption": "RAM",
2679+
"storageOption": "NVM",
26802680
"singleton": 0,
26812681
"bounded": 0,
26822682
"defaultValue": "1",

0 commit comments

Comments
 (0)