channel : this.digitalOutputChannels) {
+ for (var channel : this.digitalOutputChannels) {
String valueText;
var valueOpt = channel.value().asOptional();
if (valueOpt.isPresent()) {
valueText = valueOpt.get() ? "x" : "-";
} else {
- valueText = "?";
+ valueText = "Unknown";
}
- b.append(i + valueText);
-
- // add space for all but the last
- if (++i <= this.digitalOutputChannels.length) {
- b.append(" ");
+ b.append(valueText);
+ if (i < this.digitalOutputChannels.length) {
+ b.append("|");
}
+ i++;
}
return b.toString();
}
@@ -99,68 +116,84 @@ public void handleEvent(Event event) {
}
switch (event.getTopic()) {
- case EdgeEventConstants.TOPIC_CYCLE_BEFORE_PROCESS_IMAGE:
- this.eventBeforeProcessImage();
- break;
+ case EdgeEventConstants.TOPIC_CYCLE_EXECUTE_WRITE //
+ -> this.eventExecuteWrite();
+ }
+ }
- case EdgeEventConstants.TOPIC_CYCLE_EXECUTE_WRITE:
- this.eventExecuteWrite();
- break;
+ private record RelayState(Boolean relayIsOn, Boolean overtemp, Boolean overpower) {
+ private static RelayState from(JsonElement relay) throws OpenemsNamedException {
+ var relayIsOn = getAsBoolean(relay, "ison");
+ var overtemp = getAsBoolean(relay, "overtemperature");
+ var overpower = getAsBoolean(relay, "overpower");
+ return new RelayState(relayIsOn, overtemp, overpower);
+ }
+
+ private void applyChannels(IoShelly25 component, IoShelly25.ChannelId relayChannel,
+ IoShelly25.ChannelId overtempChannel, IoShelly25.ChannelId overpowerChannel) {
+ component.channel(relayChannel).setNextValue(this.relayIsOn);
+ component.channel(overtempChannel).setNextValue(this.overtemp);
+ component.channel(overpowerChannel).setNextValue(this.overpower);
}
}
/**
* Execute on Cycle Event "Before Process Image".
+ *
+ * @param result The JSON element containing the result of the HTTP request.
+ * @param error The throwable error, if any occurred during the HTTP request.
+ * @throws OpenemsNamedException if the processing of the HTTP result fails or
+ * communication with the slave device is
+ * unsuccessful.
*/
- private void eventBeforeProcessImage() {
- Boolean relay1IsOn;
- Boolean relay2IsOn;
- try {
- var json = this.shellyApi.getStatus();
- var relays = JsonUtils.getAsJsonArray(json, "relays");
- var relay1 = JsonUtils.getAsJsonObject(relays.get(0));
- relay1IsOn = JsonUtils.getAsBoolean(relay1, "ison");
- var relay2 = JsonUtils.getAsJsonObject(relays.get(1));
- relay2IsOn = JsonUtils.getAsBoolean(relay2, "ison");
+ private void processHttpResult(JsonElement result, Throwable error) {
+ var slaveCommunicationFailed = result == null;
+ var relay1State = new RelayState(null, null, null);
+ var relay2State = new RelayState(null, null, null);
- this._setSlaveCommunicationFailed(false);
+ try {
+ final var relays = getAsJsonArray(result, "relays");
+ relay1State = RelayState.from(getAsJsonObject(relays.get(0)));
+ relay2State = RelayState.from(getAsJsonObject(relays.get(1)));
} catch (OpenemsNamedException | IndexOutOfBoundsException e) {
- relay1IsOn = null;
- relay2IsOn = null;
- this.logError(this.log, "Unable to read from Shelly API: " + e.getMessage());
- this._setSlaveCommunicationFailed(true);
+ this.logDebug(this.log, e.getMessage());
+ slaveCommunicationFailed = true;
}
- this._setRelay1(relay1IsOn);
- this._setRelay2(relay2IsOn);
+
+ this._setSlaveCommunicationFailed(slaveCommunicationFailed);
+ relay1State.applyChannels(this, IoShelly25.ChannelId.RELAY_1, //
+ IoShelly25.ChannelId.RELAY_1_OVERTEMP, IoShelly25.ChannelId.RELAY_1_OVERPOWER);
+ relay2State.applyChannels(this, IoShelly25.ChannelId.RELAY_2, //
+ IoShelly25.ChannelId.RELAY_2_OVERTEMP, IoShelly25.ChannelId.RELAY_2_OVERPOWER);
}
/**
* Execute on Cycle Event "Execute Write".
*/
private void eventExecuteWrite() {
- try {
- this.executeWrite(this.getRelay1Channel(), 0);
- this.executeWrite(this.getRelay2Channel(), 1);
-
- this._setSlaveCommunicationFailed(false);
- } catch (OpenemsNamedException e) {
- this._setSlaveCommunicationFailed(true);
+ for (int i = 0; i < this.digitalOutputChannels.length; i++) {
+ this.executeWrite(this.digitalOutputChannels[i], i);
}
}
- private void executeWrite(BooleanWriteChannel channel, int index) throws OpenemsNamedException {
+ private void executeWrite(BooleanWriteChannel channel, int index) {
var readValue = channel.value().get();
var writeValue = channel.getNextWriteValueAndReset();
- if (!writeValue.isPresent()) {
- // no write value
+ if (writeValue.isEmpty()) {
return;
}
if (Objects.equals(readValue, writeValue.get())) {
- // read value = write value
return;
}
- this.shellyApi.setRelayTurn(index, writeValue.get());
+ final String url = this.baseUrl + "/relay/" + index + "?turn=" + (writeValue.get() ? "on" : "off");
+ this.httpBridge.get(url).whenComplete((t, e) -> {
+ this._setSlaveCommunicationFailed(e != null);
+ if (e == null) {
+ this.logInfo(this.log, "Executed write successfully for URL: " + url);
+ } else {
+ this.logError(this.log, "Failed to execute write for URL: " + url + "; Error: " + e.getMessage());
+ }
+ });
}
-
-}
\ No newline at end of file
+}
diff --git a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/ShellyApi.java b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/ShellyApi.java
deleted file mode 100644
index 6b3b8a3db6f..00000000000
--- a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/ShellyApi.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package io.openems.edge.io.shelly.shelly25;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-
-import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.common.exceptions.OpenemsException;
-import io.openems.common.utils.JsonUtils;
-
-// TODO replace with HttpBridge
-/**
- * Implements the local Shelly REST Api.
- *
- *
- * See https://shelly-api-docs.shelly.cloud
- */
-public class ShellyApi {
-
- private final String baseUrl;
-
- public ShellyApi(String ip) {
- this.baseUrl = "http://" + ip;
- }
-
- /**
- * Gets the status of the device.
- *
- *
- * See https://shelly-api-docs.shelly.cloud/#shelly2-5-status
- *
- * @return the status as JsonObject according to Shelly docs
- * @throws OpenemsNamedException on error
- */
- public JsonObject getStatus() throws OpenemsNamedException {
- return JsonUtils.getAsJsonObject(this.sendGetRequest("/status"));
- }
-
- /**
- * Gets the "ison" state of the relay with the given index.
- *
- *
- * See https://shelly-api-docs.shelly.cloud/#shelly2-5-relay-index
- *
- * @param index the index of the relay
- * @return the boolean value
- * @throws OpenemsNamedException on error
- */
- public boolean getRelayIson(int index) throws OpenemsNamedException {
- var json = this.sendGetRequest("/relay/" + index);
- return JsonUtils.getAsBoolean(json, "ison");
- }
-
- /**
- * Turns the relay with the given index on or off.
- *
- * @param index the index of the relay
- * @param value true to turn on; false to turn off
- * @throws OpenemsNamedException on error
- */
- public void setRelayTurn(int index, boolean value) throws OpenemsNamedException {
- this.sendGetRequest("/relay/" + index + "?turn=" + (value ? "on" : "off"));
- }
-
- /**
- * Sends a get request to the Shelly API.
- *
- * @param endpoint the REST Api endpoint
- * @return a JsonObject or JsonArray
- * @throws OpenemsNamedException on error
- */
- private JsonElement sendGetRequest(String endpoint) throws OpenemsNamedException {
- try {
- var url = new URL(this.baseUrl + endpoint);
- var con = (HttpURLConnection) url.openConnection();
- con.setRequestMethod("GET");
- con.setConnectTimeout(5000);
- con.setReadTimeout(5000);
- var status = con.getResponseCode();
- String body;
- try (var in = new BufferedReader(new InputStreamReader(con.getInputStream()))) {
- // Read HTTP response
- var content = new StringBuilder();
- String line;
- while ((line = in.readLine()) != null) {
- content.append(line);
- content.append(System.lineSeparator());
- }
- body = content.toString();
- }
- if (status < 300) {
- // Parse response to JSON
- return JsonUtils.parseToJsonObject(body);
- }
- throw new OpenemsException("Error while reading from Shelly API. Response code: " + status + ". " + body);
- } catch (OpenemsNamedException | IOException e) {
- throw new OpenemsException(
- "Unable to read from Shelly API. " + e.getClass().getSimpleName() + ": " + e.getMessage());
- }
- }
-
-}
diff --git a/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shelly25/IoShelly25ImplTest.java b/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shelly25/IoShelly25ImplTest.java
index 6e778d2393c..2e6e2a98902 100644
--- a/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shelly25/IoShelly25ImplTest.java
+++ b/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shelly25/IoShelly25ImplTest.java
@@ -2,6 +2,7 @@
import org.junit.Test;
+import io.openems.edge.bridge.http.dummy.DummyBridgeHttpFactory;
import io.openems.edge.common.test.ComponentTest;
public class IoShelly25ImplTest {
@@ -11,6 +12,7 @@ public class IoShelly25ImplTest {
@Test
public void test() throws Exception {
new ComponentTest(new IoShelly25Impl()) //
+ .addReference("httpBridgeFactory", new DummyBridgeHttpFactory()) //
.activate(MyConfig.create() //
.setId(COMPONENT_ID) //
.setIp("127.0.0.1") //
@@ -18,4 +20,4 @@ public void test() throws Exception {
;
}
-}
+}
\ No newline at end of file