Skip to content

Commit 56d0184

Browse files
hicklinhicklin
authored
Merge branch 'master' into update_names
2 parents a611a5b + d0d9127 commit 56d0184

File tree

36 files changed

+1454
-714
lines changed

36 files changed

+1454
-714
lines changed

‎.github/workflows/tests.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,9 @@ jobs:
571571
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_TestEventTrigger.py'
572572
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TestBatchInvoke.py'
573573
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TestGroupTableReports.py'
574+
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_OCC_2_1.py'
575+
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_OCC_2_2.py'
576+
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_OCC_2_3.py'
574577
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_OPCREDS_3_1.py'
575578
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_OPCREDS_3_2.py'
576579
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_OPSTATE_2_1.py'

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

+6-4
Original file line numberDiff line numberDiff line change
@@ -9227,10 +9227,11 @@ endpoint 1 {
92279227
server cluster OccupancySensing {
92289228
ram attribute occupancy;
92299229
ram attribute occupancySensorType;
9230-
ram attribute occupancySensorTypeBitmap;
9230+
ram attribute occupancySensorTypeBitmap default = 1;
92319231
ram attribute holdTime default = 10;
92329232
callback attribute holdTimeLimits;
9233-
ram attribute featureMap default = 0x01;
9233+
ram attribute PIROccupiedToUnoccupiedDelay default = 10;
9234+
ram attribute featureMap default = 0x02;
92349235
ram attribute clusterRevision default = 5;
92359236
}
92369237

@@ -9704,10 +9705,11 @@ endpoint 2 {
97049705
server cluster OccupancySensing {
97059706
ram attribute occupancy;
97069707
ram attribute occupancySensorType;
9707-
ram attribute occupancySensorTypeBitmap;
9708+
ram attribute occupancySensorTypeBitmap default = 1;
97089709
ram attribute holdTime default = 20;
97099710
callback attribute holdTimeLimits;
9710-
ram attribute featureMap default = 0x01;
9711+
ram attribute PIROccupiedToUnoccupiedDelay default = 10;
9712+
ram attribute featureMap default = 0x02;
97119713
ram attribute clusterRevision default = 5;
97129714
}
97139715
}

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

+38-6
Original file line numberDiff line numberDiff line change
@@ -16678,7 +16678,7 @@
1667816678
"storageOption": "External",
1667916679
"singleton": 0,
1668016680
"bounded": 0,
16681-
"defaultValue": "",
16681+
"defaultValue": null,
1668216682
"reportable": 1,
1668316683
"minInterval": 1,
1668416684
"maxInterval": 65534,
@@ -16726,7 +16726,7 @@
1672616726
"storageOption": "External",
1672716727
"singleton": 0,
1672816728
"bounded": 0,
16729-
"defaultValue": "",
16729+
"defaultValue": null,
1673016730
"reportable": 1,
1673116731
"minInterval": 1,
1673216732
"maxInterval": 65534,
@@ -19103,7 +19103,7 @@
1910319103
"storageOption": "RAM",
1910419104
"singleton": 0,
1910519105
"bounded": 0,
19106-
"defaultValue": "",
19106+
"defaultValue": "1",
1910719107
"reportable": 1,
1910819108
"minInterval": 0,
1910919109
"maxInterval": 65344,
@@ -19141,6 +19141,22 @@
1914119141
"maxInterval": 65534,
1914219142
"reportableChange": 0
1914319143
},
19144+
{
19145+
"name": "PIROccupiedToUnoccupiedDelay",
19146+
"code": 16,
19147+
"mfgCode": null,
19148+
"side": "server",
19149+
"type": "int16u",
19150+
"included": 1,
19151+
"storageOption": "RAM",
19152+
"singleton": 0,
19153+
"bounded": 0,
19154+
"defaultValue": "10",
19155+
"reportable": 1,
19156+
"minInterval": 1,
19157+
"maxInterval": 65534,
19158+
"reportableChange": 0
19159+
},
1914419160
{
1914519161
"name": "FeatureMap",
1914619162
"code": 65532,
@@ -19151,7 +19167,7 @@
1915119167
"storageOption": "RAM",
1915219168
"singleton": 0,
1915319169
"bounded": 0,
19154-
"defaultValue": "0x01",
19170+
"defaultValue": "0x02",
1915519171
"reportable": 1,
1915619172
"minInterval": 1,
1915719173
"maxInterval": 65534,
@@ -25244,7 +25260,7 @@
2524425260
"storageOption": "RAM",
2524525261
"singleton": 0,
2524625262
"bounded": 0,
25247-
"defaultValue": "",
25263+
"defaultValue": "1",
2524825264
"reportable": 1,
2524925265
"minInterval": 0,
2525025266
"maxInterval": 65344,
@@ -25282,6 +25298,22 @@
2528225298
"maxInterval": 65534,
2528325299
"reportableChange": 0
2528425300
},
25301+
{
25302+
"name": "PIROccupiedToUnoccupiedDelay",
25303+
"code": 16,
25304+
"mfgCode": null,
25305+
"side": "server",
25306+
"type": "int16u",
25307+
"included": 1,
25308+
"storageOption": "RAM",
25309+
"singleton": 0,
25310+
"bounded": 0,
25311+
"defaultValue": "10",
25312+
"reportable": 1,
25313+
"minInterval": 1,
25314+
"maxInterval": 65534,
25315+
"reportableChange": 0
25316+
},
2528525317
{
2528625318
"name": "FeatureMap",
2528725319
"code": 65532,
@@ -25292,7 +25324,7 @@
2529225324
"storageOption": "RAM",
2529325325
"singleton": 0,
2529425326
"bounded": 0,
25295-
"defaultValue": "0x01",
25327+
"defaultValue": "0x02",
2529625328
"reportable": 1,
2529725329
"minInterval": 1,
2529825330
"maxInterval": 65534,

‎examples/all-clusters-app/all-clusters-common/src/occupancy-sensing-stub.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void emberAfOccupancySensingClusterInitCallback(EndpointId endpointId)
3636
VerifyOrDie(!gAttrAccess[endpointId]);
3737

3838
gAttrAccess[endpointId] = std::make_unique<OccupancySensingAttrAccess>(
39-
BitMask<OccupancySensing::Feature, uint32_t>(OccupancySensing::Feature::kOther));
39+
BitMask<OccupancySensing::Feature, uint32_t>(OccupancySensing::Feature::kPassiveInfrared));
4040

4141
OccupancySensing::Structs::HoldTimeLimitsStruct::Type holdTimeLimits = {
4242
.holdTimeMin = 1,

‎examples/all-clusters-app/esp32/sdkconfig_m5stack.defaults

+6
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,9 @@ CONFIG_BUILD_CHIP_TESTS=y
7373

7474
# Move functions from IRAM to flash
7575
CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
76+
77+
# Reduce the event loggin buffer to reduce the DRAM usage
78+
# TODO: remove this once the underlying issue is fixed
79+
CONFIG_EVENT_LOGGING_CRIT_BUFFER_SIZE=512
80+
CONFIG_EVENT_LOGGING_INFO_BUFFER_SIZE=512
81+
CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE=512

‎examples/all-clusters-app/esp32/sdkconfig_m5stack_rpc.defaults

+6-3
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,16 @@ CONFIG_BUILD_CHIP_TESTS=y
7878
# Move functions from IRAM to flash
7979
CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
8080

81-
# to avoid dram overflow, reduce the critical loggin buffer to 1K
82-
CONFIG_EVENT_LOGGING_CRIT_BUFFER_SIZE=1024
83-
8481
CONFIG_DIAG_USE_EXTERNAL_LOG_WRAP=y
8582

8683
# Memory Optimizations
8784
CONFIG_NIMBLE_MAX_CONNECTIONS=1
8885
CONFIG_BTDM_CTRL_BLE_MAX_CONN=1
8986
CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
9087
CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
88+
89+
# Reduce the event loggin buffer to reduce the DRAM overflow
90+
# TODO: remove this once the underlying issue is fixed
91+
CONFIG_EVENT_LOGGING_CRIT_BUFFER_SIZE=512
92+
CONFIG_EVENT_LOGGING_INFO_BUFFER_SIZE=512
93+
CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE=512

‎examples/lock-app/lock-common/lock-app.matter

+12-1
Original file line numberDiff line numberDiff line change
@@ -3281,11 +3281,20 @@ endpoint 1 {
32813281
ram attribute wrongCodeEntryLimit default = 3;
32823282
ram attribute userCodeTemporaryDisableTime default = 10;
32833283
ram attribute requirePINforRemoteOperation default = 0;
3284+
callback attribute aliroReaderVerificationKey;
3285+
callback attribute aliroReaderGroupIdentifier;
3286+
callback attribute aliroReaderGroupSubIdentifier;
3287+
callback attribute aliroExpeditedTransactionSupportedProtocolVersions;
3288+
callback attribute aliroGroupResolvingKey;
3289+
callback attribute aliroSupportedBLEUWBProtocolVersions;
3290+
callback attribute aliroBLEAdvertisingVersion;
3291+
callback attribute numberOfAliroCredentialIssuerKeysSupported;
3292+
callback attribute numberOfAliroEndpointKeysSupported;
32843293
callback attribute generatedCommandList;
32853294
callback attribute acceptedCommandList;
32863295
callback attribute eventList;
32873296
callback attribute attributeList;
3288-
ram attribute featureMap default = 0x1DB3;
3297+
ram attribute featureMap default = 0x7DB3;
32893298
ram attribute clusterRevision default = 7;
32903299

32913300
handle command LockDoor;
@@ -3313,6 +3322,8 @@ endpoint 1 {
33133322
handle command GetCredentialStatusResponse;
33143323
handle command ClearCredential;
33153324
handle command UnboltDoor;
3325+
handle command SetAliroReaderConfig;
3326+
handle command ClearAliroReaderConfig;
33163327
}
33173328
}
33183329

‎examples/lock-app/lock-common/lock-app.zap

+161-1
Original file line numberDiff line numberDiff line change
@@ -5851,6 +5851,22 @@
58515851
"source": "client",
58525852
"isIncoming": 1,
58535853
"isEnabled": 1
5854+
},
5855+
{
5856+
"name": "SetAliroReaderConfig",
5857+
"code": 40,
5858+
"mfgCode": null,
5859+
"source": "client",
5860+
"isIncoming": 1,
5861+
"isEnabled": 1
5862+
},
5863+
{
5864+
"name": "ClearAliroReaderConfig",
5865+
"code": 41,
5866+
"mfgCode": null,
5867+
"source": "client",
5868+
"isIncoming": 1,
5869+
"isEnabled": 1
58545870
}
58555871
],
58565872
"attributes": [
@@ -6270,6 +6286,150 @@
62706286
"maxInterval": 65534,
62716287
"reportableChange": 0
62726288
},
6289+
{
6290+
"name": "AliroReaderVerificationKey",
6291+
"code": 128,
6292+
"mfgCode": null,
6293+
"side": "server",
6294+
"type": "octet_string",
6295+
"included": 1,
6296+
"storageOption": "External",
6297+
"singleton": 0,
6298+
"bounded": 0,
6299+
"defaultValue": "",
6300+
"reportable": 1,
6301+
"minInterval": 1,
6302+
"maxInterval": 65534,
6303+
"reportableChange": 0
6304+
},
6305+
{
6306+
"name": "AliroReaderGroupIdentifier",
6307+
"code": 129,
6308+
"mfgCode": null,
6309+
"side": "server",
6310+
"type": "octet_string",
6311+
"included": 1,
6312+
"storageOption": "External",
6313+
"singleton": 0,
6314+
"bounded": 0,
6315+
"defaultValue": "",
6316+
"reportable": 1,
6317+
"minInterval": 1,
6318+
"maxInterval": 65534,
6319+
"reportableChange": 0
6320+
},
6321+
{
6322+
"name": "AliroReaderGroupSubIdentifier",
6323+
"code": 130,
6324+
"mfgCode": null,
6325+
"side": "server",
6326+
"type": "octet_string",
6327+
"included": 1,
6328+
"storageOption": "External",
6329+
"singleton": 0,
6330+
"bounded": 0,
6331+
"defaultValue": "",
6332+
"reportable": 1,
6333+
"minInterval": 1,
6334+
"maxInterval": 65534,
6335+
"reportableChange": 0
6336+
},
6337+
{
6338+
"name": "AliroExpeditedTransactionSupportedProtocolVersions",
6339+
"code": 131,
6340+
"mfgCode": null,
6341+
"side": "server",
6342+
"type": "array",
6343+
"included": 1,
6344+
"storageOption": "External",
6345+
"singleton": 0,
6346+
"bounded": 0,
6347+
"defaultValue": "",
6348+
"reportable": 1,
6349+
"minInterval": 1,
6350+
"maxInterval": 65534,
6351+
"reportableChange": 0
6352+
},
6353+
{
6354+
"name": "AliroGroupResolvingKey",
6355+
"code": 132,
6356+
"mfgCode": null,
6357+
"side": "server",
6358+
"type": "octet_string",
6359+
"included": 1,
6360+
"storageOption": "External",
6361+
"singleton": 0,
6362+
"bounded": 0,
6363+
"defaultValue": "",
6364+
"reportable": 1,
6365+
"minInterval": 1,
6366+
"maxInterval": 65534,
6367+
"reportableChange": 0
6368+
},
6369+
{
6370+
"name": "AliroSupportedBLEUWBProtocolVersions",
6371+
"code": 133,
6372+
"mfgCode": null,
6373+
"side": "server",
6374+
"type": "array",
6375+
"included": 1,
6376+
"storageOption": "External",
6377+
"singleton": 0,
6378+
"bounded": 0,
6379+
"defaultValue": "",
6380+
"reportable": 1,
6381+
"minInterval": 1,
6382+
"maxInterval": 65534,
6383+
"reportableChange": 0
6384+
},
6385+
{
6386+
"name": "AliroBLEAdvertisingVersion",
6387+
"code": 134,
6388+
"mfgCode": null,
6389+
"side": "server",
6390+
"type": "int8u",
6391+
"included": 1,
6392+
"storageOption": "External",
6393+
"singleton": 0,
6394+
"bounded": 0,
6395+
"defaultValue": "",
6396+
"reportable": 1,
6397+
"minInterval": 1,
6398+
"maxInterval": 65534,
6399+
"reportableChange": 0
6400+
},
6401+
{
6402+
"name": "NumberOfAliroCredentialIssuerKeysSupported",
6403+
"code": 135,
6404+
"mfgCode": null,
6405+
"side": "server",
6406+
"type": "int16u",
6407+
"included": 1,
6408+
"storageOption": "External",
6409+
"singleton": 0,
6410+
"bounded": 0,
6411+
"defaultValue": "",
6412+
"reportable": 1,
6413+
"minInterval": 1,
6414+
"maxInterval": 65534,
6415+
"reportableChange": 0
6416+
},
6417+
{
6418+
"name": "NumberOfAliroEndpointKeysSupported",
6419+
"code": 136,
6420+
"mfgCode": null,
6421+
"side": "server",
6422+
"type": "int16u",
6423+
"included": 1,
6424+
"storageOption": "External",
6425+
"singleton": 0,
6426+
"bounded": 0,
6427+
"defaultValue": "",
6428+
"reportable": 1,
6429+
"minInterval": 1,
6430+
"maxInterval": 65534,
6431+
"reportableChange": 0
6432+
},
62736433
{
62746434
"name": "GeneratedCommandList",
62756435
"code": 65528,
@@ -6344,7 +6504,7 @@
63446504
"storageOption": "RAM",
63456505
"singleton": 0,
63466506
"bounded": 0,
6347-
"defaultValue": "0x1DB3",
6507+
"defaultValue": "0x7DB3",
63486508
"reportable": 1,
63496509
"minInterval": 1,
63506510
"maxInterval": 65534,

0 commit comments

Comments
 (0)