demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-25 14:55:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

[tapocontrol] support QuantityType commands (#17944)

Browse Source 
Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
This commit is contained in:
Andrew Fiddian-Green 2024-12-21 11:22:56 +00:00 committed by GitHub
parent 57577f42a9
commit 31e0bb601c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/devices/wifi/bulb/TapoBulbHandler.java
View File

@ -25,6 +25,7 @@ import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.HSBType; import org.openhab.core.library.types.HSBType;
import org.openhab.core.library.types.OnOffType; import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.PercentType; import org.openhab.core.library.types.PercentType;
import org.openhab.core.library.types.QuantityType;
import org.openhab.core.library.unit.Units; import org.openhab.core.library.unit.Units;
import org.openhab.core.thing.ChannelGroupUID; import org.openhab.core.thing.ChannelGroupUID;
import org.openhab.core.thing.ChannelUID; import org.openhab.core.thing.ChannelUID;
@ -147,8 +148,14 @@ public class TapoBulbHandler extends TapoBaseDeviceHandler {
} }
private void handleColorTempCommand(Command command) { private void handleColorTempCommand(Command command) {
if (command instanceof DecimalType decimalCommand) { QuantityType<?> kelvinQuantity = null;
setColorTemp(decimalCommand.intValue()); if (command instanceof QuantityType<?> genericQuantity) {
kelvinQuantity = genericQuantity.toInvertibleUnit(Units.KELVIN);
} else if (command instanceof DecimalType decimal) {
kelvinQuantity = QuantityType.valueOf(decimal.intValue(), Units.KELVIN);
}
if (kelvinQuantity != null) {
setColorTemp(kelvinQuantity.intValue());
} }
} }

27
bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/devices/wifi/lightstrip/TapoLightStripHandler.java
View File

@ -23,6 +23,7 @@ import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.HSBType; import org.openhab.core.library.types.HSBType;
import org.openhab.core.library.types.OnOffType; import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.PercentType; import org.openhab.core.library.types.PercentType;
import org.openhab.core.library.types.QuantityType;
import org.openhab.core.library.unit.Units; import org.openhab.core.library.unit.Units;
import org.openhab.core.thing.ChannelUID; import org.openhab.core.thing.ChannelUID;
import org.openhab.core.thing.Thing; import org.openhab.core.thing.Thing;
@ -43,7 +44,7 @@ public class TapoLightStripHandler extends TapoBaseDeviceHandler {
/** /**
* Constructor * Constructor
* *
* @param thing Thing object representing device * @param thing Thing object representing device
*/ */
public TapoLightStripHandler(Thing thing) { public TapoLightStripHandler(Thing thing) {
@ -53,7 +54,7 @@ public class TapoLightStripHandler extends TapoBaseDeviceHandler {
/** /**
* Function called by {@link org.openhab.binding.tapocontrol.internal.api.TapoDeviceConnector} if new data were * Function called by {@link org.openhab.binding.tapocontrol.internal.api.TapoDeviceConnector} if new data were
* received * received
* *
* @param queryCommand command where new data belong to * @param queryCommand command where new data belong to
*/ */
@Override @Override
@ -71,7 +72,7 @@ public class TapoLightStripHandler extends TapoBaseDeviceHandler {
/** /**
* handle command sent to device * handle command sent to device
* *
* @param channelUID channelUID command is sent to * @param channelUID channelUID command is sent to
* @param command command to be sent * @param command command to be sent
*/ */
@ -128,8 +129,14 @@ public class TapoLightStripHandler extends TapoBaseDeviceHandler {
} }
private void handleColorTempCommand(Command command) { private void handleColorTempCommand(Command command) {
if (command instanceof DecimalType decimalCommand) { QuantityType<?> kelvinQuantity = null;
setColorTemp(decimalCommand.intValue()); if (command instanceof QuantityType<?> genericQuantity) {
kelvinQuantity = genericQuantity.toInvertibleUnit(Units.KELVIN);
} else if (command instanceof DecimalType decimal) {
kelvinQuantity = QuantityType.valueOf(decimal.intValue(), Units.KELVIN);
}
if (kelvinQuantity != null) {
setColorTemp(kelvinQuantity.intValue());
} }
} }
@ -164,7 +171,7 @@ public class TapoLightStripHandler extends TapoBaseDeviceHandler {
/** /**
* Switch device On or Off * Switch device On or Off
* *
* @param on if true device will switch on. Otherwise switch off * @param on if true device will switch on. Otherwise switch off
*/ */
protected void switchOnOff(boolean on) { protected void switchOnOff(boolean on) {
@ -174,7 +181,7 @@ public class TapoLightStripHandler extends TapoBaseDeviceHandler {
/** /**
* Set Britghtness of device * Set Britghtness of device
* *
* @param newBrightness percentage 0-100 of new brightness * @param newBrightness percentage 0-100 of new brightness
*/ */
protected void setBrightness(Integer newBrightness) { protected void setBrightness(Integer newBrightness) {
@ -190,7 +197,7 @@ public class TapoLightStripHandler extends TapoBaseDeviceHandler {
/** /**
* Set Color of Device * Set Color of Device
* *
* @param command HSBType * @param command HSBType
*/ */
protected void setColor(HSBType command) { protected void setColor(HSBType command) {
@ -203,7 +210,7 @@ public class TapoLightStripHandler extends TapoBaseDeviceHandler {
/** /**
* Set ColorTemp * Set ColorTemp
* *
* @param colorTemp (Integer) in Kelvin * @param colorTemp (Integer) in Kelvin
*/ */
protected void setColorTemp(Integer colorTemp) { protected void setColorTemp(Integer colorTemp) {
@ -214,7 +221,7 @@ public class TapoLightStripHandler extends TapoBaseDeviceHandler {
/** /**
* Set light effect * Set light effect
* *
* @param lightEffect TapoLightEffect * @param lightEffect TapoLightEffect
*/ */
protected void setLightEffect(TapoLightEffect lightEffect) { protected void setLightEffect(TapoLightEffect lightEffect) {