Skip to content

Commit c3b870c

Browse files
jamesharrowjamesharrow
committed
Added a kNoFeatures enum to eevse and demm xml, and then regen_all
1 parent b79eec6 commit c3b870c

File tree

10 files changed

+42
-18
lines changed

10 files changed

+42
-18
lines changed

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

+2
Original file line numberDiff line numberDiff line change
@@ -4466,6 +4466,7 @@ provisional cluster EnergyEvseMode = 157 {
44664466
}
44674467

44684468
bitmap Feature : bitmap32 {
4469+
kNoFeatures = 0x0;
44694470
kOnOff = 0x1;
44704471
}
44714472

@@ -4517,6 +4518,7 @@ provisional cluster DeviceEnergyManagementMode = 159 {
45174518
}
45184519

45194520
bitmap Feature : bitmap32 {
4521+
kNoFeatures = 0x0;
45204522
kOnOff = 0x1;
45214523
}
45224524

‎examples/energy-management-app/energy-management-common/energy-management-app.matter

+2
Original file line numberDiff line numberDiff line change
@@ -1568,6 +1568,7 @@ provisional cluster EnergyEvseMode = 157 {
15681568
}
15691569

15701570
bitmap Feature : bitmap32 {
1571+
kNoFeatures = 0x0;
15711572
kOnOff = 0x1;
15721573
}
15731574

@@ -1619,6 +1620,7 @@ provisional cluster DeviceEnergyManagementMode = 159 {
16191620
}
16201621

16211622
bitmap Feature : bitmap32 {
1623+
kNoFeatures = 0x0;
16221624
kOnOff = 0x1;
16231625
}
16241626

‎examples/energy-management-app/energy-management-common/energy-management-app.zap

+13-13
Original file line numberDiff line numberDiff line change
@@ -1719,10 +1719,10 @@
17191719
"side": "server",
17201720
"type": "bitmap32",
17211721
"included": 1,
1722-
"storageOption": "RAM",
1722+
"storageOption": "External",
17231723
"singleton": 0,
17241724
"bounded": 0,
1725-
"defaultValue": "0",
1725+
"defaultValue": null,
17261726
"reportable": 1,
17271727
"minInterval": 1,
17281728
"maxInterval": 65534,
@@ -1735,10 +1735,10 @@
17351735
"side": "server",
17361736
"type": "int16u",
17371737
"included": 1,
1738-
"storageOption": "RAM",
1738+
"storageOption": "External",
17391739
"singleton": 0,
17401740
"bounded": 0,
1741-
"defaultValue": "1",
1741+
"defaultValue": null,
17421742
"reportable": 1,
17431743
"minInterval": 1,
17441744
"maxInterval": 65534,
@@ -2812,7 +2812,7 @@
28122812
"storageOption": "External",
28132813
"singleton": 0,
28142814
"bounded": 0,
2815-
"defaultValue": "",
2815+
"defaultValue": null,
28162816
"reportable": 1,
28172817
"minInterval": 1,
28182818
"maxInterval": 65534,
@@ -2828,7 +2828,7 @@
28282828
"storageOption": "External",
28292829
"singleton": 0,
28302830
"bounded": 0,
2831-
"defaultValue": "",
2831+
"defaultValue": null,
28322832
"reportable": 1,
28332833
"minInterval": 1,
28342834
"maxInterval": 65534,
@@ -2844,7 +2844,7 @@
28442844
"storageOption": "External",
28452845
"singleton": 0,
28462846
"bounded": 0,
2847-
"defaultValue": "",
2847+
"defaultValue": null,
28482848
"reportable": 1,
28492849
"minInterval": 1,
28502850
"maxInterval": 65534,
@@ -2860,7 +2860,7 @@
28602860
"storageOption": "External",
28612861
"singleton": 0,
28622862
"bounded": 0,
2863-
"defaultValue": "",
2863+
"defaultValue": null,
28642864
"reportable": 1,
28652865
"minInterval": 1,
28662866
"maxInterval": 65534,
@@ -2876,7 +2876,7 @@
28762876
"storageOption": "External",
28772877
"singleton": 0,
28782878
"bounded": 0,
2879-
"defaultValue": "",
2879+
"defaultValue": null,
28802880
"reportable": 1,
28812881
"minInterval": 1,
28822882
"maxInterval": 65534,
@@ -2892,7 +2892,7 @@
28922892
"storageOption": "External",
28932893
"singleton": 0,
28942894
"bounded": 0,
2895-
"defaultValue": "",
2895+
"defaultValue": null,
28962896
"reportable": 1,
28972897
"minInterval": 1,
28982898
"maxInterval": 65534,
@@ -2908,7 +2908,7 @@
29082908
"storageOption": "External",
29092909
"singleton": 0,
29102910
"bounded": 0,
2911-
"defaultValue": "",
2911+
"defaultValue": null,
29122912
"reportable": 1,
29132913
"minInterval": 1,
29142914
"maxInterval": 65534,
@@ -2924,7 +2924,7 @@
29242924
"storageOption": "External",
29252925
"singleton": 0,
29262926
"bounded": 0,
2927-
"defaultValue": "",
2927+
"defaultValue": null,
29282928
"reportable": 1,
29292929
"minInterval": 1,
29302930
"maxInterval": 65534,
@@ -2940,7 +2940,7 @@
29402940
"storageOption": "External",
29412941
"singleton": 0,
29422942
"bounded": 0,
2943-
"defaultValue": "0",
2943+
"defaultValue": null,
29442944
"reportable": 1,
29452945
"minInterval": 1,
29462946
"maxInterval": 65534,

‎src/app/zap-templates/zcl/data-model/chip/device-energy-management-mode-cluster.xml

+7
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,11 @@ limitations under the License.
5757
<arg name="StatusText" type="char_string" length="64" optional="true"/>
5858
</command>
5959
</cluster>
60+
61+
<bitmap name="Feature" type="bitmap32">
62+
<cluster code="0x009F"/>
63+
<field name="NoFeatures" mask="0x0"/>
64+
<field name="OnOff" mask="0x1"/>
65+
</bitmap>
66+
6067
</configurator>

‎src/app/zap-templates/zcl/data-model/chip/energy-evse-mode-cluster.xml

+6-1
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,10 @@ limitations under the License.
5555
<arg name="Status" type="enum8" optional="false"/>
5656
<arg name="StatusText" type="char_string" length="64" optional="true"/>
5757
</command>
58-
</cluster>
58+
</cluster>
59+
<bitmap name="Feature" type="bitmap32">
60+
<cluster code="0x009D"/>
61+
<field name="NoFeatures" mask="0x0"/>
62+
<field name="OnOff" mask="0x1"/>
63+
</bitmap>
5964
</configurator>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ This is because zap does not currently support generating code for clusters that
9595
<cluster code="0x0059"/> <!-- Dishwasher Mode -->
9696
<cluster code="0x005E"/> <!-- Microwave Oven Mode -->
9797
<cluster code="0x0049"/> <!-- Oven Mode -->
98-
<cluster code="0x009D"/> <!-- Energy EVSE Mode -->
99-
<cluster code="0x009F"/> <!-- Device Energy Management Mode -->
98+
<!-- <cluster code="0x009D"/> Energy EVSE Mode. This cluster optionally allows for kNoFeatures or kOnOff -->
99+
<!-- <cluster code="0x009F"/> Device Energy Management Mode. This cluster optionally allows for kNoFeatures or kOnOff -->
100100
<field name="OnOff" mask="0x1"/>
101101
</bitmap>
102102
</configurator>

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

+2
Original file line numberDiff line numberDiff line change
@@ -5042,6 +5042,7 @@ provisional cluster EnergyEvseMode = 157 {
50425042
}
50435043

50445044
bitmap Feature : bitmap32 {
5045+
kNoFeatures = 0x0;
50455046
kOnOff = 0x1;
50465047
}
50475048

@@ -5093,6 +5094,7 @@ provisional cluster DeviceEnergyManagementMode = 159 {
50935094
}
50945095

50955096
bitmap Feature : bitmap32 {
5097+
kNoFeatures = 0x0;
50965098
kOnOff = 0x1;
50975099
}
50985100

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

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

‎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

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

0 commit comments

Comments
 (0)