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

[wemo] Add dimensions for power/energy channel types for Insight Switch. (#11208)

Browse Source 
* 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
2021-09-08 20:36:03 +02:00
committed by GitHub
parent 5ae581f4e1
commit 8f836a08ea
4 changed files with 83 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/handler/WemoHandler.java
View File

@@ -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);

23
bundles/org.openhab.binding.wemo/src/main/resources/OH-INF/thing/thing-types.xml
View File

@@ -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>