Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Occupancy Sensing cluster Python test scripts #34572

Merged
merged 89 commits into from
Aug 1, 2024
Merged

Occupancy Sensing cluster Python test scripts #34572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
c7f753b
Occupancy Sensing cluster Python test scripts
jaehs6sam Jul 29, 2024
5e4ca22
Update TC_OCC_2_1.py
jaehs6sam Jul 29, 2024
092e864
Update TC_OCC_2_2.py
jaehs6sam Jul 29, 2024
5eeadf7
Update TC_OCC_2_3.py
jaehs6sam Jul 29, 2024
1d67a63
Update TC_OCC_3_1.py
jaehs6sam Jul 29, 2024
efacda8
Update TC_OCC_3_2.py
jaehs6sam Jul 29, 2024
423e963
Update TC_OCC_2_1.py
jaehs6sam Jul 29, 2024
889f2f4
Update TC_OCC_2_2.py
jaehs6sam Jul 30, 2024
b60b5f0
Update TC_OCC_2_3.py
jaehs6sam Jul 30, 2024
2f2129e
Update TC_OCC_3_1.py
jaehs6sam Jul 30, 2024
bb65bb6
Update TC_OCC_3_2.py
jaehs6sam Jul 30, 2024
4de391e
Update TC_OCC_2_1.py
jaehs6sam Jul 30, 2024
da31772
Update TC_OCC_3_1.py
jaehs6sam Jul 30, 2024
a1ce53b
Update TC_OCC_2_1.py
jaehs6sam Jul 30, 2024
f8df6a6
Update TC_OCC_2_2.py
jaehs6sam Jul 30, 2024
8267b3a
Update TC_OCC_2_3.py
jaehs6sam Jul 30, 2024
997aa86
Update TC_OCC_3_2.py
jaehs6sam Jul 30, 2024
37be841
Update TC_OCC_3_2.py
jaehs6sam Jul 30, 2024
293b97e
Update TC_OCC_3_2.py
jaehs6sam Jul 30, 2024
2cf4c4c
Update TC_OCC_3_2.py
jaehs6sam Jul 30, 2024
346aaaf
Update TC_OCC_3_1.py
jaehs6sam Jul 30, 2024
b848995
Update TC_OCC_2_3.py
jaehs6sam Jul 30, 2024
9761d9a
Update TC_OCC_2_2.py
jaehs6sam Jul 30, 2024
86beae4
Update TC_OCC_2_1.py
jaehs6sam Jul 30, 2024
e134ba8
Update src/python_testing/TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
748c528
Update src/python_testing/TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
d8ebf5e
Update src/python_testing/TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
1d170a3
Update src/python_testing/TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
6804084
Update src/python_testing/TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
872111e
Update src/python_testing/TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
ffedcbd
Update src/python_testing/TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
8df35a5
Update src/python_testing/TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
84cc83f
Update src/python_testing/TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
1466f18
Update src/python_testing/TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
4b20125
Update src/python_testing/TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
fea321b
Update src/python_testing/TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
5494598
Update src/python_testing/TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
6a21c0b
Update src/python_testing/TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
ae7dbd4
Update src/python_testing/TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
5dac75d
Update src/python_testing/TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
b194b33
Update src/python_testing/TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
3e86880
Update TC_OCC_2_2.py
jaehs6sam Jul 31, 2024
65fb1d5
Update TC_OCC_3_1.py
jaehs6sam Jul 31, 2024
a9c1584
Update TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
7a8a763
Update TC_OCC_3_1.py
jaehs6sam Jul 31, 2024
7245727
Update TC_OCC_3_2.py
jaehs6sam Jul 31, 2024
e64eed1
Update TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
38fa992
Update TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
05110cb
Update TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
e3d9184
Update TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
264c803
Update TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
a1a20fd
Update TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
1319d79
Update TC_OCC_2_2.py
jaehs6sam Jul 31, 2024
386a31f
Update TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
73d642e
Update TC_OCC_2_2.py
jaehs6sam Jul 31, 2024
8b430ef
Update TC_OCC_2_3.py
jaehs6sam Jul 31, 2024
99775f2
Update TC_OCC_3_1.py
jaehs6sam Jul 31, 2024
214f326
Update TC_OCC_3_2.py
jaehs6sam Jul 31, 2024
c299926
Update TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
009761b
Update TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
d797b80
Update TC_OCC_2_1.py
jaehs6sam Jul 31, 2024
e9af202
Merge branch 'master' into TC_OCC_1_4_PythonTestScript
andy31415 Jul 31, 2024
25382a4
Restyle
andy31415 Jul 31, 2024
9ec09b4
Update TC_OCC_2_2.py
jaehs6sam Aug 1, 2024
2188852
Update TC_OCC_2_2.py
jaehs6sam Aug 1, 2024
2c25e66
Update TC_OCC_3_1.py
jaehs6sam Aug 1, 2024
79710ce
Update src/python_testing/TC_OCC_2_2.py
jaehs6sam Aug 1, 2024
9f68ef6
Update src/python_testing/TC_OCC_2_2.py
jaehs6sam Aug 1, 2024
30f86dd
Update TC_OCC_2_2.py
jaehs6sam Aug 1, 2024
f6f1aa8
Update TC_OCC_2_2.py
jaehs6sam Aug 1, 2024
ed0c165
Update TC_OCC_2_2.py
jaehs6sam Aug 1, 2024
f438096
Update TC_OCC_2_2.py
jaehs6sam Aug 1, 2024
775105b
Update TC_OCC_2_2.py
jaehs6sam Aug 1, 2024
3db7f02
Update TC_OCC_2_2.py
jaehs6sam Aug 1, 2024
bede88a
Merge branch 'master' into TC_OCC_1_4_PythonTestScript
andreilitvin Aug 1, 2024
87b3f4d
Restyle
andreilitvin Aug 1, 2024
8a888d6
Proposal for TC_OCC bitmap compares
andreilitvin Aug 1, 2024
01160c4
Fix typo
andreilitvin Aug 1, 2024
d7906c5
Fix map
andreilitvin Aug 1, 2024
683e474
Update TC_OCC_3_2.py
jaehs6sam Aug 1, 2024
bc92bf5
Update TC_OCC_3_2.py
jaehs6sam Aug 1, 2024
582bdb7
Restyle
andreilitvin Aug 1, 2024
1215ecb
Typo fixes and enable some tests in CI
andreilitvin Aug 1, 2024
506d08e
Fix OCC_2_1 to run in CI
andreilitvin Aug 1, 2024
2a1f0f0
Fix all clusters for TC_OCC_2_2 and some logging
andreilitvin Aug 1, 2024
338d2f9
make all TC_OCC_2_* pass
andreilitvin Aug 1, 2024
4466463
Restyle
andreilitvin Aug 1, 2024
f733468
Enable tests in ci
andreilitvin Aug 1, 2024
ceb7013
Merge branch 'master' into TC_OCC_1_4_PythonTestScript
andy31415 Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,9 @@ jobs:
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'
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'
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'
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'
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'
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'
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'
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'
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'
Expand Down
10 changes: 6 additions & 4 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9025,10 +9025,11 @@ endpoint 1 {
server cluster OccupancySensing {
ram attribute occupancy;
ram attribute occupancySensorType;
ram attribute occupancySensorTypeBitmap;
ram attribute occupancySensorTypeBitmap default = 1;
ram attribute holdTime default = 10;
callback attribute holdTimeLimits;
ram attribute featureMap default = 0x01;
ram attribute PIROccupiedToUnoccupiedDelay default = 10;
ram attribute featureMap default = 0x02;
ram attribute clusterRevision default = 5;
}

Expand Down Expand Up @@ -9502,10 +9503,11 @@ endpoint 2 {
server cluster OccupancySensing {
ram attribute occupancy;
ram attribute occupancySensorType;
ram attribute occupancySensorTypeBitmap;
ram attribute occupancySensorTypeBitmap default = 1;
ram attribute holdTime default = 20;
callback attribute holdTimeLimits;
ram attribute featureMap default = 0x01;
ram attribute PIROccupiedToUnoccupiedDelay default = 10;
ram attribute featureMap default = 0x02;
ram attribute clusterRevision default = 5;
}
}
Expand Down
44 changes: 38 additions & 6 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16678,7 +16678,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -16726,7 +16726,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -19103,7 +19103,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": "1",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -19141,6 +19141,22 @@
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "PIROccupiedToUnoccupiedDelay",
"code": 16,
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "10",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "FeatureMap",
"code": 65532,
Expand All @@ -19151,7 +19167,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x01",
"defaultValue": "0x02",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -25244,7 +25260,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": "1",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -25282,6 +25298,22 @@
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "PIROccupiedToUnoccupiedDelay",
"code": 16,
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "10",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "FeatureMap",
"code": 65532,
Expand All @@ -25292,7 +25324,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x01",
"defaultValue": "0x02",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
2 changes: 1 addition & 1 deletion examples/all-clusters-app/all-clusters-common/src/occupancy-sensing-stub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void emberAfOccupancySensingClusterInitCallback(EndpointId endpointId)
VerifyOrDie(!gAttrAccess[endpointId]);

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

OccupancySensing::Structs::HoldTimeLimitsStruct::Type holdTimeLimits = {
.holdTimeMin = 1,
Expand Down
Loading
Loading