Skip to content
This repository has been archived by the owner on Nov 27, 2020. It is now read-only.

Commit

Permalink
rgbw and fetch fx and palletes
Browse files Browse the repository at this point in the history 
Signed-off-by: Matthew Skinner <[email protected]>
  • Loading branch information
@Skinah
Skinah committed Sep 28, 2020
1 parent 20eba86 commit b7d0fdb
Show file tree
Hide file tree
Showing 11 changed files with 189 additions and 427 deletions.
2 changes: 2 additions & 0 deletions src/main/java/org/openhab/binding/wled/internal/WLedBindingConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ public class WLedBindingConstants {
public static final String CHANNEL_MASTER_CONTROLS = "masterControls";
public static final String CHANNEL_PRIMARY_COLOR = "primaryColor";
public static final String CHANNEL_SECONDARY_COLOR = "secondaryColor";
public static final String CHANNEL_PRIMARY_WHITE = "primaryWhite";
public static final String CHANNEL_SECONDARY_WHITE = "secondaryWhite";
public static final String CHANNEL_PALETTES = "palettes";
public static final String CHANNEL_PRESETS = "presets";
public static final String CHANNEL_PRESET_DURATION = "presetDuration";
Expand Down
113 changes: 81 additions & 32 deletions src/main/java/org/openhab/binding/wled/internal/WLedHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
Expand All @@ -42,6 +44,7 @@
import org.eclipse.smarthome.core.thing.binding.BaseThingHandler;
import org.eclipse.smarthome.core.types.Command;
import org.eclipse.smarthome.core.types.RefreshType;
import org.eclipse.smarthome.core.types.StateOption;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -56,17 +59,21 @@
public class WLedHandler extends BaseThingHandler {
private final Logger logger = LoggerFactory.getLogger(getClass());
private final HttpClient httpClient;
private final WledDynamicStateDescriptionProvider stateDescriptionProvider;
private @Nullable ScheduledFuture<?> pollingFuture = null;
private ScheduledExecutorService threadPool = Executors.newScheduledThreadPool(1);
private BigDecimal masterBrightness = new BigDecimal(0);
private HSBType primaryColor = new HSBType();
private BigDecimal primaryWhite = new BigDecimal(0);
private HSBType secondaryColor = new HSBType();
private BigDecimal secondaryWhite = new BigDecimal(0);
private WLedConfiguration config;
private boolean hasWhite = false;

public WLedHandler(Thing thing, HttpClient httpClient) {
public WLedHandler(Thing thing, HttpClient httpClient,
WledDynamicStateDescriptionProvider stateDescriptionProvider) {
super(thing);
this.httpClient = httpClient;
this.stateDescriptionProvider = stateDescriptionProvider;
config = getConfigAs(WLedConfiguration.class);
}

Expand Down Expand Up @@ -103,21 +110,26 @@ private HSBType parseToHSBType(String message, String element) {
return new HSBType();
}
int endIndex = message.indexOf("<", startIndex + element.length());
int r = Integer.parseInt(message.substring(startIndex + element.length(), endIndex));
// look for second element
startIndex = message.indexOf(element, endIndex);
if (startIndex == -1) {
return new HSBType();
}
endIndex = message.indexOf("<", startIndex + element.length());
int g = Integer.parseInt(message.substring(startIndex + element.length(), endIndex));
// look for third element called <cl>
startIndex = message.indexOf(element, endIndex);
if (startIndex == -1) {
return new HSBType();
int r = 0, g = 0, b = 0;
try {
r = Integer.parseInt(message.substring(startIndex + element.length(), endIndex));
// look for second element
startIndex = message.indexOf(element, endIndex);
if (startIndex == -1) {
return new HSBType();
}
endIndex = message.indexOf("<", startIndex + element.length());
g = Integer.parseInt(message.substring(startIndex + element.length(), endIndex));
// look for third element called <cl>
startIndex = message.indexOf(element, endIndex);
if (startIndex == -1) {
return new HSBType();
}
endIndex = message.indexOf("<", startIndex + element.length());
b = Integer.parseInt(message.substring(startIndex + element.length(), endIndex));
} catch (NumberFormatException e) {
logger.warn("NumberFormatException when parsing the WLED color fields.");
}
endIndex = message.indexOf("<", startIndex + element.length());
int b = Integer.parseInt(message.substring(startIndex + element.length(), endIndex));
return HSBType.fromRGB(r, g, b);
}

Expand All @@ -126,24 +138,56 @@ private void parseColours(String message) {
updateState(CHANNEL_PRIMARY_COLOR, primaryColor);
secondaryColor = parseToHSBType(message, "<cs>");
updateState(CHANNEL_SECONDARY_COLOR, secondaryColor);
try {
primaryWhite = new BigDecimal(getValue(message, "<wv>", "<"));
if (primaryWhite.intValue() > -1) {
updateState(CHANNEL_PRIMARY_WHITE,
new PercentType(primaryWhite.divide(new BigDecimal(2.55), RoundingMode.HALF_UP)));
secondaryWhite = new BigDecimal(getValue(message, "<ws>", "<"));
updateState(CHANNEL_SECONDARY_WHITE,
new PercentType(secondaryWhite.divide(new BigDecimal(2.55), RoundingMode.HALF_UP)));
}
} catch (NumberFormatException e) {
logger.warn("NumberFormatException when parsing the WLED white fields.");
}
}

private void scrapeChannelOptions(String message) {
List<StateOption> fxOptions = new ArrayList<>();
List<StateOption> palleteOptions = new ArrayList<>();
int counter = 0;
for (String value : (getValue(message, "\"effects\":[", "]").replace("\"", "")).split(",")) {
fxOptions.add(new StateOption("" + counter++, value));
}
stateDescriptionProvider.setStateOptions(new ChannelUID(getThing().getUID(), CHANNEL_FX), fxOptions);
counter = 0;
for (String value : (getValue(message, "\"palettes\":[", "]").replace("\"", "")).split(",")) {
palleteOptions.add(new StateOption("" + counter++, value));
}
stateDescriptionProvider.setStateOptions(new ChannelUID(getThing().getUID(), CHANNEL_PALETTES), palleteOptions);
}

private void processState(String message) {
logger.trace("WLED states are:{}", message);
if (thing.getStatus() != ThingStatus.ONLINE) {
updateStatus(ThingStatus.ONLINE);
sendGetRequest("/json"); // fetch FX and Pallete names
}
if (message.contains("\"effects\":[")) {// JSON API reply
scrapeChannelOptions(message);
return;
}
if (message.contains("<ac>0</ac>")) {
updateState(CHANNEL_MASTER_CONTROLS, OnOffType.OFF);
} else {
masterBrightness = new BigDecimal(getValue(message, "<ac>")).divide(new BigDecimal(2.55),
RoundingMode.HALF_UP);
updateState(CHANNEL_MASTER_CONTROLS, new PercentType(masterBrightness));
masterBrightness = new BigDecimal(getValue(message, "<ac>", "<"));
updateState(CHANNEL_MASTER_CONTROLS,
new PercentType(masterBrightness.divide(new BigDecimal(2.55), RoundingMode.HALF_UP)));
}
if (message.contains("<ix>0</ix>")) {
updateState(CHANNEL_INTENSITY, OnOffType.OFF);
} else {
BigDecimal bigTemp = new BigDecimal(getValue(message, "<ix>")).divide(new BigDecimal(2.55),
BigDecimal bigTemp = new BigDecimal(getValue(message, "<ix>", "<")).divide(new BigDecimal(2.55),
RoundingMode.HALF_UP);
updateState(CHANNEL_INTENSITY, new PercentType(bigTemp));
}
Expand All @@ -158,20 +202,15 @@ private void processState(String message) {
updateState(CHANNEL_SLEEP, OnOffType.OFF);
}
if (message.contains("<fx>")) {
updateState(CHANNEL_FX, new StringType(getValue(message, "<fx>")));
updateState(CHANNEL_FX, new StringType(getValue(message, "<fx>", "<")));
}
if (message.contains("<sx>")) {
BigDecimal bigTemp = new BigDecimal(getValue(message, "<sx>")).divide(new BigDecimal(2.55),
BigDecimal bigTemp = new BigDecimal(getValue(message, "<sx>", "<")).divide(new BigDecimal(2.55),
RoundingMode.HALF_UP);
updateState(CHANNEL_SPEED, new PercentType(bigTemp));
}
if (message.contains("<fp>")) {
updateState(CHANNEL_PALETTES, new StringType(getValue(message, "<fp>")));
}
if (message.contains("<wv>-1</wv>")) {
hasWhite = false;
} else {
hasWhite = true;
updateState(CHANNEL_PALETTES, new StringType(getValue(message, "<fp>", "<")));
}
parseColours(message);
}
Expand Down Expand Up @@ -200,6 +239,16 @@ public void handleCommand(ChannelUID channelUID, Command command) {
}
logger.debug("command {} sent to {}", command, channelUID.getId());
switch (channelUID.getId()) {
case CHANNEL_PRIMARY_WHITE:
if (command instanceof PercentType) {
sendGetRequest("/win&W=" + new BigDecimal(command.toString()).multiply(new BigDecimal(2.55)));
}
break;
case CHANNEL_SECONDARY_WHITE:
if (command instanceof PercentType) {
sendGetRequest("/win&W2=" + new BigDecimal(command.toString()).multiply(new BigDecimal(2.55)));
}
break;
case CHANNEL_MASTER_CONTROLS:
if (command instanceof OnOffType) {
if (OnOffType.OFF.equals(command)) {
Expand Down Expand Up @@ -358,14 +407,14 @@ public void dispose() {
}

/**
* @return A string that starts after finding the element and terminates when it finds the first < char after the
* element.
* @return A string that starts after finding the element and terminates when it finds the first occurence of the
* end char after the element.
*/
static private String getValue(String message, String element) {
static private String getValue(String message, String element, String end) {
int startIndex = message.indexOf(element);
if (startIndex != -1) // It was found, as -1 means "not found"
{
int endIndex = message.indexOf('<', startIndex + element.length());
int endIndex = message.indexOf(end, startIndex + element.length());
if (endIndex != -1)// , not found so make second check
{
return message.substring(startIndex + element.length(), endIndex);
Expand Down
9 changes: 6 additions & 3 deletions src/main/java/org/openhab/binding/wled/internal/WLedHandlerFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,14 @@
@NonNullByDefault
@Component(configurationPid = "binding.wled", service = ThingHandlerFactory.class)
public class WLedHandlerFactory extends BaseThingHandlerFactory {
private HttpClient httpClient;
private final HttpClient httpClient;
private final WledDynamicStateDescriptionProvider stateDescriptionProvider;;

@Activate
public WLedHandlerFactory(@Reference HttpClientFactory httpClientFactory) {
public WLedHandlerFactory(@Reference HttpClientFactory httpClientFactory,
final @Reference WledDynamicStateDescriptionProvider stateDescriptionProvider) {
this.httpClient = httpClientFactory.getCommonHttpClient();
this.stateDescriptionProvider = stateDescriptionProvider;
}

@Override
Expand All @@ -56,7 +59,7 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) {
protected @Nullable ThingHandler createHandler(Thing thing) {
ThingTypeUID thingTypeUID = thing.getThingTypeUID();
if (SUPPORTED_THING_TYPES.contains(thingTypeUID)) {
return new WLedHandler(thing, httpClient);
return new WLedHandler(thing, httpClient, stateDescriptionProvider);
}
return null;
}
Expand Down
37 changes: 37 additions & 0 deletions src/main/java/org/openhab/binding/wled/internal/WledDynamicStateDescriptionProvider.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/**
* Copyright (c) 2010-2020 Contributors to the openHAB project
*
* See the NOTICE file(s) distributed with this work for additional
* information.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.wled.internal;

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.smarthome.core.thing.binding.BaseDynamicStateDescriptionProvider;
import org.eclipse.smarthome.core.thing.i18n.ChannelTypeI18nLocalizationService;
import org.eclipse.smarthome.core.thing.type.DynamicStateDescriptionProvider;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;

/**
* The {@link WledDynamicStateDescriptionProvider} Allows the dynamic updating of the FX and Palletes that WLED keep
* changing between firmware versions.
*
* @author Matthew Skinner - Initial contribution
*/
@Component(service = { DynamicStateDescriptionProvider.class, WledDynamicStateDescriptionProvider.class })
@NonNullByDefault
public class WledDynamicStateDescriptionProvider extends BaseDynamicStateDescriptionProvider {
@Activate
public WledDynamicStateDescriptionProvider(
final @Reference ChannelTypeI18nLocalizationService channelTypeI18nLocalizationService) {
this.channelTypeI18nLocalizationService = channelTypeI18nLocalizationService;
}
}
Loading

0 comments on commit b7d0fdb

Please sign in to comment.