Skip to content

Commit 5bab1fc

Browse files
committed
* Simplify z2m backend effects handling by using {LightEffects,LightEffectsV2}::all()
1 parent 0340188 commit 5bab1fc

File tree

1 file changed

+6
-20
lines changed

1 file changed

+6
-20
lines changed

src/backend/z2m/mod.rs

+6-20
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@ use hue::api::{
2222
BridgeHome, Button, ButtonData, ButtonMetadata, ButtonReport, ColorTemperatureUpdate,
2323
ColorUpdate, DeviceArchetype, DeviceProductData, DimmingUpdate, Entertainment,
2424
EntertainmentConfiguration, EntertainmentSegment, EntertainmentSegments, GroupedLight, Light,
25-
LightEffect, LightEffectStatus, LightEffectValues, LightEffects, LightEffectsV2,
26-
LightEffectsV2Update, LightGradientMode, LightMetadata, LightUpdate, Metadata, RType, Resource,
27-
ResourceLink, Room, RoomArchetype, RoomMetadata, Scene, SceneAction, SceneActionElement,
28-
SceneActive, SceneMetadata, SceneRecall, SceneStatus, SceneStatusUpdate, Stub, Taurus,
29-
ZigbeeConnectivity, ZigbeeConnectivityStatus,
25+
LightEffect, LightEffects, LightEffectsV2, LightEffectsV2Update, LightGradientMode,
26+
LightMetadata, LightUpdate, Metadata, RType, Resource, ResourceLink, Room, RoomArchetype,
27+
RoomMetadata, Scene, SceneAction, SceneActionElement, SceneActive, SceneMetadata, SceneRecall,
28+
SceneStatus, SceneStatusUpdate, Stub, Taurus, ZigbeeConnectivity, ZigbeeConnectivityStatus,
3029
};
3130
use hue::clamp::Clamp;
3231
use hue::error::HueError;
@@ -174,21 +173,8 @@ impl Z2mBackend {
174173

175174
if effects {
176175
log::trace!("Detected Hue light: enabling effects");
177-
light.effects = Some(LightEffects {
178-
status_values: LightEffect::ALL.into(),
179-
status: LightEffect::NoEffect,
180-
effect_values: LightEffect::ALL.into(),
181-
});
182-
light.effects_v2 = Some(LightEffectsV2 {
183-
action: LightEffectValues {
184-
effect_values: LightEffect::ALL.into(),
185-
},
186-
status: LightEffectStatus {
187-
effect: LightEffect::NoEffect,
188-
effect_values: LightEffect::ALL.into(),
189-
parameters: None,
190-
},
191-
});
176+
light.effects = Some(LightEffects::all());
177+
light.effects_v2 = Some(LightEffectsV2::all());
192178
}
193179

194180
let segments = if gradient.is_some() {

0 commit comments

Comments
 (0)