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

[Pump] Add feature map support #23824

Merged
merged 20 commits into from
Jan 18, 2023
Merged

[Pump] Add feature map support #23824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d58c9b3
Added feature map to pump xml, updated server and zap regen all
ReneJosefsen Nov 30, 2022
3b392cf
Merge branch 'project-chip:master' into rjosefsen/PCC-add-featuremap
ReneJosefsen Dec 1, 2022
fdea6bd
Added namespace and minor refactoring
ReneJosefsen Dec 1, 2022
563a39a
Removed PumpConfigurationAndControlAttrAccess since it is not used
ReneJosefsen Dec 2, 2022
54a23eb
Merge remote-tracking branch 'upstream/master' into rjosefsen/PCC-add…
ReneJosefsen Dec 5, 2022
3115b68
Updated PCC cluster on all cluster apps
ReneJosefsen Dec 5, 2022
849630f
Merge branch 'project-chip:master' into rjosefsen/PCC-add-featuremap
ReneJosefsen Dec 5, 2022
cf79362
Merge branch 'master' into rjosefsen/PCC-add-featuremap
andy31415 Dec 12, 2022
646329a
Merge branch 'master' into rjosefsen/PCC-add-featuremap
ReneJosefsen Dec 14, 2022
1458678
Updated to latest featureLevel to match master
ReneJosefsen Jan 9, 2023
96fadbd
Merge branch 'master' into rjosefsen/PCC-add-featuremap
ReneJosefsen Jan 9, 2023
27e3046
Ran regen all on latest zap and master
ReneJosefsen Jan 9, 2023
add2923
Merge branch 'master' into rjosefsen/PCC-add-featuremap
ReneJosefsen Jan 17, 2023
054d7bf
zap regen all
ReneJosefsen Jan 17, 2023
59a8ede
Updated PCC test cases to use new feature PICS
ReneJosefsen Jan 18, 2023
390c702
Merge branch 'master' into rjosefsen/PCC-add-featuremap
ReneJosefsen Jan 18, 2023
cada0e8
Fixed PICS error in 1_1 and restyle
ReneJosefsen Jan 18, 2023
c96662f
Removed whitespaces
ReneJosefsen Jan 18, 2023
ec4fd4c
Try to fix CI failure
ReneJosefsen Jan 18, 2023
e003f28
Added missing PICS for TC-PCC-2.2
ReneJosefsen Jan 18, 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
14 changes: 12 additions & 2 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 @@ -2511,6 +2511,16 @@ server cluster PumpConfigurationAndControl = 512 {
kLocal = 3;
}

bitmap PumpFeature : BITMAP32 {
kConstantPressure = 0x1;
kCompensatedPressure = 0x2;
kConstantFlow = 0x4;
kConstantSpeed = 0x8;
kConstantTemperature = 0x10;
kAutomatic = 0x20;
kLocal = 0x40;
}

bitmap PumpStatus : BITMAP16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
Expand Down Expand Up @@ -4508,8 +4518,8 @@ endpoint 1 {
ram attribute lifetimeEnergyConsumed;
ram attribute operationMode;
ram attribute controlMode;
ram attribute featureMap;
ram attribute clusterRevision default = 3;
ram attribute featureMap default = 0x1F;
ram attribute clusterRevision default = 4;
}

server cluster Thermostat {
Expand Down
4 changes: 2 additions & 2 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 @@ -14724,7 +14724,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"defaultValue": "0x1F",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -14740,7 +14740,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "3",
"defaultValue": "4",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
18 changes: 16 additions & 2 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2164,6 +2164,16 @@ server cluster PumpConfigurationAndControl = 512 {
kLocal = 3;
}

bitmap PumpFeature : BITMAP32 {
kConstantPressure = 0x1;
kCompensatedPressure = 0x2;
kConstantFlow = 0x4;
kConstantSpeed = 0x8;
kConstantTemperature = 0x10;
kAutomatic = 0x20;
kLocal = 0x40;
}

bitmap PumpStatus : BITMAP16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
Expand Down Expand Up @@ -2230,6 +2240,8 @@ server cluster PumpConfigurationAndControl = 512 {
readonly attribute nullable int16s maxPressure = 0;
readonly attribute nullable int16u maxSpeed = 1;
readonly attribute nullable int16u maxFlow = 2;
readonly attribute nullable int16s minConstPressure = 3;
readonly attribute nullable int16s maxConstPressure = 4;
readonly attribute PumpOperationMode effectiveOperationMode = 17;
readonly attribute PumpControlMode effectiveControlMode = 18;
readonly attribute nullable int16s capacity = 19;
Expand Down Expand Up @@ -3659,12 +3671,14 @@ endpoint 1 {
ram attribute maxPressure;
ram attribute maxSpeed;
ram attribute maxFlow;
ram attribute minConstPressure;
ram attribute maxConstPressure;
ram attribute effectiveOperationMode;
ram attribute effectiveControlMode;
ram attribute capacity;
ram attribute operationMode;
ram attribute featureMap;
ram attribute clusterRevision default = 3;
ram attribute featureMap default = 1;
ram attribute clusterRevision default = 4;
}

server cluster Thermostat {
Expand Down
12 changes: 6 additions & 6 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13956,11 +13956,11 @@
"mfgCode": null,
"side": "server",
"type": "int16s",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -13972,11 +13972,11 @@
"mfgCode": null,
"side": "server",
"type": "int16s",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -14280,7 +14280,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"defaultValue": "1",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -14296,7 +14296,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "3",
"defaultValue": "4",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down
10 changes: 10 additions & 0 deletions examples/placeholder/linux/apps/app1/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1750,6 +1750,16 @@ server cluster PumpConfigurationAndControl = 512 {
kLocal = 3;
}

bitmap PumpFeature : BITMAP32 {
kConstantPressure = 0x1;
kCompensatedPressure = 0x2;
kConstantFlow = 0x4;
kConstantSpeed = 0x8;
kConstantTemperature = 0x10;
kAutomatic = 0x20;
kLocal = 0x40;
}

bitmap PumpStatus : BITMAP16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
Expand Down
10 changes: 10 additions & 0 deletions examples/placeholder/linux/apps/app2/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1727,6 +1727,16 @@ server cluster PumpConfigurationAndControl = 512 {
kLocal = 3;
}

bitmap PumpFeature : BITMAP32 {
kConstantPressure = 0x1;
kCompensatedPressure = 0x2;
kConstantFlow = 0x4;
kConstantSpeed = 0x8;
kConstantTemperature = 0x10;
kAutomatic = 0x20;
kLocal = 0x40;
}

bitmap PumpStatus : BITMAP16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
Expand Down
14 changes: 12 additions & 2 deletions examples/pump-app/pump-common/pump-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1105,6 +1105,16 @@ server cluster PumpConfigurationAndControl = 512 {
kLocal = 3;
}

bitmap PumpFeature : BITMAP32 {
kConstantPressure = 0x1;
kCompensatedPressure = 0x2;
kConstantFlow = 0x4;
kConstantSpeed = 0x8;
kConstantTemperature = 0x10;
kAutomatic = 0x20;
kLocal = 0x40;
}

bitmap PumpStatus : BITMAP16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
Expand Down Expand Up @@ -1498,8 +1508,8 @@ endpoint 1 {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap;
ram attribute clusterRevision default = 3;
ram attribute featureMap default = 31;
ram attribute clusterRevision default = 4;
}

server cluster TemperatureMeasurement {
Expand Down
7 changes: 4 additions & 3 deletions examples/pump-app/pump-common/pump-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7150,7 +7150,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"defaultValue": "31",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -7166,7 +7166,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "3",
"defaultValue": "4",
"reportable": 1,
"minInterval": 0,
"maxInterval": 65344,
Expand Down Expand Up @@ -7914,5 +7914,6 @@
"endpointVersion": 1,
"deviceIdentifier": 771
}
]
],
"log": []
}
10 changes: 10 additions & 0 deletions examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,6 +1004,16 @@ client cluster PumpConfigurationAndControl = 512 {
kLocal = 3;
}

bitmap PumpFeature : BITMAP32 {
kConstantPressure = 0x1;
kCompensatedPressure = 0x2;
kConstantFlow = 0x4;
kConstantSpeed = 0x8;
kConstantTemperature = 0x10;
kAutomatic = 0x20;
kLocal = 0x40;
}

bitmap PumpStatus : BITMAP16 {
kDeviceFault = 0x1;
kSupplyfault = 0x2;
Expand Down
Loading