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

fixup! fixup! [intellicenter2] feat: adds IntelliCenter2 binding for Pentair

Browse Source
This commit is contained in:
Valdis Rigdon 2024-12-06 16:37:32 -05:00
parent 419b476cbe
commit c66de7c65f
5 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bundles/org.openhab.binding.intellicenter2/src/main/java/org/openhab/binding/intellicenter2/internal/handler/IntelliCenter2BridgeHandler.java
View File

@ -17,12 +17,17 @@ import java.net.UnknownHostException;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import javax.measure.Unit;
import javax.measure.quantity.Temperature;
import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jdt.annotation.Nullable;
import org.openhab.binding.intellicenter2.internal.IntelliCenter2Configuration; import org.openhab.binding.intellicenter2.internal.IntelliCenter2Configuration;
import org.openhab.binding.intellicenter2.internal.discovery.IntelliCenter2DiscoveryService; import org.openhab.binding.intellicenter2.internal.discovery.IntelliCenter2DiscoveryService;
import org.openhab.binding.intellicenter2.internal.model.SystemInfo; import org.openhab.binding.intellicenter2.internal.model.SystemInfo;
import org.openhab.binding.intellicenter2.internal.protocol.ICProtocol; import org.openhab.binding.intellicenter2.internal.protocol.ICProtocol;
import org.openhab.core.library.unit.ImperialUnits;
import org.openhab.core.library.unit.SIUnits;
import org.openhab.core.thing.Bridge; import org.openhab.core.thing.Bridge;
import org.openhab.core.thing.ChannelUID; import org.openhab.core.thing.ChannelUID;
import org.openhab.core.thing.Thing; import org.openhab.core.thing.Thing;
@ -113,6 +118,13 @@ public class IntelliCenter2BridgeHandler extends BaseBridgeHandler {
return Futures.getUnchecked(protocolFuture); return Futures.getUnchecked(protocolFuture);
} }
public Unit<Temperature> getTemperatureUnits() {
if (systemInfo != null) {
return systemInfo.isMetricSystem() ? SIUnits.CELSIUS : ImperialUnits.FAHRENHEIT;
}
throw new IllegalStateException("systemInfo was not set yet.");
}
@Override @Override
public void dispose() { public void dispose() {
scheduler.execute(() -> { scheduler.execute(() -> {

20
bundles/org.openhab.binding.intellicenter2/src/main/java/org/openhab/binding/intellicenter2/internal/handler/IntelliCenter2PoolHandler.java
View File

@ -27,8 +27,8 @@ import org.openhab.binding.intellicenter2.internal.protocol.ICProtocol;
import org.openhab.binding.intellicenter2.internal.protocol.ICRequest; import org.openhab.binding.intellicenter2.internal.protocol.ICRequest;
import org.openhab.binding.intellicenter2.internal.protocol.ICResponse; import org.openhab.binding.intellicenter2.internal.protocol.ICResponse;
import org.openhab.binding.intellicenter2.internal.protocol.ResponseObject; import org.openhab.binding.intellicenter2.internal.protocol.ResponseObject;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.OnOffType; import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.QuantityType;
import org.openhab.core.thing.ChannelUID; import org.openhab.core.thing.ChannelUID;
import org.openhab.core.thing.Thing; import org.openhab.core.thing.Thing;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -52,9 +52,15 @@ public class IntelliCenter2PoolHandler extends IntelliCenter2ThingHandler<Body>
@Override @Override
protected void updateState(Body pool) { protected void updateState(Body pool) {
final IntelliCenter2BridgeHandler bh = getBridgeHandler();
if (bh == null) {
return;
}
updateState(CHANNEL_HEATER_STATUS, OnOffType.from(pool.isHeating())); updateState(CHANNEL_HEATER_STATUS, OnOffType.from(pool.isHeating()));
updateState(CHANNEL_CURRENT_TEMPERATURE, new DecimalType(pool.getCurrentTemperature())); updateState(CHANNEL_CURRENT_TEMPERATURE,
updateState(CHANNEL_TARGET_TEMPERATURE, new DecimalType(pool.getTargetTemperature())); new QuantityType<>(pool.getCurrentTemperature(), bh.getTemperatureUnits()));
updateState(CHANNEL_TARGET_TEMPERATURE,
new QuantityType<>(pool.getTargetTemperature(), bh.getTemperatureUnits()));
} }
@Override @Override
@ -72,12 +78,16 @@ public class IntelliCenter2PoolHandler extends IntelliCenter2ThingHandler<Body>
@Override @Override
protected void updateState(ChannelUID channelUID, Body pool) { protected void updateState(ChannelUID channelUID, Body pool) {
final IntelliCenter2BridgeHandler bh = getBridgeHandler();
if (bh == null) {
return;
}
switch (channelUID.getId()) { switch (channelUID.getId()) {
case CHANNEL_CURRENT_TEMPERATURE: case CHANNEL_CURRENT_TEMPERATURE:
updateState(channelUID, new DecimalType(pool.getCurrentTemperature())); updateState(channelUID, new QuantityType<>(pool.getCurrentTemperature(), bh.getTemperatureUnits()));
break; break;
case CHANNEL_TARGET_TEMPERATURE: case CHANNEL_TARGET_TEMPERATURE:
updateState(channelUID, new DecimalType(pool.getTargetTemperature())); updateState(channelUID, new QuantityType<>(pool.getTargetTemperature(), bh.getTemperatureUnits()));
break; break;
case CHANNEL_HEATER_STATUS: case CHANNEL_HEATER_STATUS:
updateState(channelUID, OnOffType.from(pool.isHeating())); updateState(channelUID, OnOffType.from(pool.isHeating()));

4
bundles/org.openhab.binding.intellicenter2/src/main/java/org/openhab/binding/intellicenter2/internal/model/SystemInfo.java
View File

@ -51,6 +51,10 @@ public class SystemInfo extends ResponseModel {
return getValueAsString(MODE); return getValueAsString(MODE);
} }
public boolean isMetricSystem() {
return "METRIC".equals(getMode());
}
public String getVersion() { public String getVersion() {
return getValueAsString(VER); return getValueAsString(VER);
} }

21
bundles/org.openhab.binding.intellicenter2/src/main/resources/OH-INF/i18n/intellicenter2_xx.properties
View File

@ -1,21 +0,0 @@
# FIXME: please substitute the xx with a proper locale, ie. de
# FIXME: please do not add the file to the repo if you add or change no content
# binding
binding.intellicenter2.name = <Your localized Binding name>
binding.intellicenter2.description = <Your localized Binding description>
# thing types
thing-type.intellicenter2.sample.label = <Your localized Thing label>
thing-type.intellicenter2.sample.description = <Your localized Thing description>
# thing type config description
thing-type.config.intellicenter2.sample.hostname.label = <Your localized config parameter label>
thing-type.config.intellicenter2.sample.hostname.description = <Your localized config parameter description>
thing-type.config.intellicenter2.sample.password.label = <Your localized config parameter label>
thing-type.config.intellicenter2.sample.password.description = <Your localized config parameter description>
thing-type.config.intellicenter2.sample.refreshInterval.label = <Your localized config parameter label>
thing-type.config.intellicenter2.sample.refreshInterval.description = <Your localized config parameter description>
# channel types
channel-type.intellicenter2.sample-channel.label = <Your localized Channel label>
channel-type.intellicenter2.sample-channel.description = <Your localized Channel description>

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

@ -127,21 +127,21 @@
<item-type>Number:Temperature</item-type> <item-type>Number:Temperature</item-type>
<label>Temperature</label> <label>Temperature</label>
<description>The temperature value.</description> <description>The temperature value.</description>
<state readOnly="true"/> <state readOnly="true" pattern="%.1f %unit%"/>
</channel-type> </channel-type>
<channel-type id="temperature-current"> <channel-type id="temperature-current">
<item-type>Number:Temperature</item-type> <item-type>Number:Temperature</item-type>
<label>Temperature</label> <label>Temperature</label>
<description>The current temperature value.</description> <description>The current temperature value.</description>
<state readOnly="true"/> <state readOnly="true" pattern="%.1f %unit%"/>
</channel-type> </channel-type>
<channel-type id="temperature-target"> <channel-type id="temperature-target">
<item-type>Number:Temperature</item-type> <item-type>Number:Temperature</item-type>
<label>Temperature</label> <label>Temperature</label>
<description>The target temperature value.</description> <description>The target temperature value.</description>
<state readOnly="true"/> <state readOnly="true" pattern="%.1f %unit%"/>
</channel-type> </channel-type>
<channel-type id="heater-status"> <channel-type id="heater-status">