getOdooReferenceId(Object object) {
- if (object instanceof Object[] odooReference) {
- if (odooReference.length > 0 && odooReference[0] instanceof Integer) {
- return Optional.of((Integer) odooReference[0]);
- }
+ if (object instanceof Object[] odooReference //
+ && odooReference.length > 0 //
+ && odooReference[0] instanceof Integer i) {
+ return Optional.of(i);
}
return Optional.empty();
diff --git a/io.openems.common/src/io/openems/common/OpenemsConstants.java b/io.openems.common/src/io/openems/common/OpenemsConstants.java
index 9e7cf71367f..4c13f7bf642 100644
--- a/io.openems.common/src/io/openems/common/OpenemsConstants.java
+++ b/io.openems.common/src/io/openems/common/OpenemsConstants.java
@@ -22,7 +22,7 @@ public class OpenemsConstants {
*
* This is the month of the release.
*/
- public static final short VERSION_MINOR = 1;
+ public static final short VERSION_MINOR = 2;
/**
* The patch version of OpenEMS.
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/JSCalendar.java b/io.openems.common/src/io/openems/common/jscalendar/JSCalendar.java
similarity index 61%
rename from io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/JSCalendar.java
rename to io.openems.common/src/io/openems/common/jscalendar/JSCalendar.java
index ab9fcbf39b9..d96cb19793c 100644
--- a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/JSCalendar.java
+++ b/io.openems.common/src/io/openems/common/jscalendar/JSCalendar.java
@@ -1,17 +1,18 @@
-package io.openems.edge.controller.evcs;
+package io.openems.common.jscalendar;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableSortedSet.toImmutableSortedSet;
import static io.openems.common.utils.JsonUtils.getAsEnum;
-import static io.openems.common.utils.JsonUtils.getAsJsonArray;
import static io.openems.common.utils.JsonUtils.getAsJsonObject;
-import static io.openems.common.utils.JsonUtils.getAsLocalDateTime;
+import static io.openems.common.utils.JsonUtils.getAsOptionalJsonArray;
+import static io.openems.common.utils.JsonUtils.getAsOptionalJsonObject;
+import static io.openems.common.utils.JsonUtils.getAsOptionalString;
+import static io.openems.common.utils.JsonUtils.getAsOptionalUUID;
+import static io.openems.common.utils.JsonUtils.getAsOptionalZonedDateTime;
import static io.openems.common.utils.JsonUtils.getAsString;
-import static io.openems.common.utils.JsonUtils.getAsUUID;
-import static io.openems.common.utils.JsonUtils.getAsZonedDateTime;
+import static io.openems.common.utils.JsonUtils.parseToJsonArray;
import static io.openems.common.utils.JsonUtils.stream;
import static io.openems.common.utils.JsonUtils.toJsonArray;
-import static io.openems.edge.controller.evcs.JSCalendar.RecurrenceFrequency.WEEKLY;
import static java.time.DayOfWeek.FRIDAY;
import static java.time.DayOfWeek.MONDAY;
import static java.time.DayOfWeek.SATURDAY;
@@ -19,16 +20,22 @@
import static java.time.DayOfWeek.THURSDAY;
import static java.time.DayOfWeek.TUESDAY;
import static java.time.DayOfWeek.WEDNESDAY;
+import static java.time.LocalDate.EPOCH;
import static java.time.format.DateTimeFormatter.ISO_INSTANT;
import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE_TIME;
import static java.time.temporal.ChronoField.NANO_OF_DAY;
import static java.time.temporal.TemporalAdjusters.nextOrSame;
import static java.util.Arrays.stream;
-import static java.util.UUID.randomUUID;
import java.time.DayOfWeek;
+import java.time.Duration;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.temporal.ChronoUnit;
import java.util.NoSuchElementException;
import java.util.UUID;
import java.util.function.Consumer;
@@ -47,21 +54,44 @@
import io.openems.common.utils.JsonUtils;
/**
- * This implementation is based on RFC 8984 "JSCalendar: A JSON Representation
- * of Calendar Data".
+ * Implementation of RFC 8984 "JSCalendar: A JSON Representation of Calendar
+ * Data".
*
*
- *
- * @link https://www.rfc-editor.org/rfc/rfc8984.html
+ * See https://www.rfc-editor.org/rfc/rfc8984.html
*/
// CHECKSTYLE:OFF
public class JSCalendar {
// CHECKSTYLE:ON
- public static record Task(UUID uid, ZonedDateTime updated, LocalDateTime start,
+ private static final String PROPERTY_PAYLOAD = "openems.io:payload";
+
+ public static record Task(UUID uid, ZonedDateTime updated, LocalDateTime start, Duration duration,
ImmutableList recurrenceRules, PAYLOAD payload) {
+ /**
+ * Parse a List of {@link Task}s from a String representing a {@link JsonArray}
+ * - includes checks for null and empty.
+ *
+ * @param the type of the Payload
+ * @param string the {@link JsonArray} string
+ * @param payloadParser a parser for a Payload
+ * @return the List of {@link Task}s
+ */
+ public static ImmutableList> fromStringOrEmpty(String string,
+ ThrowingFunction payloadParser) {
+ if (string == null || string.isBlank()) {
+ return ImmutableList.of();
+ }
+ try {
+ return fromJson(parseToJsonArray(string), payloadParser);
+ } catch (OpenemsNamedException e) {
+ e.printStackTrace();
+ return ImmutableList.of();
+ }
+ }
+
/**
* Parse a List of {@link Task}s from a {@link JsonArray}.
*
@@ -77,7 +107,7 @@ public static ImmutableList> fromJson(JsonArray json,
return stream(json) //
.map(j -> {
try {
- return fromJson(JsonUtils.getAsJsonObject(j), payloadParser);
+ return fromJson(getAsJsonObject(j), payloadParser);
} catch (OpenemsNamedException e) {
e.printStackTrace();
throw new NoSuchElementException(e.getMessage());
@@ -122,43 +152,40 @@ public static Task fromJson(JsonObject json,
if (!type.equalsIgnoreCase("Task")) {
throw new OpenemsException("This is not a 'Task': " + type);
}
- try {
- var uid = getAsUUID(json, "uid");
- var updated = getAsZonedDateTime(json, "updated");
- var start = getAsLocalDateTime(json, "start");
- var recurrenceRules = stream(getAsJsonArray(json, "recurrenceRules")) //
- .map(r -> {
- try {
- return RecurrenceRule.fromJson(r);
- } catch (OpenemsNamedException e) {
- e.printStackTrace();
- throw new NoSuchElementException(e.getMessage());
- }
- }) //
- .collect(toImmutableList());
- var payload = payloadParser.apply(getAsJsonObject(json, "payload"));
- return new Task(uid, updated, start, recurrenceRules, payload);
-
- } catch (NoSuchElementException e) {
- throw new OpenemsException("NoSuchElementException: " + e.getMessage());
- }
+ var b = Task.create() //
+ .setUid(getAsOptionalUUID(json, "uid").orElse(null)) //
+ .setUpdated(getAsOptionalZonedDateTime(json, "updated").orElse(null)) //
+ .setStart(getAsString(json, "start")) //
+ .setDuration(getAsOptionalString(json, "duration").orElse(null)); //
+ getAsOptionalJsonArray(json, "recurrenceRules") //
+ .ifPresent(j -> stream(j) //
+ .forEach(r -> b.addRecurrenceRule(r)));
+ var rawPayload = getAsOptionalJsonObject(json, PROPERTY_PAYLOAD);
+ b.setPayload(rawPayload.isPresent() //
+ ? payloadParser.apply(rawPayload.get()) //
+ : null);
+ return b.build();
}
public static class Builder {
- private final UUID uid;
- private final ZonedDateTime updated;
-
+ private UUID uid = null;
+ private ZonedDateTime updated = null;
private LocalDateTime start = null;
+ private Duration duration = null;
private ImmutableList.Builder recurrenceRules = ImmutableList.builder();
private PAYLOAD payload = null;
protected Builder() {
- this(randomUUID(), ZonedDateTime.now());
}
- protected Builder(UUID uid, ZonedDateTime updated) {
+ public Builder setUid(UUID uid) {
this.uid = uid;
+ return this;
+ }
+
+ public Builder setUpdated(ZonedDateTime updated) {
this.updated = updated;
+ return this;
}
public Builder setStart(LocalDateTime start) {
@@ -166,11 +193,27 @@ public Builder setStart(LocalDateTime start) {
return this;
}
- protected Builder setStart(String start) {
- this.setStart(LocalDateTime.parse(start));
+ public Builder setStart(LocalTime start) {
+ return this.setStart(LocalDateTime.of(EPOCH, start));
+ }
+
+ protected Builder setStart(String start) throws DateTimeParseException {
+ try {
+ return this.setStart(LocalDateTime.parse(start));
+ } catch (DateTimeParseException e) {
+ return this.setStart(LocalTime.parse(start));
+ }
+ }
+
+ public Builder setDuration(Duration duration) {
+ this.duration = duration;
return this;
}
+ protected Builder setDuration(String duration) {
+ return this.setDuration(duration == null ? null : Duration.parse(duration));
+ }
+
/**
* Adds a {@link RecurrenceRule}.
*
@@ -182,6 +225,21 @@ public Builder addRecurrenceRule(RecurrenceRule recurrenceRule) {
return this;
}
+ /**
+ * Adds a {@link RecurrenceRule}.
+ *
+ * @param json the {@link RecurrenceRule} as {@link JsonObject}
+ * @return myself
+ */
+ public Builder addRecurrenceRule(JsonElement json) throws NoSuchElementException {
+ try {
+ return this.addRecurrenceRule(RecurrenceRule.fromJson(json));
+ } catch (OpenemsNamedException e) {
+ e.printStackTrace();
+ throw new NoSuchElementException(e.getMessage());
+ }
+ }
+
/**
* Adds a {@link RecurrenceRule}.
*
@@ -201,8 +259,8 @@ public Builder setPayload(PAYLOAD payload) {
}
public Task build() {
- return new Task(this.uid, this.updated, this.start, this.recurrenceRules.build(),
- this.payload);
+ return new Task(this.uid, this.updated, this.start, this.duration,
+ this.recurrenceRules.build(), this.payload);
}
}
@@ -224,11 +282,22 @@ public static Builder create() {
*/
public JsonObject toJson(Function payloadConverter) {
var j = JsonUtils.buildJsonObject() //
- .addProperty("@type", "Task") //
- .addProperty("uid", this.uid.toString()) //
- .addProperty("updated", this.updated.format(ISO_INSTANT));
+ .addProperty("@type", "Task");
+ if (this.uid != null) {
+ j.addProperty("uid", this.uid.toString());
+ }
+ if (this.updated != null) {
+ j.addProperty("updated", this.updated.format(ISO_INSTANT));
+ }
if (this.start != null) {
- j.addProperty("start", this.start.format(ISO_LOCAL_DATE_TIME));
+ if (LocalDate.from(this.start).equals(EPOCH)) {
+ j.addProperty("start", this.start.format(DateTimeFormatter.ISO_LOCAL_TIME));
+ } else {
+ j.addProperty("start", this.start.format(ISO_LOCAL_DATE_TIME));
+ }
+ }
+ if (this.duration != null) {
+ j.addProperty("duration", this.duration.toString());
}
if (!this.recurrenceRules.isEmpty()) {
j.add("recurrenceRules", this.recurrenceRules.stream() //
@@ -236,21 +305,25 @@ public JsonObject toJson(Function payloadConverter) {
.collect(toJsonArray()));
}
if (this.payload != null) {
- j.add("payload", payloadConverter.apply(this.payload));
+ j.add(PROPERTY_PAYLOAD, payloadConverter.apply(this.payload));
}
return j.build();
}
/**
- * Gets the next occurence of the {@link Task} at or after a date.
+ * Gets the next occurence of the {@link Task} (including duration) at or after
+ * a date.
*
* @param from the from timestamp
* @return a {@link ZonedDateTime}
*/
public ZonedDateTime getNextOccurence(ZonedDateTime from) {
+ var f = this.duration == null //
+ ? from //
+ : from.minus(this.duration); // query active tasks
var start = this.start.atZone(from.getZone());
return this.recurrenceRules.stream() //
- .map(rr -> rr.getNextOccurence(from.isBefore(start) ? start : from, start)) //
+ .map(rr -> rr.getNextOccurence(f.isBefore(start) ? start : f, start)) //
.min((o1, o2) -> o1.toInstant().compareTo(o2.toInstant())) //
.orElse(null);
}
@@ -283,18 +356,20 @@ public record RecurrenceRule(RecurrenceFrequency frequency, ImmutableSortedSet switch (JsonUtils.getAsOptionalString(j).orElseThrow()) {
- case "mo" -> MONDAY;
- case "tu" -> TUESDAY;
- case "we" -> WEDNESDAY;
- case "th" -> THURSDAY;
- case "fr" -> FRIDAY;
- case "sa" -> SATURDAY;
- case "su" -> SUNDAY;
- default -> throw new NoSuchElementException("");
- }) //
- .collect(toImmutableSortedSet(Ordering.natural()));
+ var byDay = getAsOptionalJsonArray(json, "byDay") //
+ .map(arr -> stream(arr) //
+ .map(j -> switch (getAsOptionalString(j).orElseThrow()) {
+ case "mo" -> MONDAY;
+ case "tu" -> TUESDAY;
+ case "we" -> WEDNESDAY;
+ case "th" -> THURSDAY;
+ case "fr" -> FRIDAY;
+ case "sa" -> SATURDAY;
+ case "su" -> SUNDAY;
+ default -> throw new NoSuchElementException("");
+ }) //
+ .collect(toImmutableSortedSet(Ordering.natural()))) //
+ .orElse(ImmutableSortedSet.of());
return new RecurrenceRule(frequency, byDay);
}
@@ -343,21 +418,36 @@ public static Builder create() {
* @return a {@link ZonedDateTime}
*/
public ZonedDateTime getNextOccurence(ZonedDateTime from, ZonedDateTime start) {
- if (this.frequency == WEEKLY) {
+ final var startTime = start.toLocalTime();
+
+ return switch (this.frequency) {
+ case DAILY -> {
+ var resultDay = from.truncatedTo(ChronoUnit.DAYS);
+ if (from.toLocalTime().isAfter(startTime)) {
+ resultDay = from.plusDays(1);
+ }
+ yield resultDay.with(NANO_OF_DAY, startTime.toNanoOfDay());
+ }
+ case WEEKLY -> {
if (!this.byDay.isEmpty()) {
- var startTime = start.toLocalTime();
var nextByDay = this.byDay.ceiling(from.toLocalTime().isAfter(startTime) //
? from.getDayOfWeek().plus(1) // next day
: from.getDayOfWeek()); // same day
if (nextByDay == null) {
nextByDay = this.byDay.first();
}
- return from //
+ yield from //
.with(nextOrSame(nextByDay)) //
.with(NANO_OF_DAY, startTime.toNanoOfDay());
}
+ // TODO: If frequency is weekly and there is no byDay property, add a byDay
+ // property with the sole value being the day of the week of the initial
+ // date-time.
+ yield null; // not implemented
}
- return null;
+ case MONTHLY -> null; // not implemented
+ case YEARLY -> null; // not implemented
+ };
}
/**
diff --git a/io.openems.common/src/io/openems/common/jscalendar/package-info.java b/io.openems.common/src/io/openems/common/jscalendar/package-info.java
new file mode 100644
index 00000000000..0d681ebdb59
--- /dev/null
+++ b/io.openems.common/src/io/openems/common/jscalendar/package-info.java
@@ -0,0 +1,11 @@
+/**
+ * Implementation of RFC 8984 "JSCalendar: A JSON Representation of Calendar
+ * Data".
+ *
+ *
+ * See https://www.rfc-editor.org/rfc/rfc8984.html
+ */
+@org.osgi.annotation.versioning.Version("1.0.0")
+@org.osgi.annotation.bundle.Export
+package io.openems.common.jscalendar;
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/base/AbstractJsonrpcRequest.java b/io.openems.common/src/io/openems/common/jsonrpc/base/AbstractJsonrpcRequest.java
index 1a7e81baa04..6a1975fd9e4 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/base/AbstractJsonrpcRequest.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/base/AbstractJsonrpcRequest.java
@@ -11,7 +11,7 @@
* @see JSON-RPC
* specification
*/
-public abstract class AbstractJsonrpcRequest extends JsonrpcMessage {
+public abstract sealed class AbstractJsonrpcRequest extends JsonrpcMessage permits JsonrpcRequest, JsonrpcNotification {
private final String method;
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcMessage.java b/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcMessage.java
index 2b4ad440394..2267ec1ccc1 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcMessage.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcMessage.java
@@ -20,7 +20,7 @@
* @see JSON-RPC
* specification
*/
-public abstract class JsonrpcMessage {
+public abstract sealed class JsonrpcMessage permits AbstractJsonrpcRequest, JsonrpcResponse {
public static final String JSONRPC_VERSION = "2.0";
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcNotification.java b/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcNotification.java
index 85256cbaf39..5600650a8f4 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcNotification.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcNotification.java
@@ -14,7 +14,7 @@
* @see JSON-RPC
* specification
*/
-public abstract class JsonrpcNotification extends AbstractJsonrpcRequest {
+public abstract non-sealed class JsonrpcNotification extends AbstractJsonrpcRequest {
public JsonrpcNotification(String method) {
super(method);
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcRequest.java b/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcRequest.java
index 5f48be201e6..3d0c5940381 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcRequest.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcRequest.java
@@ -23,7 +23,7 @@
* @see JSON-RPC
* specification
*/
-public abstract class JsonrpcRequest extends AbstractJsonrpcRequest {
+public abstract non-sealed class JsonrpcRequest extends AbstractJsonrpcRequest {
public static final int DEFAULT_TIMEOUT_SECONDS = 60;
public static final int NO_TIMEOUT = -1;
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcResponse.java b/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcResponse.java
index 87bf060e807..acddc648aa7 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcResponse.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcResponse.java
@@ -23,7 +23,7 @@
* @see JSON-RPC
* specification
*/
-public abstract class JsonrpcResponse extends JsonrpcMessage {
+public abstract non-sealed class JsonrpcResponse extends JsonrpcMessage {
/**
* Parses a JSON String to a {@link JsonrpcResponse}.
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcResponseSuccess.java b/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcResponseSuccess.java
index ba731e061cc..f4167e7c44e 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcResponseSuccess.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/base/JsonrpcResponseSuccess.java
@@ -32,11 +32,10 @@ public abstract class JsonrpcResponseSuccess extends JsonrpcResponse {
* @throws OpenemsNamedException if it was not a Success Response
*/
public static JsonrpcResponseSuccess from(JsonObject j) throws OpenemsNamedException {
- var response = JsonrpcResponse.from(j);
- if (!(response instanceof JsonrpcResponseSuccess)) {
- throw OpenemsError.GENERIC.exception("Expected a JSON-RPC Success Response");
- }
- return (JsonrpcResponseSuccess) response;
+ return switch (JsonrpcResponse.from(j)) {
+ case JsonrpcResponseSuccess r -> r;
+ default -> throw OpenemsError.GENERIC.exception("Expected a JSON-RPC Success Response");
+ };
}
public JsonrpcResponseSuccess(UUID id) {
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/notification/AbstractDataNotification.java b/io.openems.common/src/io/openems/common/jsonrpc/notification/AbstractDataNotification.java
index 506ed5037e6..4047811809c 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/notification/AbstractDataNotification.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/notification/AbstractDataNotification.java
@@ -26,8 +26,8 @@
* }
*
*/
-// TODO change to sealed class
-public abstract class AbstractDataNotification extends JsonrpcNotification {
+public abstract sealed class AbstractDataNotification extends JsonrpcNotification
+ permits TimestampedDataNotification, AggregatedDataNotification, ResendDataNotification {
private final TreeBasedTable data;
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/notification/AggregatedDataNotification.java b/io.openems.common/src/io/openems/common/jsonrpc/notification/AggregatedDataNotification.java
index a31f44d65b5..366d8a03c81 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/notification/AggregatedDataNotification.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/notification/AggregatedDataNotification.java
@@ -22,7 +22,7 @@
* }
*
*/
-public class AggregatedDataNotification extends AbstractDataNotification {
+public final class AggregatedDataNotification extends AbstractDataNotification {
public static final String METHOD = "aggregatedData";
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/notification/ResendDataNotification.java b/io.openems.common/src/io/openems/common/jsonrpc/notification/ResendDataNotification.java
index 43c9dc0b851..67236d6e650 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/notification/ResendDataNotification.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/notification/ResendDataNotification.java
@@ -21,7 +21,7 @@
* }
*
*/
-public class ResendDataNotification extends AbstractDataNotification {
+public final class ResendDataNotification extends AbstractDataNotification {
public static final String METHOD = "resendData";
diff --git a/io.openems.common/src/io/openems/common/jsonrpc/notification/TimestampedDataNotification.java b/io.openems.common/src/io/openems/common/jsonrpc/notification/TimestampedDataNotification.java
index be703c6cf15..af097e773a9 100644
--- a/io.openems.common/src/io/openems/common/jsonrpc/notification/TimestampedDataNotification.java
+++ b/io.openems.common/src/io/openems/common/jsonrpc/notification/TimestampedDataNotification.java
@@ -22,7 +22,7 @@
* }
*
*/
-public class TimestampedDataNotification extends AbstractDataNotification {
+public final class TimestampedDataNotification extends AbstractDataNotification {
public static final String METHOD = "timestampedData";
diff --git a/io.openems.common/src/io/openems/common/oem/DummyOpenemsEdgeOem.java b/io.openems.common/src/io/openems/common/oem/DummyOpenemsEdgeOem.java
index f5327adf50d..93c6e17ef6e 100644
--- a/io.openems.common/src/io/openems/common/oem/DummyOpenemsEdgeOem.java
+++ b/io.openems.common/src/io/openems/common/oem/DummyOpenemsEdgeOem.java
@@ -78,6 +78,8 @@ public SystemUpdateParams getSystemUpdateParams() {
.put("App.TimeOfUseTariff.Tibber", "") //
.put("App.Api.ModbusTcp.ReadOnly", "") //
.put("App.Api.ModbusTcp.ReadWrite", "") //
+ .put("App.Api.ModbusRtu.ReadOnly", "") //
+ .put("App.Api.ModbusRtu.ReadWrite", "") //
.put("App.Api.RestJson.ReadOnly", "") //
.put("App.Api.RestJson.ReadWrite", "") //
.put("App.Timedata.InfluxDb", "")//
diff --git a/io.openems.common/src/io/openems/common/oem/OpenemsEdgeOem.java b/io.openems.common/src/io/openems/common/oem/OpenemsEdgeOem.java
index ef291a2c75c..a4a0c63c948 100644
--- a/io.openems.common/src/io/openems/common/oem/OpenemsEdgeOem.java
+++ b/io.openems.common/src/io/openems/common/oem/OpenemsEdgeOem.java
@@ -141,7 +141,7 @@ public record OAuthClientRegistration(String clientId, String clientSecret) {
public default OAuthClientRegistration getRabotChargeCredentials() {
return null;
}
-
+
/**
* Gets the OEM authorization for Battery.BMW.
*
diff --git a/io.openems.common/src/io/openems/common/session/Role.java b/io.openems.common/src/io/openems/common/session/Role.java
index 6c60d6e8a12..9c561fc03e8 100644
--- a/io.openems.common/src/io/openems/common/session/Role.java
+++ b/io.openems.common/src/io/openems/common/session/Role.java
@@ -45,17 +45,13 @@ public int getLevel() {
* @return the Role
*/
public static Role getRole(String name) {
- switch (name.toLowerCase()) {
- case "admin":
- return ADMIN;
- case "installer":
- return INSTALLER;
- case "owner":
- return OWNER;
- case "guest":
- default:
- return GUEST;
- }
+ return switch (name.toLowerCase()) {
+ case "admin" -> ADMIN;
+ case "installer" -> INSTALLER;
+ case "owner" -> OWNER;
+ case "guest" -> GUEST;
+ default -> GUEST;
+ };
}
/**
diff --git a/io.openems.common/src/io/openems/common/test/TestUtils.java b/io.openems.common/src/io/openems/common/test/TestUtils.java
new file mode 100644
index 00000000000..36ccf762ed7
--- /dev/null
+++ b/io.openems.common/src/io/openems/common/test/TestUtils.java
@@ -0,0 +1,35 @@
+package io.openems.common.test;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.time.Instant;
+
+public class TestUtils {
+
+ private TestUtils() {
+ }
+
+ /**
+ * Creates a {@link TimeLeapClock} for 1st January 2000 00:00.
+ *
+ * @return the {@link TimeLeapClock}
+ */
+ public static TimeLeapClock createDummyClock() {
+ return new TimeLeapClock(Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */);
+ }
+
+ /**
+ * Finds and returns an open port.
+ *
+ *
+ * Source https://stackoverflow.com/a/26644672
+ *
+ * @return an open port
+ * @throws IOException on error
+ */
+ public static int findRandomOpenPortOnAllLocalInterfaces() throws IOException {
+ try (var socket = new ServerSocket(0);) {
+ return socket.getLocalPort();
+ }
+ }
+}
diff --git a/io.openems.common/src/io/openems/common/timedata/Resolution.java b/io.openems.common/src/io/openems/common/timedata/Resolution.java
index 8afcc764ba1..69dee3b500a 100644
--- a/io.openems.common/src/io/openems/common/timedata/Resolution.java
+++ b/io.openems.common/src/io/openems/common/timedata/Resolution.java
@@ -38,15 +38,12 @@ public ChronoUnit getUnit() {
* @return Date without offset
*/
public ZonedDateTime revertInfluxDbOffset(ZonedDateTime date) {
- switch (this.unit) {
- case DAYS:
- case MONTHS:
- return date.minus(this.value, this.unit);
- case MINUTES:
- case HOURS:
- default:
- return date;
- }
+ return switch (this.unit) {
+ case DAYS, MONTHS //
+ -> date.minus(this.value, this.unit);
+ default // MINUTES, HOURS, etc.
+ -> date;
+ };
}
/**
diff --git a/io.openems.common/src/io/openems/common/timedata/XlsxExportDetailData.java b/io.openems.common/src/io/openems/common/timedata/XlsxExportDetailData.java
index 199bc345846..94e40fafe63 100644
--- a/io.openems.common/src/io/openems/common/timedata/XlsxExportDetailData.java
+++ b/io.openems.common/src/io/openems/common/timedata/XlsxExportDetailData.java
@@ -11,8 +11,7 @@
public record XlsxExportDetailData(//
EnumMap> data, //
- CurrencyConfig currency
-) {
+ CurrencyConfig currency) {
public Map> getChannelsBySaveType() {
return this.data().values().stream().flatMap(List::stream).collect(Collectors.groupingBy(
diff --git a/io.openems.common/src/io/openems/common/timedata/XlsxWorksheetWrapper.java b/io.openems.common/src/io/openems/common/timedata/XlsxWorksheetWrapper.java
index faec99a684a..a39b7742d6c 100644
--- a/io.openems.common/src/io/openems/common/timedata/XlsxWorksheetWrapper.java
+++ b/io.openems.common/src/io/openems/common/timedata/XlsxWorksheetWrapper.java
@@ -38,7 +38,7 @@ public void setForRange(int r1, int c1, int r2, int c2, Consumer OpenemsType.LONG;
+ case AttributeDefinition.INTEGER -> OpenemsType.INTEGER;
+ case AttributeDefinition.SHORT, AttributeDefinition.BYTE -> OpenemsType.SHORT;
+ case AttributeDefinition.DOUBLE -> OpenemsType.DOUBLE;
+ case AttributeDefinition.FLOAT -> OpenemsType.FLOAT;
+ case AttributeDefinition.BOOLEAN -> OpenemsType.BOOLEAN;
+ case AttributeDefinition.STRING, AttributeDefinition.CHARACTER, AttributeDefinition.PASSWORD ->
+ OpenemsType.STRING;
+ default -> {
EdgeConfig.LOG.warn("AttributeDefinition type [" + ad.getType() + "] is unknown!");
- type = OpenemsType.STRING;
+ yield OpenemsType.STRING;
}
-
+ };
var defaultValues = ad.getDefaultValue();
JsonElement defaultValue;
if (defaultValues == null) {
@@ -769,15 +752,13 @@ public static Property from(AttributeDefinition ad) {
var id = ad.getID();
var name = ad.getName();
- final boolean isRequired;
- switch (id) {
- case "alias":
- // Set alias as not-required. If no alias is given it falls back to id.
- isRequired = false;
- break;
- default:
- isRequired = ad.getCardinality() == 0;
- }
+ var isRequired = switch (id) {
+ case "alias" -> //
+ // Set alias as not-required. If no alias is given it falls back to id
+ false;
+ default //
+ -> ad.getCardinality() == 0;
+ };
return new Property(id, name, description, type, isRequired, isPassword, defaultValue, schema);
}
diff --git a/io.openems.common/src/io/openems/common/types/EdgeConfigDiff.java b/io.openems.common/src/io/openems/common/types/EdgeConfigDiff.java
index a4b8615b629..6ce49572427 100644
--- a/io.openems.common/src/io/openems/common/types/EdgeConfigDiff.java
+++ b/io.openems.common/src/io/openems/common/types/EdgeConfigDiff.java
@@ -1,5 +1,7 @@
package io.openems.common.types;
+import static io.openems.common.utils.StringUtils.toShortString;
+
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -18,7 +20,6 @@
import io.openems.common.types.EdgeConfig.Component;
import io.openems.common.types.EdgeConfigDiff.ComponentDiff.Change;
import io.openems.common.types.EdgeConfigDiff.ComponentDiff.OldNewProperty;
-import io.openems.common.utils.StringUtils;
public class EdgeConfigDiff {
@@ -325,30 +326,27 @@ public String getAsText() {
final var component = componentEntry.getValue();
var change = component.properties.entrySet().stream() //
.filter(e -> {
- switch (e.getKey()) {
- case "_lastChangeAt":
- case "_lastChangeBy":
- case "org.ops4j.pax.logging.appender.name":
- // ignore
- return false;
- default:
- return true;
- }
+ return switch (e.getKey()) {
+ case //
+ "_lastChangeAt", //
+ "_lastChangeBy", //
+ "org.ops4j.pax.logging.appender.name" //
+ -> false; // ignore
+ default //
+ -> true;
+ };
}) //
.map(e -> {
- String oldValue = StringUtils.toShortString(e.getValue().getOld(), 20);
- String newValue = StringUtils.toShortString(e.getValue().getNew(), 20);
-
- switch (component.change) {
- case CREATED:
- return e.getKey() + "=" + newValue;
- case UPDATED:
- return e.getKey() + "=" + newValue + " [was:" + oldValue + "]";
- case DELETED:
- return e.getKey() + " [was:" + oldValue + "]";
- }
- assert true;
- return ""; // can never happen
+ var oldValue = toShortString(e.getValue().getOld(), 20);
+ var newValue = toShortString(e.getValue().getNew(), 20);
+ return switch (component.change) {
+ case CREATED //
+ -> e.getKey() + "=" + newValue;
+ case UPDATED //
+ -> e.getKey() + "=" + newValue + " [was:" + oldValue + "]";
+ case DELETED //
+ -> e.getKey() + " [was:" + oldValue + "]";
+ };
}) //
.collect(Collectors.joining(", "));
if (change.isEmpty()) {
diff --git a/io.openems.common/src/io/openems/common/utils/JsonUtils.java b/io.openems.common/src/io/openems/common/utils/JsonUtils.java
index 1ead2112db3..68329dbc164 100644
--- a/io.openems.common/src/io/openems/common/utils/JsonUtils.java
+++ b/io.openems.common/src/io/openems/common/utils/JsonUtils.java
@@ -23,7 +23,6 @@
import com.google.common.base.Function;
import com.google.common.base.Supplier;
-import com.google.common.collect.Sets;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
@@ -445,7 +444,7 @@ public static class JsonArrayCollector implements Collector characteristics() {
- return Sets.newHashSet().stream().collect(Sets.toImmutableEnumSet());
+ return Set.of();
}
@Override
@@ -461,7 +460,7 @@ public BiConsumer accumulator() {
@Override
public BinaryOperator combiner() {
return (t, u) -> {
- u.build().forEach(j -> t.add(j));
+ u.build().forEach(t::add);
return t;
};
}
@@ -604,7 +603,6 @@ public static JsonPrimitive getAsPrimitive(JsonElement jElement, String memberNa
* @param jElement the {@link JsonElement}
* @param memberName the name of the member
* @return the {@link Optional} {@link JsonPrimitive} value
- * @throws OpenemsNamedException on error
*/
public static Optional getAsOptionalPrimitive(JsonElement jElement, String memberName) {
return Optional.ofNullable(toPrimitive(toSubElement(jElement, memberName)));
@@ -634,7 +632,6 @@ public static JsonElement getSubElement(JsonElement jElement, String memberName)
* @param jElement the {@link JsonElement}
* @param memberName the name of the member
* @return the {@link Optional} {@link JsonElement} value
- * @throws OpenemsNamedException on error
*/
public static Optional getOptionalSubElement(JsonElement jElement, String memberName) {
return Optional.ofNullable(toSubElement(jElement, memberName));
@@ -677,7 +674,6 @@ public static JsonObject getAsJsonObject(JsonElement jElement, String memberName
*
* @param jElement the {@link JsonElement}
* @return the {@link Optional} {@link JsonObject} value
- * @throws OpenemsNamedException on error
*/
public static Optional getAsOptionalJsonObject(JsonElement jElement) {
return Optional.ofNullable(toJsonObject(jElement));
@@ -690,7 +686,6 @@ public static Optional getAsOptionalJsonObject(JsonElement jElement)
* @param jElement the {@link JsonElement}
* @param memberName the name of the member
* @return the {@link Optional} {@link JsonObject} value
- * @throws OpenemsNamedException on error
*/
public static Optional getAsOptionalJsonObject(JsonElement jElement, String memberName) {
return Optional.ofNullable(toJsonObject(toSubElement(jElement, memberName)));
@@ -733,7 +728,6 @@ public static JsonArray getAsJsonArray(JsonElement jElement, String memberName)
*
* @param jElement the {@link JsonElement}
* @return the {@link Optional} {@link JsonArray} value
- * @throws OpenemsNamedException on error
*/
public static Optional getAsOptionalJsonArray(JsonElement jElement) {
return Optional.ofNullable(toJsonArray(jElement));
@@ -746,7 +740,6 @@ public static Optional getAsOptionalJsonArray(JsonElement jElement) {
* @param jElement the {@link JsonElement}
* @param memberName the name of the member
* @return the {@link Optional} {@link JsonArray} value
- * @throws OpenemsNamedException on error
*/
public static Optional getAsOptionalJsonArray(JsonElement jElement, String memberName) {
return Optional.ofNullable(toJsonArray(toSubElement(jElement, memberName)));
@@ -789,7 +782,6 @@ public static String getAsString(JsonElement jElement, String memberName) throws
*
* @param jElement the {@link JsonElement}
* @return the {@link Optional} {@link String} value
- * @throws OpenemsNamedException on error
*/
public static Optional getAsOptionalString(JsonElement jElement) {
return Optional.ofNullable(toString(toPrimitive(jElement)));
@@ -802,7 +794,6 @@ public static Optional getAsOptionalString(JsonElement jElement) {
* @param jElement the {@link JsonElement}
* @param memberName the name of the member
* @return the {@link Optional} {@link String} value
- * @throws OpenemsNamedException on error
*/
public static Optional getAsOptionalString(JsonElement jElement, String memberName) {
return Optional.ofNullable(toString(toPrimitive(toSubElement(jElement, memberName))));
@@ -851,7 +842,7 @@ public static String[] getAsStringArray(JsonArray json) throws OpenemsNamedExcep
public static boolean getAsBoolean(JsonElement jElement) throws OpenemsNamedException {
var value = toBoolean(toPrimitive(jElement));
if (value != null) {
- return value.booleanValue();
+ return value;
}
throw OpenemsError.JSON_NO_BOOLEAN.exception(jElement.toString().replace("%", "%%"));
}
@@ -867,7 +858,7 @@ public static boolean getAsBoolean(JsonElement jElement) throws OpenemsNamedExce
public static boolean getAsBoolean(JsonElement jElement, String memberName) throws OpenemsNamedException {
var value = toBoolean(toPrimitive(toSubElement(jElement, memberName)));
if (value != null) {
- return value.booleanValue();
+ return value;
}
throw OpenemsError.JSON_NO_BOOLEAN_MEMBER.exception(memberName, jElement.toString().replace("%", "%%"));
}
@@ -877,7 +868,6 @@ public static boolean getAsBoolean(JsonElement jElement, String memberName) thro
*
* @param jElement the {@link JsonElement}
* @return the {@link Optional} {@link Boolean} value
- * @throws OpenemsNamedException on error
*/
public static Optional getAsOptionalBoolean(JsonElement jElement) {
return Optional.ofNullable(toBoolean(toPrimitive(jElement)));
@@ -890,7 +880,6 @@ public static Optional getAsOptionalBoolean(JsonElement jElement) {
* @param jElement the {@link JsonElement}
* @param memberName the name of the member
* @return the {@link Optional} {@link Boolean} value
- * @throws OpenemsNamedException on error
*/
public static Optional getAsOptionalBoolean(JsonElement jElement, String memberName) {
return Optional.ofNullable(toBoolean(toPrimitive(toSubElement(jElement, memberName))));
@@ -906,7 +895,7 @@ public static Optional getAsOptionalBoolean(JsonElement jElement, Strin
public static short getAsShort(JsonElement jElement) throws OpenemsNamedException {
var value = toShort(toPrimitive(jElement));
if (value != null) {
- return value.shortValue();
+ return value;
}
throw OpenemsError.JSON_NO_SHORT.exception(jElement.toString().replace("%", "%%"));
}
@@ -932,7 +921,6 @@ public static short getAsShort(JsonElement jElement, String memberName) throws O
*
* @param jElement the {@link JsonElement}
* @return the {@link Optional} {@link Short} value
- * @throws OpenemsNamedException on error
*/
public static Optional getAsOptionalShort(JsonElement jElement) {
return Optional.ofNullable(toShort(toPrimitive(jElement)));
@@ -945,7 +933,6 @@ public static Optional getAsOptionalShort(JsonElement jElement) {
* @param jElement the {@link JsonElement}
* @param memberName the name of the member
* @return the {@link Optional} {@link Boolean} value
- * @throws OpenemsNamedException on error
*/
public static Optional getAsOptionalShort(JsonElement jElement, String memberName) {
return Optional.ofNullable(toShort(toPrimitive(toSubElement(jElement, memberName))));
@@ -961,7 +948,7 @@ public static Optional getAsOptionalShort(JsonElement jElement, String me
public static int getAsInt(JsonElement jElement) throws OpenemsNamedException {
var value = toInt(toPrimitive(jElement));
if (value != null) {
- return value.intValue();
+ return value;
}
throw OpenemsError.JSON_NO_INTEGER.exception(jElement.toString().replace("%", "%%"));
}
@@ -1002,7 +989,6 @@ public static int getAsInt(JsonArray jArray, int index) throws OpenemsNamedExcep
*
* @param jElement the {@link JsonElement}
* @return the {@link Optional} {@link Integer} value
- * @throws OpenemsNamedException on error
*/
public static Optional getAsOptionalInt(JsonElement jElement) {
return Optional.ofNullable(toInt(toPrimitive(jElement)));
@@ -1015,7 +1001,6 @@ public static Optional getAsOptionalInt(JsonElement jElement) {
* @param jElement the {@link JsonElement}
* @param memberName the name of the member
* @return the {@link Optional} {@link Integer} value
- * @throws OpenemsNamedException on error
*/
public static Optional getAsOptionalInt(JsonElement jElement, String memberName) {
return Optional.ofNullable(toInt(toPrimitive(toSubElement(jElement, memberName))));
@@ -1031,7 +1016,7 @@ public static Optional getAsOptionalInt(JsonElement jElement, String me
public static long getAsLong(JsonElement jElement) throws OpenemsNamedException {
var value = toLong(toPrimitive(jElement));
if (value != null) {
- return value.longValue();
+ return value;
}
throw OpenemsError.JSON_NO_LONG.exception(jElement.toString().replace("%", "%%"));
}
@@ -1057,7 +1042,6 @@ public static long getAsLong(JsonElement jElement, String memberName) throws Ope
*
* @param jElement the {@link JsonElement}
* @return the {@link Optional} {@link Long} value
- * @throws OpenemsNamedException on error
*/
public static Optional getAsOptionalLong(JsonElement jElement) {
return Optional.ofNullable(toLong(toPrimitive(jElement)));
@@ -1069,7 +1053,6 @@ public static Optional getAsOptionalLong(JsonElement jElement) {
* @param jElement the {@link JsonElement}
* @param memberName the name of the member
* @return the {@link Optional} {@link Long} value
- * @throws OpenemsNamedException on error
*/
public static Optional getAsOptionalLong(JsonElement jElement, String memberName) {
return Optional.ofNullable(toLong(toPrimitive(toSubElement(jElement, memberName))));
@@ -1085,7 +1068,7 @@ public static Optional getAsOptionalLong(JsonElement jElement, String memb
public static float getAsFloat(JsonElement jElement) throws OpenemsNamedException {
var value = toFloat(toPrimitive(jElement));
if (value != null) {
- return value.floatValue();
+ return value;
}
throw OpenemsError.JSON_NO_FLOAT.exception(jElement.toString().replace("%", "%%"));
}
@@ -1111,7 +1094,6 @@ public static float getAsFloat(JsonElement jElement, String memberName) throws O
*
* @param jElement the {@link JsonElement}
* @return the {@link Optional} {@link Float} value
- * @throws OpenemsNamedException on error
*/
public static Optional getAsOptionalFloat(JsonElement jElement) {
return Optional.ofNullable(toFloat(toPrimitive(jElement)));
@@ -1123,7 +1105,6 @@ public static Optional getAsOptionalFloat(JsonElement jElement) {
* @param jElement the {@link JsonElement}
* @param memberName the name of the member
* @return the {@link Optional} {@link Float} value
- * @throws OpenemsNamedException on error
*/
public static Optional getAsOptionalFloat(JsonElement jElement, String memberName) {
return Optional.ofNullable(toFloat(toPrimitive(toSubElement(jElement, memberName))));
@@ -1139,7 +1120,7 @@ public static Optional getAsOptionalFloat(JsonElement jElement, String me
public static double getAsDouble(JsonElement jElement) throws OpenemsNamedException {
var value = toDouble(toPrimitive(jElement));
if (value != null) {
- return value.doubleValue();
+ return value;
}
throw OpenemsError.JSON_NO_DOUBLE.exception(jElement.toString().replace("%", "%%"));
}
@@ -1165,7 +1146,6 @@ public static double getAsDouble(JsonElement jElement, String memberName) throws
*
* @param jElement the {@link JsonElement}
* @return the {@link Optional} {@link Double} value
- * @throws OpenemsNamedException on error
*/
public static Optional getAsOptionalDouble(JsonElement jElement) {
return Optional.ofNullable(toDouble(toPrimitive(jElement)));
@@ -1178,7 +1158,6 @@ public static Optional getAsOptionalDouble(JsonElement jElement) {
* @param jElement the {@link JsonElement}
* @param memberName the name of the member
* @return the {@link Optional} {@link Double} value
- * @throws OpenemsNamedException on error
*/
public static Optional getAsOptionalDouble(JsonElement jElement, String memberName) {
return Optional.ofNullable(toDouble(toPrimitive(toSubElement(jElement, memberName))));
@@ -1228,7 +1207,6 @@ public static > E getAsEnum(Class enumType, JsonElement jEl
* @param enumType the class of the {@link Enum}
* @param jElement the {@link JsonElement}
* @return the {@link Optional} {@link Enum} value
- * @throws OpenemsNamedException on error
*/
public static > Optional getAsOptionalEnum(Class enumType, JsonElement jElement) {
return Optional.ofNullable(toEnum(enumType, toString(toPrimitive(jElement))));
@@ -1242,7 +1220,6 @@ public static > Optional getAsOptionalEnum(Class enumTyp
* @param jElement the {@link JsonElement}
* @param memberName the name of the member
* @return the {@link Optional} {@link Enum} value
- * @throws OpenemsNamedException on error
*/
public static > Optional getAsOptionalEnum(Class enumType, JsonElement jElement,
String memberName) {
@@ -1285,7 +1262,6 @@ public static Inet4Address getAsInet4Address(JsonElement jElement, String member
*
* @param jElement the {@link JsonElement}
* @return the {@link Optional} {@link Inet4Address} value
- * @throws OpenemsNamedException on error
*/
public static Optional getAsOptionalInet4Address(JsonElement jElement) {
return Optional.ofNullable(InetAddressUtils.parseOrNull(toString(toPrimitive(jElement))));
@@ -1298,7 +1274,6 @@ public static Optional getAsOptionalInet4Address(JsonElement jElem
* @param jElement the {@link JsonElement}
* @param memberName the name of the member
* @return the {@link Optional} {@link Inet4Address} value
- * @throws OpenemsNamedException on error
*/
public static Optional getAsOptionalInet4Address(JsonElement jElement, String memberName) {
return Optional.ofNullable(//
@@ -1345,7 +1320,6 @@ public static UUID getAsUUID(JsonElement jElement, String memberName) throws Ope
*
* @param jElement the {@link JsonElement}
* @return the {@link Optional} {@link UUID} value
- * @throws OpenemsNamedException on error
*/
// CHECKSTYLE:OFF
public static Optional getAsOptionalUUID(JsonElement jElement) {
@@ -1359,7 +1333,6 @@ public static Optional getAsOptionalUUID(JsonElement jElement) {
* @param jElement the {@link JsonElement}
* @param memberName the name of the member
* @return the {@link Optional} {@link UUID} value
- * @throws OpenemsNamedException on error
*/
// CHECKSTYLE:OFF
public static Optional getAsOptionalUUID(JsonElement jElement, String memberName) {
@@ -1379,7 +1352,7 @@ public static Object getAsBestType(JsonElement j) throws OpenemsNamedException {
try {
if (j.isJsonArray()) {
var jA = (JsonArray) j;
- if (jA.size() == 0) {
+ if (jA.isEmpty()) {
return new Object[0];
}
// identify the array type (boolean, int or String)
@@ -1453,132 +1426,88 @@ public static Object getAsBestType(JsonElement j) throws OpenemsNamedException {
* @return the {@link JsonElement}
*/
public static JsonElement getAsJsonElement(Object value) {
- // null
- if (value == null) {
- return JsonNull.INSTANCE;
- }
// optional
- if (value instanceof Optional) {
- if (!((Optional) value).isPresent()) {
+ if (value instanceof Optional opt) {
+ if (opt.isEmpty()) {
return JsonNull.INSTANCE;
}
- value = ((Optional) value).get();
- }
- if (value instanceof Number) {
- /*
- * Number
- */
- return new JsonPrimitive((Number) value);
- }
- if (value instanceof String) {
- /*
- * String
- */
- return new JsonPrimitive((String) value);
- }
- if (value instanceof Boolean) {
- /*
- * Boolean
- */
- return new JsonPrimitive((Boolean) value);
- }
- if (value instanceof Inet4Address) {
- /*
- * Inet4Address
- */
- return new JsonPrimitive(((Inet4Address) value).getHostAddress());
- }
- if (value instanceof JsonElement) {
- /*
- * JsonElement
- */
- return (JsonElement) value;
- } else if (value instanceof boolean[]) {
- /*
- * boolean-Array
- */
+ value = opt.get();
+ }
+
+ return switch (value) {
+ case null -> JsonNull.INSTANCE;
+ case Number n -> new JsonPrimitive(n);
+ case String s -> new JsonPrimitive(s);
+ case Boolean b -> new JsonPrimitive(b);
+ case Inet4Address inet -> new JsonPrimitive(inet.getHostAddress());
+ case JsonElement json -> json;
+ case boolean[] bool -> {
var js = new JsonArray();
- for (boolean b : (boolean[]) value) {
+ for (boolean b : bool) {
js.add(new JsonPrimitive(b));
}
- return js;
- } else if (value instanceof short[]) {
- /*
- * short-Array
- */
+ yield js;
+ }
+ case short[] shorts -> {
var js = new JsonArray();
- for (short s : (short[]) value) {
+ for (short s : shorts) {
js.add(new JsonPrimitive(s));
}
- return js;
- } else if (value instanceof int[]) {
- /*
- * int-Array
- */
+ yield js;
+ }
+ case int[] ints -> {
var js = new JsonArray();
- for (int i : (int[]) value) {
+ for (int i : ints) {
js.add(new JsonPrimitive(i));
}
- return js;
- } else if (value instanceof long[]) {
- /*
- * long-Array
- */
+ yield js;
+ }
+ case long[] longs -> {
var js = new JsonArray();
- for (long l : (long[]) value) {
+ for (long l : longs) {
js.add(new JsonPrimitive(l));
}
- return js;
- } else if (value instanceof float[]) {
- /*
- * float-Array
- */
+ yield js;
+ }
+ case float[] floats -> {
var js = new JsonArray();
- for (float f : (float[]) value) {
+ for (float f : floats) {
js.add(new JsonPrimitive(f));
}
- return js;
- } else if (value instanceof double[]) {
- /*
- * double-Array
- */
+ yield js;
+ }
+ case double[] doubles -> {
var js = new JsonArray();
- for (double d : (double[]) value) {
- js.add(new JsonPrimitive(d));
+ for (double f : doubles) {
+ js.add(new JsonPrimitive(f));
}
- return js;
- } else if (value instanceof String[]) {
- /*
- * String-Array
- */
+ yield js;
+ }
+ case String[] strings -> {
var js = new JsonArray();
- var v = (String[]) value;
- if (v.length == 1 && v[0].isEmpty()) {
+ if (strings.length == 1 && strings[0].isEmpty()) {
// special case: String-Array with one entry which is an empty String. Return an
// empty JsonArray.
- return js;
+ yield js;
}
- for (String s : v) {
+ for (String s : strings) {
js.add(new JsonPrimitive(s));
}
- return js;
- } else if (value instanceof Object[]) {
- /*
- * Object-Array
- */
+ yield js;
+ }
+ case Object[] objects -> {
var js = new JsonArray();
- for (Object o : (Object[]) value) {
+ for (Object o : objects) {
js.add(JsonUtils.getAsJsonElement(o));
}
- return js;
- } else {
- /*
- * Use toString()-method
- */
- JsonUtils.LOG.warn("Converter for [" + value + "]" + " of type [" + value.getClass().getSimpleName()
- + "] to JSON is not implemented.");
- return new JsonPrimitive(value.toString());
+ yield js;
}
+ default -> {
+ JsonUtils.LOG.warn("Converter for [{}] of type [{}] to JSON is not implemented.", //
+ value, value.getClass().getSimpleName());
+ yield new JsonPrimitive(value.toString());
+ }
+ };
}
/**
@@ -1631,11 +1560,11 @@ public static Object getAsType(Class type, JsonElement j) throws NotImplement
*/
return j.getAsJsonArray();
} else if (type.isArray()) {
- /**
+ /*
* Asking for Array
*/
if (Long.class.isAssignableFrom(type.getComponentType())) {
- /**
+ /*
* Asking for ArrayOfLong
*/
if (j.isJsonArray()) {
@@ -1671,22 +1600,15 @@ public static T getAsType(OpenemsType type, JsonElement j) throws OpenemsNam
}
if (j.isJsonPrimitive()) {
- switch (type) {
- case BOOLEAN:
- return (T) Boolean.valueOf(JsonUtils.getAsBoolean(j));
- case DOUBLE:
- return (T) Double.valueOf(JsonUtils.getAsDouble(j));
- case FLOAT:
- return (T) Float.valueOf(JsonUtils.getAsFloat(j));
- case INTEGER:
- return (T) Integer.valueOf(JsonUtils.getAsInt(j));
- case LONG:
- return (T) Long.valueOf(JsonUtils.getAsLong(j));
- case SHORT:
- return (T) Short.valueOf(JsonUtils.getAsShort(j));
- case STRING:
- return (T) JsonUtils.getAsString(j);
- }
+ return switch (type) {
+ case BOOLEAN -> (T) Boolean.valueOf(JsonUtils.getAsBoolean(j));
+ case DOUBLE -> (T) Double.valueOf(JsonUtils.getAsDouble(j));
+ case FLOAT -> (T) Float.valueOf(JsonUtils.getAsFloat(j));
+ case INTEGER -> (T) Integer.valueOf(JsonUtils.getAsInt(j));
+ case LONG -> (T) Long.valueOf(JsonUtils.getAsLong(j));
+ case SHORT -> (T) Short.valueOf(JsonUtils.getAsShort(j));
+ case STRING -> (T) JsonUtils.getAsString(j);
+ };
}
if (j.isJsonObject() || j.isJsonArray()) {
@@ -1715,7 +1637,7 @@ public static T getAsType(OpenemsType type, JsonElement j) throws OpenemsNam
* @return an Object of the given type
*/
public static Object getAsType(Optional> typeOptional, JsonElement j) throws NotImplementedException {
- if (!typeOptional.isPresent()) {
+ if (typeOptional.isEmpty()) {
throw new NotImplementedException(
"Type of Channel was not set: " + (j == null ? "UNDEFINED" : j.getAsString()));
}
@@ -1759,6 +1681,19 @@ public static LocalDateTime getAsLocalDateTime(JsonElement jElement, String memb
return DateUtils.parseLocalDateTimeOrError(toString(toPrimitive(toSubElement(jElement, memberName))));
}
+ /**
+ * Takes a JSON in the form '2020-01-01T00:00:00' and converts it to a
+ * {@link LocalDateTime}.
+ *
+ * @param jElement the {@link JsonElement}
+ * @param memberName the name of the member of the JsonObject
+ * @return the {@link ZonedDateTime}
+ */
+ public static Optional getAsOptionalLocalDateTime(JsonElement jElement, String memberName) {
+ return JsonUtils.getAsOptionalString(jElement, memberName)//
+ .map(DateUtils::parseLocalDateTimeOrNull);
+ }
+
/**
* Takes a JSON in the form '2020-01-01T00:00:00Z' and converts it to a
* {@link ZonedDateTime}.
@@ -1867,7 +1802,7 @@ public static String prettyToString(JsonElement j) {
public static boolean isEmptyJsonObject(JsonElement j) {
if (j != null && j.isJsonObject()) {
var object = j.getAsJsonObject();
- return object.size() == 0;
+ return object.isEmpty();
}
return false;
@@ -1882,7 +1817,7 @@ public static boolean isEmptyJsonObject(JsonElement j) {
public static boolean isEmptyJsonArray(JsonElement j) {
if (j != null && j.isJsonArray()) {
var array = j.getAsJsonArray();
- return array.size() == 0;
+ return array.isEmpty();
}
return false;
@@ -1907,7 +1842,7 @@ public static boolean isNumber(JsonElement j) {
*/
public static Stream stream(JsonArray jsonArray) {
return IntStream.range(0, jsonArray.size()) //
- .mapToObj(index -> jsonArray.get(index));
+ .mapToObj(jsonArray::get);
}
private static JsonObject toJsonObject(JsonElement jElement) {
diff --git a/io.openems.common/src/io/openems/common/utils/ObjectUtils.java b/io.openems.common/src/io/openems/common/utils/ObjectUtils.java
index 55b76a66366..4a751a514c3 100644
--- a/io.openems.common/src/io/openems/common/utils/ObjectUtils.java
+++ b/io.openems.common/src/io/openems/common/utils/ObjectUtils.java
@@ -12,11 +12,10 @@ public class ObjectUtils {
* @return a {@link String} or null
*/
public static String getAsString(Object object) {
- if (object instanceof String) {
- return (String) object;
- }
-
- return null;
+ return switch (object) {
+ case String s -> s;
+ case null, default -> null;
+ };
}
/**
@@ -37,11 +36,10 @@ public static Optional getAsOptionalString(Object object) {
* @return a {@link Integer} or null
*/
public static Integer getAsInteger(Object object) {
- if (object instanceof Integer) {
- return (Integer) object;
- }
-
- return null;
+ return switch (object) {
+ case Integer i -> i;
+ case null, default -> null;
+ };
}
/**
@@ -52,11 +50,9 @@ public static Integer getAsInteger(Object object) {
* @return a {@link Object} array or empty array
*/
public static Object[] getAsObjectArrray(Object object) {
- if (object instanceof Object[]) {
- return (Object[]) object;
- }
-
- return new Object[] {};
+ return switch (object) {
+ case Object[] os -> os;
+ case null, default -> null;
+ };
}
-
}
diff --git a/io.openems.common/src/io/openems/common/utils/StreamUtils.java b/io.openems.common/src/io/openems/common/utils/StreamUtils.java
new file mode 100644
index 00000000000..9a831452028
--- /dev/null
+++ b/io.openems.common/src/io/openems/common/utils/StreamUtils.java
@@ -0,0 +1,25 @@
+package io.openems.common.utils;
+
+import java.util.Collections;
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.stream.Stream;
+
+public class StreamUtils {
+
+ /**
+ * Converts a Dictionary to a Stream of Map entries.
+ *
+ * @param dictionary the Dictionary to be converted
+ * @param the type of keys in the Dictionary
+ * @param the type of values in the Dictionary
+ * @return a Stream containing all the key-value pairs from the Dictionary as
+ * Map entries
+ */
+ public static Stream> dictionaryToStream(Dictionary dictionary) {
+ Enumeration keys = dictionary.keys();
+ return Collections.list(keys).stream().map(key -> Map.entry(key, dictionary.get(key)));
+ }
+}
diff --git a/io.openems.common/src/io/openems/common/websocket/AbstractWebsocketServer.java b/io.openems.common/src/io/openems/common/websocket/AbstractWebsocketServer.java
index 64a90b1bda4..6b872b19fa6 100644
--- a/io.openems.common/src/io/openems/common/websocket/AbstractWebsocketServer.java
+++ b/io.openems.common/src/io/openems/common/websocket/AbstractWebsocketServer.java
@@ -162,10 +162,11 @@ public Map debugMetrics() {
@Override
protected OnInternalError getOnInternalError() {
return (t, wsDataString) -> {
- if (t instanceof BindException) {
- this.logError(this.log, "Unable to Bind to port [" + this.port + "]");
- } else {
- this.logError(this.log, new StringBuilder() //
+ switch (t) {
+ case BindException be //
+ -> this.logError(this.log, "Unable to Bind to port [" + this.port + "]");
+ default //
+ -> this.logError(this.log, new StringBuilder() //
.append("OnInternalError for ").append(wsDataString).append(". ") //
.append(t.getClass()).append(": ") //
.append(t.getMessage()).toString());
diff --git a/io.openems.common/src/io/openems/common/websocket/MyDraft6455.java b/io.openems.common/src/io/openems/common/websocket/MyDraft6455.java
index 4c4968114c6..9759e53cb25 100644
--- a/io.openems.common/src/io/openems/common/websocket/MyDraft6455.java
+++ b/io.openems.common/src/io/openems/common/websocket/MyDraft6455.java
@@ -698,16 +698,16 @@ private boolean isFrameSizeValid(int maxpacketsize, int realpacketsize) {
* @return byte that represents which RSV bit is set.
*/
private byte getRsvByte(int rsv) {
- switch (rsv) {
- case 1: // 0100 0000
- return 0x40;
- case 2: // 0010 0000
- return 0x20;
- case 3: // 0001 0000
- return 0x10;
- default:
- return 0;
- }
+ return switch (rsv) {
+ case 1 //
+ -> 0x40; // 0100 0000
+ case 2 //
+ -> 0x20; // 0010 0000
+ case 3 //
+ -> 0x10; // 0001 0000
+ default //
+ -> 0;
+ };
}
/**
@@ -864,41 +864,26 @@ private byte[] toByteArray(long val, int bytecount) {
}
private byte fromOpcode(Opcode opcode) {
- if (opcode == Opcode.CONTINUOUS) {
- return 0;
- } else if (opcode == Opcode.TEXT) {
- return 1;
- } else if (opcode == Opcode.BINARY) {
- return 2;
- } else if (opcode == Opcode.CLOSING) {
- return 8;
- } else if (opcode == Opcode.PING) {
- return 9;
- } else if (opcode == Opcode.PONG) {
- return 10;
- }
- throw new IllegalArgumentException("Don't know how to handle " + opcode.toString());
+ return switch (opcode) {
+ case Opcode.CONTINUOUS -> 0;
+ case Opcode.TEXT -> 1;
+ case Opcode.BINARY -> 2;
+ case Opcode.CLOSING -> 8;
+ case Opcode.PING -> 9;
+ case Opcode.PONG -> 10;
+ };
}
private Opcode toOpcode(byte opcode) throws InvalidFrameException {
- switch (opcode) {
- case 0:
- return Opcode.CONTINUOUS;
- case 1:
- return Opcode.TEXT;
- case 2:
- return Opcode.BINARY;
- // 3-7 are not yet defined
- case 8:
- return Opcode.CLOSING;
- case 9:
- return Opcode.PING;
- case 10:
- return Opcode.PONG;
- // 11-15 are not yet defined
- default:
- throw new InvalidFrameException("Unknown opcode " + (short) opcode);
- }
+ return switch (opcode) {
+ case 0 -> Opcode.CONTINUOUS;
+ case 1 -> Opcode.TEXT;
+ case 2 -> Opcode.BINARY;
+ case 8 -> Opcode.CLOSING;
+ case 9 -> Opcode.PING;
+ case 10 -> Opcode.PONG;
+ default -> throw new InvalidFrameException("Unknown opcode " + (short) opcode);
+ };
}
@Override
@@ -1059,8 +1044,7 @@ private void processFrameIsNotFin(Framedata frame) throws InvalidDataException {
private void processFrameClosing(WebSocketImpl webSocketImpl, Framedata frame) {
int code = CloseFrame.NOCODE;
String reason = "";
- if (frame instanceof CloseFrame) {
- CloseFrame cf = (CloseFrame) frame;
+ if (frame instanceof CloseFrame cf) {
code = cf.getCloseCode();
reason = cf.getMessage();
}
diff --git a/io.openems.common/src/io/openems/common/websocket/OnMessageHandler.java b/io.openems.common/src/io/openems/common/websocket/OnMessageHandler.java
index 9efe41ba425..400237e914a 100644
--- a/io.openems.common/src/io/openems/common/websocket/OnMessageHandler.java
+++ b/io.openems.common/src/io/openems/common/websocket/OnMessageHandler.java
@@ -56,16 +56,13 @@ public OnMessageHandler(//
@Override
public final void run() {
try {
- var message = JsonrpcMessage.from(this.message);
-
- if (message instanceof JsonrpcRequest request) {
- this.handleJsonrpcRequest(this.ws, request);
-
- } else if (message instanceof JsonrpcResponse response) {
- this.handleJsonrpcResponse(this.ws, response);
-
- } else if (message instanceof JsonrpcNotification notification) {
- this.handleJsonrpcNotification(this.ws, notification);
+ switch (JsonrpcMessage.from(this.message)) {
+ case JsonrpcRequest request //
+ -> this.handleJsonrpcRequest(this.ws, request);
+ case JsonrpcResponse response //
+ -> this.handleJsonrpcResponse(this.ws, response);
+ case JsonrpcNotification notification //
+ -> this.handleJsonrpcNotification(this.ws, notification);
}
} catch (OpenemsNamedException e) {
@@ -142,11 +139,12 @@ private void handleJsonrpcRequestException(WebSocket ws, JsonrpcRequest request,
this.logWarn.accept(this.log, log.toString());
// Get JSON-RPC Response Error
- if (t instanceof OpenemsNamedException one) {
- this.sendMessage.test(ws, new JsonrpcResponseError(request.getId(), one));
- } else {
- this.sendMessage.test(ws, new JsonrpcResponseError(request.getId(), t.getMessage()));
- }
+ this.sendMessage.test(ws, switch (t) {
+ case OpenemsNamedException one //
+ -> new JsonrpcResponseError(request.getId(), one);
+ default //
+ -> new JsonrpcResponseError(request.getId(), t.getMessage());
+ });
}
/**
diff --git a/io.openems.common/src/io/openems/common/websocket/WsData.java b/io.openems.common/src/io/openems/common/websocket/WsData.java
index 852b4290125..9c3c02809b3 100644
--- a/io.openems.common/src/io/openems/common/websocket/WsData.java
+++ b/io.openems.common/src/io/openems/common/websocket/WsData.java
@@ -119,21 +119,18 @@ public void handleJsonrpcResponse(JsonrpcResponse response) throws OpenemsNamedE
throw OpenemsError.JSONRPC_RESPONSE_WITHOUT_REQUEST.exception(response.toJsonObject());
}
// this was a response on a request
- if (response instanceof JsonrpcResponseSuccess) {
+ switch (response) {
+ case JsonrpcResponseSuccess success ->
// Success Response -> complete future
- future.complete((JsonrpcResponseSuccess) response);
-
- } else if (response instanceof JsonrpcResponseError) {
+ future.complete(success);
+ case JsonrpcResponseError error ->
// Named OpenEMS-Error Response -> cancel future
- var error = (JsonrpcResponseError) response;
- var exception = new OpenemsNamedException(error.getOpenemsError(), error.getParamsAsObjectArray());
- future.completeExceptionally(exception);
-
- } else {
+ future.completeExceptionally(
+ new OpenemsNamedException(error.getOpenemsError(), error.getParamsAsObjectArray()));
+ default ->
// Undefined Error Response -> cancel future
- var exception = new OpenemsNamedException(OpenemsError.GENERIC,
- "Response is neither JsonrpcResponseSuccess nor JsonrpcResponseError: " + response.toString());
- future.completeExceptionally(exception);
+ future.completeExceptionally(new OpenemsNamedException(OpenemsError.GENERIC,
+ "Response is neither JsonrpcResponseSuccess nor JsonrpcResponseError: " + response.toString()));
}
}
diff --git a/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/JSCalendarTest.java b/io.openems.common/test/io/openems/common/jscalendar/JSCalendarTest.java
similarity index 59%
rename from io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/JSCalendarTest.java
rename to io.openems.common/test/io/openems/common/jscalendar/JSCalendarTest.java
index defe0bf80cb..689368466fd 100644
--- a/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/JSCalendarTest.java
+++ b/io.openems.common/test/io/openems/common/jscalendar/JSCalendarTest.java
@@ -1,10 +1,11 @@
-package io.openems.edge.controller.evcs;
+package io.openems.common.jscalendar;
+import static io.openems.common.jscalendar.JSCalendar.RecurrenceFrequency.DAILY;
+import static io.openems.common.jscalendar.JSCalendar.RecurrenceFrequency.WEEKLY;
+import static io.openems.common.test.TestUtils.createDummyClock;
+import static io.openems.common.utils.JsonUtils.buildJsonArray;
import static io.openems.common.utils.JsonUtils.buildJsonObject;
import static io.openems.common.utils.JsonUtils.prettyToString;
-import static io.openems.common.utils.UuidUtils.getNilUuid;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
-import static io.openems.edge.controller.evcs.JSCalendar.RecurrenceFrequency.WEEKLY;
import static java.time.DayOfWeek.FRIDAY;
import static java.time.DayOfWeek.MONDAY;
import static java.time.DayOfWeek.SATURDAY;
@@ -27,11 +28,46 @@
public class JSCalendarTest {
// CHECKSTYLE:ON
+ @Test
+ public void testDaily() throws OpenemsNamedException {
+ var clock = createDummyClock();
+ var sut = JSCalendar.Task.create() //
+ .setStart("07:00:00") //
+ .addRecurrenceRule(b -> b //
+ .setFrequency(DAILY)) //
+ .build();
+
+ var next = sut.getNextOccurence(ZonedDateTime.now(clock));
+ assertEquals("2020-01-01T07:00Z", next.toString());
+ next = sut.getNextOccurence(next.plusSeconds(1));
+ assertEquals("2020-01-02T07:00Z", next.toString());
+ next = sut.getNextOccurence(next.plusSeconds(1));
+ assertEquals("2020-01-03T07:00Z", next.toString());
+ }
+
+ @Test
+ public void testDailyParse() throws OpenemsNamedException {
+ var sut = JSCalendar.Task.fromStringOrEmpty("""
+ [
+ {
+ "@type":"Task",
+ "start":"19:00:00",
+ "duration":"PT12H",
+ "recurrenceRules":[
+ {
+ "frequency":"daily"
+ }
+ ]
+ }
+ ]""", j -> j);
+ assertEquals(1, sut.size());
+ }
+
@Test
public void testWeekday() throws OpenemsNamedException {
var clock = createDummyClock();
- var sut = new JSCalendar.Task.Builder(getNilUuid(), ZonedDateTime.now(clock)) //
- .setStart("2024-06-17T07:00:00") //
+ var sut = JSCalendar.Task.create() //
+ .setStart("07:00:00") //
.addRecurrenceRule(b -> b //
.setFrequency(WEEKLY) //
.addByDay(MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY)) //
@@ -39,12 +75,11 @@ public void testWeekday() throws OpenemsNamedException {
.addProperty("sessionEnergy", 10000) //
.build()) //
.build();
+
assertEquals("""
{
"@type": "Task",
- "uid": "00000000-0000-0000-0000-000000000000",
- "updated": "2020-01-01T00:00:00Z",
- "start": "2024-06-17T07:00:00",
+ "start": "07:00:00",
"recurrenceRules": [
{
"frequency": "weekly",
@@ -57,35 +92,37 @@ public void testWeekday() throws OpenemsNamedException {
]
}
],
- "payload": {
+ "openems.io:payload": {
"sessionEnergy": 10000
}
}""", prettyToString(sut.toJson(identity())));
var next = sut.getNextOccurence(ZonedDateTime.now(clock));
- assertEquals("2024-06-17T07:00Z", next.toString());
+ assertEquals("2020-01-01T07:00Z", next.toString());
+ next = sut.getNextOccurence(next.plusSeconds(1));
+ assertEquals("2020-01-02T07:00Z", next.toString());
next = sut.getNextOccurence(next.plusSeconds(1));
- assertEquals("2024-06-18T07:00Z", next.toString());
+ assertEquals("2020-01-03T07:00Z", next.toString());
next = sut.getNextOccurence(next.plusSeconds(1));
- assertEquals("2024-06-19T07:00Z", next.toString());
+ assertEquals("2020-01-06T07:00Z", next.toString()); // next week
next = sut.getNextOccurence(next.plusSeconds(1));
- assertEquals("2024-06-20T07:00Z", next.toString());
+ assertEquals("2020-01-07T07:00Z", next.toString());
next = sut.getNextOccurence(next.plusSeconds(1));
- assertEquals("2024-06-21T07:00Z", next.toString());
- next = sut.getNextOccurence(next.plusSeconds(1)); // next week
- assertEquals("2024-06-24T07:00Z", next.toString());
+ assertEquals("2020-01-08T07:00Z", next.toString());
next = sut.getNextOccurence(next);
- assertEquals("2024-06-24T07:00Z", next.toString()); // same
+ assertEquals("2020-01-08T07:00Z", next.toString()); // same
// Parse JSON
- var fromJson = JSCalendar.Task.fromJson(sut.toJson(identity()), identity());
- assertEquals(sut.toJson(identity()), fromJson.toJson(identity()));
+ var fromJson = JSCalendar.Task.fromJson(buildJsonArray() //
+ .add(sut.toJson(identity())) //
+ .build(), j -> j);
+ assertEquals(sut.toJson(identity()), fromJson.get(0).toJson(identity()));
}
@Test
public void testWeekend() throws OpenemsNamedException {
var clock = createDummyClock();
- var sut = new JSCalendar.Task.Builder(getNilUuid(), ZonedDateTime.now(clock)) //
+ var sut = JSCalendar.Task.create() //
.setStart("2024-06-17T00:00:00") //
.addRecurrenceRule(b -> b //
.setFrequency(WEEKLY) //
@@ -97,8 +134,6 @@ public void testWeekend() throws OpenemsNamedException {
assertEquals("""
{
"@type": "Task",
- "uid": "00000000-0000-0000-0000-000000000000",
- "updated": "2020-01-01T00:00:00Z",
"start": "2024-06-17T00:00:00",
"recurrenceRules": [
{
@@ -109,7 +144,7 @@ public void testWeekend() throws OpenemsNamedException {
]
}
],
- "payload": {
+ "openems.io:payload": {
"sessionEnergy": 10001
}
}""", prettyToString(sut.toJson(identity())));
diff --git a/io.openems.common/test/io/openems/common/test/TimeLeapClockTest.java b/io.openems.common/test/io/openems/common/test/TimeLeapClockTest.java
index 3609efce3a5..6c7485a35ce 100644
--- a/io.openems.common/test/io/openems/common/test/TimeLeapClockTest.java
+++ b/io.openems.common/test/io/openems/common/test/TimeLeapClockTest.java
@@ -52,7 +52,7 @@ public void testMillis() {
@Test
public void testLeap() {
- var dateTime = ZonedDateTime.now();
+ var dateTime = ZonedDateTime.of(2023, 1, 2, 3, 4, 5, 6, ZoneId.of("UTC"));
final var instant = dateTime.toInstant();
final var zone = dateTime.getZone();
diff --git a/io.openems.common/test/io/openems/common/utils/JsonUtilsTest.java b/io.openems.common/test/io/openems/common/utils/JsonUtilsTest.java
index de06b6e2bd3..37f25ae848b 100644
--- a/io.openems.common/test/io/openems/common/utils/JsonUtilsTest.java
+++ b/io.openems.common/test/io/openems/common/utils/JsonUtilsTest.java
@@ -54,10 +54,12 @@
import static io.openems.common.utils.JsonUtils.getAsOptionalInt;
import static io.openems.common.utils.JsonUtils.getAsOptionalJsonArray;
import static io.openems.common.utils.JsonUtils.getAsOptionalJsonObject;
+import static io.openems.common.utils.JsonUtils.getAsOptionalLocalDateTime;
import static io.openems.common.utils.JsonUtils.getAsOptionalLong;
import static io.openems.common.utils.JsonUtils.getAsOptionalShort;
import static io.openems.common.utils.JsonUtils.getAsOptionalString;
import static io.openems.common.utils.JsonUtils.getAsOptionalUUID;
+import static io.openems.common.utils.JsonUtils.getAsOptionalZonedDateTime;
import static io.openems.common.utils.JsonUtils.getAsPrimitive;
import static io.openems.common.utils.JsonUtils.getAsShort;
import static io.openems.common.utils.JsonUtils.getAsString;
@@ -688,11 +690,17 @@ public void testGetAsZonedDateTime() throws OpenemsNamedException {
);
assertEquals("1900-01-01T00:00Z", getAsZonedDateTime(JSON_OBJECT, "ZonedDateTime").toString());
+
+ assertTrue(getAsOptionalZonedDateTime(JSON_OBJECT, "foo").isEmpty());
}
@Test
public void testGetAsLocalDateTime() throws OpenemsNamedException {
assertEquals("1900-01-01T00:00", getAsLocalDateTime(JSON_OBJECT, "LocalDateTime").toString());
+
+ assertEquals("1900-01-01T00:00", getAsOptionalLocalDateTime(JSON_OBJECT, "LocalDateTime").get().toString());
+
+ assertTrue(getAsOptionalLocalDateTime(JSON_OBJECT, "foo").isEmpty());
}
@Test
diff --git a/io.openems.common/test/io/openems/common/utils/ObjectUtilsTest.java b/io.openems.common/test/io/openems/common/utils/ObjectUtilsTest.java
new file mode 100644
index 00000000000..a2f6744ca76
--- /dev/null
+++ b/io.openems.common/test/io/openems/common/utils/ObjectUtilsTest.java
@@ -0,0 +1,42 @@
+package io.openems.common.utils;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.util.Optional;
+
+import org.junit.Test;
+
+public class ObjectUtilsTest {
+
+ @Test
+ public void testGetAsString() {
+ assertNull(ObjectUtils.getAsString(null));
+ assertNull(ObjectUtils.getAsString(new Object()));
+ assertEquals("string", ObjectUtils.getAsString("string"));
+ }
+
+ @Test
+ public void testGetAsOptionalString() {
+ assertEquals(Optional.empty(), ObjectUtils.getAsOptionalString(null));
+ assertEquals(Optional.empty(), ObjectUtils.getAsOptionalString(new Object()));
+ assertEquals(Optional.of("string"), ObjectUtils.getAsOptionalString("string"));
+ }
+
+ @Test
+ public void testGetAsInteger() {
+ assertNull(ObjectUtils.getAsInteger(null));
+ assertNull(ObjectUtils.getAsInteger(new Object()));
+ assertEquals((Integer) 1337, ObjectUtils.getAsInteger(1337));
+ }
+
+ @Test
+ public void testGetAsObjectArrray() {
+ assertNull(ObjectUtils.getAsObjectArrray(null));
+ assertNull(ObjectUtils.getAsObjectArrray(new Object()));
+ final var array = new Object[] {};
+ assertArrayEquals(array, ObjectUtils.getAsObjectArrray(array));
+ }
+
+}
diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
index 5ac61e56d48..e997fc82ca9 100644
--- a/io.openems.edge.application/EdgeApp.bndrun
+++ b/io.openems.edge.application/EdgeApp.bndrun
@@ -96,6 +96,7 @@
bnd.identity;id='io.openems.edge.controller.io.analog',\
bnd.identity;id='io.openems.edge.controller.io.channelsinglethreshold',\
bnd.identity;id='io.openems.edge.controller.io.fixdigitaloutput',\
+ bnd.identity;id='io.openems.edge.controller.io.heating.room',\
bnd.identity;id='io.openems.edge.controller.io.heatingelement',\
bnd.identity;id='io.openems.edge.controller.io.heatpump.sgready',\
bnd.identity;id='io.openems.edge.controller.pvinverter.fixpowerlimit',\
@@ -142,6 +143,7 @@
bnd.identity;id='io.openems.edge.io.offgridswitch',\
bnd.identity;id='io.openems.edge.io.revpi',\
bnd.identity;id='io.openems.edge.io.shelly',\
+ bnd.identity;id='io.openems.edge.io.siemenslogo',\
bnd.identity;id='io.openems.edge.io.wago',\
bnd.identity;id='io.openems.edge.io.weidmueller',\
bnd.identity;id='io.openems.edge.kaco.blueplanet.hybrid10',\
@@ -198,16 +200,16 @@
-runbundles: \
Java-WebSocket;version='[1.5.4,1.5.5)',\
- bcpkix;version='[1.79.0,1.79.1)',\
- bcprov;version='[1.79.0,1.79.1)',\
- bcutil;version='[1.79.0,1.79.1)',\
+ bcpkix;version='[1.80.0,1.80.1)',\
+ bcprov;version='[1.80.0,1.80.1)',\
+ bcutil;version='[1.80.0,1.80.1)',\
com.fasterxml.aalto-xml;version='[1.3.3,1.3.4)',\
com.fazecast.jSerialComm;version='[2.10.4,2.10.5)',\
com.ghgande.j2mod;version='[3.2.1,3.2.2)',\
com.google.gson;version='[2.11.0,2.11.1)',\
com.google.guava;version='[33.4.0,33.4.1)',\
com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
- com.squareup.okio;version='[3.9.1,3.9.2)',\
+ com.squareup.okio;version='[3.10.2,3.10.3)',\
com.sun.jna;version='[5.16.0,5.16.1)',\
io.openems.common;version=snapshot,\
io.openems.edge.application;version=snapshot,\
@@ -271,6 +273,7 @@
io.openems.edge.controller.io.analog;version=snapshot,\
io.openems.edge.controller.io.channelsinglethreshold;version=snapshot,\
io.openems.edge.controller.io.fixdigitaloutput;version=snapshot,\
+ io.openems.edge.controller.io.heating.room;version=snapshot,\
io.openems.edge.controller.io.heatingelement;version=snapshot,\
io.openems.edge.controller.io.heatpump.sgready;version=snapshot,\
io.openems.edge.controller.pvinverter.fixpowerlimit;version=snapshot,\
@@ -321,6 +324,7 @@
io.openems.edge.io.offgridswitch;version=snapshot,\
io.openems.edge.io.revpi;version=snapshot,\
io.openems.edge.io.shelly;version=snapshot,\
+ io.openems.edge.io.siemenslogo;version=snapshot,\
io.openems.edge.io.wago;version=snapshot,\
io.openems.edge.io.weidmueller;version=snapshot,\
io.openems.edge.kaco.blueplanet.hybrid10;version=snapshot,\
@@ -412,7 +416,7 @@
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.eventadmin;version='[1.6.4,1.6.5)',\
org.apache.felix.fileinstall;version='[3.7.4,3.7.5)',\
- org.apache.felix.http.jetty;version='[5.1.26,5.1.27)',\
+ org.apache.felix.http.jetty;version='[5.1.28,5.1.29)',\
org.apache.felix.http.servlet-api;version='[3.0.0,3.0.1)',\
org.apache.felix.inventory;version='[2.0.0,2.0.1)',\
org.apache.felix.metatype;version='[1.2.4,1.2.5)',\
@@ -424,13 +428,13 @@
org.eclipse.jetty.io;version='[9.4.28,9.4.29)',\
org.eclipse.jetty.util;version='[9.4.28,9.4.29)',\
org.eclipse.paho.mqttv5.client;version='[1.2.5,1.2.6)',\
- org.jetbrains.kotlin.osgi-bundle;version='[2.1.0,2.1.1)',\
+ org.jetbrains.kotlin.osgi-bundle;version='[2.1.10,2.1.11)',\
org.jsoup;version='[1.18.3,1.18.4)',\
org.jsr-305;version='[3.0.2,3.0.3)',\
org.openmuc.jmbus;version='[3.3.0,3.3.1)',\
org.openmuc.jrxtx;version='[1.0.1,1.0.2)',\
- org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
- org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.7,2.2.8)',\
+ org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
+ org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.8,2.2.9)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
diff --git a/io.openems.edge.battery.api/src/io/openems/edge/battery/protection/currenthandler/AbstractMaxCurrentHandler.java b/io.openems.edge.battery.api/src/io/openems/edge/battery/protection/currenthandler/AbstractMaxCurrentHandler.java
index e5406842d18..6e5793685df 100644
--- a/io.openems.edge.battery.api/src/io/openems/edge/battery/protection/currenthandler/AbstractMaxCurrentHandler.java
+++ b/io.openems.edge.battery.api/src/io/openems/edge/battery/protection/currenthandler/AbstractMaxCurrentHandler.java
@@ -422,19 +422,16 @@ protected Double getForceCurrent(Integer minCellVoltage, Integer maxCellVoltage)
}
// Evaluate force charge/discharge current from current state
- switch (state) {
- case UNDEFINED:
- case WAIT_FOR_FORCE_MODE:
- return null;
- case FORCE_MODE:
+ return switch (state) {
+ case UNDEFINED, WAIT_FOR_FORCE_MODE //
+ -> null;
+ case FORCE_MODE ->
// TODO Plan is making the value adaptive, i.e. start with 1 A; if voltage still
// decreases, then slowly increase force charge current.
- return -2.;
- case BLOCK_MODE:
- return 0.;
- }
- // will never happen
- return null;
+ -2.;
+ case BLOCK_MODE //
+ -> 0.;
+ };
}
/**
diff --git a/io.openems.edge.battery.api/src/io/openems/edge/battery/protection/force/AbstractForceChargeDischarge.java b/io.openems.edge.battery.api/src/io/openems/edge/battery/protection/force/AbstractForceChargeDischarge.java
index 9c9c4282b86..f7100c6b41d 100644
--- a/io.openems.edge.battery.api/src/io/openems/edge/battery/protection/force/AbstractForceChargeDischarge.java
+++ b/io.openems.edge.battery.api/src/io/openems/edge/battery/protection/force/AbstractForceChargeDischarge.java
@@ -74,51 +74,43 @@ public AbstractForceChargeDischarge() {
@Override
public StateHandler getStateHandler(State state) {
- switch (state) {
- case UNDEFINED:
- return new StateHandler<>() {
- @Override
- protected State runAndGetNextState(Context context) throws OpenemsNamedException {
- return AbstractForceChargeDischarge.this.handleUndefinedState(context.minCellVoltage,
- context.maxCellVoltage);
- }
- };
-
- case WAIT_FOR_FORCE_MODE:
- return new StateHandler<>() {
- private Instant enteredAt = Instant.MAX;
-
- @Override
- protected void onEntry(Context context) throws OpenemsNamedException {
- this.enteredAt = context.now();
- }
-
- @Override
- protected State runAndGetNextState(Context context) throws OpenemsNamedException {
- return AbstractForceChargeDischarge.this.handleWaitForForceModeState(context.minCellVoltage,
- context.maxCellVoltage, Duration.between(this.enteredAt, context.now()));
- }
- };
-
- case FORCE_MODE:
- return new StateHandler<>() {
- @Override
- protected State runAndGetNextState(Context context) throws OpenemsNamedException {
- return AbstractForceChargeDischarge.this.handleForceModeState(context.minCellVoltage,
- context.maxCellVoltage);
- }
- };
-
- case BLOCK_MODE:
- return new StateHandler<>() {
- @Override
- protected State runAndGetNextState(Context context) throws OpenemsNamedException {
- return AbstractForceChargeDischarge.this.handleBlockModeState(context.minCellVoltage,
- context.maxCellVoltage);
- }
- };
- }
- throw new IllegalArgumentException("Unknown State [" + state + "]");
+ return switch (state) {
+ case UNDEFINED -> new StateHandler<>() {
+ @Override
+ protected State runAndGetNextState(Context context) throws OpenemsNamedException {
+ return AbstractForceChargeDischarge.this.handleUndefinedState(context.minCellVoltage,
+ context.maxCellVoltage);
+ }
+ };
+ case WAIT_FOR_FORCE_MODE -> new StateHandler<>() {
+ private Instant enteredAt = Instant.MAX;
+
+ @Override
+ protected void onEntry(Context context) throws OpenemsNamedException {
+ this.enteredAt = context.now();
+ }
+
+ @Override
+ protected State runAndGetNextState(Context context) throws OpenemsNamedException {
+ return AbstractForceChargeDischarge.this.handleWaitForForceModeState(context.minCellVoltage,
+ context.maxCellVoltage, Duration.between(this.enteredAt, context.now()));
+ }
+ };
+ case FORCE_MODE -> new StateHandler<>() {
+ @Override
+ protected State runAndGetNextState(Context context) throws OpenemsNamedException {
+ return AbstractForceChargeDischarge.this.handleForceModeState(context.minCellVoltage,
+ context.maxCellVoltage);
+ }
+ };
+ case BLOCK_MODE -> new StateHandler<>() {
+ @Override
+ protected State runAndGetNextState(Context context) throws OpenemsNamedException {
+ return AbstractForceChargeDischarge.this.handleBlockModeState(context.minCellVoltage,
+ context.maxCellVoltage);
+ }
+ };
+ };
}
protected abstract State handleUndefinedState(int minCellVoltage, int maxCellVoltage);
diff --git a/io.openems.edge.battery.bmw/src/io/openems/edge/battery/bmw/statemachine/StateMachine.java b/io.openems.edge.battery.bmw/src/io/openems/edge/battery/bmw/statemachine/StateMachine.java
index d0e027ebc25..648baf28665 100644
--- a/io.openems.edge.battery.bmw/src/io/openems/edge/battery/bmw/statemachine/StateMachine.java
+++ b/io.openems.edge.battery.bmw/src/io/openems/edge/battery/bmw/statemachine/StateMachine.java
@@ -51,20 +51,13 @@ public StateMachine(State initialState) {
@Override
public StateHandler getStateHandler(State state) {
- switch (state) {
- case UNDEFINED:
- return new UndefinedHandler();
- case GO_RUNNING:
- return new GoRunningHandler();
- case RUNNING:
- return new RunningHandler();
- case GO_STOPPED:
- return new GoStoppedHandler();
- case STOPPED:
- return new StoppedHandler();
- case ERROR:
- return new ErrorHandler();
- }
- throw new IllegalArgumentException("Unknown State [" + state + "]");
+ return switch (state) {
+ case UNDEFINED -> new UndefinedHandler();
+ case GO_RUNNING -> new GoRunningHandler();
+ case RUNNING -> new RunningHandler();
+ case GO_STOPPED -> new GoStoppedHandler();
+ case STOPPED -> new StoppedHandler();
+ case ERROR -> new ErrorHandler();
+ };
}
}
\ No newline at end of file
diff --git a/io.openems.edge.battery.bydcommercial/src/io/openems/edge/battery/bydcommercial/BydBatteryBoxCommercialC130Impl.java b/io.openems.edge.battery.bydcommercial/src/io/openems/edge/battery/bydcommercial/BydBatteryBoxCommercialC130Impl.java
index b838288b319..865326e9ce6 100644
--- a/io.openems.edge.battery.bydcommercial/src/io/openems/edge/battery/bydcommercial/BydBatteryBoxCommercialC130Impl.java
+++ b/io.openems.edge.battery.bydcommercial/src/io/openems/edge/battery/bydcommercial/BydBatteryBoxCommercialC130Impl.java
@@ -928,22 +928,11 @@ public void setStartStop(StartStop value) {
@Override
public StartStop getStartStopTarget() {
- switch (this.config.startStop()) {
- case AUTO:
- // read StartStop-Channel
- return this.startStopTarget.get();
-
- case START:
- // force START
- return StartStop.START;
-
- case STOP:
- // force STOP
- return StartStop.STOP;
- }
-
- assert false;
- return StartStop.UNDEFINED; // can never happen
+ return switch (this.config.startStop()) {
+ case AUTO -> this.startStopTarget.get(); // read StartStop-Channel
+ case START -> StartStop.START; // force START
+ case STOP -> StartStop.STOP; // force STOP
+ };
}
/*
diff --git a/io.openems.edge.battery.bydcommercial/src/io/openems/edge/battery/bydcommercial/statemachine/StateMachine.java b/io.openems.edge.battery.bydcommercial/src/io/openems/edge/battery/bydcommercial/statemachine/StateMachine.java
index 929bf195f56..d2b1bf5ab5b 100644
--- a/io.openems.edge.battery.bydcommercial/src/io/openems/edge/battery/bydcommercial/statemachine/StateMachine.java
+++ b/io.openems.edge.battery.bydcommercial/src/io/openems/edge/battery/bydcommercial/statemachine/StateMachine.java
@@ -51,20 +51,13 @@ public StateMachine(State initialState) {
@Override
public StateHandler getStateHandler(State state) {
- switch (state) {
- case UNDEFINED:
- return new UndefinedHandler();
- case GO_RUNNING:
- return new GoRunningHandler();
- case RUNNING:
- return new RunningHandler();
- case GO_STOPPED:
- return new GoStoppedHandler();
- case STOPPED:
- return new StoppedHandler();
- case ERROR:
- return new ErrorHandler();
- }
- throw new IllegalArgumentException("Unknown State [" + state + "]");
+ return switch (state) {
+ case UNDEFINED -> new UndefinedHandler();
+ case GO_RUNNING -> new GoRunningHandler();
+ case RUNNING -> new RunningHandler();
+ case GO_STOPPED -> new GoStoppedHandler();
+ case STOPPED -> new StoppedHandler();
+ case ERROR -> new ErrorHandler();
+ };
}
}
diff --git a/io.openems.edge.battery.bydcommercial/src/io/openems/edge/battery/bydcommercial/statemachine/UndefinedHandler.java b/io.openems.edge.battery.bydcommercial/src/io/openems/edge/battery/bydcommercial/statemachine/UndefinedHandler.java
index a6524f535d2..83150414f11 100644
--- a/io.openems.edge.battery.bydcommercial/src/io/openems/edge/battery/bydcommercial/statemachine/UndefinedHandler.java
+++ b/io.openems.edge.battery.bydcommercial/src/io/openems/edge/battery/bydcommercial/statemachine/UndefinedHandler.java
@@ -9,28 +9,20 @@ public class UndefinedHandler extends StateHandler {
public State runAndGetNextState(Context context) {
var battery = context.getParent();
- switch (battery.getStartStopTarget()) {
- case UNDEFINED:
- // Stuck in UNDEFINED State
- return State.UNDEFINED;
-
- case START:
- // force START
- if (battery.hasFaults()) {
- // Has Faults -> error handling
- return State.ERROR;
- } else {
- // No Faults -> start
- return State.GO_RUNNING;
- }
-
- case STOP:
- // force STOP
- return State.GO_STOPPED;
- }
-
- assert false;
- return State.UNDEFINED; // can never happen
+ return switch (battery.getStartStopTarget()) {
+ case UNDEFINED // Stuck in UNDEFINED State
+ -> State.UNDEFINED;
+
+ case START // force START
+ -> battery.hasFaults() //
+ // Has Faults -> error handling
+ ? State.ERROR
+ // No Faults -> start
+ : State.GO_RUNNING;
+
+ case STOP // force STOP
+ -> State.GO_STOPPED;
+ };
}
}
diff --git a/io.openems.edge.battery.fenecon.commercial/src/io/openems/edge/battery/fenecon/commercial/BatteryFeneconCommercialImpl.java b/io.openems.edge.battery.fenecon.commercial/src/io/openems/edge/battery/fenecon/commercial/BatteryFeneconCommercialImpl.java
index 869077dbe64..16aa7e05552 100644
--- a/io.openems.edge.battery.fenecon.commercial/src/io/openems/edge/battery/fenecon/commercial/BatteryFeneconCommercialImpl.java
+++ b/io.openems.edge.battery.fenecon.commercial/src/io/openems/edge/battery/fenecon/commercial/BatteryFeneconCommercialImpl.java
@@ -1303,21 +1303,10 @@ public void setStartStop(StartStop value) {
@Override
public StartStop getStartStopTarget() {
- switch (this.config.startStop()) {
- case AUTO:
- // read StartStop-Channel
- return this.startStopTarget.get();
-
- case START:
- // force START
- return StartStop.START;
-
- case STOP:
- // force STOP
- return StartStop.STOP;
- }
-
- assert false;
- return StartStop.UNDEFINED; // can never happen
+ return switch (this.config.startStop()) {
+ case AUTO -> this.startStopTarget.get(); // read StartStop-Channel
+ case START -> StartStop.START; // force START
+ case STOP -> StartStop.STOP; // force STOP
+ };
}
}
diff --git a/io.openems.edge.battery.fenecon.commercial/src/io/openems/edge/battery/fenecon/commercial/IgnoreZeroConverter.java b/io.openems.edge.battery.fenecon.commercial/src/io/openems/edge/battery/fenecon/commercial/IgnoreZeroConverter.java
index b1ae6528904..5467953f365 100644
--- a/io.openems.edge.battery.fenecon.commercial/src/io/openems/edge/battery/fenecon/commercial/IgnoreZeroConverter.java
+++ b/io.openems.edge.battery.fenecon.commercial/src/io/openems/edge/battery/fenecon/commercial/IgnoreZeroConverter.java
@@ -36,10 +36,10 @@ private IgnoreZeroConverter(BatteryFeneconCommercialImpl parent) {
return null;
}
// If the battery is not started and the value is not zero -> return the value,
- if (value instanceof Integer && (Integer) value != 0) {
+ if (value instanceof Integer i && i != 0) {
return value;
}
- if (value instanceof Long && (Long) value != 0L) {
+ if (value instanceof Long l && l != 0L) {
return value;
}
// Is battery status not available or battery not started?
diff --git a/io.openems.edge.battery.fenecon.commercial/src/io/openems/edge/battery/fenecon/commercial/statemachine/StateMachine.java b/io.openems.edge.battery.fenecon.commercial/src/io/openems/edge/battery/fenecon/commercial/statemachine/StateMachine.java
index 010ee574776..f6775bb8bcc 100644
--- a/io.openems.edge.battery.fenecon.commercial/src/io/openems/edge/battery/fenecon/commercial/statemachine/StateMachine.java
+++ b/io.openems.edge.battery.fenecon.commercial/src/io/openems/edge/battery/fenecon/commercial/statemachine/StateMachine.java
@@ -54,20 +54,13 @@ public StateMachine(State initialState) {
@Override
public StateHandler getStateHandler(State state) {
- switch (state) {
- case UNDEFINED:
- return new UndefinedHandler();
- case GO_RUNNING:
- return new GoRunningHandler();
- case RUNNING:
- return new RunningHandler();
- case GO_STOPPED:
- return new GoStoppedHandler();
- case STOPPED:
- return new StoppedHandler();
- case ERROR:
- return new ErrorHandler();
- }
- throw new IllegalArgumentException("Unknown State [" + state + "]");
+ return switch (state) {
+ case UNDEFINED -> new UndefinedHandler();
+ case GO_RUNNING -> new GoRunningHandler();
+ case RUNNING -> new RunningHandler();
+ case GO_STOPPED -> new GoStoppedHandler();
+ case STOPPED -> new StoppedHandler();
+ case ERROR -> new ErrorHandler();
+ };
}
}
\ No newline at end of file
diff --git a/io.openems.edge.battery.fenecon.commercial/src/io/openems/edge/battery/fenecon/commercial/statemachine/UndefinedHandler.java b/io.openems.edge.battery.fenecon.commercial/src/io/openems/edge/battery/fenecon/commercial/statemachine/UndefinedHandler.java
index 1c08a0b67f2..085b9f5f30f 100644
--- a/io.openems.edge.battery.fenecon.commercial/src/io/openems/edge/battery/fenecon/commercial/statemachine/UndefinedHandler.java
+++ b/io.openems.edge.battery.fenecon.commercial/src/io/openems/edge/battery/fenecon/commercial/statemachine/UndefinedHandler.java
@@ -8,28 +8,20 @@ public class UndefinedHandler extends StateHandler {
@Override
public State runAndGetNextState(Context context) {
var battery = context.getParent();
- switch (battery.getStartStopTarget()) {
- case UNDEFINED:
- // Stuck in UNDEFINED State
- return State.UNDEFINED;
+ return switch (battery.getStartStopTarget()) {
+ case UNDEFINED // Stuck in UNDEFINED State
+ -> State.UNDEFINED;
- case START:
- // force START
- if (battery.hasFaults()) {
- // Has Faults -> error handling
- return State.ERROR;
- } else {
- // No Faults -> start
- return State.GO_RUNNING;
- }
+ case START // force START
+ -> battery.hasFaults() //
+ // Has Faults -> error handling
+ ? State.ERROR
+ // No Faults -> start
+ : State.GO_RUNNING;
- case STOP:
- // force STOP
- return State.GO_STOPPED;
- }
-
- assert false;
- return State.UNDEFINED; // can never happen
+ case STOP // force STOP
+ -> State.GO_STOPPED;
+ };
}
}
diff --git a/io.openems.edge.battery.fenecon.commercial/test/io/openems/edge/battery/fenecon/commercial/BatteryFeneconCommercialImplTest.java b/io.openems.edge.battery.fenecon.commercial/test/io/openems/edge/battery/fenecon/commercial/BatteryFeneconCommercialImplTest.java
index 8fec9839f16..17038a5c183 100644
--- a/io.openems.edge.battery.fenecon.commercial/test/io/openems/edge/battery/fenecon/commercial/BatteryFeneconCommercialImplTest.java
+++ b/io.openems.edge.battery.fenecon.commercial/test/io/openems/edge/battery/fenecon/commercial/BatteryFeneconCommercialImplTest.java
@@ -1,5 +1,6 @@
package io.openems.edge.battery.fenecon.commercial;
+import static io.openems.common.test.TestUtils.createDummyClock;
import static io.openems.edge.battery.api.Battery.ChannelId.CHARGE_MAX_CURRENT;
import static io.openems.edge.battery.api.Battery.ChannelId.DISCHARGE_MAX_CURRENT;
import static io.openems.edge.battery.api.Battery.ChannelId.SOC;
@@ -7,7 +8,6 @@
import static io.openems.edge.battery.fenecon.commercial.BatteryFeneconCommercial.ChannelId.RUNNING;
import static io.openems.edge.battery.fenecon.commercial.BatteryFeneconCommercial.ChannelId.STATE_MACHINE;
import static io.openems.edge.common.startstop.StartStoppable.ChannelId.START_STOP;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
import static io.openems.edge.io.test.DummyInputOutput.ChannelId.INPUT_OUTPUT7;
import org.junit.Test;
diff --git a/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/BatteryFeneconHomeImpl.java b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/BatteryFeneconHomeImpl.java
index 3130b3ba4fc..b5cbecfad37 100644
--- a/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/BatteryFeneconHomeImpl.java
+++ b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/BatteryFeneconHomeImpl.java
@@ -812,7 +812,7 @@ private synchronized void initializeTowerModulesChannels(int numberOfTowers, int
// Create Voltage Channel
var channelId = new ChannelIdImpl(//
generateSingleCellPrefix(tower, module, cell) + "_VOLTAGE",
- Doc.of(OpenemsType.INTEGER).unit(Unit.VOLT));
+ Doc.of(OpenemsType.INTEGER).unit(Unit.MILLIVOLT));
this.addChannel(channelId);
// Create Modbus-Mapping for Voltages
diff --git a/io.openems.edge.battery.fenecon.home/test/io/openems/edge/battery/fenecon/home/BatteryFeneconHomeImplTest.java b/io.openems.edge.battery.fenecon.home/test/io/openems/edge/battery/fenecon/home/BatteryFeneconHomeImplTest.java
index b0029262635..77062d93093 100644
--- a/io.openems.edge.battery.fenecon.home/test/io/openems/edge/battery/fenecon/home/BatteryFeneconHomeImplTest.java
+++ b/io.openems.edge.battery.fenecon.home/test/io/openems/edge/battery/fenecon/home/BatteryFeneconHomeImplTest.java
@@ -1,5 +1,6 @@
package io.openems.edge.battery.fenecon.home;
+import static io.openems.common.test.TestUtils.createDummyClock;
import static io.openems.edge.battery.api.Battery.ChannelId.CHARGE_MAX_CURRENT;
import static io.openems.edge.battery.api.Battery.ChannelId.CURRENT;
import static io.openems.edge.battery.api.Battery.ChannelId.MAX_CELL_VOLTAGE;
@@ -22,7 +23,6 @@
import static io.openems.edge.battery.protection.BatteryProtection.ChannelId.BP_CHARGE_BMS;
import static io.openems.edge.battery.protection.BatteryProtection.ChannelId.BP_CHARGE_MAX_SOC;
import static io.openems.edge.bridge.modbus.api.ModbusComponent.ChannelId.MODBUS_COMMUNICATION_FAILED;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
import static io.openems.edge.io.test.DummyInputOutput.ChannelId.INPUT_OUTPUT4;
import static java.lang.Math.round;
import static java.time.temporal.ChronoUnit.SECONDS;
diff --git a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/cluster/versionb/SingleRack.java b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/cluster/versionb/SingleRack.java
index 02835194b33..e5d4529f972 100644
--- a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/cluster/versionb/SingleRack.java
+++ b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/cluster/versionb/SingleRack.java
@@ -1,5 +1,14 @@
package io.openems.edge.battery.soltaro.cluster.versionb;
+import static io.openems.common.channel.AccessMode.READ_WRITE;
+import static io.openems.common.channel.Level.OK;
+import static io.openems.common.channel.Level.WARNING;
+import static io.openems.common.channel.Unit.DEZIDEGREE_CELSIUS;
+import static io.openems.common.channel.Unit.MILLIAMPERE;
+import static io.openems.common.channel.Unit.MILLIVOLT;
+import static io.openems.common.channel.Unit.NONE;
+import static io.openems.common.channel.Unit.PERCENT;
+import static io.openems.common.types.OpenemsType.INTEGER;
import static io.openems.edge.bridge.modbus.api.ElementToChannelConverter.SCALE_FACTOR_2;
import static io.openems.edge.bridge.modbus.api.ElementToChannelConverter.SCALE_FACTOR_MINUS_1;
@@ -9,10 +18,6 @@
import java.util.Map;
import java.util.Optional;
-import io.openems.common.channel.AccessMode;
-import io.openems.common.channel.Level;
-import io.openems.common.channel.Unit;
-import io.openems.common.types.OpenemsType;
import io.openems.edge.battery.soltaro.common.enums.ChargeIndication;
import io.openems.edge.bridge.modbus.api.AbstractOpenemsModbusComponent;
import io.openems.edge.bridge.modbus.api.element.BitsWordElement;
@@ -426,104 +431,102 @@ private Map> createChannelMap() {
private Map createChannelIdMap() {
Map map = new HashMap<>();
- this.addEntry(map, KEY_VOLTAGE, new IntegerDoc().unit(Unit.MILLIVOLT));
- this.addEntry(map, KEY_CURRENT, new IntegerDoc().unit(Unit.MILLIAMPERE));
+ this.addEntry(map, KEY_VOLTAGE, new IntegerDoc().unit(MILLIVOLT));
+ this.addEntry(map, KEY_CURRENT, new IntegerDoc().unit(MILLIAMPERE));
this.addEntry(map, KEY_CHARGE_INDICATION, Doc.of(ChargeIndication.values()));
- this.addEntry(map, KEY_SOC, new IntegerDoc().unit(Unit.PERCENT));
- this.addEntry(map, KEY_SOH, new IntegerDoc().unit(Unit.PERCENT));
- this.addEntry(map, KEY_MAX_CELL_VOLTAGE_ID, new IntegerDoc().unit(Unit.NONE));
- this.addEntry(map, KEY_MAX_CELL_VOLTAGE, new IntegerDoc().unit(Unit.MILLIVOLT));
- this.addEntry(map, KEY_MIN_CELL_VOLTAGE_ID, new IntegerDoc().unit(Unit.NONE));
- this.addEntry(map, KEY_MIN_CELL_VOLTAGE, new IntegerDoc().unit(Unit.MILLIVOLT));
- this.addEntry(map, KEY_MAX_CELL_TEMPERATURE_ID, new IntegerDoc().unit(Unit.NONE));
- this.addEntry(map, KEY_MAX_CELL_TEMPERATURE, new IntegerDoc().unit(Unit.DEZIDEGREE_CELSIUS));
- this.addEntry(map, KEY_MIN_CELL_TEMPERATURE_ID, new IntegerDoc().unit(Unit.NONE));
- this.addEntry(map, KEY_MIN_CELL_TEMPERATURE, new IntegerDoc().unit(Unit.DEZIDEGREE_CELSIUS));
- this.addEntry(map, KEY_ALARM_LEVEL_2_CELL_DISCHA_TEMP_LOW, Doc.of(Level.WARNING)
+ this.addEntry(map, KEY_SOC, new IntegerDoc().unit(PERCENT));
+ this.addEntry(map, KEY_SOH, new IntegerDoc().unit(PERCENT));
+ this.addEntry(map, KEY_MAX_CELL_VOLTAGE_ID, new IntegerDoc().unit(NONE));
+ this.addEntry(map, KEY_MAX_CELL_VOLTAGE, new IntegerDoc().unit(MILLIVOLT));
+ this.addEntry(map, KEY_MIN_CELL_VOLTAGE_ID, new IntegerDoc().unit(NONE));
+ this.addEntry(map, KEY_MIN_CELL_VOLTAGE, new IntegerDoc().unit(MILLIVOLT));
+ this.addEntry(map, KEY_MAX_CELL_TEMPERATURE_ID, new IntegerDoc().unit(NONE));
+ this.addEntry(map, KEY_MAX_CELL_TEMPERATURE, new IntegerDoc().unit(DEZIDEGREE_CELSIUS));
+ this.addEntry(map, KEY_MIN_CELL_TEMPERATURE_ID, new IntegerDoc().unit(NONE));
+ this.addEntry(map, KEY_MIN_CELL_TEMPERATURE, new IntegerDoc().unit(DEZIDEGREE_CELSIUS));
+ this.addEntry(map, KEY_ALARM_LEVEL_2_CELL_DISCHA_TEMP_LOW, Doc.of(WARNING)
.text("Rack" + this.rackNumber + " Cell Discharge Temperature Low Alarm Level 2")); /* Bit 15 */
- this.addEntry(map, KEY_ALARM_LEVEL_2_CELL_DISCHA_TEMP_HIGH, Doc.of(Level.WARNING)
+ this.addEntry(map, KEY_ALARM_LEVEL_2_CELL_DISCHA_TEMP_HIGH, Doc.of(WARNING)
.text("Rack" + this.rackNumber + " Cell Discharge Temperature High Alarm Level 2")); /* Bit 14 */
this.addEntry(map, KEY_ALARM_LEVEL_2_GR_TEMPERATURE_HIGH,
- Doc.of(Level.WARNING).text("Rack" + this.rackNumber + " GR Temperature High Alarm Level 2")); /* Bit 10 */
- this.addEntry(map, KEY_ALARM_LEVEL_2_CELL_CHA_TEMP_LOW, Doc.of(Level.WARNING)
+ Doc.of(WARNING).text("Rack" + this.rackNumber + " GR Temperature High Alarm Level 2")); /* Bit 10 */
+ this.addEntry(map, KEY_ALARM_LEVEL_2_CELL_CHA_TEMP_LOW, Doc.of(WARNING)
.text("Rack" + this.rackNumber + " Cell Charge Temperature Low Alarm Level 2")); /* Bit 7 */
- this.addEntry(map, KEY_ALARM_LEVEL_2_CELL_CHA_TEMP_HIGH, Doc.of(Level.WARNING)
+ this.addEntry(map, KEY_ALARM_LEVEL_2_CELL_CHA_TEMP_HIGH, Doc.of(WARNING)
.text("Rack" + this.rackNumber + " Cell Charge Temperature High Alarm Level 2")); /* Bit 6 */
- this.addEntry(map, KEY_ALARM_LEVEL_2_DISCHA_CURRENT_HIGH, Doc.of(Level.WARNING)
- .text("Rack" + this.rackNumber + " Discharge Current High Alarm Level 2")); /* Bit 5 */
+ this.addEntry(map, KEY_ALARM_LEVEL_2_DISCHA_CURRENT_HIGH,
+ Doc.of(WARNING).text("Rack" + this.rackNumber + " Discharge Current High Alarm Level 2")); /* Bit 5 */
this.addEntry(map, KEY_ALARM_LEVEL_2_TOTAL_VOLTAGE_LOW,
- Doc.of(Level.WARNING).text("Rack" + this.rackNumber + " Total Voltage Low Alarm Level 2")); /* Bit 4 */
+ Doc.of(WARNING).text("Rack" + this.rackNumber + " Total Voltage Low Alarm Level 2")); /* Bit 4 */
this.addEntry(map, KEY_ALARM_LEVEL_2_CELL_VOLTAGE_LOW,
- Doc.of(Level.WARNING).text("Cluster 1 Cell Voltage Low Alarm Level 2")); /* Bit 3 */
+ Doc.of(WARNING).text("Cluster 1 Cell Voltage Low Alarm Level 2")); /* Bit 3 */
this.addEntry(map, KEY_ALARM_LEVEL_2_CHA_CURRENT_HIGH,
- Doc.of(Level.WARNING).text("Rack" + this.rackNumber + " Charge Current High Alarm Level 2")); /* Bit 2 */
+ Doc.of(WARNING).text("Rack" + this.rackNumber + " Charge Current High Alarm Level 2")); /* Bit 2 */
this.addEntry(map, KEY_ALARM_LEVEL_2_TOTAL_VOLTAGE_HIGH,
- Doc.of(Level.WARNING).text("Rack" + this.rackNumber + " Total Voltage High Alarm Level 2")); /* Bit 1 */
+ Doc.of(WARNING).text("Rack" + this.rackNumber + " Total Voltage High Alarm Level 2")); /* Bit 1 */
this.addEntry(map, KEY_ALARM_LEVEL_2_CELL_VOLTAGE_HIGH,
- Doc.of(Level.WARNING).text("Rack" + this.rackNumber + " Cell Voltage High Alarm Level 2")); /* Bit 0 */
- this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_DISCHA_TEMP_LOW, Doc.of(Level.WARNING)
+ Doc.of(WARNING).text("Rack" + this.rackNumber + " Cell Voltage High Alarm Level 2")); /* Bit 0 */
+ this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_DISCHA_TEMP_LOW, Doc.of(WARNING)
.text("Rack" + this.rackNumber + " Cell Discharge Temperature Low Alarm Level 1")); /* Bit 15 */
- this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_DISCHA_TEMP_HIGH, Doc.of(Level.WARNING)
+ this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_DISCHA_TEMP_HIGH, Doc.of(WARNING)
.text("Rack" + this.rackNumber + " Cell Discharge Temperature High Alarm Level 1")); /* Bit 14 */
- this.addEntry(map, KEY_ALARM_LEVEL_1_TOTAL_VOLTAGE_DIFF_HIGH, Doc.of(Level.WARNING)
- .text("Rack" + this.rackNumber + " Total Voltage Diff High Alarm Level 1")); /* Bit 13 */
- this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_VOLTAGE_DIFF_HIGH, Doc.of(Level.WARNING)
- .text("Rack" + this.rackNumber + " Cell Voltage Diff High Alarm Level 1")); /* Bit 11 */
- this.addEntry(map, KEY_ALARM_LEVEL_1_GR_TEMPERATURE_HIGH, Doc.of(Level.WARNING)
- .text("Rack" + this.rackNumber + " GR Temperature High Alarm Level 1")); /* Bit 10 */
- this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_TEMP_DIFF_HIGH, Doc.of(Level.WARNING)
+ this.addEntry(map, KEY_ALARM_LEVEL_1_TOTAL_VOLTAGE_DIFF_HIGH,
+ Doc.of(WARNING).text("Rack" + this.rackNumber + " Total Voltage Diff High Alarm Level 1")); /* Bit 13 */
+ this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_VOLTAGE_DIFF_HIGH,
+ Doc.of(WARNING).text("Rack" + this.rackNumber + " Cell Voltage Diff High Alarm Level 1")); /* Bit 11 */
+ this.addEntry(map, KEY_ALARM_LEVEL_1_GR_TEMPERATURE_HIGH,
+ Doc.of(WARNING).text("Rack" + this.rackNumber + " GR Temperature High Alarm Level 1")); /* Bit 10 */
+ this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_TEMP_DIFF_HIGH, Doc.of(WARNING)
.text("Rack" + this.rackNumber + " Cell temperature Diff High Alarm Level 1")); /* Bit 9 */
this.addEntry(map, KEY_ALARM_LEVEL_1_SOC_LOW,
- Doc.of(Level.WARNING).text("Rack" + this.rackNumber + " SOC Low Alarm Level 1")); /* Bit 8 */
- this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_CHA_TEMP_LOW, Doc.of(Level.WARNING)
+ Doc.of(WARNING).text("Rack" + this.rackNumber + " SOC Low Alarm Level 1")); /* Bit 8 */
+ this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_CHA_TEMP_LOW, Doc.of(WARNING)
.text("Rack" + this.rackNumber + " Cell Charge Temperature Low Alarm Level 1")); /* Bit 7 */
- this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_CHA_TEMP_HIGH, Doc.of(Level.WARNING)
+ this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_CHA_TEMP_HIGH, Doc.of(WARNING)
.text("Rack" + this.rackNumber + " Cell Charge Temperature High Alarm Level 1")); /* Bit 6 */
- this.addEntry(map, KEY_ALARM_LEVEL_1_DISCHA_CURRENT_HIGH, Doc.of(Level.WARNING)
- .text("Rack" + this.rackNumber + " Discharge Current High Alarm Level 1")); /* Bit 5 */
+ this.addEntry(map, KEY_ALARM_LEVEL_1_DISCHA_CURRENT_HIGH,
+ Doc.of(WARNING).text("Rack" + this.rackNumber + " Discharge Current High Alarm Level 1")); /* Bit 5 */
this.addEntry(map, KEY_ALARM_LEVEL_1_TOTAL_VOLTAGE_LOW,
- Doc.of(Level.WARNING).text("Rack" + this.rackNumber + " Total Voltage Low Alarm Level 1")); /* Bit 4 */
+ Doc.of(WARNING).text("Rack" + this.rackNumber + " Total Voltage Low Alarm Level 1")); /* Bit 4 */
this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_VOLTAGE_LOW,
- Doc.of(Level.WARNING).text("Rack" + this.rackNumber + " Cell Voltage Low Alarm Level 1")); /* Bit 3 */
- this.addEntry(map, KEY_ALARM_LEVEL_1_CHA_CURRENT_HIGH, Doc.of(Level.WARNING)
- .text("Rack" + this.rackNumber + " Charge Current High Alarm Level 1")); /* Bit 2 */
+ Doc.of(WARNING).text("Rack" + this.rackNumber + " Cell Voltage Low Alarm Level 1")); /* Bit 3 */
+ this.addEntry(map, KEY_ALARM_LEVEL_1_CHA_CURRENT_HIGH,
+ Doc.of(WARNING).text("Rack" + this.rackNumber + " Charge Current High Alarm Level 1")); /* Bit 2 */
this.addEntry(map, KEY_ALARM_LEVEL_1_TOTAL_VOLTAGE_HIGH,
- Doc.of(Level.WARNING).text("Rack" + this.rackNumber + " Total Voltage High Alarm Level 1")); /* Bit 1 */
+ Doc.of(WARNING).text("Rack" + this.rackNumber + " Total Voltage High Alarm Level 1")); /* Bit 1 */
this.addEntry(map, KEY_ALARM_LEVEL_1_CELL_VOLTAGE_HIGH,
- Doc.of(Level.WARNING).text("Rack" + this.rackNumber + " Cell Voltage High Alarm Level 1")); /* Bit 0 */
+ Doc.of(WARNING).text("Rack" + this.rackNumber + " Cell Voltage High Alarm Level 1")); /* Bit 0 */
this.addEntry(map, KEY_RUN_STATE, Doc.of(Enums.ClusterRunState.values())); //
- this.addEntry(map, KEY_FAILURE_INITIALIZATION, Doc.of(Level.WARNING).text("Initialization failure")); /* Bit */
- this.addEntry(map, KEY_FAILURE_EEPROM, Doc.of(Level.WARNING).text("EEPROM fault")); /* Bit 11 */
+ this.addEntry(map, KEY_FAILURE_INITIALIZATION, Doc.of(WARNING).text("Initialization failure")); /* Bit */
+ this.addEntry(map, KEY_FAILURE_EEPROM, Doc.of(WARNING).text("EEPROM fault")); /* Bit 11 */
this.addEntry(map, KEY_FAILURE_INTRANET_COMMUNICATION,
- Doc.of(Level.WARNING).text("Internal communication fault")); /* Bit 10 */
+ Doc.of(WARNING).text("Internal communication fault")); /* Bit 10 */
this.addEntry(map, KEY_FAILURE_TEMPERATURE_SENSOR_CABLE,
- Doc.of(Level.WARNING).text("Temperature sensor cable fault")); /* Bit 9 */
- this.addEntry(map, KEY_FAILURE_BALANCING_MODULE, Doc.of(Level.OK).text("Balancing module fault")); /* Bit 8 */
- this.addEntry(map, KEY_FAILURE_TEMPERATURE_PCB, Doc.of(Level.WARNING).text("Temperature PCB error")); /* Bit 7 */
- this.addEntry(map, KEY_FAILURE_GR_TEMPERATURE, Doc.of(Level.WARNING).text("GR Temperature error")); /* Bit 6 */
- this.addEntry(map, KEY_FAILURE_TEMP_SENSOR, Doc.of(Level.WARNING).text("Temperature sensor fault")); /* Bit 5 */
- this.addEntry(map, KEY_FAILURE_TEMP_SAMPLING,
- Doc.of(Level.WARNING).text("Temperature sampling fault")); /* Bit 4 */
- this.addEntry(map, KEY_FAILURE_VOLTAGE_SAMPLING,
- Doc.of(Level.WARNING).text("Voltage sampling fault")); /* Bit 3 */
- this.addEntry(map, KEY_FAILURE_LTC6803, Doc.of(Level.WARNING).text("LTC6803 fault")); /* Bit 2 */
- this.addEntry(map, KEY_FAILURE_CONNECTOR_WIRE, Doc.of(Level.WARNING).text("connector wire fault")); /* Bit 1 */
- this.addEntry(map, KEY_FAILURE_SAMPLING_WIRE, Doc.of(Level.WARNING).text("sampling wire fault")); /* Bit 0 */
- this.addEntry(map, KEY_SLEEP, Doc.of(OpenemsType.INTEGER).accessMode(AccessMode.READ_WRITE));
- this.addEntry(map, KEY_RESET, Doc.of(OpenemsType.INTEGER).accessMode(AccessMode.READ_WRITE));
+ Doc.of(WARNING).text("Temperature sensor cable fault")); /* Bit 9 */
+ this.addEntry(map, KEY_FAILURE_BALANCING_MODULE, Doc.of(OK).text("Balancing module fault")); /* Bit 8 */
+ this.addEntry(map, KEY_FAILURE_TEMPERATURE_PCB, Doc.of(WARNING).text("Temperature PCB error")); /* Bit 7 */
+ this.addEntry(map, KEY_FAILURE_GR_TEMPERATURE, Doc.of(WARNING).text("GR Temperature error")); /* Bit 6 */
+ this.addEntry(map, KEY_FAILURE_TEMP_SENSOR, Doc.of(WARNING).text("Temperature sensor fault")); /* Bit 5 */
+ this.addEntry(map, KEY_FAILURE_TEMP_SAMPLING, Doc.of(WARNING).text("Temperature sampling fault")); /* Bit 4 */
+ this.addEntry(map, KEY_FAILURE_VOLTAGE_SAMPLING, Doc.of(WARNING).text("Voltage sampling fault")); /* Bit 3 */
+ this.addEntry(map, KEY_FAILURE_LTC6803, Doc.of(WARNING).text("LTC6803 fault")); /* Bit 2 */
+ this.addEntry(map, KEY_FAILURE_CONNECTOR_WIRE, Doc.of(WARNING).text("connector wire fault")); /* Bit 1 */
+ this.addEntry(map, KEY_FAILURE_SAMPLING_WIRE, Doc.of(WARNING).text("sampling wire fault")); /* Bit 0 */
+ this.addEntry(map, KEY_SLEEP, Doc.of(INTEGER).accessMode(READ_WRITE));
+ this.addEntry(map, KEY_RESET, Doc.of(INTEGER).accessMode(READ_WRITE));
// Cell voltages formatted like: "RACK_1_BATTERY_000_VOLTAGE"
for (var i = 0; i < this.numberOfSlaves; i++) {
for (var j = i * VOLTAGE_SENSORS_PER_MODULE; j < (i + 1) * VOLTAGE_SENSORS_PER_MODULE; j++) {
var key = this.getSingleCellPrefix(j) + "_" + VOLTAGE;
- this.addEntry(map, key, new IntegerDoc().unit(Unit.MILLIVOLT));
+ this.addEntry(map, key, new IntegerDoc().unit(MILLIVOLT));
}
}
// Cell temperatures formatted like : "RACK_1_BATTERY_000_TEMPERATURE"
for (var i = 0; i < this.numberOfSlaves; i++) {
for (var j = i * TEMPERATURE_SENSORS_PER_MODULE; j < (i + 1) * TEMPERATURE_SENSORS_PER_MODULE; j++) {
var key = this.getSingleCellPrefix(j) + "_" + TEMPERATURE;
- this.addEntry(map, key, new IntegerDoc().unit(Unit.DEZIDEGREE_CELSIUS));
+ this.addEntry(map, key, new IntegerDoc().unit(DEZIDEGREE_CELSIUS));
}
}
diff --git a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/cluster/versionc/BatterySoltaroClusterVersionCImpl.java b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/cluster/versionc/BatterySoltaroClusterVersionCImpl.java
index 6b493c42f7a..324d01e6b0c 100644
--- a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/cluster/versionc/BatterySoltaroClusterVersionCImpl.java
+++ b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/cluster/versionc/BatterySoltaroClusterVersionCImpl.java
@@ -1057,22 +1057,10 @@ public void setStartStop(StartStop value) {
@Override
public StartStop getStartStopTarget() {
- switch (this.config.startStop()) {
- case AUTO:
- // read StartStop-Channel
- return this.startStopTarget.get();
-
- case START:
- // force START
- return StartStop.START;
-
- case STOP:
- // force STOP
- return StartStop.STOP;
- }
-
- assert false;
- return StartStop.UNDEFINED; // can never happen
+ return switch (this.config.startStop()) {
+ case AUTO -> this.startStopTarget.get(); // read StartStop-Channel
+ case START -> StartStop.START; // force START
+ case STOP -> StartStop.STOP; // force STOP
+ };
}
-
}
diff --git a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/cluster/versionc/statemachine/StateMachine.java b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/cluster/versionc/statemachine/StateMachine.java
index 8320231a603..9713db3a9f8 100644
--- a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/cluster/versionc/statemachine/StateMachine.java
+++ b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/cluster/versionc/statemachine/StateMachine.java
@@ -51,20 +51,13 @@ public StateMachine(State initialState) {
@Override
public StateHandler getStateHandler(State state) {
- switch (state) {
- case UNDEFINED:
- return new UndefinedHandler();
- case GO_RUNNING:
- return new GoRunningHandler();
- case RUNNING:
- return new RunningHandler();
- case GO_STOPPED:
- return new GoStoppedHandler();
- case STOPPED:
- return new StoppedHandler();
- case ERROR:
- return new ErrorHandler();
- }
- throw new IllegalArgumentException("Unknown State [" + state + "]");
+ return switch (state) {
+ case UNDEFINED -> new UndefinedHandler();
+ case GO_RUNNING -> new GoRunningHandler();
+ case RUNNING -> new RunningHandler();
+ case GO_STOPPED -> new GoStoppedHandler();
+ case STOPPED -> new StoppedHandler();
+ case ERROR -> new ErrorHandler();
+ };
}
}
\ No newline at end of file
diff --git a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/cluster/versionc/statemachine/UndefinedHandler.java b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/cluster/versionc/statemachine/UndefinedHandler.java
index 510731f605b..bd8f3168f3a 100644
--- a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/cluster/versionc/statemachine/UndefinedHandler.java
+++ b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/cluster/versionc/statemachine/UndefinedHandler.java
@@ -9,28 +9,20 @@ public class UndefinedHandler extends StateHandler {
public State runAndGetNextState(Context context) {
var battery = context.getParent();
- switch (battery.getStartStopTarget()) {
- case UNDEFINED:
- // Stuck in UNDEFINED State
- return State.UNDEFINED;
-
- case START:
- // force START
- if (battery.hasFaults()) {
- // Has Faults -> error handling
- return State.ERROR;
- } else {
- // No Faults -> start
- return State.GO_RUNNING;
- }
-
- case STOP:
- // force STOP
- return State.GO_STOPPED;
- }
-
- assert false;
- return State.UNDEFINED; // can never happen
+ return switch (battery.getStartStopTarget()) {
+ case UNDEFINED // Stuck in UNDEFINED State
+ -> State.UNDEFINED;
+
+ case START // force START
+ -> battery.hasFaults() //
+ // Has Faults -> error handling
+ ? State.ERROR
+ // No Faults -> start
+ : State.GO_RUNNING;
+
+ case STOP // force STOP
+ -> State.GO_STOPPED;
+ };
}
}
diff --git a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionb/BatterySoltaroSingleRackVersionBImpl.java b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionb/BatterySoltaroSingleRackVersionBImpl.java
index a87a7fe5106..1af9cb7d0da 100644
--- a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionb/BatterySoltaroSingleRackVersionBImpl.java
+++ b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionb/BatterySoltaroSingleRackVersionBImpl.java
@@ -208,22 +208,11 @@ public void setStartStop(StartStop value) {
@Override
public StartStop getStartStopTarget() {
- switch (this.config.startStop()) {
- case AUTO:
- // read StartStop-Channel
- return this.startStopTarget.get();
-
- case START:
- // force START
- return StartStop.START;
-
- case STOP:
- // force STOP
- return StartStop.STOP;
- }
-
- assert false;
- return StartStop.UNDEFINED; // can never happen
+ return switch (this.config.startStop()) {
+ case AUTO -> this.startStopTarget.get(); // read StartStop-Channel
+ case START -> StartStop.START; // force START
+ case STOP -> StartStop.STOP; // force STOP
+ };
}
@Override
diff --git a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionb/statemachine/StateMachine.java b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionb/statemachine/StateMachine.java
index f1c2da278c7..e32f1901040 100644
--- a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionb/statemachine/StateMachine.java
+++ b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionb/statemachine/StateMachine.java
@@ -52,20 +52,13 @@ public StateMachine(State initialState) {
@Override
public StateHandler getStateHandler(State state) {
- switch (state) {
- case UNDEFINED:
- return new UndefinedHandler();
- case GO_RUNNING:
- return new GoRunningHandler();
- case RUNNING:
- return new RunningHandler();
- case GO_STOPPED:
- return new GoStoppedHandler();
- case STOPPED:
- return new StoppedHandler();
- case ERROR:
- return new ErrorHandler();
- }
- throw new IllegalArgumentException("Unknown State [" + state + "]");
+ return switch (state) {
+ case UNDEFINED -> new UndefinedHandler();
+ case GO_RUNNING -> new GoRunningHandler();
+ case RUNNING -> new RunningHandler();
+ case GO_STOPPED -> new GoStoppedHandler();
+ case STOPPED -> new StoppedHandler();
+ case ERROR -> new ErrorHandler();
+ };
}
}
\ No newline at end of file
diff --git a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionb/statemachine/UndefinedHandler.java b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionb/statemachine/UndefinedHandler.java
index 9ffd3d28954..52ef94b620c 100644
--- a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionb/statemachine/UndefinedHandler.java
+++ b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionb/statemachine/UndefinedHandler.java
@@ -10,28 +10,20 @@ public class UndefinedHandler extends StateHandler {
protected State runAndGetNextState(Context context) throws OpenemsNamedException {
var battery = context.getParent();
- switch (battery.getStartStopTarget()) {
- case UNDEFINED:
- // Stuck in UNDEFINED State
- return State.UNDEFINED;
-
- case START:
- // force START
- if (battery.hasFaults()) {
- // Has Faults -> error handling
- return State.ERROR;
- } else {
- // No Faults -> start
- return State.GO_RUNNING;
- }
-
- case STOP:
- // force STOP
- return State.GO_STOPPED;
- }
-
- assert false;
- return State.UNDEFINED; // can never happen
+ return switch (battery.getStartStopTarget()) {
+ case UNDEFINED // Stuck in UNDEFINED State
+ -> State.UNDEFINED;
+
+ case START // force START
+ -> battery.hasFaults() //
+ // Has Faults -> error handling
+ ? State.ERROR
+ // No Faults -> start
+ : State.GO_RUNNING;
+
+ case STOP // force STOP
+ -> State.GO_STOPPED;
+ };
}
}
diff --git a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionc/BatterySoltaroSingleRackVersionCImpl.java b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionc/BatterySoltaroSingleRackVersionCImpl.java
index 988a530da27..c2e7f9b00ae 100644
--- a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionc/BatterySoltaroSingleRackVersionCImpl.java
+++ b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionc/BatterySoltaroSingleRackVersionCImpl.java
@@ -749,22 +749,10 @@ public void setStartStop(StartStop value) {
@Override
public StartStop getStartStopTarget() {
- switch (this.config.startStop()) {
- case AUTO:
- // read StartStop-Channel
- return this.startStopTarget.get();
-
- case START:
- // force START
- return StartStop.START;
-
- case STOP:
- // force STOP
- return StartStop.STOP;
- }
-
- assert false;
- return StartStop.UNDEFINED; // can never happen
+ return switch (this.config.startStop()) {
+ case AUTO -> this.startStopTarget.get(); // read StartStop-Channel
+ case START -> StartStop.START; // force START
+ case STOP -> StartStop.STOP; // force STOP
+ };
}
-
}
diff --git a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionc/statemachine/StateMachine.java b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionc/statemachine/StateMachine.java
index 914c58eda06..c1c5d96c425 100644
--- a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionc/statemachine/StateMachine.java
+++ b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionc/statemachine/StateMachine.java
@@ -51,20 +51,13 @@ public StateMachine(State initialState) {
@Override
public StateHandler getStateHandler(State state) {
- switch (state) {
- case UNDEFINED:
- return new UndefinedHandler();
- case GO_RUNNING:
- return new GoRunningHandler();
- case RUNNING:
- return new RunningHandler();
- case GO_STOPPED:
- return new GoStoppedHandler();
- case STOPPED:
- return new StoppedHandler();
- case ERROR:
- return new ErrorHandler();
- }
- throw new IllegalArgumentException("Unknown State [" + state + "]");
+ return switch (state) {
+ case UNDEFINED -> new UndefinedHandler();
+ case GO_RUNNING -> new GoRunningHandler();
+ case RUNNING -> new RunningHandler();
+ case GO_STOPPED -> new GoStoppedHandler();
+ case STOPPED -> new StoppedHandler();
+ case ERROR -> new ErrorHandler();
+ };
}
}
\ No newline at end of file
diff --git a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionc/statemachine/UndefinedHandler.java b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionc/statemachine/UndefinedHandler.java
index 2f2bd1687b3..855a1e13e10 100644
--- a/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionc/statemachine/UndefinedHandler.java
+++ b/io.openems.edge.battery.soltaro/src/io/openems/edge/battery/soltaro/single/versionc/statemachine/UndefinedHandler.java
@@ -8,28 +8,20 @@ public class UndefinedHandler extends StateHandler {
@Override
public State runAndGetNextState(Context context) {
var battery = context.getParent();
- switch (battery.getStartStopTarget()) {
- case UNDEFINED:
- // Stuck in UNDEFINED State
- return State.UNDEFINED;
+ return switch (battery.getStartStopTarget()) {
+ case UNDEFINED // Stuck in UNDEFINED State
+ -> State.UNDEFINED;
- case START:
- // force START
- if (battery.hasFaults()) {
- // Has Faults -> error handling
- return State.ERROR;
- } else {
- // No Faults -> start
- return State.GO_RUNNING;
- }
+ case START// force START
+ -> battery.hasFaults() //
+ // Has Faults -> error handling
+ ? State.ERROR
+ // No Faults -> start
+ : State.GO_RUNNING;
- case STOP:
- // force STOP
- return State.GO_STOPPED;
- }
-
- assert false;
- return State.UNDEFINED; // can never happen
+ case STOP // force STOP
+ -> State.GO_STOPPED;
+ };
}
}
diff --git a/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/SymmetricBatteryInverter.java b/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/SymmetricBatteryInverter.java
index 32aa035b4f1..8e731a87612 100644
--- a/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/SymmetricBatteryInverter.java
+++ b/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/api/SymmetricBatteryInverter.java
@@ -135,6 +135,20 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
DC_MAX_VOLTAGE(Doc.of(OpenemsType.INTEGER) //
.unit(Unit.VOLT) //
.persistencePriority(PersistencePriority.HIGH) //
+ ), //
+
+ /**
+ * Inverter Cabinet Temperature.
+ *
+ *
+ * - Interface: SymmetricBatteryInverter
+ *
- Type: Integer
+ *
- Unit: C
+ *
+ */
+ TEMPERATURE_CABINET(Doc.of(OpenemsType.INTEGER) //
+ .unit(Unit.DEGREE_CELSIUS) //
+ .persistencePriority(PersistencePriority.HIGH) //
);
private final Doc doc;
@@ -463,4 +477,23 @@ public default void _setDcMaxVoltage(Integer value) {
public default void _setDcMaxVoltage(int value) {
this.getDcMaxVoltageChannel().setNextValue(value);
}
+
+ /**
+ * Gets the Channel for {@link ChannelId#TEMPERATURE_CABINET}.
+ *
+ * @return the Channel
+ */
+ public default IntegerReadChannel getTemperatureCabinetChannel() {
+ return this.channel(ChannelId.TEMPERATURE_CABINET);
+ }
+
+ /**
+ * Gets the Inverters Cabinet temperature in [C]. See
+ * {@link ChannelId#TEMPERATURE_CABINET}.
+ *
+ * @return the Channel {@link Value}
+ */
+ public default Value getTemperatureCabinet() {
+ return this.getTemperatureCabinetChannel().value();
+ }
}
diff --git a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/KacoSunSpecModel.java b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/KacoSunSpecModel.java
index 88974aeedf0..751aed62757 100644
--- a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/KacoSunSpecModel.java
+++ b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/KacoSunSpecModel.java
@@ -106,8 +106,7 @@ public static enum S64201 implements SunSpecPoint {
V_AR(new ScaledValuePoint("S64201_V_AR", "AC Reactive Power", "", //
ValuePoint.Type.INT16, true, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "V_AR_SF")), //
HZ(new ScaledValuePoint("S64201_HZ", "Line Frequency", "", //
- ValuePoint.Type.UINT16, true, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")
- ), //
+ ValuePoint.Type.UINT16, true, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")), //
RESERVED_36(new ReservedPoint("S64201_RESERVED_36")), //
RESERVED_37(new ReservedPoint("S64201_RESERVED_37")), //
RESERVED_38(new ReservedPoint("S64201_RESERVED_38")), //
diff --git a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/test/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/BatteryInverterKacoBlueplanetGridsaveImplTest.java b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/test/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/BatteryInverterKacoBlueplanetGridsaveImplTest.java
index fc68eda27ec..d3d8025f5e1 100644
--- a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/test/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/BatteryInverterKacoBlueplanetGridsaveImplTest.java
+++ b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/test/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/BatteryInverterKacoBlueplanetGridsaveImplTest.java
@@ -1,5 +1,6 @@
package io.openems.edge.batteryinverter.kaco.blueplanetgridsave;
+import static io.openems.common.test.TestUtils.createDummyClock;
import static io.openems.edge.batteryinverter.api.SymmetricBatteryInverter.ChannelId.MAX_APPARENT_POWER;
import static io.openems.edge.batteryinverter.kaco.blueplanetgridsave.BatteryInverterKacoBlueplanetGridsave.WATCHDOG_TIMEOUT_SECONDS;
import static io.openems.edge.batteryinverter.kaco.blueplanetgridsave.BatteryInverterKacoBlueplanetGridsave.WATCHDOG_TRIGGER_SECONDS;
@@ -27,7 +28,6 @@
import io.openems.edge.common.test.ComponentTest;
import io.openems.edge.common.test.DummyComponentManager;
import io.openems.edge.common.test.DummyConfigurationAdmin;
-import io.openems.edge.common.test.TestUtils;
public class BatteryInverterKacoBlueplanetGridsaveImplTest {
@@ -49,17 +49,16 @@ protected void handleEvent(String topic) throws Exception {
}
- private static TimeLeapClock clock;
+ private static final TimeLeapClock CLOCK = createDummyClock();
private static ComponentTest test;
@Before
public void prepareTest() throws Exception {
- clock = TestUtils.createDummyClock();
var sut = new BatteryInverterKacoBlueplanetGridsaveImpl();
test = new MyComponentTest(sut) //
.addReference("cm", new DummyConfigurationAdmin()) //
- .addReference("componentManager", new DummyComponentManager(clock)) //
+ .addReference("componentManager", new DummyComponentManager(CLOCK)) //
.addReference("setModbus", new DummyModbusBridge("modbus0"));
// TODO implement proper Dummy-Modbus-Bridge with SunSpec support. Till then...
@@ -97,10 +96,10 @@ public void testStart() throws Exception {
.input(MAX_APPARENT_POWER, 50_000) //
.output(STATE_MACHINE, State.UNDEFINED)) //
.next(new TestCase() //
- .timeleap(clock, 4, SECONDS) //
+ .timeleap(CLOCK, 4, SECONDS) //
.output(STATE_MACHINE, State.GO_RUNNING)) //
.next(new TestCase() //
- .timeleap(clock, 1, SECONDS) //
+ .timeleap(CLOCK, 1, SECONDS) //
.input(CURRENT_STATE.getChannelId(), S64201CurrentState.GRID_CONNECTED) //
.output(WATCHDOG.getChannelId(), WATCHDOG_TIMEOUT_SECONDS)) //
.next(new TestCase() //
@@ -114,10 +113,10 @@ public void testWatchdog() throws Exception {
.next(new TestCase() //
.output(WATCHDOG.getChannelId(), WATCHDOG_TIMEOUT_SECONDS)) //
.next(new TestCase() //
- .timeleap(clock, WATCHDOG_TRIGGER_SECONDS - 1, SECONDS) //
+ .timeleap(CLOCK, WATCHDOG_TRIGGER_SECONDS - 1, SECONDS) //
.output(WATCHDOG.getChannelId(), null /* waiting till next watchdog trigger */)) //
.next(new TestCase() //
- .timeleap(clock, 1, SECONDS) //
+ .timeleap(CLOCK, 1, SECONDS) //
.output(WATCHDOG.getChannelId(), WATCHDOG_TIMEOUT_SECONDS)) //
;
}
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/BatteryInverterRefuStore88kImpl.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/BatteryInverterRefuStore88kImpl.java
index a63d14f76fd..3a66adce7a3 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/BatteryInverterRefuStore88kImpl.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/BatteryInverterRefuStore88kImpl.java
@@ -490,22 +490,11 @@ public void setStartStop(StartStop value) {
@Override
public StartStop getStartStopTarget() {
- switch (this.config.startStop()) {
- case AUTO:
- // read StartStop-Channel
- return this.startStopTarget.get();
-
- case START:
- // force START
- return StartStop.START;
-
- case STOP:
- // force STOP
- return StartStop.STOP;
- }
-
- assert false;
- return StartStop.UNDEFINED; // can never happen
+ return switch (this.config.startStop()) {
+ case AUTO -> this.startStopTarget.get(); // read StartStop-Channel
+ case START -> StartStop.START; // force START
+ case STOP -> StartStop.STOP; // force STOP
+ };
}
/**
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/GoRunningHandler.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/GoRunningHandler.java
index 4e28a0ab7fe..c76b73e045f 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/GoRunningHandler.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/GoRunningHandler.java
@@ -22,31 +22,22 @@ public State runAndGetNextState(Context context) throws OpenemsNamedException {
return State.UNDEFINED;
}
- switch (inverter.getOperatingState()) {
-
- case STARTING:
- return State.GO_RUNNING;
- case MPPT:
- case STARTED:
- case THROTTLED:
+ return switch (inverter.getOperatingState()) {
+ case STARTING //
+ -> State.GO_RUNNING;
+ case MPPT, STARTED, THROTTLED -> //
// if inverter is throttled, full power is not available, but the device
// is still working
- return State.RUNNING;
- case STANDBY:
+ State.RUNNING;
+ case STANDBY -> {
inverter.exitStandbyMode();
- return State.GO_RUNNING;
- // if inverter is throttled, full power is not available, but the device
- // is still working
- case FAULT:
- return State.ERROR;
- case OFF:
- case SLEEPING:
- case SHUTTING_DOWN:
-
- case UNDEFINED:
- return State.UNDEFINED;
+ yield State.GO_RUNNING;
}
- return State.UNDEFINED;
+ case FAULT //
+ -> State.ERROR;
+ case OFF, SLEEPING, SHUTTING_DOWN, UNDEFINED //
+ -> State.UNDEFINED;
+ };
}
}
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/GoStoppedHandler.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/GoStoppedHandler.java
index c40457bc2f2..b8f7d44c34e 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/GoStoppedHandler.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/GoStoppedHandler.java
@@ -10,23 +10,15 @@ public class GoStoppedHandler extends StateHandler {
public State runAndGetNextState(Context context) throws OpenemsNamedException {
var inverter = context.getParent();
- switch (inverter.getOperatingState()) {
- case STARTING:
- case MPPT:
- case THROTTLED:
- case STARTED:
+ return switch (inverter.getOperatingState()) {
+ case STARTING, MPPT, THROTTLED, STARTED -> {
inverter.stopInverter();
- return State.GO_STOPPED;
- case FAULT:
- case STANDBY:
- return State.STOPPED;
- case SHUTTING_DOWN:
- case OFF:
- case SLEEPING:
- case UNDEFINED:
- return State.UNDEFINED;
+ yield State.GO_STOPPED;
}
-
- return State.UNDEFINED;
+ case FAULT, STANDBY //
+ -> State.STOPPED;
+ case SHUTTING_DOWN, OFF, SLEEPING, UNDEFINED //
+ -> State.UNDEFINED;
+ };
}
}
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/RunningHandler.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/RunningHandler.java
index 13e6ace900f..89a47b7315a 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/RunningHandler.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/RunningHandler.java
@@ -26,28 +26,19 @@ public State runAndGetNextState(Context context) throws OpenemsNamedException {
return State.UNDEFINED;
}
- switch (inverter.getOperatingState()) {
-
- case STARTED:
- case THROTTLED:
- case MPPT:
+ return switch (inverter.getOperatingState()) {
+ case STARTED, THROTTLED, MPPT -> {
// Mark as started
inverter._setStartStop(StartStop.START);
// Apply Active and Reactive Power Set-Points
this.applyPower(context);
- return State.RUNNING;
- case FAULT:
- return State.ERROR;
- case OFF:
- case SLEEPING:
- case STARTING:
- case SHUTTING_DOWN:
- case STANDBY:
- case UNDEFINED:
- return State.UNDEFINED;
+ yield State.RUNNING;
}
-
- return State.UNDEFINED;
+ case FAULT //
+ -> State.ERROR;
+ case OFF, SLEEPING, STARTING, SHUTTING_DOWN, STANDBY, UNDEFINED //
+ -> State.UNDEFINED;
+ };
}
/**
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/StateMachine.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/StateMachine.java
index 17e940975a2..04c64c3e00a 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/StateMachine.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/StateMachine.java
@@ -51,20 +51,13 @@ public StateMachine(State initialState) {
@Override
public StateHandler getStateHandler(State state) {
- switch (state) {
- case UNDEFINED:
- return new UndefinedHandler();
- case GO_RUNNING:
- return new GoRunningHandler();
- case RUNNING:
- return new RunningHandler();
- case GO_STOPPED:
- return new GoStoppedHandler();
- case STOPPED:
- return new StoppedHandler();
- case ERROR:
- return new ErrorHandler();
- }
- throw new IllegalArgumentException("Unknown State [" + state + "]");
+ return switch (state) {
+ case UNDEFINED -> new UndefinedHandler();
+ case GO_RUNNING -> new GoRunningHandler();
+ case RUNNING -> new RunningHandler();
+ case GO_STOPPED -> new GoStoppedHandler();
+ case STOPPED -> new StoppedHandler();
+ case ERROR -> new ErrorHandler();
+ };
}
}
\ No newline at end of file
diff --git a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/UndefinedHandler.java b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/UndefinedHandler.java
index 7a0c4b26780..d38ff233e04 100644
--- a/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/UndefinedHandler.java
+++ b/io.openems.edge.batteryinverter.refu88k/src/io/openems/edge/batteryinverter/refu88k/statemachine/UndefinedHandler.java
@@ -8,29 +8,19 @@ public class UndefinedHandler extends StateHandler {
@Override
public State runAndGetNextState(Context context) {
var inverter = context.getParent();
-
- switch (inverter.getStartStopTarget()) {
- case UNDEFINED:
- // Stuck in UNDEFINED State
- return State.UNDEFINED;
-
- case START:
- // force START
- if (inverter.hasFaults()) {
- // Has Faults -> error handling
- return State.ERROR;
- } else {
- // No Faults -> start
- return State.GO_RUNNING;
- }
-
- case STOP:
- // force STOP
- return State.GO_STOPPED;
- }
-
- assert false;
- return State.UNDEFINED; // can never happen
+ return switch (inverter.getStartStopTarget()) {
+ case UNDEFINED // Stuck in UNDEFINED State
+ -> State.UNDEFINED;
+
+ case START // force START
+ -> inverter.hasFaults() //
+ // Has Faults -> error handling
+ ? State.ERROR
+ // No Faults -> start
+ : State.GO_RUNNING;
+
+ case STOP // force STOP
+ -> State.GO_STOPPED;
+ };
}
-
}
diff --git a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/BatteryInverterSinexcelImpl.java b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/BatteryInverterSinexcelImpl.java
index 5a65149220b..cfface51a1b 100644
--- a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/BatteryInverterSinexcelImpl.java
+++ b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/BatteryInverterSinexcelImpl.java
@@ -333,22 +333,11 @@ public void setStartStop(StartStop value) {
* @return {@link StartStop}
*/
public StartStop getStartStopTarget() {
- switch (this.config.startStop()) {
- case AUTO:
- // read StartStop-Channel
- return this.startStopTarget.get();
-
- case START:
- // force START
- return StartStop.START;
-
- case STOP:
- // force STOP
- return StartStop.STOP;
- }
-
- assert false;
- return StartStop.UNDEFINED; // can never happen
+ return switch (this.config.startStop()) {
+ case AUTO -> this.startStopTarget.get(); // read StartStop-Channel
+ case START -> StartStop.START; // force START
+ case STOP -> StartStop.STOP; // force STOP
+ };
}
protected final AtomicReference targetGridMode = new AtomicReference<>(TargetGridMode.GO_ON_GRID);
diff --git a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/StateMachine.java b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/StateMachine.java
index 372a69a8287..723d3285112 100644
--- a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/StateMachine.java
+++ b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/StateMachine.java
@@ -51,20 +51,13 @@ public StateMachine(State initialState) {
@Override
public StateHandler getStateHandler(State state) {
- switch (state) {
- case UNDEFINED:
- return new UndefinedHandler();
- case GO_RUNNING:
- return new GoRunningHandler();
- case RUNNING:
- return new RunningHandler();
- case GO_STOPPED:
- return new GoStoppedHandler();
- case STOPPED:
- return new StoppedHandler();
- case ERROR:
- return new ErrorHandler();
- }
- throw new IllegalArgumentException("Unknown State [" + state + "]");
+ return switch (state) {
+ case UNDEFINED -> new UndefinedHandler();
+ case GO_RUNNING -> new GoRunningHandler();
+ case RUNNING -> new RunningHandler();
+ case GO_STOPPED -> new GoStoppedHandler();
+ case STOPPED -> new StoppedHandler();
+ case ERROR -> new ErrorHandler();
+ };
}
}
diff --git a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/UndefinedHandler.java b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/UndefinedHandler.java
index cb2346bc3fe..409482e87ab 100644
--- a/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/UndefinedHandler.java
+++ b/io.openems.edge.batteryinverter.sinexcel/src/io/openems/edge/batteryinverter/sinexcel/statemachine/UndefinedHandler.java
@@ -9,28 +9,20 @@ public class UndefinedHandler extends StateHandler {
@Override
public State runAndGetNextState(Context context) throws OpenemsNamedException {
final var inverter = context.getParent();
- switch (inverter.getStartStopTarget()) {
- case UNDEFINED:
- // Stuck in UNDEFINED State
- return State.UNDEFINED;
+ return switch (inverter.getStartStopTarget()) {
+ case UNDEFINED // Stuck in UNDEFINED State
+ -> State.UNDEFINED;
- case START:
- // force START
- if (inverter.hasFaults()) {
- // Has Faults -> error handling
- return State.ERROR;
- } else {
- // No Faults -> start
- return State.GO_RUNNING;
- }
+ case START // force START
+ -> inverter.hasFaults() //
+ // Has Faults -> error handling
+ ? State.ERROR
+ // No Faults -> start
+ : State.GO_RUNNING;
- case STOP:
- // force STOP
- return State.GO_STOPPED;
- }
-
- assert false;
- return State.UNDEFINED; // can never happen
+ case STOP// force STOP
+ -> State.GO_STOPPED;
+ };
}
}
diff --git a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/BridgeHttpImpl.java b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/BridgeHttpImpl.java
index 460236c183c..c12bcb9afd3 100644
--- a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/BridgeHttpImpl.java
+++ b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/BridgeHttpImpl.java
@@ -1,5 +1,7 @@
package io.openems.edge.bridge.http;
+import static io.openems.common.utils.FunctionUtils.doNothing;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -20,6 +22,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import io.openems.common.types.DebugMode;
import io.openems.common.utils.FunctionUtils;
import io.openems.edge.bridge.http.api.BridgeHttp;
import io.openems.edge.bridge.http.api.BridgeHttpExecutor;
@@ -145,6 +148,8 @@ public void shutdown() {
private final Set timeEndpoints = ConcurrentHashMap.newKeySet();
+ private DebugMode debugMode = DebugMode.OFF;
+
@Activate
public BridgeHttpImpl(//
@Reference final CycleSubscriber cycleSubscriber, //
@@ -170,6 +175,11 @@ public void deactivate() {
this.timeEndpoints.clear();
}
+ @Override
+ public void setDebugMode(DebugMode debugMode) {
+ this.debugMode = debugMode;
+ }
+
@Override
public CycleEndpoint subscribeCycle(CycleEndpoint endpoint) {
Objects.requireNonNull(endpoint, "CycleEndpoint is not allowed to be null!");
@@ -189,11 +199,14 @@ public TimeEndpoint subscribeTime(TimeEndpoint endpoint) {
this.timeEndpoints.add(endpointCountdown);
final var delay = endpoint.delayTimeProvider().onFirstRunDelay();
- // TODO change in java 21 to switch case
- if (delay instanceof Delay.DurationDelay durationDelay) {
+ switch (delay) {
+ case Delay.InfiniteDelay infiniteDelay //
+ -> doNothing();
+ case Delay.DurationDelay durationDelay -> {
final var future = this.pool.schedule(this.createTask(endpointCountdown), durationDelay);
endpointCountdown.setShutdownCurrentTask(() -> future.cancel(false));
}
+ }
return endpoint;
}
@@ -202,7 +215,7 @@ public CompletableFuture> request(Endpoint endpoint) {
final var future = new CompletableFuture>();
this.pool.execute(() -> {
try {
- final var result = this.urlFetcher.fetchEndpoint(endpoint);
+ final var result = this.urlFetcher.fetchEndpoint(endpoint, this.debugMode);
future.complete(result);
} catch (HttpError e) {
future.completeExceptionally(e);
@@ -252,7 +265,8 @@ private void handleEvent(Event event) {
private Runnable createTask(CycleEndpointCountdown endpointItem) {
return () -> {
try {
- final var result = this.urlFetcher.fetchEndpoint(endpointItem.getCycleEndpoint().endpoint().get());
+ final var result = this.urlFetcher.fetchEndpoint(endpointItem.getCycleEndpoint().endpoint().get(),
+ this.debugMode);
endpointItem.getCycleEndpoint().onResult().accept(result);
} catch (HttpError e) {
endpointItem.getCycleEndpoint().onError().accept(e);
@@ -275,7 +289,8 @@ private Runnable createTask(TimeEndpointCountdown endpointCountdown) {
HttpResponse result = null;
HttpError error = null;
try {
- result = this.urlFetcher.fetchEndpoint(endpointCountdown.getTimeEndpoint().endpoint().get());
+ result = this.urlFetcher.fetchEndpoint(endpointCountdown.getTimeEndpoint().endpoint().get(),
+ this.debugMode);
endpointCountdown.getTimeEndpoint().onResult().accept(result);
} catch (HttpError e) {
endpointCountdown.getTimeEndpoint().onError().accept(e);
@@ -298,14 +313,14 @@ private Runnable createTask(TimeEndpointCountdown endpointCountdown) {
nextDelay = endpointCountdown.getTimeEndpoint().delayTimeProvider().onSuccessRunDelay(result);
}
- // TODO change in java 21 to switch case
- if (nextDelay instanceof Delay.InfiniteDelay) {
- // do not queue again
- return;
- } else if (nextDelay instanceof Delay.DurationDelay durationDelay) {
+ switch (nextDelay) {
+ case Delay.InfiniteDelay infiniteDelay //
+ -> doNothing();
+ case Delay.DurationDelay durationDelay -> {
final var future = this.pool.schedule(this.createTask(endpointCountdown), durationDelay);
endpointCountdown.setShutdownCurrentTask(() -> future.cancel(false));
}
+ }
} catch (Exception e) {
if (this.pool.isShutdown()) {
diff --git a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/NetworkEndpointFetcher.java b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/NetworkEndpointFetcher.java
index 3a751cd7ffc..4d19f500373 100644
--- a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/NetworkEndpointFetcher.java
+++ b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/NetworkEndpointFetcher.java
@@ -10,18 +10,24 @@
import java.net.URI;
import org.osgi.service.component.annotations.Component;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import io.openems.common.types.DebugMode;
import io.openems.common.types.HttpStatus;
import io.openems.edge.bridge.http.api.BridgeHttp.Endpoint;
import io.openems.edge.bridge.http.api.EndpointFetcher;
import io.openems.edge.bridge.http.api.HttpError;
import io.openems.edge.bridge.http.api.HttpResponse;
+import io.openems.edge.bridge.http.dummy.DummyEndpointFetcher;
@Component
public class NetworkEndpointFetcher implements EndpointFetcher {
+ private final Logger log = LoggerFactory.getLogger(DummyEndpointFetcher.class);
+
@Override
- public HttpResponse fetchEndpoint(final Endpoint endpoint) throws HttpError {
+ public HttpResponse fetchEndpoint(final Endpoint endpoint, DebugMode mode) throws HttpError {
try {
var url = URI.create(endpoint.url()).toURL();
var con = (HttpURLConnection) url.openConnection();
@@ -53,6 +59,12 @@ public HttpResponse fetchEndpoint(final Endpoint endpoint) throws HttpEr
if (status.isError()) {
throw new HttpError.ResponseError(status, body);
}
+ if (mode.equals(DebugMode.DETAILED)) {
+ this.log.debug("Fetched Endpoint for request: " + endpoint.url() + "\n" //
+ + "method: " + endpoint.method().name() + "\n" //
+ + "result: " + body //
+ );
+ }
return new HttpResponse<>(status, body);
} catch (IOException e) {
throw new HttpError.UnknownError(e);
diff --git a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/api/BridgeHttp.java b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/api/BridgeHttp.java
index 52e198f75f8..d3cbf4352e9 100644
--- a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/api/BridgeHttp.java
+++ b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/api/BridgeHttp.java
@@ -10,6 +10,7 @@
import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
import io.openems.common.function.ThrowingFunction;
+import io.openems.common.types.DebugMode;
import io.openems.common.utils.JsonUtils;
/**
@@ -73,6 +74,8 @@ public record Endpoint(//
}
+ public void setDebugMode(DebugMode debugMode);
+
/**
* Fetches the url once with {@link HttpMethod#GET}.
*
diff --git a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/api/EndpointFetcher.java b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/api/EndpointFetcher.java
index c2467110749..e0d1bb54235 100644
--- a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/api/EndpointFetcher.java
+++ b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/api/EndpointFetcher.java
@@ -1,6 +1,7 @@
package io.openems.edge.bridge.http.api;
import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.types.DebugMode;
import io.openems.edge.bridge.http.api.BridgeHttp.Endpoint;
public interface EndpointFetcher {
@@ -9,10 +10,11 @@ public interface EndpointFetcher {
* Creates a {@link Runnable} to execute a request with the given parameters.
*
* @param endpoint the {@link Endpoint} to fetch
+ * @param mode the {@link DebugMode}
*
* @return the result of the {@link Endpoint}
* @throws OpenemsNamedException on error
*/
- public HttpResponse fetchEndpoint(Endpoint endpoint) throws HttpError;
+ public HttpResponse fetchEndpoint(Endpoint endpoint, DebugMode mode) throws HttpError;
}
diff --git a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyBridgeHttp.java b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyBridgeHttp.java
index 99040297ca2..647c1d3e6be 100644
--- a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyBridgeHttp.java
+++ b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyBridgeHttp.java
@@ -6,6 +6,7 @@
import java.util.concurrent.CompletableFuture;
import java.util.function.Predicate;
+import io.openems.common.types.DebugMode;
import io.openems.edge.bridge.http.api.BridgeHttp;
import io.openems.edge.bridge.http.api.HttpResponse;
@@ -55,4 +56,9 @@ public Collection removeTimeEndpointIf(Predicate con
return emptyList();
}
+ @Override
+ public void setDebugMode(DebugMode debugMode) {
+ // do nothing
+ }
+
}
diff --git a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyBridgeHttpExecutor.java b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyBridgeHttpExecutor.java
index cf1d07df092..71b7370b2fb 100644
--- a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyBridgeHttpExecutor.java
+++ b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyBridgeHttpExecutor.java
@@ -1,6 +1,6 @@
package io.openems.edge.bridge.http.dummy;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
+import static io.openems.common.test.TestUtils.createDummyClock;
import java.time.Clock;
import java.time.Duration;
diff --git a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyEndpointFetcher.java b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyEndpointFetcher.java
index 907c714f0d5..269148dd1a9 100644
--- a/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyEndpointFetcher.java
+++ b/io.openems.edge.bridge.http/src/io/openems/edge/bridge/http/dummy/DummyEndpointFetcher.java
@@ -7,6 +7,7 @@
import org.slf4j.LoggerFactory;
import io.openems.common.function.ThrowingFunction;
+import io.openems.common.types.DebugMode;
import io.openems.common.utils.FunctionUtils;
import io.openems.edge.bridge.http.api.BridgeHttp.Endpoint;
import io.openems.edge.bridge.http.api.EndpointFetcher;
@@ -29,7 +30,8 @@ public record DummyHandler(//
@Override
public HttpResponse fetchEndpoint(//
- final Endpoint endpoint //
+ final Endpoint endpoint, //
+ DebugMode mode //
) throws HttpError {
try {
for (final var iterator = this.urlHandler.iterator(); iterator.hasNext();) {
@@ -89,5 +91,4 @@ public void addSingleUseEndpointHandler(ThrowingFunction new DurationDelay(this.duration.plus(durationDelay.getDuration()));
+ case InfiniteDelay infiniteDelay //
+ -> delay.plus(this);
+ };
}
@Override
diff --git a/io.openems.edge.bridge.http/test/io/openems/edge/bridge/http/api/BridgeHttpTimeTest.java b/io.openems.edge.bridge.http/test/io/openems/edge/bridge/http/api/BridgeHttpTimeTest.java
index db098dab702..203f1f8ceb7 100644
--- a/io.openems.edge.bridge.http/test/io/openems/edge/bridge/http/api/BridgeHttpTimeTest.java
+++ b/io.openems.edge.bridge.http/test/io/openems/edge/bridge/http/api/BridgeHttpTimeTest.java
@@ -1,7 +1,7 @@
package io.openems.edge.bridge.http.api;
+import static io.openems.common.test.TestUtils.createDummyClock;
import static io.openems.edge.bridge.http.time.DelayTimeProviderChain.fixedDelay;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
import static org.junit.Assert.assertEquals;
import java.time.Duration;
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/AbstractOpenemsModbusComponent.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/AbstractOpenemsModbusComponent.java
index 80c29c5f234..2162ecc794c 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/AbstractOpenemsModbusComponent.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/AbstractOpenemsModbusComponent.java
@@ -354,7 +354,8 @@ public ELEMENT build() {
// dynamically get the Converter; this allows the converter to be changed
var converter = this.channelMaps.get(channel);
var convertedValue = converter.channelToElement(value);
- if (this.element instanceof ModbusRegisterElement registerElement) {
+ switch (this.element) {
+ case ModbusRegisterElement registerElement -> {
try {
registerElement.setNextWriteValueFromObject(convertedValue);
} catch (IllegalArgumentException e) {
@@ -369,8 +370,9 @@ public ELEMENT build() {
e.printStackTrace();
}
}
+ }
- } else if (this.element instanceof CoilElement coilElement) {
+ case CoilElement coilElement -> {
try {
coilElement.setNextWriteValue(TypeUtils.getAsType(OpenemsType.BOOLEAN, convertedValue));
} catch (IllegalArgumentException e) {
@@ -378,9 +380,10 @@ public ELEMENT build() {
"Unable to write to ModbusCoilElement " //
+ "[" + this.element.startAddress + "]: " + e.getMessage());
}
+ }
- } else {
- AbstractOpenemsModbusComponent.this.logWarn(AbstractOpenemsModbusComponent.this.log,
+ default //
+ -> AbstractOpenemsModbusComponent.this.logWarn(AbstractOpenemsModbusComponent.this.log,
"Unable to write to Element " //
+ "[" + this.element.startAddress + "]: it is not a ModbusElement");
}
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelConverter.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelConverter.java
index 87a9c0eb0bb..17de9f9ea32 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelConverter.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelConverter.java
@@ -441,47 +441,41 @@ private static Object apply(//
Function floatFactor, //
Function doubleFactor //
) {
- if (value == null) {
- return null;
- }
- if (value instanceof Boolean) {
- return (boolean) value;
- }
- if (value instanceof Short s) {
+ return switch (value) {
+ case null -> null;
+ case Boolean b -> b;
+ case Short s -> {
long result = shortFactor.apply(s);
if (result >= Short.MIN_VALUE && result <= Short.MAX_VALUE) {
- return Short.valueOf((short) result);
- }
- if (result > Integer.MIN_VALUE && result < Integer.MAX_VALUE) {
- return Integer.valueOf((int) result);
- } else {
- return Long.valueOf(result);
+ yield Short.valueOf((short) result);
+ } else if (result > Integer.MIN_VALUE && result < Integer.MAX_VALUE) {
+ yield Integer.valueOf((int) result);
}
+ yield Long.valueOf(result);
}
- if (value instanceof Integer i) {
+ case Integer i -> {
long result = integerFactor.apply(i);
if (result >= Integer.MIN_VALUE && result <= Integer.MAX_VALUE) {
- return Integer.valueOf((int) result);
+ yield Integer.valueOf((int) result);
}
- return Long.valueOf(result);
- }
- if (value instanceof Long l) {
- return longFactor.apply(l);
+ yield Long.valueOf(result);
}
- if (value instanceof Float f) {
+ case Long l //
+ -> longFactor.apply(l);
+ case Float f -> {
double result = floatFactor.apply(f);
if (result >= Float.MIN_VALUE && result <= Float.MAX_VALUE) {
- return Float.valueOf((float) result);
+ yield Float.valueOf((float) result);
}
- return Double.valueOf(result);
+ yield Double.valueOf(result);
}
- if (value instanceof Double d) {
- return doubleFactor.apply(d);
- }
- if (value instanceof String) {
- return value;
- }
- throw new IllegalArgumentException(
- "Type [" + value.getClass().getName() + "] not supported by OFFSET converter");
+ case Double d //
+ -> doubleFactor.apply(d);
+ case String s //
+ -> s;
+ default //
+ -> throw new IllegalArgumentException(
+ "Type [" + value.getClass().getName() + "] not supported by OFFSET converter");
+ };
}
}
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelScaleFactorConverter.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelScaleFactorConverter.java
index cf558a53d99..3cce387c0e0 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelScaleFactorConverter.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelScaleFactorConverter.java
@@ -64,48 +64,43 @@ public ElementToChannelScaleFactorConverter(int scaleFactor) {
private static Object apply(Object value, int scaleFactor) {
var factor = Math.pow(10, scaleFactor * -1);
- if (value == null) {
- return null;
- }
- if (value instanceof Boolean) {
- return (boolean) value;
- }
- if (value instanceof Short) {
- var result = (Short) value * factor;
+ return switch (value) {
+ case null -> null;
+ case Boolean b -> b;
+ case Short s -> {
+ var result = s * factor;
if (result >= Short.MIN_VALUE && result <= Short.MAX_VALUE) {
- return Short.valueOf((short) result);
- }
- if (result > Integer.MIN_VALUE && result < Integer.MAX_VALUE) {
- return Integer.valueOf((int) result);
- } else {
- return Double.valueOf(Math.round(result));
+ yield Short.valueOf((short) result);
+ } else if (result > Integer.MIN_VALUE && result < Integer.MAX_VALUE) {
+ yield Integer.valueOf((int) result);
}
+ yield Double.valueOf(Math.round(result));
}
- if (value instanceof Integer) {
- var result = (Integer) value * factor;
+ case Integer i -> {
+ var result = i * factor;
if (result >= Integer.MIN_VALUE && result <= Integer.MAX_VALUE) {
- return Integer.valueOf((int) result);
+ yield Integer.valueOf((int) result);
}
- return Double.valueOf(Math.round(result));
+ yield Double.valueOf(Math.round(result));
}
- if (value instanceof Long) {
- var result = (Long) value * factor;
- return Math.round(result);
+ case Long l -> {
+ var result = l * factor;
+ yield Math.round(result);
}
- if (value instanceof Float) {
- var result = (Float) value * factor;
+ case Float f -> {
+ var result = f * factor;
if (result >= Float.MIN_VALUE && result <= Float.MAX_VALUE) {
- return Float.valueOf((float) result);
+ yield Float.valueOf((float) result);
}
- return Double.valueOf(result);
- }
- if (value instanceof Double) {
- return Double.valueOf((Double) value * factor);
- }
- if (value instanceof String) {
- return value;
+ yield Double.valueOf(result);
}
- throw new IllegalArgumentException(
- "Type [" + value.getClass().getName() + "] not supported by SCALE_FACTOR converter");
+ case Double d //
+ -> Double.valueOf(d * factor);
+ case String s //
+ -> s;
+ default //
+ -> throw new IllegalArgumentException(
+ "Type [" + value.getClass().getName() + "] not supported by SCALE_FACTOR converter");
+ };
}
}
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/AbstractTask.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/AbstractTask.java
index 35c419f539e..0393ace47e1 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/AbstractTask.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/AbstractTask.java
@@ -1,5 +1,7 @@
package io.openems.edge.bridge.modbus.api.task;
+import static io.openems.common.utils.FunctionUtils.doNothing;
+
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import java.util.function.BiConsumer;
@@ -309,8 +311,8 @@ protected final String toLogMessage(LogVerbosity logVerbosity, int startAddress,
.append(";ref=").append(startAddress).append("/0x").append(Integer.toHexString(startAddress)) //
.append(";length=").append(length); //
switch (logVerbosity) {
- case NONE, DEBUG_LOG, READS_AND_WRITES, READS_AND_WRITES_DURATION, READS_AND_WRITES_DURATION_TRACE_EVENTS -> {
- }
+ case NONE, DEBUG_LOG, READS_AND_WRITES, READS_AND_WRITES_DURATION, READS_AND_WRITES_DURATION_TRACE_EVENTS //
+ -> doNothing();
case READS_AND_WRITES_VERBOSE -> {
if (request != null) {
var hexString = this.payloadToString(request);
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC16WriteRegistersTask.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC16WriteRegistersTask.java
index 7767f54674b..726a4dccb32 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC16WriteRegistersTask.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/task/FC16WriteRegistersTask.java
@@ -85,7 +85,8 @@ protected static List mergeWriteRegisters(ModbusElement[]
Consumer logWarn) {
final var writes = new ArrayList();
for (var element : elements) {
- if (element instanceof ModbusRegisterElement e) {
+ switch (element) {
+ case ModbusRegisterElement e -> {
var registers = e.getNextWriteValueAndReset();
if (registers != null) {
// found value registers -> add to 'writes'
@@ -107,7 +108,8 @@ protected static List mergeWriteRegisters(ModbusElement[]
}
write.add(registers);
}
- } else {
+ }
+ default -> //
logWarn.accept(
"Unable to execute Write for ModbusElement [" + element + "]: No ModbusRegisterElement!");
}
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/worker/ModbusWorker.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/worker/ModbusWorker.java
index 2558852fc4d..d9ad7008a9c 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/worker/ModbusWorker.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/worker/ModbusWorker.java
@@ -1,5 +1,7 @@
package io.openems.edge.bridge.modbus.api.worker;
+import static io.openems.common.utils.FunctionUtils.doNothing;
+
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
@@ -74,21 +76,19 @@ protected void forever() throws InterruptedException {
// execute the task
var result = this.execute.apply(task);
- // NOTE: with Java 21 LTS this can be refactored to a pattern matching switch
- // statement
- if (result instanceof ExecuteState.Ok) {
+ switch (result) {
+ case ExecuteState.Ok es ->
// no exception & at least one sub-task executed
this.markComponentAsDefective(task.getParent(), false);
-
- } else if (result instanceof ExecuteState.NoOp) {
+ case ExecuteState.NoOp es ->
// did not execute anything
-
- } else if (result instanceof ExecuteState.Error) {
+ doNothing();
+ case ExecuteState.Error es -> {
this.markComponentAsDefective(task.getParent(), true);
-
// invalidate elements of this task
this.invalidate.accept(task.getElements());
}
+ }
}
/**
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/AbstractOpenemsSunSpecComponent.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/AbstractOpenemsSunSpecComponent.java
index 42e57c330b4..b64f0a62f48 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/AbstractOpenemsSunSpecComponent.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/AbstractOpenemsSunSpecComponent.java
@@ -346,25 +346,26 @@ protected void addBlock(int startAddress, SunSpecModel model, Priority priority)
*/
protected List addModbusElementAndChannels(int startAddress, SunSpecModel model, SunSpecPoint ssp) {
final var p = ssp.get();
- // TODO migrate to Java 21 Switch Pattern Matching
- if (p instanceof BitFieldPoint bfp) {
+ return switch (p) {
+ case BitFieldPoint bfp -> {
// Channels are added and mapped internally
var alternativeBitPoints = this.getBitPoints(bfp);
- return bfp.generateModbusElements(this, channelId -> this.addChannel(channelId), startAddress,
+ yield bfp.generateModbusElements(this, channelId -> this.addChannel(channelId), startAddress,
alternativeBitPoints);
}
- if (p instanceof ModbusElementPoint mep) {
+ case ModbusElementPoint mep -> {
final var element = mep.generateModbusElement(startAddress);
if (p instanceof ChannelIdPoint cp) {
var channelId = cp.channelId;
this.addChannel(channelId);
this.m(channelId, element, this.generateElementToChannelConverter(model, p));
}
- return List.of(element);
+ yield List.of(element);
}
- return List.of();
+ case ChannelIdPoint cip -> List.of();
+ };
}
/**
@@ -429,11 +430,10 @@ protected ElementToChannelConverter generateElementToChannelConverter(SunSpecMod
/* Channel -> Element */ value -> value);
// Generate Scale-Factor converter (possibly null)
- ElementToChannelConverter scaleFactorConverter = null;
-
- if (point instanceof ScaledValuePoint svp) {
+ var scaleFactorConverter = switch (point) {
+ case ScaledValuePoint svp -> {
final var scaleFactorName = toUpperUnderscore(svp.scaleFactor);
- scaleFactorConverter = Stream.of(model.points()) //
+ yield Stream.of(model.points()) //
.filter(p -> p.name().equals(scaleFactorName)) //
.map(SunSpecPoint::get) //
.filter(ScaleFactorPoint.class::isInstance) //
@@ -454,6 +454,8 @@ protected ElementToChannelConverter generateElementToChannelConverter(SunSpecMod
}
}); //
}
+ default -> null;
+ };
if (scaleFactorConverter != null) {
return ElementToChannelConverter.chain(valueIsDefinedConverter, scaleFactorConverter);
@@ -470,17 +472,16 @@ protected ElementToChannelConverter generateElementToChannelConverter(SunSpecMod
* @return the optional {@link Channel}
*/
protected > Optional getSunSpecChannel(SunSpecPoint ssp) {
- var point = ssp.get();
- if (point instanceof ChannelIdPoint cp) {
+ return switch (ssp.get()) {
+ case ChannelIdPoint cp -> {
try {
- return Optional.ofNullable(this.channel(cp.channelId));
+ yield Optional.ofNullable(this.channel(cp.channelId));
} catch (IllegalArgumentException e) {
- // Ignore
+ yield Optional.empty();
}
- } else {
- // Ignore
}
- return Optional.empty();
+ default -> Optional.empty();
+ };
}
/**
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/DefaultSunSpecModel.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/DefaultSunSpecModel.java
index 8911c6ee34e..7d5a31e4c8d 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/DefaultSunSpecModel.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/DefaultSunSpecModel.java
@@ -2,7 +2,29 @@
package io.openems.edge.bridge.modbus.sunspec;
-import io.openems.common.channel.AccessMode;
+import static io.openems.common.channel.AccessMode.READ_ONLY;
+import static io.openems.common.channel.AccessMode.READ_WRITE;
+import static io.openems.edge.bridge.modbus.sunspec.Point.BitFieldPoint.Type.BITFIELD16;
+import static io.openems.edge.bridge.modbus.sunspec.Point.BitFieldPoint.Type.BITFIELD32;
+import static io.openems.edge.bridge.modbus.sunspec.Point.EnumPoint.Type.ENUM16;
+import static io.openems.edge.bridge.modbus.sunspec.Point.EnumPoint.Type.ENUM32;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.ACC32;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.ACC64;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.FLOAT32;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.INT16;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.INT32;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.STRING16;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.STRING2;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.STRING20;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.STRING32;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.STRING4;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.STRING5;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.STRING6;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.STRING8;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.UINT16;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.UINT32;
+import static io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint.Type.UINT64;
+
import io.openems.common.channel.Level;
import io.openems.common.channel.Unit;
import io.openems.common.types.OptionsEnum;
@@ -166,25 +188,25 @@ public enum DefaultSunSpecModel implements SunSpecModel {
public static enum S1 implements SunSpecPoint {
MN(new ValuePoint("S1_MN", "Manufacturer", //
"Well known value registered with SunSpec for compliance", //
- ValuePoint.Type.STRING16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ STRING16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
MD(new ValuePoint("S1_MD", "Model", //
"Manufacturer specific value (32 chars)", //
- ValuePoint.Type.STRING16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ STRING16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
OPT(new ValuePoint("S1_OPT", "Options", //
"Manufacturer specific value (16 chars)", //
- ValuePoint.Type.STRING8, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ STRING8, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
VR(new ValuePoint("S1_VR", "Version", //
"Manufacturer specific value (16 chars)", //
- ValuePoint.Type.STRING8, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ STRING8, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
SN(new ValuePoint("S1_SN", "Serial Number", //
"Manufacturer specific value (32 chars)", //
- ValuePoint.Type.STRING16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ STRING16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
DA(new ValuePoint("S1_DA", "Device Address", //
"Modbus device address", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
PAD(new ValuePoint("S1_PAD", "", //
"Force even alignment", //
- ValuePoint.Type.PAD, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+ ValuePoint.Type.PAD, false /* mandatory? */, READ_ONLY, Unit.NONE));
private final Point point;
@@ -201,34 +223,34 @@ public Point get() {
public static enum S2 implements SunSpecPoint {
AID(new ValuePoint("S2_AID", "AID", //
"Aggregated model id", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
N(new ValuePoint("S2_N", "N", //
"Number of aggregated models", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
UN(new ValuePoint("S2_UN", "UN", //
"Update Number. Incrementing number each time the mapping is changed. If the number is not changed from the last reading the direct access to a specific offset will result in reading the same logical model as before. Otherwise the entire model must be read to refresh the changes", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
ST(new EnumPoint("S2_ST", "Status", //
"Enumerated status code", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S2_St.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S2_St.values())), //
ST_VND(new EnumPoint("S2_ST_VND", "Vendor Status", //
"Vendor specific status code", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+ ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
EVT(new BitFieldPoint("S2_EVT", "Event Code", //
"Bitmask event code", //
- BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S2_Evt.values())), //
+ BITFIELD32, true /* mandatory? */, READ_ONLY, S2_Evt.values())), //
EVT_VND(new BitFieldPoint("S2_EVT_VND", "Vendor Event Code", //
"Vendor specific event code", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
CTL(new EnumPoint("S2_CTL", "Control", //
"Control register for all aggregated devices", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S2_Ctl.values())), //
+ ENUM16, false /* mandatory? */, READ_ONLY, S2_Ctl.values())), //
CTL_VND(new EnumPoint("S2_CTL_VND", "Vendor Control", //
"Vendor control register for all aggregated devices", //
- EnumPoint.Type.ENUM32, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+ ENUM32, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
CTL_VL(new EnumPoint("S2_CTL_VL", "Control Value", //
"Numerical value used as a parameter to the control", //
- EnumPoint.Type.ENUM32, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0]));
+ ENUM32, false /* mandatory? */, READ_ONLY, new OptionsEnum[0]));
private final Point point;
@@ -343,42 +365,42 @@ public OptionsEnum getUndefined() {
public static enum S15 implements SunSpecPoint {
CLR(new ValuePoint("S15_CLR", "Clear", //
"Write a \"1\" to clear all counters", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
IN_CNT(new ValuePoint("S15_IN_CNT", "Input Count", //
"Number of bytes received", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
IN_UC_CNT(new ValuePoint("S15_IN_UC_CNT", "Input Unicast Count", //
"Number of Unicast packets received", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
IN_N_UC_CNT(new ValuePoint("S15_IN_N_UC_CNT", "Input Non-Unicast Count", //
"Number of non-Unicast packets received", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
IN_DSC_CNT(new ValuePoint("S15_IN_DSC_CNT", "Input Discarded Count", //
"Number of inbound packets received on the interface but discarded", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
IN_ERR_CNT(new ValuePoint("S15_IN_ERR_CNT", "Input Error Count", //
"Number of inbound packets that contain errors (excluding discards)", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
IN_UNK_CNT(new ValuePoint("S15_IN_UNK_CNT", "Input Unknown Count", //
"Number of inbound packets with unknown protocol", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
OUT_CNT(new ValuePoint("S15_OUT_CNT", "Output Count", //
"Total number of bytes transmitted on this interface", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
OUT_UC_CNT(new ValuePoint("S15_OUT_UC_CNT", "Output Unicast Count", //
"Number of Unicast packets transmitted", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
OUT_N_UC_CNT(new ValuePoint("S15_OUT_N_UC_CNT", "Output Non-Unicast Count", //
"Number of Non-Unicast packets transmitted", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
OUT_DSC_CNT(new ValuePoint("S15_OUT_DSC_CNT", "Output Discarded Count", //
"Number of Discarded output packets", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
OUT_ERR_CNT(new ValuePoint("S15_OUT_ERR_CNT", "Output Error Count", //
"Number of outbound error packets", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
PAD(new ValuePoint("S15_PAD", "", "", //
- ValuePoint.Type.PAD, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+ ValuePoint.Type.PAD, false /* mandatory? */, READ_ONLY, Unit.NONE));
private final Point point;
@@ -395,19 +417,19 @@ public Point get() {
public static enum S18 implements SunSpecPoint {
NAM(new ValuePoint("S18_NAM", "Name", //
"Interface name", //
- ValuePoint.Type.STRING4, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ STRING4, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
IMEI(new ValuePoint("S18_IMEI", "IMEI", //
"International Mobile Equipment Identifier for the interface", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ UINT32, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
APN(new ValuePoint("S18_APN", "APN", //
"Access Point Name for the interface", //
- ValuePoint.Type.STRING4, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ STRING4, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
NUM(new ValuePoint("S18_NUM", "Number", //
"Phone number for the interface", //
- ValuePoint.Type.STRING6, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ STRING6, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
PIN(new ValuePoint("S18_PIN", "PIN", //
"Personal Identification Number for the interface", //
- ValuePoint.Type.STRING6, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE));
+ STRING6, false /* mandatory? */, READ_WRITE, Unit.NONE));
private final Point point;
@@ -424,109 +446,109 @@ public Point get() {
public static enum S101 implements SunSpecPoint {
A(new ScaledValuePoint("S101_A", "Amps", //
"AC Current", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
APH_A(new ScaledValuePoint("S101_APH_A", "Amps PhaseA", //
"Phase A Current", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
APH_B(new ScaledValuePoint("S101_APH_B", "Amps PhaseB", //
"Phase B Current", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
APH_C(new ScaledValuePoint("S101_APH_C", "Amps PhaseC", //
"Phase C Current", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
A_SF(new ScaleFactorPoint("S101_A_SF", "", "")), //
P_P_VPH_A_B(new ScaledValuePoint("S101_P_P_VPH_A_B", "Phase Voltage AB", //
"Phase Voltage AB", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
P_P_VPH_B_C(new ScaledValuePoint("S101_P_P_VPH_B_C", "Phase Voltage BC", //
"Phase Voltage BC", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
P_P_VPH_C_A(new ScaledValuePoint("S101_P_P_VPH_C_A", "Phase Voltage CA", //
"Phase Voltage CA", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_A(new ScaledValuePoint("S101_PH_VPH_A", "Phase Voltage AN", //
"Phase Voltage AN", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_B(new ScaledValuePoint("S101_PH_VPH_B", "Phase Voltage BN", //
"Phase Voltage BN", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_C(new ScaledValuePoint("S101_PH_VPH_C", "Phase Voltage CN", //
"Phase Voltage CN", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
V_SF(new ScaleFactorPoint("S101_V_SF", "", "")), //
W(new ScaledValuePoint("S101_W", "Watts", //
"AC Power", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
W_SF(new ScaleFactorPoint("S101_W_SF", "", "")), //
HZ(new ScaledValuePoint("S101_HZ", "Hz", //
"Line Frequency", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.HERTZ, "Hz_SF")), //
HZ_S_F(new ScaleFactorPoint("S101_HZ_S_F", "", "")), //
VA(new ScaledValuePoint("S101_VA", "VA", //
"AC Apparent Power", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
VA_SF(new ScaleFactorPoint("S101_VA_SF", "", "")), //
V_AR(new ScaledValuePoint("S101_V_AR", "VAr", //
"AC Reactive Power", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAr_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAr_SF")), //
V_AR_S_F(new ScaleFactorPoint("S101_V_AR_S_F", "", "")), //
PF(new ScaledValuePoint("S101_PF", "PF", //
"AC Power Factor", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
PF_SF(new ScaleFactorPoint("S101_PF_SF", "", "")), //
WH(new ScaledValuePoint("S101_WH", "WattHours", //
"AC Energy", //
- ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), //
+ ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), //
WH_SF(new ScaleFactorPoint("S101_WH_SF", "", "")), //
DCA(new ScaledValuePoint("S101_DCA", "DC Amps", //
"DC Current", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "DCA_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "DCA_SF")), //
DCA_SF(new ScaleFactorPoint("S101_DCA_SF", "", "")), //
DCV(new ScaledValuePoint("S101_DCV", "DC Voltage", //
"DC Voltage", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "DCV_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "DCV_SF")), //
DCV_SF(new ScaleFactorPoint("S101_DCV_SF", "", "")), //
DCW(new ScaledValuePoint("S101_DCW", "DC Watts", //
"DC Power", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "DCW_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "DCW_SF")), //
DCW_SF(new ScaleFactorPoint("S101_DCW_SF", "", "")), //
TMP_CAB(new ScaledValuePoint("S101_TMP_CAB", "Cabinet Temperature", //
"Cabinet Temperature", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
TMP_SNK(new ScaledValuePoint("S101_TMP_SNK", "Heat Sink Temperature", //
"Heat Sink Temperature", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
TMP_TRNS(new ScaledValuePoint("S101_TMP_TRNS", "Transformer Temperature", //
"Transformer Temperature", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
TMP_OT(new ScaledValuePoint("S101_TMP_OT", "Other Temperature", //
"Other Temperature", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
TMP_S_F(new ScaleFactorPoint("S101_TMP_S_F", "", "")), //
ST(new EnumPoint("S101_ST", "Operating State", //
"Enumerated value. Operating state", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S101_St.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S101_St.values())), //
ST_VND(new EnumPoint("S101_ST_VND", "Vendor Operating State", //
"Vendor specific operating state code", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+ ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
EVT1(new BitFieldPoint("S101_EVT1", "Event1", //
"Bitmask value. Event fields", //
- BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S101_Evt1.values())), //
+ BITFIELD32, true /* mandatory? */, READ_ONLY, S101_Evt1.values())), //
EVT2(new BitFieldPoint("S101_EVT2", "Event Bitfield 2", //
"Reserved for future use", //
- BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, true /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND1(new BitFieldPoint("S101_EVT_VND1", "Vendor Event Bitfield 1", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND2(new BitFieldPoint("S101_EVT_VND2", "Vendor Event Bitfield 2", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND3(new BitFieldPoint("S101_EVT_VND3", "Vendor Event Bitfield 3", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND4(new BitFieldPoint("S101_EVT_VND4", "Vendor Event Bitfield 4", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0]));
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0]));
private final Point point;
@@ -608,109 +630,109 @@ public BitPoint get() {
public static enum S102 implements SunSpecPoint {
A(new ScaledValuePoint("S102_A", "Amps", //
"AC Current", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
APH_A(new ScaledValuePoint("S102_APH_A", "Amps PhaseA", //
"Phase A Current", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
APH_B(new ScaledValuePoint("S102_APH_B", "Amps PhaseB", //
"Phase B Current", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
APH_C(new ScaledValuePoint("S102_APH_C", "Amps PhaseC", //
"Phase C Current", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
A_SF(new ScaleFactorPoint("S102_A_SF", "", "")), //
P_P_VPH_A_B(new ScaledValuePoint("S102_P_P_VPH_A_B", "Phase Voltage AB", //
"Phase Voltage AB", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
P_P_VPH_B_C(new ScaledValuePoint("S102_P_P_VPH_B_C", "Phase Voltage BC", //
"Phase Voltage BC", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
P_P_VPH_C_A(new ScaledValuePoint("S102_P_P_VPH_C_A", "Phase Voltage CA", //
"Phase Voltage CA", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_A(new ScaledValuePoint("S102_PH_VPH_A", "Phase Voltage AN", //
"Phase Voltage AN", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_B(new ScaledValuePoint("S102_PH_VPH_B", "Phase Voltage BN", //
"Phase Voltage BN", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_C(new ScaledValuePoint("S102_PH_VPH_C", "Phase Voltage CN", //
"Phase Voltage CN", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
V_SF(new ScaleFactorPoint("S102_V_SF", "", "")), //
W(new ScaledValuePoint("S102_W", "Watts", //
"AC Power", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
W_SF(new ScaleFactorPoint("S102_W_SF", "", "")), //
HZ(new ScaledValuePoint("S102_HZ", "Hz", //
"Line Frequency", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.HERTZ, "Hz_SF")), //
HZ_S_F(new ScaleFactorPoint("S102_HZ_S_F", "", "")), //
VA(new ScaledValuePoint("S102_VA", "VA", //
"AC Apparent Power", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
VA_SF(new ScaleFactorPoint("S102_VA_SF", "", "")), //
V_AR(new ScaledValuePoint("S102_V_AR", "VAr", //
"AC Reactive Power", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAr_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAr_SF")), //
V_AR_S_F(new ScaleFactorPoint("S102_V_AR_S_F", "", "")), //
PF(new ScaledValuePoint("S102_PF", "PF", //
"AC Power Factor", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
PF_SF(new ScaleFactorPoint("S102_PF_SF", "", "")), //
WH(new ScaledValuePoint("S102_WH", "WattHours", //
"AC Energy", //
- ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), //
+ ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), //
WH_SF(new ScaleFactorPoint("S102_WH_SF", "", "")), //
DCA(new ScaledValuePoint("S102_DCA", "DC Amps", //
"DC Current", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "DCA_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "DCA_SF")), //
DCA_SF(new ScaleFactorPoint("S102_DCA_SF", "", "")), //
DCV(new ScaledValuePoint("S102_DCV", "DC Voltage", //
"DC Voltage", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "DCV_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "DCV_SF")), //
DCV_SF(new ScaleFactorPoint("S102_DCV_SF", "", "")), //
DCW(new ScaledValuePoint("S102_DCW", "DC Watts", //
"DC Power", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "DCW_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "DCW_SF")), //
DCW_SF(new ScaleFactorPoint("S102_DCW_SF", "", "")), //
TMP_CAB(new ScaledValuePoint("S102_TMP_CAB", "Cabinet Temperature", //
"Cabinet Temperature", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
TMP_SNK(new ScaledValuePoint("S102_TMP_SNK", "Heat Sink Temperature", //
"Heat Sink Temperature", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
TMP_TRNS(new ScaledValuePoint("S102_TMP_TRNS", "Transformer Temperature", //
"Transformer Temperature", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
TMP_OT(new ScaledValuePoint("S102_TMP_OT", "Other Temperature", //
"Other Temperature", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
TMP_S_F(new ScaleFactorPoint("S102_TMP_S_F", "", "")), //
ST(new EnumPoint("S102_ST", "Operating State", //
"Enumerated value. Operating state", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S102_St.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S102_St.values())), //
ST_VND(new EnumPoint("S102_ST_VND", "Vendor Operating State", //
"Vendor specific operating state code", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+ ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
EVT1(new BitFieldPoint("S102_EVT1", "Event1", //
"Bitmask value. Event fields", //
- BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S102_Evt1.values())), //
+ BITFIELD32, true /* mandatory? */, READ_ONLY, S102_Evt1.values())), //
EVT2(new BitFieldPoint("S102_EVT2", "Event Bitfield 2", //
"Reserved for future use", //
- BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, true /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND1(new BitFieldPoint("S102_EVT_VND1", "Vendor Event Bitfield 1", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND2(new BitFieldPoint("S102_EVT_VND2", "Vendor Event Bitfield 2", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND3(new BitFieldPoint("S102_EVT_VND3", "Vendor Event Bitfield 3", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND4(new BitFieldPoint("S102_EVT_VND4", "Vendor Event Bitfield 4", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0]));
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0]));
private final Point point;
@@ -792,109 +814,109 @@ public BitPoint get() {
public static enum S103 implements SunSpecPoint {
A(new ScaledValuePoint("S103_A", "Amps", //
"AC Current", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
APH_A(new ScaledValuePoint("S103_APH_A", "Amps PhaseA", //
"Phase A Current", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
APH_B(new ScaledValuePoint("S103_APH_B", "Amps PhaseB", //
"Phase B Current", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
APH_C(new ScaledValuePoint("S103_APH_C", "Amps PhaseC", //
"Phase C Current", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
A_SF(new ScaleFactorPoint("S103_A_SF", "", "")), //
P_P_VPH_A_B(new ScaledValuePoint("S103_P_P_VPH_A_B", "Phase Voltage AB", //
"Phase Voltage AB", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
P_P_VPH_B_C(new ScaledValuePoint("S103_P_P_VPH_B_C", "Phase Voltage BC", //
"Phase Voltage BC", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
P_P_VPH_C_A(new ScaledValuePoint("S103_P_P_VPH_C_A", "Phase Voltage CA", //
"Phase Voltage CA", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_A(new ScaledValuePoint("S103_PH_VPH_A", "Phase Voltage AN", //
"Phase Voltage AN", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_B(new ScaledValuePoint("S103_PH_VPH_B", "Phase Voltage BN", //
"Phase Voltage BN", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_C(new ScaledValuePoint("S103_PH_VPH_C", "Phase Voltage CN", //
"Phase Voltage CN", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
V_SF(new ScaleFactorPoint("S103_V_SF", "", "")), //
W(new ScaledValuePoint("S103_W", "Watts", //
"AC Power", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
W_SF(new ScaleFactorPoint("S103_W_SF", "", "")), //
HZ(new ScaledValuePoint("S103_HZ", "Hz", //
"Line Frequency", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.HERTZ, "Hz_SF")), //
HZ_S_F(new ScaleFactorPoint("S103_HZ_S_F", "", "")), //
VA(new ScaledValuePoint("S103_VA", "VA", //
"AC Apparent Power", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
VA_SF(new ScaleFactorPoint("S103_VA_SF", "", "")), //
V_AR(new ScaledValuePoint("S103_V_AR", "VAr", //
"AC Reactive Power", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAr_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAr_SF")), //
V_AR_S_F(new ScaleFactorPoint("S103_V_AR_S_F", "", "")), //
PF(new ScaledValuePoint("S103_PF", "PF", //
"AC Power Factor", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
PF_SF(new ScaleFactorPoint("S103_PF_SF", "", "")), //
WH(new ScaledValuePoint("S103_WH", "WattHours", //
"AC Energy", //
- ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), //
+ ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), //
WH_SF(new ScaleFactorPoint("S103_WH_SF", "", "")), //
DCA(new ScaledValuePoint("S103_DCA", "DC Amps", //
"DC Current", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "DCA_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "DCA_SF")), //
DCA_SF(new ScaleFactorPoint("S103_DCA_SF", "", "")), //
DCV(new ScaledValuePoint("S103_DCV", "DC Voltage", //
"DC Voltage", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "DCV_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "DCV_SF")), //
DCV_SF(new ScaleFactorPoint("S103_DCV_SF", "", "")), //
DCW(new ScaledValuePoint("S103_DCW", "DC Watts", //
"DC Power", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "DCW_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "DCW_SF")), //
DCW_SF(new ScaleFactorPoint("S103_DCW_SF", "", "")), //
TMP_CAB(new ScaledValuePoint("S103_TMP_CAB", "Cabinet Temperature", //
"Cabinet Temperature", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
TMP_SNK(new ScaledValuePoint("S103_TMP_SNK", "Heat Sink Temperature", //
"Heat Sink Temperature", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
TMP_TRNS(new ScaledValuePoint("S103_TMP_TRNS", "Transformer Temperature", //
"Transformer Temperature", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
TMP_OT(new ScaledValuePoint("S103_TMP_OT", "Other Temperature", //
"Other Temperature", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
TMP_S_F(new ScaleFactorPoint("S103_TMP_S_F", "", "")), //
ST(new EnumPoint("S103_ST", "Operating State", //
"Enumerated value. Operating state", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S103_St.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S103_St.values())), //
ST_VND(new EnumPoint("S103_ST_VND", "Vendor Operating State", //
"Vendor specific operating state code", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+ ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
EVT1(new BitFieldPoint("S103_EVT1", "Event1", //
"Bitmask value. Event fields", //
- BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S103_Evt1.values())), //
+ BITFIELD32, true /* mandatory? */, READ_ONLY, S103_Evt1.values())), //
EVT2(new BitFieldPoint("S103_EVT2", "Event Bitfield 2", //
"Reserved for future use", //
- BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, true /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND1(new BitFieldPoint("S103_EVT_VND1", "Vendor Event Bitfield 1", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND2(new BitFieldPoint("S103_EVT_VND2", "Vendor Event Bitfield 2", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND3(new BitFieldPoint("S103_EVT_VND3", "Vendor Event Bitfield 3", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND4(new BitFieldPoint("S103_EVT_VND4", "Vendor Event Bitfield 4", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0]));
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0]));
private final Point point;
@@ -976,97 +998,97 @@ public BitPoint get() {
public static enum S111 implements SunSpecPoint {
A(new ValuePoint("S111_A", "Amps", //
"AC Current", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
APH_A(new ValuePoint("S111_APH_A", "Amps PhaseA", //
"Phase A Current", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
APH_B(new ValuePoint("S111_APH_B", "Amps PhaseB", //
"Phase B Current", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
APH_C(new ValuePoint("S111_APH_C", "Amps PhaseC", //
"Phase C Current", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
P_P_VPH_A_B(new ValuePoint("S111_P_P_VPH_A_B", "Phase Voltage AB", //
"Phase Voltage AB", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
P_P_VPH_B_C(new ValuePoint("S111_P_P_VPH_B_C", "Phase Voltage BC", //
"Phase Voltage BC", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
P_P_VPH_C_A(new ValuePoint("S111_P_P_VPH_C_A", "Phase Voltage CA", //
"Phase Voltage CA", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
PH_VPH_A(new ValuePoint("S111_PH_VPH_A", "Phase Voltage AN", //
"Phase Voltage AN", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.VOLT)), //
PH_VPH_B(new ValuePoint("S111_PH_VPH_B", "Phase Voltage BN", //
"Phase Voltage BN", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
PH_VPH_C(new ValuePoint("S111_PH_VPH_C", "Phase Voltage CN", //
"Phase Voltage CN", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
W(new ValuePoint("S111_W", "Watts", //
"AC Power", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.WATT)), //
HZ(new ValuePoint("S111_HZ", "Hz", //
"Line Frequency", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.HERTZ)), //
VA(new ValuePoint("S111_VA", "VA", //
"AC Apparent Power", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE)), //
V_AR(new ValuePoint("S111_V_AR", "VAr", //
"AC Reactive Power", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE)), //
PF(new ValuePoint("S111_PF", "PF", //
"AC Power Factor", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
WH(new ValuePoint("S111_WH", "WattHours", //
"AC Energy", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS)), //
DCA(new ValuePoint("S111_DCA", "DC Amps", //
"DC Current", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
DCV(new ValuePoint("S111_DCV", "DC Voltage", //
"DC Voltage", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
DCW(new ValuePoint("S111_DCW", "DC Watts", //
"DC Power", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.WATT)), //
TMP_CAB(new ValuePoint("S111_TMP_CAB", "Cabinet Temperature", //
"Cabinet Temperature", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
TMP_SNK(new ValuePoint("S111_TMP_SNK", "Heat Sink Temperature", //
"Heat Sink Temperature", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
TMP_TRNS(new ValuePoint("S111_TMP_TRNS", "Transformer Temperature", //
"Transformer Temperature", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
TMP_OT(new ValuePoint("S111_TMP_OT", "Other Temperature", //
"Other Temperature", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
ST(new EnumPoint("S111_ST", "Operating State", //
"Enumerated value. Operating state", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S111_St.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S111_St.values())), //
ST_VND(new EnumPoint("S111_ST_VND", "Vendor Operating State", //
"Vendor specific operating state code", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+ ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
EVT1(new BitFieldPoint("S111_EVT1", "Event1", //
"Bitmask value. Event fields", //
- BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S111_Evt1.values())), //
+ BITFIELD32, true /* mandatory? */, READ_ONLY, S111_Evt1.values())), //
EVT2(new BitFieldPoint("S111_EVT2", "Event Bitfield 2", //
"Reserved for future use", //
- BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, true /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND1(new BitFieldPoint("S111_EVT_VND1", "Vendor Event Bitfield 1", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND2(new BitFieldPoint("S111_EVT_VND2", "Vendor Event Bitfield 2", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND3(new BitFieldPoint("S111_EVT_VND3", "Vendor Event Bitfield 3", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND4(new BitFieldPoint("S111_EVT_VND4", "Vendor Event Bitfield 4", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0]));
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0]));
private final Point point;
@@ -1148,97 +1170,97 @@ public BitPoint get() {
public static enum S112 implements SunSpecPoint {
A(new ValuePoint("S112_A", "Amps", //
"AC Current", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
APH_A(new ValuePoint("S112_APH_A", "Amps PhaseA", //
"Phase A Current", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
APH_B(new ValuePoint("S112_APH_B", "Amps PhaseB", //
"Phase B Current", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
APH_C(new ValuePoint("S112_APH_C", "Amps PhaseC", //
"Phase C Current", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
P_P_VPH_A_B(new ValuePoint("S112_P_P_VPH_A_B", "Phase Voltage AB", //
"Phase Voltage AB", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
P_P_VPH_B_C(new ValuePoint("S112_P_P_VPH_B_C", "Phase Voltage BC", //
"Phase Voltage BC", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
P_P_VPH_C_A(new ValuePoint("S112_P_P_VPH_C_A", "Phase Voltage CA", //
"Phase Voltage CA", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
PH_VPH_A(new ValuePoint("S112_PH_VPH_A", "Phase Voltage AN", //
"Phase Voltage AN", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.VOLT)), //
PH_VPH_B(new ValuePoint("S112_PH_VPH_B", "Phase Voltage BN", //
"Phase Voltage BN", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.VOLT)), //
PH_VPH_C(new ValuePoint("S112_PH_VPH_C", "Phase Voltage CN", //
"Phase Voltage CN", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
W(new ValuePoint("S112_W", "Watts", //
"AC Power", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.WATT)), //
HZ(new ValuePoint("S112_HZ", "Hz", //
"Line Frequency", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.HERTZ)), //
VA(new ValuePoint("S112_VA", "VA", //
"AC Apparent Power", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE)), //
V_AR(new ValuePoint("S112_V_AR", "VAr", //
"AC Reactive Power", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE)), //
PF(new ValuePoint("S112_PF", "PF", //
"AC Power Factor", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
WH(new ValuePoint("S112_WH", "WattHours", //
"AC Energy", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS)), //
DCA(new ValuePoint("S112_DCA", "DC Amps", //
"DC Current", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
DCV(new ValuePoint("S112_DCV", "DC Voltage", //
"DC Voltage", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
DCW(new ValuePoint("S112_DCW", "DC Watts", //
"DC Power", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.WATT)), //
TMP_CAB(new ValuePoint("S112_TMP_CAB", "Cabinet Temperature", //
"Cabinet Temperature", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
TMP_SNK(new ValuePoint("S112_TMP_SNK", "Heat Sink Temperature", //
"Heat Sink Temperature", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
TMP_TRNS(new ValuePoint("S112_TMP_TRNS", "Transformer Temperature", //
"Transformer Temperature", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
TMP_OT(new ValuePoint("S112_TMP_OT", "Other Temperature", //
"Other Temperature", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
ST(new EnumPoint("S112_ST", "Operating State", //
"Enumerated value. Operating state", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S112_St.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S112_St.values())), //
ST_VND(new EnumPoint("S112_ST_VND", "Vendor Operating State", //
"Vendor specific operating state code", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+ ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
EVT1(new BitFieldPoint("S112_EVT1", "Event1", //
"Bitmask value. Event fields", //
- BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S112_Evt1.values())), //
+ BITFIELD32, true /* mandatory? */, READ_ONLY, S112_Evt1.values())), //
EVT2(new BitFieldPoint("S112_EVT2", "Event Bitfield 2", //
"Reserved for future use", //
- BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, true /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND1(new BitFieldPoint("S112_EVT_VND1", "Vendor Event Bitfield 1", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND2(new BitFieldPoint("S112_EVT_VND2", "Vendor Event Bitfield 2", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND3(new BitFieldPoint("S112_EVT_VND3", "Vendor Event Bitfield 3", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND4(new BitFieldPoint("S112_EVT_VND4", "Vendor Event Bitfield 4", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0]));
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0]));
private final Point point;
@@ -1320,97 +1342,97 @@ public BitPoint get() {
public static enum S113 implements SunSpecPoint {
A(new ValuePoint("S113_A", "Amps", //
"AC Current", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
APH_A(new ValuePoint("S113_APH_A", "Amps PhaseA", //
"Phase A Current", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
APH_B(new ValuePoint("S113_APH_B", "Amps PhaseB", //
"Phase B Current", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
APH_C(new ValuePoint("S113_APH_C", "Amps PhaseC", //
"Phase C Current", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
P_P_VPH_A_B(new ValuePoint("S113_P_P_VPH_A_B", "Phase Voltage AB", //
"Phase Voltage AB", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
P_P_VPH_B_C(new ValuePoint("S113_P_P_VPH_B_C", "Phase Voltage BC", //
"Phase Voltage BC", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
P_P_VPH_C_A(new ValuePoint("S113_P_P_VPH_C_A", "Phase Voltage CA", //
"Phase Voltage CA", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
PH_VPH_A(new ValuePoint("S113_PH_VPH_A", "Phase Voltage AN", //
"Phase Voltage AN", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.VOLT)), //
PH_VPH_B(new ValuePoint("S113_PH_VPH_B", "Phase Voltage BN", //
"Phase Voltage BN", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.VOLT)), //
PH_VPH_C(new ValuePoint("S113_PH_VPH_C", "Phase Voltage CN", //
"Phase Voltage CN", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.VOLT)), //
W(new ValuePoint("S113_W", "Watts", //
"AC Power", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.WATT)), //
HZ(new ValuePoint("S113_HZ", "Hz", //
"Line Frequency", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.HERTZ)), //
VA(new ValuePoint("S113_VA", "VA", //
"AC Apparent Power", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE)), //
V_AR(new ValuePoint("S113_V_AR", "VAr", //
"AC Reactive Power", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE)), //
PF(new ValuePoint("S113_PF", "PF", //
"AC Power Factor", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
WH(new ValuePoint("S113_WH", "WattHours", //
"AC Energy", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS)), //
DCA(new ValuePoint("S113_DCA", "DC Amps", //
"DC Current", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.AMPERE)), //
DCV(new ValuePoint("S113_DCV", "DC Voltage", //
"DC Voltage", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.VOLT)), //
DCW(new ValuePoint("S113_DCW", "DC Watts", //
"DC Power", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.WATT)), //
TMP_CAB(new ValuePoint("S113_TMP_CAB", "Cabinet Temperature", //
"Cabinet Temperature", //
- ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+ FLOAT32, true /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
TMP_SNK(new ValuePoint("S113_TMP_SNK", "Heat Sink Temperature", //
"Heat Sink Temperature", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
TMP_TRNS(new ValuePoint("S113_TMP_TRNS", "Transformer Temperature", //
"Transformer Temperature", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
TMP_OT(new ValuePoint("S113_TMP_OT", "Other Temperature", //
"Other Temperature", //
- ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), //
+ FLOAT32, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS)), //
ST(new EnumPoint("S113_ST", "Operating State", //
"Enumerated value. Operating state", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S113_St.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S113_St.values())), //
ST_VND(new EnumPoint("S113_ST_VND", "Vendor Operating State", //
"Vendor specific operating state code", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+ ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
EVT1(new BitFieldPoint("S113_EVT1", "Event1", //
"Bitmask value. Event fields", //
- BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S113_Evt1.values())), //
+ BITFIELD32, true /* mandatory? */, READ_ONLY, S113_Evt1.values())), //
EVT2(new BitFieldPoint("S113_EVT2", "Event Bitfield 2", //
"Reserved for future use", //
- BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, true /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND1(new BitFieldPoint("S113_EVT_VND1", "Vendor Event Bitfield 1", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND2(new BitFieldPoint("S113_EVT_VND2", "Vendor Event Bitfield 2", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND3(new BitFieldPoint("S113_EVT_VND3", "Vendor Event Bitfield 3", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND4(new BitFieldPoint("S113_EVT_VND4", "Vendor Event Bitfield 4", //
"Vendor defined events", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0]));
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0]));
private final Point point;
@@ -1492,73 +1514,73 @@ public BitPoint get() {
public static enum S120 implements SunSpecPoint {
D_E_R_TYP(new EnumPoint("S120_D_E_R_TYP", "DERTyp", //
"Type of DER device. Default value is 4 to indicate PV device.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S120_DERTyp.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S120_DERTyp.values())), //
W_RTG(new ScaledValuePoint("S120_W_RTG", "WRtg", //
"Continuous power output capability of the inverter.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "WRtg_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "WRtg_SF")), //
W_RTG_S_F(new ScaleFactorPoint("S120_W_RTG_S_F", "WRtg_SF", //
"Scale factor")), //
V_A_RTG(new ScaledValuePoint("S120_V_A_RTG", "VARtg", //
"Continuous Volt-Ampere capability of the inverter.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VARtg_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VARtg_SF")), //
V_A_RTG_S_F(new ScaleFactorPoint("S120_V_A_RTG_S_F", "VARtg_SF", //
"Scale factor")), //
V_AR_RTG_Q1(new ScaledValuePoint("S120_V_AR_RTG_Q1", "VArRtgQ1", //
"Continuous VAR capability of the inverter in quadrant 1.", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VArRtg_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VArRtg_SF")), //
V_AR_RTG_Q2(new ScaledValuePoint("S120_V_AR_RTG_Q2", "VArRtgQ2", //
"Continuous VAR capability of the inverter in quadrant 2.", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VArRtg_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VArRtg_SF")), //
V_AR_RTG_Q3(new ScaledValuePoint("S120_V_AR_RTG_Q3", "VArRtgQ3", //
"Continuous VAR capability of the inverter in quadrant 3.", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VArRtg_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VArRtg_SF")), //
V_AR_RTG_Q4(new ScaledValuePoint("S120_V_AR_RTG_Q4", "VArRtgQ4", //
"Continuous VAR capability of the inverter in quadrant 4.", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VArRtg_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VArRtg_SF")), //
V_AR_RTG_S_F(new ScaleFactorPoint("S120_V_AR_RTG_S_F", "VArRtg_SF", //
"Scale factor")), //
A_RTG(new ScaledValuePoint("S120_A_RTG", "ARtg", //
"Maximum RMS AC current level capability of the inverter.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "ARtg_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "ARtg_SF")), //
A_RTG_S_F(new ScaleFactorPoint("S120_A_RTG_S_F", "ARtg_SF", //
"Scale factor")), //
P_F_RTG_Q1(new ScaledValuePoint("S120_P_F_RTG_Q1", "PFRtgQ1", //
"Minimum power factor capability of the inverter in quadrant 1.", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PFRtg_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.NONE, "PFRtg_SF")), //
P_F_RTG_Q2(new ScaledValuePoint("S120_P_F_RTG_Q2", "PFRtgQ2", //
"Minimum power factor capability of the inverter in quadrant 2.", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PFRtg_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.NONE, "PFRtg_SF")), //
P_F_RTG_Q3(new ScaledValuePoint("S120_P_F_RTG_Q3", "PFRtgQ3", //
"Minimum power factor capability of the inverter in quadrant 3.", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PFRtg_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.NONE, "PFRtg_SF")), //
P_F_RTG_Q4(new ScaledValuePoint("S120_P_F_RTG_Q4", "PFRtgQ4", //
"Minimum power factor capability of the inverter in quadrant 4.", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PFRtg_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.NONE, "PFRtg_SF")), //
P_F_RTG_S_F(new ScaleFactorPoint("S120_P_F_RTG_S_F", "PFRtg_SF", //
"Scale factor")), //
W_H_RTG(new ScaledValuePoint("S120_W_H_RTG", "WHRtg", //
"Nominal energy rating of storage device.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WHRtg_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WHRtg_SF")), //
W_H_RTG_S_F(new ScaleFactorPoint("S120_W_H_RTG_S_F", "WHRtg_SF", //
"Scale factor")), //
AHR_RTG(new ScaledValuePoint("S120_AHR_RTG", "AhrRtg", //
"The usable capacity of the battery. Maximum charge minus minimum charge from a technology capability perspective (Amp-hour capacity rating).", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE_HOURS, "AhrRtg_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE_HOURS, "AhrRtg_SF")), //
AHR_RTG_S_F(new ScaleFactorPoint("S120_AHR_RTG_S_F", "AhrRtg_SF", //
"Scale factor for amp-hour rating.")), //
MAX_CHA_RTE(new ScaledValuePoint("S120_MAX_CHA_RTE", "MaxChaRte", //
"Maximum rate of energy transfer into the storage device.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "MaxChaRte_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "MaxChaRte_SF")), //
MAX_CHA_RTE_S_F(new ScaleFactorPoint("S120_MAX_CHA_RTE_S_F", "MaxChaRte_SF", //
"Scale factor")), //
MAX_DIS_CHA_RTE(new ScaledValuePoint("S120_MAX_DIS_CHA_RTE", "MaxDisChaRte", //
"Maximum rate of energy transfer out of the storage device.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "MaxDisChaRte_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "MaxDisChaRte_SF")), //
MAX_DIS_CHA_RTE_S_F(new ScaleFactorPoint("S120_MAX_DIS_CHA_RTE_S_F", "MaxDisChaRte_SF", //
"Scale factor")), //
PAD(new ValuePoint("S120_PAD", "Pad", //
"Pad register.", //
- ValuePoint.Type.PAD, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+ ValuePoint.Type.PAD, false /* mandatory? */, READ_ONLY, Unit.NONE));
private final Point point;
@@ -1604,64 +1626,64 @@ public OptionsEnum getUndefined() {
public static enum S121 implements SunSpecPoint {
W_MAX(new ScaledValuePoint("S121_W_MAX", "WMax", //
"Setting for maximum power output. Default to WRtg.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.WATT, "WMax_SF")), //
+ UINT16, true /* mandatory? */, READ_WRITE, Unit.WATT, "WMax_SF")), //
V_REF(new ScaledValuePoint("S121_V_REF", "VRef", //
"Voltage at the PCC.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT, "VRef_SF")), //
+ UINT16, true /* mandatory? */, READ_WRITE, Unit.VOLT, "VRef_SF")), //
V_REF_OFS(new ScaledValuePoint("S121_V_REF_OFS", "VRefOfs", //
"Offset from PCC to inverter.", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT, "VRefOfs_SF")), //
+ INT16, true /* mandatory? */, READ_WRITE, Unit.VOLT, "VRefOfs_SF")), //
V_MAX(new ScaledValuePoint("S121_V_MAX", "VMax", //
"Setpoint for maximum voltage.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT, "VMinMax_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT, "VMinMax_SF")), //
V_MIN(new ScaledValuePoint("S121_V_MIN", "VMin", //
"Setpoint for minimum voltage.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT, "VMinMax_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT, "VMinMax_SF")), //
V_A_MAX(new ScaledValuePoint("S121_V_A_MAX", "VAMax", //
"Setpoint for maximum apparent power. Default to VARtg.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE, "VAMax_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE, "VAMax_SF")), //
V_AR_MAX_Q1(new ScaledValuePoint("S121_V_AR_MAX_Q1", "VArMaxQ1", //
"Setting for maximum reactive power in quadrant 1. Default to VArRtgQ1.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VArMax_SF")), //
+ INT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VArMax_SF")), //
V_AR_MAX_Q2(new ScaledValuePoint("S121_V_AR_MAX_Q2", "VArMaxQ2", //
"Setting for maximum reactive power in quadrant 2. Default to VArRtgQ2.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VArMax_SF")), //
+ INT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VArMax_SF")), //
V_AR_MAX_Q3(new ScaledValuePoint("S121_V_AR_MAX_Q3", "VArMaxQ3", //
"Setting for maximum reactive power in quadrant 3. Default to VArRtgQ3.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VArMax_SF")), //
+ INT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VArMax_SF")), //
V_AR_MAX_Q4(new ScaledValuePoint("S121_V_AR_MAX_Q4", "VArMaxQ4", //
"Setting for maximum reactive power in quadrant 4. Default to VArRtgQ4.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VArMax_SF")), //
+ INT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VArMax_SF")), //
W_GRA(new ScaledValuePoint("S121_W_GRA", "WGra", //
"Default ramp rate of change of active power due to command or internal action.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "WGra_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "WGra_SF")), //
P_F_MIN_Q1(new ScaledValuePoint("S121_P_F_MIN_Q1", "PFMinQ1", //
"Setpoint for minimum power factor value in quadrant 1. Default to PFRtgQ1.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "PFMin_SF")), //
+ INT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "PFMin_SF")), //
P_F_MIN_Q2(new ScaledValuePoint("S121_P_F_MIN_Q2", "PFMinQ2", //
"Setpoint for minimum power factor value in quadrant 2. Default to PFRtgQ2.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "PFMin_SF")), //
+ INT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "PFMin_SF")), //
P_F_MIN_Q3(new ScaledValuePoint("S121_P_F_MIN_Q3", "PFMinQ3", //
"Setpoint for minimum power factor value in quadrant 3. Default to PFRtgQ3.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "PFMin_SF")), //
+ INT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "PFMin_SF")), //
P_F_MIN_Q4(new ScaledValuePoint("S121_P_F_MIN_Q4", "PFMinQ4", //
"Setpoint for minimum power factor value in quadrant 4. Default to PFRtgQ4.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "PFMin_SF")), //
+ INT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "PFMin_SF")), //
V_AR_ACT(new EnumPoint("S121_V_AR_ACT", "VArAct", //
"VAR action on change between charging and discharging: 1=switch 2=maintain VAR characterization.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S121_VArAct.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S121_VArAct.values())), //
CLC_TOT_V_A(new EnumPoint("S121_CLC_TOT_V_A", "ClcTotVA", //
"Calculation method for total apparent power. 1=vector 2=arithmetic.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S121_ClcTotVA.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S121_ClcTotVA.values())), //
MAX_RMP_RTE(new ScaledValuePoint("S121_MAX_RMP_RTE", "MaxRmpRte", //
"Setpoint for maximum ramp rate as percentage of nominal maximum ramp rate. This setting will limit the rate that watts delivery to the grid can increase or decrease in response to intermittent PV generation.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "MaxRmpRte_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "MaxRmpRte_SF")), //
E_C_P_NOM_HZ(new ScaledValuePoint("S121_E_C_P_NOM_HZ", "ECPNomHz", //
"Setpoint for nominal frequency at the ECP.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.HERTZ, "ECPNomHz_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.HERTZ, "ECPNomHz_SF")), //
CONN_PH(new EnumPoint("S121_CONN_PH", "ConnPh", //
"Identity of connected phase for single phase inverters. A=1 B=2 C=3.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S121_ConnPh.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S121_ConnPh.values())), //
W_MAX_S_F(new ScaleFactorPoint("S121_W_MAX_S_F", "WMax_SF", //
"Scale factor for real power.")), //
V_REF_S_F(new ScaleFactorPoint("S121_V_REF_S_F", "VRef_SF", //
@@ -1786,59 +1808,59 @@ public OptionsEnum getUndefined() {
public static enum S122 implements SunSpecPoint {
P_V_CONN(new BitFieldPoint("S122_P_V_CONN", "PVConn", //
"PV inverter present/available status. Enumerated value.", //
- BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_ONLY, S122_PVConn.values())), //
+ BITFIELD16, true /* mandatory? */, READ_ONLY, S122_PVConn.values())), //
STOR_CONN(new BitFieldPoint("S122_STOR_CONN", "StorConn", //
"Storage inverter present/available status. Enumerated value.", //
- BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_ONLY, S122_StorConn.values())), //
+ BITFIELD16, true /* mandatory? */, READ_ONLY, S122_StorConn.values())), //
E_C_P_CONN(new BitFieldPoint("S122_E_C_P_CONN", "ECPConn", //
"ECP connection status: disconnected=0 connected=1.", //
- BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_ONLY, S122_ECPConn.values())), //
+ BITFIELD16, true /* mandatory? */, READ_ONLY, S122_ECPConn.values())), //
ACT_WH(new ValuePoint("S122_ACT_WH", "ActWh", //
"AC lifetime active (real) energy output.", //
- ValuePoint.Type.ACC64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS)), //
+ ACC64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS)), //
ACT_V_AH(new ValuePoint("S122_ACT_V_AH", "ActVAh", //
"AC lifetime apparent energy output.", //
- ValuePoint.Type.ACC64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS)), //
+ ACC64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS)), //
ACT_V_ARH_Q1(new ValuePoint("S122_ACT_V_ARH_Q1", "ActVArhQ1", //
"AC lifetime reactive energy output in quadrant 1.", //
- ValuePoint.Type.ACC64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS)), //
+ ACC64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS)), //
ACT_V_ARH_Q2(new ValuePoint("S122_ACT_V_ARH_Q2", "ActVArhQ2", //
"AC lifetime reactive energy output in quadrant 2.", //
- ValuePoint.Type.ACC64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS)), //
+ ACC64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS)), //
ACT_V_ARH_Q3(new ValuePoint("S122_ACT_V_ARH_Q3", "ActVArhQ3", //
"AC lifetime negative energy output in quadrant 3.", //
- ValuePoint.Type.ACC64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS)), //
+ ACC64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS)), //
ACT_V_ARH_Q4(new ValuePoint("S122_ACT_V_ARH_Q4", "ActVArhQ4", //
"AC lifetime reactive energy output in quadrant 4.", //
- ValuePoint.Type.ACC64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS)), //
+ ACC64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS)), //
V_AR_AVAL(new ScaledValuePoint("S122_V_AR_AVAL", "VArAval", //
"Amount of VARs available without impacting watts output.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VArAval_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VArAval_SF")), //
V_AR_AVAL_S_F(new ScaleFactorPoint("S122_V_AR_AVAL_S_F", "VArAval_SF", //
"Scale factor for available VARs.")), //
W_AVAL(new ScaledValuePoint("S122_W_AVAL", "WAval", //
"Amount of Watts available.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "WAval_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "WAval_SF")), //
W_AVAL_S_F(new ScaleFactorPoint("S122_W_AVAL_S_F", "WAval_SF", //
"Scale factor for available Watts.")), //
ST_SET_LIM_MSK(new BitFieldPoint("S122_ST_SET_LIM_MSK", "StSetLimMsk", //
"Bit Mask indicating setpoint limit(s) reached.", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, S122_StSetLimMsk.values())), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, S122_StSetLimMsk.values())), //
ST_ACT_CTL(new BitFieldPoint("S122_ST_ACT_CTL", "StActCtl", //
"Bit Mask indicating which inverter controls are currently active.", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, S122_StActCtl.values())), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, S122_StActCtl.values())), //
TM_SRC(new ValuePoint("S122_TM_SRC", "TmSrc", //
"Source of time synchronization.", //
- ValuePoint.Type.STRING4, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ STRING4, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
TMS(new ValuePoint("S122_TMS", "Tms", //
"Seconds since 01-01-2000 00:00 UTC", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
RT_ST(new BitFieldPoint("S122_RT_ST", "RtSt", //
"Bit Mask indicating active ride-through status.", //
- BitFieldPoint.Type.BITFIELD16, false /* mandatory? */, AccessMode.READ_ONLY, S122_RtSt.values())), //
+ BITFIELD16, false /* mandatory? */, READ_ONLY, S122_RtSt.values())), //
RIS(new ScaledValuePoint("S122_RIS", "Ris", //
"Isolation resistance.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "Ris_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "Ris_SF")), //
RIS_S_F(new ScaleFactorPoint("S122_RIS_S_F", "Ris_SF", //
"Scale factor for isolation resistance."));
@@ -1979,67 +2001,67 @@ public BitPoint get() {
public static enum S123 implements SunSpecPoint {
CONN_WIN_TMS(new ValuePoint("S123_CONN_WIN_TMS", "Conn_WinTms", //
"Time window for connect/disconnect.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
CONN_RVRT_TMS(new ValuePoint("S123_CONN_RVRT_TMS", "Conn_RvrtTms", //
"Timeout period for connect/disconnect.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
CONN(new EnumPoint("S123_CONN", "Conn", //
"Enumerated valued. Connection control.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S123_Conn.values())), //
+ ENUM16, true /* mandatory? */, READ_WRITE, S123_Conn.values())), //
W_MAX_LIM_PCT(new ScaledValuePoint("S123_W_MAX_LIM_PCT", "WMaxLimPct", //
"Set power output to specified level.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "WMaxLimPct_SF")), //
+ UINT16, true /* mandatory? */, READ_WRITE, Unit.PERCENT, "WMaxLimPct_SF")), //
W_MAX_LIM_PCT_WIN_TMS(new ValuePoint("S123_W_MAX_LIM_PCT_WIN_TMS", "WMaxLimPct_WinTms", //
"Time window for power limit change.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
W_MAX_LIM_PCT_RVRT_TMS(new ValuePoint("S123_W_MAX_LIM_PCT_RVRT_TMS", "WMaxLimPct_RvrtTms", //
"Timeout period for power limit.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
W_MAX_LIM_PCT_RMP_TMS(new ValuePoint("S123_W_MAX_LIM_PCT_RMP_TMS", "WMaxLimPct_RmpTms", //
"Ramp time for moving from current setpoint to new setpoint.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
W_MAX_LIM_ENA(new EnumPoint("S123_W_MAX_LIM_ENA", "WMaxLim_Ena", //
"Enumerated valued. Throttle enable/disable control.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S123_WMaxLim_Ena.values())), //
+ ENUM16, true /* mandatory? */, READ_WRITE, S123_WMaxLim_Ena.values())), //
OUT_P_F_SET(new ScaledValuePoint("S123_OUT_P_F_SET", "OutPFSet", //
"Set power factor to specific value - cosine of angle.", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "OutPFSet_SF")), //
+ INT16, true /* mandatory? */, READ_WRITE, Unit.NONE, "OutPFSet_SF")), //
OUT_P_F_SET_WIN_TMS(new ValuePoint("S123_OUT_P_F_SET_WIN_TMS", "OutPFSet_WinTms", //
"Time window for power factor change.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
OUT_P_F_SET_RVRT_TMS(new ValuePoint("S123_OUT_P_F_SET_RVRT_TMS", "OutPFSet_RvrtTms", //
"Timeout period for power factor.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
OUT_P_F_SET_RMP_TMS(new ValuePoint("S123_OUT_P_F_SET_RMP_TMS", "OutPFSet_RmpTms", //
"Ramp time for moving from current setpoint to new setpoint.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
OUT_P_F_SET_ENA(new EnumPoint("S123_OUT_P_F_SET_ENA", "OutPFSet_Ena", //
"Enumerated valued. Fixed power factor enable/disable control.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S123_OutPFSet_Ena.values())), //
+ ENUM16, true /* mandatory? */, READ_WRITE, S123_OutPFSet_Ena.values())), //
V_AR_W_MAX_PCT(new ScaledValuePoint("S123_V_AR_W_MAX_PCT", "VArWMaxPct", //
"Reactive power in percent of WMax.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "VArPct_SF")), //
+ INT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "VArPct_SF")), //
V_AR_MAX_PCT(new ScaledValuePoint("S123_V_AR_MAX_PCT", "VArMaxPct", //
"Reactive power in percent of VArMax.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "VArPct_SF")), //
+ INT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "VArPct_SF")), //
V_AR_AVAL_PCT(new ScaledValuePoint("S123_V_AR_AVAL_PCT", "VArAvalPct", //
"Reactive power in percent of VArAval.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "VArPct_SF")), //
+ INT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "VArPct_SF")), //
V_AR_PCT_WIN_TMS(new ValuePoint("S123_V_AR_PCT_WIN_TMS", "VArPct_WinTms", //
"Time window for VAR limit change.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
V_AR_PCT_RVRT_TMS(new ValuePoint("S123_V_AR_PCT_RVRT_TMS", "VArPct_RvrtTms", //
"Timeout period for VAR limit.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
V_AR_PCT_RMP_TMS(new ValuePoint("S123_V_AR_PCT_RMP_TMS", "VArPct_RmpTms", //
"Ramp time for moving from current setpoint to new setpoint.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
V_AR_PCT_MOD(new EnumPoint("S123_V_AR_PCT_MOD", "VArPct_Mod", //
"Enumerated value. VAR percent limit mode.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S123_VArPct_Mod.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S123_VArPct_Mod.values())), //
V_AR_PCT_ENA(new EnumPoint("S123_V_AR_PCT_ENA", "VArPct_Ena", //
"Enumerated valued. Percent limit VAr enable/disable control.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S123_VArPct_Ena.values())), //
+ ENUM16, true /* mandatory? */, READ_WRITE, S123_VArPct_Ena.values())), //
W_MAX_LIM_PCT_S_F(new ScaleFactorPoint("S123_W_MAX_LIM_PCT_S_F", "WMaxLimPct_SF", //
"Scale factor for power output percent.")), //
OUT_P_F_SET_S_F(new ScaleFactorPoint("S123_OUT_P_F_SET_S_F", "OutPFSet_SF", //
@@ -2209,51 +2231,51 @@ public OptionsEnum getUndefined() {
public static enum S124 implements SunSpecPoint {
W_CHA_MAX(new ScaledValuePoint("S124_W_CHA_MAX", "WChaMax", //
"Setpoint for maximum charge.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.WATT, "WChaMax_SF")), //
+ UINT16, true /* mandatory? */, READ_WRITE, Unit.WATT, "WChaMax_SF")), //
W_CHA_GRA(new ScaledValuePoint("S124_W_CHA_GRA", "WChaGra", //
"Setpoint for maximum charging rate. Default is MaxChaRte.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "WChaDisChaGra_SF")), //
+ UINT16, true /* mandatory? */, READ_WRITE, Unit.PERCENT, "WChaDisChaGra_SF")), //
W_DIS_CHA_GRA(new ScaledValuePoint("S124_W_DIS_CHA_GRA", "WDisChaGra", //
"Setpoint for maximum discharge rate. Default is MaxDisChaRte.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "WChaDisChaGra_SF")), //
+ UINT16, true /* mandatory? */, READ_WRITE, Unit.PERCENT, "WChaDisChaGra_SF")), //
STOR_CTL_MOD(new BitFieldPoint("S124_STOR_CTL_MOD", "StorCtl_Mod", //
"Activate hold/discharge/charge storage control mode. Bitfield value.", //
- BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_WRITE, S124_StorCtl_Mod.values())), //
+ BITFIELD16, true /* mandatory? */, READ_WRITE, S124_StorCtl_Mod.values())), //
V_A_CHA_MAX(new ScaledValuePoint("S124_V_A_CHA_MAX", "VAChaMax", //
"Setpoint for maximum charging VA.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE, "VAChaMax_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE, "VAChaMax_SF")), //
MIN_RSV_PCT(new ScaledValuePoint("S124_MIN_RSV_PCT", "MinRsvPct", //
"Setpoint for minimum reserve for storage as a percentage of the nominal maximum storage.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "MinRsvPct_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "MinRsvPct_SF")), //
CHA_STATE(new ScaledValuePoint("S124_CHA_STATE", "ChaState", //
"Currently available energy as a percent of the capacity rating.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.PERCENT, "ChaState_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.PERCENT, "ChaState_SF")), //
STOR_AVAL(new ScaledValuePoint("S124_STOR_AVAL", "StorAval", //
"State of charge (ChaState) minus storage reserve (MinRsvPct) times capacity rating (AhrRtg).", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE_HOURS, "StorAval_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE_HOURS, "StorAval_SF")), //
IN_BAT_V(new ScaledValuePoint("S124_IN_BAT_V", "InBatV", //
"Internal battery voltage.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "InBatV_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "InBatV_SF")), //
CHA_ST(new EnumPoint("S124_CHA_ST", "ChaSt", //
"Charge status of storage device. Enumerated value.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S124_ChaSt.values())), //
+ ENUM16, false /* mandatory? */, READ_ONLY, S124_ChaSt.values())), //
OUT_W_RTE(new ScaledValuePoint("S124_OUT_W_RTE", "OutWRte", //
"Percent of max discharge rate.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "InOutWRte_SF")), //
+ INT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "InOutWRte_SF")), //
IN_W_RTE(new ScaledValuePoint("S124_IN_W_RTE", "InWRte", //
"Percent of max charging rate.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "InOutWRte_SF")), //
+ INT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "InOutWRte_SF")), //
IN_OUT_W_RTE_WIN_TMS(new ValuePoint("S124_IN_OUT_W_RTE_WIN_TMS", "InOutWRte_WinTms", //
"Time window for charge/discharge rate change.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
IN_OUT_W_RTE_RVRT_TMS(new ValuePoint("S124_IN_OUT_W_RTE_RVRT_TMS", "InOutWRte_RvrtTms", //
"Timeout period for charge/discharge rate.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
IN_OUT_W_RTE_RMP_TMS(new ValuePoint("S124_IN_OUT_W_RTE_RMP_TMS", "InOutWRte_RmpTms", //
"Ramp time for moving from current setpoint to new setpoint.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
CHA_GRI_SET(new EnumPoint("S124_CHA_GRI_SET", "", "", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S124_ChaGriSet.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S124_ChaGriSet.values())), //
W_CHA_MAX_S_F(new ScaleFactorPoint("S124_W_CHA_MAX_S_F", "WChaMax_SF", //
"Scale factor for maximum charge.")), //
W_CHA_DIS_CHA_GRA_S_F(new ScaleFactorPoint("S124_W_CHA_DIS_CHA_GRA_S_F", "WChaDisChaGra_SF", //
@@ -2365,26 +2387,26 @@ public OptionsEnum getUndefined() {
public static enum S125 implements SunSpecPoint {
MOD_ENA(new BitFieldPoint("S125_MOD_ENA", "ModEna", //
"Is price-based charge/discharge mode active?", //
- BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_WRITE, S125_ModEna.values())), //
+ BITFIELD16, true /* mandatory? */, READ_WRITE, S125_ModEna.values())), //
SIG_TYPE(new EnumPoint("S125_SIG_TYPE", "SigType", //
"Meaning of the pricing signal. When a Price schedule is used, type must match the schedule range variable description.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S125_SigType.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S125_SigType.values())), //
SIG(new ScaledValuePoint("S125_SIG", "Sig", //
"Utility/ESP specific pricing signal. Content depends on pricing signal type. When H/M/L type is specified. Low=0; Med=1; High=2.", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "Sig_SF")), //
+ INT16, true /* mandatory? */, READ_WRITE, Unit.NONE, "Sig_SF")), //
WIN_TMS(new ValuePoint("S125_WIN_TMS", "WinTms", //
"Time window for charge/discharge pricing change.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
RVT_TMS(new ValuePoint("S125_RVT_TMS", "RvtTms", //
"Timeout period for charge/discharge pricing change.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
RMP_TMS(new ValuePoint("S125_RMP_TMS", "RmpTms", //
"Ramp time for moving from current charge or discharge level to new level.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
SIG_S_F(new ScaleFactorPoint("S125_SIG_S_F", "Sig_SF", //
"Pricing signal scale factor.")), //
PAD(new ValuePoint("S125_PAD", "", "", //
- ValuePoint.Type.PAD, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+ ValuePoint.Type.PAD, false /* mandatory? */, READ_ONLY, Unit.NONE));
private final Point point;
@@ -2448,22 +2470,22 @@ public OptionsEnum getUndefined() {
public static enum S127 implements SunSpecPoint {
W_GRA(new ScaledValuePoint("S127_W_GRA", "WGra", //
"The slope of the reduction in the maximum allowed watts output as a function of frequency.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "WGra_SF")), //
+ UINT16, true /* mandatory? */, READ_WRITE, Unit.PERCENT, "WGra_SF")), //
HZ_STR(new ScaledValuePoint("S127_HZ_STR", "HzStr", //
"The frequency deviation from nominal frequency (ECPNomHz) at which a snapshot of the instantaneous power output is taken to act as the CAPPED power level (PM) and above which reduction in power output occurs.", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.HERTZ, "HzStrStop_SF")), //
+ INT16, true /* mandatory? */, READ_WRITE, Unit.HERTZ, "HzStrStop_SF")), //
HZ_STOP(new ScaledValuePoint("S127_HZ_STOP", "HzStop", //
"The frequency deviation from nominal frequency (ECPNomHz) at which curtailed power output may return to normal and the cap on the power level value is removed.", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.HERTZ, "HzStrStop_SF")), //
+ INT16, true /* mandatory? */, READ_WRITE, Unit.HERTZ, "HzStrStop_SF")), //
HYS_ENA(new BitFieldPoint("S127_HYS_ENA", "HysEna", //
"Enable hysteresis", //
- BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_WRITE, S127_HysEna.values())), //
+ BITFIELD16, true /* mandatory? */, READ_WRITE, S127_HysEna.values())), //
MOD_ENA(new BitFieldPoint("S127_MOD_ENA", "ModEna", //
"Is Parameterized Frequency-Watt control active.", //
- BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_WRITE, S127_ModEna.values())), //
+ BITFIELD16, true /* mandatory? */, READ_WRITE, S127_ModEna.values())), //
HZ_STOP_W_GRA(new ScaledValuePoint("S127_HZ_STOP_W_GRA", "HzStopWGra", //
"The maximum time-based rate of change at which power output returns to normal after having been capped by an over frequency event.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "RmpIncDec_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "RmpIncDec_SF")), //
W_GRA_S_F(new ScaleFactorPoint("S127_W_GRA_S_F", "WGra_SF", //
"Scale factor for output gradient.")), //
HZ_STR_STOP_S_F(new ScaleFactorPoint("S127_HZ_STR_STOP_S_F", "HzStrStop_SF", //
@@ -2471,7 +2493,7 @@ public static enum S127 implements SunSpecPoint {
RMP_INC_DEC_S_F(new ScaleFactorPoint("S127_RMP_INC_DEC_S_F", "RmpIncDec_SF", //
"Scale factor for increment and decrement ramps.")), //
PAD(new ValuePoint("S127_PAD", "", "", //
- ValuePoint.Type.PAD, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+ ValuePoint.Type.PAD, false /* mandatory? */, READ_ONLY, Unit.NONE));
private final Point point;
@@ -2518,43 +2540,43 @@ public BitPoint get() {
public static enum S128 implements SunSpecPoint {
AR_GRA_MOD(new EnumPoint("S128_AR_GRA_MOD", "ArGraMod", //
"Indicates if gradients trend toward zero at the edges of the deadband or trend toward zero at the center of the deadband.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S128_ArGraMod.values())), //
+ ENUM16, true /* mandatory? */, READ_WRITE, S128_ArGraMod.values())), //
AR_GRA_SAG(new ScaledValuePoint("S128_AR_GRA_SAG", "ArGraSag", //
"The gradient used to increase capacitive dynamic current. A value of 0 indicates no additional reactive current support.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "ArGra_SF")), //
+ UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE, "ArGra_SF")), //
AR_GRA_SWELL(new ScaledValuePoint("S128_AR_GRA_SWELL", "ArGraSwell", //
"The gradient used to increase inductive dynamic current. A value of 0 indicates no additional reactive current support.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "ArGra_SF")), //
+ UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE, "ArGra_SF")), //
MOD_ENA(new BitFieldPoint("S128_MOD_ENA", "ModEna", //
"Activate dynamic reactive current model", //
- BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_WRITE, S128_ModEna.values())), //
+ BITFIELD16, true /* mandatory? */, READ_WRITE, S128_ModEna.values())), //
FIL_TMS(new ValuePoint("S128_FIL_TMS", "FilTms", //
"The time window used to calculate the moving average voltage.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
DB_V_MIN(new ScaledValuePoint("S128_DB_V_MIN", "DbVMin", //
"The lower delta voltage limit for which negative voltage deviations less than this value no dynamic vars are produced.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "VRefPct_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "VRefPct_SF")), //
DB_V_MAX(new ScaledValuePoint("S128_DB_V_MAX", "DbVMax", //
"The upper delta voltage limit for which positive voltage deviations less than this value no dynamic current produced.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "VRefPct_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "VRefPct_SF")), //
BLK_ZN_V(new ScaledValuePoint("S128_BLK_ZN_V", "BlkZnV", //
"Block zone voltage which defines a lower voltage boundary below which no dynamic current is produced.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "VRefPct_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "VRefPct_SF")), //
HYS_BLK_ZN_V(new ScaledValuePoint("S128_HYS_BLK_ZN_V", "HysBlkZnV", //
"Hysteresis voltage used with BlkZnV.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "VRefPct_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "VRefPct_SF")), //
BLK_ZN_TMMS(new ValuePoint("S128_BLK_ZN_TMMS", "BlkZnTmms", //
"Block zone time the time before which reactive current support remains active regardless of how low the voltage drops.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.MILLISECONDS)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.MILLISECONDS)), //
HOLD_TMMS(new ValuePoint("S128_HOLD_TMMS", "HoldTmms", //
"Hold time during which reactive current support continues after the average voltage has entered the dead zone.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.MILLISECONDS)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.MILLISECONDS)), //
AR_GRA_S_F(new ScaleFactorPoint("S128_AR_GRA_S_F", "ArGra_SF", //
"Scale factor for the gradients.")), //
V_REF_PCT_S_F(new ScaleFactorPoint("S128_V_REF_PCT_S_F", "VRefPct_SF", //
"Scale factor for the voltage zone and limit settings.")), //
PAD(new ValuePoint("S128_PAD", "", "", //
- ValuePoint.Type.PAD, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+ ValuePoint.Type.PAD, false /* mandatory? */, READ_ONLY, Unit.NONE));
private final Point point;
@@ -2615,25 +2637,25 @@ public BitPoint get() {
public static enum S145 implements SunSpecPoint {
NOM_RMP_UP_RTE(new ScaledValuePoint("S145_NOM_RMP_UP_RTE", "Ramp Up Rate", //
"Ramp up rate as a percentage of max current.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "Rmp_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "Rmp_SF")), //
NOM_RMP_DN_RTE(new ScaledValuePoint("S145_NOM_RMP_DN_RTE", "NomRmpDnRte", //
"Ramp down rate as a percentage of max current.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "Rmp_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "Rmp_SF")), //
EMG_RMP_UP_RTE(new ScaledValuePoint("S145_EMG_RMP_UP_RTE", "Emergency Ramp Up Rate", //
"Emergency ramp up rate as a percentage of max current.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "Rmp_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "Rmp_SF")), //
EMG_RMP_DN_RTE(new ScaledValuePoint("S145_EMG_RMP_DN_RTE", "Emergency Ramp Down Rate", //
"Emergency ramp down rate as a percentage of max current.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "Rmp_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "Rmp_SF")), //
CONN_RMP_UP_RTE(new ScaledValuePoint("S145_CONN_RMP_UP_RTE", "Connect Ramp Up Rate", //
"Connect ramp up rate as a percentage of max current.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "Rmp_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "Rmp_SF")), //
CONN_RMP_DN_RTE(new ScaledValuePoint("S145_CONN_RMP_DN_RTE", "Connect Ramp Down Rate", //
"Connect ramp down rate as a percentage of max current.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "Rmp_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "Rmp_SF")), //
A_GRA(new ScaledValuePoint("S145_A_GRA", "Default Ramp Rate", //
"Ramp rate specified in percent of max current.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "Rmp_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "Rmp_SF")), //
RMP_S_F(new ScaleFactorPoint("S145_RMP_S_F", "Ramp Rate Scale Factor", //
"Ramp Rate Scale Factor"));
@@ -2652,174 +2674,186 @@ public Point get() {
public static enum S201 implements SunSpecPoint {
A(new ScaledValuePoint("S201_A", "Amps", //
"Total AC Current", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
APH_A(new ScaledValuePoint("S201_APH_A", "Amps PhaseA", //
"Phase A Current", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
APH_B(new ScaledValuePoint("S201_APH_B", "Amps PhaseB", //
"Phase B Current", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
APH_C(new ScaledValuePoint("S201_APH_C", "Amps PhaseC", //
"Phase C Current", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
A_SF(new ScaleFactorPoint("S201_A_SF", "", //
"Current scale factor")), //
PH_V(new ScaledValuePoint("S201_PH_V", "Voltage LN", //
"Line to Neutral AC Voltage (average of active phases)", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_A(new ScaledValuePoint("S201_PH_VPH_A", "Phase Voltage AN", //
"Phase Voltage AN", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_B(new ScaledValuePoint("S201_PH_VPH_B", "Phase Voltage BN", //
"Phase Voltage BN", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_C(new ScaledValuePoint("S201_PH_VPH_C", "Phase Voltage CN", //
"Phase Voltage CN", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PPV(new ScaledValuePoint("S201_PPV", "Voltage LL", //
"Line to Line AC Voltage (average of active phases)", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
P_P_VPH_A_B(new ScaledValuePoint("S201_P_P_VPH_A_B", "Phase Voltage AB", //
"Phase Voltage AB", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
P_P_VPH_B_C(new ScaledValuePoint("S201_P_P_VPH_B_C", "Phase Voltage BC", //
"Phase Voltage BC", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
P_P_VPH_C_A(new ScaledValuePoint("S201_P_P_VPH_C_A", "Phase Voltage CA", //
"Phase Voltage CA", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
V_SF(new ScaleFactorPoint("S201_V_SF", "", //
"Voltage scale factor")), //
HZ(new ScaledValuePoint("S201_HZ", "Hz", //
"Frequency", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.HERTZ, "Hz_SF")), //
HZ_S_F(new ScaleFactorPoint("S201_HZ_S_F", "", //
"Frequency scale factor")), //
W(new ScaledValuePoint("S201_W", "Watts", //
"Total Real Power", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
WPH_A(new ScaledValuePoint("S201_WPH_A", "Watts phase A", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
WPH_B(new ScaledValuePoint("S201_WPH_B", "Watts phase B", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
WPH_C(new ScaledValuePoint("S201_WPH_C", "Watts phase C", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
W_SF(new ScaleFactorPoint("S201_W_SF", "", //
"Real Power scale factor")), //
VA(new ScaledValuePoint("S201_VA", "VA", //
"AC Apparent Power", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
V_APH_A(new ScaledValuePoint("S201_V_APH_A", "VA phase A", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
V_APH_B(new ScaledValuePoint("S201_V_APH_B", "VA phase B", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
V_APH_C(new ScaledValuePoint("S201_V_APH_C", "VA phase C", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
VA_SF(new ScaleFactorPoint("S201_VA_SF", "", //
"Apparent Power scale factor")), //
VAR(new ScaledValuePoint("S201_VAR", "VAR", //
"Reactive Power", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
V_A_RPH_A(new ScaledValuePoint("S201_V_A_RPH_A", "VAR phase A", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
V_A_RPH_B(new ScaledValuePoint("S201_V_A_RPH_B", "VAR phase B", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
V_A_RPH_C(new ScaledValuePoint("S201_V_A_RPH_C", "VAR phase C", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
VAR_SF(new ScaleFactorPoint("S201_VAR_SF", "", //
"Reactive Power scale factor")), //
PF(new ScaledValuePoint("S201_PF", "PF", //
"Power Factor", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
P_FPH_A(new ScaledValuePoint("S201_P_FPH_A", "PF phase A", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
P_FPH_B(new ScaledValuePoint("S201_P_FPH_B", "PF phase B", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
P_FPH_C(new ScaledValuePoint("S201_P_FPH_C", "PF phase C", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
PF_SF(new ScaleFactorPoint("S201_PF_SF", "", //
"Power Factor scale factor")), //
TOT_WH_EXP(new ScaledValuePoint("S201_TOT_WH_EXP", "Total Watt-hours Exported", //
"Total Real Energy Exported", //
- ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_EXP_PH_A(new ScaledValuePoint("S201_TOT_WH_EXP_PH_A", "Total Watt-hours Exported phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_EXP_PH_B(new ScaledValuePoint("S201_TOT_WH_EXP_PH_B", "Total Watt-hours Exported phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_EXP_PH_C(new ScaledValuePoint("S201_TOT_WH_EXP_PH_C", "Total Watt-hours Exported phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_IMP(new ScaledValuePoint("S201_TOT_WH_IMP", "Total Watt-hours Imported", //
"Total Real Energy Imported", //
- ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_IMP_PH_A(new ScaledValuePoint("S201_TOT_WH_IMP_PH_A", "Total Watt-hours Imported phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_IMP_PH_B(new ScaledValuePoint("S201_TOT_WH_IMP_PH_B", "Total Watt-hours Imported phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_IMP_PH_C(new ScaledValuePoint("S201_TOT_WH_IMP_PH_C", "Total Watt-hours Imported phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_S_F(new ScaleFactorPoint("S201_TOT_WH_S_F", "", //
"Real Energy scale factor")), //
TOT_V_AH_EXP(new ScaledValuePoint("S201_TOT_V_AH_EXP", "Total VA-hours Exported", //
"Total Apparent Energy Exported", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_EXP_PH_A(new ScaledValuePoint("S201_TOT_V_AH_EXP_PH_A", "Total VA-hours Exported phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_EXP_PH_B(new ScaledValuePoint("S201_TOT_V_AH_EXP_PH_B", "Total VA-hours Exported phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_EXP_PH_C(new ScaledValuePoint("S201_TOT_V_AH_EXP_PH_C", "Total VA-hours Exported phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_IMP(new ScaledValuePoint("S201_TOT_V_AH_IMP", "Total VA-hours Imported", //
"Total Apparent Energy Imported", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_IMP_PH_A(new ScaledValuePoint("S201_TOT_V_AH_IMP_PH_A", "Total VA-hours Imported phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_IMP_PH_B(new ScaledValuePoint("S201_TOT_V_AH_IMP_PH_B", "Total VA-hours Imported phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_IMP_PH_C(new ScaledValuePoint("S201_TOT_V_AH_IMP_PH_C", "Total VA-hours Imported phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_S_F(new ScaleFactorPoint("S201_TOT_V_AH_S_F", "", //
"Apparent Energy scale factor")), //
TOT_V_ARH_IMP_Q1(new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q1", "Total VAR-hours Imported Q1", //
"Total Reactive Energy Imported Quadrant 1", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q1_PH_A(new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q1_PH_A", "Total VAr-hours Imported Q1 phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q1_PH_B(new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q1_PH_B", "Total VAr-hours Imported Q1 phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q1_PH_C(new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q1_PH_C", "Total VAr-hours Imported Q1 phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q1_PH_A(
+ new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q1_PH_A", "Total VAr-hours Imported Q1 phase A", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q1_PH_B(
+ new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q1_PH_B", "Total VAr-hours Imported Q1 phase B", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q1_PH_C(
+ new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q1_PH_C", "Total VAr-hours Imported Q1 phase C", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
TOT_V_ARH_IMP_Q2(new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q2", "Total VAr-hours Imported Q2", //
"Total Reactive Power Imported Quadrant 2", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q2_PH_A(new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q2_PH_A", "Total VAr-hours Imported Q2 phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q2_PH_B(new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q2_PH_B", "Total VAr-hours Imported Q2 phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q2_PH_C(new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q2_PH_C", "Total VAr-hours Imported Q2 phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q2_PH_A(
+ new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q2_PH_A", "Total VAr-hours Imported Q2 phase A", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q2_PH_B(
+ new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q2_PH_B", "Total VAr-hours Imported Q2 phase B", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q2_PH_C(
+ new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q2_PH_C", "Total VAr-hours Imported Q2 phase C", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
TOT_V_ARH_EXP_Q3(new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q3", "Total VAr-hours Exported Q3", //
"Total Reactive Power Exported Quadrant 3", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q3_PH_A(new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q3_PH_A", "Total VAr-hours Exported Q3 phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q3_PH_B(new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q3_PH_B", "Total VAr-hours Exported Q3 phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q3_PH_C(new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q3_PH_C", "Total VAr-hours Exported Q3 phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q3_PH_A(
+ new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q3_PH_A", "Total VAr-hours Exported Q3 phase A", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q3_PH_B(
+ new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q3_PH_B", "Total VAr-hours Exported Q3 phase B", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q3_PH_C(
+ new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q3_PH_C", "Total VAr-hours Exported Q3 phase C", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
TOT_V_ARH_EXP_Q4(new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q4", "Total VAr-hours Exported Q4", //
"Total Reactive Power Exported Quadrant 4", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q4_PH_A(new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q4_PH_A", "Total VAr-hours Exported Q4 Imported phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q4_PH_B(new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q4_PH_B", "Total VAr-hours Exported Q4 Imported phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q4_PH_C(new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q4_PH_C", "Total VAr-hours Exported Q4 Imported phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q4_PH_A(
+ new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q4_PH_A", "Total VAr-hours Exported Q4 Imported phase A", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q4_PH_B(
+ new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q4_PH_B", "Total VAr-hours Exported Q4 Imported phase B", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q4_PH_C(
+ new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q4_PH_C", "Total VAr-hours Exported Q4 Imported phase C", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
TOT_V_ARH_S_F(new ScaleFactorPoint("S201_TOT_V_ARH_S_F", "", //
"Reactive Energy scale factor")), //
EVT(new BitFieldPoint("S201_EVT", "Events", //
"Meter Event Flags", //
- BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S201_Evt.values()));
+ BITFIELD32, true /* mandatory? */, READ_ONLY, S201_Evt.values()));
private final Point point;
@@ -2871,174 +2905,186 @@ public BitPoint get() {
public static enum S202 implements SunSpecPoint {
A(new ScaledValuePoint("S202_A", "Amps", //
"Total AC Current", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
APH_A(new ScaledValuePoint("S202_APH_A", "Amps PhaseA", //
"Phase A Current", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
APH_B(new ScaledValuePoint("S202_APH_B", "Amps PhaseB", //
"Phase B Current", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
APH_C(new ScaledValuePoint("S202_APH_C", "Amps PhaseC", //
"Phase C Current", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
A_SF(new ScaleFactorPoint("S202_A_SF", "", //
"Current scale factor")), //
PH_V(new ScaledValuePoint("S202_PH_V", "Voltage LN", //
"Line to Neutral AC Voltage (average of active phases)", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_A(new ScaledValuePoint("S202_PH_VPH_A", "Phase Voltage AN", //
"Phase Voltage AN", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_B(new ScaledValuePoint("S202_PH_VPH_B", "Phase Voltage BN", //
"Phase Voltage BN", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_C(new ScaledValuePoint("S202_PH_VPH_C", "Phase Voltage CN", //
"Phase Voltage CN", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PPV(new ScaledValuePoint("S202_PPV", "Voltage LL", //
"Line to Line AC Voltage (average of active phases)", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_A_B(new ScaledValuePoint("S202_PH_VPH_A_B", "Phase Voltage AB", //
"Phase Voltage AB", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_B_C(new ScaledValuePoint("S202_PH_VPH_B_C", "Phase Voltage BC", //
"Phase Voltage BC", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_C_A(new ScaledValuePoint("S202_PH_VPH_C_A", "Phase Voltage CA", //
"Phase Voltage CA", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
V_SF(new ScaleFactorPoint("S202_V_SF", "", //
"Voltage scale factor")), //
HZ(new ScaledValuePoint("S202_HZ", "Hz", //
"Frequency", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.HERTZ, "Hz_SF")), //
HZ_S_F(new ScaleFactorPoint("S202_HZ_S_F", "", //
"Frequency scale factor")), //
W(new ScaledValuePoint("S202_W", "Watts", //
"Total Real Power", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
WPH_A(new ScaledValuePoint("S202_WPH_A", "Watts phase A", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
WPH_B(new ScaledValuePoint("S202_WPH_B", "Watts phase B", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
WPH_C(new ScaledValuePoint("S202_WPH_C", "Watts phase C", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
W_SF(new ScaleFactorPoint("S202_W_SF", "", //
"Real Power scale factor")), //
VA(new ScaledValuePoint("S202_VA", "VA", //
"AC Apparent Power", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
V_APH_A(new ScaledValuePoint("S202_V_APH_A", "VA phase A", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
V_APH_B(new ScaledValuePoint("S202_V_APH_B", "VA phase B", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
V_APH_C(new ScaledValuePoint("S202_V_APH_C", "VA phase C", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
VA_SF(new ScaleFactorPoint("S202_VA_SF", "", //
"Apparent Power scale factor")), //
VAR(new ScaledValuePoint("S202_VAR", "VAR", //
"Reactive Power", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
V_A_RPH_A(new ScaledValuePoint("S202_V_A_RPH_A", "VAR phase A", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
V_A_RPH_B(new ScaledValuePoint("S202_V_A_RPH_B", "VAR phase B", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
V_A_RPH_C(new ScaledValuePoint("S202_V_A_RPH_C", "VAR phase C", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
VAR_SF(new ScaleFactorPoint("S202_VAR_SF", "", //
"Reactive Power scale factor")), //
PF(new ScaledValuePoint("S202_PF", "PF", //
"Power Factor", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
P_FPH_A(new ScaledValuePoint("S202_P_FPH_A", "PF phase A", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
P_FPH_B(new ScaledValuePoint("S202_P_FPH_B", "PF phase B", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
P_FPH_C(new ScaledValuePoint("S202_P_FPH_C", "PF phase C", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
PF_SF(new ScaleFactorPoint("S202_PF_SF", "", //
"Power Factor scale factor")), //
TOT_WH_EXP(new ScaledValuePoint("S202_TOT_WH_EXP", "Total Watt-hours Exported", //
"Total Real Energy Exported", //
- ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_EXP_PH_A(new ScaledValuePoint("S202_TOT_WH_EXP_PH_A", "Total Watt-hours Exported phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_EXP_PH_B(new ScaledValuePoint("S202_TOT_WH_EXP_PH_B", "Total Watt-hours Exported phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_EXP_PH_C(new ScaledValuePoint("S202_TOT_WH_EXP_PH_C", "Total Watt-hours Exported phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_IMP(new ScaledValuePoint("S202_TOT_WH_IMP", "Total Watt-hours Imported", //
"Total Real Energy Imported", //
- ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_IMP_PH_A(new ScaledValuePoint("S202_TOT_WH_IMP_PH_A", "Total Watt-hours Imported phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_IMP_PH_B(new ScaledValuePoint("S202_TOT_WH_IMP_PH_B", "Total Watt-hours Imported phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_IMP_PH_C(new ScaledValuePoint("S202_TOT_WH_IMP_PH_C", "Total Watt-hours Imported phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_S_F(new ScaleFactorPoint("S202_TOT_WH_S_F", "", //
"Real Energy scale factor")), //
TOT_V_AH_EXP(new ScaledValuePoint("S202_TOT_V_AH_EXP", "Total VA-hours Exported", //
"Total Apparent Energy Exported", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_EXP_PH_A(new ScaledValuePoint("S202_TOT_V_AH_EXP_PH_A", "Total VA-hours Exported phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_EXP_PH_B(new ScaledValuePoint("S202_TOT_V_AH_EXP_PH_B", "Total VA-hours Exported phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_EXP_PH_C(new ScaledValuePoint("S202_TOT_V_AH_EXP_PH_C", "Total VA-hours Exported phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_IMP(new ScaledValuePoint("S202_TOT_V_AH_IMP", "Total VA-hours Imported", //
"Total Apparent Energy Imported", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_IMP_PH_A(new ScaledValuePoint("S202_TOT_V_AH_IMP_PH_A", "Total VA-hours Imported phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_IMP_PH_B(new ScaledValuePoint("S202_TOT_V_AH_IMP_PH_B", "Total VA-hours Imported phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_IMP_PH_C(new ScaledValuePoint("S202_TOT_V_AH_IMP_PH_C", "Total VA-hours Imported phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_S_F(new ScaleFactorPoint("S202_TOT_V_AH_S_F", "", //
"Apparent Energy scale factor")), //
TOT_V_ARH_IMP_Q1(new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q1", "Total VAR-hours Imported Q1", //
"Total Reactive Energy Imported Quadrant 1", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q1_PH_A(new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q1_PH_A", "Total VAr-hours Imported Q1 phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q1_PH_B(new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q1_PH_B", "Total VAr-hours Imported Q1 phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q1_PH_C(new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q1_PH_C", "Total VAr-hours Imported Q1 phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q1_PH_A(
+ new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q1_PH_A", "Total VAr-hours Imported Q1 phase A", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q1_PH_B(
+ new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q1_PH_B", "Total VAr-hours Imported Q1 phase B", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q1_PH_C(
+ new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q1_PH_C", "Total VAr-hours Imported Q1 phase C", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
TOT_V_ARH_IMP_Q2(new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q2", "Total VAr-hours Imported Q2", //
"Total Reactive Power Imported Quadrant 2", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q2_PH_A(new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q2_PH_A", "Total VAr-hours Imported Q2 phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q2_PH_B(new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q2_PH_B", "Total VAr-hours Imported Q2 phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q2_PH_C(new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q2_PH_C", "Total VAr-hours Imported Q2 phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q2_PH_A(
+ new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q2_PH_A", "Total VAr-hours Imported Q2 phase A", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q2_PH_B(
+ new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q2_PH_B", "Total VAr-hours Imported Q2 phase B", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q2_PH_C(
+ new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q2_PH_C", "Total VAr-hours Imported Q2 phase C", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
TOT_V_ARH_EXP_Q3(new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q3", "Total VAr-hours Exported Q3", //
"Total Reactive Power Exported Quadrant 3", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q3_PH_A(new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q3_PH_A", "Total VAr-hours Exported Q3 phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q3_PH_B(new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q3_PH_B", "Total VAr-hours Exported Q3 phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q3_PH_C(new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q3_PH_C", "Total VAr-hours Exported Q3 phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q3_PH_A(
+ new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q3_PH_A", "Total VAr-hours Exported Q3 phase A", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q3_PH_B(
+ new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q3_PH_B", "Total VAr-hours Exported Q3 phase B", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q3_PH_C(
+ new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q3_PH_C", "Total VAr-hours Exported Q3 phase C", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
TOT_V_ARH_EXP_Q4(new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q4", "Total VAr-hours Exported Q4", //
"Total Reactive Power Exported Quadrant 4", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q4_PH_A(new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q4_PH_A", "Total VAr-hours Exported Q4 Imported phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q4_PH_B(new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q4_PH_B", "Total VAr-hours Exported Q4 Imported phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q4_PH_C(new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q4_PH_C", "Total VAr-hours Exported Q4 Imported phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q4_PH_A(
+ new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q4_PH_A", "Total VAr-hours Exported Q4 Imported phase A", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q4_PH_B(
+ new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q4_PH_B", "Total VAr-hours Exported Q4 Imported phase B", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q4_PH_C(
+ new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q4_PH_C", "Total VAr-hours Exported Q4 Imported phase C", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
TOT_V_ARH_S_F(new ScaleFactorPoint("S202_TOT_V_ARH_S_F", "", //
"Reactive Energy scale factor")), //
EVT(new BitFieldPoint("S202_EVT", "Events", //
"Meter Event Flags", //
- BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S202_Evt.values()));
+ BITFIELD32, true /* mandatory? */, READ_ONLY, S202_Evt.values()));
private final Point point;
@@ -3098,174 +3144,186 @@ public BitPoint get() {
public static enum S203 implements SunSpecPoint {
A(new ScaledValuePoint("S203_A", "Amps", //
"Total AC Current", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
APH_A(new ScaledValuePoint("S203_APH_A", "Amps PhaseA", //
"Phase A Current", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
APH_B(new ScaledValuePoint("S203_APH_B", "Amps PhaseB", //
"Phase B Current", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
APH_C(new ScaledValuePoint("S203_APH_C", "Amps PhaseC", //
"Phase C Current", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
A_SF(new ScaleFactorPoint("S203_A_SF", "", //
"Current scale factor")), //
PH_V(new ScaledValuePoint("S203_PH_V", "Voltage LN", //
"Line to Neutral AC Voltage (average of active phases)", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_A(new ScaledValuePoint("S203_PH_VPH_A", "Phase Voltage AN", //
"Phase Voltage AN", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_B(new ScaledValuePoint("S203_PH_VPH_B", "Phase Voltage BN", //
"Phase Voltage BN", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_C(new ScaledValuePoint("S203_PH_VPH_C", "Phase Voltage CN", //
"Phase Voltage CN", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PPV(new ScaledValuePoint("S203_PPV", "Voltage LL", //
"Line to Line AC Voltage (average of active phases)", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_A_B(new ScaledValuePoint("S203_PH_VPH_A_B", "Phase Voltage AB", //
"Phase Voltage AB", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_B_C(new ScaledValuePoint("S203_PH_VPH_B_C", "Phase Voltage BC", //
"Phase Voltage BC", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_C_A(new ScaledValuePoint("S203_PH_VPH_C_A", "Phase Voltage CA", //
"Phase Voltage CA", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
V_SF(new ScaleFactorPoint("S203_V_SF", "", //
"Voltage scale factor")), //
HZ(new ScaledValuePoint("S203_HZ", "Hz", //
"Frequency", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.HERTZ, "Hz_SF")), //
HZ_S_F(new ScaleFactorPoint("S203_HZ_S_F", "", //
"Frequency scale factor")), //
W(new ScaledValuePoint("S203_W", "Watts", //
"Total Real Power", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
WPH_A(new ScaledValuePoint("S203_WPH_A", "Watts phase A", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
WPH_B(new ScaledValuePoint("S203_WPH_B", "Watts phase B", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
WPH_C(new ScaledValuePoint("S203_WPH_C", "Watts phase C", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
W_SF(new ScaleFactorPoint("S203_W_SF", "", //
"Real Power scale factor")), //
VA(new ScaledValuePoint("S203_VA", "VA", //
"AC Apparent Power", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
V_APH_A(new ScaledValuePoint("S203_V_APH_A", "VA phase A", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
V_APH_B(new ScaledValuePoint("S203_V_APH_B", "VA phase B", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
V_APH_C(new ScaledValuePoint("S203_V_APH_C", "VA phase C", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
VA_SF(new ScaleFactorPoint("S203_VA_SF", "", //
"Apparent Power scale factor")), //
VAR(new ScaledValuePoint("S203_VAR", "VAR", //
"Reactive Power", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
V_A_RPH_A(new ScaledValuePoint("S203_V_A_RPH_A", "VAR phase A", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
V_A_RPH_B(new ScaledValuePoint("S203_V_A_RPH_B", "VAR phase B", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
V_A_RPH_C(new ScaledValuePoint("S203_V_A_RPH_C", "VAR phase C", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
VAR_SF(new ScaleFactorPoint("S203_VAR_SF", "", //
"Reactive Power scale factor")), //
PF(new ScaledValuePoint("S203_PF", "PF", //
"Power Factor", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
P_FPH_A(new ScaledValuePoint("S203_P_FPH_A", "PF phase A", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
P_FPH_B(new ScaledValuePoint("S203_P_FPH_B", "PF phase B", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
P_FPH_C(new ScaledValuePoint("S203_P_FPH_C", "PF phase C", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
PF_SF(new ScaleFactorPoint("S203_PF_SF", "", //
"Power Factor scale factor")), //
TOT_WH_EXP(new ScaledValuePoint("S203_TOT_WH_EXP", "Total Watt-hours Exported", //
"Total Real Energy Exported", //
- ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_EXP_PH_A(new ScaledValuePoint("S203_TOT_WH_EXP_PH_A", "Total Watt-hours Exported phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_EXP_PH_B(new ScaledValuePoint("S203_TOT_WH_EXP_PH_B", "Total Watt-hours Exported phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_EXP_PH_C(new ScaledValuePoint("S203_TOT_WH_EXP_PH_C", "Total Watt-hours Exported phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_IMP(new ScaledValuePoint("S203_TOT_WH_IMP", "Total Watt-hours Imported", //
"Total Real Energy Imported", //
- ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_IMP_PH_A(new ScaledValuePoint("S203_TOT_WH_IMP_PH_A", "Total Watt-hours Imported phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_IMP_PH_B(new ScaledValuePoint("S203_TOT_WH_IMP_PH_B", "Total Watt-hours Imported phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_IMP_PH_C(new ScaledValuePoint("S203_TOT_WH_IMP_PH_C", "Total Watt-hours Imported phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_S_F(new ScaleFactorPoint("S203_TOT_WH_S_F", "", //
"Real Energy scale factor")), //
TOT_V_AH_EXP(new ScaledValuePoint("S203_TOT_V_AH_EXP", "Total VA-hours Exported", //
"Total Apparent Energy Exported", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_EXP_PH_A(new ScaledValuePoint("S203_TOT_V_AH_EXP_PH_A", "Total VA-hours Exported phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_EXP_PH_B(new ScaledValuePoint("S203_TOT_V_AH_EXP_PH_B", "Total VA-hours Exported phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_EXP_PH_C(new ScaledValuePoint("S203_TOT_V_AH_EXP_PH_C", "Total VA-hours Exported phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_IMP(new ScaledValuePoint("S203_TOT_V_AH_IMP", "Total VA-hours Imported", //
"Total Apparent Energy Imported", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_IMP_PH_A(new ScaledValuePoint("S203_TOT_V_AH_IMP_PH_A", "Total VA-hours Imported phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_IMP_PH_B(new ScaledValuePoint("S203_TOT_V_AH_IMP_PH_B", "Total VA-hours Imported phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_IMP_PH_C(new ScaledValuePoint("S203_TOT_V_AH_IMP_PH_C", "Total VA-hours Imported phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_S_F(new ScaleFactorPoint("S203_TOT_V_AH_S_F", "", //
"Apparent Energy scale factor")), //
TOT_V_ARH_IMP_Q1(new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q1", "Total VAR-hours Imported Q1", //
"Total Reactive Energy Imported Quadrant 1", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q1_PH_A(new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q1_PH_A", "Total VAr-hours Imported Q1 phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q1_PH_B(new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q1_PH_B", "Total VAr-hours Imported Q1 phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q1_PH_C(new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q1_PH_C", "Total VAr-hours Imported Q1 phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q1_PH_A(
+ new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q1_PH_A", "Total VAr-hours Imported Q1 phase A", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q1_PH_B(
+ new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q1_PH_B", "Total VAr-hours Imported Q1 phase B", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q1_PH_C(
+ new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q1_PH_C", "Total VAr-hours Imported Q1 phase C", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
TOT_V_ARH_IMP_Q2(new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q2", "Total VAr-hours Imported Q2", //
"Total Reactive Power Imported Quadrant 2", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q2_PH_A(new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q2_PH_A", "Total VAr-hours Imported Q2 phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q2_PH_B(new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q2_PH_B", "Total VAr-hours Imported Q2 phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q2_PH_C(new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q2_PH_C", "Total VAr-hours Imported Q2 phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q2_PH_A(
+ new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q2_PH_A", "Total VAr-hours Imported Q2 phase A", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q2_PH_B(
+ new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q2_PH_B", "Total VAr-hours Imported Q2 phase B", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q2_PH_C(
+ new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q2_PH_C", "Total VAr-hours Imported Q2 phase C", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
TOT_V_ARH_EXP_Q3(new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q3", "Total VAr-hours Exported Q3", //
"Total Reactive Power Exported Quadrant 3", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q3_PH_A(new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q3_PH_A", "Total VAr-hours Exported Q3 phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q3_PH_B(new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q3_PH_B", "Total VAr-hours Exported Q3 phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q3_PH_C(new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q3_PH_C", "Total VAr-hours Exported Q3 phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q3_PH_A(
+ new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q3_PH_A", "Total VAr-hours Exported Q3 phase A", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q3_PH_B(
+ new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q3_PH_B", "Total VAr-hours Exported Q3 phase B", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q3_PH_C(
+ new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q3_PH_C", "Total VAr-hours Exported Q3 phase C", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
TOT_V_ARH_EXP_Q4(new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q4", "Total VAr-hours Exported Q4", //
"Total Reactive Power Exported Quadrant 4", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q4_PH_A(new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q4_PH_A", "Total VAr-hours Exported Q4 Imported phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q4_PH_B(new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q4_PH_B", "Total VAr-hours Exported Q4 Imported phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q4_PH_C(new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q4_PH_C", "Total VAr-hours Exported Q4 Imported phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q4_PH_A(
+ new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q4_PH_A", "Total VAr-hours Exported Q4 Imported phase A", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q4_PH_B(
+ new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q4_PH_B", "Total VAr-hours Exported Q4 Imported phase B", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q4_PH_C(
+ new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q4_PH_C", "Total VAr-hours Exported Q4 Imported phase C", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
TOT_V_ARH_S_F(new ScaleFactorPoint("S203_TOT_V_ARH_S_F", "", //
"Reactive Energy scale factor")), //
EVT(new BitFieldPoint("S203_EVT", "Events", //
"Meter Event Flags", //
- BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S203_Evt.values()));
+ BITFIELD32, true /* mandatory? */, READ_ONLY, S203_Evt.values()));
private final Point point;
@@ -3325,174 +3383,186 @@ public BitPoint get() {
public static enum S204 implements SunSpecPoint {
A(new ScaledValuePoint("S204_A", "Amps", //
"Total AC Current", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
APH_A(new ScaledValuePoint("S204_APH_A", "Amps PhaseA", //
"Phase A Current", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
APH_B(new ScaledValuePoint("S204_APH_B", "Amps PhaseB", //
"Phase B Current", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
APH_C(new ScaledValuePoint("S204_APH_C", "Amps PhaseC", //
"Phase C Current", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
A_SF(new ScaleFactorPoint("S204_A_SF", "", //
"Current scale factor")), //
PH_V(new ScaledValuePoint("S204_PH_V", "Voltage LN", //
"Line to Neutral AC Voltage (average of active phases)", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_A(new ScaledValuePoint("S204_PH_VPH_A", "Phase Voltage AN", //
"Phase Voltage AN", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_B(new ScaledValuePoint("S204_PH_VPH_B", "Phase Voltage BN", //
"Phase Voltage BN", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_C(new ScaledValuePoint("S204_PH_VPH_C", "Phase Voltage CN", //
"Phase Voltage CN", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PPV(new ScaledValuePoint("S204_PPV", "Voltage LL", //
"Line to Line AC Voltage (average of active phases)", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_A_B(new ScaledValuePoint("S204_PH_VPH_A_B", "Phase Voltage AB", //
"Phase Voltage AB", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_B_C(new ScaledValuePoint("S204_PH_VPH_B_C", "Phase Voltage BC", //
"Phase Voltage BC", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
PH_VPH_C_A(new ScaledValuePoint("S204_PH_VPH_C_A", "Phase Voltage CA", //
"Phase Voltage CA", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
V_SF(new ScaleFactorPoint("S204_V_SF", "", //
"Voltage scale factor")), //
HZ(new ScaledValuePoint("S204_HZ", "Hz", //
"Frequency", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.HERTZ, "Hz_SF")), //
HZ_S_F(new ScaleFactorPoint("S204_HZ_S_F", "", //
"Frequency scale factor")), //
W(new ScaledValuePoint("S204_W", "Watts", //
"Total Real Power", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
WPH_A(new ScaledValuePoint("S204_WPH_A", "Watts phase A", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
WPH_B(new ScaledValuePoint("S204_WPH_B", "Watts phase B", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
WPH_C(new ScaledValuePoint("S204_WPH_C", "Watts phase C", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
W_SF(new ScaleFactorPoint("S204_W_SF", "", //
"Real Power scale factor")), //
VA(new ScaledValuePoint("S204_VA", "VA", //
"AC Apparent Power", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
V_APH_A(new ScaledValuePoint("S204_V_APH_A", "VA phase A", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
V_APH_B(new ScaledValuePoint("S204_V_APH_B", "VA phase B", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
V_APH_C(new ScaledValuePoint("S204_V_APH_C", "VA phase C", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
VA_SF(new ScaleFactorPoint("S204_VA_SF", "", //
"Apparent Power scale factor")), //
VAR(new ScaledValuePoint("S204_VAR", "VAR", //
"Reactive Power", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
V_A_RPH_A(new ScaledValuePoint("S204_V_A_RPH_A", "VAR phase A", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
V_A_RPH_B(new ScaledValuePoint("S204_V_A_RPH_B", "VAR phase B", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
V_A_RPH_C(new ScaledValuePoint("S204_V_A_RPH_C", "VAR phase C", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "VAR_SF")), //
VAR_SF(new ScaleFactorPoint("S204_VAR_SF", "", //
"Reactive Power scale factor")), //
PF(new ScaledValuePoint("S204_PF", "PF", //
"Power Factor", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
P_FPH_A(new ScaledValuePoint("S204_P_FPH_A", "PF phase A", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
P_FPH_B(new ScaledValuePoint("S204_P_FPH_B", "PF phase B", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
P_FPH_C(new ScaledValuePoint("S204_P_FPH_C", "PF phase C", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
PF_SF(new ScaleFactorPoint("S204_PF_SF", "", //
"Power Factor scale factor")), //
TOT_WH_EXP(new ScaledValuePoint("S204_TOT_WH_EXP", "Total Watt-hours Exported", //
"Total Real Energy Exported", //
- ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_EXP_PH_A(new ScaledValuePoint("S204_TOT_WH_EXP_PH_A", "Total Watt-hours Exported phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_EXP_PH_B(new ScaledValuePoint("S204_TOT_WH_EXP_PH_B", "Total Watt-hours Exported phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_EXP_PH_C(new ScaledValuePoint("S204_TOT_WH_EXP_PH_C", "Total Watt-hours Exported phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_IMP(new ScaledValuePoint("S204_TOT_WH_IMP", "Total Watt-hours Imported", //
"Total Real Energy Imported", //
- ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_IMP_PH_A(new ScaledValuePoint("S204_TOT_WH_IMP_PH_A", "Total Watt-hours Imported phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_IMP_PH_B(new ScaledValuePoint("S204_TOT_WH_IMP_PH_B", "Total Watt-hours Imported phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_IMP_PH_C(new ScaledValuePoint("S204_TOT_WH_IMP_PH_C", "Total Watt-hours Imported phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_S_F(new ScaleFactorPoint("S204_TOT_WH_S_F", "", //
"Real Energy scale factor")), //
TOT_V_AH_EXP(new ScaledValuePoint("S204_TOT_V_AH_EXP", "Total VA-hours Exported", //
"Total Apparent Energy Exported", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_EXP_PH_A(new ScaledValuePoint("S204_TOT_V_AH_EXP_PH_A", "Total VA-hours Exported phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_EXP_PH_B(new ScaledValuePoint("S204_TOT_V_AH_EXP_PH_B", "Total VA-hours Exported phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_EXP_PH_C(new ScaledValuePoint("S204_TOT_V_AH_EXP_PH_C", "Total VA-hours Exported phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_IMP(new ScaledValuePoint("S204_TOT_V_AH_IMP", "Total VA-hours Imported", //
"Total Apparent Energy Imported", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_IMP_PH_A(new ScaledValuePoint("S204_TOT_V_AH_IMP_PH_A", "Total VA-hours Imported phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_IMP_PH_B(new ScaledValuePoint("S204_TOT_V_AH_IMP_PH_B", "Total VA-hours Imported phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_IMP_PH_C(new ScaledValuePoint("S204_TOT_V_AH_IMP_PH_C", "Total VA-hours Imported phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_HOURS, "TotVAh_SF")), //
TOT_V_AH_S_F(new ScaleFactorPoint("S204_TOT_V_AH_S_F", "", //
"Apparent Energy scale factor")), //
TOT_V_ARH_IMP_Q1(new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q1", "Total VAR-hours Imported Q1", //
"Total Reactive Energy Imported Quadrant 1", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q1_PH_A(new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q1_PH_A", "Total VAr-hours Imported Q1 phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q1_PH_B(new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q1_PH_B", "Total VAr-hours Imported Q1 phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q1_PH_C(new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q1_PH_C", "Total VAr-hours Imported Q1 phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q1_PH_A(
+ new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q1_PH_A", "Total VAr-hours Imported Q1 phase A", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q1_PH_B(
+ new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q1_PH_B", "Total VAr-hours Imported Q1 phase B", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q1_PH_C(
+ new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q1_PH_C", "Total VAr-hours Imported Q1 phase C", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
TOT_V_ARH_IMP_Q2(new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q2", "Total VAr-hours Imported Q2", //
"Total Reactive Power Imported Quadrant 2", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q2_PH_A(new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q2_PH_A", "Total VAr-hours Imported Q2 phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q2_PH_B(new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q2_PH_B", "Total VAr-hours Imported Q2 phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_IMP_Q2_PH_C(new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q2_PH_C", "Total VAr-hours Imported Q2 phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q2_PH_A(
+ new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q2_PH_A", "Total VAr-hours Imported Q2 phase A", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q2_PH_B(
+ new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q2_PH_B", "Total VAr-hours Imported Q2 phase B", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_IMP_Q2_PH_C(
+ new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q2_PH_C", "Total VAr-hours Imported Q2 phase C", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
TOT_V_ARH_EXP_Q3(new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q3", "Total VAr-hours Exported Q3", //
"Total Reactive Power Exported Quadrant 3", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q3_PH_A(new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q3_PH_A", "Total VAr-hours Exported Q3 phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q3_PH_B(new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q3_PH_B", "Total VAr-hours Exported Q3 phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q3_PH_C(new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q3_PH_C", "Total VAr-hours Exported Q3 phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q3_PH_A(
+ new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q3_PH_A", "Total VAr-hours Exported Q3 phase A", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q3_PH_B(
+ new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q3_PH_B", "Total VAr-hours Exported Q3 phase B", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q3_PH_C(
+ new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q3_PH_C", "Total VAr-hours Exported Q3 phase C", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
TOT_V_ARH_EXP_Q4(new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q4", "Total VAr-hours Exported Q4", //
"Total Reactive Power Exported Quadrant 4", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q4_PH_A(new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q4_PH_A", "Total VAr-hours Exported Q4 Imported phase A", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q4_PH_B(new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q4_PH_B", "Total VAr-hours Exported Q4 Imported phase B", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
- TOT_V_ARH_EXP_Q4_PH_C(new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q4_PH_C", "Total VAr-hours Exported Q4 Imported phase C", "", //
- ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q4_PH_A(
+ new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q4_PH_A", "Total VAr-hours Exported Q4 Imported phase A", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q4_PH_B(
+ new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q4_PH_B", "Total VAr-hours Exported Q4 Imported phase B", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
+ TOT_V_ARH_EXP_Q4_PH_C(
+ new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q4_PH_C", "Total VAr-hours Exported Q4 Imported phase C", "", //
+ ACC32, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVArh_SF")), //
TOT_V_ARH_S_F(new ScaleFactorPoint("S204_TOT_V_ARH_S_F", "", //
"Reactive Energy scale factor")), //
EVT(new BitFieldPoint("S204_EVT", "Events", //
"Meter Event Flags", //
- BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S204_Evt.values()));
+ BITFIELD32, true /* mandatory? */, READ_ONLY, S204_Evt.values()));
private final Point point;
@@ -3552,22 +3622,22 @@ public BitPoint get() {
public static enum S305 implements SunSpecPoint {
TM(new ValuePoint("S305_TM", "Tm", //
"UTC 24 hour time stamp to millisecond hhmmss.sssZ format", //
- ValuePoint.Type.STRING6, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ STRING6, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
DATE(new ValuePoint("S305_DATE", "Date", //
"UTC Date string YYYYMMDD format", //
- ValuePoint.Type.STRING4, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ STRING4, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
LOC(new ValuePoint("S305_LOC", "Location", //
"Location string (40 chars max)", //
- ValuePoint.Type.STRING20, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ STRING20, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
LAT(new ScaledValuePoint("S305_LAT", "Lat", //
"Latitude with seven degrees of precision", //
- ValuePoint.Type.INT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "-7")), //
+ INT32, false /* mandatory? */, READ_ONLY, Unit.NONE, "-7")), //
LONG(new ScaledValuePoint("S305_LONG", "Long", //
"Longitude with seven degrees of precision", //
- ValuePoint.Type.INT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "-7")), //
+ INT32, false /* mandatory? */, READ_ONLY, Unit.NONE, "-7")), //
ALT(new ValuePoint("S305_ALT", "Altitude", //
"Altitude measurement in meters", //
- ValuePoint.Type.INT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+ INT32, false /* mandatory? */, READ_ONLY, Unit.NONE));
private final Point point;
@@ -3584,16 +3654,16 @@ public Point get() {
public static enum S306 implements SunSpecPoint {
GHI(new ValuePoint("S306_GHI", "GHI", //
"Global Horizontal Irradiance", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
A(new ValuePoint("S306_A", "Amps", //
"Current measurement at reference point", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
V(new ValuePoint("S306_V", "Voltage", //
"Voltage measurement at reference point", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
TMP(new ValuePoint("S306_TMP", "Temperature", //
"Temperature measurement at reference point", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE));
private final Point point;
@@ -3609,28 +3679,28 @@ public Point get() {
public static enum S307 implements SunSpecPoint {
TMP_AMB(new ScaledValuePoint("S307_TMP_AMB", "Ambient Temperature", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "-1")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "-1")), //
RH(new ValuePoint("S307_RH", "Relative Humidity", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
PRES(new ValuePoint("S307_PRES", "Barometric Pressure", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
WND_SPD(new ValuePoint("S307_WND_SPD", "Wind Speed", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
WND_DIR(new ValuePoint("S307_WND_DIR", "Wind Direction", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
RAIN(new ValuePoint("S307_RAIN", "Rainfall", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
SNW(new ValuePoint("S307_SNW", "Snow Depth", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
PPT(new ValuePoint("S307_PPT", "Precipitation Type", //
"Precipitation Type (WMO 4680 SYNOP code reference)", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
ELEC_FLD(new ValuePoint("S307_ELEC_FLD", "Electric Field", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
SUR_WET(new ValuePoint("S307_SUR_WET", "Surface Wetness", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
SOIL_WET(new ValuePoint("S307_SOIL_WET", "Soil Wetness", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE));
private final Point point;
@@ -3647,14 +3717,14 @@ public Point get() {
public static enum S308 implements SunSpecPoint {
GHI(new ValuePoint("S308_GHI", "GHI", //
"Global Horizontal Irradiance", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
TMP_B_O_M(new ScaledValuePoint("S308_TMP_B_O_M", "Temp", //
"Back of module temperature measurement", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "-1")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "-1")), //
TMP_AMB(new ScaledValuePoint("S308_TMP_AMB", "Ambient Temperature", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "-1")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "-1")), //
WND_SPD(new ValuePoint("S308_WND_SPD", "Wind Speed", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE));
private final Point point;
@@ -3671,181 +3741,181 @@ public Point get() {
public static enum S701 implements SunSpecPoint {
A_C_TYPE(new EnumPoint("S701_A_C_TYPE", "AC Wiring Type", //
"AC wiring type.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S701_ACType.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S701_ACType.values())), //
ST(new EnumPoint("S701_ST", "Operating State", //
"Operating state of the DER.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S701_St.values())), //
+ ENUM16, false /* mandatory? */, READ_ONLY, S701_St.values())), //
INV_ST(new EnumPoint("S701_INV_ST", "Inverter State", //
"Enumerated value. Inverter state.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S701_InvSt.values())), //
+ ENUM16, false /* mandatory? */, READ_ONLY, S701_InvSt.values())), //
CONN_ST(new EnumPoint("S701_CONN_ST", "Grid Connection State", //
"Grid connection state of the DER.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S701_ConnSt.values())), //
+ ENUM16, false /* mandatory? */, READ_ONLY, S701_ConnSt.values())), //
ALRM(new BitFieldPoint("S701_ALRM", "Alarm Bitfield", //
"Active alarms for the DER.", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, S701_Alrm.values())), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, S701_Alrm.values())), //
D_E_R_MODE(new BitFieldPoint("S701_D_E_R_MODE", "DER Operational Characteristics", //
"Current operational characteristics of the DER.", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, S701_DERMode.values())), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, S701_DERMode.values())), //
W(new ScaledValuePoint("S701_W", "Active Power", //
"Total active power. Active power is positive for DER generation and negative for absorption.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
VA(new ScaledValuePoint("S701_VA", "Apparent Power", //
"Total apparent power.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
VAR(new ScaledValuePoint("S701_VAR", "Reactive Power", //
"Total reactive power.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
PF(new ScaledValuePoint("S701_PF", "Power Factor", //
"Power factor. The sign of power factor should be the sign of active power.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
A(new ScaledValuePoint("S701_A", "Total AC Current", //
"Total AC current.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
LLV(new ScaledValuePoint("S701_LLV", "Voltage LL", //
"Line to line AC voltage as an average of active phases.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
LNV(new ScaledValuePoint("S701_LNV", "Voltage LN", //
"Line to neutral AC voltage as an average of active phases.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
HZ(new ScaledValuePoint("S701_HZ", "Frequency", //
"AC frequency.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")), //
+ UINT32, false /* mandatory? */, READ_ONLY, Unit.HERTZ, "Hz_SF")), //
TOT_WH_INJ(new ScaledValuePoint("S701_TOT_WH_INJ", "Total Energy Injected", //
"Total active energy injected (Quadrants 1 & 4).", //
- ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ UINT64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_ABS(new ScaledValuePoint("S701_TOT_WH_ABS", "Total Energy Absorbed", //
"Total active energy absorbed (Quadrants 2 & 3).", //
- ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ UINT64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_VARH_INJ(new ScaledValuePoint("S701_TOT_VARH_INJ", "Total Reactive Energy Inj", //
"Total reactive energy injected (Quadrants 1 & 2).", //
- ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
+ UINT64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
TOT_VARH_ABS(new ScaledValuePoint("S701_TOT_VARH_ABS", "Total Reactive Energy Abs", //
"Total reactive energy absorbed (Quadrants 3 & 4).", //
- ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
+ UINT64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
TMP_AMB(new ScaledValuePoint("S701_TMP_AMB", "Ambient Temperature", //
"Ambient temperature.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
TMP_CAB(new ScaledValuePoint("S701_TMP_CAB", "Cabinet Temperature", //
"Cabinet temperature.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
TMP_SNK(new ScaledValuePoint("S701_TMP_SNK", "Heat Sink Temperature", //
"Heat sink temperature.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
TMP_TRNS(new ScaledValuePoint("S701_TMP_TRNS", "Transformer Temperature", //
"Transformer temperature.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
TMP_SW(new ScaledValuePoint("S701_TMP_SW", "IGBT/MOSFET Temperature", //
"IGBT/MOSFET temperature.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
TMP_OT(new ScaledValuePoint("S701_TMP_OT", "Other Temperature", //
"Other temperature.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), //
WL1(new ScaledValuePoint("S701_WL1", "Watts L1", //
"Active power L1.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
VAL1(new ScaledValuePoint("S701_VAL1", "VA L1", //
"Apparent power L1.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
VAR_L1(new ScaledValuePoint("S701_VAR_L1", "Var L1", //
"Reactive power L1.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
PFL1(new ScaledValuePoint("S701_PFL1", "PF L1", //
"Power factor phase L1.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
AL1(new ScaledValuePoint("S701_AL1", "Amps L1", //
"Current phase L1.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
VL1L2(new ScaledValuePoint("S701_VL1L2", "Phase Voltage L1-L2", //
"Phase voltage L1-L2.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
VL1(new ScaledValuePoint("S701_VL1", "Phase Voltage L1-N", //
"Phase voltage L1-N.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
TOT_WH_INJ_L1(new ScaledValuePoint("S701_TOT_WH_INJ_L1", "Total Watt-Hours Inj L1", //
"Total active energy injected L1.", //
- ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ UINT64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_ABS_L1(new ScaledValuePoint("S701_TOT_WH_ABS_L1", "Total Watt-Hours Abs L1", //
"Total active energy absorbed L1.", //
- ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ UINT64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_VARH_INJ_L1(new ScaledValuePoint("S701_TOT_VARH_INJ_L1", "Total Var-Hours Inj L1", //
"Total reactive energy injected L1.", //
- ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
+ UINT64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
TOT_VARH_ABS_L1(new ScaledValuePoint("S701_TOT_VARH_ABS_L1", "Total Var-Hours Abs L1", //
"Total reactive energy absorbed L1.", //
- ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
+ UINT64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
WL2(new ScaledValuePoint("S701_WL2", "Watts L2", //
"Active power L2.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
VAL2(new ScaledValuePoint("S701_VAL2", "VA L2", //
"Apparent power L2.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
VAR_L2(new ScaledValuePoint("S701_VAR_L2", "Var L2", //
"Reactive power L2.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
PFL2(new ScaledValuePoint("S701_PFL2", "PF L2", //
"Power factor L2.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
AL2(new ScaledValuePoint("S701_AL2", "Amps L2", //
"Current L2.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
VL2L3(new ScaledValuePoint("S701_VL2L3", "Phase Voltage L2-L3", //
"Phase voltage L2-L3.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
VL2(new ScaledValuePoint("S701_VL2", "Phase Voltage L2-N", //
"Phase voltage L2-N.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
TOT_WH_INJ_L2(new ScaledValuePoint("S701_TOT_WH_INJ_L2", "Total Watt-Hours Inj L2", //
"Total active energy injected L2.", //
- ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ UINT64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_ABS_L2(new ScaledValuePoint("S701_TOT_WH_ABS_L2", "Total Watt-Hours Abs L2", //
"Total active energy absorbed L2.", //
- ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ UINT64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_VARH_INJ_L2(new ScaledValuePoint("S701_TOT_VARH_INJ_L2", "Total Var-Hours Inj L2", //
"Total reactive energy injected L2.", //
- ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
+ UINT64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
TOT_VARH_ABS_L2(new ScaledValuePoint("S701_TOT_VARH_ABS_L2", "Total Var-Hours Abs L2", //
"Total reactive energy absorbed L2.", //
- ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
+ UINT64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
WL3(new ScaledValuePoint("S701_WL3", "Watts L3", //
"Active power L3.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
VAL3(new ScaledValuePoint("S701_VAL3", "VA L3", //
"Apparent power L3.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
VAR_L3(new ScaledValuePoint("S701_VAR_L3", "Var L3", //
"Reactive power L3.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
PFL3(new ScaledValuePoint("S701_PFL3", "PF L3", //
"Power factor L3.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
AL3(new ScaledValuePoint("S701_AL3", "Amps L3", //
"Current L3.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
VL3L1(new ScaledValuePoint("S701_VL3L1", "Phase Voltage L3-L1", //
"Phase voltage L3-L1.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
VL3(new ScaledValuePoint("S701_VL3", "Phase Voltage L3-N", //
"Phase voltage L3-N.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
TOT_WH_INJ_L3(new ScaledValuePoint("S701_TOT_WH_INJ_L3", "Total Watt-Hours Inj L3", //
"Total active energy injected L3.", //
- ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ UINT64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_WH_ABS_L3(new ScaledValuePoint("S701_TOT_WH_ABS_L3", "Total Watt-Hours Abs L3", //
"Total active energy absorbed L3.", //
- ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
+ UINT64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "TotWh_SF")), //
TOT_VARH_INJ_L3(new ScaledValuePoint("S701_TOT_VARH_INJ_L3", "Total Var-Hours Inj L3", //
"Total reactive energy injected L3.", //
- ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
+ UINT64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
TOT_VARH_ABS_L3(new ScaledValuePoint("S701_TOT_VARH_ABS_L3", "Total Var-Hours Abs L3", //
"Total reactive energy absorbed L3.", //
- ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
+ UINT64, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), //
THROT_PCT(new ValuePoint("S701_THROT_PCT", "Throttling In Pct", //
"Throttling in pct of maximum active power.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
THROT_SRC(new BitFieldPoint("S701_THROT_SRC", "Throttle Source Information", //
"Active throttling source.", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, S701_ThrotSrc.values())), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, S701_ThrotSrc.values())), //
A_SF(new ScaleFactorPoint("S701_A_SF", "Current Scale Factor", //
"Current scale factor.")), //
V_SF(new ScaleFactorPoint("S701_V_SF", "Voltage Scale Factor", //
@@ -3868,7 +3938,7 @@ public static enum S701 implements SunSpecPoint {
"Temperature scale factor.")), //
MN_ALRM_INFO(new ValuePoint("S701_MN_ALRM_INFO", "Manufacturer Alarm Info", //
"Manufacturer alarm information. Valid if MANUFACTURER_ALRM indication is active.", //
- ValuePoint.Type.STRING32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+ STRING32, false /* mandatory? */, READ_ONLY, Unit.NONE));
private final Point point;
@@ -4085,130 +4155,130 @@ public BitPoint get() {
public static enum S702 implements SunSpecPoint {
W_MAX_RTG(new ScaledValuePoint("S702_W_MAX_RTG", "Active Power Max Rating", //
"Maximum active power rating at unity power factor in watts.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
W_OVR_EXT_RTG(new ScaledValuePoint("S702_W_OVR_EXT_RTG", "Active Power (Over-Excited) Rating", //
"Active power rating at specified over-excited power factor in watts.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
W_OVR_EXT_RTG_P_F(new ScaledValuePoint("S702_W_OVR_EXT_RTG_P_F", "Specified Over-Excited PF", //
"Specified over-excited power factor.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
W_UND_EXT_RTG(new ScaledValuePoint("S702_W_UND_EXT_RTG", "Active Power (Under-Excited) Rating", //
"Active power rating at specified under-excited power factor in watts.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
W_UND_EXT_RTG_P_F(new ScaledValuePoint("S702_W_UND_EXT_RTG_P_F", "Specified Under-Excited PF", //
"Specified under-excited power factor.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
V_A_MAX_RTG(new ScaledValuePoint("S702_V_A_MAX_RTG", "Apparent Power Max Rating", //
"Maximum apparent power rating in voltamperes.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
VAR_MAX_INJ_RTG(new ScaledValuePoint("S702_VAR_MAX_INJ_RTG", "Reactive Power Injected Rating", //
"Maximum injected reactive power rating in vars.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
VAR_MAX_ABS_RTG(new ScaledValuePoint("S702_VAR_MAX_ABS_RTG", "Reactive Power Absorbed Rating", //
"Maximum absorbed reactive power rating in vars.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
W_CHA_RTE_MAX_RTG(new ScaledValuePoint("S702_W_CHA_RTE_MAX_RTG", "Charge Rate Max Rating", //
"Maximum active power charge rate in watts.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
W_DIS_CHA_RTE_MAX_RTG(new ScaledValuePoint("S702_W_DIS_CHA_RTE_MAX_RTG", "Discharge Rate Max Rating", //
"Maximum active power discharge rate in watts.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
V_A_CHA_RTE_MAX_RTG(new ScaledValuePoint("S702_V_A_CHA_RTE_MAX_RTG", "Charge Rate Max VA Rating", //
"Maximum apparent power charge rate in voltamperes.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
V_A_DIS_CHA_RTE_MAX_RTG(new ScaledValuePoint("S702_V_A_DIS_CHA_RTE_MAX_RTG", "Discharge Rate Max VA Rating", //
"Maximum apparent power discharge rate in voltamperes.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), //
V_NOM_RTG(new ScaledValuePoint("S702_V_NOM_RTG", "AC Voltage Nominal Rating", //
"AC voltage nominal rating.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
V_MAX_RTG(new ScaledValuePoint("S702_V_MAX_RTG", "AC Voltage Max Rating", //
"AC voltage maximum rating.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
V_MIN_RTG(new ScaledValuePoint("S702_V_MIN_RTG", "AC Voltage Min Rating", //
"AC voltage minimum rating.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
A_MAX_RTG(new ScaledValuePoint("S702_A_MAX_RTG", "AC Current Max Rating", //
"AC current maximum rating in amps.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
P_F_OVR_EXT_RTG(new ScaledValuePoint("S702_P_F_OVR_EXT_RTG", "PF Over-Excited Rating", //
"Power factor over-excited rating.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
P_F_UND_EXT_RTG(new ScaledValuePoint("S702_P_F_UND_EXT_RTG", "PF Under-Excited Rating", //
"Power factor under-excited rating.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "PF_SF")), //
REACT_SUSCEPT_RTG(new ScaledValuePoint("S702_REACT_SUSCEPT_RTG", "Reactive Susceptance", //
"Reactive susceptance that remains connected to the Area EPS in the cease to energize and trip state.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "S_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "S_SF")), //
NOR_OP_CAT_RTG(new EnumPoint("S702_NOR_OP_CAT_RTG", "Normal Operating Category", //
"Normal operating performance category as specified in IEEE 1547-2018.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S702_NorOpCatRtg.values())), //
+ ENUM16, false /* mandatory? */, READ_ONLY, S702_NorOpCatRtg.values())), //
ABN_OP_CAT_RTG(new EnumPoint("S702_ABN_OP_CAT_RTG", "Abnormal Operating Category", //
"Abnormal operating performance category as specified in IEEE 1547-2018.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S702_AbnOpCatRtg.values())), //
+ ENUM16, false /* mandatory? */, READ_ONLY, S702_AbnOpCatRtg.values())), //
CTRL_MODES(new BitFieldPoint("S702_CTRL_MODES", "Supported Control Modes", //
"Supported control mode functions.", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, S702_CtrlModes.values())), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, S702_CtrlModes.values())), //
INT_ISLAND_CAT_RTG(new BitFieldPoint("S702_INT_ISLAND_CAT_RTG", "Intentional Island Categories", //
"Intentional island categories.", //
- BitFieldPoint.Type.BITFIELD16, false /* mandatory? */, AccessMode.READ_ONLY, S702_IntIslandCatRtg.values())), //
+ BITFIELD16, false /* mandatory? */, READ_ONLY, S702_IntIslandCatRtg.values())), //
W_MAX(new ScaledValuePoint("S702_W_MAX", "Active Power Max Setting", //
"Maximum active power setting used to adjust maximum active power setting.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.WATT, "W_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.WATT, "W_SF")), //
W_MAX_OVR_EXT(new ScaledValuePoint("S702_W_MAX_OVR_EXT", "Active Power (Over-Excited) Setting", //
"Active power setting at specified over-excited power factor in watts.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.WATT, "W_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.WATT, "W_SF")), //
W_OVR_EXT_P_F(new ScaledValuePoint("S702_W_OVR_EXT_P_F", "Specified Over-Excited PF", //
"Specified over-excited power factor.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "PF_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "PF_SF")), //
W_MAX_UND_EXT(new ScaledValuePoint("S702_W_MAX_UND_EXT", "Active Power (Under-Excited) Setting", //
"Active power setting at specified under-excited power factor in watts.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.WATT, "W_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.WATT, "W_SF")), //
W_UND_EXT_P_F(new ScaledValuePoint("S702_W_UND_EXT_P_F", "Specified Under-Excited PF", //
"Specified under-excited power factor.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "PF_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "PF_SF")), //
V_A_MAX(new ScaledValuePoint("S702_V_A_MAX", "Apparent Power Max Setting", //
"Maximum apparent power setting used to adjust maximum apparent power rating.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE, "VA_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE, "VA_SF")), //
VAR_MAX_INJ(new ScaledValuePoint("S702_VAR_MAX_INJ", "Reactive Power Injected Setting", //
"Maximum injected reactive power setting used to adjust maximum injected reactive power rating.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
VAR_MAX_ABS(new ScaledValuePoint("S702_VAR_MAX_ABS", "Reactive Power Absorbed Setting", //
"Maximum absorbed reactive power setting used to adjust maximum absorbed reactive power rating.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), //
W_CHA_RTE_MAX(new ScaledValuePoint("S702_W_CHA_RTE_MAX", "Charge Rate Max Setting", //
"Maximum active power charge rate setting used to adjust maximum active power charge rate rating.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.WATT, "W_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.WATT, "W_SF")), //
W_DIS_CHA_RTE_MAX(new ScaledValuePoint("S702_W_DIS_CHA_RTE_MAX", "Discharge Rate Max Setting", //
"Maximum active power discharge rate setting used to adjust maximum active power discharge rate rating.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.WATT, "W_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.WATT, "W_SF")), //
V_A_CHA_RTE_MAX(new ScaledValuePoint("S702_V_A_CHA_RTE_MAX", "Charge Rate Max VA Setting", //
"Maximum apparent power charge rate setting used to adjust maximum apparent power charge rate rating.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE, "VA_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE, "VA_SF")), //
V_A_DIS_CHA_RTE_MAX(new ScaledValuePoint("S702_V_A_DIS_CHA_RTE_MAX", "Discharge Rate Max VA Setting", //
"Maximum apparent power discharge rate setting used to adjust maximum apparent power discharge rate rating.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE, "VA_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE, "VA_SF")), //
V_NOM(new ScaledValuePoint("S702_V_NOM", "Nominal AC Voltage Setting", //
"Nominal AC voltage setting.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT, "V_SF")), //
V_MAX(new ScaledValuePoint("S702_V_MAX", "AC Voltage Max Setting", //
"AC voltage maximum setting used to adjust AC voltage maximum rating.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT, "V_SF")), //
V_MIN(new ScaledValuePoint("S702_V_MIN", "AC Voltage Min Setting", //
"AC voltage minimum setting used to adjust AC voltage minimum rating.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.VOLT, "V_SF")), //
A_MAX(new ScaledValuePoint("S702_A_MAX", "AC Current Max Setting", //
"Maximum AC current setting used to adjust maximum AC current rating.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.AMPERE, "A_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.AMPERE, "A_SF")), //
P_F_OVR_EXT(new ScaledValuePoint("S702_P_F_OVR_EXT", "PF Over-Excited Setting", //
"Power factor over-excited setting.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "PF_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "PF_SF")), //
P_F_UND_EXT(new ScaledValuePoint("S702_P_F_UND_EXT", "PF Under-Excited Setting", //
"Power factor under-excited setting.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "PF_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "PF_SF")), //
INT_ISLAND_CAT(new BitFieldPoint("S702_INT_ISLAND_CAT", "Intentional Island Categories", //
"Intentional island categories.", //
- BitFieldPoint.Type.BITFIELD16, false /* mandatory? */, AccessMode.READ_WRITE, S702_IntIslandCat.values())), //
+ BITFIELD16, false /* mandatory? */, READ_WRITE, S702_IntIslandCat.values())), //
W_SF(new ScaleFactorPoint("S702_W_SF", "Active Power Scale Factor", //
"Active power scale factor.")), //
PF_SF(new ScaleFactorPoint("S702_PF_SF", "Power Factor Scale Factor", //
@@ -4362,31 +4432,31 @@ public BitPoint get() {
public static enum S703 implements SunSpecPoint {
ES(new EnumPoint("S703_ES", "Permit Enter Service", //
"Permit enter service.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S703_ES.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S703_ES.values())), //
E_S_V_HI(new ScaledValuePoint("S703_E_S_V_HI", "Enter Service Voltage High", //
"Enter service voltage high threshold as percent of normal voltage.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "V_SF")), //
E_S_V_LO(new ScaledValuePoint("S703_E_S_V_LO", "Enter Service Voltage Low", //
"Enter service voltage low threshold as percent of normal voltage.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "V_SF")), //
E_S_HZ_HI(new ScaledValuePoint("S703_E_S_HZ_HI", "Enter Service Frequency High", //
"Enter service frequency high threshold.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.HERTZ, "Hz_SF")), //
+ UINT32, false /* mandatory? */, READ_WRITE, Unit.HERTZ, "Hz_SF")), //
E_S_HZ_LO(new ScaledValuePoint("S703_E_S_HZ_LO", "Enter Service Frequency Low", //
"Enter service frequency low threshold.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.HERTZ, "Hz_SF")), //
+ UINT32, false /* mandatory? */, READ_WRITE, Unit.HERTZ, "Hz_SF")), //
E_S_DLY_TMS(new ValuePoint("S703_E_S_DLY_TMS", "Enter Service Delay Time", //
"Enter service delay time in seconds.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
E_S_RND_TMS(new ValuePoint("S703_E_S_RND_TMS", "Enter Service Random Delay", //
"Enter service random delay in seconds.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
E_S_RMP_TMS(new ValuePoint("S703_E_S_RMP_TMS", "Enter Service Ramp Time", //
"Enter service ramp time in seconds.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
E_S_DLY_REM_TMS(new ValuePoint("S703_E_S_DLY_REM_TMS", "Enter Service Delay Remaining", //
"Enter service delay time remaining in seconds.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
V_SF(new ScaleFactorPoint("S703_V_SF", "Voltage Scale Factor", //
"Voltage percentage scale factor.")), //
HZ_S_F(new ScaleFactorPoint("S703_HZ_S_F", "Frequency Scale Factor", //
@@ -4436,115 +4506,115 @@ public OptionsEnum getUndefined() {
public static enum S704 implements SunSpecPoint {
P_F_W_INJ_ENA(new EnumPoint("S704_P_F_W_INJ_ENA", "Power Factor Enable (W Inj) Enable", //
"Power factor enable when injecting active power.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_PFWInjEna.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S704_PFWInjEna.values())), //
P_F_W_INJ_ENA_RVRT(new EnumPoint("S704_P_F_W_INJ_ENA_RVRT", "Power Factor Reversion Enable (W Inj)", //
"Power factor reversion timer when injecting active power enable.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_PFWInjEnaRvrt.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S704_PFWInjEnaRvrt.values())), //
P_F_W_INJ_RVRT_TMS(new ValuePoint("S704_P_F_W_INJ_RVRT_TMS", "PF Reversion Time (W Inj)", //
"Power factor reversion timer when injecting active power.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
P_F_W_INJ_RVRT_REM(new ValuePoint("S704_P_F_W_INJ_RVRT_REM", "PF Reversion Time Rem (W Inj)", //
"Power factor reversion time remaining when injecting active power.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
P_F_W_ABS_ENA(new EnumPoint("S704_P_F_W_ABS_ENA", "Power Factor Enable (W Abs) Enable", //
"Power factor enable when absorbing active power.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_PFWAbsEna.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S704_PFWAbsEna.values())), //
P_F_W_ABS_ENA_RVRT(new EnumPoint("S704_P_F_W_ABS_ENA_RVRT", "Power Factor Reversion Enable (W Abs)", //
"Power factor reversion timer when absorbing active power enable.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_PFWAbsEnaRvrt.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S704_PFWAbsEnaRvrt.values())), //
P_F_W_ABS_RVRT_TMS(new ValuePoint("S704_P_F_W_ABS_RVRT_TMS", "PF Reversion Time (W Abs)", //
"Power factor reversion timer when absorbing active power.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
P_F_W_ABS_RVRT_REM(new ValuePoint("S704_P_F_W_ABS_RVRT_REM", "PF Reversion Time Rem (W Abs)", //
"Power factor reversion time remaining when absorbing active power.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
W_MAX_LIM_PCT_ENA(new EnumPoint("S704_W_MAX_LIM_PCT_ENA", "Limit Max Power Pct Enable", //
"Limit maximum active power percent enable.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_WMaxLimPctEna.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S704_WMaxLimPctEna.values())), //
W_MAX_LIM_PCT(new ScaledValuePoint("S704_W_MAX_LIM_PCT", "Limit Max Power Pct Setpoint", //
"Limit maximum active power percent value.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "WMaxLimPct_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "WMaxLimPct_SF")), //
W_MAX_LIM_PCT_RVRT(new ScaledValuePoint("S704_W_MAX_LIM_PCT_RVRT", "Reversion Limit Max Power Pct", //
"Reversion limit maximum active power percent value.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "WMaxLimPct_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "WMaxLimPct_SF")), //
W_MAX_LIM_PCT_ENA_RVRT(new EnumPoint("S704_W_MAX_LIM_PCT_ENA_RVRT", "Reversion Limit Max Power Pct Enable", //
"Reversion limit maximum active power percent value enable.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_WMaxLimPctEnaRvrt.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S704_WMaxLimPctEnaRvrt.values())), //
W_MAX_LIM_PCT_RVRT_TMS(new ValuePoint("S704_W_MAX_LIM_PCT_RVRT_TMS", "Limit Max Power Pct Reversion Time", //
"Limit maximum active power percent reversion time.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
W_MAX_LIM_PCT_RVRT_REM(new ValuePoint("S704_W_MAX_LIM_PCT_RVRT_REM", "Limit Max Power Pct Rev Time Rem", //
"Limit maximum active power percent reversion time remaining.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
W_SET_ENA(new EnumPoint("S704_W_SET_ENA", "Set Active Power Enable", //
"Set active power enable.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_WSetEna.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S704_WSetEna.values())), //
W_SET_MOD(new EnumPoint("S704_W_SET_MOD", "Set Active Power Mode", //
"Set active power mode.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_WSetMod.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S704_WSetMod.values())), //
W_SET(new ScaledValuePoint("S704_W_SET", "Active Power Setpoint (W)", //
"Active power setting value in watts.", //
- ValuePoint.Type.INT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.WATT, "WSet_SF")), //
+ INT32, false /* mandatory? */, READ_WRITE, Unit.WATT, "WSet_SF")), //
W_SET_RVRT(new ScaledValuePoint("S704_W_SET_RVRT", "Reversion Active Power (W)", //
"Reversion active power setting value in watts.", //
- ValuePoint.Type.INT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.WATT, "WSet_SF")), //
+ INT32, false /* mandatory? */, READ_WRITE, Unit.WATT, "WSet_SF")), //
W_SET_PCT(new ScaledValuePoint("S704_W_SET_PCT", "Active Power Setpoint (Pct)", //
"Active power setting value as percent.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "WSetPct_SF")), //
+ INT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "WSetPct_SF")), //
W_SET_PCT_RVRT(new ScaledValuePoint("S704_W_SET_PCT_RVRT", "Reversion Active Power (Pct)", //
"Reversion active power setting value as percent.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "WSetPct_SF")), //
+ INT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "WSetPct_SF")), //
W_SET_ENA_RVRT(new EnumPoint("S704_W_SET_ENA_RVRT", "Reversion Active Power Enable", //
"Reversion active power function enable.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_WSetEnaRvrt.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S704_WSetEnaRvrt.values())), //
W_SET_RVRT_TMS(new ValuePoint("S704_W_SET_RVRT_TMS", "Active Power Reversion Time", //
"Set active power reversion time.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
W_SET_RVRT_REM(new ValuePoint("S704_W_SET_RVRT_REM", "Active Power Rev Time Rem", //
"Set active power reversion time remaining.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
VAR_SET_ENA(new EnumPoint("S704_VAR_SET_ENA", "Set Reactive Power Enable", //
"Set reactive power enable.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_VarSetEna.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S704_VarSetEna.values())), //
VAR_SET_MOD(new EnumPoint("S704_VAR_SET_MOD", "Set Reactive Power Mode", //
"Set reactive power mode.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_VarSetMod.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S704_VarSetMod.values())), //
VAR_SET_PRI(new EnumPoint("S704_VAR_SET_PRI", "Reactive Power Priority", //
"Reactive power priority.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_VarSetPri.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S704_VarSetPri.values())), //
VAR_SET(new ScaledValuePoint("S704_VAR_SET", "Reactive Power Setpoint (Vars)", //
"Reactive power setting value in vars.", //
- ValuePoint.Type.INT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VarSet_SF")), //
+ INT32, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VarSet_SF")), //
VAR_SET_RVRT(new ScaledValuePoint("S704_VAR_SET_RVRT", "Reversion Reactive Power (Vars)", //
"Reversion reactive power setting value in vars.", //
- ValuePoint.Type.INT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VarSet_SF")), //
+ INT32, false /* mandatory? */, READ_WRITE, Unit.VOLT_AMPERE_REACTIVE, "VarSet_SF")), //
VAR_SET_PCT(new ScaledValuePoint("S704_VAR_SET_PCT", "Reactive Power Setpoint (Pct)", //
"Reactive power setting value as percent.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "VarSetPct_SF")), //
+ INT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "VarSetPct_SF")), //
VAR_SET_PCT_RVRT(new ScaledValuePoint("S704_VAR_SET_PCT_RVRT", "Reversion Reactive Power (Pct)", //
"Reversion reactive power setting value as percent.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "VarSetPct_SF")), //
+ INT16, false /* mandatory? */, READ_WRITE, Unit.NONE, "VarSetPct_SF")), //
VAR_SET_ENA_RVRT(new EnumPoint("S704_VAR_SET_ENA_RVRT", "Reversion Reactive Power Enable", //
"Reversion reactive power function enable.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_VarSetEnaRvrt.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S704_VarSetEnaRvrt.values())), //
VAR_SET_RVRT_TMS(new ValuePoint("S704_VAR_SET_RVRT_TMS", "Reactive Power Reversion Time", //
"Set reactive power reversion time.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
VAR_SET_RVRT_REM(new ValuePoint("S704_VAR_SET_RVRT_REM", "Reactive Power Rev Time Rem", //
"Set reactive power reversion time remaining.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
W_RMP(new ValuePoint("S704_W_RMP", "Normal Ramp Rate", //
"Ramp rate for increases in active power during normal generation.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
W_RMP_REF(new EnumPoint("S704_W_RMP_REF", "Normal Ramp Rate Reference", //
"Ramp rate reference unit for increases in active power or current during normal generation.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_WRmpRef.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S704_WRmpRef.values())), //
VAR_RMP(new ValuePoint("S704_VAR_RMP", "Reactive Power Ramp Rate", //
"Ramp rate based on max reactive power per second.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
ANTI_ISL_ENA(new EnumPoint("S704_ANTI_ISL_ENA", "Anti-Islanding Enable", //
"Anti-islanding enable.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_AntiIslEna.values())), //
+ ENUM16, false /* mandatory? */, READ_WRITE, S704_AntiIslEna.values())), //
PF_SF(new ScaleFactorPoint("S704_PF_SF", "Power Factor Scale Factor", //
"Power factor scale factor.")), //
W_MAX_LIM_PCT_S_F(new ScaleFactorPoint("S704_W_MAX_LIM_PCT_S_F", "Limit Max Power Scale Factor", //
@@ -5012,28 +5082,28 @@ public OptionsEnum getUndefined() {
public static enum S705 implements SunSpecPoint {
ENA(new EnumPoint("S705_ENA", "DER Volt-Var Module Enable", //
"Volt-Var control enable.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S705_Ena.values())), //
+ ENUM16, true /* mandatory? */, READ_WRITE, S705_Ena.values())), //
ADPT_CRV_REQ(new ValuePoint("S705_ADPT_CRV_REQ", "Adopt Curve Request", //
"Index of curve points to adopt. First curve index is 1.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE)), //
ADPT_CRV_RSLT(new EnumPoint("S705_ADPT_CRV_RSLT", "Adopt Curve Result", //
"Result of last adopt curve operation.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S705_AdptCrvRslt.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S705_AdptCrvRslt.values())), //
N_PT(new ValuePoint("S705_N_PT", "Number Of Points", //
"Number of curve points supported.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
N_CRV(new ValuePoint("S705_N_CRV", "Stored Curve Count", //
"Number of stored curves supported.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
RVRT_TMS(new ValuePoint("S705_RVRT_TMS", "Reversion Timeout", //
"Reversion time in seconds. 0 = No reversion time.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
RVRT_REM(new ValuePoint("S705_RVRT_REM", "Reversion Time Remaining", //
"Reversion time remaining in seconds.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
RVRT_CRV(new ValuePoint("S705_RVRT_CRV", "Reversion Curve", //
"Default curve after reversion timeout.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
V_SF(new ScaleFactorPoint("S705_V_SF", "Voltage Scale Factor", //
"Scale factor for curve voltage points.")), //
DEPT_REF_S_F(new ScaleFactorPoint("S705_DEPT_REF_S_F", "Var Scale Factor", //
@@ -5115,28 +5185,28 @@ public OptionsEnum getUndefined() {
public static enum S706 implements SunSpecPoint {
ENA(new EnumPoint("S706_ENA", "DER Volt-Watt Module Enable", //
"Volt-Watt control enable.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S706_Ena.values())), //
+ ENUM16, true /* mandatory? */, READ_WRITE, S706_Ena.values())), //
ADPT_CRV_REQ(new ValuePoint("S706_ADPT_CRV_REQ", "Adopt Curve Request", //
"Index of curve points to adopt. First curve index is 1.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE)), //
ADPT_CRV_RSLT(new EnumPoint("S706_ADPT_CRV_RSLT", "Adopt Curve Result", //
"Result of last adopt curve operation.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S706_AdptCrvRslt.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S706_AdptCrvRslt.values())), //
N_PT(new ValuePoint("S706_N_PT", "Number Of Points", //
"Number of curve points supported.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
N_CRV(new ValuePoint("S706_N_CRV", "Stored Curve Count", //
"Number of stored curves supported.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
RVRT_TMS(new ValuePoint("S706_RVRT_TMS", "Reversion Timeout", //
"Reversion time in seconds. 0 = No reversion time.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
RVRT_REM(new ValuePoint("S706_RVRT_REM", "Reversion Time Remaining", //
"Reversion time remaining in seconds.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
RVRT_CRV(new ValuePoint("S706_RVRT_CRV", "Reversion Curve", //
"Default curve after reversion timeout.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
V_SF(new ScaleFactorPoint("S706_V_SF", "Voltage Scale Factor", //
"Scale factor for curve voltage points.")), //
DEPT_REF_S_F(new ScaleFactorPoint("S706_DEPT_REF_S_F", "Watt Scale Factor", //
@@ -5218,19 +5288,19 @@ public OptionsEnum getUndefined() {
public static enum S707 implements SunSpecPoint {
ENA(new EnumPoint("S707_ENA", "DER Trip LV Module Enable", //
"DER low voltage trip control enable.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S707_Ena.values())), //
+ ENUM16, true /* mandatory? */, READ_WRITE, S707_Ena.values())), //
ADPT_CRV_REQ(new ValuePoint("S707_ADPT_CRV_REQ", "Adopt Curve Request", //
"Index of curve points to adopt. First curve index is 1.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE)), //
ADPT_CRV_RSLT(new EnumPoint("S707_ADPT_CRV_RSLT", "Adopt Curve Result", //
"Result of last adopt curve operation.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S707_AdptCrvRslt.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S707_AdptCrvRslt.values())), //
N_PT(new ValuePoint("S707_N_PT", "Number Of Points", //
"Number of curve points supported.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
N_CRV_SET(new ValuePoint("S707_N_CRV_SET", "Stored Curve Count", //
"Number of stored curves supported.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
V_SF(new ScaleFactorPoint("S707_V_SF", "Voltage Scale Factor", //
"Scale factor for curve voltage points.")), //
TMS_S_F(new ScaleFactorPoint("S707_TMS_S_F", "Time Point Scale Factor", //
@@ -5310,19 +5380,19 @@ public OptionsEnum getUndefined() {
public static enum S708 implements SunSpecPoint {
ENA(new EnumPoint("S708_ENA", "DER Trip HV Module Enable", //
"DER high voltage trip control enable.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S708_Ena.values())), //
+ ENUM16, true /* mandatory? */, READ_WRITE, S708_Ena.values())), //
ADPT_CRV_REQ(new ValuePoint("S708_ADPT_CRV_REQ", "Adopt Curve Request", //
"Index of curve points to adopt. First curve index is 1.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE)), //
ADPT_CRV_RSLT(new EnumPoint("S708_ADPT_CRV_RSLT", "Adopt Curve Result", //
"Result of last adopt curve operation.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S708_AdptCrvRslt.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S708_AdptCrvRslt.values())), //
N_PT(new ValuePoint("S708_N_PT", "Number Of Points", //
"Number of curve points supported.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
N_CRV_SET(new ValuePoint("S708_N_CRV_SET", "Stored Curve Count", //
"Number of stored curves supported.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
V_SF(new ScaleFactorPoint("S708_V_SF", "Voltage Scale Factor", //
"Scale factor for curve voltage points.")), //
TMS_S_F(new ScaleFactorPoint("S708_TMS_S_F", "Time Point Scale Factor", //
@@ -5402,19 +5472,19 @@ public OptionsEnum getUndefined() {
public static enum S709 implements SunSpecPoint {
ENA(new EnumPoint("S709_ENA", "DER Trip LF Module Enable", //
"DER low frequency trip control enable.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S709_Ena.values())), //
+ ENUM16, true /* mandatory? */, READ_WRITE, S709_Ena.values())), //
ADPT_CRV_REQ(new ValuePoint("S709_ADPT_CRV_REQ", "Adopt Curve Request", //
"Index of curve points to adopt. First curve index is 1.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE)), //
ADPT_CRV_RSLT(new EnumPoint("S709_ADPT_CRV_RSLT", "Adopt Curve Result", //
"Result of last adopt curve operation.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S709_AdptCrvRslt.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S709_AdptCrvRslt.values())), //
N_PT(new ValuePoint("S709_N_PT", "Number Of Points", //
"Number of curve points supported.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
N_CRV_SET(new ValuePoint("S709_N_CRV_SET", "Stored Curve Count", //
"Number of stored curves supported.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
HZ_S_F(new ScaleFactorPoint("S709_HZ_S_F", "Frequency Scale Factor", //
"Scale factor for curve frequency points.")), //
TMS_S_F(new ScaleFactorPoint("S709_TMS_S_F", "Time Point Scale Factor", //
@@ -5494,19 +5564,19 @@ public OptionsEnum getUndefined() {
public static enum S710 implements SunSpecPoint {
ENA(new EnumPoint("S710_ENA", "DER Trip HF Module Enable", //
"DER high frequency trip control enable.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S710_Ena.values())), //
+ ENUM16, true /* mandatory? */, READ_WRITE, S710_Ena.values())), //
ADPT_CRV_REQ(new ValuePoint("S710_ADPT_CRV_REQ", "Adopt Curve Request", //
"Index of curve points to adopt. First curve index is 1.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE)), //
ADPT_CRV_RSLT(new EnumPoint("S710_ADPT_CRV_RSLT", "Adopt Curve Result", //
"Result of last adopt curve operation.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S710_AdptCrvRslt.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S710_AdptCrvRslt.values())), //
N_PT(new ValuePoint("S710_N_PT", "Number Of Points", //
"Number of curve points supported.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
N_CRV_SET(new ValuePoint("S710_N_CRV_SET", "Stored Curve Count", //
"Number of stored curves supported.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
HZ_S_F(new ScaleFactorPoint("S710_HZ_S_F", "Frequency Scale Factor", //
"Scale factor for curve frequency points.")), //
TMS_S_F(new ScaleFactorPoint("S710_TMS_S_F", "Time Point Scale Factor", //
@@ -5586,25 +5656,25 @@ public OptionsEnum getUndefined() {
public static enum S711 implements SunSpecPoint {
ENA(new EnumPoint("S711_ENA", "DER Frequency Droop Module Enable", //
"DER Frequency-Watt (Frequency-Droop) control enable.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S711_Ena.values())), //
+ ENUM16, true /* mandatory? */, READ_WRITE, S711_Ena.values())), //
ADPT_CTL_REQ(new ValuePoint("S711_ADPT_CTL_REQ", "Set Active Control Request", //
"Set active control. 0 = No active control.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE)), //
ADPT_CTL_RSLT(new EnumPoint("S711_ADPT_CTL_RSLT", "Set Active Control Result", //
"Result of last set active control operation.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S711_AdptCtlRslt.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S711_AdptCtlRslt.values())), //
N_CTL(new ValuePoint("S711_N_CTL", "Stored Control Count", //
"Number of stored controls supported.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
RVRT_TMS(new ValuePoint("S711_RVRT_TMS", "Reversion Timeout", //
"Reversion time in seconds. 0 = No reversion time.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
RVRT_REM(new ValuePoint("S711_RVRT_REM", "Reversion Time Left", //
"Reversion time remaining in seconds.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
RVRT_CTL(new ValuePoint("S711_RVRT_CTL", "Reversion Control", //
"Default control after reversion timeout.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
DB_S_F(new ScaleFactorPoint("S711_DB_S_F", "Deadband Scale Factor", //
"Deadband scale factor.")), //
K_SF(new ScaleFactorPoint("S711_K_SF", "Frequency Change Scale Factor", //
@@ -5686,28 +5756,28 @@ public OptionsEnum getUndefined() {
public static enum S712 implements SunSpecPoint {
ENA(new EnumPoint("S712_ENA", "DER Watt-Var Module Enable", //
"DER Watt-Var control enable.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S712_Ena.values())), //
+ ENUM16, true /* mandatory? */, READ_WRITE, S712_Ena.values())), //
ADPT_CRV_REQ(new ValuePoint("S712_ADPT_CRV_REQ", "Set Active Curve Request", //
"Set active curve. 0 = No active curve.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE)), //
ADPT_CRV_RSLT(new EnumPoint("S712_ADPT_CRV_RSLT", "Set Active Curve Result", //
"Result of last set active curve operation.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S712_AdptCrvRslt.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S712_AdptCrvRslt.values())), //
N_PT(new ValuePoint("S712_N_PT", "Number Of Points", //
"Number of curve points supported.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
N_CRV(new ValuePoint("S712_N_CRV", "Stored Curve Count", //
"Number of stored curves supported.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
RVRT_TMS(new ValuePoint("S712_RVRT_TMS", "Reversion Timeout", //
"Reversion time in seconds. 0 = No reversion time.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_WRITE, Unit.SECONDS)), //
RVRT_REM(new ValuePoint("S712_RVRT_REM", "Reversion Time Left", //
"Reversion time remaining in seconds.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), //
+ UINT32, false /* mandatory? */, READ_ONLY, Unit.SECONDS)), //
RVRT_CRV(new ValuePoint("S712_RVRT_CRV", "Reversion Curve", //
"Default curve after reversion timeout.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
W_SF(new ScaleFactorPoint("S712_W_SF", "Active Power Scale Factor", //
"Scale factor for curve active power points.")), //
DEPT_REF_S_F(new ScaleFactorPoint("S712_DEPT_REF_S_F", "Var Scale Factor", //
@@ -5787,19 +5857,19 @@ public OptionsEnum getUndefined() {
public static enum S713 implements SunSpecPoint {
W_H_RTG(new ScaledValuePoint("S713_W_H_RTG", "Energy Rating", //
"Energy rating of the DER storage.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), //
W_H_AVAIL(new ScaledValuePoint("S713_W_H_AVAIL", "Energy Available", //
"Energy available of the DER storage (WHAvail = WHRtg * SoC * SoH)", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), //
SO_C(new ScaledValuePoint("S713_SO_C", "State of Charge", //
"State of charge of the DER storage.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "Pct_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "Pct_SF")), //
SO_H(new ScaledValuePoint("S713_SO_H", "State of Health", //
"State of health of the DER storage.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "Pct_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE, "Pct_SF")), //
STA(new EnumPoint("S713_STA", "Status", //
"Storage status.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S713_Sta.values())), //
+ ENUM16, false /* mandatory? */, READ_ONLY, S713_Sta.values())), //
WH_SF(new ScaleFactorPoint("S713_WH_SF", "Energy Scale Factor", //
"Scale factor for energy capacity.")), //
PCT_S_F(new ScaleFactorPoint("S713_PCT_S_F", "Percent Scale Factor", //
@@ -5850,22 +5920,22 @@ public OptionsEnum getUndefined() {
public static enum S714 implements SunSpecPoint {
PRT_ALRMS(new BitFieldPoint("S714_PRT_ALRMS", "Port Alarms", //
"Bitfield of ports with active alarms. Bit is 1 if port has an active alarm. Bit 0 is first port.", //
- BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
N_PRT(new ValuePoint("S714_N_PRT", "Number Of Ports", //
"Number of DC ports.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
DCA(new ScaledValuePoint("S714_DCA", "DC Current", //
"Total DC current for all ports.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "DCA_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "DCA_SF")), //
DCW(new ScaledValuePoint("S714_DCW", "DC Power", //
"Total DC power for all ports.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "DCW_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "DCW_SF")), //
D_C_WH_INJ(new ScaledValuePoint("S714_D_C_WH_INJ", "DC Energy Injected", //
"Total cumulative DC energy injected for all ports.", //
- ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "DCWH_SF")), //
+ UINT64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "DCWH_SF")), //
D_C_WH_ABS(new ScaledValuePoint("S714_D_C_WH_ABS", "DC Energy Absorbed", //
"Total cumulative DC energy absorbed for all ports.", //
- ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "DCWH_SF")), //
+ UINT64, false /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "DCWH_SF")), //
DCA_SF(new ScaleFactorPoint("S714_DCA_SF", "DC Current Scale Factor", //
"DC current scale factor.")), //
DCV_SF(new ScaleFactorPoint("S714_DCV_SF", "DC Voltage Scale Factor", //
@@ -5892,19 +5962,19 @@ public Point get() {
public static enum S715 implements SunSpecPoint {
LOC_REM_CTL(new EnumPoint("S715_LOC_REM_CTL", "Control Mode", //
"DER control mode. Enumeration.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S715_LocRemCtl.values())), //
+ ENUM16, false /* mandatory? */, READ_ONLY, S715_LocRemCtl.values())), //
D_E_R_HB(new ValuePoint("S715_D_E_R_HB", "DER Heartbeat", //
"Value is incremented every second by the DER with periodic resets to zero.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
CONTROLLER_HB(new ValuePoint("S715_CONTROLLER_HB", "Controller Heartbeat", //
"Value is incremented every second by the controller with periodic resets to zero.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ UINT32, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
ALARM_RESET(new ValuePoint("S715_ALARM_RESET", "Alarm Reset", //
"Used to reset any latched alarms. 1 = Reset.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
OP_CTL(new EnumPoint("S715_OP_CTL", "Set Operation", //
"Commands to PCS. Enumerated value.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S715_OpCtl.values()));
+ ENUM16, false /* mandatory? */, READ_WRITE, S715_OpCtl.values()));
private final Point point;
@@ -5981,7 +6051,7 @@ public OptionsEnum getUndefined() {
public static enum S801 implements SunSpecPoint {
DEPRECATED(new EnumPoint("S801_DEPRECATED", "Deprecated Model", //
"This model has been deprecated.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0]));
+ ENUM16, true /* mandatory? */, READ_ONLY, new OptionsEnum[0]));
private final Point point;
@@ -5998,136 +6068,136 @@ public Point get() {
public static enum S802 implements SunSpecPoint {
A_H_RTG(new ScaledValuePoint("S802_A_H_RTG", "Nameplate Charge Capacity", //
"Nameplate charge capacity in amp-hours.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE_HOURS, "AHRtg_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE_HOURS, "AHRtg_SF")), //
W_H_RTG(new ScaledValuePoint("S802_W_H_RTG", "Nameplate Energy Capacity", //
"Nameplate energy capacity in DC watt-hours.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WHRtg_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WHRtg_SF")), //
W_CHA_RTE_MAX(new ScaledValuePoint("S802_W_CHA_RTE_MAX", "Nameplate Max Charge Rate", //
"Maximum rate of energy transfer into the storage device in DC watts.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "WChaDisChaMax_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "WChaDisChaMax_SF")), //
W_DIS_CHA_RTE_MAX(new ScaledValuePoint("S802_W_DIS_CHA_RTE_MAX", "Nameplate Max Discharge Rate", //
"Maximum rate of energy transfer out of the storage device in DC watts.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "WChaDisChaMax_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "WChaDisChaMax_SF")), //
DIS_CHA_RTE(new ScaledValuePoint("S802_DIS_CHA_RTE", "Self Discharge Rate", //
"Self discharge rate. Percentage of capacity (WHRtg) discharged per day.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.PERCENT, "DisChaRte_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.PERCENT, "DisChaRte_SF")), //
SO_C_MAX(new ScaledValuePoint("S802_SO_C_MAX", "Nameplate Max SoC", //
"Manufacturer maximum state of charge, expressed as a percentage.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.PERCENT, "SoC_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.PERCENT, "SoC_SF")), //
SO_C_MIN(new ScaledValuePoint("S802_SO_C_MIN", "Nameplate Min SoC", //
"Manufacturer minimum state of charge, expressed as a percentage.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.PERCENT, "SoC_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.PERCENT, "SoC_SF")), //
SOC_RSV_MAX(new ScaledValuePoint("S802_SOC_RSV_MAX", "Max Reserve Percent", //
"Setpoint for maximum reserve for storage as a percentage of the nominal maximum storage.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "SoC_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "SoC_SF")), //
SO_C_RSV_MIN(new ScaledValuePoint("S802_SO_C_RSV_MIN", "Min Reserve Percent", //
"Setpoint for minimum reserve for storage as a percentage of the nominal maximum storage.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "SoC_SF")), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.PERCENT, "SoC_SF")), //
SO_C(new ScaledValuePoint("S802_SO_C", "State of Charge", //
"State of charge, expressed as a percentage.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.PERCENT, "SoC_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.PERCENT, "SoC_SF")), //
DO_D(new ScaledValuePoint("S802_DO_D", "Depth of Discharge", //
"Depth of discharge, expressed as a percentage.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.PERCENT, "DoD_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.PERCENT, "DoD_SF")), //
SO_H(new ScaledValuePoint("S802_SO_H", "State of Health", //
"Percentage of battery life remaining.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.PERCENT, "SoH_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.PERCENT, "SoH_SF")), //
N_CYC(new ValuePoint("S802_N_CYC", "Cycle Count", //
"Number of cycles executed in the battery.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
CHA_ST(new EnumPoint("S802_CHA_ST", "Charge Status", //
"Charge status of storage device. Enumeration.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S802_ChaSt.values())), //
+ ENUM16, false /* mandatory? */, READ_ONLY, S802_ChaSt.values())), //
LOC_REM_CTL(new EnumPoint("S802_LOC_REM_CTL", "Control Mode", //
"Battery control mode. Enumeration.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S802_LocRemCtl.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S802_LocRemCtl.values())), //
HB(new ValuePoint("S802_HB", "Battery Heartbeat", //
"Value is incremented every second with periodic resets to zero.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
CTRL_HB(new ValuePoint("S802_CTRL_HB", "Controller Heartbeat", //
"Value is incremented every second with periodic resets to zero.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_WRITE, Unit.NONE)), //
ALM_RST(new ValuePoint("S802_ALM_RST", "Alarm Reset", //
"Used to reset any latched alarms. 1 = Reset.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_WRITE, Unit.NONE)), //
TYP(new EnumPoint("S802_TYP", "Battery Type", //
"Type of battery. Enumeration.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S802_Typ.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S802_Typ.values())), //
STATE(new EnumPoint("S802_STATE", "State of the Battery Bank", //
"State of the battery bank. Enumeration.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S802_State.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S802_State.values())), //
STATE_VND(new EnumPoint("S802_STATE_VND", "Vendor Battery Bank State", //
"Vendor specific battery bank state. Enumeration.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+ ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
WARR_DT(new ValuePoint("S802_WARR_DT", "Warranty Date", //
"Date the device warranty expires.", //
- ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT32, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
EVT1(new BitFieldPoint("S802_EVT1", "Battery Event 1 Bitfield", //
"Alarms and warnings. Bit flags.", //
- BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S802_Evt1.values())), //
+ BITFIELD32, true /* mandatory? */, READ_ONLY, S802_Evt1.values())), //
EVT2(new BitFieldPoint("S802_EVT2", "Battery Event 2 Bitfield", //
"Alarms and warnings. Bit flags.", //
- BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, true /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND1(new BitFieldPoint("S802_EVT_VND1", "Vendor Event Bitfield 1", //
"Vendor defined events.", //
- BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, true /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
EVT_VND2(new BitFieldPoint("S802_EVT_VND2", "Vendor Event Bitfield 2", //
"Vendor defined events.", //
- BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD32, true /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
V(new ScaledValuePoint("S802_V", "External Battery Voltage", //
"DC Bus Voltage.", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
V_MAX(new ScaledValuePoint("S802_V_MAX", "Max Battery Voltage", //
"Instantaneous maximum battery voltage.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
V_MIN(new ScaledValuePoint("S802_V_MIN", "Min Battery Voltage", //
"Instantaneous minimum battery voltage.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
CELL_V_MAX(new ScaledValuePoint("S802_CELL_V_MAX", "Max Cell Voltage", //
"Maximum voltage for all cells in the bank.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "CellV_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "CellV_SF")), //
CELL_V_MAX_STR(new ValuePoint("S802_CELL_V_MAX_STR", "Max Cell Voltage String", //
"String containing the cell with maximum voltage.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
CELL_V_MAX_MOD(new ValuePoint("S802_CELL_V_MAX_MOD", "Max Cell Voltage Module", //
"Module containing the cell with maximum voltage.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
CELL_V_MIN(new ScaledValuePoint("S802_CELL_V_MIN", "Min Cell Voltage", //
"Minimum voltage for all cells in the bank.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "CellV_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "CellV_SF")), //
CELL_V_MIN_STR(new ValuePoint("S802_CELL_V_MIN_STR", "Min Cell Voltage String", //
"String containing the cell with minimum voltage.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
CELL_V_MIN_MOD(new ValuePoint("S802_CELL_V_MIN_MOD", "Min Cell Voltage Module", //
"Module containing the cell with minimum voltage.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
CELL_V_AVG(new ScaledValuePoint("S802_CELL_V_AVG", "Average Cell Voltage", //
"Average cell voltage for all cells in the bank.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "CellV_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.VOLT, "CellV_SF")), //
A(new ScaledValuePoint("S802_A", "Total DC Current", //
"Total DC current flowing to/from the battery bank.", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
A_CHA_MAX(new ScaledValuePoint("S802_A_CHA_MAX", "Max Charge Current", //
"Instantaneous maximum DC charge current.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "AMax_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "AMax_SF")), //
A_DIS_CHA_MAX(new ScaledValuePoint("S802_A_DIS_CHA_MAX", "Max Discharge Current", //
"Instantaneous maximum DC discharge current.", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "AMax_SF")), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.AMPERE, "AMax_SF")), //
W(new ScaledValuePoint("S802_W", "Total Power", //
"Total power flowing to/from the battery bank.", //
- ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
REQ_INV_STATE(new EnumPoint("S802_REQ_INV_STATE", "Inverter State Request", //
"Request from battery to start or stop the inverter. Enumeration.", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S802_ReqInvState.values())), //
+ ENUM16, false /* mandatory? */, READ_ONLY, S802_ReqInvState.values())), //
REQ_W(new ScaledValuePoint("S802_REQ_W", "Battery Power Request", //
"AC Power requested by battery.", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), //
+ INT16, false /* mandatory? */, READ_ONLY, Unit.WATT, "W_SF")), //
SET_OP(new EnumPoint("S802_SET_OP", "Set Operation", //
"Instruct the battery bank to perform an operation such as connecting. Enumeration.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S802_SetOp.values())), //
+ ENUM16, true /* mandatory? */, READ_WRITE, S802_SetOp.values())), //
SET_INV_STATE(new EnumPoint("S802_SET_INV_STATE", "Set Inverter State", //
"Set the current state of the inverter.", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S802_SetInvState.values())), //
+ ENUM16, true /* mandatory? */, READ_WRITE, S802_SetInvState.values())), //
A_H_RTG_S_F(new ScaleFactorPoint("S802_A_H_RTG_S_F", "", //
"Scale factor for charge capacity.")), //
W_H_RTG_S_F(new ScaleFactorPoint("S802_W_H_RTG_S_F", "", //
@@ -6308,9 +6378,12 @@ public static enum S802_Evt1 implements SunSpecBitPoint {
UNDER_TEMP_ALARM(new BitPoint(3, "S802_EVT1_UNDER_TEMP_ALARM", "Under Temp Alarm")), //
UNDER_TEMP_WARNING(new BitPoint(4, "S802_EVT1_UNDER_TEMP_WARNING", "Under Temp Warning")), //
OVER_CHARGE_CURRENT_ALARM(new BitPoint(5, "S802_EVT1_OVER_CHARGE_CURRENT_ALARM", "Over Charge Current Alarm")), //
- OVER_CHARGE_CURRENT_WARNING(new BitPoint(6, "S802_EVT1_OVER_CHARGE_CURRENT_WARNING", "Over Charge Current Warning")), //
- OVER_DISCHARGE_CURRENT_ALARM(new BitPoint(7, "S802_EVT1_OVER_DISCHARGE_CURRENT_ALARM", "Over Discharge Current Alarm")), //
- OVER_DISCHARGE_CURRENT_WARNING(new BitPoint(8, "S802_EVT1_OVER_DISCHARGE_CURRENT_WARNING", "Over Discharge Current Warning")), //
+ OVER_CHARGE_CURRENT_WARNING(
+ new BitPoint(6, "S802_EVT1_OVER_CHARGE_CURRENT_WARNING", "Over Charge Current Warning")), //
+ OVER_DISCHARGE_CURRENT_ALARM(
+ new BitPoint(7, "S802_EVT1_OVER_DISCHARGE_CURRENT_ALARM", "Over Discharge Current Alarm")), //
+ OVER_DISCHARGE_CURRENT_WARNING(
+ new BitPoint(8, "S802_EVT1_OVER_DISCHARGE_CURRENT_WARNING", "Over Discharge Current Warning")), //
OVER_VOLT_ALARM(new BitPoint(9, "S802_EVT1_OVER_VOLT_ALARM", "Over Volt Alarm")), //
OVER_VOLT_WARNING(new BitPoint(10, "S802_EVT1_OVER_VOLT_WARNING", "Over Volt Warning")), //
UNDER_VOLT_ALARM(new BitPoint(11, "S802_EVT1_UNDER_VOLT_ALARM", "Under Volt Alarm")), //
@@ -6320,8 +6393,10 @@ public static enum S802_Evt1 implements SunSpecBitPoint {
OVER_SOC_MAX_ALARM(new BitPoint(15, "S802_EVT1_OVER_SOC_MAX_ALARM", "Over Soc Max Alarm")), //
OVER_SOC_MAX_WARNING(new BitPoint(16, "S802_EVT1_OVER_SOC_MAX_WARNING", "Over Soc Max Warning")), //
VOLTAGE_IMBALANCE_WARNING(new BitPoint(17, "S802_EVT1_VOLTAGE_IMBALANCE_WARNING", "Voltage Imbalance Warning")), //
- TEMPERATURE_IMBALANCE_ALARM(new BitPoint(18, "S802_EVT1_TEMPERATURE_IMBALANCE_ALARM", "Temperature Imbalance Alarm")), //
- TEMPERATURE_IMBALANCE_WARNING(new BitPoint(19, "S802_EVT1_TEMPERATURE_IMBALANCE_WARNING", "Temperature Imbalance Warning")), //
+ TEMPERATURE_IMBALANCE_ALARM(
+ new BitPoint(18, "S802_EVT1_TEMPERATURE_IMBALANCE_ALARM", "Temperature Imbalance Alarm")), //
+ TEMPERATURE_IMBALANCE_WARNING(
+ new BitPoint(19, "S802_EVT1_TEMPERATURE_IMBALANCE_WARNING", "Temperature Imbalance Warning")), //
CONTACTOR_ERROR(new BitPoint(20, "S802_EVT1_CONTACTOR_ERROR", "Contactor Error")), //
FAN_ERROR(new BitPoint(21, "S802_EVT1_FAN_ERROR", "Fan Error")), //
GROUND_FAULT(new BitPoint(22, "S802_EVT1_GROUND_FAULT", "Ground Fault")), //
@@ -6436,75 +6511,75 @@ public OptionsEnum getUndefined() {
public static enum S64001 implements SunSpecPoint {
CMD(new EnumPoint("S64001_CMD", "Command Code", "", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, new OptionsEnum[0])), //
+ ENUM16, false /* mandatory? */, READ_WRITE, new OptionsEnum[0])), //
H_W_REV(new ValuePoint("S64001_H_W_REV", "Hardware Revision", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
R_S_F_W_REV(new ValuePoint("S64001_R_S_F_W_REV", "RS FW Revision", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
O_S_F_W_REV(new ValuePoint("S64001_O_S_F_W_REV", "OS FW Revision", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
PROD_REV(new ValuePoint("S64001_PROD_REV", "Product Revision", "", //
- ValuePoint.Type.STRING2, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ STRING2, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
BOOTS(new ValuePoint("S64001_BOOTS", "Boot Count", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
SWITCH(new BitFieldPoint("S64001_SWITCH", "DIP Switches", "", //
- BitFieldPoint.Type.BITFIELD16, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD16, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
SENSORS(new ValuePoint("S64001_SENSORS", "Num Detected Sensors", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
TALKING(new ValuePoint("S64001_TALKING", "Num Communicating Sensors", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
STATUS(new BitFieldPoint("S64001_STATUS", "System Status", "", //
- BitFieldPoint.Type.BITFIELD16, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD16, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
CONFIG(new BitFieldPoint("S64001_CONFIG", "System Configuration", "", //
- BitFieldPoint.Type.BITFIELD16, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD16, false /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
L_E_DBLINK(new ValuePoint("S64001_L_E_DBLINK", "LED Blink Threshold", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
L_E_DON(new ValuePoint("S64001_L_E_DON", "LED On Threshold", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
RESERVED(new ValuePoint("S64001_RESERVED", "", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
LOC(new ValuePoint("S64001_LOC", "Location String", "", //
- ValuePoint.Type.STRING16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ STRING16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
S1ID(new EnumPoint("S64001_S1ID", "Sensor 1 Unit ID", "", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+ ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
S1_ADDR(new ValuePoint("S64001_S1_ADDR", "Sensor 1 Address", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
S1_O_S_VER(new ValuePoint("S64001_S1_O_S_VER", "Sensor 1 OS Version", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
S1_VER(new ValuePoint("S64001_S1_VER", "Sensor 1 Product Version", "", //
- ValuePoint.Type.STRING2, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ STRING2, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
S1_SERIAL(new ValuePoint("S64001_S1_SERIAL", "Sensor 1 Serial Num", "", //
- ValuePoint.Type.STRING5, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ STRING5, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
S2ID(new EnumPoint("S64001_S2ID", "Sensor 2 Unit ID", "", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+ ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
S2_ADDR(new ValuePoint("S64001_S2_ADDR", "Sensor 2 Address", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
S2_O_S_VER(new ValuePoint("S64001_S2_O_S_VER", "Sensor 2 OS Version", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
S2_VER(new ValuePoint("S64001_S2_VER", "Sensor 2 Product Version", "", //
- ValuePoint.Type.STRING2, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ STRING2, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
S2_SERIAL(new ValuePoint("S64001_S2_SERIAL", "Sensor 2 Serial Num", "", //
- ValuePoint.Type.STRING5, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ STRING5, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
S3ID(new EnumPoint("S64001_S3ID", "Sensor 3 Unit ID", "", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+ ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
S3_ADDR(new ValuePoint("S64001_S3_ADDR", "Sensor 3 Address", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
S3_O_S_VER(new ValuePoint("S64001_S3_O_S_VER", "Sensor 3 OS Version", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
S3_VER(new ValuePoint("S64001_S3_VER", "Sensor 3 Product Version", "", //
- ValuePoint.Type.STRING2, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ STRING2, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
S3_SERIAL(new ValuePoint("S64001_S3_SERIAL", "Sensor 3 Serial Num", "", //
- ValuePoint.Type.STRING5, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ STRING5, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
S4ID(new EnumPoint("S64001_S4ID", "Sensor 4 Unit ID", "", //
- EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), //
+ ENUM16, false /* mandatory? */, READ_ONLY, new OptionsEnum[0])), //
S4_ADDR(new ValuePoint("S64001_S4_ADDR", "Sensor 4 Address", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
S4_O_S_VER(new ValuePoint("S64001_S4_O_S_VER", "Sensor 4 OS Version", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
S4_VER(new ValuePoint("S64001_S4_VER", "Sensor 4 Product Version", "", //
- ValuePoint.Type.STRING2, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ STRING2, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
S4_SERIAL(new ValuePoint("S64001_S4_SERIAL", "Sensor 4 Serial Num", "", //
- ValuePoint.Type.STRING5, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+ STRING5, false /* mandatory? */, READ_ONLY, Unit.NONE));
private final Point point;
@@ -6520,19 +6595,19 @@ public Point get() {
public static enum S64101 implements SunSpecPoint {
ELTEK_COUNTRY_CODE(new ValuePoint("S64101_ELTEK_COUNTRY_CODE", "", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
ELTEK_FEEDING_PHASE(new ValuePoint("S64101_ELTEK_FEEDING_PHASE", "", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
ELTEK_A_P_D_METHOD(new ValuePoint("S64101_ELTEK_A_P_D_METHOD", "", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
ELTEK_A_P_D_POWER_REF(new ValuePoint("S64101_ELTEK_A_P_D_POWER_REF", "", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
ELTEK_R_P_S_METHOD(new ValuePoint("S64101_ELTEK_R_P_S_METHOD", "", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
ELTEK_R_P_S_Q_REF(new ValuePoint("S64101_ELTEK_R_P_S_Q_REF", "", "", //
- ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, false /* mandatory? */, READ_ONLY, Unit.NONE)), //
ELTEK_R_P_S_COS_PHI_REF(new ValuePoint("S64101_ELTEK_R_P_S_COS_PHI_REF", "", "", //
- ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+ INT16, false /* mandatory? */, READ_ONLY, Unit.NONE));
private final Point point;
@@ -6548,46 +6623,46 @@ public Point get() {
public static enum S64111 implements SunSpecPoint {
PORT(new ValuePoint("S64111_PORT", "Port Number", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
V_SF(new ScaleFactorPoint("S64111_V_SF", "", "")), //
A_SF(new ScaleFactorPoint("S64111_A_SF", "", "")), //
P_SF(new ScaleFactorPoint("S64111_P_SF", "", "")), //
AH_SF(new ScaleFactorPoint("S64111_AH_SF", "", "")), //
KWH_SF(new ScaleFactorPoint("S64111_KWH_SF", "", "")), //
BATT_V(new ScaledValuePoint("S64111_BATT_V", "Battery Voltage", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
ARRAY_V(new ScaledValuePoint("S64111_ARRAY_V", "Array Voltage", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
OUTPUT_A(new ScaledValuePoint("S64111_OUTPUT_A", "Output Current", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "A_SF")), //
INPUT_A(new ScaledValuePoint("S64111_INPUT_A", "Array Current", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "P_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "P_SF")), //
CHARGER_ST(new EnumPoint("S64111_CHARGER_ST", "Operating State", "", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64111_ChargerSt.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S64111_ChargerSt.values())), //
OUTPUT_W(new ScaledValuePoint("S64111_OUTPUT_W", "Output Wattage", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "P_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "P_SF")), //
TODAY_MIN_BAT_V(new ScaledValuePoint("S64111_TODAY_MIN_BAT_V", "Today's Minimum Battery Voltage", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
TODAY_MAX_BAT_V(new ScaledValuePoint("S64111_TODAY_MAX_BAT_V", "Today's Maximum Battery Voltage", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
VOCV(new ScaledValuePoint("S64111_VOCV", "VOC", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
TODAY_MAX_V_O_C(new ScaledValuePoint("S64111_TODAY_MAX_V_O_C", "Today's Maximum VOC", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
TODAYK_WH_OUTPUT(new ScaledValuePoint("S64111_TODAYK_WH_OUTPUT", "Today's kWh", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.KILOWATT_HOURS, "KWH_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.KILOWATT_HOURS, "KWH_SF")), //
TODAY_A_H_OUTPUT(new ScaledValuePoint("S64111_TODAY_A_H_OUTPUT", "Today's AH", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE_HOURS, "AH_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE_HOURS, "AH_SF")), //
LIFE_TIME_K_W_H_OUT(new ScaledValuePoint("S64111_LIFE_TIME_K_W_H_OUT", "Lifetime kWh", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.KILOWATT_HOURS, "P_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.KILOWATT_HOURS, "P_SF")), //
LIFE_TIME_A_H_OUT(new ScaledValuePoint("S64111_LIFE_TIME_A_H_OUT", "Lifetime kAH", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.KILOAMPERE_HOURS, "KWH_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.KILOAMPERE_HOURS, "KWH_SF")), //
LIFE_TIME_MAX_OUT(new ScaledValuePoint("S64111_LIFE_TIME_MAX_OUT", "Lifetime Maximum Output Wattage", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "P_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "P_SF")), //
LIFE_TIME_MAX_BATT(new ScaledValuePoint("S64111_LIFE_TIME_MAX_BATT", "Lifetime Maximum Battery Voltage", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
LIFE_TIME_MAX_V_O_C(new ScaledValuePoint("S64111_LIFE_TIME_MAX_V_O_C", "Lifetime Maximum VOC Voltage", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF"));
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF"));
private final Point point;
@@ -6635,7 +6710,7 @@ public OptionsEnum getUndefined() {
public static enum S64112 implements SunSpecPoint {
PORT(new ValuePoint("S64112_PORT", "Port Number", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
V_SF(new ScaleFactorPoint("S64112_V_SF", "", "")), //
C_SF(new ScaleFactorPoint("S64112_C_SF", "", "")), //
H_SF(new ScaleFactorPoint("S64112_H_SF", "", "")), //
@@ -6643,119 +6718,147 @@ public static enum S64112 implements SunSpecPoint {
AH_SF(new ScaleFactorPoint("S64112_AH_SF", "", "")), //
KWH_SF(new ScaleFactorPoint("S64112_KWH_SF", "", "")), //
C_C_CONFIG_FAULT(new BitFieldPoint("S64112_C_C_CONFIG_FAULT", "Faults", "", //
- BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), //
+ BITFIELD16, true /* mandatory? */, READ_ONLY, new SunSpecBitPoint[0])), //
C_C_CONFIG_ABSORB_V(new ScaledValuePoint("S64112_C_C_CONFIG_ABSORB_V", "Absorb", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
C_C_CONFIG_ABSORB_HR(new ScaledValuePoint("S64112_C_C_CONFIG_ABSORB_HR", "Absorb Time", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "H_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE, "H_SF")), //
C_C_CONFIG_ABSORB_END_A(new ScaledValuePoint("S64112_C_C_CONFIG_ABSORB_END_A", "Absorb End", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "V_SF")), //
C_C_CONFIG_REBULK_V(new ScaledValuePoint("S64112_C_C_CONFIG_REBULK_V", "Rebulk", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
C_C_CONFIG_FLOAT_V(new ScaledValuePoint("S64112_C_C_CONFIG_FLOAT_V", "Float", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
C_C_CONFIG_MAX_CHG_A(new ScaledValuePoint("S64112_C_C_CONFIG_MAX_CHG_A", "Maximum Charge", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "V_SF")), //
C_C_CONFIG_EQUALIZE_V(new ScaledValuePoint("S64112_C_C_CONFIG_EQUALIZE_V", "Equalize", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
C_C_CONFIG_EQUALIZE_HR(new ValuePoint("S64112_C_C_CONFIG_EQUALIZE_HR", "Equalize Time", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
C_C_CONFIG_AUTO_EQUALIZE(new ValuePoint("S64112_C_C_CONFIG_AUTO_EQUALIZE", "Auto Equalize Interval", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
C_C_CONFIG_M_P_P_T_MODE(new EnumPoint("S64112_C_C_CONFIG_M_P_P_T_MODE", "MPPT mode", "", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64112_CC_Config_MPPT_mode.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S64112_CC_Config_MPPT_mode.values())), //
C_C_CONFIG_SWEEP_WIDTH(new EnumPoint("S64112_C_C_CONFIG_SWEEP_WIDTH", "Sweep Width", "", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64112_CC_Config_sweep_width.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S64112_CC_Config_sweep_width.values())), //
C_C_CONFIG_SWEEP_MAX(new EnumPoint("S64112_C_C_CONFIG_SWEEP_MAX", "Sweep Maximum", "", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64112_CC_Config_sweep_max.values())), //
- C_C_CONFIG_U_PICK_DUTY_CYC(new ScaledValuePoint("S64112_C_C_CONFIG_U_PICK_DUTY_CYC", "U-Pick PWM Duty Cycle", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "V_SF")), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S64112_CC_Config_sweep_max.values())), //
+ C_C_CONFIG_U_PICK_DUTY_CYC(
+ new ScaledValuePoint("S64112_C_C_CONFIG_U_PICK_DUTY_CYC", "U-Pick PWM Duty Cycle", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE, "V_SF")), //
C_C_CONFIG_GRID_TIE(new EnumPoint("S64112_C_C_CONFIG_GRID_TIE", "Grid Tie Mode", "", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64112_CC_Config_grid_tie.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S64112_CC_Config_grid_tie.values())), //
C_C_CONFIG_TEMP_COMP(new EnumPoint("S64112_C_C_CONFIG_TEMP_COMP", "Temp Comp Mode", "", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64112_CC_Config_temp_comp.values())), //
- C_C_CONFIG_TEMP_COMP_LLIMT(new ScaledValuePoint("S64112_C_C_CONFIG_TEMP_COMP_LLIMT", "Temp Comp Lower Limit", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
- C_C_CONFIG_TEMP_COMP_HLIMT(new ScaledValuePoint("S64112_C_C_CONFIG_TEMP_COMP_HLIMT", "Temp Comp Upper Limit", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S64112_CC_Config_temp_comp.values())), //
+ C_C_CONFIG_TEMP_COMP_LLIMT(
+ new ScaledValuePoint("S64112_C_C_CONFIG_TEMP_COMP_LLIMT", "Temp Comp Lower Limit", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
+ C_C_CONFIG_TEMP_COMP_HLIMT(
+ new ScaledValuePoint("S64112_C_C_CONFIG_TEMP_COMP_HLIMT", "Temp Comp Upper Limit", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
C_C_CONFIG_AUTO_RESTART(new EnumPoint("S64112_C_C_CONFIG_AUTO_RESTART", "Auto Restart Mode", "", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64112_CC_Config_auto_restart.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S64112_CC_Config_auto_restart.values())), //
C_C_CONFIG_WAKEUP_V_O_C(new ScaledValuePoint("S64112_C_C_CONFIG_WAKEUP_V_O_C", "Wakeup VOC Change", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
C_C_CONFIG_SNOOZE_MODE_A(new ScaledValuePoint("S64112_C_C_CONFIG_SNOOZE_MODE_A", "Snooze Mode", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "V_SF")), //
C_C_CONFIG_WAKEUP_INTERVAL(new ValuePoint("S64112_C_C_CONFIG_WAKEUP_INTERVAL", "Wakeup Interval", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
C_C_CONFIG_A_U_X_MODE(new EnumPoint("S64112_C_C_CONFIG_A_U_X_MODE", "AUX Output Mode", "", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64112_CC_Config_AUX_mode.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S64112_CC_Config_AUX_mode.values())), //
C_C_CONFIG_A_U_X_CONTROL(new EnumPoint("S64112_C_C_CONFIG_A_U_X_CONTROL", "AUX Output Control", "", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64112_CC_Config_AUX_control.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S64112_CC_Config_AUX_control.values())), //
C_C_CONFIG_A_U_X_STATE(new EnumPoint("S64112_C_C_CONFIG_A_U_X_STATE", "AUX Output State", "", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64112_CC_Config_AUX_state.values())), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S64112_CC_Config_AUX_state.values())), //
C_C_CONFIG_A_U_X_POLARITY(new EnumPoint("S64112_C_C_CONFIG_A_U_X_POLARITY", "AUX Output Polarity", "", //
- EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S64112_CC_Config_AUX_polarity.values())), //
- C_C_CONFIG_A_U_X_L_BATT_DISC(new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_L_BATT_DISC", "AUX Low Battery Disconnect", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
- C_C_CONFIG_A_U_X_L_BATT_RCON(new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_L_BATT_RCON", "AUX Low Battery Reconnect", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
- C_C_CONFIG_A_U_X_L_BATT_DLY(new ValuePoint("S64112_C_C_CONFIG_A_U_X_L_BATT_DLY", "AUX Low Battery Disconnect Delay", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ ENUM16, true /* mandatory? */, READ_ONLY, S64112_CC_Config_AUX_polarity.values())), //
+ C_C_CONFIG_A_U_X_L_BATT_DISC(
+ new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_L_BATT_DISC", "AUX Low Battery Disconnect", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
+ C_C_CONFIG_A_U_X_L_BATT_RCON(
+ new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_L_BATT_RCON", "AUX Low Battery Reconnect", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
+ C_C_CONFIG_A_U_X_L_BATT_DLY(
+ new ValuePoint("S64112_C_C_CONFIG_A_U_X_L_BATT_DLY", "AUX Low Battery Disconnect Delay", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
C_C_CONFIG_A_U_X_VENT_FAN_V(new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_VENT_FAN_V", "AUX Vent Fan", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
- C_C_CONFIG_A_U_X_P_V_TRIGGER_V(new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_P_V_TRIGGER_V", "AUX PV Trigger", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
- C_C_CONFIG_A_U_X_P_V_TRG_H_TM(new ValuePoint("S64112_C_C_CONFIG_A_U_X_P_V_TRG_H_TM", "AUX PV Trigger Hold Time", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
- C_C_CONFIG_A_U_X_NLITE_THRS_V(new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_NLITE_THRS_V", "AUX Night Light Threshold", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
- C_C_CONFIG_A_U_X_NLITE_ON_TM(new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_NLITE_ON_TM", "AUX Night Light On Time", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "H_SF")), //
- C_C_CONFIG_A_U_X_NLITE_ON_HIST(new ValuePoint("S64112_C_C_CONFIG_A_U_X_NLITE_ON_HIST", "AUX Night Light On Hysteresis", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
- C_C_CONFIG_A_U_X_NLITE_OFF_HIST(new ValuePoint("S64112_C_C_CONFIG_A_U_X_NLITE_OFF_HIST", "AUX Night Light Off Hysteresis", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
- C_C_CONFIG_A_U_X_ERROR_BATT_V(new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_ERROR_BATT_V", "AUX Error Output Low Battery", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
- C_C_CONFIG_A_U_X_DIVERT_H_TIME(new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_DIVERT_H_TIME", "AUX Divert Hold Time", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "V_SF")), //
- C_C_CONFIG_A_U_X_DIVERT_DLY_TIME(new ValuePoint("S64112_C_C_CONFIG_A_U_X_DIVERT_DLY_TIME", "AUX Divert Delay Time", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
- C_C_CONFIG_A_U_X_DIVERT_REL_V(new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_DIVERT_REL_V", "AUX Divert Relative", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
- C_C_CONFIG_A_U_X_DIVERT_HYST_V(new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_DIVERT_HYST_V", "AUX Divert Hysteresis", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
+ C_C_CONFIG_A_U_X_P_V_TRIGGER_V(
+ new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_P_V_TRIGGER_V", "AUX PV Trigger", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
+ C_C_CONFIG_A_U_X_P_V_TRG_H_TM(
+ new ValuePoint("S64112_C_C_CONFIG_A_U_X_P_V_TRG_H_TM", "AUX PV Trigger Hold Time", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
+ C_C_CONFIG_A_U_X_NLITE_THRS_V(
+ new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_NLITE_THRS_V", "AUX Night Light Threshold", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
+ C_C_CONFIG_A_U_X_NLITE_ON_TM(
+ new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_NLITE_ON_TM", "AUX Night Light On Time", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE, "H_SF")), //
+ C_C_CONFIG_A_U_X_NLITE_ON_HIST(
+ new ValuePoint("S64112_C_C_CONFIG_A_U_X_NLITE_ON_HIST", "AUX Night Light On Hysteresis", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
+ C_C_CONFIG_A_U_X_NLITE_OFF_HIST(
+ new ValuePoint("S64112_C_C_CONFIG_A_U_X_NLITE_OFF_HIST", "AUX Night Light Off Hysteresis", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
+ C_C_CONFIG_A_U_X_ERROR_BATT_V(
+ new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_ERROR_BATT_V", "AUX Error Output Low Battery", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
+ C_C_CONFIG_A_U_X_DIVERT_H_TIME(
+ new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_DIVERT_H_TIME", "AUX Divert Hold Time", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE, "V_SF")), //
+ C_C_CONFIG_A_U_X_DIVERT_DLY_TIME(
+ new ValuePoint("S64112_C_C_CONFIG_A_U_X_DIVERT_DLY_TIME", "AUX Divert Delay Time", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
+ C_C_CONFIG_A_U_X_DIVERT_REL_V(
+ new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_DIVERT_REL_V", "AUX Divert Relative", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
+ C_C_CONFIG_A_U_X_DIVERT_HYST_V(
+ new ScaledValuePoint("S64112_C_C_CONFIG_A_U_X_DIVERT_HYST_V", "AUX Divert Hysteresis", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
C_C_CONFIG_MAJOR_F_W_REV(new ValuePoint("S64112_C_C_CONFIG_MAJOR_F_W_REV", "FM CC Major Firmware Number", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
C_C_CONFIG_MID_F_W_REV(new ValuePoint("S64112_C_C_CONFIG_MID_F_W_REV", "FM CC Mid Firmware Number", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
C_C_CONFIG_MINOR_F_W_REV(new ValuePoint("S64112_C_C_CONFIG_MINOR_F_W_REV", "FM CC Minor Firmware Number", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
- C_C_CONFIG_DATA_LOG_DAY_OFFSET(new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_DAY_OFFSET", "Set Data Log Day Offset", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
- C_C_CONFIG_DATA_LOG_CUR_DAY_OFF(new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_CUR_DAY_OFF", "Current Data Log Day Offset", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
+ C_C_CONFIG_DATA_LOG_DAY_OFFSET(
+ new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_DAY_OFFSET", "Set Data Log Day Offset", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
+ C_C_CONFIG_DATA_LOG_CUR_DAY_OFF(
+ new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_CUR_DAY_OFF", "Current Data Log Day Offset", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
C_C_CONFIG_DATA_LOG_DAILY_A_H(new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_DAILY_A_H", "Data Log Daily (Ah)", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE_HOURS)), //
- C_C_CONFIG_DATA_LOG_DAILY_K_W_H(new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_DAILY_K_W_H", "Data Log Daily (kWh)", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.KILOWATT_HOURS, "KWH_SF")), //
- C_C_CONFIG_DATA_LOG_MAX_OUT_A(new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_MAX_OUT_A", "Data Log Daily Maximum Output (A)", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "V_SF")), //
- C_C_CONFIG_DATA_LOG_MAX_OUT_W(new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_MAX_OUT_W", "Data Log Daily Maximum Output (W)", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "V_SF")), //
- C_C_CONFIG_DATA_LOG_ABSORB_T(new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_ABSORB_T", "Data Log Daily Absorb Time", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
- C_C_CONFIG_DATA_LOG_FLOAT_T(new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_FLOAT_T", "Data Log Daily Float Time", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
- C_C_CONFIG_DATA_LOG_MIN_BATT_V(new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_MIN_BATT_V", "Data Log Daily Minimum Battery", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
- C_C_CONFIG_DATA_LOG_MAX_BATT_V(new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_MAX_BATT_V", "Data Log Daily Maximum Battery", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
- C_C_CONFIG_DATA_LOG_MAX_INPUT_V(new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_MAX_INPUT_V", "Data Log Daily Maximum Input", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE_HOURS)), //
+ C_C_CONFIG_DATA_LOG_DAILY_K_W_H(
+ new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_DAILY_K_W_H", "Data Log Daily (kWh)", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.KILOWATT_HOURS, "KWH_SF")), //
+ C_C_CONFIG_DATA_LOG_MAX_OUT_A(
+ new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_MAX_OUT_A", "Data Log Daily Maximum Output (A)", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.AMPERE, "V_SF")), //
+ C_C_CONFIG_DATA_LOG_MAX_OUT_W(
+ new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_MAX_OUT_W", "Data Log Daily Maximum Output (W)", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.WATT, "V_SF")), //
+ C_C_CONFIG_DATA_LOG_ABSORB_T(
+ new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_ABSORB_T", "Data Log Daily Absorb Time", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
+ C_C_CONFIG_DATA_LOG_FLOAT_T(
+ new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_FLOAT_T", "Data Log Daily Float Time", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
+ C_C_CONFIG_DATA_LOG_MIN_BATT_V(
+ new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_MIN_BATT_V", "Data Log Daily Minimum Battery", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
+ C_C_CONFIG_DATA_LOG_MAX_BATT_V(
+ new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_MAX_BATT_V", "Data Log Daily Maximum Battery", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
+ C_C_CONFIG_DATA_LOG_MAX_INPUT_V(
+ new ScaledValuePoint("S64112_C_C_CONFIG_DATA_LOG_MAX_INPUT_V", "Data Log Daily Maximum Input", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.VOLT, "V_SF")), //
C_C_CONFIG_DATA_LOG_CLEAR(new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_CLEAR", "Data Log Clear", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), //
- C_C_CONFIG_DATA_LOG_CLR_COMP(new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_CLR_COMP", "Data Log Clear Complement", "", //
- ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE));
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE)), //
+ C_C_CONFIG_DATA_LOG_CLR_COMP(
+ new ValuePoint("S64112_C_C_CONFIG_DATA_LOG_CLR_COMP", "Data Log Clear Complement", "", //
+ UINT16, true /* mandatory? */, READ_ONLY, Unit.NONE));
private final Point point;
diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/Point.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/Point.java
index 9f43d5aadcb..3de0bddcc5e 100644
--- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/Point.java
+++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/Point.java
@@ -172,12 +172,14 @@ public ValuePoint(String name, String label, String description, ValuePoint.Type
this(name, label, description, type, mandatory, accessMode, unit, //
Doc.of(//
switch (type) {
- case UINT16, ACC16, INT16, COUNT, INT32, PAD, // ignore
- EUI48, FLOAT32 // avoid floating point numbers; FLOAT32 might not fit in INTEGER
+ case UINT16, ACC16, INT16, COUNT, INT32, PAD, EUI48 //
-> OpenemsType.INTEGER;
- case ACC32, IPADDR, UINT32, UINT64, ACC64, INT64, IPV6ADDR, //
- FLOAT64 // avoid floating point numbers
+ case ACC32, IPADDR, UINT32, UINT64, ACC64, INT64, IPV6ADDR //
-> OpenemsType.LONG;
+ case FLOAT32 //
+ -> OpenemsType.FLOAT;
+ case FLOAT64 //
+ -> OpenemsType.DOUBLE;
case STRING2, STRING4, STRING5, STRING6, STRING7, STRING8, STRING12, STRING16, STRING20,
STRING25, STRING32 //
-> OpenemsType.STRING;
diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/BridgeModbusTcpImplTest.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/BridgeModbusTcpImplTest.java
index 33c3496c644..cfcf6d532c0 100644
--- a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/BridgeModbusTcpImplTest.java
+++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/BridgeModbusTcpImplTest.java
@@ -1,5 +1,6 @@
package io.openems.edge.bridge.modbus;
+import static io.openems.common.test.TestUtils.findRandomOpenPortOnAllLocalInterfaces;
import static io.openems.edge.bridge.modbus.api.ModbusComponent.ChannelId.MODBUS_COMMUNICATION_FAILED;
import org.junit.Test;
@@ -22,7 +23,6 @@
import io.openems.edge.common.taskmanager.Priority;
import io.openems.edge.common.test.AbstractComponentTest.TestCase;
import io.openems.edge.common.test.ComponentTest;
-import io.openems.edge.common.test.TestUtils;
public class BridgeModbusTcpImplTest {
@@ -33,7 +33,7 @@ public class BridgeModbusTcpImplTest {
public void test() throws Exception {
final ThrowingRunnable sleep = () -> Thread.sleep(CYCLE_TIME);
- var port = TestUtils.findRandomOpenPortOnAllLocalInterfaces();
+ var port = findRandomOpenPortOnAllLocalInterfaces();
ModbusSlave slave = null;
try {
/*
diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/worker/internal/DefectiveComponentsTest.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/worker/internal/DefectiveComponentsTest.java
index ce0b9f97068..fe8246dfb2f 100644
--- a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/worker/internal/DefectiveComponentsTest.java
+++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/worker/internal/DefectiveComponentsTest.java
@@ -1,7 +1,7 @@
package io.openems.edge.bridge.modbus.api.worker.internal;
+import static io.openems.common.test.TestUtils.createDummyClock;
import static io.openems.edge.bridge.modbus.api.worker.internal.CycleTasksManagerTest.LOG_HANDLER;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/worker/internal/TasksSupplierImplTest.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/worker/internal/TasksSupplierImplTest.java
index 77e3d8b8f3f..46b13094b91 100644
--- a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/worker/internal/TasksSupplierImplTest.java
+++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/api/worker/internal/TasksSupplierImplTest.java
@@ -1,7 +1,7 @@
package io.openems.edge.bridge.modbus.api.worker.internal;
+import static io.openems.common.test.TestUtils.createDummyClock;
import static io.openems.edge.bridge.modbus.api.worker.internal.CycleTasksManagerTest.LOG_HANDLER;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/AbstractOpenemsSunSpecComponentTest.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/AbstractOpenemsSunSpecComponentTest.java
index 2e877e2cb42..d55f8c1b395 100644
--- a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/AbstractOpenemsSunSpecComponentTest.java
+++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/AbstractOpenemsSunSpecComponentTest.java
@@ -1,5 +1,6 @@
package io.openems.edge.bridge.modbus.sunspec;
+import static io.openems.common.test.TestUtils.findRandomOpenPortOnAllLocalInterfaces;
import static io.openems.edge.bridge.modbus.sunspec.AbstractOpenemsSunSpecComponent.preprocessModbusElements;
import static java.util.stream.IntStream.range;
import static org.junit.Assert.assertEquals;
@@ -37,7 +38,6 @@
import io.openems.edge.common.test.AbstractComponentTest.TestCase;
import io.openems.edge.common.test.ComponentTest;
import io.openems.edge.common.test.DummyConfigurationAdmin;
-import io.openems.edge.common.test.TestUtils;
public class AbstractOpenemsSunSpecComponentTest {
@@ -163,7 +163,7 @@ private static ImmutableSortedMap.Builder generateSunSpec() {
@Ignore
@Test
public void test() throws Exception {
- var port = TestUtils.findRandomOpenPortOnAllLocalInterfaces();
+ var port = findRandomOpenPortOnAllLocalInterfaces();
ModbusSlave slave = null;
try {
/*
diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/PointTest.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/PointTest.java
index 8e62fa932a5..21ee9b76f46 100644
--- a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/PointTest.java
+++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/PointTest.java
@@ -4,7 +4,7 @@
import static io.openems.common.channel.ChannelCategory.OPENEMS_TYPE;
import static io.openems.common.channel.PersistencePriority.VERY_LOW;
import static io.openems.common.channel.Unit.AMPERE;
-import static io.openems.common.types.OpenemsType.INTEGER;
+import static io.openems.common.types.OpenemsType.FLOAT;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
@@ -22,7 +22,7 @@ public void testChannelIdPoint() {
assertEquals(OPENEMS_TYPE, doc.getChannelCategory());
assertEquals(VERY_LOW, doc.getPersistencePriority());
assertEquals("Amps. AC Current", doc.getText());
- assertEquals(INTEGER, doc.getType());
+ assertEquals(FLOAT, doc.getType());
assertEquals(AMPERE, doc.getUnit());
}
diff --git a/io.openems.edge.bridge.onewire/bnd.bnd b/io.openems.edge.bridge.onewire/bnd.bnd
index e61cf21d959..017e4a82b22 100644
--- a/io.openems.edge.bridge.onewire/bnd.bnd
+++ b/io.openems.edge.bridge.onewire/bnd.bnd
@@ -12,8 +12,8 @@ Export-Package: \
com.dalsemi.onewire.application.tag,\
com.dalsemi.onewire.container,\
com.dalsemi.onewire.debug,\
- io.openems.edge.bridge.onewire,\
com.dalsemi.onewire.utils,\
+ io.openems.edge.bridge.onewire,\
gnu.io
Include-Resource: \
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/UAdapterState.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/UAdapterState.java
index ed93664f6c5..381ae0db30c 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/UAdapterState.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/UAdapterState.java
@@ -148,9 +148,9 @@ class UAdapterState {
/**
* This is the current 'real' speed that the OneWire is operating at. This is
- * used to represent the actual mode that the DS2480 is operating in. For example
- * the logical speed might be USPEED_REGULAR but for RF emission reasons we may
- * put the actual DS2480 in SPEED_FLEX.
+ * used to represent the actual mode that the DS2480 is operating in. For
+ * example the logical speed might be USPEED_REGULAR but for RF emission reasons
+ * we may put the actual DS2480 in SPEED_FLEX.
*
* The valid values for this are:
*
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/USerialAdapter.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/USerialAdapter.java
index fae5e1ee211..c6692349189 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/USerialAdapter.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/adapter/USerialAdapter.java
@@ -2154,24 +2154,13 @@ private void setStreamingSpeed(int operation) throws OneWireIOException {
}
// convert this baud to 'u' baud
- char ubaud;
-
- switch (baud) {
-
- case 115200:
- ubaud = UAdapterState.BAUD_115200;
- break;
- case 57600:
- ubaud = UAdapterState.BAUD_57600;
- break;
- case 19200:
- ubaud = UAdapterState.BAUD_19200;
- break;
- case 9600:
- default:
- ubaud = UAdapterState.BAUD_9600;
- break;
- }
+ var ubaud = switch (baud) {
+ case 115200 -> UAdapterState.BAUD_115200;
+ case 57600 -> UAdapterState.BAUD_57600;
+ case 19200 -> UAdapterState.BAUD_19200;
+ case 9600 -> UAdapterState.BAUD_9600;
+ default -> UAdapterState.BAUD_9600;
+ };
// see if this is a new baud
if (ubaud == this.uState.ubaud) {
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/NetworkDeviceMonitor.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/NetworkDeviceMonitor.java
index 4af1f56ad36..5d17d6ca8e9 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/NetworkDeviceMonitor.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/monitor/NetworkDeviceMonitor.java
@@ -207,8 +207,7 @@ public void search(Vector arrivals, Vector departures) throws OneWir
var owc = getDeviceContainer(this.adapter, longAddress);
// check to see if it's a switch and if we are supposed
// to automatically search down branches
- if (this.branchAutoSearching && owc instanceof SwitchContainer) {
- var sc = (SwitchContainer) owc;
+ if (this.branchAutoSearching && owc instanceof SwitchContainer sc) {
var state = sc.readDevice();
for (var j = 0; j < sc.getNumberChannels(state); j++) {
var tmp = new OWPath(this.adapter, path);
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHADebit.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHADebit.java
index e3b7a03f8a5..e48fd109f1b 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHADebit.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHADebit.java
@@ -705,16 +705,12 @@ private final boolean writeTransactionData(SHAiButtonUser user, int transID, int
*/
@Override
public synchronized int getParameter(int type) {
- switch (type) {
- case DEBIT_AMOUNT:
- return this.debitAmount;
- case INITIAL_AMOUNT:
- return this.initialAmount;
- case USER_BALANCE:
- return this.userBalance;
- default:
- throw new IllegalArgumentException("Invalid parameter type");
- }
+ return switch (type) {
+ case DEBIT_AMOUNT -> this.debitAmount;
+ case INITIAL_AMOUNT -> this.initialAmount;
+ case USER_BALANCE -> this.userBalance;
+ default -> throw new IllegalArgumentException("Invalid parameter type");
+ };
}
/**
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHADebitUnsigned.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHADebitUnsigned.java
index b44cbe76c64..ea4b9caaf70 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHADebitUnsigned.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/sha/SHADebitUnsigned.java
@@ -887,16 +887,12 @@ private final boolean writeTransactionData(SHAiButtonUser user, int transID, int
*/
@Override
public synchronized int getParameter(int type) {
- switch (type) {
- case DEBIT_AMOUNT:
- return this.debitAmount;
- case INITIAL_AMOUNT:
- return this.initialAmount;
- case USER_BALANCE:
- return this.userBalance;
- default:
- return -1;
- }
+ return switch (type) {
+ case DEBIT_AMOUNT -> this.debitAmount;
+ case INITIAL_AMOUNT -> this.initialAmount;
+ case USER_BALANCE -> this.userBalance;
+ default -> -1;
+ };
}
/**
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/TaggedDevice.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/TaggedDevice.java
index 9f6e3edb440..b1a99065b69 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/TaggedDevice.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/application/tag/TaggedDevice.java
@@ -266,8 +266,7 @@ public boolean equals(Object o) {
return true;
}
- if (o instanceof TaggedDevice) {
- var td = (TaggedDevice) o;
+ if (o instanceof TaggedDevice td) {
return td.DeviceContainer.equals(this.DeviceContainer) && td.DeviceType.equals(this.DeviceType)
&& td.min.equals(this.min) && td.max.equals(this.max) && td.init.equals(this.init)
&& td.clusterName.equals(this.clusterName) && td.label.equals(this.label);
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer.java
index 863d4153458..dbac249cea2 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer.java
@@ -559,8 +559,7 @@ public boolean equals(Object obj) {
return true;
}
- if (obj instanceof OneWireContainer) {
- var owc = (OneWireContainer) obj;
+ if (obj instanceof OneWireContainer owc) {
// don't claim that all subclasses of a specific container are
// equivalent to the parent container
if (owc.getClass() == this.getClass()) {
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer12.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer12.java
index 75572fe9fde..e281df1fc1a 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer12.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer12.java
@@ -1139,18 +1139,15 @@ public byte[] channelAccess(byte[] inbuffer, boolean toggleRW, boolean readIniti
inlength = inlength << 1; // = inlength * 2
}
- switch (CRCMode) {
+ inlength = switch (CRCMode) {
default:
case CRC_EVERY_BYTE: // we need to allow for 2 CRC bytes for every byte of the length
- inlength = inlength * 3; // length + 2*length
- break;
+ yield inlength * 3; // length + 2*length
case CRC_EVERY_8_BYTES: // we need to allow for 2 CRC bytes for every 8 bytes of length
- inlength = inlength + (inlength >> 3 << 1); // (length DIV 8) * 2
- break;
+ yield inlength + (inlength >> 3 << 1); // (length DIV 8) * 2
case CRC_EVERY_32_BYTES: // we need to allow for 2 CRC bytes for every 32 bytes of length
- inlength = inlength + (inlength >> 5 << 1); // (length DIV 32) * 2
- break;
- }
+ yield inlength + (inlength >> 5 << 1); // (length DIV 32) * 2
+ };
var outputbuffer = new byte[inlength + 3 + 1]; // 3 control bytes + 1 information byte
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer21.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer21.java
index 8f9406a0481..edffe87634e 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer21.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer21.java
@@ -2026,27 +2026,16 @@ public void setClockAlarm(int hours, int minutes, int seconds, int day, int alar
state[0x0a] = (byte) day;
- var number_0_msb = 0; // how many of the MS, MM, MH, MD bytes have
-
+ // how many of the MS, MM, MH, MD bytes have
// 0 as their ms bit???
- switch (alarmFrequency) {
- case ONCE_PER_SECOND:
- number_0_msb = 0;
- break;
- case ONCE_PER_MINUTE:
- number_0_msb = 1;
- break;
- case ONCE_PER_HOUR:
- number_0_msb = 2;
- break;
- case ONCE_PER_DAY:
- number_0_msb = 3;
- break;
- default:
- case ONCE_PER_WEEK:
- number_0_msb = 4;
- break;
- }
+ var number_0_msb = switch (alarmFrequency) {
+ case ONCE_PER_SECOND -> 0;
+ case ONCE_PER_MINUTE -> 1;
+ case ONCE_PER_HOUR -> 2;
+ case ONCE_PER_DAY -> 3;
+ case ONCE_PER_WEEK -> 4;
+ default -> 4;
+ };
for (var i = 0x07; i < 0x0b; i++) {
if (number_0_msb > 0) {
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer26.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer26.java
index a12ed7d3923..9a5de5478ff 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer26.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer26.java
@@ -662,26 +662,15 @@ public void calibrateCurrentADC() throws OneWireIOException, OneWireException, I
* @throws IllegalArgumentException Bad parameters passed
*/
public void setThreshold(byte thresholdValue) throws OneWireIOException, OneWireException {
- byte thresholdReg;
byte[] data;
- switch (thresholdValue) {
-
- case 0:
- thresholdReg = 0;
- break;
- case 2:
- thresholdReg = 64;
- break;
- case 4:
- thresholdReg = (byte) 128;
- break;
- case 8:
- thresholdReg = (byte) 192;
- break;
- default:
- throw new IllegalArgumentException("OneWireContainer26-Threshold value must be 0,2,4, or 8.");
- }
+ var thresholdReg = switch (thresholdValue) {
+ case 0 -> (byte) 0;
+ case 2 -> (byte) 64;
+ case 4 -> (byte) 128;
+ case 8 -> (byte) 192;
+ default -> throw new IllegalArgumentException("OneWireContainer26-Threshold value must be 0,2,4, or 8.");
+ };
// first save their original IAD settings so we dont change anything
var IADvalue = this.getFlag(IAD_FLAG);
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer28.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer28.java
index 6b2ba98c326..15cb9c17954 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer28.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer28.java
@@ -361,8 +361,6 @@ public double getMinTemperature() {
*/
@Override
public void doTemperatureConvert(byte[] state) throws OneWireIOException, OneWireException {
- var msDelay = 750; // in milliseconds
-
// select the device
if (!this.adapter.select(this.address)) {
@@ -376,23 +374,13 @@ public void doTemperatureConvert(byte[] state) throws OneWireIOException, OneWir
this.adapter.putByte(CONVERT_TEMPERATURE_COMMAND);
// calculate duration of delay according to resolution desired
- switch (state[4]) {
-
- case RESOLUTION_9_BIT:
- msDelay = 94;
- break;
- case RESOLUTION_10_BIT:
- msDelay = 188;
- break;
- case RESOLUTION_11_BIT:
- msDelay = 375;
- break;
- case RESOLUTION_12_BIT:
- msDelay = 750;
- break;
- default:
- msDelay = 750;
- } // switch
+ var msDelay = switch (state[4]) {
+ case RESOLUTION_9_BIT -> 94;
+ case RESOLUTION_10_BIT -> 188;
+ case RESOLUTION_11_BIT -> 375;
+ case RESOLUTION_12_BIT -> 750;
+ default -> 750;
+ };
// delay for specified amount of time
try {
@@ -502,28 +490,14 @@ public double getTemperatureAlarm(int alarmType, byte[] state) {
*/
@Override
public double getTemperatureResolution(byte[] state) {
- var tempres = 0.0;
-
// calculate temperature resolution according to configuration byte
- switch (state[4]) {
-
- case RESOLUTION_9_BIT:
- tempres = 0.5;
- break;
- case RESOLUTION_10_BIT:
- tempres = 0.25;
- break;
- case RESOLUTION_11_BIT:
- tempres = 0.125;
- break;
- case RESOLUTION_12_BIT:
- tempres = 0.0625;
- break;
- default:
- tempres = 0.0;
- } // switch
-
- return tempres;
+ return switch (state[4]) {
+ case RESOLUTION_9_BIT -> 0.5;
+ case RESOLUTION_10_BIT -> 0.25;
+ case RESOLUTION_11_BIT -> 0.125;
+ case RESOLUTION_12_BIT -> 0.0625;
+ default -> 0.0;
+ };
}
// --------
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer2C.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer2C.java
index 4ff3518aecf..a908b173c66 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer2C.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer2C.java
@@ -271,17 +271,12 @@ public int numberOfPotentiometers(byte[] state) {
*/
@Override
public int numberOfWiperSettings(byte[] state) {
- switch (state[0] & 0x30) {
-
- case 0x00:
- return 32;
- case 0x10:
- return 64;
- case 0x20:
- return 128;
- default:
- return 256;
- }
+ return switch (state[0] & 0x30) {
+ case 0x00 -> 32;
+ case 0x10 -> 64;
+ case 0x20 -> 128;
+ default -> 256;
+ };
}
/**
@@ -293,17 +288,12 @@ public int numberOfWiperSettings(byte[] state) {
*/
@Override
public int potentiometerResistance(byte[] state) {
- switch (state[0] & 0xc0) {
-
- case 0x00:
- return 5;
- case 0x40:
- return 10;
- case 0x80:
- return 50;
- default:
- return 100;
- }
+ return switch (state[0] & 0xc0) {
+ case 0x00 -> 5;
+ case 0x40 -> 10;
+ case 0x80 -> 50;
+ default -> 100;
+ };
}
/**
diff --git a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer42.java b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer42.java
index 31f26a7390b..83c93eb277f 100644
--- a/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer42.java
+++ b/io.openems.edge.bridge.onewire/src/com/dalsemi/onewire/container/OneWireContainer42.java
@@ -449,8 +449,6 @@ public double getMinTemperature() {
*/
@Override
public void doTemperatureConvert(byte[] state) throws OneWireIOException, OneWireException {
- var msDelay = 750; // in milliseconds
-
// select the device
if (!this.adapter.select(this.address)) {
@@ -464,23 +462,13 @@ public void doTemperatureConvert(byte[] state) throws OneWireIOException, OneWir
this.adapter.putByte(CONVERT_TEMPERATURE_COMMAND);
// calculate duration of delay according to resolution desired
- switch (state[4]) {
-
- case RESOLUTION_9_BIT:
- msDelay = 94;
- break;
- case RESOLUTION_10_BIT:
- msDelay = 188;
- break;
- case RESOLUTION_11_BIT:
- msDelay = 375;
- break;
- case RESOLUTION_12_BIT:
- msDelay = 750;
- break;
- default:
- msDelay = 750;
- } // switch
+ var msDelay = switch (state[4]) {
+ case RESOLUTION_9_BIT -> 94;
+ case RESOLUTION_10_BIT -> 188;
+ case RESOLUTION_11_BIT -> 375;
+ case RESOLUTION_12_BIT -> 750;
+ default -> 750;
+ };
// delay for specified amount of time
try {
@@ -589,28 +577,14 @@ public double getTemperatureAlarm(int alarmType, byte[] state) {
*/
@Override
public double getTemperatureResolution(byte[] state) {
- var tempres = 0.0;
-
// calculate temperature resolution according to configuration byte
- switch (state[4]) {
-
- case RESOLUTION_9_BIT:
- tempres = 0.5;
- break;
- case RESOLUTION_10_BIT:
- tempres = 0.25;
- break;
- case RESOLUTION_11_BIT:
- tempres = 0.125;
- break;
- case RESOLUTION_12_BIT:
- tempres = 0.0625;
- break;
- default:
- tempres = 0.0;
- } // switch
-
- return tempres;
+ return switch (state[4]) {
+ case RESOLUTION_9_BIT -> 0.5;
+ case RESOLUTION_10_BIT -> 0.25;
+ case RESOLUTION_11_BIT -> 0.125;
+ case RESOLUTION_12_BIT -> 0.0625;
+ default -> 0.0;
+ };
}
// --------
diff --git a/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/impl/BridgeOnewireImpl.java b/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/impl/BridgeOnewireImpl.java
index b03ef071bd0..d1f60ff3073 100644
--- a/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/impl/BridgeOnewireImpl.java
+++ b/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/impl/BridgeOnewireImpl.java
@@ -82,7 +82,8 @@ protected void logError(Logger log, String message) {
@Override
public void buildJsonApiRoutes(JsonApiBuilder builder) {
- builder.handleRequest(GetDevicesRequest.METHOD, call -> this.taskWorker.handleGetDevicesRequest(call.getRequest()));
+ builder.handleRequest(GetDevicesRequest.METHOD,
+ call -> this.taskWorker.handleGetDevicesRequest(call.getRequest()));
}
}
\ No newline at end of file
diff --git a/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/jsonrpc/GetDeviceResponse.java b/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/jsonrpc/GetDeviceResponse.java
index 04549846a09..b98337c68e7 100644
--- a/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/jsonrpc/GetDeviceResponse.java
+++ b/io.openems.edge.bridge.onewire/src/io/openems/edge/bridge/onewire/jsonrpc/GetDeviceResponse.java
@@ -50,10 +50,9 @@ public static class Device {
public static Device from(OneWireContainer owc) {
final var details = new JsonObject();
- if (owc instanceof TemperatureContainer) {
+ if (owc instanceof TemperatureContainer tc) {
details.addProperty("type", "TemperatureContainer");
try {
- var tc = (TemperatureContainer) owc;
var state = tc.readDevice();
tc.doTemperatureConvert(state);
state = tc.readDevice();
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/BooleanDoc.java b/io.openems.edge.common/src/io/openems/edge/common/channel/BooleanDoc.java
index 86b591e5263..f2187b13a16 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/BooleanDoc.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/BooleanDoc.java
@@ -19,15 +19,12 @@ protected BooleanDoc self() {
@SuppressWarnings("unchecked")
@Override
public BooleanReadChannel createChannelInstance(OpenemsComponent component, ChannelId channelId) {
- switch (this.getAccessMode()) {
- case READ_ONLY:
- return new BooleanReadChannel(component, channelId, this, this.debounce, this.debounceMode);
- case READ_WRITE:
- case WRITE_ONLY:
- return new BooleanWriteChannel(component, channelId, this);
- }
- throw new IllegalArgumentException(
- "AccessMode [" + this.getAccessMode() + "] is unhandled. This should never happen.");
+ return switch (this.getAccessMode()) {
+ case READ_ONLY //
+ -> new BooleanReadChannel(component, channelId, this, this.debounce, this.debounceMode);
+ case READ_WRITE, WRITE_ONLY //
+ -> new BooleanWriteChannel(component, channelId, this);
+ };
}
/**
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/DoubleDoc.java b/io.openems.edge.common/src/io/openems/edge/common/channel/DoubleDoc.java
index 22c0185cc29..3e45b9ed7d0 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/DoubleDoc.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/DoubleDoc.java
@@ -18,14 +18,11 @@ protected DoubleDoc self() {
@SuppressWarnings("unchecked")
@Override
public DoubleReadChannel createChannelInstance(OpenemsComponent component, ChannelId channelId) {
- switch (this.getAccessMode()) {
- case READ_ONLY:
- return new DoubleReadChannel(component, channelId, this);
- case READ_WRITE:
- case WRITE_ONLY:
- return new DoubleWriteChannel(component, channelId, this);
- }
- throw new IllegalArgumentException(
- "AccessMode [" + this.getAccessMode() + "] is unhandled. This should never happen.");
+ return switch (this.getAccessMode()) {
+ case READ_ONLY //
+ -> new DoubleReadChannel(component, channelId, this);
+ case READ_WRITE, WRITE_ONLY //
+ -> new DoubleWriteChannel(component, channelId, this);
+ };
}
}
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/EnumDoc.java b/io.openems.edge.common/src/io/openems/edge/common/channel/EnumDoc.java
index 92306580030..854a4de096e 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/EnumDoc.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/EnumDoc.java
@@ -60,15 +60,12 @@ public EnumDoc initialValue(OptionsEnum initialValue) {
@Override
public EnumReadChannel createChannelInstance(OpenemsComponent component,
io.openems.edge.common.channel.ChannelId channelId) {
- switch (this.getAccessMode()) {
- case READ_ONLY:
- return new EnumReadChannel(component, channelId, this, this.getUndefinedOption(), this.getDebounce());
- case READ_WRITE:
- case WRITE_ONLY:
- return new EnumWriteChannel(component, channelId, this, this.getUndefinedOption());
- }
- throw new IllegalArgumentException(
- "Unable to initialize Channel-ID [" + channelId.id() + "] from OptionsEnumDoc!");
+ return switch (this.getAccessMode()) {
+ case READ_ONLY //
+ -> new EnumReadChannel(component, channelId, this, this.getUndefinedOption(), this.getDebounce());
+ case READ_WRITE, WRITE_ONLY //
+ -> new EnumWriteChannel(component, channelId, this, this.getUndefinedOption());
+ };
}
/**
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/FloatDoc.java b/io.openems.edge.common/src/io/openems/edge/common/channel/FloatDoc.java
index 3a1e89d4597..8ea3c035129 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/FloatDoc.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/FloatDoc.java
@@ -18,14 +18,11 @@ protected FloatDoc self() {
@SuppressWarnings("unchecked")
@Override
public FloatReadChannel createChannelInstance(OpenemsComponent component, ChannelId channelId) {
- switch (this.getAccessMode()) {
- case READ_ONLY:
- return new FloatReadChannel(component, channelId, this);
- case READ_WRITE:
- case WRITE_ONLY:
- return new FloatWriteChannel(component, channelId, this);
- }
- throw new IllegalArgumentException(
- "AccessMode [" + this.getAccessMode() + "] is unhandled. This should never happen.");
+ return switch (this.getAccessMode()) {
+ case READ_ONLY //
+ -> new FloatReadChannel(component, channelId, this);
+ case READ_WRITE, WRITE_ONLY //
+ -> new FloatWriteChannel(component, channelId, this);
+ };
}
}
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/IntegerDoc.java b/io.openems.edge.common/src/io/openems/edge/common/channel/IntegerDoc.java
index e1b92cf338d..e9de3ebdcd0 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/IntegerDoc.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/IntegerDoc.java
@@ -18,14 +18,11 @@ protected IntegerDoc self() {
@SuppressWarnings("unchecked")
@Override
public IntegerReadChannel createChannelInstance(OpenemsComponent component, ChannelId channelId) {
- switch (this.getAccessMode()) {
- case READ_ONLY:
- return new IntegerReadChannel(component, channelId, this);
- case READ_WRITE:
- case WRITE_ONLY:
- return new IntegerWriteChannel(component, channelId, this);
- }
- throw new IllegalArgumentException(
- "AccessMode [" + this.getAccessMode() + "] is unhandled. This should never happen.");
+ return switch (this.getAccessMode()) {
+ case READ_ONLY //
+ -> new IntegerReadChannel(component, channelId, this);
+ case READ_WRITE, WRITE_ONLY //
+ -> new IntegerWriteChannel(component, channelId, this);
+ };
}
}
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/LongDoc.java b/io.openems.edge.common/src/io/openems/edge/common/channel/LongDoc.java
index 2a54a98958e..398d4930386 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/LongDoc.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/LongDoc.java
@@ -18,14 +18,11 @@ protected LongDoc self() {
@SuppressWarnings("unchecked")
@Override
public LongReadChannel createChannelInstance(OpenemsComponent component, ChannelId channelId) {
- switch (this.getAccessMode()) {
- case READ_ONLY:
- return new LongReadChannel(component, channelId, this);
- case READ_WRITE:
- case WRITE_ONLY:
- return new LongWriteChannel(component, channelId, this);
- }
- throw new IllegalArgumentException(
- "AccessMode [" + this.getAccessMode() + "] is unhandled. This should never happen.");
+ return switch (this.getAccessMode()) {
+ case READ_ONLY //
+ -> new LongReadChannel(component, channelId, this);
+ case READ_WRITE, WRITE_ONLY //
+ -> new LongWriteChannel(component, channelId, this);
+ };
}
}
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/ShortDoc.java b/io.openems.edge.common/src/io/openems/edge/common/channel/ShortDoc.java
index b4486bf388a..dd4d9e877ba 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/ShortDoc.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/ShortDoc.java
@@ -18,14 +18,11 @@ protected ShortDoc self() {
@SuppressWarnings("unchecked")
@Override
public ShortReadChannel createChannelInstance(OpenemsComponent component, ChannelId channelId) {
- switch (this.getAccessMode()) {
- case READ_ONLY:
- return new ShortReadChannel(component, channelId, this);
- case READ_WRITE:
- case WRITE_ONLY:
- return new ShortWriteChannel(component, channelId, this);
- }
- throw new IllegalArgumentException(
- "AccessMode [" + this.getAccessMode() + "] is unhandled. This should never happen.");
+ return switch (this.getAccessMode()) {
+ case READ_ONLY //
+ -> new ShortReadChannel(component, channelId, this);
+ case READ_WRITE, WRITE_ONLY //
+ -> new ShortWriteChannel(component, channelId, this);
+ };
}
}
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/StringDoc.java b/io.openems.edge.common/src/io/openems/edge/common/channel/StringDoc.java
index b4d5f5b11c9..fe3db4ca6b1 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/StringDoc.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/StringDoc.java
@@ -18,14 +18,11 @@ protected StringDoc self() {
@SuppressWarnings("unchecked")
@Override
public StringReadChannel createChannelInstance(OpenemsComponent component, ChannelId channelId) {
- switch (this.getAccessMode()) {
- case READ_ONLY:
- return new StringReadChannel(component, channelId, this);
- case READ_WRITE:
- case WRITE_ONLY:
- return new StringWriteChannel(component, channelId, this);
- }
- throw new IllegalArgumentException(
- "AccessMode [" + this.getAccessMode() + "] is unhandled. This should never happen.");
+ return switch (this.getAccessMode()) {
+ case READ_ONLY //
+ -> new StringReadChannel(component, channelId, this);
+ case READ_WRITE, WRITE_ONLY //
+ -> new StringWriteChannel(component, channelId, this);
+ };
}
}
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/internal/AbstractReadChannel.java b/io.openems.edge.common/src/io/openems/edge/common/channel/internal/AbstractReadChannel.java
index 529dc6437e2..551af28eb6c 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/internal/AbstractReadChannel.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/internal/AbstractReadChannel.java
@@ -270,32 +270,20 @@ protected List> getOnSetNextWrites()
* @return true if validation ok
*/
private boolean validateType(OpenemsType expected, OpenemsType actual) {
- switch (expected) {
- case BOOLEAN:
- case FLOAT:
- case SHORT:
- case STRING:
- return actual == expected;
- case DOUBLE:
- switch (actual) {
- case DOUBLE:
- case FLOAT:
- return true;
- default:
- return false;
- }
- case INTEGER:
- case LONG:
- switch (actual) {
- case SHORT:
- case INTEGER:
- case LONG:
- return true;
- default:
- return false;
- }
- }
- return false;
+ return switch (expected) {
+ case BOOLEAN, FLOAT, SHORT, STRING //
+ -> actual == expected;
+ case DOUBLE //
+ -> switch (actual) {
+ case DOUBLE, FLOAT -> true;
+ default -> false;
+ };
+ case INTEGER, LONG //
+ -> switch (actual) {
+ case SHORT, INTEGER, LONG -> true;
+ default -> false;
+ };
+ };
}
/**
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/internal/OpenemsTypeDoc.java b/io.openems.edge.common/src/io/openems/edge/common/channel/internal/OpenemsTypeDoc.java
index 7f9bdcd22be..fad703f8dbd 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/internal/OpenemsTypeDoc.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/internal/OpenemsTypeDoc.java
@@ -21,23 +21,15 @@ public abstract class OpenemsTypeDoc extends AbstractDoc {
* @return the {@link OpenemsTypeDoc}
*/
public static OpenemsTypeDoc of(OpenemsType type) {
- switch (type) {
- case BOOLEAN:
- return new BooleanDoc();
- case DOUBLE:
- return new DoubleDoc();
- case FLOAT:
- return new FloatDoc();
- case INTEGER:
- return new IntegerDoc();
- case LONG:
- return new LongDoc();
- case SHORT:
- return new ShortDoc();
- case STRING:
- return new StringDoc();
- }
- throw new IllegalArgumentException("OpenemsType [" + type + "] is unhandled. This should never happen.");
+ return switch (type) {
+ case BOOLEAN -> new BooleanDoc();
+ case DOUBLE -> new DoubleDoc();
+ case FLOAT -> new FloatDoc();
+ case INTEGER -> new IntegerDoc();
+ case LONG -> new LongDoc();
+ case SHORT -> new ShortDoc();
+ case STRING -> new StringDoc();
+ };
}
protected OpenemsTypeDoc(OpenemsType type) {
diff --git a/io.openems.edge.common/src/io/openems/edge/common/channel/value/Value.java b/io.openems.edge.common/src/io/openems/edge/common/channel/value/Value.java
index ca3925b6e49..7e47e9d1b2c 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/channel/value/Value.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/channel/value/Value.java
@@ -215,10 +215,10 @@ public JsonElement asJson() {
* enum
*/
private EnumDoc isEnumValue() {
- if (this.parent.channelDoc() instanceof EnumDoc) {
- return (EnumDoc) this.parent.channelDoc();
- }
- return null;
+ return switch (this.parent.channelDoc()) {
+ case EnumDoc ed -> ed;
+ default -> null;
+ };
}
/**
diff --git a/io.openems.edge.common/src/io/openems/edge/common/component/ComponentManager.java b/io.openems.edge.common/src/io/openems/edge/common/component/ComponentManager.java
index ea444764b63..9ea55060009 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/component/ComponentManager.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/component/ComponentManager.java
@@ -2,6 +2,7 @@
import java.time.Clock;
import java.util.List;
+import java.util.Map;
import org.osgi.framework.BundleContext;
@@ -173,6 +174,20 @@ public default void _setDefaultConfigurationFailed(boolean value) {
@Override
public Clock getClock();
+ /**
+ * Gets the component properties by its component id.
+ *
+ * @param componentId the id of the component
+ * @return the properties or a empty map if none found
+ * @implNote this method is preferred to use when only the properties of an
+ * component are of interest. Because of OSGi delivering the component
+ * updates asynchronously and if a component update happens the config
+ * update may not reflect immediately to the config of the
+ * implementation of that component but this method uses the direct
+ * configuration in the service registration.
+ */
+ public Map getComponentProperties(String componentId);
+
/**
* Gets all enabled OpenEMS-Components.
*
diff --git a/io.openems.edge.common/src/io/openems/edge/common/converter/StaticConverters.java b/io.openems.edge.common/src/io/openems/edge/common/converter/StaticConverters.java
index 08ecb837ce1..48c95d69fdd 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/converter/StaticConverters.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/converter/StaticConverters.java
@@ -2,112 +2,40 @@
import java.util.function.Function;
-import io.openems.common.types.OpenemsType;
-
public class StaticConverters {
/**
* Converts only positive values from Element to Channel.
*/
public static final Function KEEP_POSITIVE = value -> {
- if (value == null) {
- return null;
- }
- for (OpenemsType openemsType : OpenemsType.values()) {
- // this 'for' + 'switch' is only utilized to get an alert by Eclipse IDE if a
- // new OpenemsType was added. ("The enum constant XX needs a corresponding case
- // label in this enum switch on OpenemsType")
- switch (openemsType) {
- case BOOLEAN:
- case SHORT:
- case INTEGER:
- case LONG:
- case FLOAT:
- case DOUBLE:
- case STRING:
- if (value instanceof Boolean || value instanceof String) {
- return value; // impossible
- }
- if (value instanceof Short) {
- short shortValue = (Short) value;
- if (shortValue > 0) {
- return shortValue;
- } else {
- return 0;
- }
- } else if (value instanceof Integer) {
- int intValue = (Integer) value;
- if (intValue > 0) {
- return intValue;
- } else {
- return 0;
- }
- } else if (value instanceof Long) {
- long longValue = (Long) value;
- if (longValue > 0) {
- return longValue;
- } else {
- return 0;
- }
- } else if (value instanceof Float) {
- float floatValue = (Float) value;
- if (floatValue > 0) {
- return floatValue;
- } else {
- return 0;
- }
- } else if (value instanceof Double) {
- double doubleValue = (Double) value;
- if (doubleValue > 0) {
- return doubleValue;
- } else {
- return 0;
- }
- }
- }
- break;
- }
- throw new IllegalArgumentException("Converter KEEP_POSITIVE does not accept the type of [" + value + "]");
+ return switch (value) {
+ case null -> null;
+ case Boolean b -> b;
+ case String s -> s;
+ case Short s -> s > 0 ? s : 0;
+ case Integer i -> i > 0 ? i : 0;
+ case Long l -> l > 0 ? l : 0;
+ case Float f -> f > 0 ? f : 0;
+ case Double d -> d > 0 ? d : 0;
+ default ->
+ throw new IllegalArgumentException("Converter KEEP_POSITIVE does not accept the type of [" + value + "]");
+ };
};
/**
* Invert a value.
*/
public static final Function INVERT = value -> {
- if (value == null) {
- return null;
- }
- for (OpenemsType openemsType : OpenemsType.values()) {
- // this 'for' + 'switch' is only utilized to get an alert by Eclipse IDE if a
- // new OpenemsType was added. ("The enum constant XX needs a corresponding case
- // label in this enum switch on OpenemsType")
- switch (openemsType) {
- case BOOLEAN:
- case SHORT:
- case INTEGER:
- case LONG:
- case FLOAT:
- case DOUBLE:
- case STRING:
- if (value instanceof String) {
- return value; // impossible
- }
- if (value instanceof Boolean) {
- return Boolean.valueOf(!(boolean) value);
- } else if (value instanceof Short) {
- return Short.valueOf((short) ((short) value * -1));
- } else if (value instanceof Integer) {
- return Integer.valueOf((int) value * -1);
- } else if (value instanceof Long) {
- return Long.valueOf((long) value * -1);
- } else if (value instanceof Float) {
- return Float.valueOf((float) value * -1);
- } else if (value instanceof Double) {
- return Double.valueOf((double) value * -1);
- }
- }
- break;
- }
- throw new IllegalArgumentException("Converter INVERT does not accept the type of [" + value + "]");
+ return switch (value) {
+ case null -> null;
+ case Boolean b -> !b;
+ case String s -> s; // impossible
+ case Short s -> s * -1;
+ case Integer i -> i * -1;
+ case Long l -> l * -1;
+ case Float f -> f * -1;
+ case Double d -> d * -1;
+ default -> throw new IllegalArgumentException("Converter INVERT does not accept the type of [" + value + "]");
+ };
};
}
diff --git a/io.openems.edge.common/src/io/openems/edge/common/currency/Currency.java b/io.openems.edge.common/src/io/openems/edge/common/currency/Currency.java
index 52337d0c78f..d1750f819fe 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/currency/Currency.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/currency/Currency.java
@@ -44,5 +44,4 @@ public static Currency fromCurrencyConfig(CurrencyConfig config) {
case CHF -> Currency.CHF;
};
}
-
}
diff --git a/io.openems.edge.common/src/io/openems/edge/common/host/Host.java b/io.openems.edge.common/src/io/openems/edge/common/host/Host.java
index 3048111f0ad..304fc98d217 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/host/Host.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/host/Host.java
@@ -106,7 +106,7 @@ public default void _setHostname(String value) {
* @throws OpenemsNamedException exception
*/
public List getSystemIPs() throws OpenemsNamedException;
-
+
/**
* Gets the Channel for {@link ChannelId#OS_VERSION}.
*
diff --git a/io.openems.edge.common/src/io/openems/edge/common/jsonapi/JsonApiBuilder.java b/io.openems.edge.common/src/io/openems/edge/common/jsonapi/JsonApiBuilder.java
index e1c1cae8031..fef18e45bf0 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/jsonapi/JsonApiBuilder.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/jsonapi/JsonApiBuilder.java
@@ -531,11 +531,12 @@ private JsonrpcResponseError handleException(Call new JsonrpcResponseError(call.getRequest().getId(), ex);
+ default //
+ -> new JsonrpcResponseError(call.getRequest().getId(), t.getMessage());
+ };
}
private static final Key DEPTH = new Key("depth", Integer.class);
diff --git a/io.openems.edge.common/src/io/openems/edge/common/jsonapi/MultipleJsonApiBinder.java b/io.openems.edge.common/src/io/openems/edge/common/jsonapi/MultipleJsonApiBinder.java
index f051eaa18eb..369064bc85e 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/jsonapi/MultipleJsonApiBinder.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/jsonapi/MultipleJsonApiBinder.java
@@ -19,8 +19,8 @@ public class MultipleJsonApiBinder {
* logs a warning.
*
*
- * Commonly used like this with OSGi injection to bind all {@link JsonApi}
- * which target the specific {@code ENTRY_POINT}:
+ * Commonly used like this with OSGi injection to bind all {@link JsonApi} which
+ * target the specific {@code ENTRY_POINT}:
*
*
* {@code @Reference}(//
diff --git a/io.openems.edge.common/src/io/openems/edge/common/jsonapi/SingleJsonApiBinder.java b/io.openems.edge.common/src/io/openems/edge/common/jsonapi/SingleJsonApiBinder.java
index e13e2838e9e..941e9e6cec2 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/jsonapi/SingleJsonApiBinder.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/jsonapi/SingleJsonApiBinder.java
@@ -1,5 +1,8 @@
package io.openems.edge.common.jsonapi;
+import static java.util.concurrent.CompletableFuture.completedFuture;
+import static java.util.concurrent.CompletableFuture.failedFuture;
+
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
@@ -83,13 +86,14 @@ public CompletableFuture handleRequest(//
throw new OpenemsException("No response");
}
- if (response instanceof JsonrpcResponseSuccess success) {
- return CompletableFuture
- .completedFuture(new GenericJsonrpcResponseSuccess(request.getId(), success.getResult()));
- } else if (response instanceof JsonrpcResponseError error) {
- return CompletableFuture.failedFuture(error.getOpenemsError().exception(error.getParamsAsObjectArray()));
- }
- throw new OpenemsException("Unhandled response");
+ return switch (response) {
+ case JsonrpcResponseSuccess success //
+ -> completedFuture(new GenericJsonrpcResponseSuccess(request.getId(), success.getResult()));
+ case JsonrpcResponseError error //
+ -> failedFuture(error.getOpenemsError().exception(error.getParamsAsObjectArray()));
+ default //
+ -> throw new OpenemsException("Unhandled response");
+ };
}
public void setDebug(boolean debug) {
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint16.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint16.java
index 3e2e751cde0..0c6801f6b84 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint16.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint16.java
@@ -3,6 +3,7 @@
import java.nio.ByteBuffer;
import io.openems.common.types.OpenemsType;
+import io.openems.common.types.OptionsEnum;
import io.openems.edge.common.type.TypeUtils;
public class ModbusRecordUint16 extends ModbusRecordConstant {
@@ -40,8 +41,7 @@ public static byte[] toByteArray(short value) {
* @return the byte array
*/
public static byte[] toByteArray(Object value) {
- if (value == null || value instanceof io.openems.common.types.OptionsEnum
- && ((io.openems.common.types.OptionsEnum) value).isUndefined()) {
+ if (value == null || (value instanceof OptionsEnum oe && oe.isUndefined())) {
return UNDEFINED_VALUE;
}
return toByteArray((short) TypeUtils.getAsType(OpenemsType.SHORT, value));
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint32.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint32.java
index 23bae440c32..a7b7f19539f 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint32.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint32.java
@@ -3,6 +3,7 @@
import java.nio.ByteBuffer;
import io.openems.common.types.OpenemsType;
+import io.openems.common.types.OptionsEnum;
import io.openems.edge.common.type.TypeUtils;
public class ModbusRecordUint32 extends ModbusRecordConstant {
@@ -40,8 +41,7 @@ public static byte[] toByteArray(int value) {
* @return the byte array
*/
public static byte[] toByteArray(Object value) {
- if (value == null || value instanceof io.openems.common.types.OptionsEnum
- && ((io.openems.common.types.OptionsEnum) value).isUndefined()) {
+ if (value == null || (value instanceof OptionsEnum oe && oe.isUndefined())) {
return UNDEFINED_VALUE;
}
return toByteArray((int) TypeUtils.getAsType(OpenemsType.INTEGER, value));
diff --git a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint64.java b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint64.java
index 87ccc8e779d..c0f893e56f5 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint64.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/modbusslave/ModbusRecordUint64.java
@@ -3,6 +3,7 @@
import java.nio.ByteBuffer;
import io.openems.common.types.OpenemsType;
+import io.openems.common.types.OptionsEnum;
import io.openems.edge.common.type.TypeUtils;
public class ModbusRecordUint64 extends ModbusRecordConstant {
@@ -42,8 +43,7 @@ public static byte[] toByteArray(long value) {
* @return the byte array
*/
public static byte[] toByteArray(Object value) {
- if (value == null || value instanceof io.openems.common.types.OptionsEnum
- && ((io.openems.common.types.OptionsEnum) value).isUndefined()) {
+ if (value == null || (value instanceof OptionsEnum oe && oe.isUndefined())) {
return UNDEFINED_VALUE;
}
return toByteArray((long) TypeUtils.getAsType(OpenemsType.LONG, value));
diff --git a/io.openems.edge.common/src/io/openems/edge/common/sum/DummySum.java b/io.openems.edge.common/src/io/openems/edge/common/sum/DummySum.java
index 2a2b9bd7568..64d093c8511 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/sum/DummySum.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/sum/DummySum.java
@@ -93,4 +93,59 @@ public DummySum withEssMaxDischargePower(int value) {
return this.self();
}
+ /**
+ * Set {@link Sum.ChannelId#GRID_BUY_ACTIVE_ENERGY}.
+ *
+ * @param value the value
+ * @return myself
+ */
+ public DummySum withGridBuyActiveEnergy(long value) {
+ withValue(this, Sum.ChannelId.GRID_BUY_ACTIVE_ENERGY, value);
+ return this.self();
+ }
+
+ /**
+ * Set {@link Sum.ChannelId#GRID_SELL_ACTIVE_ENERGY}.
+ *
+ * @param value the value
+ * @return myself
+ */
+ public DummySum withGridSellActiveEnergy(long value) {
+ withValue(this, Sum.ChannelId.GRID_SELL_ACTIVE_ENERGY, value);
+ return this.self();
+ }
+
+ /**
+ * Set {@link Sum.ChannelId#ESS_ACTIVE_CHARGE_ENERGY}.
+ *
+ * @param value the value
+ * @return myself
+ */
+ public DummySum withEssActiveChargeEnergy(long value) {
+ withValue(this, Sum.ChannelId.ESS_ACTIVE_CHARGE_ENERGY, value);
+ return this.self();
+ }
+
+ /**
+ * Set {@link Sum.ChannelId#ESS_ACTIVE_DISCHARGE_ENERGY}.
+ *
+ * @param value the value
+ * @return myself
+ */
+ public DummySum withEssActiveDischargeEnergy(long value) {
+ withValue(this, Sum.ChannelId.ESS_ACTIVE_DISCHARGE_ENERGY, value);
+ return this.self();
+ }
+
+ /**
+ * Set {@link Sum.ChannelId#CONSUMPTION_ACTIVE_ENERGY}.
+ *
+ * @param value the value
+ * @return myself
+ */
+ public DummySum withConsumptionActiveEnergy(long value) {
+ withValue(this, Sum.ChannelId.CONSUMPTION_ACTIVE_ENERGY, value);
+ return this.self();
+ }
+
}
diff --git a/io.openems.edge.common/src/io/openems/edge/common/sum/Sum.java b/io.openems.edge.common/src/io/openems/edge/common/sum/Sum.java
index b065cb50c18..c42c686cdc2 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/sum/Sum.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/sum/Sum.java
@@ -398,7 +398,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
*/
CONSUMPTION_ACTIVE_POWER(Doc.of(OpenemsType.INTEGER) //
.unit(Unit.WATT) //
- .persistencePriority(PersistencePriority.VERY_HIGH)), //
+ .persistencePriority(PersistencePriority.VERY_HIGH) //
+ .text("Active power of the electrical consumption")), //
/**
* Consumption: Active Power L1.
*
@@ -413,7 +414,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
*/
CONSUMPTION_ACTIVE_POWER_L1(Doc.of(OpenemsType.INTEGER) //
.unit(Unit.WATT) //
- .persistencePriority(PersistencePriority.VERY_HIGH)), //
+ .persistencePriority(PersistencePriority.VERY_HIGH) //
+ .text("Active power of the electrical consumption on phase L1")), //
/**
* Consumption: Active Power L2.
*
@@ -428,7 +430,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
*/
CONSUMPTION_ACTIVE_POWER_L2(Doc.of(OpenemsType.INTEGER) //
.unit(Unit.WATT) //
- .persistencePriority(PersistencePriority.VERY_HIGH)), //
+ .persistencePriority(PersistencePriority.VERY_HIGH) //
+ .text("Active power of the electrical consumption on phase L2")), //
/**
* Consumption: Active Power L3.
*
@@ -443,7 +446,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
*/
CONSUMPTION_ACTIVE_POWER_L3(Doc.of(OpenemsType.INTEGER) //
.unit(Unit.WATT) //
- .persistencePriority(PersistencePriority.VERY_HIGH)), //
+ .persistencePriority(PersistencePriority.VERY_HIGH) //
+ .text("Active power of the electrical consumption on phase L3")), //
/**
* Consumption: Maximum Ever Active Power.
*
@@ -456,7 +460,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
*/
CONSUMPTION_MAX_ACTIVE_POWER(Doc.of(OpenemsType.INTEGER) //
.unit(Unit.WATT) //
- .persistencePriority(PersistencePriority.VERY_HIGH)), //
+ .persistencePriority(PersistencePriority.VERY_HIGH) //
+ .text("Maximum measured active power of the electrical consumpton")), //
/**
* Unmanaged Consumption: Active Power.
*
@@ -521,7 +526,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
*/
ESS_ACTIVE_CHARGE_ENERGY(Doc.of(OpenemsType.LONG) //
.unit(Unit.CUMULATED_WATT_HOURS) //
- .persistencePriority(PersistencePriority.VERY_HIGH)), //
+ .persistencePriority(PersistencePriority.VERY_HIGH) //
+ .text("Accumulated electrical energy of the AC-side storage charging incl. excess PV generation at the hybrid inverter")), //
/**
* Ess: Active Discharge Energy.
*
@@ -533,7 +539,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
*/
ESS_ACTIVE_DISCHARGE_ENERGY(Doc.of(OpenemsType.LONG) //
.unit(Unit.CUMULATED_WATT_HOURS) //
- .persistencePriority(PersistencePriority.VERY_HIGH)), //
+ .persistencePriority(PersistencePriority.VERY_HIGH) //
+ .text("Accumulated electrical energy of the AC-side storage discharge incl. excess PV generation at the hybrid inverter")), //
/**
* Ess: DC Discharge Energy.
*
@@ -545,7 +552,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
*/
ESS_DC_DISCHARGE_ENERGY(Doc.of(OpenemsType.LONG) //
.unit(Unit.CUMULATED_WATT_HOURS) //
- .persistencePriority(PersistencePriority.VERY_HIGH)), //
+ .persistencePriority(PersistencePriority.VERY_HIGH) //
+ .text("Accumulated DC electrical energy of the storage discharging")), //
/**
* Ess: DC Charge Energy.
*
@@ -557,7 +565,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
*/
ESS_DC_CHARGE_ENERGY(Doc.of(OpenemsType.LONG) //
.unit(Unit.CUMULATED_WATT_HOURS) //
- .persistencePriority(PersistencePriority.VERY_HIGH)), //
+ .persistencePriority(PersistencePriority.VERY_HIGH) //
+ .text("Accumulated DC electrical energy of the storage charging")), //
/**
* Grid: Buy-from-grid Energy ("Production").
*
@@ -569,7 +578,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
*/
GRID_BUY_ACTIVE_ENERGY(Doc.of(OpenemsType.LONG) //
.unit(Unit.CUMULATED_WATT_HOURS) //
- .persistencePriority(PersistencePriority.VERY_HIGH)), //
+ .persistencePriority(PersistencePriority.VERY_HIGH) //
+ .text("Accumulated electrical energy of grid consumption")), //
/**
* Grid: Sell-to-grid Energy ("Consumption").
*
@@ -581,7 +591,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
*/
GRID_SELL_ACTIVE_ENERGY(Doc.of(OpenemsType.LONG) //
.unit(Unit.CUMULATED_WATT_HOURS) //
- .persistencePriority(PersistencePriority.VERY_HIGH)), //
+ .persistencePriority(PersistencePriority.VERY_HIGH) //
+ .text("Accumulated electrical energy of grid feed-in")), //
/**
* Production: Energy.
*
@@ -592,7 +603,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
*/
PRODUCTION_ACTIVE_ENERGY(Doc.of(OpenemsType.LONG) //
.unit(Unit.CUMULATED_WATT_HOURS) //
- .persistencePriority(PersistencePriority.VERY_HIGH)), //
+ .persistencePriority(PersistencePriority.VERY_HIGH) //
+ .text("Accumulated electrical energy of DC- and AC-side generators, e.g. photovoltaics")), //
/**
* Production: AC Energy.
*
@@ -604,7 +616,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
*/
PRODUCTION_AC_ACTIVE_ENERGY(Doc.of(OpenemsType.LONG) //
.unit(Unit.CUMULATED_WATT_HOURS) //
- .persistencePriority(PersistencePriority.VERY_HIGH)), //
+ .persistencePriority(PersistencePriority.VERY_HIGH) //
+ .text("Accumulated electrical energy of AC-side generators")), //
/**
* Production: DC Energy.
*
@@ -616,7 +629,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
*/
PRODUCTION_DC_ACTIVE_ENERGY(Doc.of(OpenemsType.LONG) //
.unit(Unit.CUMULATED_WATT_HOURS) //
- .persistencePriority(PersistencePriority.VERY_HIGH)), //
+ .persistencePriority(PersistencePriority.VERY_HIGH) //
+ .text("Accumulated electrical energy of DC-side generators")), //
/**
* Consumption: Energy.
*
@@ -628,7 +642,8 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
*/
CONSUMPTION_ACTIVE_ENERGY(Doc.of(OpenemsType.LONG) //
.unit(Unit.CUMULATED_WATT_HOURS) //
- .persistencePriority(PersistencePriority.VERY_HIGH)), //
+ .persistencePriority(PersistencePriority.VERY_HIGH) //
+ .text("Accumulated electrical energy consumption")), //
/**
* Is there any Component Info/Warning/Fault that is getting ignored/hidden
diff --git a/io.openems.edge.common/src/io/openems/edge/common/test/AbstractComponentTest.java b/io.openems.edge.common/src/io/openems/edge/common/test/AbstractComponentTest.java
index 9096c7d91ef..07e2f9201d3 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/test/AbstractComponentTest.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/test/AbstractComponentTest.java
@@ -1,8 +1,16 @@
package io.openems.edge.common.test;
+import static io.openems.common.utils.FunctionUtils.doNothing;
import static io.openems.common.utils.ReflectionUtils.invokeMethodViaReflection;
import static io.openems.common.utils.ReflectionUtils.invokeMethodWithoutArgumentsViaReflection;
import static io.openems.common.utils.ReflectionUtils.setAttributeViaReflection;
+import static io.openems.edge.common.event.EdgeEventConstants.TOPIC_CYCLE_AFTER_CONTROLLERS;
+import static io.openems.edge.common.event.EdgeEventConstants.TOPIC_CYCLE_AFTER_PROCESS_IMAGE;
+import static io.openems.edge.common.event.EdgeEventConstants.TOPIC_CYCLE_AFTER_WRITE;
+import static io.openems.edge.common.event.EdgeEventConstants.TOPIC_CYCLE_BEFORE_CONTROLLERS;
+import static io.openems.edge.common.event.EdgeEventConstants.TOPIC_CYCLE_BEFORE_PROCESS_IMAGE;
+import static io.openems.edge.common.event.EdgeEventConstants.TOPIC_CYCLE_BEFORE_WRITE;
+import static io.openems.edge.common.event.EdgeEventConstants.TOPIC_CYCLE_EXECUTE_WRITE;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
@@ -23,7 +31,6 @@
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.event.Event;
@@ -542,8 +549,7 @@ protected void validateOutputs(AbstractComponentTest act) throws Exception
readWriteInfo = "ReadValue";
}
// Try to parse an Enum
- if (channel.channelDoc() instanceof EnumDoc) {
- var enumDoc = (EnumDoc) channel.channelDoc();
+ if (channel.channelDoc() instanceof EnumDoc enumDoc) {
var intGot = TypeUtils.getAsType(OpenemsType.INTEGER, got);
got = enumDoc.getOption(intGot);
}
@@ -569,25 +575,22 @@ private OpenemsComponent getComponent(Map components,
private Channel getChannel(AbstractComponentTest act, ChannelValue cv)
throws IllegalArgumentException {
- if (cv instanceof ChannelAddressValue cav) {
+ return switch (cv) {
+ case ChannelAddressValue cav -> {
var component = this.getComponent(act.components, cav.address.getComponentId());
- return component.channel(cav.address.getChannelId());
+ yield component.channel(cav.address.getChannelId());
}
-
- if (cv instanceof ChannelIdValue civ) {
- return act.sut.channel(civ.channelId);
- }
-
- if (cv instanceof ChannelNameValue civ2) {
- return act.sut.channel(civ2.channelName);
- }
-
- if (cv instanceof ComponentChannelIdValue cciv) {
+ case ChannelIdValue civ //
+ -> act.sut.channel(civ.channelId);
+ case ChannelNameValue civ2 //
+ -> act.sut.channel(civ2.channelName);
+ case ComponentChannelIdValue cciv -> {
var component = this.getComponent(act.components, cciv.componentId());
- return component.channel(cciv.channelId());
+ yield component.channel(cciv.channelId());
}
-
- throw new IllegalArgumentException("Unhandled subtype of ChannelValue");
+ default //
+ -> throw new IllegalArgumentException("Unhandled subtype of ChannelValue");
+ };
}
}
@@ -688,23 +691,25 @@ public SELF addReference(String memberName, Object object) throws Exception {
// Store reference
this.references.add(object);
- // If this is a DummyComponentManager -> fill it with existing Components
- if (object instanceof DummyComponentManager) {
- for (OpenemsComponent component : this.components.values()) {
- ((DummyComponentManager) object).addComponent(component);
- }
- }
- // If this is an OpenemsComponent -> store it for later
- if (object instanceof OpenemsComponent) {
- this.addComponent((OpenemsComponent) object);
- }
- if (object instanceof Collection) {
- for (Object o : (Collection) object) {
- if (o instanceof OpenemsComponent) {
- this.addComponent((OpenemsComponent) o);
- }
- }
+ switch (object) {
+ case DummyComponentManager dcm ->
+ // If this is a DummyComponentManager -> fill it with existing Components
+ this.components.values() //
+ .forEach(dcm::addComponent);
+
+ case OpenemsComponent oc ->
+ // If this is an OpenemsComponent -> store it for later
+ this.addComponent(oc);
+
+ case Collection os -> //
+ os.stream() //
+ .filter(OpenemsComponent.class::isInstance) //
+ .map(OpenemsComponent.class::cast) //
+ .forEach(this::addComponent);
+
+ case null, default -> doNothing();
}
+
return this.self();
}
@@ -741,11 +746,11 @@ public SELF addComponent(OpenemsComponent component) {
this.components.put(component.id(), component);
// Is a DummyComponentManager present -> add this Component
- for (Object object : this.references) {
- if (object instanceof DummyComponentManager) {
- ((DummyComponentManager) object).addComponent(component);
- }
- }
+ this.references.stream() //
+ .filter(DummyComponentManager.class::isInstance) //
+ .map(DummyComponentManager.class::cast) //
+ .forEach(dcm -> dcm.addComponent(component));
+
return this.self();
}
@@ -763,8 +768,7 @@ public SELF addComponent(OpenemsComponent component) {
public SELF activate(AbstractComponentConfig config) throws Exception {
// Add the configuration to ConfigurationAdmin
for (Object object : this.references) {
- if (object instanceof DummyConfigurationAdmin) {
- var cm = (DummyConfigurationAdmin) object;
+ if (object instanceof DummyConfigurationAdmin cm) {
cm.addConfig(config);
}
}
@@ -795,11 +799,9 @@ public SELF deactivate() throws Exception {
private int getConfigChangeCount() throws IOException, InvalidSyntaxException {
var result = 0;
- for (Object object : this.references) {
- if (object instanceof ConfigurationAdmin) {
- var cm = (ConfigurationAdmin) object;
- var configs = cm.listConfigurations(null);
- for (Configuration config : configs) {
+ for (var object : this.references) {
+ if (object instanceof ConfigurationAdmin cm) {
+ for (var config : cm.listConfigurations(null)) {
result += config.getChangeCount();
}
}
@@ -900,31 +902,30 @@ public SELF next(TestCase testCase) throws Exception {
testCase.applyTimeLeap();
this.onBeforeProcessImage();
executeCallbacks(testCase.onBeforeProcessImageCallbacks);
- this.handleEvent(EdgeEventConstants.TOPIC_CYCLE_BEFORE_PROCESS_IMAGE);
- for (Channel channel : this.getSut().channels()) {
- channel.nextProcessImage();
- }
+ this.handleEvent(TOPIC_CYCLE_BEFORE_PROCESS_IMAGE);
+ this.sut.channels() //
+ .forEach(Channel::nextProcessImage);
testCase.applyInputs(this);
this.onAfterProcessImage();
executeCallbacks(testCase.onAfterProcessImageCallbacks);
- this.handleEvent(EdgeEventConstants.TOPIC_CYCLE_AFTER_PROCESS_IMAGE);
+ this.handleEvent(TOPIC_CYCLE_AFTER_PROCESS_IMAGE);
this.onBeforeControllers();
executeCallbacks(testCase.onBeforeControllersCallbacks);
- this.handleEvent(EdgeEventConstants.TOPIC_CYCLE_BEFORE_CONTROLLERS);
+ this.handleEvent(TOPIC_CYCLE_BEFORE_CONTROLLERS);
this.onExecuteControllers();
executeCallbacks(testCase.onExecuteControllersCallbacks);
this.onAfterControllers();
executeCallbacks(testCase.onAfterControllersCallbacks);
- this.handleEvent(EdgeEventConstants.TOPIC_CYCLE_AFTER_CONTROLLERS);
+ this.handleEvent(TOPIC_CYCLE_AFTER_CONTROLLERS);
this.onBeforeWrite();
executeCallbacks(testCase.onBeforeWriteCallbacks);
- this.handleEvent(EdgeEventConstants.TOPIC_CYCLE_BEFORE_WRITE);
+ this.handleEvent(TOPIC_CYCLE_BEFORE_WRITE);
this.onExecuteWrite();
executeCallbacks(testCase.onExecuteWriteCallbacks);
- this.handleEvent(EdgeEventConstants.TOPIC_CYCLE_EXECUTE_WRITE);
+ this.handleEvent(TOPIC_CYCLE_EXECUTE_WRITE);
this.onAfterWrite();
executeCallbacks(testCase.onAfterWriteCallbacks);
- this.handleEvent(EdgeEventConstants.TOPIC_CYCLE_AFTER_WRITE);
+ this.handleEvent(TOPIC_CYCLE_AFTER_WRITE);
testCase.validateOutputs(this);
return this.self();
}
diff --git a/io.openems.edge.common/src/io/openems/edge/common/test/DummyComponentManager.java b/io.openems.edge.common/src/io/openems/edge/common/test/DummyComponentManager.java
index db5ebb96825..63c3ba3d539 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/test/DummyComponentManager.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/test/DummyComponentManager.java
@@ -1,6 +1,7 @@
package io.openems.edge.common.test;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
+import static io.openems.common.test.TestUtils.createDummyClock;
+import static java.util.Collections.unmodifiableList;
import java.io.IOException;
import java.time.Clock;
@@ -9,6 +10,9 @@
import java.util.Collections;
import java.util.Hashtable;
import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.service.cm.ConfigurationAdmin;
@@ -25,10 +29,10 @@
import io.openems.common.jsonrpc.request.DeleteComponentConfigRequest;
import io.openems.common.jsonrpc.request.GetEdgeConfigRequest;
import io.openems.common.jsonrpc.request.UpdateComponentConfigRequest;
-import io.openems.common.jsonrpc.request.UpdateComponentConfigRequest.Property;
import io.openems.common.jsonrpc.response.GetEdgeConfigResponse;
import io.openems.common.types.EdgeConfig;
import io.openems.common.utils.JsonUtils;
+import io.openems.common.utils.StreamUtils;
import io.openems.edge.common.channel.Channel;
import io.openems.edge.common.component.ComponentManager;
import io.openems.edge.common.component.OpenemsComponent;
@@ -58,12 +62,12 @@ public DummyComponentManager(Clock clock) {
@Override
public List getEnabledComponents() {
- return Collections.unmodifiableList(this.components);
+ return unmodifiableList(this.components);
}
@Override
public List getAllComponents() {
- return Collections.unmodifiableList(this.components);
+ return unmodifiableList(this.components);
}
@Override
@@ -199,9 +203,9 @@ public void handleCreateComponentConfigRequest(User user, CreateComponentConfigR
var config = this.configurationAdmin.createFactoryConfiguration(request.getFactoryPid(), null);
// set properties
- for (Property property : request.getProperties()) {
+ for (var property : request.getProperties()) {
var value = JsonUtils.getAsBestType(property.getValue());
- if (value instanceof Object[] && ((Object[]) value).length == 0) {
+ if (value instanceof Object[] os && os.length == 0) {
value = new String[0];
}
config.getProperties().put(property.getName(), value);
@@ -271,4 +275,15 @@ public void setConfigurationAdmin(ConfigurationAdmin configurationAdmin) {
this.configurationAdmin = configurationAdmin;
}
+ @Override
+ public Map getComponentProperties(String componentId) {
+ try {
+ var component = this.getComponent(componentId);
+ return StreamUtils.dictionaryToStream(component.getComponentContext().getProperties())//
+ .collect(Collectors.toMap(Entry::getKey, Entry::getValue));
+ } catch (OpenemsNamedException e) {
+ return Collections.emptyMap();
+ }
+ }
+
}
\ No newline at end of file
diff --git a/io.openems.edge.common/src/io/openems/edge/common/test/Plot.java b/io.openems.edge.common/src/io/openems/edge/common/test/Plot.java
index d6a73e22d47..e54440b033d 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/test/Plot.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/test/Plot.java
@@ -1022,24 +1022,16 @@ else if (vAlign == VertAlign.CENTER)
}
public static String formatDouble(double d, AxisFormat format) {
- switch (format) {
- case TIME_HM:
- return String.format("%tR", new java.util.Date((long) d));
- case TIME_HMS:
- return String.format("%tT", new java.util.Date((long) d));
- case DATE:
- return String.format("%tF", new java.util.Date((long) d));
- case DATETIME_HM:
- return String.format("%tF %1$tR", new java.util.Date((long) d));
- case DATETIME_HMS:
- return String.format("%tF %1$tT", new java.util.Date((long) d));
- case NUMBER_KGM:
- return formatDoubleAsNumber(d, true);
- case NUMBER_INT:
- return Integer.toString((int) d);
- default:
- return formatDoubleAsNumber(d, false);
- }
+ return switch (format) {
+ case TIME_HM -> String.format("%tR", new java.util.Date((long) d));
+ case TIME_HMS -> String.format("%tT", new java.util.Date((long) d));
+ case DATE -> String.format("%tF", new java.util.Date((long) d));
+ case DATETIME_HM -> String.format("%tF %1$tR", new java.util.Date((long) d));
+ case DATETIME_HMS -> String.format("%tF %1$tT", new java.util.Date((long) d));
+ case NUMBER_KGM -> formatDoubleAsNumber(d, true);
+ case NUMBER_INT -> Integer.toString((int) d);
+ default -> formatDoubleAsNumber(d, false);
+ };
}
private static String formatDoubleAsNumber(double d, boolean useKGM) {
diff --git a/io.openems.edge.common/src/io/openems/edge/common/test/TestUtils.java b/io.openems.edge.common/src/io/openems/edge/common/test/TestUtils.java
index 4cb54a3f37e..5f99649086e 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/test/TestUtils.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/test/TestUtils.java
@@ -1,12 +1,8 @@
package io.openems.edge.common.test;
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.time.Instant;
import java.util.function.BiFunction;
import java.util.function.Function;
-import io.openems.common.test.TimeLeapClock;
import io.openems.edge.common.channel.Channel;
import io.openems.edge.common.channel.ChannelId;
import io.openems.edge.common.channel.value.Value;
@@ -15,31 +11,6 @@
public class TestUtils {
private TestUtils() {
-
- }
-
- /**
- * Creates a {@link TimeLeapClock} for 1st January 2000 00:00.
- *
- * @return the {@link TimeLeapClock}
- */
- public static TimeLeapClock createDummyClock() {
- return new TimeLeapClock(Instant.ofEpochSecond(1577836800) /* starts at 1. January 2020 00:00:00 */);
- }
-
- /**
- * Finds and returns an open port.
- *
- *
- * Source https://stackoverflow.com/a/26644672
- *
- * @return an open port
- * @throws IOException on error
- */
- public static int findRandomOpenPortOnAllLocalInterfaces() throws IOException {
- try (var socket = new ServerSocket(0);) {
- return socket.getLocalPort();
- }
}
/**
diff --git a/io.openems.edge.common/src/io/openems/edge/common/type/TypeUtils.java b/io.openems.edge.common/src/io/openems/edge/common/type/TypeUtils.java
index d43a8bc6716..a468d55e6a7 100644
--- a/io.openems.edge.common/src/io/openems/edge/common/type/TypeUtils.java
+++ b/io.openems.edge.common/src/io/openems/edge/common/type/TypeUtils.java
@@ -43,16 +43,16 @@ public static T getAsType(OpenemsType type, Object value) throws IllegalArgu
}
// Extract OptionsEnum
if (value instanceof OptionsEnum oe) {
- value = oe.getValue();
+ return getAsType(type, oe.getValue());
}
// Extract Enum (lower priority than OptionsEnum)
if (value instanceof Enum e) {
- value = e.ordinal();
+ return getAsType(type, e.ordinal());
}
// Extract value from Array
if (type != OpenemsType.STRING && value != null && value.getClass().isArray()) {
if (Array.getLength(value) == 1) {
- return TypeUtils.getAsType(type, Array.get(value, 0));
+ return getAsType(type, Array.get(value, 0));
}
return null;
}
@@ -66,26 +66,15 @@ public static T getAsType(OpenemsType type, Object value) throws IllegalArgu
}
return (T) switch (type) {
- case BOOLEAN -> {
- if (value instanceof Boolean b) {
- yield b;
-
- } else if (value instanceof Short s) {
- yield s == 0 ? Boolean.FALSE : Boolean.TRUE;
-
- } else if (value instanceof Integer i) {
- yield i == 0 ? Boolean.FALSE : Boolean.TRUE;
-
- } else if (value instanceof Long l) {
- yield l == 0 ? Boolean.FALSE : Boolean.TRUE;
-
- } else if (value instanceof Float f) {
- yield f == 0 ? Boolean.FALSE : Boolean.TRUE;
-
- } else if (value instanceof Double d) {
- yield d == 0 ? Boolean.FALSE : Boolean.TRUE;
-
- } else if (value instanceof String s) {
+ case BOOLEAN //
+ -> switch (value) {
+ case Boolean b -> b;
+ case Short s -> s == 0 ? Boolean.FALSE : Boolean.TRUE;
+ case Integer i -> i == 0 ? Boolean.FALSE : Boolean.TRUE;
+ case Long l -> l == 0 ? Boolean.FALSE : Boolean.TRUE;
+ case Float f -> f == 0 ? Boolean.FALSE : Boolean.TRUE;
+ case Double d -> d == 0 ? Boolean.FALSE : Boolean.TRUE;
+ case String s -> {
if (s.isEmpty()) {
yield null;
} else if (s.equalsIgnoreCase("false")) {
@@ -96,17 +85,14 @@ public static T getAsType(OpenemsType type, Object value) throws IllegalArgu
throw new IllegalArgumentException("Cannot convert String [" + s + "] to Boolean.");
}
}
- throw converterIsNotImplemented(type, value);
- }
-
- case SHORT -> {
- if (value instanceof Boolean b) {
- yield Short.valueOf(b ? (short) 1 : (short) 0);
-
- } else if (value instanceof Short s) {
- yield s;
-
- } else if (value instanceof Integer i) {
+ default -> throw converterIsNotImplemented(type, value);
+ };
+
+ case SHORT //
+ -> switch (value) {
+ case Boolean b -> Short.valueOf(b ? (short) 1 : (short) 0);
+ case Short s -> s;
+ case Integer i -> {
var intValue = i.intValue();
if (intValue >= Short.MIN_VALUE && intValue <= Short.MAX_VALUE) {
yield Short.valueOf((short) intValue);
@@ -114,8 +100,8 @@ public static T getAsType(OpenemsType type, Object value) throws IllegalArgu
throw new IllegalArgumentException(
"Cannot convert. Integer [" + value + "] is not fitting in Short range.");
}
-
- } else if (value instanceof Long l) {
+ }
+ case Long l -> {
var longValue = l.longValue();
if (longValue >= Short.MIN_VALUE && longValue <= Short.MAX_VALUE) {
yield Short.valueOf((short) longValue);
@@ -123,8 +109,8 @@ public static T getAsType(OpenemsType type, Object value) throws IllegalArgu
throw new IllegalArgumentException(
"Cannot convert. Long [" + value + "] is not fitting in Short range.");
}
-
- } else if (value instanceof Float f) {
+ }
+ case Float f -> {
var intValue = Math.round(f.floatValue());
if (intValue >= Short.MIN_VALUE && intValue <= Short.MAX_VALUE) {
yield Short.valueOf((short) intValue);
@@ -132,8 +118,8 @@ public static T getAsType(OpenemsType type, Object value) throws IllegalArgu
throw new IllegalArgumentException(
"Cannot convert. Float [" + value + "] is not fitting in Short range.");
}
-
- } else if (value instanceof Double d) {
+ }
+ case Double d -> {
var longValue = Math.round(d.doubleValue());
if (longValue >= Short.MIN_VALUE && longValue <= Short.MAX_VALUE) {
yield Short.valueOf((short) longValue);
@@ -141,8 +127,8 @@ public static T getAsType(OpenemsType type, Object value) throws IllegalArgu
throw new IllegalArgumentException(
"Cannot convert. Double [" + value + "] is not fitting in Short range.");
}
-
- } else if (value instanceof String s) {
+ }
+ case String s -> {
if (s.isEmpty()) {
yield null;
}
@@ -152,20 +138,15 @@ public static T getAsType(OpenemsType type, Object value) throws IllegalArgu
throw new IllegalArgumentException("Cannot convert String [" + s + "] to Short.");
}
}
- throw converterIsNotImplemented(type, value);
- }
-
- case INTEGER -> {
- if (value instanceof Boolean b) {
- yield Integer.valueOf(b ? 1 : 0);
-
- } else if (value instanceof Short s) {
- yield Integer.valueOf(s);
-
- } else if (value instanceof Integer i) {
- yield i;
-
- } else if (value instanceof Long l) {
+ default -> throw converterIsNotImplemented(type, value);
+ };
+
+ case INTEGER //
+ -> switch (value) {
+ case Boolean b -> Integer.valueOf(b ? 1 : 0);
+ case Short s -> Integer.valueOf(s);
+ case Integer i -> i;
+ case Long l -> {
var longValue = l.longValue();
if (longValue >= Integer.MIN_VALUE && longValue <= Integer.MAX_VALUE) {
yield Integer.valueOf((int) longValue);
@@ -173,8 +154,8 @@ public static T getAsType(OpenemsType type, Object value) throws IllegalArgu
throw new IllegalArgumentException(
"Cannot convert. Long [" + value + "] is not fitting in Integer range.");
}
-
- } else if (value instanceof Float f) {
+ }
+ case Float f -> {
var floatValue = f.floatValue();
if (floatValue >= Integer.MIN_VALUE && floatValue <= Integer.MAX_VALUE) {
yield Integer.valueOf((int) floatValue);
@@ -182,8 +163,8 @@ public static T getAsType(OpenemsType type, Object value) throws IllegalArgu
throw new IllegalArgumentException(
"Cannot convert. Float [" + value + "] is not fitting in Integer range.");
}
-
- } else if (value instanceof Double d) {
+ }
+ case Double d -> {
var longValue = Math.round(d.doubleValue());
if (longValue >= Integer.MIN_VALUE && longValue <= Integer.MAX_VALUE) {
yield Integer.valueOf((int) longValue);
@@ -191,8 +172,8 @@ public static T getAsType(OpenemsType type, Object value) throws IllegalArgu
throw new IllegalArgumentException(
"Cannot convert. Double [" + value + "] is not fitting in Integer range.");
}
-
- } else if (value instanceof String s) {
+ }
+ case String s -> {
if (s.isEmpty()) {
yield null;
}
@@ -202,23 +183,16 @@ public static T getAsType(OpenemsType type, Object value) throws IllegalArgu
throw new IllegalArgumentException("Cannot convert String [" + s + "] to Integer.");
}
}
- throw converterIsNotImplemented(type, value);
- }
-
- case LONG -> {
- if (value instanceof Boolean b) {
- yield Long.valueOf(b ? 1L : 0L);
-
- } else if (value instanceof Short s) {
- yield (Long) s.longValue();
-
- } else if (value instanceof Integer i) {
- yield (Long) i.longValue();
-
- } else if (value instanceof Long l) {
- yield l;
-
- } else if (value instanceof Float f) {
+ default -> throw converterIsNotImplemented(type, value);
+ };
+
+ case LONG //
+ -> switch (value) {
+ case Boolean b -> Long.valueOf(b ? 1L : 0L);
+ case Short s -> (Long) s.longValue();
+ case Integer i -> (Long) i.longValue();
+ case Long l -> l;
+ case Float f -> {
var floatValue = f.floatValue();
if (floatValue >= Long.MIN_VALUE && floatValue <= Long.MAX_VALUE) {
yield Long.valueOf((long) floatValue);
@@ -226,8 +200,8 @@ public static T getAsType(OpenemsType type, Object value) throws IllegalArgu
throw new IllegalArgumentException(
"Cannot convert. Float [" + value + "] is not fitting in Long range.");
}
-
- } else if (value instanceof Double d) {
+ }
+ case Double d -> {
var doubleValue = d.doubleValue();
if (doubleValue >= Long.MIN_VALUE && doubleValue <= Long.MAX_VALUE) {
yield (Long) Math.round(d.doubleValue());
@@ -235,8 +209,8 @@ public static T getAsType(OpenemsType type, Object value) throws IllegalArgu
throw new IllegalArgumentException(
"Cannot convert. Double [" + value + "] is not fitting in Long range.");
}
-
- } else if (value instanceof String s) {
+ }
+ case String s -> {
if (s.isEmpty()) {
yield null;
}
@@ -246,31 +220,21 @@ public static T getAsType(OpenemsType type, Object value) throws IllegalArgu
throw new IllegalArgumentException("Cannot convert String [" + s + "] to Long.");
}
}
- throw converterIsNotImplemented(type, value);
- }
-
- case FLOAT -> {
- if (value instanceof Boolean b) {
- yield Float.valueOf(b ? 1f : 0f);
-
- } else if (value instanceof Short s) {
- yield (Float) s.floatValue();
-
- } else if (value instanceof Integer i) {
- yield (Float) i.floatValue();
-
- } else if (value instanceof Long l) {
- yield (Float) l.floatValue();
-
- } else if (value instanceof Float f) {
- yield f;
-
- } else if (value instanceof Double d) {
+ default -> throw converterIsNotImplemented(type, value);
+ };
+
+ case FLOAT //
+ -> switch (value) {
+ case Boolean b -> Float.valueOf(b ? 1f : 0f);
+ case Short s -> (Float) s.floatValue();
+ case Integer i -> (Float) i.floatValue();
+ case Long l -> (Float) l.floatValue();
+ case Float f -> f;
+ case Double d ->
// Returns the value of this Double as a float after a narrowing primitive
// conversion.
- yield Float.valueOf(d.floatValue());
-
- } else if (value instanceof String s) {
+ Float.valueOf(d.floatValue());
+ case String s -> {
if (s.isEmpty()) {
yield null;
}
@@ -280,29 +244,18 @@ public static T getAsType(OpenemsType type, Object value) throws IllegalArgu
throw new IllegalArgumentException("Cannot convert String [" + s + "] to Float.");
}
}
- throw converterIsNotImplemented(type, value);
- }
-
- case DOUBLE -> {
- if (value instanceof Boolean b) {
- yield Double.valueOf(b ? 1L : 0L);
-
- } else if (value instanceof Short s) {
- yield Double.valueOf(s);
-
- } else if (value instanceof Integer i) {
- yield Double.valueOf(i);
-
- } else if (value instanceof Long l) {
- yield Double.valueOf(l);
-
- } else if (value instanceof Float f) {
- yield Double.valueOf(f);
-
- } else if (value instanceof Double d) {
- yield d;
-
- } else if (value instanceof String s) {
+ default -> throw converterIsNotImplemented(type, value);
+ };
+
+ case DOUBLE //
+ -> switch (value) {
+ case Boolean b -> Double.valueOf(b ? 1L : 0L);
+ case Short s -> Double.valueOf(s);
+ case Integer i -> Double.valueOf(i);
+ case Long l -> Double.valueOf(l);
+ case Float f -> Double.valueOf(f);
+ case Double d -> d;
+ case String s -> {
if (s.isEmpty()) {
yield null;
}
@@ -312,33 +265,25 @@ public static T getAsType(OpenemsType type, Object value) throws IllegalArgu
throw new IllegalArgumentException("Cannot convert String [" + s + "] to Double.");
}
}
- throw converterIsNotImplemented(type, value);
- }
+ default -> throw converterIsNotImplemented(type, value);
+ };
case STRING -> {
- if (value instanceof Object[]) {
- yield Arrays.deepToString((Object[]) value);
+ if (value instanceof Object[] os) {
+ yield Arrays.deepToString(os);
} else if (value.getClass().isArray()) {
- if (value instanceof boolean[]) {
- yield Arrays.toString((boolean[]) value);
- } else if (value instanceof byte[]) {
- yield Arrays.toString((byte[]) value);
- } else if (value instanceof char[]) {
- yield Arrays.toString((char[]) value);
- } else if (value instanceof double[]) {
- yield Arrays.toString((double[]) value);
- } else if (value instanceof float[]) {
- yield Arrays.toString((float[]) value);
- } else if (value instanceof int[]) {
- yield Arrays.toString((int[]) value);
- } else if (value instanceof long[]) {
- yield Arrays.toString((long[]) value);
- } else if (value instanceof short[]) {
- yield Arrays.toString((short[]) value);
- } else {
- yield value.toString();
- }
+ yield switch (value) {
+ case boolean[] bs -> Arrays.toString(bs);
+ case byte[] bs -> Arrays.toString(bs);
+ case char[] cs -> Arrays.toString(cs);
+ case double[] ds -> Arrays.toString(ds);
+ case float[] fs -> Arrays.toString(fs);
+ case int[] is -> Arrays.toString(is);
+ case long[] ls -> Arrays.toString(ls);
+ case short[] ss -> Arrays.toString(ss);
+ default -> value.toString();
+ };
} else {
yield value.toString();
diff --git a/io.openems.edge.common/test/io/openems/edge/common/jsonapi/CallTest.java b/io.openems.edge.common/test/io/openems/edge/common/jsonapi/CallTest.java
index 56a1820b518..3b3b4125502 100644
--- a/io.openems.edge.common/test/io/openems/edge/common/jsonapi/CallTest.java
+++ b/io.openems.edge.common/test/io/openems/edge/common/jsonapi/CallTest.java
@@ -43,7 +43,7 @@ public void testMapRequest() {
class DummyRequestClass {
}
-
+
final var dummyRequest = new DummyRequestClass();
final var newCall = call.mapRequest(dummyRequest);
@@ -58,7 +58,7 @@ public void testMapResponse() {
class DummyResponseClass {
}
-
+
final var mappedCall = call.mapResponse();
final var originalResponse = new GenericJsonrpcResponseSuccess(call.getRequest().getId());
diff --git a/io.openems.edge.common/test/io/openems/edge/common/type/QuarterlyValuesTest.java b/io.openems.edge.common/test/io/openems/edge/common/type/QuarterlyValuesTest.java
index b418b9bb1a9..56e5cf9032d 100644
--- a/io.openems.edge.common/test/io/openems/edge/common/type/QuarterlyValuesTest.java
+++ b/io.openems.edge.common/test/io/openems/edge/common/type/QuarterlyValuesTest.java
@@ -1,5 +1,6 @@
package io.openems.edge.common.type;
+import static io.openems.common.test.TestUtils.createDummyClock;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
@@ -11,8 +12,6 @@
import com.google.common.collect.ImmutableSortedMap;
-import io.openems.edge.common.test.TestUtils;
-
public class QuarterlyValuesTest {
private static class MyQuarterlyValues extends QuarterlyValues {
@@ -32,14 +31,14 @@ protected Double[] asArray() {
@Test(expected = IllegalArgumentException.class)
public void testExpectError() {
- var time = ZonedDateTime.now(TestUtils.createDummyClock());
+ var time = ZonedDateTime.now(createDummyClock());
new MyQuarterlyValues(ImmutableSortedMap.of(//
time.plusMinutes(1), 0.1));
}
@Test
public void testEmpty() {
- var time = ZonedDateTime.now(TestUtils.createDummyClock());
+ var time = ZonedDateTime.now(createDummyClock());
var sut = new MyQuarterlyValues(time);
assertTrue(sut.isEmpty());
assertNull(sut.getFirst());
@@ -53,7 +52,7 @@ public void testEmpty() {
@Test
public void test() {
- var time = ZonedDateTime.now(TestUtils.createDummyClock());
+ var time = ZonedDateTime.now(createDummyClock());
var sut = new MyQuarterlyValues(ImmutableSortedMap.of(//
time, 0.1, //
time.plusMinutes(15), 0.2, //
@@ -71,7 +70,7 @@ public void test() {
@Test
public void test2() {
- var time = ZonedDateTime.now(TestUtils.createDummyClock());
+ var time = ZonedDateTime.now(createDummyClock());
var sut = new MyQuarterlyValues(time, 0.1, 0.2, null, 0.3);
assertEquals(3, sut.asArray().length);
assertEquals(4, sut.toMapWithAllQuarters().size());
diff --git a/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/SendChannelValuesWorker.java b/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/SendChannelValuesWorker.java
index 94289206d45..95a01a9e335 100644
--- a/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/SendChannelValuesWorker.java
+++ b/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/SendChannelValuesWorker.java
@@ -172,7 +172,7 @@ private TreeBasedTable collectAggregatedData(ZonedDat
List enabledComponents) {
final var endTime = now.truncatedTo(DurationUnit.ofMinutes(AGGREGATION_MINUTES));
final var startTime = endTime.minusMinutes(AGGREGATION_MINUTES);
-
+
final var timestamp = startTime.toInstant();
if (this.lastSendAggregatedDataTimestamp == null) {
this.lastSendAggregatedDataTimestamp = timestamp;
diff --git a/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/handler/AuthenticatedRequestHandler.java b/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/handler/AuthenticatedRequestHandler.java
index e95c94ad568..6b2c0807ce2 100644
--- a/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/handler/AuthenticatedRequestHandler.java
+++ b/io.openems.edge.controller.api.backend/src/io/openems/edge/controller/api/backend/handler/AuthenticatedRequestHandler.java
@@ -49,12 +49,15 @@ public void buildJsonApiRoutes(JsonApiBuilder b) {
final var authenticatedRpcRequest = AuthenticatedRpcRequest.from(t.getRequest(), User::from);
t.put(EdgeKeys.USER_KEY, authenticatedRpcRequest.getUser());
return authenticatedRpcRequest.getPayload();
+
}, c -> this.binder.getJsonApiBuilder(), response -> {
// wrap response in a AuthenticatedRpcResponse if successful
- if (response instanceof JsonrpcResponseSuccess success) {
- return new AuthenticatedRpcResponse(response.getId(), success);
- }
- return response;
+ return switch (response) {
+ case JsonrpcResponseSuccess success //
+ -> new AuthenticatedRpcResponse(response.getId(), success);
+ default -> response;
+ };
+
}, () -> {
final var subrequest = new Subrequest(JsonUtils.buildJsonObject().build());
subrequest.addRpcBuilderFor(this.binder.getJsonApiBuilder(), "payload");
diff --git a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/ApiWorker.java b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/ApiWorker.java
index 4e15cd6d476..492326b2e24 100644
--- a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/ApiWorker.java
+++ b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/ApiWorker.java
@@ -140,8 +140,7 @@ public CompletableFuture handleSetChannelValueRequest(Co
value = null;
} else {
value = JsonUtils.getAsBestType(request.getValue());
- if (value instanceof String && ((String) value).isEmpty()
- && channel.channelId().doc().getType() != OpenemsType.STRING) {
+ if (value instanceof String s && s.isEmpty() && channel.channelId().doc().getType() != OpenemsType.STRING) {
// Allow non-string Channels to be set to 'UNDEFINED' using an empty string
value = null;
}
diff --git a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/Status.java b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/Status.java
index 14c18bde3e8..27edce1e31c 100644
--- a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/Status.java
+++ b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/Status.java
@@ -3,14 +3,10 @@
import io.openems.common.types.OptionsEnum;
public enum Status implements OptionsEnum {
-
ACTIVE(0, "Active"), //
-
INACTIVE(1, "Inactive"), //
-
ERROR(2, "Error"); //
-
private final int value;
private final String name;
@@ -33,5 +29,4 @@ public String getName() {
public OptionsEnum getUndefined() {
return INACTIVE;
}
-
}
diff --git a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/WriteObject.java b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/WriteObject.java
index 02c4533867d..1b5b4b9fcd3 100644
--- a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/WriteObject.java
+++ b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/WriteObject.java
@@ -118,7 +118,7 @@ public void notifyTimeout() {
* @return the value as String
*/
public abstract String valueToString();
-
+
/**
* Gets the value of the current object.
*
diff --git a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/handler/QueryRequestHandler.java b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/handler/QueryRequestHandler.java
index 64496f773cc..a21ac88bb8b 100644
--- a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/handler/QueryRequestHandler.java
+++ b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/handler/QueryRequestHandler.java
@@ -1,7 +1,8 @@
package io.openems.edge.controller.api.common.handler;
+import static java.time.temporal.ChronoUnit.MINUTES;
+
import java.io.IOException;
-import java.time.temporal.ChronoUnit;
import java.util.Collections;
import java.util.TreeSet;
@@ -86,8 +87,8 @@ private QueryHistoricTimeseriesExportXlsxResponse handleQueryHistoricTimeseriesE
final var channelsByType = detailData.getChannelsBySaveType();
powerChannels.addAll(channelsByType.getOrDefault(HistoricTimedataSaveType.POWER, Collections.emptyList()));
energyChannels.addAll(channelsByType.getOrDefault(HistoricTimedataSaveType.ENERGY, Collections.emptyList()));
- var powerData = this.timedata.queryHistoricData(null, request.getFromDate(), request.getToDate(),
- powerChannels, new Resolution(15, ChronoUnit.MINUTES));
+ var powerData = this.timedata.queryHistoricData(null, request.getFromDate(), request.getToDate(), powerChannels,
+ new Resolution(15, MINUTES));
var energyData = this.timedata.queryHistoricEnergy(null, request.getFromDate(), request.getToDate(),
energyChannels);
diff --git a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/handler/RoutesJsonApiHandler.java b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/handler/RoutesJsonApiHandler.java
index 4cceb550d83..13741e20121 100644
--- a/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/handler/RoutesJsonApiHandler.java
+++ b/io.openems.edge.controller.api.common/src/io/openems/edge/controller/api/common/handler/RoutesJsonApiHandler.java
@@ -86,11 +86,10 @@ private static final List getAllRequests(List parent
.map(Tag.serializer()::serialize) //
.collect(toJsonArray()))
.add("guards", def.getGuards().stream() //
- .map(t -> {
- if (t instanceof JsonrpcRoleEndpointGuard a) {
- return JsonrpcRoleEndpointGuard.serializer().serialize(a);
- }
- return null;
+ .map(t -> switch (t) {
+ case JsonrpcRoleEndpointGuard a //
+ -> JsonrpcRoleEndpointGuard.serializer().serialize(a);
+ default -> null;
}) //
.filter(Objects::nonNull) //
.collect(toJsonArray()))
diff --git a/io.openems.edge.controller.api.modbus/bnd.bnd b/io.openems.edge.controller.api.modbus/bnd.bnd
index 87fd5d5a4a8..aaaa2848a5c 100644
--- a/io.openems.edge.controller.api.modbus/bnd.bnd
+++ b/io.openems.edge.controller.api.modbus/bnd.bnd
@@ -5,14 +5,15 @@ Bundle-Version: 1.0.0.${tstamp}
-buildpath: \
${buildpath},\
- com.ghgande.j2mod;version=2.5.5,\
+ com.ghgande.j2mod,\
io.openems.common,\
+ io.openems.edge.bridge.modbus,\
io.openems.edge.common,\
io.openems.edge.controller.api,\
io.openems.edge.controller.api.common,\
io.openems.edge.ess.api,\
io.openems.edge.timedata.api,\
- io.openems.wrapper.fastexcel
+ io.openems.wrapper.fastexcel,\
-testpath: \
${testpath}
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusApi.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusApi.java
new file mode 100644
index 00000000000..be3b15d2f4f
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusApi.java
@@ -0,0 +1,481 @@
+package io.openems.edge.controller.api.modbus;
+
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Consumer;
+
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.component.ComponentContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.ghgande.j2mod.modbus.ModbusException;
+import com.ghgande.j2mod.modbus.slave.ModbusSlaveFactory;
+
+import io.openems.common.channel.AccessMode;
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.exceptions.OpenemsException;
+import io.openems.common.utils.ConfigUtils;
+import io.openems.common.utils.FunctionUtils;
+import io.openems.common.worker.AbstractWorker;
+import io.openems.edge.common.channel.WriteChannel;
+import io.openems.edge.common.component.AbstractOpenemsComponent;
+import io.openems.edge.common.component.OpenemsComponent;
+import io.openems.edge.common.jsonapi.ComponentJsonApi;
+import io.openems.edge.common.jsonapi.JsonApiBuilder;
+import io.openems.edge.common.jsonapi.JsonrpcEndpointGuard;
+import io.openems.edge.common.meta.Meta;
+import io.openems.edge.common.modbusslave.ModbusRecord;
+import io.openems.edge.common.modbusslave.ModbusRecordChannel;
+import io.openems.edge.common.modbusslave.ModbusRecordCycleValue;
+import io.openems.edge.common.modbusslave.ModbusRecordString16;
+import io.openems.edge.common.modbusslave.ModbusRecordUint16BlockLength;
+import io.openems.edge.common.modbusslave.ModbusRecordUint16Hash;
+import io.openems.edge.common.modbusslave.ModbusSlave;
+import io.openems.edge.common.modbusslave.ModbusSlaveNatureTable;
+import io.openems.edge.controller.api.Controller;
+import io.openems.edge.controller.api.common.ApiWorker;
+import io.openems.edge.controller.api.common.ApiWorker.WriteHandler;
+import io.openems.edge.controller.api.common.Status;
+import io.openems.edge.controller.api.common.WriteObject;
+import io.openems.edge.controller.api.common.WritePojo;
+import io.openems.edge.controller.api.modbus.jsonrpc.GetModbusProtocolExportXlsxRequest;
+import io.openems.edge.controller.api.modbus.jsonrpc.GetModbusProtocolExportXlsxResponse;
+import io.openems.edge.controller.api.modbus.jsonrpc.GetModbusProtocolRequest;
+import io.openems.edge.controller.api.modbus.jsonrpc.GetModbusProtocolResponse;
+
+public abstract class AbstractModbusApi extends AbstractOpenemsComponent
+ implements ModbusApi, ComponentJsonApi, Controller {
+
+ public static final int UNIT_ID = 1;
+ public static final int DEFAULT_MAX_CONCURRENT_CONNECTIONS = 5;
+
+ /**
+ * Holds the link between Modbus start address of a Component and the
+ * Component-ID.
+ */
+ protected final TreeMap components = new TreeMap<>();
+ protected final TreeMap records = new TreeMap<>();
+ protected volatile List _components = new CopyOnWriteArrayList<>();
+ protected List invalidComponents = new CopyOnWriteArrayList<>();
+ protected final Logger log = LoggerFactory.getLogger(AbstractModbusApi.class);
+ protected final MyProcessImage processImage;
+
+ /**
+ * Holds the link between Modbus address and ModbusRecord.
+ */
+ protected final ApiWorker apiWorker = new ApiWorker(this,
+ new WriteHandler(this.handleWrites(), this::setOverrideStatus, this.handleTimeouts()));
+
+ private AbstractModbusConfig config;
+
+ protected AbstractModbusApi(io.openems.edge.common.channel.ChannelId[] firstInitialChannelIds,
+ io.openems.edge.common.channel.ChannelId[][] furtherInitialChannelIds) {
+ super(firstInitialChannelIds, furtherInitialChannelIds);
+ this.processImage = new MyProcessImage(this);
+ }
+
+ protected void activate(ComponentContext context, ConfigurationAdmin cm, AbstractModbusConfig config)
+ throws OpenemsException {
+ this.config = config;
+ super.activate(context, config.id(), config.alias(), config.enabled());
+
+ final var filter = ConfigUtils.generateReferenceTargetFilter(this.servicePid(), false, config.componentIds());
+ OpenemsComponent.updateReferenceFilterRaw(cm, this.servicePid(), "Component", filter);
+
+ this.apiWorker.setTimeoutSeconds(config.apiTimeout());
+
+ if (!this.isEnabled()) {
+ return;
+ }
+
+ this.startApiWorker.activate(config.id());
+
+ }
+
+ protected void modified(ComponentContext context, ConfigurationAdmin cm, AbstractModbusConfig config)
+ throws OpenemsException {
+ super.modified(context, config.id(), config.alias(), config.enabled());
+
+ final var filter = ConfigUtils.generateReferenceTargetFilter(this.servicePid(), false, config.componentIds());
+ OpenemsComponent.updateReferenceFilterRaw(cm, this.servicePid(), "Component", filter);
+
+ if (this.config.equals(config)) {
+ return;
+ }
+
+ this.config = config;
+
+ this.apiWorker.setTimeoutSeconds(config.apiTimeout());
+
+ if (!this.isEnabled()) {
+ this.startApiWorker.deactivate();
+ return;
+ }
+
+ this.startApiWorker.modified(config.id());
+
+ }
+
+ @Override
+ protected void deactivate() {
+ this.startApiWorker.deactivate();
+ super.deactivate();
+
+ // wait until modbus slave was completely closed
+ try {
+ Thread.sleep(10000);
+ } catch (InterruptedException e) {
+ this.log.warn(e.getMessage());
+ }
+ }
+
+ protected void onStarted() {
+ AbstractModbusApi.this.logInfo(this.log, "ModbusApi started.");
+ }
+
+ protected Consumer, WriteObject>> handleWrites() {
+ return FunctionUtils::doNothing;
+ }
+
+ protected void setOverrideStatus(Status status) {
+ // do nothing
+ }
+
+ protected Runnable handleTimeouts() {
+ return FunctionUtils::doNothing;
+ }
+
+ protected abstract com.ghgande.j2mod.modbus.slave.ModbusSlave createSlave() throws ModbusException;
+
+ private final AbstractWorker startApiWorker = new AbstractWorker() {
+
+ private static final int DEFAULT_WAIT_TIME = 5000; // 5 seconds
+
+ private final Logger log = LoggerFactory.getLogger(AbstractWorker.class);
+
+ protected com.ghgande.j2mod.modbus.slave.ModbusSlave slave = null;
+
+ protected AbstractModbusConfig currentConfig = null;
+
+ @Override
+ protected void forever() throws ModbusException {
+ if (this.slave == null) {
+ try {
+ // start new server
+ this.currentConfig = AbstractModbusApi.this.config;
+ this.slave = AbstractModbusApi.this.createSlave();
+ this.slave.addProcessImage(UNIT_ID, AbstractModbusApi.this.processImage);
+ this.slave.open();
+ if (isEnabled()) {
+ AbstractModbusApi.this.onStarted();
+ AbstractModbusApi.this._setUnableToStart(false);
+ }
+ } catch (ModbusException e) {
+ ModbusSlaveFactory.close(this.slave);
+ AbstractModbusApi.this.logError(this.log, "Unable to start Modbus-Api: " + e.getMessage());
+ AbstractModbusApi.this._setUnableToStart(true);
+ }
+
+ } else {
+ // regular check for errors
+ String error = this.slave.getError();
+ if (error != null) {
+ AbstractModbusApi.this.logError(this.log, "Unable to start Modbus-Api: " + error);
+ AbstractModbusApi.this._setUnableToStart(true);
+ this.stopSlave();
+ } else if (!this.currentConfig.equals(AbstractModbusApi.this.config)) {
+ this.stopSlave();
+ }
+ }
+ }
+
+ private void stopSlave() {
+ ModbusSlaveFactory.close(this.slave);
+ this.slave = null;
+ }
+
+ @Override
+ protected int getCycleTime() {
+ return DEFAULT_WAIT_TIME;
+ }
+
+ };
+
+ @Override
+ public void run() throws OpenemsNamedException {
+ if (!this.isEnabled()) {
+ return;
+ }
+
+ this.updateCycleValues();
+ this.apiWorker.run();
+ }
+
+ /**
+ * Called by addComponent/removeComponent. Initializes the ModbusRecords, once
+ * all Components are available. Fault-State otherwise.
+ */
+ protected synchronized void updateComponents() {
+ var config = this.config;
+
+ if (config == null) {
+ return;
+ }
+ if (config.componentIds().length > this._components.size()) {
+ if (this.getComponentNoModbusApiFaultChannel().getNextValue().get() != true) {
+ this._setComponentMissingFault(true); // Either this or that fault
+ }
+ return;
+ }
+ this._setComponentMissingFault(false);
+
+ this.initializeModbusRecords(this.config.metaComponent(), this.config.componentIds());
+ }
+
+ protected synchronized void addComponent(OpenemsComponent component) {
+ if (!(component instanceof ModbusSlave ms)) {
+ this.logError(this.log, "Component [" + component.id() + "] does not implement ModbusSlave");
+ this.invalidComponents.add(component);
+ this._setComponentNoModbusApiFault(true);
+ return;
+ }
+ this._components.add(ms);
+ this.updateComponents();
+ }
+
+ protected synchronized void removeComponent(OpenemsComponent component) {
+ this._components.remove(component);
+ if (this.invalidComponents.remove(component)) {
+ if (this.invalidComponents.isEmpty()) {
+ this._setComponentNoModbusApiFault(false);
+ }
+ return;
+ }
+ this.updateComponents();
+ }
+
+ /**
+ * Once every cycle: update the values for each registered
+ * {@link ModbusRecordCycleValue}.
+ */
+ @SuppressWarnings("unchecked")
+ protected void updateCycleValues() {
+ this.records.values() //
+ .stream() //
+ .filter(ModbusRecordCycleValue.class::isInstance) //
+ .map(ModbusRecordCycleValue.class::cast) //
+ .forEach(r -> {
+ var component = this.getPossiblyDisabledComponent(r.getComponentId());
+ if (component != null && component.isEnabled()) {
+ r.updateValue(component);
+ } else {
+ r.updateValue(null);
+ }
+ });
+ }
+
+ @Override
+ protected void logDebug(Logger log, String message) {
+ super.logDebug(log, message);
+ }
+
+ @Override
+ protected void logInfo(Logger log, String message) {
+ super.logInfo(log, message);
+ }
+
+ @Override
+ protected void logWarn(Logger log, String message) {
+ super.logWarn(log, message);
+ }
+
+ /**
+ * Gets the AccessMode.
+ *
+ * @return the {@link AccessMode}
+ */
+ protected abstract AccessMode getAccessMode();
+
+ /**
+ * Gets the Component. Be aware, that it might be 'disabled'.
+ *
+ * @param componentId the Component-ID
+ *
+ * @return the {@link ModbusSlave} Component; possibly null
+ */
+ protected ModbusSlave getPossiblyDisabledComponent(String componentId) {
+ if (componentId == null) {
+ return null;
+ }
+ if (componentId == Meta.SINGLETON_COMPONENT_ID) {
+ return this.config.metaComponent();
+ }
+ return this._components.stream() //
+ .filter(c -> componentId.equals(c.id())) //
+ .findFirst() //
+ .orElse(null);
+ }
+
+ /**
+ * Adds a Record to the process image at the given address.
+ *
+ * @param address the address
+ * @param record the record
+ * @param component the OpenEMS Component
+ * @return the next address after this record
+ */
+ private int addRecordToProcessImage(int address, ModbusRecord record, OpenemsComponent component) {
+ record.setComponentId(component.id());
+
+ // Handle writes to the Channel; limited to ModbusRecordChannels
+ if (record instanceof ModbusRecordChannel r) {
+ r.onWriteValue(value -> {
+ var readChannel = component.channel(r.getChannelId());
+ if (!(readChannel instanceof WriteChannel wc)) {
+ this.logWarn(this.log, "Unable to write to Read-Only-Channel [" + readChannel.address() + "]");
+ return;
+ }
+ this.apiWorker.addValue(wc, new WritePojo(value));
+ });
+ }
+
+ this.records.put(address, record);
+ return address + record.getType().getWords();
+ }
+
+ /**
+ * Initialize Modbus-Records for all configured Component-IDs.
+ *
+ * @param metaComponent the {@link Meta} component
+ * @param componentIds the configured Component-IDs.
+ */
+ private void initializeModbusRecords(Meta metaComponent, String[] componentIds) {
+ this.records.clear();
+ // Add generic header
+ this.records.put(0, new ModbusRecordUint16Hash(0, "OpenEMS"));
+ var nextAddress = 1;
+
+ // add Meta-Component
+ nextAddress = this.addMetaComponentToProcessImage(nextAddress, metaComponent);
+
+ // add remaining components; sorted by configured componentIds
+ for (String id : componentIds) {
+ // find next component in order
+ var component = this.getPossiblyDisabledComponent(id);
+ if (component == null) { // This should never happen
+ this.logWarn(this.log, "Required Component [" + id + "] " //
+ + "is not available. Component may not implement ModbusSlave or is not active.");
+ continue;
+ }
+
+ nextAddress = this.addComponentToProcessImage(nextAddress, component);
+ }
+ }
+
+ /**
+ * Adds the Meta-Component to the Process Image.
+ *
+ * @param startAddress the start-address
+ * @param component the {@link Meta} component
+ * @return the next start-address
+ */
+ private int addMetaComponentToProcessImage(int startAddress, Meta component) {
+ var table = component.getModbusSlaveTable(this.getAccessMode());
+
+ // add the Component-Model Length
+ var nextAddress = this.addRecordToProcessImage(startAddress,
+ new ModbusRecordUint16BlockLength(-1, component.id(), (short) table.getLength()), component);
+
+ // add Records
+ for (ModbusSlaveNatureTable natureTable : table.getNatureTables()) {
+ for (ModbusRecord record : natureTable.getModbusRecords()) {
+ this.addRecordToProcessImage(nextAddress + record.getOffset(), record, component);
+ }
+ }
+ return startAddress + table.getLength();
+ }
+
+ /**
+ * Adds a Component to the Process Image.
+ *
+ * @param startAddress the start-address
+ * @param component the OpenEMS Component
+ * @return the next start-address
+ */
+ private int addComponentToProcessImage(int startAddress, ModbusSlave component) {
+ this.components.put(startAddress, component.alias());
+ var table = component.getModbusSlaveTable(this.getAccessMode());
+
+ // add the Component-ID and Component-Model Length
+ var nextAddress = this.addRecordToProcessImage(startAddress,
+ new ModbusRecordString16(-1, "Component-ID", component.id()), component);
+ this.addRecordToProcessImage(nextAddress,
+ new ModbusRecordUint16BlockLength(-1, component.id(), (short) table.getLength()), component);
+ nextAddress = startAddress + 20;
+ var nextNatureAddress = nextAddress;
+
+ // add all Nature-Tables
+ for (ModbusSlaveNatureTable natureTable : table.getNatureTables()) {
+ // add the Interface Hash-Code and Length
+ nextAddress = this.addRecordToProcessImage(nextNatureAddress,
+ new ModbusRecordUint16Hash(-1, natureTable.getNatureName()), component);
+ nextAddress = this.addRecordToProcessImage(nextAddress,
+ new ModbusRecordUint16BlockLength(-1, natureTable.getNatureName(), (short) natureTable.getLength()),
+ component);
+
+ // add Records
+ for (ModbusRecord record : natureTable.getModbusRecords()) {
+ this.addRecordToProcessImage(nextNatureAddress + 2 + record.getOffset(), record, component);
+ }
+
+ nextNatureAddress = nextNatureAddress += natureTable.getLength();
+ }
+
+ // calculate next address after this component
+ return startAddress + table.getLength();
+ }
+
+ @Override
+ public void buildJsonApiRoutes(JsonApiBuilder builder) {
+ builder.handleRequest(GetModbusProtocolRequest.METHOD, def -> {
+ def.setGuards(this.componentMissingGuard(), this.componentNoModbusApiGuard());
+ }, call -> {
+ return new GetModbusProtocolResponse(call.getRequest().getId(), this.records);
+ });
+ builder.handleRequest(GetModbusProtocolExportXlsxRequest.METHOD, def -> {
+ def.setGuards(this.componentMissingGuard(), this.componentNoModbusApiGuard());
+ }, call -> {
+ return new GetModbusProtocolExportXlsxResponse(call.getRequest().getId(), this.components, this.records);
+ });
+ }
+
+ private JsonrpcEndpointGuard componentMissingGuard() {
+ return call -> {
+ if (this.getComponentMissingFault().get() == true) {
+ throw new OpenemsException(this.getComponentMissingFaultChannel().channelDoc().getText());
+ }
+ };
+ }
+
+ private JsonrpcEndpointGuard componentNoModbusApiGuard() {
+ return call -> {
+ if (this.getComponentNoModbusApiFault().get() == true) {
+ throw new OpenemsException(this.getComponentNoModbusApiFaultChannel().channelDoc().getText());
+ }
+ };
+ }
+
+ /**
+ * Format a given channelAddress to a ChannelId.
+ *
+ * @param channel WriteChannel
+ * @return component_channelId as String
+ */
+ public static String formatChannelName(WriteChannel channel) {
+ return channel.getComponent().id() + "_" + channel.channelId().name();
+ }
+
+}
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusConfig.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusConfig.java
new file mode 100644
index 00000000000..a9792bd4199
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusConfig.java
@@ -0,0 +1,108 @@
+package io.openems.edge.controller.api.modbus;
+
+import java.util.Arrays;
+
+import io.openems.edge.common.meta.Meta;
+
+public abstract class AbstractModbusConfig {
+ private final String id;
+ private final String alias;
+ private final boolean enabled;
+ private final Meta metaComponent;
+ private final String[] componentIds;
+ private final int apiTimeout;
+ private final int maxConcurrentConnections;
+
+ public AbstractModbusConfig(String id, String alias, boolean enabled, Meta metaComponent, String[] componentIds,
+ int apiTimeout, int maxConcurrentConnections) {
+ this.id = id;
+ this.alias = alias;
+ this.enabled = enabled;
+ this.metaComponent = metaComponent;
+ this.componentIds = componentIds;
+ this.apiTimeout = apiTimeout;
+ this.maxConcurrentConnections = maxConcurrentConnections;
+ }
+
+ /**
+ * Returns a unique ID for this OpenEMS component.
+ *
+ * @return the unique ID
+ */
+ public String id() {
+ return this.id;
+ }
+
+ /**
+ * Returns a unique ID for this OpenEMS component.
+ *
+ * @return the unique ID
+ */
+ public String alias() {
+ return this.alias;
+ }
+
+ /**
+ * Is this controller enabled?.
+ *
+ * @return boolean
+ */
+ public boolean enabled() {
+ return this.enabled;
+ }
+
+ /**
+ * Returns a metaComponent.
+ *
+ * @return the metaComponent
+ */
+ public Meta metaComponent() {
+ return this.metaComponent;
+ }
+
+ /**
+ * Returns an array of component ids.
+ *
+ * @return the componentIds
+ */
+ public String[] componentIds() {
+ return this.componentIds;
+ }
+
+ /**
+ * Returns the api timeout.
+ *
+ * @return the apiTimeout
+ */
+ public int apiTimeout() {
+ return this.apiTimeout;
+ }
+
+ /**
+ * Returns the max number of concurrent connections.
+ *
+ * @return the maxConcurrentConnections
+ */
+ public int maxConcurrentConnections() {
+ return this.maxConcurrentConnections;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (this == other) {
+ return true;
+ }
+ if (other == null || getClass() != other.getClass()) {
+ return false;
+ }
+ AbstractModbusConfig config = (AbstractModbusConfig) other;
+ return this.enabled == config.enabled //
+ && this.apiTimeout == config.apiTimeout //
+ && this.maxConcurrentConnections == config.maxConcurrentConnections
+ && this.id.equals(config.id) //
+ && this.alias.equals(config.alias)
+ && this.metaComponent.equals(config.metaComponent) //
+ && Arrays.equals(this.componentIds, config.componentIds);
+ }
+
+}
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusRtuApi.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusRtuApi.java
new file mode 100644
index 00000000000..4781e65aa2d
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusRtuApi.java
@@ -0,0 +1,99 @@
+package io.openems.edge.controller.api.modbus;
+
+import io.openems.edge.bridge.modbus.api.Parity;
+import io.openems.edge.bridge.modbus.api.Stopbit;
+import io.openems.edge.common.component.OpenemsComponent;
+import io.openems.edge.common.jsonapi.ComponentJsonApi;
+import io.openems.edge.common.meta.Meta;
+import io.openems.edge.controller.api.Controller;
+
+public abstract class AbstractModbusRtuApi extends AbstractModbusApi
+ implements ModbusApi, Controller, OpenemsComponent, ComponentJsonApi {
+
+ public AbstractModbusRtuApi(String implementationName,
+ io.openems.edge.common.channel.ChannelId[] firstInitialChannelIds,
+ io.openems.edge.common.channel.ChannelId[]... furtherInitialChannelIds) {
+ super(firstInitialChannelIds, furtherInitialChannelIds);
+ }
+
+ public static class RtuConfig extends AbstractModbusConfig {
+ private final String portName;
+ private final int baudRate;
+ private final int databits;
+ private final Stopbit stopbits;
+ private final Parity parity;
+
+ public RtuConfig(String id, String alias, boolean enabled, Meta metaComponent, String[] componentIds,
+ int apiTimeout, String portName, int baudRate, int databits, Stopbit stopbits, Parity parity,
+ int maxConcurrentConnections) {
+ super(id, alias, enabled, metaComponent, componentIds, apiTimeout, maxConcurrentConnections);
+ this.portName = portName;
+ this.baudRate = baudRate;
+ this.databits = databits;
+ this.stopbits = stopbits;
+ this.parity = parity;
+ }
+
+ /**
+ * Returns the portName.
+ *
+ * @return the portName
+ */
+ public String portName() {
+ return this.portName;
+ }
+
+ /**
+ * Returns the baudRate.
+ *
+ * @return the baudRate
+ */
+ public int baudRate() {
+ return this.baudRate;
+ }
+
+ /**
+ * Returns the databits.
+ *
+ * @return databits
+ */
+ public int databits() {
+ return this.databits;
+ }
+
+ /**
+ * Returns the stopbits.
+ *
+ * @return the stopbits
+ */
+ public Stopbit stopbits() {
+ return this.stopbits;
+ }
+
+ /**
+ * Returns the parity.
+ *
+ * @return the parity
+ */
+ public Parity parity() {
+ return this.parity;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (!super.equals(other)) {
+ return false;
+ }
+ if (!(other instanceof RtuConfig config)) {
+ return false;
+ }
+ return this.baudRate == config.baudRate //
+ && this.databits == config.databits //
+ && this.stopbits == config.stopbits //
+ && this.parity == config.parity //
+ && this.portName.equals(config.portName);
+ }
+
+ }
+
+}
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusTcpApi.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusTcpApi.java
index 7aff8bc95ec..fa5cbb2d909 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusTcpApi.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/AbstractModbusTcpApi.java
@@ -1,531 +1,43 @@
package io.openems.edge.controller.api.modbus;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.function.Consumer;
-
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.service.component.ComponentContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.ghgande.j2mod.modbus.ModbusException;
-import com.ghgande.j2mod.modbus.slave.ModbusSlaveFactory;
-
-import io.openems.common.channel.AccessMode;
-import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.common.exceptions.OpenemsException;
-import io.openems.common.utils.ConfigUtils;
-import io.openems.common.worker.AbstractWorker;
-import io.openems.edge.common.channel.Channel;
-import io.openems.edge.common.channel.WriteChannel;
-import io.openems.edge.common.component.AbstractOpenemsComponent;
import io.openems.edge.common.component.OpenemsComponent;
-import io.openems.edge.common.jsonapi.ComponentJsonApi;
-import io.openems.edge.common.jsonapi.JsonApiBuilder;
-import io.openems.edge.common.jsonapi.JsonrpcEndpointGuard;
import io.openems.edge.common.meta.Meta;
-import io.openems.edge.common.modbusslave.ModbusRecord;
-import io.openems.edge.common.modbusslave.ModbusRecordChannel;
-import io.openems.edge.common.modbusslave.ModbusRecordCycleValue;
-import io.openems.edge.common.modbusslave.ModbusRecordString16;
-import io.openems.edge.common.modbusslave.ModbusRecordUint16BlockLength;
-import io.openems.edge.common.modbusslave.ModbusRecordUint16Hash;
-import io.openems.edge.common.modbusslave.ModbusSlave;
-import io.openems.edge.common.modbusslave.ModbusSlaveNatureTable;
import io.openems.edge.controller.api.Controller;
-import io.openems.edge.controller.api.common.ApiWorker;
-import io.openems.edge.controller.api.common.ApiWorker.WriteHandler;
-import io.openems.edge.controller.api.common.Status;
-import io.openems.edge.controller.api.common.WriteObject;
-import io.openems.edge.controller.api.common.WritePojo;
-import io.openems.edge.controller.api.modbus.jsonrpc.GetModbusProtocolExportXlsxRequest;
-import io.openems.edge.controller.api.modbus.jsonrpc.GetModbusProtocolExportXlsxResponse;
-import io.openems.edge.controller.api.modbus.jsonrpc.GetModbusProtocolRequest;
-import io.openems.edge.controller.api.modbus.jsonrpc.GetModbusProtocolResponse;
-public abstract class AbstractModbusTcpApi extends AbstractOpenemsComponent
- implements ModbusTcpApi, Controller, OpenemsComponent, ComponentJsonApi {
+public abstract class AbstractModbusTcpApi extends AbstractModbusApi
+ implements ModbusApi, Controller, OpenemsComponent {
- public static final int UNIT_ID = 1;
public static final int DEFAULT_PORT = 502;
- public static final int DEFAULT_MAX_CONCURRENT_CONNECTIONS = 5;
-
- /**
- * Holds the link between Modbus address and ModbusRecord.
- */
- protected final TreeMap records = new TreeMap<>();
- protected final ApiWorker apiWorker = new ApiWorker(this,
- new WriteHandler(this.handleWrites(), this::setOverrideStatus, this.handleTimeouts()));
- private final Logger log = LoggerFactory.getLogger(AbstractModbusTcpApi.class);
- private final MyProcessImage processImage;
- private final String implementationName;
-
- /**
- * Holds the link between Modbus start address of a Component and the
- * Component-ID.
- */
- private final TreeMap components = new TreeMap<>();
-
- private ConfigRecord config;
- private List invalidComponents = new CopyOnWriteArrayList<>();
-
- protected synchronized void addComponent(OpenemsComponent component) {
- if (!(component instanceof ModbusSlave)) {
- this.logError(this.log, "Component [" + component.id() + "] does not implement ModbusSlave");
- this.invalidComponents.add(component);
- this._setComponentNoModbusApiFault(true);
- return;
- }
- this._components.add((ModbusSlave) component);
- this.updateComponents();
- }
-
- protected abstract Consumer, WriteObject>> handleWrites();
-
- protected abstract void setOverrideStatus(Status status);
-
- protected abstract Runnable handleTimeouts();
-
- protected synchronized void removeComponent(OpenemsComponent component) {
- this._components.remove(component);
- if (this.invalidComponents.remove(component)) {
- if (this.invalidComponents.isEmpty()) {
- this._setComponentNoModbusApiFault(false);
- }
- return;
- }
- this.updateComponents();
- }
-
- private volatile List _components = new CopyOnWriteArrayList<>();
public AbstractModbusTcpApi(String implementationName,
io.openems.edge.common.channel.ChannelId[] firstInitialChannelIds,
io.openems.edge.common.channel.ChannelId[]... furtherInitialChannelIds) {
super(firstInitialChannelIds, furtherInitialChannelIds);
- this.implementationName = implementationName;
- this.processImage = new MyProcessImage(this);
- }
-
- protected void activate(ComponentContext context, ConfigurationAdmin cm, ConfigRecord config)
- throws OpenemsException {
- super.activate(context, config.id(), config.alias(), config.enabled());
- this.handleActivate(config, cm, config.id());
- }
-
- protected void modified(ComponentContext context, ConfigurationAdmin cm, ConfigRecord config)
- throws OpenemsException {
- super.modified(context, config.id(), config.alias(), config.enabled());
-
- // update filter for 'Components'; allow disable components
- final var filter = ConfigUtils.generateReferenceTargetFilter(this.servicePid(), false, config.componentIds);
- OpenemsComponent.updateReferenceFilterRaw(cm, this.servicePid(), "Component", filter);
-
- // Config (relevant for API) was not modified
- if (this.config.equals(config)) {
- return;
- }
-
- ModbusSlaveFactory.close();
-
- // Activate with new config
- this.handleModified(config, cm, config.id());
- }
-
- private void handleActivate(ConfigRecord config, ConfigurationAdmin cm, String id) {
- // configuration settings
- this.config = config;
-
- // update filter for 'Components'; allow disable components
- final var filter = ConfigUtils.generateReferenceTargetFilter(this.servicePid(), false, config.componentIds);
- OpenemsComponent.updateReferenceFilterRaw(cm, this.servicePid(), "Component", filter);
-
- this.apiWorker.setTimeoutSeconds(config.apiTimeout);
-
- if (!this.isEnabled()) {
- // abort if disabled
- return;
- }
-
- // Start Modbus-Server
- this.startApiWorker.activate(id);
-
- this.updateComponents();
- }
-
- private void handleModified(ConfigRecord config, ConfigurationAdmin cm, String id) {
- // configuration settings
- this.config = config;
-
- this.apiWorker.setTimeoutSeconds(config.apiTimeout);
-
- if (!this.isEnabled()) {
- // abort if disabled
- this.startApiWorker.deactivate();
- return;
- }
-
- // Modify Modbus-Server
- this.startApiWorker.modified(id);
-
- this.updateComponents();
- }
-
- /**
- * Called by addComponent/removeComponent. Initializes the ModbusRecords, once
- * all Components are available. Fault-State otherwise.
- */
- private synchronized void updateComponents() {
- // Check if all Components are available
- var config = this.config;
- if (config == null) {
- return;
- }
- if (config.componentIds.length > this._components.size()) {
- if (this.getComponentNoModbusApiFaultChannel().getNextValue().get() != Boolean.TRUE) {
- this._setComponentMissingFault(true); // Either this or that fault
- }
- return;
- }
- this._setComponentMissingFault(false);
-
- // Initialize Modbus Records
- this.initializeModbusRecords(this.config.metaComponent, this.config.componentIds);
- }
-
- @Override
- protected void deactivate() {
-
- this.startApiWorker.deactivate();
- ModbusSlaveFactory.close();
- super.deactivate();
-
- // wait until modbus slave was completely closed
- try {
- Thread.sleep(10000);
- } catch (InterruptedException e) {
- this.log.warn(e.getMessage());
- }
- }
-
- private final AbstractWorker startApiWorker = new AbstractWorker() {
-
- private static final int DEFAULT_WAIT_TIME = 5000; // 5 seconds
-
- private final Logger log = LoggerFactory.getLogger(AbstractWorker.class);
-
- private com.ghgande.j2mod.modbus.slave.ModbusSlave slave = null;
-
- @Override
- protected void forever() {
- var port = AbstractModbusTcpApi.this.config.port;
- if (this.slave == null) {
- try {
- // start new server
- this.slave = ModbusSlaveFactory.createTCPSlave(port,
- AbstractModbusTcpApi.this.config.maxConcurrentConnections);
- this.slave.addProcessImage(UNIT_ID, AbstractModbusTcpApi.this.processImage);
- if (isEnabled()) {
- this.slave.open();
- AbstractModbusTcpApi.this.logInfo(this.log,
- AbstractModbusTcpApi.this.implementationName + " started " //
- + "on port [" + port + "] with UnitId [" + AbstractModbusTcpApi.UNIT_ID + "].");
- }
- } catch (ModbusException e) {
- ModbusSlaveFactory.close();
- AbstractModbusTcpApi.this.logError(this.log,
- "Unable to start " + AbstractModbusTcpApi.this.implementationName + " on port [" + port
- + "]: " + e.getMessage());
- AbstractModbusTcpApi.this._setUnableToStart(true);
- }
-
- } else {
- // regular check for errors
- var error = this.slave.getError();
- if (error == null) {
- AbstractModbusTcpApi.this._setUnableToStart(false);
-
- } else {
- AbstractModbusTcpApi.this.logError(this.log,
- "Unable to start Modbus/TCP Api on port [" + port + "]: " + error);
- AbstractModbusTcpApi.this._setUnableToStart(true);
- this.slave = null;
- // stop server
- ModbusSlaveFactory.close();
- }
- }
- }
-
- @Override
- protected int getCycleTime() {
- return DEFAULT_WAIT_TIME;
- }
-
- };
-
- /**
- * Initialize Modbus-Records for all configured Component-IDs.
- *
- * @param metaComponent the {@link Meta} component
- * @param componentIds the configured Component-IDs.
- */
- private void initializeModbusRecords(Meta metaComponent, String[] componentIds) {
- // Add generic header
- this.records.clear();
- this.records.put(0, new ModbusRecordUint16Hash(0, "OpenEMS"));
- var nextAddress = 1;
-
- // add Meta-Component
- nextAddress = this.addMetaComponentToProcessImage(nextAddress, metaComponent);
-
- // add remaining components; sorted by configured componentIds
- for (String id : componentIds) {
- // find next component in order
- var component = this.getPossiblyDisabledComponent(id);
- if (component == null) { // This should never happen
- this.logWarn(this.log, "Required Component [" + id + "] " //
- + "is not available. Component may not implement ModbusSlave or is not active.");
- continue;
- }
-
- // add component to process image
- nextAddress = this.addComponentToProcessImage(nextAddress, component);
- }
- }
-
- /**
- * Adds the Meta-Component to the Process Image.
- *
- * @param startAddress the start-address
- * @param component the {@link Meta} component
- * @return the next start-address
- */
- private int addMetaComponentToProcessImage(int startAddress, Meta component) {
- var table = component.getModbusSlaveTable(this.getAccessMode());
-
- // add the Component-Model Length
- var nextAddress = this.addRecordToProcessImage(startAddress,
- new ModbusRecordUint16BlockLength(-1, component.id(), (short) table.getLength()), component);
-
- // add Records
- for (ModbusSlaveNatureTable natureTable : table.getNatureTables()) {
- for (ModbusRecord record : natureTable.getModbusRecords()) {
- this.addRecordToProcessImage(nextAddress + record.getOffset(), record, component);
- }
- }
- return startAddress + table.getLength();
}
- /**
- * Adds a Component to the Process Image.
- *
- * @param startAddress the start-address
- * @param component the OpenEMS Component
- * @return the next start-address
- */
- private int addComponentToProcessImage(int startAddress, ModbusSlave component) {
- this.components.put(startAddress, component.alias());
- var table = component.getModbusSlaveTable(this.getAccessMode());
-
- // add the Component-ID and Component-Model Length
- var nextAddress = this.addRecordToProcessImage(startAddress,
- new ModbusRecordString16(-1, "Component-ID", component.id()), component);
- this.addRecordToProcessImage(nextAddress,
- new ModbusRecordUint16BlockLength(-1, component.id(), (short) table.getLength()), component);
- nextAddress = startAddress + 20;
- var nextNatureAddress = nextAddress;
+ public class TcpConfig extends AbstractModbusConfig {
+ private final int port;
- // add all Nature-Tables
- for (ModbusSlaveNatureTable natureTable : table.getNatureTables()) {
- // add the Interface Hash-Code and Length
- nextAddress = this.addRecordToProcessImage(nextNatureAddress,
- new ModbusRecordUint16Hash(-1, natureTable.getNatureName()), component);
- nextAddress = this.addRecordToProcessImage(nextAddress,
- new ModbusRecordUint16BlockLength(-1, natureTable.getNatureName(), (short) natureTable.getLength()),
- component);
-
- // add Records
- for (ModbusRecord record : natureTable.getModbusRecords()) {
- this.addRecordToProcessImage(nextNatureAddress + 2 + record.getOffset(), record, component);
- }
-
- nextNatureAddress = nextNatureAddress += natureTable.getLength();
+ public TcpConfig(String id, String alias, boolean enabled, Meta metaComponent, String[] componentIds,
+ int apiTimeout, int port, int maxConcurrentConnections) {
+ super(id, alias, enabled, metaComponent, componentIds, apiTimeout, maxConcurrentConnections);
+ this.port = port;
}
- // calculate next address after this component
- return startAddress + table.getLength();
- }
-
- /**
- * Adds a Record to the process image at the given address.
- *
- * @param address the address
- * @param record the record
- * @param component the OpenEMS Component
- * @return the next address after this record
- */
- private int addRecordToProcessImage(int address, ModbusRecord record, OpenemsComponent component) {
- record.setComponentId(component.id());
-
- // Handle writes to the Channel; limited to ModbusRecordChannels
- if (record instanceof ModbusRecordChannel) {
- var r = (ModbusRecordChannel) record;
- r.onWriteValue(value -> {
- Channel readChannel = component.channel(r.getChannelId());
- if (!(readChannel instanceof WriteChannel)) {
- this.logWarn(this.log, "Unable to write to Read-Only-Channel [" + readChannel.address() + "]");
- return;
- }
- WriteChannel channel = (WriteChannel) readChannel;
- this.apiWorker.addValue(channel, new WritePojo(value));
- });
+ public int getPort() {
+ return this.port;
}
- this.records.put(address, record);
- return address + record.getType().getWords();
- }
-
- @Override
- public void run() throws OpenemsNamedException {
- // Enabled?
- if (!this.isEnabled()) {
- return;
- }
-
- this.updateCycleValues();
- this.apiWorker.run();
- }
-
- @SuppressWarnings("unchecked")
- /**
- * Once every cycle: update the values for each registered
- * {@link ModbusRecordCycleValue}.
- */
- private void updateCycleValues() {
- this.records.values() //
- .stream() //
- .filter(r -> r instanceof ModbusRecordCycleValue) //
- .map(r -> (ModbusRecordCycleValue) r) //
- .forEach(r -> {
- OpenemsComponent component = this.getPossiblyDisabledComponent(r.getComponentId());
- if (component != null && component.isEnabled()) {
- r.updateValue(component);
- } else {
- r.updateValue(null);
- }
- });
- }
-
- @Override
- protected void logDebug(Logger log, String message) {
- super.logDebug(log, message);
- }
-
- @Override
- protected void logInfo(Logger log, String message) {
- super.logInfo(log, message);
- }
-
- @Override
- protected void logWarn(Logger log, String message) {
- super.logWarn(log, message);
- }
-
- @Override
- public void buildJsonApiRoutes(JsonApiBuilder builder) {
- builder.handleRequest(GetModbusProtocolRequest.METHOD, def -> {
- def.setGuards(this.componentMissingGuard(), this.componentNoModbusApiGuard());
- }, call -> {
- return new GetModbusProtocolResponse(call.getRequest().getId(), this.records);
- });
- builder.handleRequest(GetModbusProtocolExportXlsxRequest.METHOD, def -> {
- def.setGuards(this.componentMissingGuard(), this.componentNoModbusApiGuard());
- }, call -> {
- return new GetModbusProtocolExportXlsxResponse(call.getRequest().getId(), this.components, this.records);
- });
- }
-
- private JsonrpcEndpointGuard componentMissingGuard() {
- return call -> {
- if (this.getComponentMissingFault().get() == Boolean.TRUE) {
- throw new OpenemsException(this.getComponentMissingFaultChannel().channelDoc().getText());
- }
- };
- }
-
- private JsonrpcEndpointGuard componentNoModbusApiGuard() {
- return call -> {
- if (this.getComponentNoModbusApiFault().get() == Boolean.TRUE) {
- throw new OpenemsException(this.getComponentNoModbusApiFaultChannel().channelDoc().getText());
- }
- };
- }
-
- /**
- * Gets the AccessMode.
- *
- * @return the {@link AccessMode}
- */
- protected abstract AccessMode getAccessMode();
-
- /**
- * Gets the Component. Be aware, that it might be 'disabled'.
- *
- * @param componentId the Component-ID
- *
- * @return the {@link ModbusSlave} Component; possibly null
- */
- protected ModbusSlave getPossiblyDisabledComponent(String componentId) {
- if (componentId == null) {
- return null;
- }
- if (componentId == Meta.SINGLETON_COMPONENT_ID) {
- return this.config.metaComponent;
- }
- return this._components.stream() //
- .filter(c -> componentId.equals(c.id())) //
- .findFirst() //
- .orElse(null);
- }
-
- public static record ConfigRecord(String id, String alias, boolean enabled, Meta metaComponent,
- String[] componentIds, int apiTimeout, int port, int maxConcurrentConnections) {
-
@Override
public boolean equals(Object other) {
- if (this == other) {
- return true;
- }
- if (other == null) {
+ if (!super.equals(other)) {
return false;
}
- if (!(other instanceof ConfigRecord)) {
+ if (!(other instanceof TcpConfig config)) {
return false;
}
- ConfigRecord config = (ConfigRecord) other;
-
- if (config.id.equals(this.id) && config.alias.equals(this.alias) //
- && config.enabled == this.enabled && config.metaComponent.equals(this.metaComponent) //
- && Arrays.equals(config.componentIds, this.componentIds) //
- && config.apiTimeout == this.apiTimeout && config.port == this.port //
- && config.maxConcurrentConnections == this.maxConcurrentConnections) {
- return true;
- }
- return false;
+ return this.port == config.port;
}
- }
- /**
- * Format a given channelAddress to a ChannelId.
- *
- * @param channel WriteChannel
- * @return component_channelId as String
- */
- public static String formatChannelName(WriteChannel channel) {
- return channel.getComponent().id() + "_" + channel.channelId().name();
}
}
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/ModbusTcpApi.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/ModbusApi.java
similarity index 97%
rename from io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/ModbusTcpApi.java
rename to io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/ModbusApi.java
index da838a2d947..c7357b08c1d 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/ModbusTcpApi.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/ModbusApi.java
@@ -7,11 +7,11 @@
import io.openems.edge.common.channel.value.Value;
import io.openems.edge.common.component.OpenemsComponent;
-public interface ModbusTcpApi extends OpenemsComponent {
+public interface ModbusApi extends OpenemsComponent {
public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
UNABLE_TO_START(Doc.of(Level.FAULT) //
- .text("Unable to start Modbus/TCP-Api Server")), //
+ .text("Unable to start ModbusTCP/RTU-Api Server")), //
COMPONENT_NO_MODBUS_API_FAULT(Doc.of(Level.FAULT) //
.text("A configured Component does not support Modbus-API")), //
COMPONENT_MISSING_FAULT(Doc.of(Level.FAULT) //
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/MyProcessImage.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/MyProcessImage.java
index cbc587a8c4f..e155ba3576f 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/MyProcessImage.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/MyProcessImage.java
@@ -19,15 +19,15 @@
import io.openems.edge.common.modbusslave.ModbusRecordUint16Reserved;
/**
- * This implementation answers Modbus-TCP Slave requests.
+ * This implementation answers Modbus-TCP/RTU Slave requests.
*/
public class MyProcessImage implements ProcessImage {
private final Logger log = LoggerFactory.getLogger(MyProcessImage.class);
- protected final AbstractModbusTcpApi parent;
+ protected final AbstractModbusApi parent;
- protected MyProcessImage(AbstractModbusTcpApi parent) {
+ protected MyProcessImage(AbstractModbusApi parent) {
this.parent = parent;
}
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/rtu/Config.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/rtu/Config.java
new file mode 100644
index 00000000000..d2ca0403017
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/rtu/Config.java
@@ -0,0 +1,52 @@
+package io.openems.edge.controller.api.modbus.readonly.rtu;
+
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+
+import io.openems.edge.bridge.modbus.api.Parity;
+import io.openems.edge.bridge.modbus.api.Stopbit;
+import io.openems.edge.controller.api.modbus.AbstractModbusRtuApi;
+
+@ObjectClassDefinition(//
+ name = "Controller Api Modbus/RTU Read-Only", //
+ description = "This controller provides a read-only Modbus/RTU api.")
+@interface Config {
+
+ @AttributeDefinition(name = "Component-ID", description = "Unique ID of this Component")
+ String id() default "ctrlApiModbusRtu0";
+
+ @AttributeDefinition(name = "Alias", description = "Human-readable name of this Component; defaults to Component-ID")
+ String alias() default "ModbusRtu Read-Only";
+
+ @AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
+ boolean enabled() default true;
+
+ @AttributeDefinition(name = "Port-Name", description = "The name of the serial port - e.g. '/dev/ttyUSB0' or 'COM3'")
+ String portName() default "/dev/ttyUSB0";
+
+ @AttributeDefinition(name = "Component-IDs", description = "Components that should be made available via Modbus.")
+ String[] component_ids() default { "_sum" };
+
+ @AttributeDefinition(name = "Api-Timeout", description = "Sets the timeout in seconds for updates on Channels set by this Api.")
+ int apiTimeout() default 60;
+
+ @AttributeDefinition(name = "Max concurrent connections", description = "Sets the maximum number of concurrent connections via Modbus.")
+ int maxConcurrentConnections() default AbstractModbusRtuApi.DEFAULT_MAX_CONCURRENT_CONNECTIONS;
+
+ @AttributeDefinition(name = "Components target filter", description = "This is auto-generated by 'Component-IDs'.")
+ String Component_target() default "(enabled=true)";
+
+ @AttributeDefinition(name = "Baudrate", description = "The baudrate - e.g. 9600, 19200, 38400, 57600 or 115200")
+ int baudRate() default 9600;
+
+ @AttributeDefinition(name = "Databits", description = "The number of databits - e.g. 8")
+ int databits() default 8;
+
+ @AttributeDefinition(name = "Stopbits", description = "The number of stopbits - '1', '1.5' or '2'")
+ Stopbit stopbits() default Stopbit.ONE;
+
+ @AttributeDefinition(name = "Parity", description = "The parity - 'none', 'even', 'odd', 'mark' or 'space'")
+ Parity parity() default Parity.NONE;
+
+ String webconsole_configurationFactory_nameHint() default "Controller Api Modbus/RTU Read-Write [{id}]";
+}
\ No newline at end of file
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/rtu/ControllerApiModbusRtuReadOnly.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/rtu/ControllerApiModbusRtuReadOnly.java
new file mode 100644
index 00000000000..3695fe79585
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/rtu/ControllerApiModbusRtuReadOnly.java
@@ -0,0 +1,23 @@
+package io.openems.edge.controller.api.modbus.readonly.rtu;
+
+import io.openems.edge.common.channel.Doc;
+import io.openems.edge.common.component.OpenemsComponent;
+
+public interface ControllerApiModbusRtuReadOnly extends OpenemsComponent {
+
+ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
+ ;
+
+ private final Doc doc;
+
+ private ChannelId(Doc doc) {
+ this.doc = doc;
+ }
+
+ @Override
+ public Doc doc() {
+ return this.doc;
+ }
+ }
+}
+
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/rtu/ControllerApiModbusRtuReadOnlyImpl.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/rtu/ControllerApiModbusRtuReadOnlyImpl.java
new file mode 100644
index 00000000000..2a6d065a9b1
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/rtu/ControllerApiModbusRtuReadOnlyImpl.java
@@ -0,0 +1,107 @@
+package io.openems.edge.controller.api.modbus.readonly.rtu;
+
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Modified;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
+import org.osgi.service.component.annotations.ReferencePolicyOption;
+import org.osgi.service.metatype.annotations.Designate;
+
+import com.ghgande.j2mod.modbus.Modbus;
+import com.ghgande.j2mod.modbus.ModbusException;
+import com.ghgande.j2mod.modbus.slave.ModbusSlave;
+import com.ghgande.j2mod.modbus.slave.ModbusSlaveFactory;
+import com.ghgande.j2mod.modbus.util.SerialParameters;
+
+import io.openems.common.channel.AccessMode;
+import io.openems.common.exceptions.OpenemsException;
+import io.openems.edge.common.component.OpenemsComponent;
+import io.openems.edge.common.jsonapi.ComponentJsonApi;
+import io.openems.edge.common.meta.Meta;
+import io.openems.edge.controller.api.Controller;
+import io.openems.edge.controller.api.modbus.AbstractModbusRtuApi;
+import io.openems.edge.controller.api.modbus.ModbusApi;
+
+@Designate(ocd = Config.class, factory = true)
+@Component(//
+ name = "Controller.Api.ModbusRtu.ReadOnly", //
+ immediate = true, //
+ configurationPolicy = ConfigurationPolicy.REQUIRE //
+)
+public class ControllerApiModbusRtuReadOnlyImpl extends AbstractModbusRtuApi
+ implements ControllerApiModbusRtuReadOnly, ModbusApi, Controller, OpenemsComponent, ComponentJsonApi {
+
+ @Reference
+ private Meta metaComponent = null;
+
+ @Reference
+ private ConfigurationAdmin cm;
+
+ private RtuConfig config;
+
+ public ControllerApiModbusRtuReadOnlyImpl() {
+ super("Modbus/RTU-Api Read-Only", //
+ OpenemsComponent.ChannelId.values(), //
+ Controller.ChannelId.values(), //
+ ModbusApi.ChannelId.values(), //
+ ControllerApiModbusRtuReadOnly.ChannelId.values() //
+ );
+ }
+
+ @Override
+ @Reference(policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MULTIPLE)
+ protected void addComponent(OpenemsComponent component) {
+ super.addComponent(component);
+ }
+
+ protected void removeComponent(OpenemsComponent component) {
+ super.removeComponent(component);
+ }
+
+ @Activate
+ private void activate(ComponentContext context, Config config) throws OpenemsException {
+ this.config = new RtuConfig(config.id(), config.alias(), config.enabled(), this.metaComponent,
+ config.component_ids(), 0 /* no timeout */, config.portName(), config.baudRate(), config.databits(),
+ config.stopbits(), config.parity(), config.maxConcurrentConnections());
+ super.activate(context, this.cm, this.config);
+ }
+
+ @Modified
+ private void modified(ComponentContext context, Config config) throws OpenemsException {
+ this.config = new RtuConfig(config.id(), config.alias(), config.enabled(), this.metaComponent,
+ config.component_ids(), 0 /* no timeout */, config.portName(), config.baudRate(), config.databits(),
+ config.stopbits(), config.parity(), config.maxConcurrentConnections());
+ super.modified(context, this.cm, this.config);
+ }
+
+ @Override
+ @Deactivate
+ protected void deactivate() {
+ super.deactivate();
+ }
+
+ @Override
+ protected ModbusSlave createSlave() throws ModbusException {
+ SerialParameters params = new SerialParameters();
+ params.setPortName(this.config.portName());
+ params.setBaudRate(this.config.baudRate());
+ params.setDatabits(this.config.databits());
+ params.setStopbits(this.config.stopbits().getValue());
+ params.setParity(this.config.parity().getValue());
+ params.setEncoding(Modbus.SERIAL_ENCODING_RTU);
+ params.setEcho(false);
+ return ModbusSlaveFactory.createSerialSlave(params);
+ }
+
+ @Override
+ protected AccessMode getAccessMode() {
+ return AccessMode.READ_ONLY;
+ }
+
+}
\ No newline at end of file
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/Config.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/tcp/Config.java
similarity index 93%
rename from io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/Config.java
rename to io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/tcp/Config.java
index 56c67020d85..e8947eea421 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/Config.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/tcp/Config.java
@@ -1,4 +1,4 @@
-package io.openems.edge.controller.api.modbus.readonly;
+package io.openems.edge.controller.api.modbus.readonly.tcp;
import org.osgi.service.metatype.annotations.AttributeDefinition;
import org.osgi.service.metatype.annotations.ObjectClassDefinition;
@@ -14,7 +14,7 @@
String id() default "ctrlApiModbusTcp0";
@AttributeDefinition(name = "Alias", description = "Human-readable name of this Component; defaults to Component-ID")
- String alias() default "";
+ String alias() default "ModbusTcp Read-Only";
@AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
boolean enabled() default true;
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnly.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/tcp/ControllerApiModbusTcpReadOnly.java
similarity index 87%
rename from io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnly.java
rename to io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/tcp/ControllerApiModbusTcpReadOnly.java
index 52bb94c3b2e..cb31ba9d8d4 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnly.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/tcp/ControllerApiModbusTcpReadOnly.java
@@ -1,4 +1,4 @@
-package io.openems.edge.controller.api.modbus.readonly;
+package io.openems.edge.controller.api.modbus.readonly.tcp;
import io.openems.edge.common.channel.Doc;
import io.openems.edge.common.component.OpenemsComponent;
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnlyImpl.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/tcp/ControllerApiModbusTcpReadOnlyImpl.java
similarity index 65%
rename from io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnlyImpl.java
rename to io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/tcp/ControllerApiModbusTcpReadOnlyImpl.java
index 01c6e47638a..2f35e4bf4fe 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnlyImpl.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readonly/tcp/ControllerApiModbusTcpReadOnlyImpl.java
@@ -1,4 +1,4 @@
-package io.openems.edge.controller.api.modbus.readonly;
+package io.openems.edge.controller.api.modbus.readonly.tcp;
import java.util.Map.Entry;
import java.util.function.Consumer;
@@ -9,6 +9,7 @@
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.ConfigurationPolicy;
import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Modified;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.osgi.service.component.annotations.ReferencePolicy;
@@ -16,9 +17,13 @@
import org.osgi.service.metatype.annotations.Designate;
import com.ghgande.j2mod.modbus.ModbusException;
+import com.ghgande.j2mod.modbus.slave.ModbusSlave;
+import com.ghgande.j2mod.modbus.slave.ModbusSlaveFactory;
import io.openems.common.channel.AccessMode;
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
import io.openems.common.exceptions.OpenemsException;
+import io.openems.common.utils.FunctionUtils;
import io.openems.edge.common.channel.WriteChannel;
import io.openems.edge.common.component.OpenemsComponent;
import io.openems.edge.common.jsonapi.ComponentJsonApi;
@@ -27,7 +32,7 @@
import io.openems.edge.controller.api.common.Status;
import io.openems.edge.controller.api.common.WriteObject;
import io.openems.edge.controller.api.modbus.AbstractModbusTcpApi;
-import io.openems.edge.controller.api.modbus.ModbusTcpApi;
+import io.openems.edge.controller.api.modbus.ModbusApi;
@Designate(ocd = Config.class, factory = true)
@Component(//
@@ -36,14 +41,16 @@
configurationPolicy = ConfigurationPolicy.REQUIRE //
)
public class ControllerApiModbusTcpReadOnlyImpl extends AbstractModbusTcpApi
- implements ControllerApiModbusTcpReadOnly, ModbusTcpApi, Controller, OpenemsComponent, ComponentJsonApi {
+ implements ControllerApiModbusTcpReadOnly, ModbusApi, Controller, OpenemsComponent, ComponentJsonApi {
- @Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
+ @Reference
private Meta metaComponent = null;
@Reference
private ConfigurationAdmin cm;
+ private TcpConfig config;
+
@Override
@Reference(policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MULTIPLE)
protected void addComponent(OpenemsComponent component) {
@@ -58,16 +65,23 @@ public ControllerApiModbusTcpReadOnlyImpl() {
super("Modbus/TCP-Api Read-Only", //
OpenemsComponent.ChannelId.values(), //
Controller.ChannelId.values(), //
- ModbusTcpApi.ChannelId.values(), //
+ ModbusApi.ChannelId.values(), //
ControllerApiModbusTcpReadOnly.ChannelId.values() //
);
}
@Activate
private void activate(ComponentContext context, Config config) throws ModbusException, OpenemsException {
- super.activate(context, this.cm,
- new ConfigRecord(config.id(), config.alias(), config.enabled(),this.metaComponent, config.component_ids(), 0 /* no timeout */, config.port(),
- config.maxConcurrentConnections()));
+ this.config = new TcpConfig(config.id(), config.alias(), config.enabled(), this.metaComponent,
+ config.component_ids(), 0 /* no timeout */, config.port(), config.maxConcurrentConnections());
+ super.activate(context, this.cm, this.config);
+ }
+
+ @Modified
+ private void modified(ComponentContext context, Config config) throws OpenemsNamedException {
+ this.config = new TcpConfig(config.id(), config.alias(), config.enabled(), this.metaComponent,
+ config.component_ids(), 0 /* no timeout */, config.port(), config.maxConcurrentConnections());
+ super.modified(context, this.cm, this.config);
}
@Override
@@ -83,7 +97,7 @@ protected AccessMode getAccessMode() {
@Override
protected Consumer, WriteObject>> handleWrites() {
- return entry -> { };
+ return FunctionUtils::doNothing;
}
@Override
@@ -92,6 +106,11 @@ protected void setOverrideStatus(Status status) {
@Override
protected Runnable handleTimeouts() {
- return () -> { };
+ return FunctionUtils::doNothing;
+ }
+
+ @Override
+ protected ModbusSlave createSlave() throws ModbusException {
+ return ModbusSlaveFactory.createTCPSlave(this.config.getPort(), this.config.maxConcurrentConnections());
}
}
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/rtu/Config.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/rtu/Config.java
new file mode 100644
index 00000000000..380d24fb662
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/rtu/Config.java
@@ -0,0 +1,52 @@
+package io.openems.edge.controller.api.modbus.readwrite.rtu;
+
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+
+import io.openems.edge.bridge.modbus.api.Parity;
+import io.openems.edge.bridge.modbus.api.Stopbit;
+import io.openems.edge.controller.api.modbus.AbstractModbusRtuApi;
+
+@ObjectClassDefinition(//
+ name = "Controller Api Modbus/RTU Read-Write", //
+ description = "This controller provides a read-write Modbus/RTU api.")
+@interface Config {
+
+ @AttributeDefinition(name = "Component-ID", description = "Unique ID of this Component")
+ String id() default "ctrlApiModbusRtu0";
+
+ @AttributeDefinition(name = "Alias", description = "Human-readable name of this Component; defaults to Component-ID")
+ String alias() default "ModbusRtu Read-Write";
+
+ @AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
+ boolean enabled() default true;
+
+ @AttributeDefinition(name = "Port-Name", description = "The name of the serial port - e.g. '/dev/ttyUSB0' or 'COM3'")
+ String portName() default "/dev/ttyUSB0";
+
+ @AttributeDefinition(name = "Component-IDs", description = "Components that should be made available via Modbus.")
+ String[] component_ids() default { "_sum" };
+
+ @AttributeDefinition(name = "Api-Timeout", description = "Sets the timeout in seconds for updates on Channels set by this Api.")
+ int apiTimeout() default 60;
+
+ @AttributeDefinition(name = "Max concurrent connections", description = "Sets the maximum number of concurrent connections via Modbus.")
+ int maxConcurrentConnections() default AbstractModbusRtuApi.DEFAULT_MAX_CONCURRENT_CONNECTIONS;
+
+ @AttributeDefinition(name = "Components target filter", description = "This is auto-generated by 'Component-IDs'.")
+ String Component_target() default "(enabled=true)";
+
+ @AttributeDefinition(name = "Baudrate", description = "The baudrate - e.g. 9600, 19200, 38400, 57600 or 115200")
+ int baudRate() default 9600;
+
+ @AttributeDefinition(name = "Databits", description = "The number of databits - e.g. 8")
+ int databits() default 8;
+
+ @AttributeDefinition(name = "Stopbits", description = "The number of stopbits - '1', '1.5' or '2'")
+ Stopbit stopbits() default Stopbit.ONE;
+
+ @AttributeDefinition(name = "Parity", description = "The parity - 'none', 'even', 'odd', 'mark' or 'space'")
+ Parity parity() default Parity.NONE;
+
+ String webconsole_configurationFactory_nameHint() default "Controller Api Modbus/RTU Read-Write [{id}]";
+}
\ No newline at end of file
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/rtu/ControllerApiModbusRtuReadWrite.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/rtu/ControllerApiModbusRtuReadWrite.java
new file mode 100644
index 00000000000..85280084c66
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/rtu/ControllerApiModbusRtuReadWrite.java
@@ -0,0 +1,50 @@
+package io.openems.edge.controller.api.modbus.readwrite.rtu;
+
+import io.openems.common.channel.Unit;
+import io.openems.common.types.OpenemsType;
+import io.openems.edge.common.channel.Doc;
+import io.openems.edge.common.channel.StringReadChannel;
+import io.openems.edge.common.component.OpenemsComponent;
+
+public interface ControllerApiModbusRtuReadWrite extends OpenemsComponent {
+
+ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
+ API_WORKER_LOG(Doc.of(OpenemsType.STRING) //
+ .text("Logs Write-Commands via ApiWorker")), //
+ DEBUG_SET_ACTIVE_POWER_EQUALS(Doc.of(OpenemsType.INTEGER) //
+ .unit(Unit.WATT)), //
+ DEBUG_SET_ACTIVE_POWER_GREATER_OR_EQUALS(Doc.of(OpenemsType.INTEGER) //
+ .unit(Unit.WATT)), //
+ DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS(Doc.of(OpenemsType.INTEGER) //
+ .unit(Unit.WATT)), //
+ DEBUG_SET_REACTIVE_POWER_EQUALS(Doc.of(OpenemsType.INTEGER) //
+ .unit(Unit.VOLT_AMPERE_REACTIVE)), //
+ DEBUG_SET_REACTIVE_POWER_GREATER_OR_EQUALS(Doc.of(OpenemsType.INTEGER) //
+ .unit(Unit.VOLT_AMPERE_REACTIVE)), //
+ DEBUG_SET_REACTIVE_POWER_LESS_OR_EQUALS(Doc.of(OpenemsType.INTEGER) //
+ .unit(Unit.VOLT_AMPERE_REACTIVE)), //
+
+ ;
+
+ private final Doc doc;
+
+ private ChannelId(Doc doc) {
+ this.doc = doc;
+ }
+
+ @Override
+ public Doc doc() {
+ return this.doc;
+ }
+ }
+
+ /**
+ * Gets the Channel for {@link ChannelId#API_WORKER_LOG}.
+ *
+ * @return the Channel
+ */
+ public default StringReadChannel getApiWorkerLogChannel() {
+ return this.channel(ChannelId.API_WORKER_LOG);
+ }
+
+}
\ No newline at end of file
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/rtu/ControllerApiModbusRtuReadWriteImpl.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/rtu/ControllerApiModbusRtuReadWriteImpl.java
new file mode 100644
index 00000000000..7cfd34c5840
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/rtu/ControllerApiModbusRtuReadWriteImpl.java
@@ -0,0 +1,141 @@
+package io.openems.edge.controller.api.modbus.readwrite.rtu;
+
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Modified;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
+import org.osgi.service.component.annotations.ReferencePolicyOption;
+import org.osgi.service.metatype.annotations.Designate;
+
+import com.ghgande.j2mod.modbus.Modbus;
+import com.ghgande.j2mod.modbus.ModbusException;
+import com.ghgande.j2mod.modbus.slave.ModbusSlave;
+import com.ghgande.j2mod.modbus.slave.ModbusSlaveFactory;
+import com.ghgande.j2mod.modbus.util.SerialParameters;
+
+import io.openems.common.channel.AccessMode;
+import io.openems.common.exceptions.OpenemsException;
+import io.openems.edge.common.component.ComponentManager;
+import io.openems.edge.common.component.OpenemsComponent;
+import io.openems.edge.common.jsonapi.ComponentJsonApi;
+import io.openems.edge.common.meta.Meta;
+import io.openems.edge.common.modbusslave.ModbusSlaveNatureTable;
+import io.openems.edge.common.modbusslave.ModbusSlaveTable;
+import io.openems.edge.common.modbusslave.ModbusType;
+import io.openems.edge.controller.api.Controller;
+import io.openems.edge.controller.api.modbus.AbstractModbusRtuApi;
+import io.openems.edge.controller.api.modbus.ModbusApi;
+
+@Designate(ocd = Config.class, factory = true)
+@Component(//
+ name = "Controller.Api.ModbusRtu.ReadWrite", //
+ immediate = true, //
+ configurationPolicy = ConfigurationPolicy.REQUIRE //
+)
+public class ControllerApiModbusRtuReadWriteImpl extends AbstractModbusRtuApi
+ implements ControllerApiModbusRtuReadWrite, ModbusApi, Controller, OpenemsComponent, ComponentJsonApi,
+ io.openems.edge.common.modbusslave.ModbusSlave {
+
+ @Reference
+ private Meta metaComponent = null;
+
+ @Reference
+ private ConfigurationAdmin cm;
+
+ private RtuConfig config;
+
+ @Reference
+ private ComponentManager componentManager;
+
+ public ControllerApiModbusRtuReadWriteImpl() {
+ super("Modbus/RTU-Api Read-Write", //
+ OpenemsComponent.ChannelId.values(), //
+ Controller.ChannelId.values(), //
+ ModbusApi.ChannelId.values(), //
+ ControllerApiModbusRtuReadWrite.ChannelId.values() //
+ );
+ this.apiWorker.setLogChannel(this.getApiWorkerLogChannel());
+ }
+
+ @Override
+ @Reference(policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MULTIPLE)
+ protected void addComponent(OpenemsComponent component) {
+ super.addComponent(component);
+ }
+
+ @Override
+ protected void removeComponent(OpenemsComponent component) {
+ super.removeComponent(component);
+ }
+
+ @Activate
+ private void activate(ComponentContext context, Config config) throws OpenemsException {
+ this.config = new RtuConfig(config.id(), config.alias(), config.enabled(), this.metaComponent,
+ config.component_ids(), config.apiTimeout(), config.portName(), config.baudRate(), config.databits(),
+ config.stopbits(), config.parity(), config.maxConcurrentConnections());
+ super.activate(context, this.cm, this.config);
+ }
+
+ @Modified
+ private void modified(ComponentContext context, Config config) throws OpenemsException {
+ this.config = new RtuConfig(config.id(), config.alias(), config.enabled(), this.metaComponent,
+ config.component_ids(), config.apiTimeout(), config.portName(), config.baudRate(), config.databits(),
+ config.stopbits(), config.parity(), config.maxConcurrentConnections());
+ super.modified(context, this.cm, this.config);
+ }
+
+ @Override
+ @Deactivate
+ protected void deactivate() {
+ super.deactivate();
+ }
+
+ @Override
+ protected ModbusSlave createSlave() throws ModbusException {
+ SerialParameters params = new SerialParameters();
+ params.setPortName(this.config.portName());
+ params.setBaudRate(this.config.baudRate());
+ params.setDatabits(this.config.databits());
+ params.setStopbits(this.config.stopbits().getValue());
+ params.setParity(this.config.parity().getValue());
+ params.setEncoding(Modbus.SERIAL_ENCODING_RTU);
+ params.setEcho(false);
+ return ModbusSlaveFactory.createSerialSlave(params);
+ }
+
+ @Override
+ protected AccessMode getAccessMode() {
+ return AccessMode.READ_WRITE;
+ }
+
+ @Override
+ public ModbusSlaveTable getModbusSlaveTable(AccessMode accessMode) {
+ return new ModbusSlaveTable(//
+ OpenemsComponent.getModbusSlaveNatureTable(accessMode), //
+ ModbusSlaveNatureTable.of(ControllerApiModbusRtuReadWrite.class, accessMode, 100) //
+ .channel(0, ModbusApi.ChannelId.UNABLE_TO_START, ModbusType.UINT16) //
+ .channel(1, ModbusApi.ChannelId.COMPONENT_MISSING_FAULT, ModbusType.UINT16) //
+ .channel(2, ModbusApi.ChannelId.PROCESS_IMAGE_FAULT, ModbusType.UINT16) //
+ .channel(3, ModbusApi.ChannelId.COMPONENT_NO_MODBUS_API_FAULT, ModbusType.UINT16) //
+ .channel(4, ControllerApiModbusRtuReadWrite.ChannelId.DEBUG_SET_ACTIVE_POWER_EQUALS,
+ ModbusType.FLOAT32) //
+ .channel(6, ControllerApiModbusRtuReadWrite.ChannelId.DEBUG_SET_ACTIVE_POWER_GREATER_OR_EQUALS,
+ ModbusType.FLOAT32) //
+ .channel(8, ControllerApiModbusRtuReadWrite.ChannelId.DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS,
+ ModbusType.FLOAT32) //
+ .channel(10, ControllerApiModbusRtuReadWrite.ChannelId.DEBUG_SET_REACTIVE_POWER_EQUALS,
+ ModbusType.FLOAT32) //
+ .channel(12,
+ ControllerApiModbusRtuReadWrite.ChannelId.DEBUG_SET_REACTIVE_POWER_GREATER_OR_EQUALS,
+ ModbusType.FLOAT32) //
+ .channel(14, ControllerApiModbusRtuReadWrite.ChannelId.DEBUG_SET_REACTIVE_POWER_LESS_OR_EQUALS,
+ ModbusType.FLOAT32) //
+ .build()); //
+ }
+}
\ No newline at end of file
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/Config.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/tcp/Config.java
similarity index 93%
rename from io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/Config.java
rename to io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/tcp/Config.java
index 0614487de2f..efd08feb754 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/Config.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/tcp/Config.java
@@ -1,4 +1,4 @@
-package io.openems.edge.controller.api.modbus.readwrite;
+package io.openems.edge.controller.api.modbus.readwrite.tcp;
import org.osgi.service.metatype.annotations.AttributeDefinition;
import org.osgi.service.metatype.annotations.ObjectClassDefinition;
@@ -14,7 +14,7 @@
String id() default "ctrlApiModbusTcp0";
@AttributeDefinition(name = "Alias", description = "Human-readable name of this Component; defaults to Component-ID")
- String alias() default "";
+ String alias() default "ModbusTcp Read-Write";
@AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
boolean enabled() default true;
@@ -27,7 +27,7 @@
// TODO: Currently unused
@AttributeDefinition(name = "Read Channel-IDs", description = "Contains the channelnames of all read channels.")
- String[] readChannels() default { };
+ String[] readChannels() default {};
@AttributeDefinition(name = "Write Channel-IDs", description = "Contains the channelnames of all overridden channels.")
String[] writeChannels();
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWrite.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/tcp/ControllerApiModbusTcpReadWrite.java
similarity index 95%
rename from io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWrite.java
rename to io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/tcp/ControllerApiModbusTcpReadWrite.java
index 8a18a1aada2..47e04f0b476 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWrite.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/tcp/ControllerApiModbusTcpReadWrite.java
@@ -1,4 +1,4 @@
-package io.openems.edge.controller.api.modbus.readwrite;
+package io.openems.edge.controller.api.modbus.readwrite.tcp;
import static io.openems.common.channel.PersistencePriority.HIGH;
import static io.openems.common.channel.Unit.CUMULATED_SECONDS;
@@ -16,18 +16,18 @@
public interface ControllerApiModbusTcpReadWrite extends OpenemsComponent {
public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
-
+
OVERRIDE_STATUS(Doc.of(Status.values()) //
.persistencePriority(PersistencePriority.HIGH)), //
-
+
CUMULATED_ACTIVE_TIME(Doc.of(LONG)//
.unit(CUMULATED_SECONDS) //
.persistencePriority(HIGH)), //
-
+
CUMULATED_INACTIVE_TIME(Doc.of(LONG)//
.unit(CUMULATED_SECONDS) //
.persistencePriority(HIGH)), //
-
+
API_WORKER_LOG(Doc.of(OpenemsType.STRING) //
.text("Logs Write-Commands via ApiWorker")); //
@@ -71,7 +71,8 @@ public default Status getOverrideStatus() {
}
/**
- * Internal method to set the 'nextValue' on {@link ChannelId#OVERRIDE_STATUS} Channel.
+ * Internal method to set the 'nextValue' on {@link ChannelId#OVERRIDE_STATUS}
+ * Channel.
*
* @param value the next value
*/
diff --git a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWriteImpl.java b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/tcp/ControllerApiModbusTcpReadWriteImpl.java
similarity index 86%
rename from io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWriteImpl.java
rename to io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/tcp/ControllerApiModbusTcpReadWriteImpl.java
index 6f1a47ad49c..6aff04589ce 100644
--- a/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWriteImpl.java
+++ b/io.openems.edge.controller.api.modbus/src/io/openems/edge/controller/api/modbus/readwrite/tcp/ControllerApiModbusTcpReadWriteImpl.java
@@ -1,4 +1,4 @@
-package io.openems.edge.controller.api.modbus.readwrite;
+package io.openems.edge.controller.api.modbus.readwrite.tcp;
import static io.openems.edge.common.channel.ChannelId.channelIdCamelToUpper;
import static io.openems.edge.common.channel.ChannelId.channelIdUpperToCamel;
@@ -27,6 +27,7 @@
import org.slf4j.LoggerFactory;
import com.ghgande.j2mod.modbus.ModbusException;
+import com.ghgande.j2mod.modbus.slave.ModbusSlaveFactory;
import io.openems.common.channel.AccessMode;
import io.openems.common.channel.PersistencePriority;
@@ -48,7 +49,7 @@
import io.openems.edge.controller.api.common.Status;
import io.openems.edge.controller.api.common.WriteObject;
import io.openems.edge.controller.api.modbus.AbstractModbusTcpApi;
-import io.openems.edge.controller.api.modbus.ModbusTcpApi;
+import io.openems.edge.controller.api.modbus.ModbusApi;
import io.openems.edge.ess.api.ManagedSymmetricEss;
import io.openems.edge.timedata.api.Timedata;
import io.openems.edge.timedata.api.TimedataProvider;
@@ -61,7 +62,7 @@
configurationPolicy = ConfigurationPolicy.REQUIRE //
)
public class ControllerApiModbusTcpReadWriteImpl extends AbstractModbusTcpApi
- implements ControllerApiModbusTcpReadWrite, ModbusTcpApi, Controller, OpenemsComponent, ComponentJsonApi,
+ implements ControllerApiModbusTcpReadWrite, ModbusApi, Controller, OpenemsComponent, ComponentJsonApi,
TimedataProvider, ModbusSlave {
private final Logger log = LoggerFactory.getLogger(ControllerApiModbusTcpReadWriteImpl.class);
@@ -76,12 +77,14 @@ public class ControllerApiModbusTcpReadWriteImpl extends AbstractModbusTcpApi
private List components = new ArrayList<>();
+ private TcpConfig config;
+
private boolean isActive = false;
@Reference(policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.OPTIONAL)
private volatile Timedata timedata = null;
- @Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
+ @Reference
private Meta metaComponent = null;
@Reference
@@ -107,7 +110,7 @@ public ControllerApiModbusTcpReadWriteImpl() {
super("Modbus/TCP-Api Read-Write", //
OpenemsComponent.ChannelId.values(), //
Controller.ChannelId.values(), //
- ModbusTcpApi.ChannelId.values(), //
+ ModbusApi.ChannelId.values(), //
ControllerApiModbusTcpReadWrite.ChannelId.values() //
);
this.apiWorker.setLogChannel(this.getApiWorkerLogChannel());
@@ -115,17 +118,17 @@ public ControllerApiModbusTcpReadWriteImpl() {
@Activate
private void activate(ComponentContext context, Config config) throws ModbusException, OpenemsException {
- super.activate(context, this.cm,
- new ConfigRecord(config.id(), config.alias(), config.enabled(), this.metaComponent,
- config.component_ids(), config.apiTimeout(), config.port(), config.maxConcurrentConnections()));
+ this.config = new TcpConfig(config.id(), config.alias(), config.enabled(), this.metaComponent,
+ config.component_ids(), config.apiTimeout(), config.port(), config.maxConcurrentConnections());
+ super.activate(context, this.cm, this.config);
this.applyConfig(config);
}
@Modified
private void modified(ComponentContext context, Config config) throws OpenemsNamedException {
- super.modified(context, this.cm,
- new ConfigRecord(config.id(), config.alias(), config.enabled(), this.metaComponent,
- config.component_ids(), config.apiTimeout(), config.port(), config.maxConcurrentConnections()));
+ this.config = new TcpConfig(config.id(), config.alias(), config.enabled(), this.metaComponent,
+ config.component_ids(), config.apiTimeout(), config.port(), config.maxConcurrentConnections());
+ super.modified(context, this.cm, this.config);
this.applyConfig(config);
}
@@ -245,14 +248,18 @@ protected Integer getChannelValue(String componentId, io.openems.edge.common.cha
public ModbusSlaveTable getModbusSlaveTable(AccessMode accessMode) {
return new ModbusSlaveTable(//
OpenemsComponent.getModbusSlaveNatureTable(AccessMode.READ_ONLY),
- ModbusSlaveNatureTable.of(ControllerApiModbusTcpReadWriteImpl.class, AccessMode.READ_ONLY, 300)
- .cycleValue(0, this.id() + "/ Ess0ActivePowerLimit", Unit.WATT, "", ModbusType.FLOAT32,
+ ModbusSlaveNatureTable.of(ControllerApiModbusTcpReadWrite.class, AccessMode.READ_ONLY, 300)
+ .cycleValue(0, this.id() + "/Ess0ActivePowerLimit", Unit.WATT, "", ModbusType.FLOAT32,
t -> this.getChannelValue("ess0",
ManagedSymmetricEss.ChannelId.SET_ACTIVE_POWER_EQUALS))
- .cycleValue(2, this.id() + "/Ess0ReactivePowerLimit", Unit.WATT, "", ModbusType.FLOAT32,
- t -> this.getChannelValue("ess0",
+ .cycleValue(2, this.id() + "/Ess0ReactivePowerLimit", Unit.VOLT_AMPERE_REACTIVE, "",
+ ModbusType.FLOAT32, t -> this.getChannelValue("ess0",
ManagedSymmetricEss.ChannelId.SET_REACTIVE_POWER_EQUALS))
.build());
}
+ @Override
+ protected com.ghgande.j2mod.modbus.slave.ModbusSlave createSlave() throws ModbusException {
+ return ModbusSlaveFactory.createTCPSlave(this.config.getPort(), this.config.maxConcurrentConnections());
+ }
}
diff --git a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/rtu/ControllerApiModbusRtuReadOnlyImplTest.java b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/rtu/ControllerApiModbusRtuReadOnlyImplTest.java
new file mode 100644
index 00000000000..c183e8f9529
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/rtu/ControllerApiModbusRtuReadOnlyImplTest.java
@@ -0,0 +1,32 @@
+package io.openems.edge.controller.api.modbus.readonly.rtu;
+
+import org.junit.Test;
+
+import io.openems.edge.bridge.modbus.api.Parity;
+import io.openems.edge.bridge.modbus.api.Stopbit;
+import io.openems.edge.common.test.AbstractComponentTest.TestCase;
+import io.openems.edge.common.test.DummyConfigurationAdmin;
+import io.openems.edge.controller.test.ControllerTest;
+
+public class ControllerApiModbusRtuReadOnlyImplTest {
+
+ private static final String CTRL_ID = "ctrl0";
+
+ @Test
+ public void test() throws Exception {
+ new ControllerTest(new ControllerApiModbusRtuReadOnlyImpl()) //
+ .addReference("cm", new DummyConfigurationAdmin()) //
+ .activate(MyConfig.create() //
+ .setId(CTRL_ID) //
+ .setEnabled(false) // do not actually start server
+ .setParity(Parity.NONE)
+ .setStopbit(Stopbit.ONE)
+ .setBaudrate(9600) //
+ .setComponentIds() //
+ .setMaxConcurrentConnections(5) //
+ .setPortName("/dev/ttyUSB0") //
+ .build()) //
+ .next(new TestCase()) //
+ ;
+ }
+}
diff --git a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/rtu/MyConfig.java b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/rtu/MyConfig.java
new file mode 100644
index 00000000000..4eef1319428
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/rtu/MyConfig.java
@@ -0,0 +1,147 @@
+package io.openems.edge.controller.api.modbus.readonly.rtu;
+
+import io.openems.common.test.AbstractComponentConfig;
+import io.openems.common.utils.ConfigUtils;
+import io.openems.edge.bridge.modbus.api.Parity;
+import io.openems.edge.bridge.modbus.api.Stopbit;
+
+@SuppressWarnings("all")
+public class MyConfig extends AbstractComponentConfig implements Config {
+
+ protected static class Builder {
+ private String id;
+ private boolean enabled;
+ private String portName;
+ private String[] componentIds;
+ private int baudrate;
+ private int databits;
+ private Stopbit stopbit;
+ private Parity parity;
+ private int apiTimeout;
+ private int maxConcurrentConnections;
+
+ private Builder() {
+ }
+
+ public Builder setId(String id) {
+ this.id = id;
+ return this;
+ }
+
+ public Builder setEnabled(boolean enabled) {
+ this.enabled = enabled;
+ return this;
+ }
+
+ public Builder setPortName(String portName) {
+ this.portName = portName;
+ return this;
+ }
+
+ public Builder setComponentIds(String... componentIds) {
+ this.componentIds = componentIds;
+ return this;
+ }
+
+ public Builder setMaxConcurrentConnections(int maxConcurrentConnections) {
+ this.maxConcurrentConnections = maxConcurrentConnections;
+ return this;
+ }
+
+ public Builder setBaudrate(int baudrate) {
+ this.baudrate = baudrate;
+ return this;
+ }
+
+ public Builder setDatabits(int databits) {
+ this.databits = databits;
+ return this;
+ }
+
+ public Builder setStopbit(Stopbit stopbit) {
+ this.stopbit = stopbit;
+ return this;
+ }
+
+ public Builder setParity(Parity parity) {
+ this.parity = parity;
+ return this;
+ }
+
+ public Builder setApiTimeout(int apiTimeout) {
+ this.apiTimeout = apiTimeout;
+ return this;
+ }
+
+ public MyConfig build() {
+ return new MyConfig(this);
+ }
+ }
+
+ /**
+ * Create a Config builder.
+ *
+ * @return a {@link Builder}
+ */
+ public static Builder create() {
+ return new Builder();
+ }
+
+ private final Builder builder;
+
+ private MyConfig(Builder builder) {
+ super(Config.class, builder.id);
+ this.builder = builder;
+ }
+
+ @Override
+ public boolean enabled() {
+ return this.builder.enabled;
+ }
+
+ @Override
+ public String portName() {
+ return this.builder.portName;
+ }
+
+ @Override
+ public int apiTimeout() {
+ return this.builder.apiTimeout;
+ }
+
+ @Override
+ public int baudRate() {
+ return this.builder.baudrate;
+ }
+
+ @Override
+ public int databits() {
+ return this.builder.baudrate;
+ }
+
+ @Override
+ public Stopbit stopbits() {
+ return this.builder.stopbit;
+ }
+
+ @Override
+ public Parity parity() {
+ return this.builder.parity;
+ }
+
+ @Override
+ public String[] component_ids() {
+ return this.builder.componentIds;
+ }
+
+ @Override
+ public int maxConcurrentConnections() {
+ return this.builder.maxConcurrentConnections;
+ }
+
+ @Override
+ public String Component_target() {
+ return ConfigUtils.generateReferenceTargetFilter(this.id(), false, this.component_ids());
+ }
+
+}
\ No newline at end of file
diff --git a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnlyImplTest.java b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/tcp/ControllerApiModbusTcpReadOnlyImplTest.java
similarity index 93%
rename from io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnlyImplTest.java
rename to io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/tcp/ControllerApiModbusTcpReadOnlyImplTest.java
index 6248a9b4e41..dc90cfccd44 100644
--- a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/ControllerApiModbusTcpReadOnlyImplTest.java
+++ b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/tcp/ControllerApiModbusTcpReadOnlyImplTest.java
@@ -1,4 +1,4 @@
-package io.openems.edge.controller.api.modbus.readonly;
+package io.openems.edge.controller.api.modbus.readonly.tcp;
import static io.openems.edge.controller.api.modbus.AbstractModbusTcpApi.DEFAULT_PORT;
diff --git a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/MyConfig.java b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/tcp/MyConfig.java
similarity index 96%
rename from io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/MyConfig.java
rename to io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/tcp/MyConfig.java
index 0b9618e3806..428f8b1dd1e 100644
--- a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/MyConfig.java
+++ b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readonly/tcp/MyConfig.java
@@ -1,4 +1,4 @@
-package io.openems.edge.controller.api.modbus.readonly;
+package io.openems.edge.controller.api.modbus.readonly.tcp;
import io.openems.common.test.AbstractComponentConfig;
import io.openems.common.utils.ConfigUtils;
diff --git a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/rtu/ControllerApiModbusRtuReadWriteImplTest.java b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/rtu/ControllerApiModbusRtuReadWriteImplTest.java
new file mode 100644
index 00000000000..26dc37018c0
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/rtu/ControllerApiModbusRtuReadWriteImplTest.java
@@ -0,0 +1,30 @@
+package io.openems.edge.controller.api.modbus.readwrite.rtu;
+
+import org.junit.Test;
+
+import io.openems.edge.bridge.modbus.api.Parity;
+import io.openems.edge.bridge.modbus.api.Stopbit;
+import io.openems.edge.common.test.AbstractComponentTest.TestCase;
+import io.openems.edge.common.test.DummyConfigurationAdmin;
+import io.openems.edge.controller.test.ControllerTest;
+
+public class ControllerApiModbusRtuReadWriteImplTest {
+
+ private static final String CTRL_ID = "ctrl0";
+
+ @Test
+ public void test() throws Exception {
+ new ControllerTest(new ControllerApiModbusRtuReadWriteImpl()) //
+ .addReference("cm", new DummyConfigurationAdmin()) //
+ .activate(MyConfig.create() //
+ .setId(CTRL_ID) //
+ .setEnabled(false) // do not actually start server
+ .setParity(Parity.NONE).setStopbit(Stopbit.ONE).setBaudrate(9600) //
+ .setComponentIds() //
+ .setMaxConcurrentConnections(5) //
+ .setPortName("/dev/ttyUSB0") //
+ .build()) //
+ .next(new TestCase()) //
+ ;
+ }
+}
diff --git a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/rtu/MyConfig.java b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/rtu/MyConfig.java
new file mode 100644
index 00000000000..6f28ca0db52
--- /dev/null
+++ b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/rtu/MyConfig.java
@@ -0,0 +1,147 @@
+package io.openems.edge.controller.api.modbus.readwrite.rtu;
+
+import io.openems.common.test.AbstractComponentConfig;
+import io.openems.common.utils.ConfigUtils;
+import io.openems.edge.bridge.modbus.api.Parity;
+import io.openems.edge.bridge.modbus.api.Stopbit;
+
+@SuppressWarnings("all")
+public class MyConfig extends AbstractComponentConfig implements Config {
+
+ protected static class Builder {
+ private String id;
+ private boolean enabled;
+ private String portName;
+ private String[] componentIds;
+ private int baudrate;
+ private int databits;
+ private Stopbit stopbit;
+ private Parity parity;
+ private int apiTimeout;
+ private int maxConcurrentConnections;
+
+ private Builder() {
+ }
+
+ public Builder setId(String id) {
+ this.id = id;
+ return this;
+ }
+
+ public Builder setEnabled(boolean enabled) {
+ this.enabled = enabled;
+ return this;
+ }
+
+ public Builder setPortName(String portName) {
+ this.portName = portName;
+ return this;
+ }
+
+ public Builder setComponentIds(String... componentIds) {
+ this.componentIds = componentIds;
+ return this;
+ }
+
+ public Builder setMaxConcurrentConnections(int maxConcurrentConnections) {
+ this.maxConcurrentConnections = maxConcurrentConnections;
+ return this;
+ }
+
+ public Builder setBaudrate(int baudrate) {
+ this.baudrate = baudrate;
+ return this;
+ }
+
+ public Builder setDatabits(int databits) {
+ this.databits = databits;
+ return this;
+ }
+
+ public Builder setStopbit(Stopbit stopbit) {
+ this.stopbit = stopbit;
+ return this;
+ }
+
+ public Builder setParity(Parity parity) {
+ this.parity = parity;
+ return this;
+ }
+
+ public Builder setApiTimeout(int apiTimeout) {
+ this.apiTimeout = apiTimeout;
+ return this;
+ }
+
+ public MyConfig build() {
+ return new MyConfig(this);
+ }
+ }
+
+ /**
+ * Create a Config builder.
+ *
+ * @return a {@link Builder}
+ */
+ public static Builder create() {
+ return new Builder();
+ }
+
+ private final Builder builder;
+
+ private MyConfig(Builder builder) {
+ super(Config.class, builder.id);
+ this.builder = builder;
+ }
+
+ @Override
+ public boolean enabled() {
+ return this.builder.enabled;
+ }
+
+ @Override
+ public String portName() {
+ return this.builder.portName;
+ }
+
+ @Override
+ public int apiTimeout() {
+ return this.builder.apiTimeout;
+ }
+
+ @Override
+ public int baudRate() {
+ return this.builder.baudrate;
+ }
+
+ @Override
+ public int databits() {
+ return this.builder.baudrate;
+ }
+
+ @Override
+ public Stopbit stopbits() {
+ return this.builder.stopbit;
+ }
+
+ @Override
+ public Parity parity() {
+ return this.builder.parity;
+ }
+
+ @Override
+ public String[] component_ids() {
+ return this.builder.componentIds;
+ }
+
+ @Override
+ public int maxConcurrentConnections() {
+ return this.builder.maxConcurrentConnections;
+ }
+
+ @Override
+ public String Component_target() {
+ return ConfigUtils.generateReferenceTargetFilter(this.id(), false, this.component_ids());
+ }
+
+}
\ No newline at end of file
diff --git a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWriteImplTest.java b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/tcp/ControllerApiModbusTcpReadWriteImplTest.java
similarity index 72%
rename from io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWriteImplTest.java
rename to io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/tcp/ControllerApiModbusTcpReadWriteImplTest.java
index f87124a5295..7ca3f80aaaa 100644
--- a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/ControllerApiModbusTcpReadWriteImplTest.java
+++ b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/tcp/ControllerApiModbusTcpReadWriteImplTest.java
@@ -1,8 +1,8 @@
-package io.openems.edge.controller.api.modbus.readwrite;
+package io.openems.edge.controller.api.modbus.readwrite.tcp;
import static io.openems.edge.controller.api.modbus.AbstractModbusTcpApi.DEFAULT_PORT;
-import static io.openems.edge.controller.api.modbus.readwrite.ControllerApiModbusTcpReadWriteImpl.getChannelNameCamel;
-import static io.openems.edge.controller.api.modbus.readwrite.ControllerApiModbusTcpReadWriteImpl.getChannelNameUpper;
+import static io.openems.edge.controller.api.modbus.readwrite.tcp.ControllerApiModbusTcpReadWriteImpl.getChannelNameCamel;
+import static io.openems.edge.controller.api.modbus.readwrite.tcp.ControllerApiModbusTcpReadWriteImpl.getChannelNameUpper;
import static io.openems.edge.ess.api.ManagedSymmetricEss.ChannelId.SET_ACTIVE_POWER_EQUALS;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -53,13 +53,17 @@ public void testAddFalseComponents() throws Exception {
@Test
public void testGetChannelNameUpper() {
- assertEquals("ESS0_SET_ACTIVE_POWER_EQUALS", getChannelNameUpper("ess0", SET_ACTIVE_POWER_EQUALS));
- assertEquals("ESS0_SET_ACTIVE_POWER_EQUALS", getChannelNameUpper("Ess0", SET_ACTIVE_POWER_EQUALS));
+ assertEquals("ESS0_SET_ACTIVE_POWER_EQUALS",
+ getChannelNameUpper("ess0", SET_ACTIVE_POWER_EQUALS));
+ assertEquals("ESS0_SET_ACTIVE_POWER_EQUALS",
+ getChannelNameUpper("Ess0", SET_ACTIVE_POWER_EQUALS));
}
@Test
public void testGetChannelNameCamel() {
- assertEquals("Ess0SetActivePowerEquals", getChannelNameCamel("ess0", SET_ACTIVE_POWER_EQUALS));
- assertEquals("Ess0SetActivePowerEquals", getChannelNameCamel("Ess0", SET_ACTIVE_POWER_EQUALS));
+ assertEquals("Ess0SetActivePowerEquals",
+ getChannelNameCamel("ess0", SET_ACTIVE_POWER_EQUALS));
+ assertEquals("Ess0SetActivePowerEquals",
+ getChannelNameCamel("Ess0", SET_ACTIVE_POWER_EQUALS));
}
}
diff --git a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/MyConfig.java b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/tcp/MyConfig.java
similarity index 97%
rename from io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/MyConfig.java
rename to io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/tcp/MyConfig.java
index dfbd3ea52b8..6a6a40a630a 100644
--- a/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/MyConfig.java
+++ b/io.openems.edge.controller.api.modbus/test/io/openems/edge/controller/api/modbus/readwrite/tcp/MyConfig.java
@@ -1,4 +1,4 @@
-package io.openems.edge.controller.api.modbus.readwrite;
+package io.openems.edge.controller.api.modbus.readwrite.tcp;
import io.openems.common.test.AbstractComponentConfig;
import io.openems.common.utils.ConfigUtils;
@@ -18,12 +18,12 @@ protected static class Builder {
private Builder() {
}
-
+
public Builder setWriteChannels(String... writeChannels) {
this.writeChannels = writeChannels;
return this;
}
-
+
public Builder setReadChannels(String... readChannels) {
this.readChannels = readChannels;
return this;
diff --git a/io.openems.edge.controller.api.mqtt/src/io/openems/edge/controller/api/mqtt/MqttUtils.java b/io.openems.edge.controller.api.mqtt/src/io/openems/edge/controller/api/mqtt/MqttUtils.java
index f245063471a..b208a16b28e 100644
--- a/io.openems.edge.controller.api.mqtt/src/io/openems/edge/controller/api/mqtt/MqttUtils.java
+++ b/io.openems.edge.controller.api.mqtt/src/io/openems/edge/controller/api/mqtt/MqttUtils.java
@@ -115,22 +115,15 @@ private static X509Certificate loadCertificate(String cert) throws IOException,
*/
private static PrivateKey loadPrivateKey(String privateKey)
throws IOException, NoSuchAlgorithmException, InvalidKeySpecException {
- try (PEMParser pemParser = new PEMParser(
- new InputStreamReader(new ByteArrayInputStream(privateKey.getBytes())))) {
- Object obj = pemParser.readObject();
- if (obj instanceof PEMKeyPair) {
- // Handle RSA private key
- PEMKeyPair pemKeyPair = (PEMKeyPair) obj;
- JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider("BC");
- return converter.getPrivateKey(pemKeyPair.getPrivateKeyInfo());
- } else if (obj instanceof PrivateKeyInfo) {
- // Handle other private key formats
- PrivateKeyInfo privateKeyInfo = (PrivateKeyInfo) obj;
- JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider("BC");
- return converter.getPrivateKey(privateKeyInfo);
- } else {
- throw new InvalidKeySpecException("Invalid private key format");
- }
+ try (var pemParser = new PEMParser(new InputStreamReader(new ByteArrayInputStream(privateKey.getBytes())))) {
+ var converter = new JcaPEMKeyConverter().setProvider("BC");
+ return switch (pemParser.readObject()) {
+ case PEMKeyPair pemKeyPair // Handle RSA private key
+ -> converter.getPrivateKey(pemKeyPair.getPrivateKeyInfo());
+ case PrivateKeyInfo privateKeyInfo // Handle other private key formats
+ -> converter.getPrivateKey(privateKeyInfo);
+ default -> throw new InvalidKeySpecException("Invalid private key format");
+ };
}
}
}
\ No newline at end of file
diff --git a/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/RestHandler.java b/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/RestHandler.java
index 1819afa7696..9fa0a35258b 100644
--- a/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/RestHandler.java
+++ b/io.openems.edge.controller.api.rest/src/io/openems/edge/controller/api/rest/RestHandler.java
@@ -148,13 +148,12 @@ private boolean handleRest(User user, List targets, Request baseRequest,
var thisTarget = targets.get(0);
var remainingTargets = targets.subList(1, targets.size());
- switch (thisTarget) {
- case "channel":
- return this.handleChannel(user, remainingTargets, baseRequest, request, response);
-
- default:
- throw new OpenemsException("Unhandled REST target [" + thisTarget + "]");
- }
+ return switch (thisTarget) {
+ case "channel"//
+ -> this.handleChannel(user, remainingTargets, baseRequest, request, response);
+ default //
+ -> throw new OpenemsException("Unhandled REST target [" + thisTarget + "]");
+ };
}
private boolean handleChannel(User user, List targets, Request baseRequest, HttpServletRequest request,
@@ -167,23 +166,21 @@ private boolean handleChannel(User user, List targets, Request baseReque
var channelAddress = new ChannelAddress(targets.get(0), targets.get(1));
// call handler methods
- switch (request.getMethod()) {
- case "GET":
- return this.handleGet(user, channelAddress, baseRequest, request, response);
-
- case "POST":
- // Validate API Access-Mode
- switch (this.parent.getAccessMode()) {
- case READ_ONLY:
- throw new OpenemsException("REST-Api is in Read-Only mode");
- case READ_WRITE:
- case WRITE_ONLY:
- return this.handlePost(user, channelAddress, baseRequest, request, response);
- }
-
- default:
- throw new OpenemsException("Unhandled REST Channel request method [" + request.getMethod() + "]");
- }
+ return switch (request.getMethod()) {
+ case "GET" //
+ -> this.handleGet(user, channelAddress, baseRequest, request, response);
+
+ case "POST" //
+ -> switch (this.parent.getAccessMode()) {
+ case READ_ONLY //
+ -> throw new OpenemsException("REST-Api is in Read-Only mode");
+ case READ_WRITE, WRITE_ONLY //
+ -> this.handlePost(user, channelAddress, baseRequest, request, response);
+ };
+
+ default //
+ -> throw new OpenemsException("Unhandled REST Channel request method [" + request.getMethod() + "]");
+ };
}
/**
@@ -271,19 +268,20 @@ private void sendErrorResponse(Request baseRequest, HttpServletResponse response
response.setContentType("application/json");
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
baseRequest.setHandled(true);
- JsonrpcResponseError message;
- if (ex instanceof OpenemsNamedException) {
+ var message = switch (ex) {
+ case OpenemsNamedException one -> {
// Check for authentication error and set more specific response code
// accordingly
- if (((OpenemsNamedException) ex).getError() == OpenemsError.COMMON_AUTHENTICATION_FAILED) {
+ if (one.getError() == OpenemsError.COMMON_AUTHENTICATION_FAILED) {
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
}
// Get Named Exception error response
- message = new JsonrpcResponseError(jsonrpcId, (OpenemsNamedException) ex);
- } else {
- // Get GENERIC error response
- message = new JsonrpcResponseError(jsonrpcId, ex.getMessage());
+ yield new JsonrpcResponseError(jsonrpcId, one);
}
+ default ->
+ // Get GENERIC error response
+ new JsonrpcResponseError(jsonrpcId, ex.getMessage());
+ };
response.getWriter().write(message.toString());
} catch (IOException e) {
this.parent.logWarn(this.log, "Unable to send Error-Response: " + e.getMessage());
@@ -411,10 +409,9 @@ private void handleJsonRpc(User user, Request baseRequest, HttpServletRequest ht
// parse JSON-RPC Request
var message = JsonrpcMessage.from(json);
- if (!(message instanceof JsonrpcRequest)) {
+ if (!(message instanceof JsonrpcRequest request)) {
throw new OpenemsException("Only JSON-RPC Request is supported here.");
}
- var request = (JsonrpcRequest) message;
requestId = request.getId();
// handle the request
diff --git a/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readonly/ControllerApiRestReadOnlyImplTest.java b/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readonly/ControllerApiRestReadOnlyImplTest.java
index 04c9d124dd6..6c93e76983e 100644
--- a/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readonly/ControllerApiRestReadOnlyImplTest.java
+++ b/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readonly/ControllerApiRestReadOnlyImplTest.java
@@ -1,11 +1,12 @@
package io.openems.edge.controller.api.rest.readonly;
+import static io.openems.common.test.TestUtils.findRandomOpenPortOnAllLocalInterfaces;
+
import org.junit.Test;
import io.openems.common.exceptions.OpenemsException;
import io.openems.edge.common.test.DummyComponentManager;
import io.openems.edge.common.test.DummyUserService;
-import io.openems.edge.common.test.TestUtils;
import io.openems.edge.controller.api.rest.DummyJsonRpcRestHandlerFactory;
import io.openems.edge.controller.api.rest.JsonRpcRestHandler;
import io.openems.edge.controller.test.ControllerTest;
@@ -14,7 +15,7 @@ public class ControllerApiRestReadOnlyImplTest {
@Test
public void test() throws OpenemsException, Exception {
- final var port = TestUtils.findRandomOpenPortOnAllLocalInterfaces();
+ final var port = findRandomOpenPortOnAllLocalInterfaces();
new ControllerTest(new ControllerApiRestReadOnlyImpl()) //
.addReference("componentManager", new DummyComponentManager()) //
diff --git a/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/ControllerApiRestReadWriteImplTest.java b/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/ControllerApiRestReadWriteImplTest.java
index eaaf3fae866..29c3f530886 100644
--- a/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/ControllerApiRestReadWriteImplTest.java
+++ b/io.openems.edge.controller.api.rest/test/io/openems/edge/controller/api/rest/readwrite/ControllerApiRestReadWriteImplTest.java
@@ -1,5 +1,6 @@
package io.openems.edge.controller.api.rest.readwrite;
+import static io.openems.common.test.TestUtils.findRandomOpenPortOnAllLocalInterfaces;
import static io.openems.common.utils.JsonUtils.getAsJsonObject;
import static io.openems.edge.common.test.DummyUser.DUMMY_ADMIN;
import static io.openems.edge.common.test.DummyUser.DUMMY_GUEST;
@@ -54,7 +55,7 @@ public class ControllerApiRestReadWriteImplTest {
@Test
public void test() throws OpenemsException, Exception {
- final var port = TestUtils.findRandomOpenPortOnAllLocalInterfaces();
+ final var port = findRandomOpenPortOnAllLocalInterfaces();
final var componentManager = new DummyComponentManager();
diff --git a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/handler/EdgeRequestHandler.java b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/handler/EdgeRequestHandler.java
index 45234bfaa4f..d47cecfd29b 100644
--- a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/handler/EdgeRequestHandler.java
+++ b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/handler/EdgeRequestHandler.java
@@ -31,7 +31,8 @@ public void buildJsonApiRoutes(JsonApiBuilder builder) {
return new GetEdgeResponse(call.getRequest().getId(), Utils.getEdgeMetadata(user.getGlobalRole()));
});
- builder.handleRequest(SubscribeEdgesRequest.METHOD, call -> new GenericJsonrpcResponseSuccess(call.getRequest().getId()));
+ builder.handleRequest(SubscribeEdgesRequest.METHOD,
+ call -> new GenericJsonrpcResponseSuccess(call.getRequest().getId()));
}
}
diff --git a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/handler/EdgeRpcRequestHandler.java b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/handler/EdgeRpcRequestHandler.java
index 8aa5e780c95..aea61333a15 100644
--- a/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/handler/EdgeRpcRequestHandler.java
+++ b/io.openems.edge.controller.api.websocket/src/io/openems/edge/controller/api/websocket/handler/EdgeRpcRequestHandler.java
@@ -45,14 +45,18 @@ public void buildJsonApiRoutes(JsonApiBuilder builder) {
}, call -> {
return EdgeRpcRequest.from(call.getRequest()).getPayload();
+
}, b -> {
return this.binder.getJsonApiBuilder();
+
}, response -> {
// wrap response in a EdgeRpcResponse if successful
- if (response instanceof JsonrpcResponseSuccess success) {
- return new EdgeRpcResponse(response.getId(), success);
- }
- return response;
+ return switch (response) {
+ case JsonrpcResponseSuccess success //
+ -> new EdgeRpcResponse(response.getId(), success);
+ default -> response;
+ };
+
}, () -> {
final var subrequest = new Subrequest(JsonUtils.buildJsonObject() //
.addProperty("edgeId", ControllerApiWebsocket.EDGE_ID) //
diff --git a/io.openems.edge.controller.chp.soc/src/io/openems/edge/controller/chp/soc/ControllerChpSocImpl.java b/io.openems.edge.controller.chp.soc/src/io/openems/edge/controller/chp/soc/ControllerChpSocImpl.java
index 8affca4f438..85016e592d4 100644
--- a/io.openems.edge.controller.chp.soc/src/io/openems/edge/controller/chp/soc/ControllerChpSocImpl.java
+++ b/io.openems.edge.controller.chp.soc/src/io/openems/edge/controller/chp/soc/ControllerChpSocImpl.java
@@ -90,21 +90,20 @@ protected void deactivate() {
public void run() throws OpenemsNamedException {
boolean modeChanged;
do {
- modeChanged = false;
- switch (this.mode) {
- case MANUAL_ON:
+ modeChanged = switch (this.mode) {
+ case MANUAL_ON -> {
this.setOutput(true);
- modeChanged = this.changeMode(Mode.MANUAL_ON);
- break;
- case MANUAL_OFF:
+ yield this.changeMode(Mode.MANUAL_ON);
+ }
+ case MANUAL_OFF -> {
this.setOutput(false);
- modeChanged = this.changeMode(Mode.MANUAL_OFF);
- break;
- case AUTOMATIC:
+ yield this.changeMode(Mode.MANUAL_OFF);
+ }
+ case AUTOMATIC -> {
this.automaticMode();
- modeChanged = this.changeMode(Mode.AUTOMATIC);
- break;
+ yield this.changeMode(Mode.AUTOMATIC);
}
+ };
} while (modeChanged);
this.channel(ControllerChpSoc.ChannelId.MODE).setNextValue(this.mode);
diff --git a/io.openems.edge.controller.debug.detailedlog/src/io/openems/edge/controller/debug/detailedlog/ControllerDebugDetailedLogImpl.java b/io.openems.edge.controller.debug.detailedlog/src/io/openems/edge/controller/debug/detailedlog/ControllerDebugDetailedLogImpl.java
index 629a04e491b..44f3a79261d 100644
--- a/io.openems.edge.controller.debug.detailedlog/src/io/openems/edge/controller/debug/detailedlog/ControllerDebugDetailedLogImpl.java
+++ b/io.openems.edge.controller.debug.detailedlog/src/io/openems/edge/controller/debug/detailedlog/ControllerDebugDetailedLogImpl.java
@@ -109,10 +109,8 @@ public void run() throws OpenemsNamedException {
/*
* create descriptive text
*/
- var channelText = "";
- switch (channel.channelDoc().getAccessMode()) {
- case READ_ONLY:
- case READ_WRITE:
+ var channelText = switch (channel.channelDoc().getAccessMode()) {
+ case READ_ONLY, READ_WRITE -> {
var description = "";
if (channel instanceof EnumReadChannel) {
try {
@@ -122,29 +120,26 @@ public void run() throws OpenemsNamedException {
description += "ERROR: " + e.getMessage();
}
}
- if (channel instanceof StateChannel
- && ((StateChannel) channel).value().orElse(false) == true) {
+ if (channel instanceof StateChannel sc && sc.value().orElse(false) == true) {
if (!description.isEmpty()) {
description += "; ";
}
- description += ((StateChannel) channel).channelDoc().getText();
+ description += sc.channelDoc().getText();
}
- if (channel instanceof StateCollectorChannel
- && ((StateCollectorChannel) channel).value().orElse(0) != 0) {
+ if (channel instanceof StateCollectorChannel scc && scc.value().orElse(0) != 0) {
if (!description.isEmpty()) {
description += "; ";
}
- description += ((StateCollectorChannel) channel).listStates();
+ description += scc.listStates();
}
- channelText = String.format("%15s %-3s %s", //
+ yield String.format("%15s %-3s %s", //
channel.value().asStringWithoutUnit(), //
unit, //
description.isEmpty() ? "" : "(" + description + ")");
- break;
-
- case WRITE_ONLY:
- channelText += "WRITE_ONLY";
}
+ case WRITE_ONLY //
+ -> "WRITE_ONLY";
+ };
// Build complete line
var line = String.format("%-" + WIDTH_FIRST + "s : %s", channel.channelId().id(), channelText);
// Print the line only if is not equal to the last printed line
diff --git a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/Context.java b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/Context.java
index a97c045451b..6b2d7a93438 100644
--- a/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/Context.java
+++ b/io.openems.edge.controller.ess.cycle/src/io/openems/edge/controller/ess/cycle/statemachine/Context.java
@@ -55,11 +55,13 @@ protected int getAcPower(ManagedSymmetricEss ess, HybridEssMode hybridEssMode, i
return switch (this.config.hybridEssMode()) {
case TARGET_AC -> this.config.power();
case TARGET_DC -> {
- if (ess instanceof HybridEss) {
- var pv = ess.getActivePower().orElse(0) - ((HybridEss) ess).getDcDischargePower().orElse(0);
+ yield switch (ess) {
+ case HybridEss he -> {
+ var pv = ess.getActivePower().orElse(0) - he.getDcDischargePower().orElse(0);
yield pv + this.config.power();
}
- yield this.config.power();
+ default -> this.config.power();
+ };
}
};
}
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/Context.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/Context.java
index 68f2031ba43..588d84b1bdb 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/Context.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/Context.java
@@ -24,6 +24,7 @@ public class Context extends AbstractContext= reserveSoc + 1 || soc == 100) {
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/StateMachine.java b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/StateMachine.java
index 290e1fb1c47..c42fbe6677d 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/StateMachine.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/src/io/openems/edge/controller/ess/emergencycapacityreserve/statemachine/StateMachine.java
@@ -82,6 +82,7 @@ public void run(Context context) throws OpenemsNamedException {
this.lastActiveState = this.getPreviousState();
}
context.setLastActiveState(this.lastActiveState);
+ context.setPreviousState(this.getPreviousState());
super.run(context);
}
@@ -92,20 +93,13 @@ public StateMachine(State initialState) {
@Override
public StateHandler getStateHandler(State state) {
return switch (state) {
- case NO_LIMIT ->
- new NoLimitHandler();
- case ABOVE_RESERVE_SOC ->
- new AboveReserveSocHandler();
- case AT_RESERVE_SOC ->
- new AtReserveSocHandler();
- case BELOW_RESERVE_SOC ->
- new BelowReserveSocHandler();
- case FORCE_CHARGE_PV ->
- new ForceChargePvHandler();
- case FORCE_CHARGE_GRID ->
- new ForceChargeGridHandler();
- case UNDEFINED ->
- new UndefinedHandler();
+ case NO_LIMIT -> new NoLimitHandler();
+ case ABOVE_RESERVE_SOC -> new AboveReserveSocHandler();
+ case AT_RESERVE_SOC -> new AtReserveSocHandler();
+ case BELOW_RESERVE_SOC -> new BelowReserveSocHandler();
+ case FORCE_CHARGE_PV -> new ForceChargePvHandler();
+ case FORCE_CHARGE_GRID -> new ForceChargeGridHandler();
+ case UNDEFINED -> new UndefinedHandler();
};
}
diff --git a/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserveImplTest.java b/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserveImplTest.java
index 2ab88d2be77..30c0e7e27d6 100644
--- a/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserveImplTest.java
+++ b/io.openems.edge.controller.ess.emergencycapacityreserve/test/io/openems/edge/controller/ess/emergencycapacityreserve/ControllerEssEmergencyCapacityReserveImplTest.java
@@ -606,20 +606,20 @@ public void testGridChargingOn() throws Exception {
)//
.next(new TestCase()//
.input("ess0", SOC, 18).output(STATE_MACHINE, State.FORCE_CHARGE_GRID) //
- .output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, 9100)//
- .output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 9100) //
+ .output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, -1000)//
+ .output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, -1000) //
)//
.next(new TestCase()//
.input("ess0", SOC, 18)//
.output(STATE_MACHINE, State.FORCE_CHARGE_GRID) //
- .output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, 9000)//
- .output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 9000) //
+ .output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, -1000)//
+ .output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, -1000) //
)
// From Below
.next(new TestCase()//
.input("ess0", SOC, 15).output(STATE_MACHINE, State.FORCE_CHARGE_GRID) //
- .output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, 8900)//
- .output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, 8900) //
+ .output("ess0", SET_ACTIVE_POWER_LESS_OR_EQUALS, -1100)//
+ .output(DEBUG_SET_ACTIVE_POWER_LESS_OR_EQUALS, -1100) //
)
// let ramp run its course
.next(new TestCase()//
diff --git a/io.openems.edge.controller.ess.fastfrequencyreserve/src/io/openems/edge/controller/ess/fastfrequencyreserve/statemachine/DeactivationTimeHandler.java b/io.openems.edge.controller.ess.fastfrequencyreserve/src/io/openems/edge/controller/ess/fastfrequencyreserve/statemachine/DeactivationTimeHandler.java
index aa01cbddbbb..98dd659b20c 100644
--- a/io.openems.edge.controller.ess.fastfrequencyreserve/src/io/openems/edge/controller/ess/fastfrequencyreserve/statemachine/DeactivationTimeHandler.java
+++ b/io.openems.edge.controller.ess.fastfrequencyreserve/src/io/openems/edge/controller/ess/fastfrequencyreserve/statemachine/DeactivationTimeHandler.java
@@ -10,7 +10,7 @@
public class DeactivationTimeHandler extends StateHandler {
- private static final int ZERO_WATT_POWER = 0; //[0 W]
+ private static final int ZERO_WATT_POWER = 0; // [0 W]
protected Instant deactivationStateStartTime;
private static enum SubState {
diff --git a/io.openems.edge.controller.ess.fastfrequencyreserve/test/io/openems/edge/controller/ess/fastfrequencyreserve/ControllerFastFrequencyReserveImplTest.java b/io.openems.edge.controller.ess.fastfrequencyreserve/test/io/openems/edge/controller/ess/fastfrequencyreserve/ControllerFastFrequencyReserveImplTest.java
index e704c552b50..ac8b9abaa2e 100644
--- a/io.openems.edge.controller.ess.fastfrequencyreserve/test/io/openems/edge/controller/ess/fastfrequencyreserve/ControllerFastFrequencyReserveImplTest.java
+++ b/io.openems.edge.controller.ess.fastfrequencyreserve/test/io/openems/edge/controller/ess/fastfrequencyreserve/ControllerFastFrequencyReserveImplTest.java
@@ -1,6 +1,6 @@
package io.openems.edge.controller.ess.fastfrequencyreserve;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
+import static io.openems.common.test.TestUtils.createDummyClock;
import static io.openems.edge.controller.ess.fastfrequencyreserve.ControllerFastFrequencyReserve.ChannelId.STATE_MACHINE;
import static io.openems.edge.controller.ess.fastfrequencyreserve.enums.ActivationTime.LONG_ACTIVATION_RUN;
import static io.openems.edge.controller.ess.fastfrequencyreserve.enums.SupportDuration.LONG_SUPPORT_DURATION;
diff --git a/io.openems.edge.controller.ess.fixactivepower/src/io/openems/edge/controller/ess/fixactivepower/ControllerEssFixActivePowerImpl.java b/io.openems.edge.controller.ess.fixactivepower/src/io/openems/edge/controller/ess/fixactivepower/ControllerEssFixActivePowerImpl.java
index 32c9fb30834..79e7acf8f15 100644
--- a/io.openems.edge.controller.ess.fixactivepower/src/io/openems/edge/controller/ess/fixactivepower/ControllerEssFixActivePowerImpl.java
+++ b/io.openems.edge.controller.ess.fixactivepower/src/io/openems/edge/controller/ess/fixactivepower/ControllerEssFixActivePowerImpl.java
@@ -133,20 +133,18 @@ public void run() throws OpenemsNamedException {
* @return the AC power set-point
*/
protected static Integer getAcPower(ManagedSymmetricEss ess, HybridEssMode hybridEssMode, int power) {
- switch (hybridEssMode) {
- case TARGET_AC:
- return power;
-
- case TARGET_DC:
- if (ess instanceof HybridEss) {
- var pv = ess.getActivePower().orElse(0) - ((HybridEss) ess).getDcDischargePower().orElse(0);
- return pv + power; // Charge or Discharge
- } else {
- return power;
+ return switch (hybridEssMode) {
+ case TARGET_AC -> power;
+
+ case TARGET_DC -> //
+ switch (ess) {
+ case HybridEss he -> {
+ var pv = ess.getActivePower().orElse(0) - he.getDcDischargePower().orElse(0);
+ yield pv + power; // Charge or Discharge
}
- }
-
- return null; /* should never happen */
+ default -> power;
+ };
+ };
}
@Override
diff --git a/io.openems.edge.controller.ess.fixstateofcharge/src/io/openems/edge/controller/ess/fixstateofcharge/api/AbstractFixStateOfCharge.java b/io.openems.edge.controller.ess.fixstateofcharge/src/io/openems/edge/controller/ess/fixstateofcharge/api/AbstractFixStateOfCharge.java
index 5849daf0e9d..45ebdffbf6f 100644
--- a/io.openems.edge.controller.ess.fixstateofcharge/src/io/openems/edge/controller/ess/fixstateofcharge/api/AbstractFixStateOfCharge.java
+++ b/io.openems.edge.controller.ess.fixstateofcharge/src/io/openems/edge/controller/ess/fixstateofcharge/api/AbstractFixStateOfCharge.java
@@ -203,6 +203,7 @@ private Context handleStateMachine() {
*/
private void applyTargetPower(Float targetPower, float rampPower, int maxApparentPower)
throws OpenemsNamedException {
+ final var ess = this.getEss();
var activePower = this.rampFilter.getFilteredValueAsInteger(targetPower, rampPower);
this._setDebugSetActivePowerRaw(activePower);
@@ -221,21 +222,16 @@ private void applyTargetPower(Float targetPower, float rampPower, int maxApparen
activePower = this.calculateAcLimit(activePower);
// Fit into min/max "EssPower"
- if (this.getEss() instanceof ManagedSymmetricEss) {
- var e = (ManagedSymmetricEss) this.getEss();
- var maxCharge = e.getPower().getMinPower(e, Phase.ALL, Pwr.ACTIVE);
- var maxDischarge = e.getPower().getMaxPower(e, Phase.ALL, Pwr.ACTIVE);
- activePower = TypeUtils.fitWithin(maxCharge, maxDischarge, activePower);
- } else {
- activePower = TypeUtils.fitWithin(maxApparentPower * -1, maxApparentPower, activePower);
- }
+ var maxCharge = ess.getPower().getMinPower(ess, Phase.ALL, Pwr.ACTIVE);
+ var maxDischarge = ess.getPower().getMaxPower(ess, Phase.ALL, Pwr.ACTIVE);
+ activePower = TypeUtils.fitWithin(maxCharge, maxDischarge, activePower);
if (activePower > 0) {
- this.getEss().setActivePowerEquals(activePower);
+ ess.setActivePowerEquals(activePower);
} else if (activePower < 0) {
- this.getEss().setActivePowerEquals(activePower);
+ ess.setActivePowerEquals(activePower);
} else {
- this.getEss().setActivePowerEquals(activePower);
+ ess.setActivePowerEquals(activePower);
}
// Set debug channels
diff --git a/io.openems.edge.controller.ess.fixstateofcharge/src/io/openems/edge/controller/ess/fixstateofcharge/statemachine/StateMachine.java b/io.openems.edge.controller.ess.fixstateofcharge/src/io/openems/edge/controller/ess/fixstateofcharge/statemachine/StateMachine.java
index 7017b970771..627a2c2f4d1 100644
--- a/io.openems.edge.controller.ess.fixstateofcharge/src/io/openems/edge/controller/ess/fixstateofcharge/statemachine/StateMachine.java
+++ b/io.openems.edge.controller.ess.fixstateofcharge/src/io/openems/edge/controller/ess/fixstateofcharge/statemachine/StateMachine.java
@@ -78,23 +78,15 @@ public StateMachine(State initialState) {
@Override
public StateHandler getStateHandler(State state) {
- switch (state) {
- case IDLE:
- return new IdleHander();
- case NOT_STARTED:
- return new NotStartedHandler();
- case ABOVE_TARGET_SOC:
- return new AboveTargetSocHandler();
- case BELOW_TARGET_SOC:
- return new BelowTargetSocHandler();
- case AT_TARGET_SOC:
- return new AtTargetSocHandler();
- case WITHIN_LOWER_TARGET_SOC_BOUNDARIES:
- return new WithinLowerTargetSocBoundariesHandler();
- case WITHIN_UPPER_TARGET_SOC_BOUNDARIES:
- return new WithinUpperTargetSocBoundariesHandler();
- }
- throw new IllegalArgumentException("Unknown State [" + state + "]");
+ return switch (state) {
+ case IDLE -> new IdleHander();
+ case NOT_STARTED -> new NotStartedHandler();
+ case ABOVE_TARGET_SOC -> new AboveTargetSocHandler();
+ case BELOW_TARGET_SOC -> new BelowTargetSocHandler();
+ case AT_TARGET_SOC -> new AtTargetSocHandler();
+ case WITHIN_LOWER_TARGET_SOC_BOUNDARIES -> new WithinLowerTargetSocBoundariesHandler();
+ case WITHIN_UPPER_TARGET_SOC_BOUNDARIES -> new WithinUpperTargetSocBoundariesHandler();
+ };
}
}
\ No newline at end of file
diff --git a/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/test/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/ControllerEssHybridSurplusFeedToGridImplTest.java b/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/test/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/ControllerEssHybridSurplusFeedToGridImplTest.java
index 94d0e84fbb1..edb1435b1e8 100644
--- a/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/test/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/ControllerEssHybridSurplusFeedToGridImplTest.java
+++ b/io.openems.edge.controller.ess.hybrid.surplusfeedtogrid/test/io/openems/edge/controller/ess/hybrid/surplusfeedtogrid/ControllerEssHybridSurplusFeedToGridImplTest.java
@@ -38,7 +38,7 @@ public void test() throws Exception {
test.next(new TestCase() //
.output(SURPLUS_FEED_TO_GRID_IS_LIMITED, true) //
.output("ess0", SET_ACTIVE_POWER_GREATER_OR_EQUALS, 2000)) //
-
+
.deactivate();
}
}
\ No newline at end of file
diff --git a/io.openems.edge.controller.ess.limiter14a/src/io/openems/edge/controller/ess/limiter14a/Config.java b/io.openems.edge.controller.ess.limiter14a/src/io/openems/edge/controller/ess/limiter14a/Config.java
index 69f598db15b..c2768e430d8 100644
--- a/io.openems.edge.controller.ess.limiter14a/src/io/openems/edge/controller/ess/limiter14a/Config.java
+++ b/io.openems.edge.controller.ess.limiter14a/src/io/openems/edge/controller/ess/limiter14a/Config.java
@@ -16,7 +16,7 @@
@AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
boolean enabled() default true;
-
+
@AttributeDefinition(name = "Ess-ID", description = "ID of Ess.")
String ess_id() default "ess0";
diff --git a/io.openems.edge.controller.ess.limiter14a/test/io/openems/edge/controller/ess/limiter14a/MyConfig.java b/io.openems.edge.controller.ess.limiter14a/test/io/openems/edge/controller/ess/limiter14a/MyConfig.java
index c0c2a3ddab8..028564e3ea1 100644
--- a/io.openems.edge.controller.ess.limiter14a/test/io/openems/edge/controller/ess/limiter14a/MyConfig.java
+++ b/io.openems.edge.controller.ess.limiter14a/test/io/openems/edge/controller/ess/limiter14a/MyConfig.java
@@ -12,7 +12,7 @@ protected static class Builder {
private Builder() {
}
-
+
public Builder setInputChannelAddress(String inputChannelAddress) {
this.inputChannelAddress = inputChannelAddress;
return this;
@@ -22,7 +22,7 @@ public Builder setId(String id) {
this.id = id;
return this;
}
-
+
public Builder setEssId(String id) {
this.essId = id;
return this;
diff --git a/io.openems.edge.controller.ess.limittotaldischarge/test/io/openems/edge/controller/ess/limittotaldischarge/ControllerEssLimitTotalDischargeImplTest.java b/io.openems.edge.controller.ess.limittotaldischarge/test/io/openems/edge/controller/ess/limittotaldischarge/ControllerEssLimitTotalDischargeImplTest.java
index f240abc3ed9..acc57399ef6 100644
--- a/io.openems.edge.controller.ess.limittotaldischarge/test/io/openems/edge/controller/ess/limittotaldischarge/ControllerEssLimitTotalDischargeImplTest.java
+++ b/io.openems.edge.controller.ess.limittotaldischarge/test/io/openems/edge/controller/ess/limittotaldischarge/ControllerEssLimitTotalDischargeImplTest.java
@@ -1,6 +1,6 @@
package io.openems.edge.controller.ess.limittotaldischarge;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
+import static io.openems.common.test.TestUtils.createDummyClock;
import static io.openems.edge.controller.ess.limittotaldischarge.ControllerEssLimitTotalDischarge.ChannelId.AWAITING_HYSTERESIS;
import static io.openems.edge.ess.api.ManagedSymmetricEss.ChannelId.SET_ACTIVE_POWER_LESS_OR_EQUALS;
import static io.openems.edge.ess.api.SymmetricEss.ChannelId.SOC;
diff --git a/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/test/io/openems/edge/controller/ess/reactivepowervoltagecharacteristic/ControllerEssReactivePowerVoltageCharacteristicImplTest.java b/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/test/io/openems/edge/controller/ess/reactivepowervoltagecharacteristic/ControllerEssReactivePowerVoltageCharacteristicImplTest.java
index 442be9ddfa2..0278054c009 100644
--- a/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/test/io/openems/edge/controller/ess/reactivepowervoltagecharacteristic/ControllerEssReactivePowerVoltageCharacteristicImplTest.java
+++ b/io.openems.edge.controller.ess.reactivepowervoltagecharacteristic/test/io/openems/edge/controller/ess/reactivepowervoltagecharacteristic/ControllerEssReactivePowerVoltageCharacteristicImplTest.java
@@ -1,8 +1,8 @@
package io.openems.edge.controller.ess.reactivepowervoltagecharacteristic;
+import static io.openems.common.test.TestUtils.createDummyClock;
import static io.openems.common.utils.JsonUtils.buildJsonArray;
import static io.openems.common.utils.JsonUtils.buildJsonObject;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
import static io.openems.edge.ess.api.ManagedSymmetricEss.ChannelId.SET_REACTIVE_POWER_EQUALS;
import static io.openems.edge.ess.api.SymmetricEss.ChannelId.MAX_APPARENT_POWER;
import static io.openems.edge.meter.api.ElectricityMeter.ChannelId.VOLTAGE;
diff --git a/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/StateMachine.java b/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/StateMachine.java
index e0c53185f05..2570a45be3c 100644
--- a/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/StateMachine.java
+++ b/io.openems.edge.controller.ess.standby/src/io/openems/edge/controller/ess/standby/statemachine/StateMachine.java
@@ -48,20 +48,13 @@ public StateMachine(State initialState) {
@Override
public StateHandler getStateHandler(State state) {
- switch (state) {
- case UNDEFINED:
- return new UndefinedHandler();
- case DISCHARGE:
- return new DischargeHandler();
- case SLOW_CHARGE_1:
- return new SlowCharge1Handler();
- case FAST_CHARGE:
- return new FastChargeHandler();
- case SLOW_CHARGE_2:
- return new SlowCharge2Handler();
- case FINISHED:
- return new FinishedHandler();
- }
- throw new IllegalArgumentException("Unknown State [" + state + "]");
+ return switch (state) {
+ case UNDEFINED -> new UndefinedHandler();
+ case DISCHARGE -> new DischargeHandler();
+ case SLOW_CHARGE_1 -> new SlowCharge1Handler();
+ case FAST_CHARGE -> new FastChargeHandler();
+ case SLOW_CHARGE_2 -> new SlowCharge2Handler();
+ case FINISHED -> new FinishedHandler();
+ };
}
}
diff --git a/io.openems.edge.controller.ess.timeofusetariff/src/io/openems/edge/controller/ess/timeofusetariff/TimeOfUseTariffController.java b/io.openems.edge.controller.ess.timeofusetariff/src/io/openems/edge/controller/ess/timeofusetariff/TimeOfUseTariffController.java
index b241b53977a..b05feebdff4 100644
--- a/io.openems.edge.controller.ess.timeofusetariff/src/io/openems/edge/controller/ess/timeofusetariff/TimeOfUseTariffController.java
+++ b/io.openems.edge.controller.ess.timeofusetariff/src/io/openems/edge/controller/ess/timeofusetariff/TimeOfUseTariffController.java
@@ -11,7 +11,6 @@
import io.openems.edge.controller.ess.timeofusetariff.v1.EnergyScheduleHandlerV1;
import io.openems.edge.energy.api.EnergySchedulable;
-@SuppressWarnings("deprecation")
public interface TimeOfUseTariffController extends Controller, EnergySchedulable, OpenemsComponent {
public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
diff --git a/io.openems.edge.controller.ess.timeofusetariff/src/io/openems/edge/controller/ess/timeofusetariff/Utils.java b/io.openems.edge.controller.ess.timeofusetariff/src/io/openems/edge/controller/ess/timeofusetariff/Utils.java
index 8c945077d45..45976c1da10 100644
--- a/io.openems.edge.controller.ess.timeofusetariff/src/io/openems/edge/controller/ess/timeofusetariff/Utils.java
+++ b/io.openems.edge.controller.ess.timeofusetariff/src/io/openems/edge/controller/ess/timeofusetariff/Utils.java
@@ -234,13 +234,14 @@ public static Integer calculateMaxChargeProductionPower(Sum sum) {
* @return the set-point
*/
public static int calculateDelayDischargePower(ManagedSymmetricEss ess) {
- if (ess instanceof HybridEss e) {
+ return switch (ess) {
+ case HybridEss e ->
// Limit discharge to DC-PV power
- return max(0, ess.getActivePower().orElse(0) - e.getDcDischargePower().orElse(0));
- } else {
+ max(0, ess.getActivePower().orElse(0) - e.getDcDischargePower().orElse(0));
+ default ->
// Limit discharge to 0
- return 0;
- }
+ 0;
+ };
}
/**
diff --git a/io.openems.edge.controller.ess.timeofusetariff/test/io/openems/edge/controller/ess/timeofusetariff/TimeOfUseTariffControllerImplTest.java b/io.openems.edge.controller.ess.timeofusetariff/test/io/openems/edge/controller/ess/timeofusetariff/TimeOfUseTariffControllerImplTest.java
index 941aaaf78f0..469536f9d5a 100644
--- a/io.openems.edge.controller.ess.timeofusetariff/test/io/openems/edge/controller/ess/timeofusetariff/TimeOfUseTariffControllerImplTest.java
+++ b/io.openems.edge.controller.ess.timeofusetariff/test/io/openems/edge/controller/ess/timeofusetariff/TimeOfUseTariffControllerImplTest.java
@@ -1,6 +1,6 @@
package io.openems.edge.controller.ess.timeofusetariff;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
+import static io.openems.common.test.TestUtils.createDummyClock;
import static io.openems.edge.controller.ess.timeofusetariff.ControlMode.CHARGE_CONSUMPTION;
import static io.openems.edge.controller.ess.timeofusetariff.Mode.AUTOMATIC;
diff --git a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Utils.java b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Utils.java
index a426a0f3186..6b185129d8b 100644
--- a/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Utils.java
+++ b/io.openems.edge.controller.evcs/src/io/openems/edge/controller/evcs/Utils.java
@@ -18,7 +18,8 @@
import com.google.gson.JsonObject;
import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.edge.controller.evcs.JSCalendar.Task;
+import io.openems.common.jscalendar.JSCalendar;
+import io.openems.common.jscalendar.JSCalendar.Task;
import io.openems.edge.controller.evcs.Utils.EshContext.EshManualContext;
import io.openems.edge.controller.evcs.Utils.EshContext.EshSmartContext;
import io.openems.edge.energy.api.EnergyScheduleHandler;
diff --git a/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/ControllerEvcsImplTest.java b/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/ControllerEvcsImplTest.java
index 2adacb94a33..3a9bb67ad68 100644
--- a/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/ControllerEvcsImplTest.java
+++ b/io.openems.edge.controller.evcs/test/io/openems/edge/controller/evcs/ControllerEvcsImplTest.java
@@ -1,9 +1,9 @@
package io.openems.edge.controller.evcs;
+import static io.openems.common.test.TestUtils.createDummyClock;
import static io.openems.edge.common.sum.Sum.ChannelId.ESS_DISCHARGE_POWER;
import static io.openems.edge.common.sum.Sum.ChannelId.ESS_SOC;
import static io.openems.edge.common.sum.Sum.ChannelId.GRID_ACTIVE_POWER;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
import static io.openems.edge.controller.evcs.ControllerEvcs.ChannelId.AWAITING_HYSTERESIS;
import static io.openems.edge.controller.evcs.Priority.CAR;
import static io.openems.edge.evcs.api.ChargeMode.EXCESS_POWER;
diff --git a/io.openems.edge.controller.highloadtimeslot/src/io/openems/edge/controller/highloadtimeslot/ControllerHighLoadTimeslotImpl.java b/io.openems.edge.controller.highloadtimeslot/src/io/openems/edge/controller/highloadtimeslot/ControllerHighLoadTimeslotImpl.java
index 98c81d8c854..1fab94396a7 100644
--- a/io.openems.edge.controller.highloadtimeslot/src/io/openems/edge/controller/highloadtimeslot/ControllerHighLoadTimeslotImpl.java
+++ b/io.openems.edge.controller.highloadtimeslot/src/io/openems/edge/controller/highloadtimeslot/ControllerHighLoadTimeslotImpl.java
@@ -121,8 +121,8 @@ private int getPower(ManagedSymmetricEss ess) {
/*
* We are in a Charge period
*/
- switch (this.chargeState) {
- case NORMAL:
+ return switch (this.chargeState) {
+ case NORMAL -> {
/*
* charge with configured charge-power
*/
@@ -133,9 +133,9 @@ private int getPower(ManagedSymmetricEss ess) {
// activate Charge-hysteresis if no charge power (i.e. >= 0) is allowed
this.chargeState = ChargeState.HYSTERESIS;
}
- return this.chargePower;
-
- case HYSTERESIS:
+ yield this.chargePower;
+ }
+ case HYSTERESIS -> {
/*
* block charging till configured hysteresisSoc
*/
@@ -145,17 +145,16 @@ private int getPower(ManagedSymmetricEss ess) {
+ "]. Switch to Charge-Normal state.");
this.chargeState = ChargeState.NORMAL;
}
- return 0;
-
- case FORCE_CHARGE:
+ yield 0;
+ }
+ case FORCE_CHARGE -> {
/*
* force full charging just before the high-load timeslot starts
*/
this.logInfo(this.log, "Just before High-Load timeslot. Charge with [" + this.chargePower + "]");
- return this.chargePower;
+ yield this.chargePower;
}
- // we should never come here...
- return 0;
+ };
}
/**
@@ -186,16 +185,11 @@ private boolean isHighLoadTimeslot(LocalDateTime dateTime) {
* @return true on yes
*/
protected static boolean isActiveWeekday(WeekdayFilter activeDayFilter, LocalDateTime dateTime) {
- switch (activeDayFilter) {
- case EVERDAY:
- return true;
- case ONLY_WEEKDAYS:
- return !isWeekend(dateTime);
- case ONLY_WEEKEND:
- return isWeekend(dateTime);
- }
- // should never happen
- return false;
+ return switch (activeDayFilter) {
+ case EVERDAY -> true;
+ case ONLY_WEEKDAYS -> !isWeekend(dateTime);
+ case ONLY_WEEKEND -> isWeekend(dateTime);
+ };
}
protected static boolean isActiveDate(LocalDate startDate, LocalDate endDate, LocalDateTime dateTime) {
diff --git a/io.openems.edge.controller.io.analog/test/io/openems/edge/controller/io/analog/MyControllerTest.java b/io.openems.edge.controller.io.analog/test/io/openems/edge/controller/io/analog/MyControllerTest.java
index e2ce7b1917c..3fc3bd26560 100644
--- a/io.openems.edge.controller.io.analog/test/io/openems/edge/controller/io/analog/MyControllerTest.java
+++ b/io.openems.edge.controller.io.analog/test/io/openems/edge/controller/io/analog/MyControllerTest.java
@@ -1,6 +1,6 @@
package io.openems.edge.controller.io.analog;
-import static io.openems.edge.common.test.TestUtils.createDummyClock;
+import static io.openems.common.test.TestUtils.createDummyClock;
import java.time.temporal.ChronoUnit;
diff --git a/io.openems.edge.controller.io.heating.room/.classpath b/io.openems.edge.controller.io.heating.room/.classpath
new file mode 100644
index 00000000000..b4cffd0fe60
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/.classpath
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/io.openems.edge.controller.io.heating.room/.gitignore b/io.openems.edge.controller.io.heating.room/.gitignore
new file mode 100644
index 00000000000..c2b941a96de
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/.gitignore
@@ -0,0 +1,2 @@
+/bin_test/
+/generated/
diff --git a/io.openems.edge.controller.io.heating.room/.project b/io.openems.edge.controller.io.heating.room/.project
new file mode 100644
index 00000000000..b63b02b9297
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/.project
@@ -0,0 +1,23 @@
+
+
+ io.openems.edge.controller.io.heating.room
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ bndtools.core.bndbuilder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+ bndtools.core.bndnature
+
+
diff --git a/io.openems.edge.controller.io.heating.room/.settings/org.eclipse.core.resources.prefs b/io.openems.edge.controller.io.heating.room/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..99f26c0203a
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/=UTF-8
diff --git a/io.openems.edge.controller.io.heating.room/bnd.bnd b/io.openems.edge.controller.io.heating.room/bnd.bnd
new file mode 100644
index 00000000000..80110260ed9
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/bnd.bnd
@@ -0,0 +1,17 @@
+Bundle-Name: OpenEMS Edge Controller IO Heating Room
+Bundle-Vendor: OpenEMS Association e.V.
+Bundle-License: https://opensource.org/licenses/EPL-2.0
+Bundle-Version: 1.0.0.${tstamp}
+
+-buildpath: \
+ ${buildpath},\
+ io.openems.common,\
+ io.openems.edge.common,\
+ io.openems.edge.controller.api,\
+ io.openems.edge.io.api,\
+ io.openems.edge.meter.api,\
+ io.openems.edge.thermometer.api,\
+ io.openems.edge.timedata.api,\
+
+-testpath: \
+ ${testpath}
diff --git a/io.openems.edge.controller.io.heating.room/readme.adoc b/io.openems.edge.controller.io.heating.room/readme.adoc
new file mode 100644
index 00000000000..849e0c1ff29
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/readme.adoc
@@ -0,0 +1,45 @@
+= IO Heating Room
+
+Controls electric floor and infrared heating in a room.
+
+The Controller activates electric floor and infrared heating in a room in order to keep a configured LOW or HIGH temperature.
+The timings of LOW or HIGH are configured via a `schedule` configuration parameter.
+It holds a JsonArray with JSCalendar information, e.g.
+
+----
+[
+ {
+ "@type":"Task",
+ "start":"05:30:00",
+ "duration":"PT2H30M",
+ "recurrenceRules":[
+ {
+ "frequency":"weekly",
+ "byDay":[
+ "mo",
+ "tu",
+ "we",
+ "th",
+ "fr"
+ ]
+ }
+ ]
+ },
+ {
+ "@type":"Task",
+ "start":"08:00:00",
+ "duration":"PT16H",
+ "recurrenceRules":[
+ {
+ "frequency":"weekly",
+ "byDay":[
+ "sa",
+ "su"
+ ]
+ }
+ ]
+ }
+]
+----
+
+https://github.com/OpenEMS/openems/tree/develop/io.openems.edge.controller.io.heating.room[Source Code icon:github[]]
\ No newline at end of file
diff --git a/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/io/heating/room/Config.java b/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/io/heating/room/Config.java
new file mode 100644
index 00000000000..b2360ac3c13
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/io/heating/room/Config.java
@@ -0,0 +1,73 @@
+package io.openems.edge.controller.io.heating.room;
+
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+
+@ObjectClassDefinition(//
+ name = "Controller Heating Room", //
+ description = "Controls electric floor and infrared heating in a room")
+@interface Config {
+
+ @AttributeDefinition(name = "Component-ID", description = "Unique ID of this Component")
+ String id() default "ctrlHeatingRoom0";
+
+ @AttributeDefinition(name = "Alias", description = "Human-readable name of this Component; defaults to Component-ID")
+ String alias() default "";
+
+ @AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?")
+ boolean enabled() default true;
+
+ @AttributeDefinition(name = "Mode", description = "Heating control mode")
+ Mode mode() default Mode.AUTOMATIC;
+
+ @AttributeDefinition(name = "JSON Schedule in AUTOMATIC Mode", description = "Takes a Json-Array in JSCalendar format")
+ String schedule() default "";
+
+ @AttributeDefinition(name = "Low Floor Temperature", description = "The target floor temperature in LOW mode (in 0.1 degree celsius)")
+ int lowFloorTemperature();
+
+ @AttributeDefinition(name = "Low Ambient Temperature", description = "The target ambient temperature in LOW mode (in 0.1 degree celsius)")
+ int lowAmbientTemperature();
+
+ @AttributeDefinition(name = "High Floor Temperature", description = "The target floor temperature in HIGH mode (in 0.1 degree celsius)")
+ int highFloorTemperature();
+
+ @AttributeDefinition(name = "High Ambient Temperature", description = "The target ambient temperature in HIGH mode (in 0.1 degree celsius)")
+ int highAmbientTemperature();
+
+ @AttributeDefinition(name = "Floor Thermometer ID", description = "Component-ID of the Floor Thermometer")
+ String floorThermometer_id();
+
+ @AttributeDefinition(name = "Ambient Thermometer ID", description = "Component-ID of the Ambient Air Thermometer")
+ String ambientThermometer_id();
+
+ @AttributeDefinition(name = "Floor Heating Relay(s)", description = "Channel addresses of the Relays for Floor Heating")
+ String[] floorRelays();
+
+ @AttributeDefinition(name = "Infrared Heating Relay(s)", description = "Channel addresses of the Relays for Infrared Heating")
+ String[] infraredRelays();
+
+ @AttributeDefinition(name = "Floor Heating Power", description = "The switched power of the floor heating (in Watt)")
+ int floorPower();
+
+ @AttributeDefinition(name = "Infrared Heating Power", description = "The switched power of the infrared heating (in Watt)")
+ int infraredPower();
+
+ @AttributeDefinition(name = "Has external ambient heating?", description = "Is there an external ambient heating in this room - like a wood stove")
+ boolean hasExternalAmbientHeating();
+
+ @AttributeDefinition(name = "Floor Thermometer target filter", description = "This is auto-generated by 'Floor Thermometer ID'")
+ String floorThermometer_target() default "(enabled=true)";
+
+ @AttributeDefinition(name = "Ambient Thermometer target filter", description = "This is auto-generated by 'Ambient Thermometer ID'")
+ String ambientThermometer_target() default "(enabled=true)";
+
+ @AttributeDefinition(name = "Floor Relay Components target filter", description = "This is auto-generated by 'Floor Heating Relay(s)'")
+ String floorRelayComponents_target() default "(enabled=true)";
+
+ @AttributeDefinition(name = "Infrared Relay Components target filter", description = "This is auto-generated by 'Infrared Heating Relay(s)'")
+ String infraredRelayComponents_target() default "(enabled=true)";
+
+ String webconsole_configurationFactory_nameHint() default "Controller Heating Room [{id}]";
+
+}
\ No newline at end of file
diff --git a/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/io/heating/room/ControllerIoRoomHeating.java b/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/io/heating/room/ControllerIoRoomHeating.java
new file mode 100644
index 00000000000..c2b48e2dfb4
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/io/heating/room/ControllerIoRoomHeating.java
@@ -0,0 +1,148 @@
+package io.openems.edge.controller.io.heating.room;
+
+import io.openems.common.types.OpenemsType;
+import io.openems.edge.common.channel.Doc;
+import io.openems.edge.common.channel.IntegerReadChannel;
+import io.openems.edge.common.channel.value.Value;
+import io.openems.edge.common.component.OpenemsComponent;
+import io.openems.edge.controller.api.Controller;
+import io.openems.edge.meter.api.ElectricityMeter;
+
+public interface ControllerIoRoomHeating extends Controller, ElectricityMeter, OpenemsComponent {
+
+ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
+ FLOOR_ACTUAL(Doc.of(OpenemsType.INTEGER)), //
+ FLOOR_TARGET(Doc.of(OpenemsType.INTEGER)), //
+ AMBIENT_ACTUAL(Doc.of(OpenemsType.INTEGER)), //
+ AMBIENT_TARGET(Doc.of(OpenemsType.INTEGER)), //
+ ;
+
+ private final Doc doc;
+
+ private ChannelId(Doc doc) {
+ this.doc = doc;
+ }
+
+ @Override
+ public Doc doc() {
+ return this.doc;
+ }
+ }
+
+ /**
+ * Gets the Channel for {@link ChannelId#FLOOR_ACTUAL}.
+ *
+ * @return the Channel
+ */
+ public default IntegerReadChannel getFloorActualChannel() {
+ return this.channel(ChannelId.FLOOR_ACTUAL);
+ }
+
+ /**
+ * Gets the Floor Actual Temperature in [deci degC]. See
+ * {@link ChannelId#FLOOR_ACTUAL}.
+ *
+ * @return the Channel {@link Value}
+ */
+ public default Value getFloorActual() {
+ return this.getFloorActualChannel().value();
+ }
+
+ /**
+ * Internal method to set the 'nextValue' on {@link ChannelId#FLOOR_ACTUAL}
+ * Channel.
+ *
+ * @param value the next value
+ */
+ public default void _setFloorActual(Integer value) {
+ this.getFloorActualChannel().setNextValue(value);
+ }
+
+ /**
+ * Gets the Channel for {@link ChannelId#FLOOR_TARGET}.
+ *
+ * @return the Channel
+ */
+ public default IntegerReadChannel getFloorTargetChannel() {
+ return this.channel(ChannelId.FLOOR_TARGET);
+ }
+
+ /**
+ * Gets the Floor Target Temperature in [deci degC]. See
+ * {@link ChannelId#FLOOR_TARGET}.
+ *
+ * @return the Channel {@link Value}
+ */
+ public default Value getFloorTarget() {
+ return this.getFloorTargetChannel().value();
+ }
+
+ /**
+ * Internal method to set the 'nextValue' on {@link ChannelId#FLOOR_TARGET}
+ * Channel.
+ *
+ * @param value the next value
+ */
+ public default void _setFloorTarget(Integer value) {
+ this.getFloorTargetChannel().setNextValue(value);
+ }
+
+ /**
+ * Gets the Channel for {@link ChannelId#AMBIENT_ACTUAL}.
+ *
+ * @return the Channel
+ */
+ public default IntegerReadChannel getAmbientActualChannel() {
+ return this.channel(ChannelId.AMBIENT_ACTUAL);
+ }
+
+ /**
+ * Gets the Ambient Actual Temperature in [deci degC]. See
+ * {@link ChannelId#AMBIENT_ACTUAL}.
+ *
+ * @return the Channel {@link Value}
+ */
+ public default Value getAmbientActual() {
+ return this.getAmbientActualChannel().value();
+ }
+
+ /**
+ * Internal method to set the 'nextValue' on {@link ChannelId#AMBIENT_ACTUAL}
+ * Channel.
+ *
+ * @param value the next value
+ */
+ public default void _setAmbientActual(Integer value) {
+ this.getAmbientActualChannel().setNextValue(value);
+ }
+
+ /**
+ * Gets the Channel for {@link ChannelId#AMBIENT_TARGET}.
+ *
+ * @return the Channel
+ */
+ public default IntegerReadChannel getAmbientTargetChannel() {
+ return this.channel(ChannelId.AMBIENT_TARGET);
+ }
+
+ /**
+ * Gets the Ambient Target Temperature in [deci degC]. See
+ * {@link ChannelId#AMBIENT_TARGET}.
+ *
+ * @return the Channel {@link Value}
+ */
+ public default Value getAmbientTarget() {
+ return this.getAmbientTargetChannel().value();
+ }
+
+ /**
+ * Internal method to set the 'nextValue' on {@link ChannelId#AMBIENT_TARGET}
+ * Channel.
+ *
+ * @param value the next value
+ */
+ public default void _setAmbientTarget(Integer value) {
+ this.getAmbientTargetChannel().setNextValue(value);
+ }
+
+}
diff --git a/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/io/heating/room/ControllerIoRoomHeatingImpl.java b/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/io/heating/room/ControllerIoRoomHeatingImpl.java
new file mode 100644
index 00000000000..ec20d7451b3
--- /dev/null
+++ b/io.openems.edge.controller.io.heating.room/src/io/openems/edge/controller/io/heating/room/ControllerIoRoomHeatingImpl.java
@@ -0,0 +1,472 @@
+package io.openems.edge.controller.io.heating.room;
+
+import static io.openems.edge.controller.io.heating.room.Utils.getNextHighPeriod;
+import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE_TIME;
+
+import java.time.Clock;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Modified;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferencePolicyOption;
+import org.osgi.service.metatype.annotations.Designate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gson.JsonObject;
+
+import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.jscalendar.JSCalendar;
+import io.openems.common.jscalendar.JSCalendar.Task;
+import io.openems.common.types.ChannelAddress;
+import io.openems.common.types.MeterType;
+import io.openems.edge.common.channel.BooleanWriteChannel;
+import io.openems.edge.common.channel.WriteChannel;
+import io.openems.edge.common.component.AbstractOpenemsComponent;
+import io.openems.edge.common.component.OpenemsComponent;
+import io.openems.edge.controller.api.Controller;
+import io.openems.edge.controller.io.heating.room.Utils.HighPeriod;
+import io.openems.edge.io.api.DigitalOutput;
+import io.openems.edge.meter.api.ElectricityMeter;
+import io.openems.edge.thermometer.api.Thermometer;
+import io.openems.edge.timedata.api.Timedata;
+import io.openems.edge.timedata.api.TimedataProvider;
+import io.openems.edge.timedata.api.utils.CalculateEnergyFromPower;
+
+@Designate(ocd = Config.class, factory = true)
+@Component(//
+ name = "Controller.IO.Heating.Room", //
+ immediate = true, //
+ configurationPolicy = ConfigurationPolicy.REQUIRE //
+)
+public class ControllerIoRoomHeatingImpl extends AbstractOpenemsComponent
+ implements ControllerIoRoomHeating, Controller, ElectricityMeter, OpenemsComponent, TimedataProvider {
+
+ private static final int MINIMUM_SWITCHING_TIME = 180; // [s]
+
+ private final Logger log = LoggerFactory.getLogger(ControllerIoRoomHeatingImpl.class);
+ private final Clock clock;
+ private final CalculateEnergyFromPower calculateEnergy = new CalculateEnergyFromPower(this,
+ ElectricityMeter.ChannelId.ACTIVE_PRODUCTION_ENERGY);
+
+ @Reference
+ private ConfigurationAdmin cm;
+
+ @Reference
+ private Timedata timedata;
+
+ @Reference(policyOption = ReferencePolicyOption.GREEDY)
+ private Thermometer floorThermometer;
+
+ @Reference(policyOption = ReferencePolicyOption.GREEDY)
+ private Thermometer ambientThermometer;
+
+ @Reference(policyOption = ReferencePolicyOption.GREEDY)
+ private List floorRelayComponents;
+
+ @Reference(policyOption = ReferencePolicyOption.GREEDY)
+ private List infraredRelayComponents;
+
+ private Config config = null;
+ private ImmutableList> schedule = ImmutableList.of();
+ private final List floorRelays = new ArrayList<>();
+ private final List infraredRelays = new ArrayList<>();
+
+ private HighPeriod highPeriod;
+ private RelayState lastFloorRelayState = null;
+ private RelayState lastInfraredRelayState = null;
+
+ public ControllerIoRoomHeatingImpl(Clock clock) {
+ super(//
+ OpenemsComponent.ChannelId.values(), //
+ ElectricityMeter.ChannelId.values(), //
+ Controller.ChannelId.values(), //
+ ControllerIoRoomHeating.ChannelId.values() //
+ );
+ this.clock = clock;
+
+ // Set static Meter channels
+ this._setActiveConsumptionEnergy(0);
+ this._setReactivePower(0);
+ }
+
+ public ControllerIoRoomHeatingImpl() {
+ this(Clock.systemDefaultZone());
+ }
+
+ @Activate
+ private void activate(ComponentContext context, Config config) throws OpenemsNamedException {
+ super.activate(context, config.id(), config.alias(), config.enabled());
+ this.applyConfig(config);
+ }
+
+ @Modified
+ private void modified(ComponentContext context, Config config) throws OpenemsNamedException {
+ this.applyConfig(config);
+ super.modified(context, config.id(), config.alias(), config.enabled());
+ }
+
+ @Deactivate
+ protected void deactivate() {
+ super.deactivate();
+ }
+
+ @Override
+ public synchronized void run() throws OpenemsNamedException {
+ this.applyHeatingLogic();
+ this.updateMeterValues();
+ }
+
+ /**
+ * Applies the actual heating logic.
+ */
+ private void applyHeatingLogic() {
+ /*
+ * Evaluate actual temperatures
+ */
+ var floorActual = this.floorThermometer.getTemperature();
+ var ambientActual = this.ambientThermometer.getTemperature();
+ this._setFloorActual(floorActual.get());
+ this._setAmbientActual(ambientActual.get());
+
+ /*
+ * Evaluate target temperatures
+ */
+ final var actualMode = switch (this.config.mode()) {
+ case AUTOMATIC -> this.getActualModeFromSchedule();
+ case MANUAL_HIGH -> ActualMode.HIGH;
+ case MANUAL_LOW -> ActualMode.LOW;
+ case OFF -> ActualMode.OFF;
+ };
+ var floorTarget = switch (actualMode) {
+ case HIGH -> this.config.highFloorTemperature();
+ case LOW -> this.config.lowFloorTemperature();
+ case OFF -> null;
+ };
+ var ambientTarget = switch (actualMode) {
+ case HIGH -> this.config.highAmbientTemperature();
+ case LOW -> this.config.lowAmbientTemperature();
+ case OFF -> null;
+ };
+ this._setFloorTarget(floorTarget);
+ this._setAmbientTarget(ambientTarget);
+
+ /*
+ * Control floor heating
+ */
+ if (floorActual.isDefined() && floorTarget != null && floorActual.get() < floorTarget) {
+ if (this.config.hasExternalAmbientHeating() //
+ && ambientActual.isDefined() && ambientTarget != null && ambientActual.get() > ambientTarget) {
+ // Switch Floor heating OFF if there is external heating in the room and ambient
+ // target temperature is already met
+ this.switchFloorRelays(Switch.OFF);
+ } else {
+ this.switchFloorRelays(Switch.ON);
+ }
+
+ } else {
+ this.switchFloorRelays(Switch.OFF);
+ }
+
+ /*
+ * Control infrared heating
+ */
+ if (ambientActual.isDefined() && ambientTarget != null && ambientActual.get() < ambientTarget) {
+ this.switchInfraredRelays(Switch.ON);
+ } else {
+ this.switchInfraredRelays(Switch.OFF);
+ }
+ }
+
+ public static enum ActualMode {
+ OFF, LOW, HIGH;
+ }
+
+ /**
+ * Gets the {@link ActualMode} from the Schedule.
+ *
+ * @return the {@link ActualMode}
+ */
+ protected synchronized ActualMode getActualModeFromSchedule() {
+ var hp = this.highPeriod;
+ if (hp == null) {
+ return ActualMode.LOW;
+ }
+ var now = Instant.now(this.clock);
+ if (now.isBefore(hp.from())) {
+ return ActualMode.LOW;
+ }
+ if (now.isAfter(hp.to())) {
+ this.updateHighPeriod();
+ return this.getActualModeFromSchedule();
+ }
+ return ActualMode.HIGH;
+ }
+
+ public static enum Switch {
+ ON, OFF;
+ }
+
+ /**
+ * Switch the Floor Heating Relays.
+ *
+ * @param target the {@link Switch} target
+ */
+ private void switchFloorRelays(Switch target) {
+ this.lastFloorRelayState = this.switchRelays(//
+ this.getFloorRelayChannels(), //
+ this.lastFloorRelayState, //
+ target);
+ }
+
+ /**
+ * Switch the Infrared Heating Relays.
+ *
+ * @param target the {@link Switch} target
+ */
+ private void switchInfraredRelays(Switch target) {
+ this.lastInfraredRelayState = this.switchRelays(//
+ this.getInfraredRelayChannels(), //
+ this.lastInfraredRelayState, //
+ target);
+ }
+
+ private static record RelayState(Instant lastChange, Switch target) {
+ }
+
+ /**
+ * Switches Relays ON or OFF. Does not switch faster than MINIMUM_SWITCHING_TIME
+ * and does not set the command if the Relay is already in correct state.
+ *
+ * @param channels the Relay channels
+ * @param lastRelayState the matching {@link RelayState} information object
+ * @param target the {@link Switch} target
+ * @return a new {@link RelayState} information object
+ */
+ private RelayState switchRelays(List> channels, RelayState lastRelayState, Switch target) {
+ var now = Instant.now(this.clock);
+ if (lastRelayState != null
+ && Duration.between(lastRelayState.lastChange, now).getSeconds() < MINIMUM_SWITCHING_TIME) {
+ // Hysteresis is active
+ return lastRelayState;
+ }
+
+ boolean value = target == Switch.ON;
+ for (var channel : channels) {
+ try {
+ if (channel.value().asOptional().equals(Optional.of(value))) {
+ // it is already in the desired state
+ } else {
+ channel.setNextWriteValue(value);
+ }
+ } catch (OpenemsNamedException e) {
+ this.logError(this.log,
+ "Unable to switch Relay [" + channel.address() + "] " + target.name() + ": " + e.getMessage());
+ }
+ }
+ return new RelayState(now, target);
+ }
+
+ /**
+ * Gets the Floor Heating Relay Channels.
+ *
+ * @return a list of {@link BooleanWriteChannel}s
+ */
+ private List> getFloorRelayChannels() {
+ return getChannels(this.floorRelayComponents, this.floorRelays); //
+ }
+
+ /**
+ * Gets the Infrared Heating Relay Channels.
+ *
+ * @return a list of {@link BooleanWriteChannel}s
+ */
+ private List> getInfraredRelayChannels() {
+ return getChannels(this.infraredRelayComponents, this.infraredRelays); //
+ }
+
+ /**
+ * Gets the Relay Channels from addresses.
+ *
+ * @param components the {@link DigitalOutput} components
+ * @param addresses the {@link ChannelAddress}es of the Relays
+ * @return a list of relay channels
+ */
+ private static List> getChannels(List