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

Jump to bottom

[yeelight] Fixed ceiling3 device being recognized as device without night mode #11876

Merged
merged 1 commit into from Dec 29, 2021
Merged

[yeelight] Fixed ceiling3 device being recognized as device without night mode #11876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions ....yeelight/src/main/java/org/openhab/binding/yeelight/internal/YeelightHandlerFactory.java
View file
Open in desktop
Expand Up @@ -67,10 +67,9 @@ protected ThingHandler createHandler(Thing thing) {
return new YeelightColorHandler(thing);
} else if (thingTypeUID.equals(THING_TYPE_STRIPE)) {
return new YeelightStripeHandler(thing);
} else if (thingTypeUID.equals(THING_TYPE_CEILING) || thingTypeUID.equals(THING_TYPE_CEILING3)
|| thingTypeUID.equals(THING_TYPE_DESKLAMP)) {
} else if (thingTypeUID.equals(THING_TYPE_CEILING) || thingTypeUID.equals(THING_TYPE_DESKLAMP)) {
return new YeelightCeilingHandler(thing);
} else if (thingTypeUID.equals(THING_TYPE_CEILING1)) {
} else if (thingTypeUID.equals(THING_TYPE_CEILING1) || thingTypeUID.equals(THING_TYPE_CEILING3)) {
return new YeelightCeilingWithNightHandler(thing);
} else if (thingTypeUID.equals(THING_TYPE_CEILING4)) {
return new YeelightCeilingWithAmbientHandler(thing);
Expand Down
2 changes: 1 addition & 1 deletion ...eelight/src/main/java/org/openhab/binding/yeelight/internal/lib/device/DeviceFactory.java
View file
Open in desktop
Expand Up @@ -34,9 +34,9 @@ public static DeviceBase build(String model, String id) {
DeviceType type = DeviceType.valueOf(model);
switch (type) {
case ceiling:
case ceiling3:
return new CeilingDevice(id);
case ceiling1:
case ceiling3:
return new CeilingDeviceWithNightDevice(id);
case ceiling4:
return new CeilingDeviceWithAmbientDevice(id);
Expand Down
2 changes: 1 addition & 1 deletion ...light/src/main/java/org/openhab/binding/yeelight/internal/lib/services/DeviceManager.java
View file
Open in desktop
Expand Up @@ -332,9 +332,9 @@ public static String getDefaultName(DeviceBase device) {
}
switch (device.getDeviceType()) {
case ceiling:
case ceiling3:
return "Yeelight LED Ceiling";
case ceiling1:
case ceiling3:
return "Yeelight LED Ceiling with night mode";
case ceiling4:
return "Yeelight LED Ceiling with ambient light";
Expand Down
2 changes: 1 addition & 1 deletion ...light/src/test/java/org/openhab/binding/yeelight/internal/YeelightHandlerFactoryTest.java
View file
Open in desktop
Expand Up @@ -51,7 +51,7 @@ public class YeelightHandlerFactoryTest {
private static final List<Object[]> TESTS = Arrays.asList(
new Object[][] { { "dolphin", YeelightWhiteHandler.class }, { "ct_bulb", YeelightWhiteHandler.class },
{ "wonder", YeelightColorHandler.class }, { "stripe", YeelightStripeHandler.class },
{ "ceiling", YeelightCeilingHandler.class }, { "ceiling3", YeelightCeilingHandler.class },
{ "ceiling", YeelightCeilingHandler.class }, { "ceiling3", YeelightCeilingWithNightHandler.class },
{ "ceiling1", YeelightCeilingWithNightHandler.class }, { "desklamp", YeelightCeilingHandler.class },
{ "ceiling4", YeelightCeilingWithAmbientHandler.class }, { "unknown", null } });

Expand Down