Skip to content

Commit

Permalink
Merge pull request openhab#5 from dimalo/xiaomi-miio-pr
Browse files Browse the repository at this point in the history
minor changes in the project & basic functionality for yeelight ceiling
  • Loading branch information
marcelrv authored Aug 14, 2017
2 parents 21cd95c + eb55ebf commit 39be8b3
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 4 deletions.
2 changes: 1 addition & 1 deletion addons/binding/org.openhab.binding.miio/.classpath
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="output" path="target/classes"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"device": {
"id": "yeelink.light.ceiling1",
"properties": [{
"property": "power",
"friendlyName": "Power",
"channel": "actions#power",
"type": "Switch",
"refresh": true,
"ChannelGroup": ""
},
{
"property": "color_mode",
"friendlyName": "ColorMode",
"channel": "actions#colorMode",
"type": "String",
"refresh": true,
"ChannelGroup": "actions"
},
{
"property": "ct",
"friendlyName": "ColorTemperature",
"channel": "actions#colorTemperature",
"type": "Number",
"refresh": true,
"ChannelGroup": "actions"
},
{
"property": "bright",
"friendlyName": "Brightness",
"channel": "actions#brightness",
"type": "Dimmer",
"refresh": true,
"ChannelGroup": "actions"
}],
"actions": [{
"command": "set_power",
"channel": "actions#power",
"type": "Switch"
},
{
"command": "set_scene",
"channel": "actions#colorMode",
"type": "String"
},
{
"command": "set_bright",
"channel": "actions#brightness",
"type": "Dimmer"
},
{
"command": "set_ct_abx",
"channel": "actions#colorTemperature",
"type": "Number"
},
{
"command": "set_default",
"channel": "actions#saveCurrentState",
"type": "Switch"
}]
}
}

2 changes: 0 additions & 2 deletions addons/binding/org.openhab.binding.miio/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
<version>2.2.0-SNAPSHOT</version>
</parent>

<groupId>org.openhab.binding</groupId>
<artifactId>org.openhab.binding.miio</artifactId>
<version>2.2.0-SNAPSHOT</version>

<name>Xiaomi Mi IO Binding</name>
<packaging>eclipse-plugin</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,11 @@ public enum MiIoDevices {
YEELIGHT_L1("yeelink.light.lamp1", "Yeelight", MiIoBindingConstants.THING_TYPE_UNSUPPORTED),
YEELIGHT_M1("yeelink.light.mono1", "Yeelight White Bulb", MiIoBindingConstants.THING_TYPE_UNSUPPORTED),
YEELIGHT_C1("yeelink.light.color1", "Yeelight Color Bulb", MiIoBindingConstants.THING_TYPE_UNSUPPORTED),
YEELIGHT_CEIL1("yeelink.light.ceiling1", "Yeelight LED Ceiling Lamp", MiIoBindingConstants.THING_TYPE_BASIC),
TOOTHBRUSH("soocare.toothbrush.x3", "Mi Toothbrush", MiIoBindingConstants.THING_TYPE_UNSUPPORTED),
WIFISPEAKER("xiaomi.wifispeaker.v1", "Mi Internet Speaker", MiIoBindingConstants.THING_TYPE_UNSUPPORTED),
PHILIPSBULB("philips.light.bulb", "Xiaomi Philips Bulb", MiIoBindingConstants.THING_TYPE_UNSUPPORTED),
PHILIPS("philips.light.sread1", "Xiaomi Philips Eyecare Smart Lamp 2", MiIoBindingConstants.THING_TYPE_UNSUPPORTED),
PHILIPS("philips.light.sread1", "Xiaomi Philips Eyecare Smart Lamp 2", MiIoBindingConstants.THING_TYPE_BASIC),
PHILIPS2("philips.light.ceiling", "Xiaomi Philips LED Ceiling Lamp", MiIoBindingConstants.THING_TYPE_UNSUPPORTED),
UNKNOWN("unknown", "Unknown Mi IO Device", MiIoBindingConstants.THING_TYPE_UNSUPPORTED);

Expand Down

0 comments on commit 39be8b3

Please sign in to comment.