import org.eclipse.jdt.annotation.Nullable;
/**
- * Channel configuration from Eclipse SmartHome.
+ * Astro Channel configuration.
*
* @author Gerhard Riegler - Initial contribution
*/
import org.eclipse.jdt.annotation.Nullable;
/**
- * Thing configuration from Eclipse SmartHome.
+ * Astro Thing configuration.
*
* @author Gerhard Riegler - Initial contribution
*/
}
/**
- * This class contains the set of units that are not yet defined in SmarthomeUnits.
+ * This class contains the set of units that are not yet defined in Units.
* Once these units are added to the core then this class will be removed.
*
* @author cpetty
// Query the device state
DeviceStateInformation state = controller.getState();
DeviceStatus statusWithMessage = DeviceStatus.decodeStatusCode(state.getState());
- int eshStatus = getEshStatusFromCommand(statusWithMessage.getAssociatedCommand());
+ int status = getStatusFromCommand(statusWithMessage.getAssociatedCommand());
int mowed = state.getMowed();
int error = state.getError();
int statecode = state.getState();
if (state.getState() != stateTmp.getState()) {
state = stateTmp;
statusWithMessage = DeviceStatus.decodeStatusCode(state.getState());
- eshStatus = getEshStatusFromCommand(statusWithMessage.getAssociatedCommand());
+ status = getStatusFromCommand(statusWithMessage.getAssociatedCommand());
mowed = state.getMowed();
error = state.getError();
statecode = state.getState();
updateState(READY, new DecimalType(ready ? 1 : 0));
updateState(ERRORCODE, new DecimalType(error));
updateState(MOWED, new PercentType(mowed));
- updateState(STATE, new DecimalType(eshStatus));
+ updateState(STATE, new DecimalType(status));
updateState(TEXTUAL_STATE, new StringType(statusWithMessage.getMessage()));
} catch (IndegoAuthenticationException e) {
return true;
}
- private int getEshStatusFromCommand(DeviceCommand command) {
- int eshStatus;
+ private int getStatusFromCommand(DeviceCommand command) {
+ int status;
switch (command) {
case MOW:
- eshStatus = 1;
+ status = 1;
break;
case RETURN:
- eshStatus = 2;
+ status = 2;
break;
case PAUSE:
- eshStatus = 3;
+ status = 3;
break;
default:
- eshStatus = 0;
+ status = 0;
}
- return eshStatus;
+ return status;
}
@Override
}
/**
- * Method to add a Thing to the Smarthome Inbox.
+ * Method to add a Thing to the Inbox.
*
* @param bridge
* @param caddxThingType
if (deviceStateUpdate.isSensorUpdateType()) {
updateState(getSensorChannelID(deviceStateUpdate.getTypeAsSensorEnum()),
new DecimalType(deviceStateUpdate.getValueAsFloat()));
- logger.debug("Update ESH-State");
+ logger.debug("Update state");
return;
}
if (deviceStateUpdate.isBinarayInputType()) {
}
updateState(DsChannelTypeProvider.SHADE, new PercentType(percent));
}
- logger.debug("Update ESH-State");
+ logger.debug("Update state");
}
}
}
if (!channelList.isEmpty()) {
Iterator<Channel> channelInter = channelList.iterator();
while (channelInter.hasNext()) {
- Channel eshChannel = channelInter.next();
- if (DsChannelTypeProvider.isOutputChannel(eshChannel.getUID().getId())) {
- if (!eshChannel.getUID().getId().equals(currentChannel)
- && !(device.isShade() && eshChannel.getUID().getId().equals(DsChannelTypeProvider.SHADE))) {
+ Channel channel = channelInter.next();
+ if (DsChannelTypeProvider.isOutputChannel(channel.getUID().getId())) {
+ if (!channel.getUID().getId().equals(currentChannel)
+ && !(device.isShade() && channel.getUID().getId().equals(DsChannelTypeProvider.SHADE))) {
channelInter.remove();
channelListChanged = true;
} else {
- if (!eshChannel.getUID().getId().equals(DsChannelTypeProvider.SHADE)) {
+ if (!channel.getUID().getId().equals(DsChannelTypeProvider.SHADE)) {
channelIsAlreadyLoaded = true;
}
}
}
/**
- * Returns true, if the given property exists at the ESH event properties, otherwise false.
+ * Returns true, if the given property exists at the event properties, otherwise false.
*
* @param property to check
* @return contains property (true = yes | false = no)
while (!currentDeviceList.isEmpty()) {
Device currentDevice = currentDeviceList.remove(0);
DSID currentDeviceDSID = currentDevice.getDSID();
- Device eshDevice = tempDeviceMap.remove(currentDeviceDSID);
+ Device device = tempDeviceMap.remove(currentDeviceDSID);
- if (eshDevice != null) {
- checkDeviceConfig(currentDevice, eshDevice);
+ if (device != null) {
+ checkDeviceConfig(currentDevice, device);
- if (eshDevice.isPresent()) {
+ if (device.isPresent()) {
// check device state updates
- while (!eshDevice.isDeviceUpToDate()) {
- DeviceStateUpdate deviceStateUpdate = eshDevice.getNextDeviceUpdateState();
+ while (!device.isDeviceUpToDate()) {
+ DeviceStateUpdate deviceStateUpdate = device.getNextDeviceUpdateState();
if (deviceStateUpdate != null) {
switch (deviceStateUpdate.getType()) {
case DeviceStateUpdate.OUTPUT:
case DeviceStateUpdate.SLAT_ANGLE_INCREASE:
case DeviceStateUpdate.SLAT_ANGLE_DECREASE:
- filterCommand(deviceStateUpdate, eshDevice);
+ filterCommand(deviceStateUpdate, device);
break;
case DeviceStateUpdate.UPDATE_SCENE_CONFIG:
case DeviceStateUpdate.UPDATE_SCENE_OUTPUT:
- updateSceneData(eshDevice, deviceStateUpdate);
+ updateSceneData(device, deviceStateUpdate);
break;
case DeviceStateUpdate.UPDATE_OUTPUT_VALUE:
if (deviceStateUpdate.getValueAsInteger() > -1) {
- readOutputValue(eshDevice);
+ readOutputValue(device);
} else {
- removeSensorJob(eshDevice, deviceStateUpdate);
+ removeSensorJob(device, deviceStateUpdate);
}
break;
default:
- sendComandsToDSS(eshDevice, deviceStateUpdate);
+ sendComandsToDSS(device, deviceStateUpdate);
}
}
}
}
}
- private void removeSensorJob(Device eshDevice, DeviceStateUpdate deviceStateUpdate) {
+ private void removeSensorJob(Device device, DeviceStateUpdate deviceStateUpdate) {
switch (deviceStateUpdate.getType()) {
case DeviceStateUpdate.UPDATE_SCENE_CONFIG:
if (sceneJobExecutor != null) {
- sceneJobExecutor.removeSensorJob(eshDevice,
- SceneConfigReadingJob.getID(eshDevice, deviceStateUpdate.getSceneId()));
+ sceneJobExecutor.removeSensorJob(device,
+ SceneConfigReadingJob.getID(device, deviceStateUpdate.getSceneId()));
}
break;
case DeviceStateUpdate.UPDATE_SCENE_OUTPUT:
if (sceneJobExecutor != null) {
- sceneJobExecutor.removeSensorJob(eshDevice,
- SceneOutputValueReadingJob.getID(eshDevice, deviceStateUpdate.getSceneId()));
+ sceneJobExecutor.removeSensorJob(device,
+ SceneOutputValueReadingJob.getID(device, deviceStateUpdate.getSceneId()));
}
break;
case DeviceStateUpdate.UPDATE_OUTPUT_VALUE:
if (sensorJobExecutor != null) {
- sensorJobExecutor.removeSensorJob(eshDevice, DeviceOutputValueSensorJob.getID(eshDevice));
+ sensorJobExecutor.removeSensorJob(device, DeviceOutputValueSensorJob.getID(device));
}
break;
}
if (deviceStateUpdate.isSensorUpdateType()) {
if (sensorJobExecutor != null) {
logger.debug("remove SensorJob with ID: {}",
- DeviceConsumptionSensorJob.getID(eshDevice, deviceStateUpdate.getTypeAsSensorEnum()));
- sensorJobExecutor.removeSensorJob(eshDevice,
- DeviceConsumptionSensorJob.getID(eshDevice, deviceStateUpdate.getTypeAsSensorEnum()));
+ DeviceConsumptionSensorJob.getID(device, deviceStateUpdate.getTypeAsSensorEnum()));
+ sensorJobExecutor.removeSensorJob(device,
+ DeviceConsumptionSensorJob.getID(device, deviceStateUpdate.getTypeAsSensorEnum()));
}
}
}
* Updates the {@link Device} status of the given {@link Device} with handling outstanding commands, which are saved
* as {@link DeviceStateUpdate}'s.
*
- * @param eshDevice to update
+ * @param device to update
*/
- public synchronized void updateDevice(Device eshDevice) {
+ public synchronized void updateDevice(Device device) {
logger.debug("Check device updates");
// check device state updates
- while (!eshDevice.isDeviceUpToDate()) {
- DeviceStateUpdate deviceStateUpdate = eshDevice.getNextDeviceUpdateState();
+ while (!device.isDeviceUpToDate()) {
+ DeviceStateUpdate deviceStateUpdate = device.getNextDeviceUpdateState();
if (deviceStateUpdate != null) {
if (deviceStateUpdate.getType() != DeviceStateUpdate.OUTPUT) {
if (deviceStateUpdate.getType() == DeviceStateUpdate.UPDATE_SCENE_CONFIG
|| deviceStateUpdate.getType() == DeviceStateUpdate.UPDATE_SCENE_OUTPUT) {
- updateSceneData(eshDevice, deviceStateUpdate);
+ updateSceneData(device, deviceStateUpdate);
} else {
- sendComandsToDSS(eshDevice, deviceStateUpdate);
+ sendComandsToDSS(device, deviceStateUpdate);
}
} else {
- DeviceStateUpdate nextDeviceStateUpdate = eshDevice.getNextDeviceUpdateState();
+ DeviceStateUpdate nextDeviceStateUpdate = device.getNextDeviceUpdateState();
while (nextDeviceStateUpdate != null
&& nextDeviceStateUpdate.getType() == DeviceStateUpdate.OUTPUT) {
deviceStateUpdate = nextDeviceStateUpdate;
- nextDeviceStateUpdate = eshDevice.getNextDeviceUpdateState();
+ nextDeviceStateUpdate = device.getNextDeviceUpdateState();
}
- sendComandsToDSS(eshDevice, deviceStateUpdate);
+ sendComandsToDSS(device, deviceStateUpdate);
if (nextDeviceStateUpdate != null) {
if (deviceStateUpdate.getType() == DeviceStateUpdate.UPDATE_SCENE_CONFIG
|| deviceStateUpdate.getType() == DeviceStateUpdate.UPDATE_SCENE_OUTPUT) {
- updateSceneData(eshDevice, deviceStateUpdate);
+ updateSceneData(device, deviceStateUpdate);
} else {
- sendComandsToDSS(eshDevice, deviceStateUpdate);
+ sendComandsToDSS(device, deviceStateUpdate);
}
}
}
rawPacket[114] = (byte) (this.universeId % 256);
/* set sender name in packet */
- String senderName = new String("ESH DMX binding (sACN) <" + String.format("%05d", this.universeId) + ">");
+ String senderName = new String("openHAB DMX binding (sACN) <" + String.format("%05d", this.universeId) + ">");
byte[] senderNameBytes = senderName.getBytes(StandardCharsets.UTF_8);
System.arraycopy(senderNameBytes, 0, rawPacket, 44, senderName.length());
};
/**
- * Method to add an Envisalink Bridge to the Smarthome Inbox.
+ * Method to add an Envisalink Bridge to the Inbox.
*
* @param ipAddress
*/
public void addEnvisalinkBridge(String ipAddress) {
- logger.trace("addBridge(): Adding new Envisalink Bridge on {} to Smarthome inbox", ipAddress);
+ logger.trace("addBridge(): Adding new Envisalink Bridge on {} to inbox", ipAddress);
String bridgeID = ipAddress.replace('.', '_');
Map<String, Object> properties = new HashMap<>(0);
thingDiscovered(DiscoveryResultBuilder.create(thingUID).withProperties(properties)
.withLabel("EyezOn Envisalink Bridge - " + ipAddress).build());
- logger.trace("addBridge(): '{}' was added to Smarthome inbox.", thingUID);
+ logger.trace("addBridge(): '{}' was added to inbox.", thingUID);
} catch (Exception e) {
logger.error("addBridge(): Error", e);
}
}
/**
- * Method to add a Thing to the Smarthome Inbox.
+ * Method to add a Thing to the Inbox.
*
* @param bridge
* @param dscAlarmThingType
* @param event
*/
public void addThing(Bridge bridge, DSCAlarmThingType dscAlarmThingType, DSCAlarmEvent event) {
- logger.trace("addThing(): Adding new DSC Alarm {} to the smarthome inbox", dscAlarmThingType.getLabel());
+ logger.trace("addThing(): Adding new DSC Alarm {} to the inbox", dscAlarmThingType.getLabel());
ThingUID thingUID = null;
String thingID = "";
import org.osgi.service.component.annotations.Component;
/**
- * Discovery for Enocean USB dongles, integrated in Eclipse SmartHome's USB-serial discovery by implementing
- * a component of type {@link UsbSerialDiscoveryParticipant}.
+ * Discovery for Enocean USB dongles, integrated in USB-serial discovery by implementing a component of type
+ * {@link UsbSerialDiscoveryParticipant}.
* <p/>
* Currently, this {@link UsbSerialDiscoveryParticipant} supports the Enocean USB300 dongles.
*
public synchronized void deviceRemoved() {
deviceDeletionPending = false;
if (getThing().getStatus() == ThingStatus.REMOVING) {
- // thing removal was initiated on ESH side
+ // thing removal was initiated
updateStatus(ThingStatus.REMOVED);
} else {
// device removal was initiated on homematic side, thing is not removed
<parameter name="callbackHost" type="text">
<context>network-address</context>
<label>Callback Network Address</label>
- <description>Callback network address of the ESH runtime, default is auto-discovery</description>
+ <description>Callback network address of the runtime, default is auto-discovery</description>
</parameter>
<parameter name="bindAddress" type="text">
<context>network-address</context>
import org.openhab.core.library.types.StringType;
/**
- * The {@link LightStateConverter} is responsible for mapping Eclipse SmartHome
- * types to jue types and vice versa.
+ * The {@link LightStateConverter} is responsible for mapping to/from jue types.
*
* @author Dennis Nobel - Initial contribution
* @author Oliver Libutzki - Adjustments
import org.openhab.binding.ihc.internal.ws.resourcevalues.WSBooleanValue;
import org.openhab.binding.ihc.internal.ws.resourcevalues.WSEnumValue;
import org.openhab.binding.ihc.internal.ws.resourcevalues.WSResourceValue;
+import org.openhab.core.OpenHAB;
import org.openhab.core.library.types.DateTimeType;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.OnOffType;
}
private String getFilePathInUserDataFolder(String fileName) {
- String progArg = System.getProperty("smarthome.userdata");
- if (progArg != null) {
- return progArg + File.separator + fileName;
- }
- return fileName;
+ return OpenHAB.getUserDataFolder() + File.separator + fileName;
}
@Override
if (selector != null) {
if (getConfig().get(IP_ADDRESS) != null && getConfig().get(PORT_NUMBER) != null) {
if (pollingThread == null) {
- pollingThread = new Thread(pollingRunnable, "ESH-IRtrans-Polling " + getThing().getUID());
+ pollingThread = new Thread(pollingRunnable, "OH-binding-" + getThing().getUID() + "-polling");
pollingThread.start();
}
} else {
break;
}
case AMPERE_HOUR: {
- // Ampere hours are not supported by ESH, but 1 AH is equal tp 3600 coulomb...
+ // Ampere hours is not a supported unit, but 1 AH is equal tp 3600 coulomb...
updateState(channeluid, new QuantityType<>(value * 3600, Units.COULOMB));
break;
}
private void discoveryResultSubmission(String IpAddress, String cubeSerialNumber, String rfAddress) {
if (cubeSerialNumber != null) {
- logger.trace("Adding new MAX! Cube Lan Gateway on {} with id '{}' to Smarthome inbox", IpAddress,
- cubeSerialNumber);
+ logger.trace("Adding new MAX! Cube Lan Gateway on {} with id '{}' to inbox", IpAddress, cubeSerialNumber);
Map<String, Object> properties = new HashMap<>(2);
properties.put(PROPERTY_IP_ADDRESS, IpAddress);
properties.put(PROPERTY_SERIAL_NUMBER, cubeSerialNumber);
@Override
public void onDeviceAdded(Bridge bridge, Device device) {
- logger.trace("Adding new MAX! {} with id '{}' to smarthome inbox", device.getType(), device.getSerialNumber());
+ logger.trace("Adding new MAX! {} with id '{}' to inbox", device.getType(), device.getSerialNumber());
ThingUID thingUID = null;
switch (device.getType()) {
case WallMountedThermostat:
* The {@link ApplianceChannelSelector} class defines a common interface for
* all the data structures used by appliance thing handlers. It is used to traverse
* the channels that possibly exist for an appliance, and convert data
- * returned by the appliance to a ESH compatible State
+ * returned by the appliance to a compatible State
*
* @author Karel Goderis - Initial contribution
*/
String toString();
/**
- * Returns the ESH ChannelID for the given datapoint
+ * Returns the ChannelID for the given datapoint
*/
String getChannelID();
}
/**
- * Submit the discovered Devices to the Smarthome inbox,
+ * Submit the discovered Devices to the inbox.
*
* @param bridgeUID
* @param name name of the player
}
/**
- * Submit the discovered Signs to the Smarthome inbox,
+ * Submit the discovered Signs to the inbox.
*
* @param bridgeUID
* @param sign data describing sign
return;
}
- // Map the string to an ESH command, update the cached value and post the command to the framework
+ // Map the string to a command, update the cached value and post the command to the framework
try {
cachedValue.update(command);
} catch (IllegalArgumentException | IllegalStateException e) {
import org.openhab.core.thing.type.ChannelGroupTypeUID;
/**
- * A HomeAssistant component is comparable to an ESH channel group.
+ * A HomeAssistant component is comparable to a channel group.
* It has a name and consists of multiple channels.
*
* @author David Graeff - Initial contribution
protected boolean configSeen;
/**
- * Provide a thingUID and HomeAssistant topic ID to determine the ESH channel group UID and type.
+ * Provide a thingUID and HomeAssistant topic ID to determine the channel group UID and type.
*
* @param thing A ThingUID
* @param haID A HomeAssistant topic ID
}
/**
- * Each HomeAssistant component corresponds to an ESH Channel Group Type.
+ * Each HomeAssistant component corresponds to a Channel Group Type.
*/
public ChannelGroupTypeUID groupTypeUID() {
return channelGroupTypeUID;
}
/**
- * The unique id of this component within the ESH framework.
+ * The unique id of this component.
*/
public ChannelGroupUID uid() {
return channelGroupUID;
}
/**
- * Each component consists of multiple ESH Channels.
+ * Each component consists of multiple Channels.
*/
public Map<String, CChannel> channelTypes() {
return channels;
/**
* Return a components channel. A HomeAssistant MQTT component consists of multiple functions
- * and those are mapped to one or more ESH channels. The channel IDs are constants within the
+ * and those are mapped to one or more channels. The channel IDs are constants within the
* derived Component, like the {@link ComponentSwitch#switchChannelID}.
*
* @param channelID The channel ID
/**
* An {@link AbstractComponent}s derived class consists of one or multiple channels.
- * Each component channel consists of the determined ESH channel type, channel type UID and the
- * ESH channel description itself as well as the the channels state.
+ * Each component channel consists of the determined channel type, channel type UID and the
+ * channel description itself as well as the the channels state.
*
* After the discovery process has completed and the tree of components and component channels
* have been built up, the channel types are registered to a custom channel type provider
- * before adding the channel descriptions to the ESH Thing themselves.
+ * before adding the channel descriptions to the Thing themselves.
* <br>
* <br>
* An object of this class creates the required {@link ChannelType} and {@link ChannelTypeUID} as well
private static final String JINJA = "JINJA";
private final ChannelUID channelUID;
- private final ChannelState channelState; // Channel state (value)
- private final Channel channel; // ESH Channel
+ private final ChannelState channelState;
+ private final Channel channel;
private final ChannelType type;
private final ChannelTypeUID channelTypeUID;
private final ChannelStateUpdateListener channelStateUpdateListener;
public CChannel build(boolean addToComponent) {
ChannelUID channelUID;
- ChannelState channelState; // Channel state (value)
- Channel channel; // ESH Channel
+ ChannelState channelState;
+ Channel channel;
ChannelType type;
ChannelTypeUID channelTypeUID;
* The specification does not cover the case of disappearing Components. This handler doesn't as well therefore.<br>
* <br>
*
- * A Component Instance equals an ESH Channel Group and the Component parts equal ESH Channels.<br>
+ * A Component Instance equals a Channel Group and the Component parts equal Channels.<br>
* <br>
*
* If a Components configuration changes, the known ChannelGroupType and ChannelTypes are replaced with the new ones.
}
/**
- * Get a homie property (which translates to an ESH channel).
+ * Get a homie property (which translates to a channel).
*
* @param channelUID The group ID corresponds to the Homie Node, the channel ID (without group ID) corresponds to
* the Nodes Property.
* Homie 3.x Node.
*
* A Homie Node contains Homie Properties ({@link Property}) but can also have attributes ({@link NodeAttributes}).
- * It corresponds to an ESH ChannelGroup.
+ * It corresponds to a ChannelGroup.
*
* @author David Graeff - Initial contribution
*/
public ChildMap<Property> properties;
// Runtime
public final DeviceCallback callback;
- // ESH
protected final ChannelGroupUID channelGroupUID;
public final ChannelGroupTypeUID channelGroupTypeUID;
private final String topic;
public class NodeAttributes extends AbstractMqttAttributeClass {
public @MandatoryField String name;
public @MandatoryField @MQTTvalueTransform(splitCharacter = ",") String[] properties;
- // Type has no meaning for ESH yet and is currently purely of textual, descriptive nature
+ // Type has no meaning yet and is currently purely of textual, descriptive nature
public String type;
@Override
import org.slf4j.LoggerFactory;
/**
- * A homie Property (which translates into an ESH channel).
+ * A homie Property (which translates into a channel).
*
* @author David Graeff - Initial contribution
*/
public final String propertyID;
// Runtime state
protected @Nullable ChannelState channelState;
- // ESH
public final ChannelUID channelUID;
public final ChannelTypeUID channelTypeUID;
private ChannelType type;
return;
}
- logger.debug("addThing(): Adding new Neato unit {} to the smarthome inbox", robot.getName());
+ logger.debug("addThing(): Adding new Neato unit {} to the inbox", robot.getName());
Map<String, Object> properties = new HashMap<>();
String serial = robot.getSerial();
}
if (thingType != null) {
- logger.trace("Adding new pulseaudio {} with name '{}' to smarthome inbox",
- device.getClass().getSimpleName(), uidName);
+ logger.trace("Adding new pulseaudio {} with name '{}' to inbox", device.getClass().getSimpleName(),
+ uidName);
ThingUID thingUID = new ThingUID(thingType, bridge.getUID(), device.getUIDName());
DiscoveryResult discoveryResult = DiscoveryResultBuilder.create(thingUID).withProperties(properties)
.withBridge(bridge.getUID()).withLabel(device.getUIDName()).build();
if (handler == null) {
logger.trace("Ignoring RFXCOM {} with id '{}' - bridge handler is null", thingUID, id);
} else if (!handler.getConfiguration().disableDiscovery) {
- logger.trace("Adding new RFXCOM {} with id '{}' to smarthome inbox", thingUID, id);
+ logger.trace("Adding new RFXCOM {} with id '{}' to inbox", thingUID, id);
DiscoveryResultBuilder discoveryResultBuilder = DiscoveryResultBuilder.create(thingUID).withBridge(bridge)
.withTTL(DISCOVERY_TTL);
message.addDevicePropertiesTo(discoveryResultBuilder);
public class SonosBindingConstants {
public static final String BINDING_ID = "sonos";
- public static final String ESH_PREFIX = "smarthome-";
+ public static final String TITLE_PREFIX = "smarthome-";
// List of all Thing Type UIDs
// Column (:) is not used for PLAY:1, PLAY:3, PLAY:5 and CONNECT:AMP because of
String existingList = "";
List<SonosEntry> playLists = getPlayLists();
for (SonosEntry someList : playLists) {
- if (someList.getTitle().equals(ESH_PREFIX + getUDN())) {
+ if (someList.getTitle().equals(TITLE_PREFIX + getUDN())) {
existingList = someList.getId();
break;
}
}
- saveQueue(ESH_PREFIX + getUDN(), existingList);
+ saveQueue(TITLE_PREFIX + getUDN(), existingList);
// get all the playlists and a ref to our
// saved list
playLists = getPlayLists();
for (SonosEntry someList : playLists) {
- if (someList.getTitle().equals(ESH_PREFIX + getUDN())) {
+ if (someList.getTitle().equals(TITLE_PREFIX + getUDN())) {
savedState.entry = new SonosEntry(someList.getId(), someList.getTitle(),
someList.getParentId(), "", "", "", someList.getUpnpClass(),
someList.getRes());
@Override
public void onDeviceAdded(Bridge bridge, Device device) {
- logger.debug("Adding new TellstickDevice! '{}' with id '{}' and type '{}' to smarthome inbox", device,
- device.getId(), device.getDeviceType());
+ logger.debug("Adding new TellstickDevice! '{}' with id '{}' and type '{}' to inbox", device, device.getId(),
+ device.getDeviceType());
ThingUID thingUID = getThingUID(bridge, device);
logger.debug("Detected thingUID: {}", thingUID);
if (thingUID != null) {
/**
* Java class for an channel XML element
- * Renamed to MediaChannel in order to avoid confusion with ESH Channels
+ * Renamed to MediaChannel in order to avoid confusion with Framework Channels
*
* @author Gaël L'hopital - Initial contribution
*/
/*
* Properties
* - Configuration: DEVICE_CONFIG_NODE_ID
- * - ESH default properties:
+ * - System properties:
* --- PROPERTY_VENDOR
* --- other default properties not available
* - Custom properties:
ZWaveController zwaveController = mZWayApi.getZWaveController();
if (zwaveController != null) {
Map<String, String> properties = editProperties();
- // ESH default properties
+ // System properties
properties.put(Thing.PROPERTY_FIRMWARE_VERSION, zwaveController.getData().getAPIVersion().getValue());
properties.put(Thing.PROPERTY_HARDWARE_VERSION, zwaveController.getData().getZWaveChip().getValue());
// Thing.PROPERTY_MODEL_ID not available, only manufacturerProductId
/**
* Provides a mechanism to store authenticated HomeKit client details inside the
- * ESH StorageService, by implementing HomekitAuthInfo.
+ * StorageService, by implementing HomekitAuthInfo.
*
* @author Andy Lintner - Initial contribution
*/
public class ConfigStore {
public static final String METAKEY = "HUEEMU";
- public static final String EVENT_ADDRESS_CHANGED = "ESH_EMU_CONFIG_ADDR_CHANGED";
+ public static final String EVENT_ADDRESS_CHANGED = "HUE_EMU_CONFIG_ADDR_CHANGED";
private final Logger logger = LoggerFactory.getLogger(ConfigStore.class);
if (newState.ct != null) {
try {
// We can't do anything here with a white color temperature.
- // The core ESH color type does not support setting it.
+ // The color type does not support setting it.
// Adjusting the color temperature implies setting the mode to ct
if (state instanceof HueStateColorBulb) {
if (newState.ct_inc != null) {
try {
// We can't do anything here with a white color temperature.
- // The core ESH color type does not support setting it.
+ // The color type does not support setting it.
// Adjusting the color temperature implies setting the mode to ct
if (state instanceof HueStateColorBulb) {
* @author Pauli Anttila - Initial contribution
*/
@NonNullByDefault
-@Component(property = { "smarthome.transform=BIN2JSON" })
+@Component(property = { "openhab.transform=BIN2JSON" })
public class Bin2JsonTransformationService implements TransformationService {
private Logger logger = LoggerFactory.getLogger(Bin2JsonTransformationService.class);
* @author Jan N. Klug - added command whitelist service
*/
@NonNullByDefault
-@Component(property = { "smarthome.transform=EXEC" })
+@Component(property = { "openhab.transform=EXEC" })
public class ExecTransformationService implements TransformationService {
private final Logger logger = LoggerFactory.getLogger(ExecTransformationService.class);
private final ExecTransformationWhitelistWatchService execTransformationWhitelistWatchService;
return Arrays.asList(ExecTransformationProfile.PROFILE_TYPE_UID);
}
- @Reference(target = "(smarthome.transform=EXEC)")
+ @Reference(target = "(openhab.transform=EXEC)")
public void addTransformationService(TransformationService service) {
this.service = service;
}
* @author Thomas Kordelle - pre compiled scripts
*/
@NonNullByDefault
-@Component(property = { "smarthome.transform=JS" })
+@Component(property = { "openhab.transform=JS" })
public class JavaScriptTransformationService implements TransformationService {
private Logger logger = LoggerFactory.getLogger(JavaScriptTransformationService.class);
return Arrays.asList(JavascriptTransformationProfile.PROFILE_TYPE_UID);
}
- @Reference(target = "(smarthome.transform=JS)")
+ @Reference(target = "(openhab.transform=JS)")
public void addTransformationService(TransformationService service) {
this.service = service;
}
*
*/
@NonNullByDefault
-@Component(property = { "smarthome.transform=JINJA" })
+@Component(property = { "openhab.transform=JINJA" })
public class JinjaTransformationService implements TransformationService {
private final Logger logger = LoggerFactory.getLogger(JinjaTransformationService.class);
return Arrays.asList(JinjaTransformationProfile.PROFILE_TYPE_UID);
}
- @Reference(target = "(smarthome.transform=JINJA)")
+ @Reference(target = "(openhab.transform=JINJA)")
public void addTransformationService(TransformationService service) {
this.service = service;
}
*
*/
@NonNullByDefault
-@Component(property = { "smarthome.transform=JSONPATH" })
+@Component(property = { "openhab.transform=JSONPATH" })
public class JSonPathTransformationService implements TransformationService {
private final Logger logger = LoggerFactory.getLogger(JSonPathTransformationService.class);
return Arrays.asList(JSonPathTransformationProfile.PROFILE_TYPE_UID);
}
- @Reference(target = "(smarthome.transform=JSONPATH)")
+ @Reference(target = "(openhab.transform=JSONPATH)")
public void addTransformationService(TransformationService service) {
this.service = service;
}
* @author Kai Kreuzer - Initial contribution and API
* @author Gaël L'hopital - Make it localizable
*/
-@Component(service = TransformationService.class, property = { "smarthome.transform=MAP" })
+@Component(service = TransformationService.class, property = { "openhab.transform=MAP" })
public class MapTransformationService extends AbstractFileTransformationService<Properties> {
private final Logger logger = LoggerFactory.getLogger(MapTransformationService.class);
return Arrays.asList(MapTransformationProfile.PROFILE_TYPE_UID);
}
- @Reference(target = "(smarthome.transform=MAP)")
+ @Reference(target = "(openhab.transform=MAP)")
public void addTransformationService(TransformationService service) {
this.service = service;
}
* @author Thomas.Eichstaedt-Engelen
*/
@NonNullByDefault
-@Component(property = { "smarthome.transform=REGEX" })
+@Component(property = { "openhab.transform=REGEX" })
public class RegExTransformationService implements TransformationService {
private final Logger logger = LoggerFactory.getLogger(RegExTransformationService.class);
return Arrays.asList(RegexTransformationProfile.PROFILE_TYPE_UID);
}
- @Reference(target = "(smarthome.transform=REGEX)")
+ @Reference(target = "(openhab.transform=REGEX)")
public void addTransformationService(TransformationService service) {
this.service = service;
}
* @author Gaël L'hopital
* @author Markus Rathgeb - drop usage of Guava
*/
-@Component(service = TransformationService.class, property = { "smarthome.transform=SCALE" })
+@Component(service = TransformationService.class, property = { "openhab.transform=SCALE" })
public class ScaleTransformationService extends AbstractFileTransformationService<Map<Range, String>> {
private final Logger logger = LoggerFactory.getLogger(ScaleTransformationService.class);
return Arrays.asList(ScaleTransformationProfile.PROFILE_TYPE_UID);
}
- @Reference(target = "(smarthome.transform=SCALE)")
+ @Reference(target = "(openhab.transform=SCALE)")
public void addTransformationService(TransformationService service) {
this.service = service;
}
* @author Thomas.Eichstaedt-Engelen
*/
@NonNullByDefault
-@Component(property = { "smarthome.transform=XPATH" })
+@Component(property = { "openhab.transform=XPATH" })
public class XPathTransformationService implements TransformationService {
private final Logger logger = LoggerFactory.getLogger(XPathTransformationService.class);
return Arrays.asList(XPathTransformationProfile.PROFILE_TYPE_UID);
}
- @Reference(target = "(smarthome.transform=XPATH)")
+ @Reference(target = "(openhab.transform=XPATH)")
public void addTransformationService(TransformationService service) {
this.service = service;
}
* @author Thomas.Eichstaedt-Engelen
*/
@NonNullByDefault
-@Component(property = { "smarthome.transform=XSLT" })
+@Component(property = { "openhab.transform=XSLT" })
public class XsltTransformationService implements TransformationService {
private final Logger logger = LoggerFactory.getLogger(XsltTransformationService.class);
return Arrays.asList(XSLTTransformationProfile.PROFILE_TYPE_UID);
}
- @Reference(target = "(smarthome.transform=XSLT)")
+ @Reference(target = "(openhab.transform=XSLT)")
public void addTransformationService(TransformationService service) {
this.service = service;
}
}
/**
- * Converts ESH audio format to Google parameters.
+ * Converts audio format to Google parameters.
*
* @param codec Requested codec
* @return String array of Google audio format and the file extension to use.
protected void mockTransformation(String name, TransformationService service) {
Dictionary<String, Object> params = new Hashtable<>();
- params.put("smarthome.transform", name);
+ params.put("openhab.transform", name);
registerService(service, params);
}
private static final String TEST_ITEM_NAME = "testItem";
private static final String TEST_THING_ID = "testThingId";
- // No bundle in ESH is exporting a package from which we can use item types
+ // No bundle is exporting a package from which we can use item types
// as constants, so we will use String.
private static final String ACCEPTED_ITEM_TYPE_STRING = "String";
private static final String ACCEPTED_ITEM_TYPE_DATE_TIME = "DateTime";
projects / openhab-addons.git / commitdiff