Fixes project-chip#31578 Removed provisional features from implementation to align with test plan for TE2. (project-chip#31663)

jamesharrow · web-flow · commit ce800c26dce0 · 2024-01-25T23:33:33.000Z
diff --git a/examples/all-clusters-app/all-clusters-common/src/device-energy-management-stub.cpp b/examples/all-clusters-app/all-clusters-common/src/device-energy-management-stub.cpp
@@ -52,8 +52,7 @@ void emberAfDeviceEnergyManagementClusterInitCallback(chip::EndpointId endpointI
         BitMask<DeviceEnergyManagement::Feature, uint32_t>(
             DeviceEnergyManagement::Feature::kPowerAdjustment, DeviceEnergyManagement::Feature::kPowerForecastReporting,
             DeviceEnergyManagement::Feature::kStateForecastReporting, DeviceEnergyManagement::Feature::kStartTimeAdjustment,
-            DeviceEnergyManagement::Feature::kPausable, DeviceEnergyManagement::Feature::kForecastAdjustment,
-            DeviceEnergyManagement::Feature::kConstraintBasedAdjustment));
+            DeviceEnergyManagement::Feature::kPausable));
 
     if (!gInstance)
     {
diff --git a/examples/energy-management-app/esp32/main/main.cpp b/examples/energy-management-app/esp32/main/main.cpp
@@ -154,8 +154,7 @@ CHIP_ERROR DeviceEnergyManagementInit()
         BitMask<DeviceEnergyManagement::Feature, uint32_t>(
             DeviceEnergyManagement::Feature::kPowerAdjustment, DeviceEnergyManagement::Feature::kPowerForecastReporting,
             DeviceEnergyManagement::Feature::kStateForecastReporting, DeviceEnergyManagement::Feature::kStartTimeAdjustment,
-            DeviceEnergyManagement::Feature::kPausable, DeviceEnergyManagement::Feature::kForecastAdjustment,
-            DeviceEnergyManagement::Feature::kConstraintBasedAdjustment));
+            DeviceEnergyManagement::Feature::kPausable));
 
     if (!gDEMInstance)
     {
diff --git a/examples/energy-management-app/linux/main.cpp b/examples/energy-management-app/linux/main.cpp
@@ -77,8 +77,7 @@ CHIP_ERROR DeviceEnergyManagementInit()
         BitMask<DeviceEnergyManagement::Feature, uint32_t>(
             DeviceEnergyManagement::Feature::kPowerAdjustment, DeviceEnergyManagement::Feature::kPowerForecastReporting,
             DeviceEnergyManagement::Feature::kStateForecastReporting, DeviceEnergyManagement::Feature::kStartTimeAdjustment,
-            DeviceEnergyManagement::Feature::kPausable, DeviceEnergyManagement::Feature::kForecastAdjustment,
-            DeviceEnergyManagement::Feature::kConstraintBasedAdjustment));
+            DeviceEnergyManagement::Feature::kPausable));
 
     if (!gDEMInstance)
     {

Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,7 @@ void emberAfDeviceEnergyManagementClusterInitCallback(chip::EndpointId endpointI`
`52`	`52`	`BitMask<DeviceEnergyManagement::Feature, uint32_t>(`
`53`	`53`	`DeviceEnergyManagement::Feature::kPowerAdjustment, DeviceEnergyManagement::Feature::kPowerForecastReporting,`
`54`	`54`	`DeviceEnergyManagement::Feature::kStateForecastReporting, DeviceEnergyManagement::Feature::kStartTimeAdjustment,`
`55`		`- DeviceEnergyManagement::Feature::kPausable, DeviceEnergyManagement::Feature::kForecastAdjustment,`
`56`		`- DeviceEnergyManagement::Feature::kConstraintBasedAdjustment));`
	`55`	`+ DeviceEnergyManagement::Feature::kPausable));`
`57`	`56`
`58`	`57`	`if (!gInstance)`
`59`	`58`	`{`
Original file line number	Diff line number	Diff line change
`@@ -154,8 +154,7 @@ CHIP_ERROR DeviceEnergyManagementInit()`
`154`	`154`	`BitMask<DeviceEnergyManagement::Feature, uint32_t>(`
`155`	`155`	`DeviceEnergyManagement::Feature::kPowerAdjustment, DeviceEnergyManagement::Feature::kPowerForecastReporting,`
`156`	`156`	`DeviceEnergyManagement::Feature::kStateForecastReporting, DeviceEnergyManagement::Feature::kStartTimeAdjustment,`
`157`		`- DeviceEnergyManagement::Feature::kPausable, DeviceEnergyManagement::Feature::kForecastAdjustment,`
`158`		`- DeviceEnergyManagement::Feature::kConstraintBasedAdjustment));`
	`157`	`+ DeviceEnergyManagement::Feature::kPausable));`
`159`	`158`
`160`	`159`	`if (!gDEMInstance)`
`161`	`160`	`{`
Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,7 @@ CHIP_ERROR DeviceEnergyManagementInit()`
`77`	`77`	`BitMask<DeviceEnergyManagement::Feature, uint32_t>(`
`78`	`78`	`DeviceEnergyManagement::Feature::kPowerAdjustment, DeviceEnergyManagement::Feature::kPowerForecastReporting,`
`79`	`79`	`DeviceEnergyManagement::Feature::kStateForecastReporting, DeviceEnergyManagement::Feature::kStartTimeAdjustment,`
`80`		`- DeviceEnergyManagement::Feature::kPausable, DeviceEnergyManagement::Feature::kForecastAdjustment,`
`81`		`- DeviceEnergyManagement::Feature::kConstraintBasedAdjustment));`
	`80`	`+ DeviceEnergyManagement::Feature::kPausable));`
`82`	`81`
`83`	`82`	`if (!gDEMInstance)`
`84`	`83`	`{`