diff --git a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/i18n/wemo.properties b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/i18n/wemo.properties
index a423beb6e..e69a1e555 100644
--- a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/i18n/wemo.properties
+++ b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/i18n/wemo.properties
@@ -7,10 +7,18 @@ binding.wemo.description = The WeMo binding integrates Belkin WeMo devices.
thing-type.wemo.CoffeeMaker.label = Mr. Coffee WeMo Enabled Coffeemaker
thing-type.wemo.CoffeeMaker.description = This is a WeMo enabled coffee maker
+thing-type.wemo.Crockpot.label = Crock-Pot Slow Cooker
+thing-type.wemo.Crockpot.description = Crock-Pot Smart Slow Cooker with WeMo
+thing-type.wemo.Heater.label = Holmes Heater
+thing-type.wemo.Heater.description = Holmes Smart Heater with WeMo
+thing-type.wemo.Humidifier.label = Holmes Humidifier
+thing-type.wemo.Humidifier.description = Holmes Smart Humidifier with WeMo
thing-type.wemo.MZ100.label = WeMo LED Light
thing-type.wemo.MZ100.description = This is a standard WeMo light bulb with E27 socket
thing-type.wemo.Maker.label = WeMo Maker
thing-type.wemo.Maker.description = This is a WeMo Maker
+thing-type.wemo.Purifier.label = Holmes Air Purifier
+thing-type.wemo.Purifier.description = Holmes Smart Air Purifier with WeMo
thing-type.wemo.bridge.label = WeMo Link
thing-type.wemo.bridge.description = The Wemo Link represents the Belkin WeMo Link bridge.
thing-type.wemo.dimmer.label = WeMo DimmerSwitch
@@ -39,6 +47,11 @@ thing-type.config.wemo.device.udn.description = The UDN identifies the WeMo Devi
# channel types
+channel-type.wemo.airQiality.label = Air Quality
+channel-type.wemo.airQiality.description = Shows the air quality measured by a WeMo enabled Holmes Air Purifier
+channel-type.wemo.autoOffTime.label = Auto OFF Time
+channel-type.wemo.autoOffTime.description = Time when a WeMo enabled Heater should switch off
+channel-type.wemo.autoOffTime.state.pattern = %1$tR
channel-type.wemo.averagePower.label = Average Power
channel-type.wemo.averagePower.description = The average power consumption
channel-type.wemo.brewed.label = Brewed
@@ -58,8 +71,22 @@ channel-type.wemo.coffeeMode.state.option.Brewed = Brewing Finished
channel-type.wemo.coffeeMode.state.option.CleaningBrewing = Cleaning Coffee Maker
channel-type.wemo.coffeeMode.state.option.CleaningSoaking = Cleaning Filter
channel-type.wemo.coffeeMode.state.option.BrewFailCarafeRemoved = Brewing Failed: Carafe Removed
+channel-type.wemo.cookMode.label = Cooking Mode
+channel-type.wemo.cookMode.description = Shows the operation mode of a WeMo CrockPot
+channel-type.wemo.cookMode.state.option.OFF = Not cooking
+channel-type.wemo.cookMode.state.option.WARM = Warming
+channel-type.wemo.cookMode.state.option.LOW = Low cooking
+channel-type.wemo.cookMode.state.option.HIGH = High cooking
+channel-type.wemo.cookedTime.label = CookedTime
+channel-type.wemo.cookedTime.description = Shows the elapsed cooking time
+channel-type.wemo.currentHumidity.label = Current Humidity
+channel-type.wemo.currentHumidity.description = Shows the current humidity of a WeMo enabled Holmes Humidifier
channel-type.wemo.currentPower.label = Power
channel-type.wemo.currentPower.description = The current power consumption
+channel-type.wemo.currentTemperature.label = Current Temperature
+channel-type.wemo.currentTemperature.description = Shows the current temperature measured by a WeMo enabled Heater
+channel-type.wemo.desiredHumidity.label = Target Humidity
+channel-type.wemo.desiredHumidity.description = Shows the target humidity of a WeMo enabled Holmes Humidifier
channel-type.wemo.endTime.label = NightMode End Time
channel-type.wemo.endTime.description = Time when the Night Mode ends
channel-type.wemo.endTime.state.pattern = %1$tR
@@ -73,6 +100,33 @@ channel-type.wemo.faderEnabled.label = Fader OFF/ON
channel-type.wemo.faderEnabled.description = Allows to switch the fader ON/OFF
channel-type.wemo.filterAdvise.label = FilterAdvise
channel-type.wemo.filterAdvise.description = Indicates if a WeMo Coffee Maker needs to have the filter changed
+channel-type.wemo.filterExpired.label = Filter Time expired
+channel-type.wemo.filterExpired.description = Indicates whether the air Filter needs to be replaced
+channel-type.wemo.filterLife.label = Filter Life
+channel-type.wemo.filterLife.description = Shows the remaining lifetime percentage of the air filter
+channel-type.wemo.filterPresent.label = Filter is present
+channel-type.wemo.filterPresent.description = Indicates whether the air Filter is present
+channel-type.wemo.heaterMode.label = Operation Mode
+channel-type.wemo.heaterMode.description = Shows the operation mode of a WeMo enabled Heater
+channel-type.wemo.heaterMode.state.option.OFF = Not Running
+channel-type.wemo.heaterMode.state.option.FROSTPROTECT = Running at FrostProtect
+channel-type.wemo.heaterMode.state.option.HIGH = Running at high level
+channel-type.wemo.heaterMode.state.option.LOW = Running at low level
+channel-type.wemo.heaterMode.state.option.ECO = Running in Eco mode
+channel-type.wemo.heatingRemaining.label = Remaining heating time
+channel-type.wemo.heatingRemaining.description = Shows the target temperature for a WeMo enabled Heater
+channel-type.wemo.highCookTime.label = HighCookTime
+channel-type.wemo.highCookTime.description = Shows the timer settings for high cooking mode
+channel-type.wemo.humidifierMode.label = Operation Mode
+channel-type.wemo.humidifierMode.description = Shows the operation mode of a WeMo enabled Holmes Humidifier
+channel-type.wemo.humidifierMode.state.option.OFF = Not Running
+channel-type.wemo.humidifierMode.state.option.MIN = Running at min level
+channel-type.wemo.humidifierMode.state.option.LOW = Running at low level
+channel-type.wemo.humidifierMode.state.option.MED = Running at medium level
+channel-type.wemo.humidifierMode.state.option.HIGH = Running at high level
+channel-type.wemo.humidifierMode.state.option.MAX = Running in max level
+channel-type.wemo.ionizer.label = Ionizer
+channel-type.wemo.ionizer.description = Switches ionization ON or OFF
channel-type.wemo.lastChangedAt.label = Last Activity (Date/Time)
channel-type.wemo.lastChangedAt.description = Date/time when the state last changed
channel-type.wemo.lastCleaned.label = LastCleaned
@@ -81,6 +135,8 @@ channel-type.wemo.lastMotionDetected.label = Last Activity (Date/Time)
channel-type.wemo.lastMotionDetected.description = Date/time when last motion was detected
channel-type.wemo.lastOnFor.label = Last Activity (s)
channel-type.wemo.lastOnFor.description = Duration the device has been switched on for
+channel-type.wemo.lowCookTime.label = LowCookTime
+channel-type.wemo.lowCookTime.description = Shows the timer settings for low cooking mode
channel-type.wemo.modeTime.label = ModeTime
channel-type.wemo.modeTime.description = Shows the current amount of time, in minutes, that the Coffee Maker has been in the current mode
channel-type.wemo.motionDetection.label = Motion Status
@@ -95,6 +151,13 @@ channel-type.wemo.onToday.label = Today's Activity (s)
channel-type.wemo.onToday.description = How long has the device been switched on today
channel-type.wemo.onTotal.label = Total Activity (s)
channel-type.wemo.onTotal.description = How long has the device been switched on totally
+channel-type.wemo.purifierMode.label = Operation Mode
+channel-type.wemo.purifierMode.description = Shows the operation mode of a WeMo enabled Holmes Air Purifier
+channel-type.wemo.purifierMode.state.option.OFF = Not Running
+channel-type.wemo.purifierMode.state.option.LOW = Running at low level
+channel-type.wemo.purifierMode.state.option.MED = Running at medium level
+channel-type.wemo.purifierMode.state.option.HIGH = Running at high level
+channel-type.wemo.purifierMode.state.option.AUTO = Running in auto mode
channel-type.wemo.relay.label = Relay
channel-type.wemo.relay.description = Switches the integrated relay contact close/open
channel-type.wemo.sensor.label = Sensor
@@ -106,16 +169,23 @@ channel-type.wemo.startTime.description = Time when the Night Mode starts
channel-type.wemo.startTime.state.pattern = %1$tR
channel-type.wemo.state.label = Switch
channel-type.wemo.state.description = Turns the power on or off
+channel-type.wemo.targetTemperature.label = Target Temperature
+channel-type.wemo.targetTemperature.description = Shows the target temperature for a WeMo enabled Heater
channel-type.wemo.timeRemaining.label = TimeRemaining
channel-type.wemo.timeRemaining.description = Shows the remaining brewing time of a WeMo Coffee Maker
channel-type.wemo.timerStart.label = Timer OFF/ON
channel-type.wemo.timerStart.description = Allows to switch the timer ON/OFF
channel-type.wemo.timespan.label = Usage Timespan (s)
channel-type.wemo.timespan.description = Time used to measure average usage
+channel-type.wemo.warmCookTime.label = WarmCookTime
+channel-type.wemo.warmCookTime.description = Shows the timer settings for warm cooking mode
+channel-type.wemo.waterLevel.label = Water Level
+channel-type.wemo.waterLevel.description = Shows the water level of a WeMo enabled Holmes Humidifier
channel-type.wemo.waterLevelReached.label = WaterLevelReached
channel-type.wemo.waterLevelReached.description = Indicates if the WeMo Coffee Maker needs to be refilled
-# Config status messages
+# config status messages
+
config-status.pending.device-not-registered = UPnP device is not registered yet.
config-status.error.missing-udn = UDN of the WeMo device is missing.
config-status.error.missing-ip = IP address of the WeMo device is missing.
diff --git a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/channels.xml
similarity index 65%
rename from bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/thing-types.xml
rename to bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/channels.xml
index e21fdba0f..62aeed076 100644
--- a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/channels.xml
@@ -4,232 +4,6 @@
xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
-
-
- This is a standard WeMo Switch
-
-
-
-
-
- udn
-
-
-
-
-
-
- This is a WeMo Insight Switch with energy measurement
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- udn
-
-
-
-
-
-
- This is a WeMo LightSwitch
-
-
-
-
-
- udn
-
-
-
-
-
-
- This is a WeMo MotionSensor
-
-
-
-
-
-
- udn
-
-
-
-
-
-
-
-
-
-
-
- This is a standard WeMo light bulb with E27 socket
-
-
-
-
-
-
-
- MRVL
- MZ100
-
-
-
-
-
- The device ID identifies one certain WeMo light.
-
-
-
-
-
-
- This is a WeMo Maker
-
-
-
-
-
-
- udn
-
-
-
-
-
-
- This is a WeMo enabled coffee maker
-
-
-
-
-
-
-
-
-
-
-
-
-
- udn
-
-
-
-
- The UDN identifies the WeMo Device
-
-
-
- Interval polling the WeMo Coffee Maker.
- 60
-
-
-
-
-
-
- This is a WeMo DimmerSwitch
-
-
-
-
-
-
-
-
-
-
-
-
- udn
-
-
-
-
-
-
- Crock-Pot Smart Slow Cooker with WeMo
-
-
-
-
-
-
-
-
-
- udn
-
-
-
-
-
-
- Holmes Smart Air Purifier with WeMo
-
-
-
-
-
-
-
-
-
-
- udn
-
-
-
-
-
-
- Holmes Smart Humidifier with WeMo
-
-
-
-
-
-
-
-
-
-
- udn
-
-
-
-
-
-
- Holmes Smart Heater with WeMo
-
-
-
-
-
-
-
-
-
- udn
-
-
-
-
Switch
@@ -241,7 +15,7 @@
SwitchIndicates whether motion is detected or not
- Switch
+ Motion
@@ -249,12 +23,14 @@
DateTimeDate/time when last motion was detected
+ TimeDateTimeDate/time when the state last changed
+ Time
@@ -268,6 +44,7 @@
NumberHow long has the device been switched on today
+ Time
@@ -275,6 +52,7 @@
NumberHow long has the device been switched on totally
+ Time
@@ -282,6 +60,7 @@
NumberTime used to measure average usage
+ Time
@@ -331,7 +110,6 @@
Appliance on standbyEnergy
-
@@ -382,12 +160,14 @@
NumberShows the current amount of time, in minutes, that the Coffee Maker has been in the current mode
+ TimeNumberShows the remaining brewing time of a WeMo Coffee Maker
+ Time
@@ -415,18 +195,21 @@
DateTimeDate/time the coffee maker last completed brewing coffee
+ TimeDateTimeDate/time the coffee maker last completed cleaning
+ TimeNumberThe fading duration time in minutes
+ Time
@@ -452,6 +235,7 @@
DateTimeTime when the Night Mode starts
+ Time
@@ -459,6 +243,7 @@
DateTimeTime when the Night Mode ends
+ Time
@@ -580,12 +365,22 @@
NumberShows the current humidity of a WeMo enabled Holmes Humidifier
+ Humidity
+
+ Measurement
+ Humidity
+ NumberShows the target humidity of a WeMo enabled Holmes Humidifier
+ Humidity
+
+ Setpoint
+ Humidity
+
@@ -600,7 +395,7 @@
String
- Shows the water levele of a WeMo enabled Holmes Humidifier
+ Shows the water level of a WeMo enabled Holmes Humidifier
@@ -629,18 +424,29 @@
NumberShows the current temperature measured by a WeMo enabled Heater
+ Temperature
+
+ Measurement
+ Temperature
+ NumberShows the target temperature for a WeMo enabled Heater
+ Temperature
+
+ Setpoint
+ Temperature
+ DateTimeTime when a WeMo enabled Heater should switch off
+ Time
diff --git a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/coffeemaker.xml b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/coffeemaker.xml
new file mode 100644
index 000000000..e9554e499
--- /dev/null
+++ b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/coffeemaker.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+ This is a WeMo enabled coffee maker
+
+
+
+
+
+
+
+
+
+
+
+
+
+ udn
+
+
+
+
+ The UDN identifies the WeMo Device
+
+
+
+ Interval polling the WeMo Coffee Maker.
+ 60
+
+
+
+
+
diff --git a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/crockpot.xml b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/crockpot.xml
new file mode 100644
index 000000000..94c8665ca
--- /dev/null
+++ b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/crockpot.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+ Crock-Pot Smart Slow Cooker with WeMo
+
+
+
+
+
+
+
+
+
+ udn
+
+
+
+
+
diff --git a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/dimmer.xml b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/dimmer.xml
new file mode 100644
index 000000000..ef6e3001f
--- /dev/null
+++ b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/dimmer.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+ This is a WeMo DimmerSwitch
+
+
+
+
+
+
+
+
+
+
+
+
+ udn
+
+
+
+
+
diff --git a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/heater.xml b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/heater.xml
new file mode 100644
index 000000000..c2cc42b95
--- /dev/null
+++ b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/heater.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+ Holmes Smart Heater with WeMo
+
+
+
+
+
+
+
+
+
+ udn
+
+
+
+
+
diff --git a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/humidifier.xml b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/humidifier.xml
new file mode 100644
index 000000000..7ce930f08
--- /dev/null
+++ b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/humidifier.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+ Holmes Smart Humidifier with WeMo
+
+
+
+
+
+
+
+
+
+
+ udn
+
+
+
+
+
diff --git a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/insight.xml b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/insight.xml
new file mode 100644
index 000000000..6485462d7
--- /dev/null
+++ b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/insight.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+ This is a WeMo Insight Switch with energy measurement
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ udn
+
+
+
+
+
diff --git a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/lightswitch.xml b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/lightswitch.xml
new file mode 100644
index 000000000..8725682b2
--- /dev/null
+++ b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/lightswitch.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+ This is a WeMo LightSwitch
+
+
+
+
+
+ udn
+
+
+
+
+
diff --git a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/maker.xml b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/maker.xml
new file mode 100644
index 000000000..6dac3776c
--- /dev/null
+++ b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/maker.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+ This is a WeMo Maker
+
+
+
+
+
+
+ udn
+
+
+
+
+
diff --git a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/motion.xml b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/motion.xml
new file mode 100644
index 000000000..184dc9713
--- /dev/null
+++ b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/motion.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+ This is a WeMo MotionSensor
+
+
+
+
+
+
+ udn
+
+
+
+
+
diff --git a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/mz100.xml b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/mz100.xml
new file mode 100644
index 000000000..32511737e
--- /dev/null
+++ b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/mz100.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+ This is a standard WeMo light bulb with E27 socket
+
+
+
+
+
+
+
+ MRVL
+ MZ100
+
+
+
+
+
+ The device ID identifies one certain WeMo light.
+
+
+
+
+
diff --git a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/purifier.xml b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/purifier.xml
new file mode 100644
index 000000000..09877eac6
--- /dev/null
+++ b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/purifier.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+ Holmes Smart Air Purifier with WeMo
+
+
+
+
+
+
+
+
+
+
+ udn
+
+
+
+
+
diff --git a/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/socket.xml b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/socket.xml
new file mode 100644
index 000000000..d95e8372f
--- /dev/null
+++ b/bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/socket.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+ This is a standard WeMo Switch
+
+
+
+
+
+ udn
+
+
+
+
+