public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[yeelight] Fixed ceiling3 device being recognized as device without nightmode (#11876) 

Signed-off-by: Ondrej Pecta <opecta@gmail.com>
This commit is contained in:
Ondrej Pecta 2021-12-29 08:42:09 +01:00 committed by GitHub
parent db567bc652
commit 0583b608fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bundles/org.openhab.binding.yeelight/src/main/java/org/openhab/binding/yeelight/internal/YeelightHandlerFactory.java
View File

@ -67,10 +67,9 @@ public class YeelightHandlerFactory extends BaseThingHandlerFactory {
return new YeelightColorHandler(thing); return new YeelightColorHandler(thing);
} else if (thingTypeUID.equals(THING_TYPE_STRIPE)) { } else if (thingTypeUID.equals(THING_TYPE_STRIPE)) {
return new YeelightStripeHandler(thing); return new YeelightStripeHandler(thing);
} else if (thingTypeUID.equals(THING_TYPE_CEILING) || thingTypeUID.equals(THING_TYPE_CEILING3) } else if (thingTypeUID.equals(THING_TYPE_CEILING) || thingTypeUID.equals(THING_TYPE_DESKLAMP)) {
|| thingTypeUID.equals(THING_TYPE_DESKLAMP)) {
return new YeelightCeilingHandler(thing); 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); return new YeelightCeilingWithNightHandler(thing);
} else if (thingTypeUID.equals(THING_TYPE_CEILING4)) { } else if (thingTypeUID.equals(THING_TYPE_CEILING4)) {
return new YeelightCeilingWithAmbientHandler(thing); return new YeelightCeilingWithAmbientHandler(thing);

2
bundles/org.openhab.binding.yeelight/src/main/java/org/openhab/binding/yeelight/internal/lib/device/DeviceFactory.java
View File

@ -34,9 +34,9 @@ public class DeviceFactory {
DeviceType type = DeviceType.valueOf(model); DeviceType type = DeviceType.valueOf(model);
switch (type) { switch (type) {
case ceiling: case ceiling:
case ceiling3:
return new CeilingDevice(id); return new CeilingDevice(id);
case ceiling1: case ceiling1:
case ceiling3:
return new CeilingDeviceWithNightDevice(id); return new CeilingDeviceWithNightDevice(id);
case ceiling4: case ceiling4:
return new CeilingDeviceWithAmbientDevice(id); return new CeilingDeviceWithAmbientDevice(id);

2
bundles/org.openhab.binding.yeelight/src/main/java/org/openhab/binding/yeelight/internal/lib/services/DeviceManager.java
View File

@ -332,9 +332,9 @@ public class DeviceManager {
} }
switch (device.getDeviceType()) { switch (device.getDeviceType()) {
case ceiling: case ceiling:
case ceiling3:
return "Yeelight LED Ceiling"; return "Yeelight LED Ceiling";
case ceiling1: case ceiling1:
case ceiling3:
return "Yeelight LED Ceiling with night mode"; return "Yeelight LED Ceiling with night mode";
case ceiling4: case ceiling4:
return "Yeelight LED Ceiling with ambient light"; return "Yeelight LED Ceiling with ambient light";

2
bundles/org.openhab.binding.yeelight/src/test/java/org/openhab/binding/yeelight/internal/YeelightHandlerFactoryTest.java
View File

@ -51,7 +51,7 @@ public class YeelightHandlerFactoryTest {
private static final List<Object[]> TESTS = Arrays.asList( private static final List<Object[]> TESTS = Arrays.asList(
new Object[][] { { "dolphin", YeelightWhiteHandler.class }, { "ct_bulb", YeelightWhiteHandler.class }, new Object[][] { { "dolphin", YeelightWhiteHandler.class }, { "ct_bulb", YeelightWhiteHandler.class },
{ "wonder", YeelightColorHandler.class }, { "stripe", YeelightStripeHandler.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 }, { "ceiling1", YeelightCeilingWithNightHandler.class }, { "desklamp", YeelightCeilingHandler.class },
{ "ceiling4", YeelightCeilingWithAmbientHandler.class }, { "unknown", null } }); { "ceiling4", YeelightCeilingWithAmbientHandler.class }, { "unknown", null } });