Skip to content

Commit 9175e75

Browse files
committedJan 26, 2024
Replaced the previous solution that fixed the issue in the generated python files canused by the lack of bitmasks by adding a NoFeatures=0 mask.
1 parent 856f906 commit 9175e75

File tree

10 files changed

+16
-4
lines changed

10 files changed

+16
-4
lines changed
 

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

+2
Original file line numberDiff line numberDiff line change
@@ -2929,6 +2929,7 @@ cluster RvcRunMode = 84 {
29292929
}
29302930

29312931
bitmap Feature : bitmap32 {
2932+
kNoFeatures = 0x0;
29322933
}
29332934

29342935
struct ModeTagStruct {
@@ -2980,6 +2981,7 @@ cluster RvcCleanMode = 85 {
29802981
}
29812982

29822983
bitmap Feature : bitmap32 {
2984+
kNoFeatures = 0x0;
29832985
}
29842986

29852987
struct ModeTagStruct {

‎examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter

+2
Original file line numberDiff line numberDiff line change
@@ -1020,6 +1020,7 @@ cluster RvcRunMode = 84 {
10201020
}
10211021

10221022
bitmap Feature : bitmap32 {
1023+
kNoFeatures = 0x0;
10231024
}
10241025

10251026
struct ModeTagStruct {
@@ -1071,6 +1072,7 @@ cluster RvcCleanMode = 85 {
10711072
}
10721073

10731074
bitmap Feature : bitmap32 {
1075+
kNoFeatures = 0x0;
10741076
}
10751077

10761078
struct ModeTagStruct {

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

+2
Original file line numberDiff line numberDiff line change
@@ -943,6 +943,7 @@ cluster RvcRunMode = 84 {
943943
}
944944

945945
bitmap Feature : bitmap32 {
946+
kNoFeatures = 0x0;
946947
}
947948

948949
struct ModeTagStruct {
@@ -994,6 +995,7 @@ cluster RvcCleanMode = 85 {
994995
}
995996

996997
bitmap Feature : bitmap32 {
998+
kNoFeatures = 0x0;
997999
}
9981000

9991001
struct ModeTagStruct {

‎src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml

+1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ limitations under the License.
6363

6464
<bitmap name="Feature" type="bitmap32">
6565
<cluster code="0x0055"/>
66+
<field name="NoFeatures" mask="0x0"/>
6667
<!-- Feature OnOff with code 0x01 is deprecated -->
6768
</bitmap>
6869

‎src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml

+1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ limitations under the License.
7070

7171
<bitmap name="Feature" type="bitmap32">
7272
<cluster code="0x0054"/>
73+
<field name="NoFeatures" mask="0x0"/>
7374
<!-- Feature OnOff with code 0x01 is deprecated -->
7475
</bitmap>
7576

‎src/controller/data_model/controller-clusters.matter

+2
Original file line numberDiff line numberDiff line change
@@ -3117,6 +3117,7 @@ cluster RvcRunMode = 84 {
31173117
}
31183118

31193119
bitmap Feature : bitmap32 {
3120+
kNoFeatures = 0x0;
31203121
}
31213122

31223123
struct ModeTagStruct {
@@ -3168,6 +3169,7 @@ cluster RvcCleanMode = 85 {
31683169
}
31693170

31703171
bitmap Feature : bitmap32 {
3172+
kNoFeatures = 0x0;
31713173
}
31723174

31733175
struct ModeTagStruct {

‎src/controller/python/chip/clusters/Objects.py

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/controller/python/templates/python-cluster-Objects-py.zapt

-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ class {{asUpperCamelCase name}}(Cluster):
7878
class {{asType label}}(IntFlag):
7979
{{#zcl_bitmap_items}}
8080
k{{asUpperCamelCase label}} = {{asHex mask}}
81-
{{else}}
82-
kInternalDoNotUseNone = 0
8381
{{/zcl_bitmap_items}}
8482

8583
{{/zcl_bitmaps}}

‎src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎zzz_generated/app-common/app-common/zap-generated/cluster-enums.h

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)