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

Jump to bottom

Remove provisional (and disallowed by the device type) attribtes from… #29015

Closed
wants to merge 17 commits into from
Closed

Remove provisional (and disallowed by the device type) attribtes from… #29015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
44bf76e
Remove provisional (and disallowed by the device type) attribtes from…
marktrayer Sep 1, 2023
7eb5818
Address styling issues.
bzbarsky-apple Sep 1, 2023
feb861c
Merge branch 'master' into removeprovisionalsissue26746
marktrayer Sep 22, 2023
bcd289d
Zap Regen
marktrayer Sep 23, 2023
1b0f2da
Set PICS values for attributes that are not used by mode specializati…
marktrayer Sep 25, 2023
afc8fb8
Remove setting of DepOnOff Feature Flag from the derivations of ModeB…
marktrayer Sep 26, 2023
d73a339
Restyled by clang-format
restyled-commits Sep 26, 2023
ac48bae
Mark LWM tests on provisional attributes as in development
marktrayer Sep 26, 2023
33eba24
Fix Python Lint issue
marktrayer Sep 26, 2023
e0d232f
Remove erroneous duplicated PICS values for TCCM
marktrayer Sep 26, 2023
5074f8c
Fix the bug in the YAML for TCCM_1_1 that expects attributes 2 and 3 in
marktrayer Sep 27, 2023
9b92ed4
Remove TCCM 3-1, 3-2, 3-3 from being executed.
marktrayer Sep 27, 2023
afa91b2
Add zap regen for the yaml tc tccm 1-1
marktrayer Sep 27, 2023
8904b45
Merge branch 'master' into removeprovisionalsissue26746
marktrayer Sep 29, 2023
888f79a
Merge branch 'master' into removeprovisionalsissue26746
marktrayer Oct 2, 2023
e67a53d
Zap Regen
marktrayer Oct 2, 2023
4d4c7e3
Merge branch 'master' into removeprovisionalsissue26746
andy31415 Oct 2, 2023
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
12 changes: 0 additions & 12 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 @@ -2510,8 +2510,6 @@ server cluster LaundryWasherMode = 81 {

readonly attribute ModeOptionStruct supportedModes[] = 0;
readonly attribute int8u currentMode = 1;
attribute nullable int8u startUpMode = 2;
attribute nullable int8u onMode = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down Expand Up @@ -2555,8 +2553,6 @@ server cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {

readonly attribute ModeOptionStruct supportedModes[] = 0;
readonly attribute int8u currentMode = 1;
attribute nullable int8u startUpMode = 2;
attribute nullable int8u onMode = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down Expand Up @@ -2782,8 +2778,6 @@ server cluster DishwasherMode = 89 {

readonly attribute ModeOptionStruct supportedModes[] = 0;
readonly attribute int8u currentMode = 1;
attribute nullable int8u startUpMode = 2;
attribute nullable int8u onMode = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand Down Expand Up @@ -6708,8 +6702,6 @@ endpoint 1 {
server cluster LaundryWasherMode {
callback attribute supportedModes;
callback attribute currentMode;
callback attribute startUpMode;
callback attribute onMode;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
Expand All @@ -6720,8 +6712,6 @@ endpoint 1 {
server cluster RefrigeratorAndTemperatureControlledCabinetMode {
callback attribute supportedModes;
callback attribute currentMode;
callback attribute startUpMode;
callback attribute onMode;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
Expand Down Expand Up @@ -6791,8 +6781,6 @@ endpoint 1 {
server cluster DishwasherMode {
callback attribute supportedModes;
callback attribute currentMode;
callback attribute startUpMode;
callback attribute onMode;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
Expand Down
111 changes: 8 additions & 103 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 @@ -16,19 +16,19 @@
}
],
"package": [
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"version": "chip-v1"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json",
"type": "zcl-properties",
"category": "matter",
"version": 1,
"description": "Matter SDK ZCL data with some extensions"
},
{
"pathRelativity": "relativeToZap",
"path": "../../../src/app/zap-templates/app-templates.json",
"type": "gen-templates-json",
"version": "chip-v1"
}
],
"endpointTypes": [
Expand Down Expand Up @@ -15099,38 +15099,6 @@
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "StartUpMode",
"code": 2,
"mfgCode": null,
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "OnMode",
"code": 3,
"mfgCode": null,
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "GeneratedCommandList",
"code": 65528,
Expand Down Expand Up @@ -15331,38 +15299,6 @@
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "StartUpMode",
"code": 2,
"mfgCode": null,
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "OnMode",
"code": 3,
"mfgCode": null,
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "GeneratedCommandList",
"code": 65528,
Expand Down Expand Up @@ -16656,38 +16592,6 @@
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "StartUpMode",
"code": 2,
"mfgCode": null,
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "OnMode",
"code": 3,
"mfgCode": null,
"side": "server",
"type": "int8u",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "GeneratedCommandList",
"code": 65528,
Expand Down Expand Up @@ -35392,5 +35296,6 @@
"endpointId": 65534,
"networkId": 0
}
]
],
"log": []
}
3 changes: 1 addition & 2 deletions examples/all-clusters-app/all-clusters-common/src/dishwasher-mode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ void emberAfDishwasherModeClusterInitCallback(chip::EndpointId endpointId)
VerifyOrDie(endpointId == 1); // this cluster is only enabled for endpoint 1.
VerifyOrDie(gDishwasherModeDelegate == nullptr && gDishwasherModeInstance == nullptr);
gDishwasherModeDelegate = new DishwasherMode::DishwasherModeDelegate;
gDishwasherModeInstance =
new ModeBase::Instance(gDishwasherModeDelegate, 0x1, DishwasherMode::Id, chip::to_underlying(Feature::kOnOff));
gDishwasherModeInstance = new ModeBase::Instance(gDishwasherModeDelegate, 0x1, DishwasherMode::Id, 0x0);
gDishwasherModeInstance->Init();
}
3 changes: 1 addition & 2 deletions examples/all-clusters-app/all-clusters-common/src/laundry-washer-mode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ void emberAfLaundryWasherModeClusterInitCallback(chip::EndpointId endpointId)
VerifyOrDie(endpointId == 1); // this cluster is only enabled for endpoint 1.
VerifyOrDie(gLaundryWasherModeDelegate == nullptr && gLaundryWasherModeInstance == nullptr);
gLaundryWasherModeDelegate = new LaundryWasherMode::LaundryWasherModeDelegate;
gLaundryWasherModeInstance =
new ModeBase::Instance(gLaundryWasherModeDelegate, 0x1, LaundryWasherMode::Id, chip::to_underlying(Feature::kOnOff));
gLaundryWasherModeInstance = new ModeBase::Instance(gLaundryWasherModeDelegate, 0x1, LaundryWasherMode::Id, 0x0);
gLaundryWasherModeInstance->Init();
}
3 changes: 1 addition & 2 deletions examples/all-clusters-app/all-clusters-common/src/tcc-mode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ void emberAfRefrigeratorAndTemperatureControlledCabinetModeClusterInitCallback(c
VerifyOrDie(endpointId == 1); // this cluster is only enabled for endpoint 1.
VerifyOrDie(gTccModeDelegate == nullptr && gTccModeInstance == nullptr);
gTccModeDelegate = new RefrigeratorAndTemperatureControlledCabinetMode::TccModeDelegate;
gTccModeInstance = new ModeBase::Instance(gTccModeDelegate, 0x1, RefrigeratorAndTemperatureControlledCabinetMode::Id,
chip::to_underlying(Feature::kOnOff));
gTccModeInstance = new ModeBase::Instance(gTccModeDelegate, 0x1, RefrigeratorAndTemperatureControlledCabinetMode::Id, 0x0);
gTccModeInstance->Init();
}
10 changes: 9 additions & 1 deletion scripts/tests/chiptest/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,15 @@ def _GetInDevelopmentTests() -> Set[str]:
# TestEventTriggersEnabled is true, which it's not in CI.
"Test_TC_SMOKECO_2_6.yaml", # chip-repl does not support local timeout (07/20/2023) and test assumes
# TestEventTriggersEnabled is true, which it's not in CI.
"Test_TC_S_2_4.yaml", # https://github.com/project-chip/connectedhomeip/issues/29117
"Test_TC_IDM_1_2.yaml", # Broken harness: https://github.com/project-chip/connectedhomeip/issues/29115
"Test_TC_S_2_4.yaml", # https://github.com/project-chip/connectedhomeip/issues/29117
"Test_TC_LWM_3_1.yaml", # Target attribute now provisional and removed from the XML
"Test_TC_LWM_3_2.yaml", # Target attribute now provisional and removed from the XML
"Test_TC_LWM_3_3.yaml", # Target attribute now provisional and removed from the XML
"Test_TC_TCCM_3_1.yaml", # Target attribute now provisional and removed from the XML
"Test_TC_TCCM_3_2.yaml", # Target attribute now provisional and removed from the XML
"Test_TC_TCCM_3_3.yaml" # Target attribute now provisional and removed from the XML
"Test_TC_S_2_4.yaml" # https://github.com/project-chip/connectedhomeip/issues/29117
}


Expand Down
28 changes: 9 additions & 19 deletions src/app/tests/suites/certification/ci-pics-values
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,13 +325,13 @@ DISHALM.S.C01.Rsp=1
# DISHWASHER MODE CLUSTER

DISHM.S=1
DISHM.S.F00=1
DISHM.S.F00=0

#Server
DISHM.S.A0000=1
DISHM.S.A0001=1
DISHM.S.A0002=1
DISHM.S.A0003=1
DISHM.S.A0002=0
DISHM.S.A0003=0

#Command
DISHM.S.C00.Rsp=1
Expand Down Expand Up @@ -741,11 +741,11 @@ CGEN.C=1
LWM.S=1
LWM.S.A0000=1
LWM.S.A0001=1
LWM.S.A0003=1
LWM.S.A0002=1
LWM.S.A0003=0
LWM.S.A0002=0

#Feature
LWM.S.F00=1
LWM.S.F00=0

#Command
LWM.S.C00.Rsp=1
Expand Down Expand Up @@ -2474,13 +2474,13 @@ PIXIT.RVCRUNM.MODE_CHANGE_OK=1
#Refrigerator and Temperature Controlled Cabinet Mode Cluster(TCCM)

TCCM.S=1
TCCM.S.F00=1
TCCM.S.F00=0

#Server
TCCM.S.A0000=1
TCCM.S.A0001=1
TCCM.S.A0002=1
TCCM.S.A0003=1
TCCM.S.A0002=0
TCCM.S.A0003=0

#Commands
TCCM.S.C00.Rsp=1
Expand Down Expand Up @@ -2583,16 +2583,6 @@ SMOKECO.M.ManuallyControlledTest=1
SMOKECO.M.ManuallyControlledMute=1
SMOKECO.S.C00.Rsp=1

#Temperature Controlled Cabinet Mode Cluster
TCCM.S=1
TCCM.S.F00=1
TCCM.S.A0000=1
TCCM.S.A0001=1
TCCM.S.A0002=1
TCCM.S.A0003=1
TCCM.S.C00.Rsp=1
TCCM.S.C01.Tx=1

#Temperature Control
TCTL.S=1
TCTL.C=1
Expand Down
2 changes: 0 additions & 2 deletions src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ limitations under the License.
<!-- Base data types -->
<attribute side="server" code="0x0000" define="SUPPORTED_MODES" type="ARRAY" entryType="ModeOptionStruct" writable="false" optional="false" isNullable="false" length="255">SupportedModes</attribute>
<attribute side="server" code="0x0001" define="CURRENT_MODE" type="INT8U" writable="false" optional="false" isNullable="false" reportable="true">CurrentMode</attribute>
<attribute side="server" code="0x0002" define="START_UP_MODE" type="INT8U" writable="true" optional="true" isNullable="true">StartUpMode</attribute>
<attribute side="server" code="0x0003" define="ON_MODE" type="INT8U" writable="true" optional="true" isNullable="true">OnMode</attribute>

<!-- Commands -->
<command source="client" code="0x00" name="ChangeToMode" response="ChangeToModeResponse" optional="false">
Expand Down
2 changes: 0 additions & 2 deletions src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ limitations under the License.
<!-- Base data types -->
<attribute side="server" code="0x0000" define="SUPPORTED_MODES" type="ARRAY" entryType="ModeOptionStruct" writable="false" optional="false" isNullable="false" length="255">SupportedModes</attribute>
<attribute side="server" code="0x0001" define="CURRENT_MODE" type="INT8U" writable="false" optional="false" isNullable="false" reportable="true">CurrentMode</attribute>
<attribute side="server" code="0x0002" define="START_UP_MODE" type="INT8U" writable="true" optional="true" isNullable="true">StartUpMode</attribute>
<attribute side="server" code="0x0003" define="ON_MODE" type="INT8U" writable="true" optional="true" isNullable="true">OnMode</attribute>

<!-- Commands -->
<command source="client" code="0x00" name="ChangeToMode" response="ChangeToModeResponse" optional="false">
Expand Down
2 changes: 0 additions & 2 deletions ...ates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ limitations under the License.
<!-- Base data types -->
<attribute side="server" code="0x0000" define="SUPPORTED_MODES" type="ARRAY" entryType="ModeOptionStruct" writable="false" optional="false" isNullable="false" length="255">SupportedModes</attribute>
<attribute side="server" code="0x0001" define="CURRENT_MODE" type="INT8U" writable="false" optional="false" isNullable="false" reportable="true">CurrentMode</attribute>
<attribute side="server" code="0x0002" define="START_UP_MODE" type="INT8U" writable="true" optional="true" isNullable="true">StartUpMode</attribute>
<attribute side="server" code="0x0003" define="ON_MODE" type="INT8U" writable="true" optional="true" isNullable="true">OnMode</attribute>

<!-- Commands -->
<command source="client" code="0x00" name="ChangeToMode" response="ChangeToModeResponse" optional="false">
Expand Down
18 changes: 2 additions & 16 deletions src/app/zap-templates/zcl/zcl-with-test-extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,25 +316,11 @@
"DSTOffsetListMaxSize"
],
"Temperature Control": ["SupportedTemperatureLevels"],
"Dishwasher Mode": [
"SupportedModes",
"CurrentMode",
"StartUpMode",
"OnMode",
"FeatureMap"
],
"Laundry Washer Mode": [
"SupportedModes",
"CurrentMode",
"StartUpMode",
"OnMode",
"FeatureMap"
],
"Dishwasher Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
"Laundry Washer Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
"Refrigerator And Temperature Controlled Cabinet Mode": [
"SupportedModes",
"CurrentMode",
"StartUpMode",
"OnMode",
"FeatureMap"
],
"RVC Clean Mode": [
Expand Down
18 changes: 2 additions & 16 deletions src/app/zap-templates/zcl/zcl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,25 +314,11 @@
"DSTOffsetListMaxSize"
],
"Temperature Control": ["SupportedTemperatureLevels"],
"Dishwasher Mode": [
"SupportedModes",
"CurrentMode",
"StartUpMode",
"OnMode",
"FeatureMap"
],
"Laundry Washer Mode": [
"SupportedModes",
"CurrentMode",
"StartUpMode",
"OnMode",
"FeatureMap"
],
"Dishwasher Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
"Laundry Washer Mode": ["SupportedModes", "CurrentMode", "FeatureMap"],
"Refrigerator And Temperature Controlled Cabinet Mode": [
"SupportedModes",
"CurrentMode",
"StartUpMode",
"OnMode",
"FeatureMap"
],
"RVC Clean Mode": [
Expand Down
Loading
Loading