Skip to content

Commit b860517

Browse files
paklspakls
authored
Merge branch 'master' into genio/10-31
2 parents 5e917f8 + 1ee863e commit b860517

File tree

317 files changed

+38708
-40554
lines changed

Some content is hidden

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

317 files changed

+38708
-40554
lines changed

‎.github/dependabot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ updates:
77
allow:
88
- dependency-name: "third_party/pigweed/repo"
99
- dependency-name: "third_party/mbedtls/repo"
10-
- dependancy-name: "third_party/openthread/repo"
10+
- dependency-name: "third_party/openthread/repo"

‎config/nrfconnect/chip-module/Kconfig

+4
Original file line numberDiff line numberDiff line change
@@ -284,5 +284,9 @@ config CHIP_CERTIFiCATION_DECLARATION_OTA_IMAGE_ID
284284

285285
endif
286286

287+
# See config/zephyr/Kconfig for full definition
288+
config CHIP_FACTORY_RESET_ERASE_NVS
289+
bool
290+
default y if CHIP_FACTORY_DATA || CHIP_FACTORY_DATA_CUSTOM_BACKEND
287291

288292
endif

‎config/zephyr/Kconfig

+11
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,17 @@ config CHIP_CRYPTO_PSA
202202
Use the backend for the Matter crypto layer that is based on PSA crypto
203203
API instead of the default, based on legacy mbedTLS APIs.
204204

205+
config CHIP_FACTORY_RESET_ERASE_NVS
206+
bool "Erase NVS flash pages on factory reset"
207+
depends on SETTINGS_NVS
208+
help
209+
When factory reset is requested, erase flash pages occupied by non-volatile storage
210+
instead of removing Matter-related settings only. This provides a more robust
211+
factory reset mechanism and allows to regain the original storage performance if any
212+
firmware issue has brought it to an unexpected state. For this reason, it is
213+
advisable to set this option if all configuration, including device-specific
214+
entries, is supposed to be cleared on a factory reset.
215+
205216
config CHIP_MALLOC_SYS_HEAP
206217
bool "Memory allocator based on Zephyr sys_heap"
207218
imply SYS_HEAP_RUNTIME_STATS

‎docs/guides/nrfconnect_examples_configuration.md

+9
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,15 @@ instead of using a QR code, which is the default configuration.
193193
To enable NFC for commissioning and share the onboarding payload in an NFC tag,
194194
set the `CONFIG_CHIP_NFC_COMMISSIONING` option.
195195

196+
**Factory reset behavior**
197+
198+
By default, the factory reset procedure implemented in the Matter stack removes
199+
Matter-related settings only. If your application does not depend on any
200+
device-lifelong data stored in the non-volatile storage, set the
201+
`CONFIG_CHIP_FACTORY_RESET_ERASE_NVS` option to fully erase the NVS partition at
202+
the factory reset. This approach is more robust and regains the original NVS
203+
performance in case it has been polluted with unwanted entries.
204+
196205
**Logging**
197206

198207
You can enable logging for both the stack and Zephyr’s

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

+18-18
Original file line numberDiff line numberDiff line change
@@ -1530,7 +1530,7 @@
15301530
"name": "OTA Software Update Provider",
15311531
"code": 41,
15321532
"mfgCode": null,
1533-
"define": "OTA_PROVIDER_CLUSTER",
1533+
"define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
15341534
"side": "client",
15351535
"enabled": 1,
15361536
"commands": [
@@ -1582,7 +1582,7 @@
15821582
"name": "OTA Software Update Provider",
15831583
"code": 41,
15841584
"mfgCode": null,
1585-
"define": "OTA_PROVIDER_CLUSTER",
1585+
"define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
15861586
"side": "server",
15871587
"enabled": 0,
15881588
"commands": [
@@ -1658,7 +1658,7 @@
16581658
"name": "OTA Software Update Requestor",
16591659
"code": 42,
16601660
"mfgCode": null,
1661-
"define": "OTA_REQUESTOR_CLUSTER",
1661+
"define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
16621662
"side": "client",
16631663
"enabled": 0,
16641664
"commands": [
@@ -1694,7 +1694,7 @@
16941694
"name": "OTA Software Update Requestor",
16951695
"code": 42,
16961696
"mfgCode": null,
1697-
"define": "OTA_REQUESTOR_CLUSTER",
1697+
"define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
16981698
"side": "server",
16991699
"enabled": 1,
17001700
"attributes": [
@@ -7710,7 +7710,7 @@
77107710
"name": "Temperature Measurement",
77117711
"code": 1026,
77127712
"mfgCode": null,
7713-
"define": "TEMP_MEASUREMENT_CLUSTER",
7713+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
77147714
"side": "client",
77157715
"enabled": 0,
77167716
"attributes": [
@@ -7736,7 +7736,7 @@
77367736
"name": "Temperature Measurement",
77377737
"code": 1026,
77387738
"mfgCode": null,
7739-
"define": "TEMP_MEASUREMENT_CLUSTER",
7739+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
77407740
"side": "server",
77417741
"enabled": 0,
77427742
"attributes": [
@@ -10770,7 +10770,7 @@
1077010770
"name": "OTA Software Update Provider",
1077110771
"code": 41,
1077210772
"mfgCode": null,
10773-
"define": "OTA_PROVIDER_CLUSTER",
10773+
"define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
1077410774
"side": "client",
1077510775
"enabled": 0,
1077610776
"commands": [
@@ -10814,7 +10814,7 @@
1081410814
"name": "OTA Software Update Provider",
1081510815
"code": 41,
1081610816
"mfgCode": null,
10817-
"define": "OTA_PROVIDER_CLUSTER",
10817+
"define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
1081810818
"side": "server",
1081910819
"enabled": 0,
1082010820
"commands": [
@@ -10850,7 +10850,7 @@
1085010850
"name": "OTA Software Update Requestor",
1085110851
"code": 42,
1085210852
"mfgCode": null,
10853-
"define": "OTA_REQUESTOR_CLUSTER",
10853+
"define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
1085410854
"side": "client",
1085510855
"enabled": 0,
1085610856
"attributes": [
@@ -10876,7 +10876,7 @@
1087610876
"name": "OTA Software Update Requestor",
1087710877
"code": 42,
1087810878
"mfgCode": null,
10879-
"define": "OTA_REQUESTOR_CLUSTER",
10879+
"define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
1088010880
"side": "server",
1088110881
"enabled": 0,
1088210882
"attributes": [
@@ -14102,7 +14102,7 @@
1410214102
"name": "Pump Configuration and Control",
1410314103
"code": 512,
1410414104
"mfgCode": null,
14105-
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
14105+
"define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER",
1410614106
"side": "client",
1410714107
"enabled": 0,
1410814108
"attributes": [
@@ -14128,7 +14128,7 @@
1412814128
"name": "Pump Configuration and Control",
1412914129
"code": 512,
1413014130
"mfgCode": null,
14131-
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
14131+
"define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER",
1413214132
"side": "server",
1413314133
"enabled": 1,
1413414134
"attributes": [
@@ -15308,7 +15308,7 @@
1530815308
"name": "Thermostat User Interface Configuration",
1530915309
"code": 516,
1531015310
"mfgCode": null,
15311-
"define": "THERMOSTAT_UI_CONFIG_CLUSTER",
15311+
"define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER",
1531215312
"side": "client",
1531315313
"enabled": 0,
1531415314
"attributes": [
@@ -15334,7 +15334,7 @@
1533415334
"name": "Thermostat User Interface Configuration",
1533515335
"code": 516,
1533615336
"mfgCode": null,
15337-
"define": "THERMOSTAT_UI_CONFIG_CLUSTER",
15337+
"define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER",
1533815338
"side": "server",
1533915339
"enabled": 1,
1534015340
"attributes": [
@@ -16626,7 +16626,7 @@
1662616626
"name": "Temperature Measurement",
1662716627
"code": 1026,
1662816628
"mfgCode": null,
16629-
"define": "TEMP_MEASUREMENT_CLUSTER",
16629+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
1663016630
"side": "client",
1663116631
"enabled": 0,
1663216632
"attributes": [
@@ -16652,7 +16652,7 @@
1665216652
"name": "Temperature Measurement",
1665316653
"code": 1026,
1665416654
"mfgCode": null,
16655-
"define": "TEMP_MEASUREMENT_CLUSTER",
16655+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
1665616656
"side": "server",
1665716657
"enabled": 1,
1665816658
"attributes": [
@@ -24128,7 +24128,7 @@
2412824128
"name": "Temperature Measurement",
2412924129
"code": 1026,
2413024130
"mfgCode": null,
24131-
"define": "TEMP_MEASUREMENT_CLUSTER",
24131+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
2413224132
"side": "client",
2413324133
"enabled": 0,
2413424134
"attributes": [
@@ -24154,7 +24154,7 @@
2415424154
"name": "Temperature Measurement",
2415524155
"code": 1026,
2415624156
"mfgCode": null,
24157-
"define": "TEMP_MEASUREMENT_CLUSTER",
24157+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
2415824158
"side": "server",
2415924159
"enabled": 0,
2416024160
"attributes": [

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

+18-18
Original file line numberDiff line numberDiff line change
@@ -1530,7 +1530,7 @@
15301530
"name": "OTA Software Update Provider",
15311531
"code": 41,
15321532
"mfgCode": null,
1533-
"define": "OTA_PROVIDER_CLUSTER",
1533+
"define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
15341534
"side": "client",
15351535
"enabled": 1,
15361536
"commands": [
@@ -1582,7 +1582,7 @@
15821582
"name": "OTA Software Update Provider",
15831583
"code": 41,
15841584
"mfgCode": null,
1585-
"define": "OTA_PROVIDER_CLUSTER",
1585+
"define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
15861586
"side": "server",
15871587
"enabled": 0,
15881588
"commands": [
@@ -1658,7 +1658,7 @@
16581658
"name": "OTA Software Update Requestor",
16591659
"code": 42,
16601660
"mfgCode": null,
1661-
"define": "OTA_REQUESTOR_CLUSTER",
1661+
"define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
16621662
"side": "client",
16631663
"enabled": 0,
16641664
"commands": [
@@ -1694,7 +1694,7 @@
16941694
"name": "OTA Software Update Requestor",
16951695
"code": 42,
16961696
"mfgCode": null,
1697-
"define": "OTA_REQUESTOR_CLUSTER",
1697+
"define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
16981698
"side": "server",
16991699
"enabled": 1,
17001700
"attributes": [
@@ -7710,7 +7710,7 @@
77107710
"name": "Temperature Measurement",
77117711
"code": 1026,
77127712
"mfgCode": null,
7713-
"define": "TEMP_MEASUREMENT_CLUSTER",
7713+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
77147714
"side": "client",
77157715
"enabled": 0,
77167716
"attributes": [
@@ -7736,7 +7736,7 @@
77367736
"name": "Temperature Measurement",
77377737
"code": 1026,
77387738
"mfgCode": null,
7739-
"define": "TEMP_MEASUREMENT_CLUSTER",
7739+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
77407740
"side": "server",
77417741
"enabled": 0,
77427742
"attributes": [
@@ -10620,7 +10620,7 @@
1062010620
"name": "OTA Software Update Provider",
1062110621
"code": 41,
1062210622
"mfgCode": null,
10623-
"define": "OTA_PROVIDER_CLUSTER",
10623+
"define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
1062410624
"side": "client",
1062510625
"enabled": 0,
1062610626
"commands": [
@@ -10664,7 +10664,7 @@
1066410664
"name": "OTA Software Update Provider",
1066510665
"code": 41,
1066610666
"mfgCode": null,
10667-
"define": "OTA_PROVIDER_CLUSTER",
10667+
"define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
1066810668
"side": "server",
1066910669
"enabled": 0,
1067010670
"commands": [
@@ -10700,7 +10700,7 @@
1070010700
"name": "OTA Software Update Requestor",
1070110701
"code": 42,
1070210702
"mfgCode": null,
10703-
"define": "OTA_REQUESTOR_CLUSTER",
10703+
"define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
1070410704
"side": "client",
1070510705
"enabled": 0,
1070610706
"attributes": [
@@ -10726,7 +10726,7 @@
1072610726
"name": "OTA Software Update Requestor",
1072710727
"code": 42,
1072810728
"mfgCode": null,
10729-
"define": "OTA_REQUESTOR_CLUSTER",
10729+
"define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
1073010730
"side": "server",
1073110731
"enabled": 0,
1073210732
"attributes": [
@@ -13872,7 +13872,7 @@
1387213872
"name": "Pump Configuration and Control",
1387313873
"code": 512,
1387413874
"mfgCode": null,
13875-
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
13875+
"define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER",
1387613876
"side": "client",
1387713877
"enabled": 0,
1387813878
"attributes": [
@@ -13898,7 +13898,7 @@
1389813898
"name": "Pump Configuration and Control",
1389913899
"code": 512,
1390013900
"mfgCode": null,
13901-
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
13901+
"define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER",
1390213902
"side": "server",
1390313903
"enabled": 1,
1390413904
"attributes": [
@@ -15014,7 +15014,7 @@
1501415014
"name": "Thermostat User Interface Configuration",
1501515015
"code": 516,
1501615016
"mfgCode": null,
15017-
"define": "THERMOSTAT_UI_CONFIG_CLUSTER",
15017+
"define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER",
1501815018
"side": "client",
1501915019
"enabled": 0,
1502015020
"attributes": [
@@ -15040,7 +15040,7 @@
1504015040
"name": "Thermostat User Interface Configuration",
1504115041
"code": 516,
1504215042
"mfgCode": null,
15043-
"define": "THERMOSTAT_UI_CONFIG_CLUSTER",
15043+
"define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER",
1504415044
"side": "server",
1504515045
"enabled": 1,
1504615046
"attributes": [
@@ -16332,7 +16332,7 @@
1633216332
"name": "Temperature Measurement",
1633316333
"code": 1026,
1633416334
"mfgCode": null,
16335-
"define": "TEMP_MEASUREMENT_CLUSTER",
16335+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
1633616336
"side": "client",
1633716337
"enabled": 0,
1633816338
"attributes": [
@@ -16358,7 +16358,7 @@
1635816358
"name": "Temperature Measurement",
1635916359
"code": 1026,
1636016360
"mfgCode": null,
16361-
"define": "TEMP_MEASUREMENT_CLUSTER",
16361+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
1636216362
"side": "server",
1636316363
"enabled": 1,
1636416364
"attributes": [
@@ -23904,7 +23904,7 @@
2390423904
"name": "Temperature Measurement",
2390523905
"code": 1026,
2390623906
"mfgCode": null,
23907-
"define": "TEMP_MEASUREMENT_CLUSTER",
23907+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
2390823908
"side": "client",
2390923909
"enabled": 0,
2391023910
"attributes": [
@@ -23930,7 +23930,7 @@
2393023930
"name": "Temperature Measurement",
2393123931
"code": 1026,
2393223932
"mfgCode": null,
23933-
"define": "TEMP_MEASUREMENT_CLUSTER",
23933+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
2393423934
"side": "server",
2393523935
"enabled": 0,
2393623936
"attributes": [

‎examples/android/CHIPTool/.idea/jarRepositories.xml

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)