[wemo] Add dimensions for power/energy channel types for Insight Switch. (#11208)
* Add dimensions for power/energy channel types for Insight Switch. Fixes #11207 Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
This commit is contained in:
jlaur
GitHub
parent
5ae581f4e1
commit
8f836a08ea
|
|
@ -41,7 +41,7 @@ MZ100 94103EA2B278xxxx [ deviceID="94103EA2B278xxxx" ]
|
|||
Devices support some of the following channels:
|
||||
|
||||
| Channel Type | Item Type | Description | Available on Thing |
|
||||
|---------------------|-----------|---------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||
|---------------------|---------------|----------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------|
|
||||
| motionDetection | Switch | On if motion is detected, off otherwise. (Motion Sensor only) | Motion |
|
||||
| lastMotionDetected | DateTime | Date and Time when the last motion was detected. (Motion Sensor only) | Motion |
|
||||
| state | Switch | This channel controls the actual binary State of a Device or represents Motion Detection. | All but Dimmer, Crockpot, Airpurifier and Humidifier |
|
||||
|
|
@ -50,11 +50,11 @@ Devices support some of the following channels:
|
|||
| onToday | Number | Time in seconds an Insight device has been switched on today. | Insight |
|
||||
| onTotal | Number | Time in seconds an Insight device has been switched on totally. | Insight |
|
||||
| timespan | Number | Time in seconds over which onTotal applies. Typically 2 weeks except first used. | Insight |
|
||||
| averagePower | Number | Average power consumption in Watts. | Insight |
|
||||
| currentPower | Number | Current power consumption of an Insight device. 0 if switched off. | Insight |
|
||||
| energyToday | Number | Energy in Wh used today. | Insight |
|
||||
| energyTotal | Number | Energy in Wh used in total. | Insight |
|
||||
| standbyLimit | Number | Minimum energy draw in W to register device as switched on (default 8W, configurable via WeMo App). | Insight |
|
||||
| averagePower | Number:Power | Average power consumption in Watts. | Insight |
|
||||
| currentPower | Number:Power | Current power consumption of an Insight device. 0 if switched off. | Insight |
|
||||
| energyToday | Number:Energy | Energy in Wh used today. | Insight |
|
||||
| energyTotal | Number:Energy | Energy in Wh used in total. | Insight |
|
||||
| standbyLimit | Number:Power | Minimum energy draw in W to register device as switched on (default 8W, configurable via WeMo App). | Insight |
|
||||
| onStandBy | Switch | Read-only indication of whether or not the device plugged in to the insight switch is drawing more than the standby limit. | Insight |
|
||||
| relay | Switch | Switches the integrated relay contact close/open | Maker |
|
||||
| sensor | Switch | Shows the state of the integrated sensor | Maker |
|
||||
|
|
@ -124,7 +124,7 @@ DateTime MotionDetected { channel="wemo:Motion:Sensor1:lastMotionDetected"
|
|||
|
||||
// Insight
|
||||
Switch InsightSwitch { channel="wemo:insight:Insight-1_0-xxxxxxxxxxxxxx:state" }
|
||||
Number InsightPower { channel="wemo:insight:Insight-1_0-xxxxxxxxxxxxxx:currentPower" }
|
||||
Number:Power InsightPower { channel="wemo:insight:Insight-1_0-xxxxxxxxxxxxxx:currentPower" }
|
||||
Number InsightLastOn { channel="wemo:insight:Insight-1_0-xxxxxxxxxxxxxx:lastOnFor" }
|
||||
Number InsightToday { channel="wemo:insight:Insight-1_0-xxxxxxxxxxxxxx:onToday" }
|
||||
Number InsightTotal { channel="wemo:insight:Insight-1_0-xxxxxxxxxxxxxx:onTotal" }
|
||||
|
|
|
|||
|
|
@ -39,6 +39,8 @@ import org.openhab.core.io.transport.upnp.UpnpIOService;
|
|||
import org.openhab.core.library.types.DateTimeType;
|
||||
import org.openhab.core.library.types.DecimalType;
|
||||
import org.openhab.core.library.types.OnOffType;
|
||||
import org.openhab.core.library.types.QuantityType;
|
||||
import org.openhab.core.library.unit.Units;
|
||||
import org.openhab.core.thing.ChannelUID;
|
||||
import org.openhab.core.thing.Thing;
|
||||
import org.openhab.core.thing.ThingStatus;
|
||||
|
|
@ -245,13 +247,16 @@ public class WemoHandler extends AbstractWemoHandler implements UpnpIOParticipan
|
|||
logger.trace("New InsightParam timespan '{}' for device '{}' received", timespan, getThing().getUID());
|
||||
updateState(CHANNEL_TIMESPAN, timespan);
|
||||
|
||||
State averagePower = DecimalType.valueOf(splitInsightParams[6]); // natively given in W
|
||||
State averagePower = new QuantityType<>(DecimalType.valueOf(splitInsightParams[6]), Units.WATT); // natively
|
||||
// given
|
||||
// in W
|
||||
logger.trace("New InsightParam averagePower '{}' for device '{}' received", averagePower,
|
||||
getThing().getUID());
|
||||
updateState(CHANNEL_AVERAGEPOWER, averagePower);
|
||||
|
||||
BigDecimal currentMW = new BigDecimal(splitInsightParams[7]);
|
||||
State currentPower = new DecimalType(currentMW.divide(new BigDecimal(1000), RoundingMode.HALF_UP)); // recalculate
|
||||
State currentPower = new QuantityType<>(currentMW.divide(new BigDecimal(1000), 0, RoundingMode.HALF_UP),
|
||||
Units.WATT); // recalculate
|
||||
// mW to W
|
||||
logger.trace("New InsightParam currentPower '{}' for device '{}' received", currentPower,
|
||||
getThing().getUID());
|
||||
|
|
@ -259,29 +264,30 @@ public class WemoHandler extends AbstractWemoHandler implements UpnpIOParticipan
|
|||
|
||||
BigDecimal energyTodayMWMin = new BigDecimal(splitInsightParams[8]);
|
||||
// recalculate mW-mins to Wh
|
||||
State energyToday = new DecimalType(
|
||||
energyTodayMWMin.divide(new BigDecimal(60000), RoundingMode.HALF_UP));
|
||||
State energyToday = new QuantityType<>(
|
||||
energyTodayMWMin.divide(new BigDecimal(60000), 0, RoundingMode.HALF_UP), Units.WATT_HOUR);
|
||||
logger.trace("New InsightParam energyToday '{}' for device '{}' received", energyToday,
|
||||
getThing().getUID());
|
||||
updateState(CHANNEL_ENERGYTODAY, energyToday);
|
||||
|
||||
BigDecimal energyTotalMWMin = new BigDecimal(splitInsightParams[9]);
|
||||
// recalculate mW-mins to Wh
|
||||
State energyTotal = new DecimalType(
|
||||
energyTotalMWMin.divide(new BigDecimal(60000), RoundingMode.HALF_UP));
|
||||
State energyTotal = new QuantityType<>(
|
||||
energyTotalMWMin.divide(new BigDecimal(60000), 0, RoundingMode.HALF_UP), Units.WATT_HOUR);
|
||||
logger.trace("New InsightParam energyTotal '{}' for device '{}' received", energyTotal,
|
||||
getThing().getUID());
|
||||
updateState(CHANNEL_ENERGYTOTAL, energyTotal);
|
||||
|
||||
BigDecimal standByLimitMW = new BigDecimal(splitInsightParams[10]);
|
||||
State standByLimit = new DecimalType(standByLimitMW.divide(new BigDecimal(1000), RoundingMode.HALF_UP)); // recalculate
|
||||
State standByLimit = new QuantityType<>(
|
||||
standByLimitMW.divide(new BigDecimal(1000), 0, RoundingMode.HALF_UP), Units.WATT); // recalculate
|
||||
// mW to W
|
||||
logger.trace("New InsightParam standByLimit '{}' for device '{}' received", standByLimit,
|
||||
getThing().getUID());
|
||||
updateState(CHANNEL_STANDBYLIMIT, standByLimit);
|
||||
|
||||
if (currentMW.divide(new BigDecimal(1000), RoundingMode.HALF_UP).intValue() > standByLimitMW
|
||||
.divide(new BigDecimal(1000), RoundingMode.HALF_UP).intValue()) {
|
||||
if (currentMW.divide(new BigDecimal(1000), 0, RoundingMode.HALF_UP).intValue() > standByLimitMW
|
||||
.divide(new BigDecimal(1000), 0, RoundingMode.HALF_UP).intValue()) {
|
||||
updateState(CHANNEL_ONSTANDBY, OnOffType.OFF);
|
||||
} else {
|
||||
updateState(CHANNEL_ONSTANDBY, OnOffType.ON);
|
||||
|
|
|
|||
|
|
@ -236,43 +236,43 @@
|
|||
</channel-type>
|
||||
|
||||
<channel-type id="averagePower" advanced="true">
|
||||
<item-type>Number</item-type>
|
||||
<item-type>Number:Power</item-type>
|
||||
<label>Average Power</label>
|
||||
<description>The average power consumption</description>
|
||||
<category>Energy</category>
|
||||
<state pattern="%.1f W"/>
|
||||
<state pattern="%.0f %unit%"/>
|
||||
</channel-type>
|
||||
|
||||
<channel-type id="currentPower">
|
||||
<item-type>Number</item-type>
|
||||
<item-type>Number:Power</item-type>
|
||||
<label>Power</label>
|
||||
<description>The current power consumption</description>
|
||||
<category>Energy</category>
|
||||
<state pattern="%.1f W"/>
|
||||
<state pattern="%.0f %unit%"/>
|
||||
</channel-type>
|
||||
|
||||
<channel-type id="energyToday" advanced="true">
|
||||
<item-type>Number</item-type>
|
||||
<item-type>Number:Energy</item-type>
|
||||
<label>Energy Today</label>
|
||||
<description>Todays power consumption</description>
|
||||
<category>Energy</category>
|
||||
<state pattern="%.1f Wh"/>
|
||||
<state pattern="%.0f %unit%"/>
|
||||
</channel-type>
|
||||
|
||||
<channel-type id="energyTotal" advanced="true">
|
||||
<item-type>Number</item-type>
|
||||
<item-type>Number:Energy</item-type>
|
||||
<label>Energy Total</label>
|
||||
<description>Total power consumption</description>
|
||||
<category>Energy</category>
|
||||
<state pattern="%.1f Wh"/>
|
||||
<state pattern="%.0f %unit%"/>
|
||||
</channel-type>
|
||||
|
||||
<channel-type id="standByLimit" advanced="true">
|
||||
<item-type>Number</item-type>
|
||||
<item-type>Number:Power</item-type>
|
||||
<label>StandBy Limit</label>
|
||||
<description>Total power consumption</description>
|
||||
<description>Minimum energy draw to register device as switched on</description>
|
||||
<category>Energy</category>
|
||||
<state pattern="%.1f W"/>
|
||||
<state pattern="%.0f %unit%"/>
|
||||
</channel-type>
|
||||
|
||||
<channel-type id="onStandBy" advanced="true">
|
||||
|
|
@ -392,7 +392,6 @@
|
|||
<description>Allows to switch the timer ON/OFF</description>
|
||||
</channel-type>
|
||||
|
||||
|
||||
<channel-type id="nightMode" advanced="true">
|
||||
<item-type>Switch</item-type>
|
||||
<label>NightMode OFF/ON</label>
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@ import org.openhab.binding.wemo.internal.handler.WemoHandler;
|
|||
import org.openhab.binding.wemo.internal.http.WemoHttpCall;
|
||||
import org.openhab.core.library.types.DecimalType;
|
||||
import org.openhab.core.library.types.OnOffType;
|
||||
import org.openhab.core.library.types.QuantityType;
|
||||
import org.openhab.core.library.unit.Units;
|
||||
import org.openhab.core.thing.Thing;
|
||||
import org.openhab.core.thing.ThingStatus;
|
||||
import org.openhab.core.thing.ThingStatusDetail;
|
||||
|
|
@ -122,7 +124,7 @@ public class WemoHandlerTest {
|
|||
@Test
|
||||
public void assertThatChannelAVERAGEPOWERIsUpdatedOnReceivedValue() {
|
||||
insightParams.avgPower = POWER_PARAM;
|
||||
State expectedStateType = new DecimalType(POWER_PARAM);
|
||||
State expectedStateType = new QuantityType<>(POWER_PARAM, Units.WATT);
|
||||
String expectedChannel = CHANNEL_AVERAGEPOWER;
|
||||
|
||||
testOnValueReceived(expectedChannel, expectedStateType, insightParams.toString());
|
||||
|
|
|
|||
Loading…
Reference in New Issue