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

31599 DEMM & EVSEM FeatureMap list has to be updated as per test plan (should be 0) #32057

Merged
merged 3 commits into from
Feb 12, 2024
Merged

31599 DEMM & EVSEM FeatureMap list has to be updated as per test plan (should be 0) #32057

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b79eec6
Fixes: #31599 - Changed to remove kOnOff support in EEVSEM and DEMM c…
jamesharrow Feb 10, 2024
c3b870c
Added a kNoFeatures enum to eevse and demm xml, and then regen_all
jamesharrow Feb 10, 2024
9394725
Revert "Fixes: #31599 - Changed to remove kOnOff support in EEVSEM an…
jamesharrow Feb 11, 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
2 changes: 2 additions & 0 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 @@ -4466,6 +4466,7 @@ provisional cluster EnergyEvseMode = 157 {
}

bitmap Feature : bitmap32 {
kNoFeatures = 0x0;
kOnOff = 0x1;
}

Expand Down Expand Up @@ -4517,6 +4518,7 @@ provisional cluster DeviceEnergyManagementMode = 159 {
}

bitmap Feature : bitmap32 {
kNoFeatures = 0x0;
kOnOff = 0x1;
}

Expand Down
2 changes: 2 additions & 0 deletions examples/energy-management-app/energy-management-common/energy-management-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1568,6 +1568,7 @@ provisional cluster EnergyEvseMode = 157 {
}

bitmap Feature : bitmap32 {
kNoFeatures = 0x0;
kOnOff = 0x1;
}

Expand Down Expand Up @@ -1619,6 +1620,7 @@ provisional cluster DeviceEnergyManagementMode = 159 {
}

bitmap Feature : bitmap32 {
kNoFeatures = 0x0;
kOnOff = 0x1;
}

Expand Down
26 changes: 13 additions & 13 deletions examples/energy-management-app/energy-management-common/energy-management-app.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1719,10 +1719,10 @@
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -1735,10 +1735,10 @@
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -2812,7 +2812,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -2828,7 +2828,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -2844,7 +2844,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -2860,7 +2860,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -2876,7 +2876,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -2892,7 +2892,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -2908,7 +2908,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -2924,7 +2924,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -2940,7 +2940,7 @@
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down
2 changes: 1 addition & 1 deletion ...ples/energy-management-app/energy-management-common/src/device-energy-management-mode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,6 @@ void emberAfDeviceEnergyManagementModeClusterInitCallback(chip::EndpointId endpo
gDeviceEnergyManagementModeDelegate = std::make_unique<DeviceEnergyManagementMode::DeviceEnergyManagementModeDelegate>();
gDeviceEnergyManagementModeInstance =
std::make_unique<ModeBase::Instance>(gDeviceEnergyManagementModeDelegate.get(), 0x1, DeviceEnergyManagementMode::Id,
chip::to_underlying(DeviceEnergyManagementMode::Feature::kOnOff));
chip::to_underlying(DeviceEnergyManagementMode::Feature::kNoFeatures));
gDeviceEnergyManagementModeInstance->Init();
}
2 changes: 1 addition & 1 deletion examples/energy-management-app/energy-management-common/src/energy-evse-mode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,6 @@ void emberAfEnergyEvseModeClusterInitCallback(chip::EndpointId endpointId)
VerifyOrDie(!gEnergyEvseModeDelegate && !gEnergyEvseModeInstance);
gEnergyEvseModeDelegate = std::make_unique<EnergyEvseMode::EnergyEvseModeDelegate>();
gEnergyEvseModeInstance = std::make_unique<ModeBase::Instance>(gEnergyEvseModeDelegate.get(), 0x1, EnergyEvseMode::Id,
chip::to_underlying(EnergyEvseMode::Feature::kOnOff));
chip::to_underlying(EnergyEvseMode::Feature::kNoFeatures));
gEnergyEvseModeInstance->Init();
}
7 changes: 7 additions & 0 deletions src/app/zap-templates/zcl/data-model/chip/device-energy-management-mode-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,11 @@ limitations under the License.
<arg name="StatusText" type="char_string" length="64" optional="true"/>
</command>
</cluster>

<bitmap name="Feature" type="bitmap32">
<cluster code="0x009F"/>
<field name="NoFeatures" mask="0x0"/>
<field name="OnOff" mask="0x1"/>
</bitmap>

</configurator>
7 changes: 6 additions & 1 deletion src/app/zap-templates/zcl/data-model/chip/energy-evse-mode-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,10 @@ limitations under the License.
<arg name="Status" type="enum8" optional="false"/>
<arg name="StatusText" type="char_string" length="64" optional="true"/>
</command>
</cluster>
</cluster>
<bitmap name="Feature" type="bitmap32">
<cluster code="0x009D"/>
<field name="NoFeatures" mask="0x0"/>
<field name="OnOff" mask="0x1"/>
</bitmap>
</configurator>
4 changes: 2 additions & 2 deletions src/app/zap-templates/zcl/data-model/chip/mode-base-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ This is because zap does not currently support generating code for clusters that
<cluster code="0x0059"/> <!-- Dishwasher Mode -->
<cluster code="0x005E"/> <!-- Microwave Oven Mode -->
<cluster code="0x0049"/> <!-- Oven Mode -->
<cluster code="0x009D"/> <!-- Energy EVSE Mode -->
<cluster code="0x009F"/> <!-- Device Energy Management Mode -->
<!-- <cluster code="0x009D"/> Energy EVSE Mode. This cluster optionally allows for kNoFeatures or kOnOff -->
<!-- <cluster code="0x009F"/> Device Energy Management Mode. This cluster optionally allows for kNoFeatures or kOnOff -->
<field name="OnOff" mask="0x1"/>
</bitmap>
</configurator>
2 changes: 2 additions & 0 deletions src/controller/data_model/controller-clusters.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5042,6 +5042,7 @@ provisional cluster EnergyEvseMode = 157 {
}

bitmap Feature : bitmap32 {
kNoFeatures = 0x0;
kOnOff = 0x1;
}

Expand Down Expand Up @@ -5093,6 +5094,7 @@ provisional cluster DeviceEnergyManagementMode = 159 {
}

bitmap Feature : bitmap32 {
kNoFeatures = 0x0;
kOnOff = 0x1;
}

Expand Down
2 changes: 2 additions & 0 deletions src/controller/python/chip/clusters/Objects.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading