Skip to content

Commit 08d7c60

Browse files
hyunuktakhyunuktak
authored
Merge branch 'master' into tizen
2 parents 90bc29c + 4e33240 commit 08d7c60

File tree

125 files changed

+5442
-4578
lines changed

Some content is hidden

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

125 files changed

+5442
-4578
lines changed

‎.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Mark all files in the "gen" folders as auto-generated to hide them in diffs
2+
**/gen/** linguist-generated

‎config/esp32/components/chip/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ menu "CHIP Device Layer"
488488

489489
config WIFI_AP_IDLE_TIMEOUT
490490
int "WiFi AP Idle Timeout (ms)"
491-
range 0 65535
491+
range 0 600000
492492
default 120000
493493
help
494494
The amount of time (in milliseconds) after which the CHIP platform will deactivate the soft-AP

‎config/esp32/components/chip/component.mk

+1
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ COMPONENT_ADD_INCLUDEDIRS += $(REL_OUTPUT_DIR)/src/include \
101101
COMPONENT_OWNBUILDTARGET = 1
102102
COMPONENT_OWNCLEANTARGET = 1
103103

104+
is_debug ?= true
104105

105106
# ==================================================
106107
# Build Rules

‎credentials/test/attestation/Chip-Test-PAA-FFF1-Cert.der

4 Bytes
Binary file not shown.

‎credentials/test/attestation/Chip-Test-PAA-FFF1-Cert.pem

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIBmTCCAT+gAwIBAgIIaDhPq7kZ/N8wCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
2+
MIIBnTCCAUKgAwIBAgIIPkgLCCqFJx8wCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
33
TWF0dGVyIFRlc3QgUEFBIEZGRjEwIBcNMjEwNjI4MTQyMzQzWhgPOTk5OTEyMzEy
44
MzU5NTlaMB8xHTAbBgNVBAMMFE1hdHRlciBUZXN0IFBBQSBGRkYxMFkwEwYHKoZI
55
zj0CAQYIKoZIzj0DAQcDQgAEG5isW7wR3GoXVaBbCsXha6AsRu5vwrvnb/fPbKeq
6-
Tp/R15jcvvtP6uIl03c8kTSMwm1JMTHjCWMtXp7zHRLek6NjMGEwDwYDVR0TAQH/
7-
BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFO8Y4OzUZgQ03w28kR7U
8-
UhaZZoOfMB8GA1UdIwQYMBaAFO8Y4OzUZgQ03w28kR7UUhaZZoOfMAoGCCqGSM49
9-
BAMCA0gAMEUCIQCn+l+nZv/3tf0VjNNPYl1IkSAOBYUO8SX23udWVPmXNgIgI7Ub
10-
bkJTKCjbCZIDNwUNcPC2tyzNPLeB5nGsIl31Rys=
6+
Tp/R15jcvvtP6uIl03c8kTSMwm1JMTHjCWMtXp7zHRLek6NmMGQwEgYDVR0TAQH/
7+
BAgwBgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFO8Y4OzUZgQ03w28
8+
kR7UUhaZZoOfMB8GA1UdIwQYMBaAFO8Y4OzUZgQ03w28kR7UUhaZZoOfMAoGCCqG
9+
SM49BAMCA0kAMEYCIQDHQclgaMyReHFBbWrBPNiduu+Y+umYSwdnYoLTA7ksBgIh
10+
AKnXTWyUsSlCjlMtA1NSh6ay249U8Jy0xzHWv0PLW8pC
1111
-----END CERTIFICATE-----

‎credentials/test/attestation/Chip-Test-PAA-FFF2-Cert.der

5 Bytes
Binary file not shown.

‎credentials/test/attestation/Chip-Test-PAA-FFF2-Cert.pem

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIBmDCCAT+gAwIBAgIIabTWq+iZPl0wCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
2+
MIIBnTCCAUKgAwIBAgIIA5KnZVo+bHcwCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
33
TWF0dGVyIFRlc3QgUEFBIEZGRjIwIBcNMjEwNjI4MTQyMzQzWhgPOTk5OTEyMzEy
44
MzU5NTlaMB8xHTAbBgNVBAMMFE1hdHRlciBUZXN0IFBBQSBGRkYyMFkwEwYHKoZI
55
zj0CAQYIKoZIzj0DAQcDQgAEdW4YkvnpULAOlQqilfM1sEhLh20i4m+WZZLKweUQ
6-
1f6Zsx1cmIgWeorWUDd+dRD7dYI8fluYuMAG7F8Gz66FSqNjMGEwDwYDVR0TAQH/
7-
BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFOfv6sMzXF/Qw+Y0Up8W
8-
cEbEvKVcMB8GA1UdIwQYMBaAFOfv6sMzXF/Qw+Y0Up8WcEbEvKVcMAoGCCqGSM49
9-
BAMCA0cAMEQCIGq8jf1kG2hXC38ut2/BhpFh2BeMh8VQcrUzG/E+dDVcAiBysDJW
10-
TQIA/ursIC1aKt0Tr0daZxQo10z6Z5flgbQKUA==
6+
1f6Zsx1cmIgWeorWUDd+dRD7dYI8fluYuMAG7F8Gz66FSqNmMGQwEgYDVR0TAQH/
7+
BAgwBgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFOfv6sMzXF/Qw+Y0
8+
Up8WcEbEvKVcMB8GA1UdIwQYMBaAFOfv6sMzXF/Qw+Y0Up8WcEbEvKVcMAoGCCqG
9+
SM49BAMCA0kAMEYCIQCSUQ0dYCFfARvaLqeV/ssklO+QppeHrQr8IGxhjAnMUgIh
10+
AKA2sK+D40VcCTi5S/9HdRlyuNy+cZyfYbVW7LTqF8xX
1111
-----END CERTIFICATE-----

‎credentials/test/attestation/Chip-Test-PAI-FFF1-8000-Cert.der

5 Bytes
Binary file not shown.

‎credentials/test/attestation/Chip-Test-PAI-FFF1-8000-Cert.pem

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIBvzCCAWagAwIBAgIIfpkqTYmEBRUwCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
2+
MIIBxDCCAWmgAwIBAgIIBXAmqJAFs6UwCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
33
TWF0dGVyIFRlc3QgUEFBIEZGRjEwIBcNMjEwNjI4MTQyMzQzWhgPOTk5OTEyMzEy
44
MzU5NTlaMEYxGDAWBgNVBAMMD01hdHRlciBUZXN0IFBBSTEUMBIGCisGAQQBgqJ8
55
AgEMBEZGRjExFDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZI
66
zj0DAQcDQgAEynPORkG/CDtKM42gQxoKMjB/ZtFgV0tmEi8lBs9q03Djf2XWNHrn
7-
l6GXJlBQl200rHtjezvaC1vYQ+2OXV6b8qNjMGEwDwYDVR0TAQH/BAUwAwEB/zAO
8-
BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFIT1Hf+ezNopNZRIUg6F8Skto+3XMB8G
9-
A1UdIwQYMBaAFO8Y4OzUZgQ03w28kR7UUhaZZoOfMAoGCCqGSM49BAMCA0cAMEQC
10-
IFlGfLWq/BpStUOJbdI73kXQgGxTpzec5xLkqAqtZ6taAiA/mv80v+8mVtOb+tF2
11-
WCRrNllsMubAajV+yukQb3k0dQ==
7+
l6GXJlBQl200rHtjezvaC1vYQ+2OXV6b8qNmMGQwEgYDVR0TAQH/BAgwBgEB/wIB
8+
ADAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFIT1Hf+ezNopNZRIUg6F8Skto+3X
9+
MB8GA1UdIwQYMBaAFO8Y4OzUZgQ03w28kR7UUhaZZoOfMAoGCCqGSM49BAMCA0kA
10+
MEYCIQCZOYY4qq/OMNuma0XvCumxHeticRSrWCzbghtPf/+52AIhALMhsOr2dfqj
11+
LAR0nHmPYGs7IsEmZd/UE/nWxCSo/868
1212
-----END CERTIFICATE-----

‎credentials/test/attestation/Chip-Test-PAI-FFF1-8001-Cert.der

3 Bytes
Binary file not shown.

‎credentials/test/attestation/Chip-Test-PAI-FFF1-8001-Cert.pem

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIBwDCCAWagAwIBAgIIOfa+AYgJN3gwCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
2+
MIIBwzCCAWmgAwIBAgIITSplyxPvQE0wCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
33
TWF0dGVyIFRlc3QgUEFBIEZGRjEwIBcNMjEwNjI4MTQyMzQzWhgPOTk5OTEyMzEy
44
MzU5NTlaMEYxGDAWBgNVBAMMD01hdHRlciBUZXN0IFBBSTEUMBIGCisGAQQBgqJ8
55
AgEMBEZGRjExFDASBgorBgEEAYKifAICDAQ4MDAxMFkwEwYHKoZIzj0CAQYIKoZI
66
zj0DAQcDQgAE63okUnxFcFGPmgZLDvKIBFt0V9AMgpKGYTLXvvkYxovjGrSDfa1n
7-
hmDdxJaJVVQGBhOz9jKIaxOj1sp+68PMs6NjMGEwDwYDVR0TAQH/BAUwAwEB/zAO
8-
BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJlJAzbtRDWhtz2JXcPWyRaxdE40MB8G
9-
A1UdIwQYMBaAFO8Y4OzUZgQ03w28kR7UUhaZZoOfMAoGCCqGSM49BAMCA0gAMEUC
10-
IQD1Vgrcf09s7NwDcFje6LOHQVDPrC4VkNSDMVZBJ5H6wQIgVo8JuexQ4KwZc7z9
11-
8h/g4QHlLBv2T0U++woATn6biTs=
7+
hmDdxJaJVVQGBhOz9jKIaxOj1sp+68PMs6NmMGQwEgYDVR0TAQH/BAgwBgEB/wIB
8+
ADAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJlJAzbtRDWhtz2JXcPWyRaxdE40
9+
MB8GA1UdIwQYMBaAFO8Y4OzUZgQ03w28kR7UUhaZZoOfMAoGCCqGSM49BAMCA0gA
10+
MEUCIQCbz5xONSJDdLLgWIbER5/Zd3thISF9ElaGubVPHSHFtAIgbHoTzwcuFCNS
11+
Ksb6CjhujsZxa8AdTZlaAbBAcAMMH3M=
1212
-----END CERTIFICATE-----

‎credentials/test/attestation/Chip-Test-PAI-FFF2-8000-Cert.der

5 Bytes
Binary file not shown.

‎credentials/test/attestation/Chip-Test-PAI-FFF2-8000-Cert.pem

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIBvzCCAWagAwIBAgIINH+acwAlToMwCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
2+
MIIBxDCCAWmgAwIBAgIICDRqlhDWSBAwCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
33
TWF0dGVyIFRlc3QgUEFBIEZGRjIwIBcNMjEwNjI4MTQyMzQzWhgPOTk5OTEyMzEy
44
MzU5NTlaMEYxGDAWBgNVBAMMD01hdHRlciBUZXN0IFBBSTEUMBIGCisGAQQBgqJ8
55
AgEMBEZGRjIxFDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZI
66
zj0DAQcDQgAE9WxJasCpj9Yqwmqkvju6KOAwD+jC5NeLMbz8aDYbVBTzZdkkabYH
7-
LcOt8Kgqop8jKMHE/htCZeQfH5lDLl9JIqNjMGEwDwYDVR0TAQH/BAUwAwEB/zAO
8-
BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFFpwXHDpF99K1qV3cHUT/2I5KEm7MB8G
9-
A1UdIwQYMBaAFOfv6sMzXF/Qw+Y0Up8WcEbEvKVcMAoGCCqGSM49BAMCA0cAMEQC
10-
IClLpYmn/TUFvGnjZZcSpawyTUptd+wYKtzEZG2880pfAiBci4uQHo2uQcAykAVo
11-
XqUDF5Fsmkrn8Ah8l+zQaAH39Q==
7+
LcOt8Kgqop8jKMHE/htCZeQfH5lDLl9JIqNmMGQwEgYDVR0TAQH/BAgwBgEB/wIB
8+
ADAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFFpwXHDpF99K1qV3cHUT/2I5KEm7
9+
MB8GA1UdIwQYMBaAFOfv6sMzXF/Qw+Y0Up8WcEbEvKVcMAoGCCqGSM49BAMCA0kA
10+
MEYCIQCVvpUUWjSa35AwLgbOfz/gNUdvDh71pnRjQCFvyRO9CAIhAOgPn0LXTWkI
11+
hmOGy9fbpwiqEIKwVtXxnRtobpD58wcP
1212
-----END CERTIFICATE-----

‎credentials/test/attestation/Chip-Test-PAI-FFF2-8001-Cert.der

3 Bytes
Binary file not shown.

‎credentials/test/attestation/Chip-Test-PAI-FFF2-8001-Cert.pem

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIBwDCCAWagAwIBAgIIRL5f86dv2S8wCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
2+
MIIBwzCCAWmgAwIBAgIIDaowBF5HxwQwCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
33
TWF0dGVyIFRlc3QgUEFBIEZGRjIwIBcNMjEwNjI4MTQyMzQzWhgPOTk5OTEyMzEy
44
MzU5NTlaMEYxGDAWBgNVBAMMD01hdHRlciBUZXN0IFBBSTEUMBIGCisGAQQBgqJ8
55
AgEMBEZGRjIxFDASBgorBgEEAYKifAICDAQ4MDAxMFkwEwYHKoZIzj0CAQYIKoZI
66
zj0DAQcDQgAEzvfsK0V8nY3MrY/1qEyGU86yHAsNrouPx/VKH3v0ilsAmtgFH7Hj
7-
nKRhfnAC3BhtyZBWF/l7ye1fnudEwnK/06NjMGEwDwYDVR0TAQH/BAUwAwEB/zAO
8-
BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFO2mD++9Knk8Ml4qbUh43rmpNtBHMB8G
9-
A1UdIwQYMBaAFOfv6sMzXF/Qw+Y0Up8WcEbEvKVcMAoGCCqGSM49BAMCA0gAMEUC
10-
IFVt+a9+LTIex49MErhjx21r7Uu9469VVrcClSxR0dTkAiEA2BWdsZzVC8Wcu99e
11-
fX1FdDs1xrMOwKnZmp4ynWRJPDc=
7+
nKRhfnAC3BhtyZBWF/l7ye1fnudEwnK/06NmMGQwEgYDVR0TAQH/BAgwBgEB/wIB
8+
ADAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFO2mD++9Knk8Ml4qbUh43rmpNtBH
9+
MB8GA1UdIwQYMBaAFOfv6sMzXF/Qw+Y0Up8WcEbEvKVcMAoGCCqGSM49BAMCA0gA
10+
MEUCIEqWvBko3L7xtlIz0cuRcMtmXCG/NaXMpdQblzpi2OIxAiEAwOEY8dMGbWmy
11+
3SJfN7PcNJmCrkjJVIodQk2C0AsqpM0=
1212
-----END CERTIFICATE-----

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

+15
Original file line numberDiff line numberDiff line change
@@ -1602,6 +1602,21 @@
16021602
}
16031603
],
16041604
"attributes": [
1605+
{
1606+
"name": "FeatureMap",
1607+
"code": 65532,
1608+
"mfgCode": null,
1609+
"side": "server",
1610+
"included": 1,
1611+
"storageOption": "RAM",
1612+
"singleton": 0,
1613+
"bounded": 0,
1614+
"defaultValue": "0",
1615+
"reportable": 0,
1616+
"minInterval": 0,
1617+
"maxInterval": 65344,
1618+
"reportableChange": 0
1619+
},
16051620
{
16061621
"name": "ClusterRevision",
16071622
"code": 65533,

0 commit comments

Comments
 (0)