diff --git a/.gradle-wrapper/gradle-wrapper.jar b/.gradle-wrapper/gradle-wrapper.jar index d64cd491770..e6441136f3d 100644 Binary files a/.gradle-wrapper/gradle-wrapper.jar and b/.gradle-wrapper/gradle-wrapper.jar differ diff --git a/.gradle-wrapper/gradle-wrapper.properties b/.gradle-wrapper/gradle-wrapper.properties index b82aa23a4f0..a4413138c96 100644 --- a/.gradle-wrapper/gradle-wrapper.properties +++ b/.gradle-wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/build.gradle b/build.gradle index f44c073c365..e5169513417 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,7 @@ subprojects { jacocoTestReport { reports { - xml.required = false + xml.required = true csv.required = true html.required = false } @@ -97,7 +97,7 @@ task cleanEdge() { description 'Clean all Edge-Bundles' subprojects.each { proj -> - if( proj.name ==~ /io.openems.(common|edge|shared|wrapper).*/ ) { + if( proj.name ==~ /io.openems.(common|edge|oem|shared|wrapper).*/ ) { if (proj.tasks.findAll { it.name == 'clean' }) { dependsOn(proj.clean) } @@ -134,7 +134,7 @@ task assembleEdge() { description 'Assemble all Edge-Bundles' subprojects.each { proj -> - if( proj.name ==~ /io.openems.(common|edge|shared|wrapper).*/ ) { + if( proj.name ==~ /io.openems.(common|edge|oem|shared|wrapper).*/ ) { if (proj.tasks.findAll { it.name == 'assemble' }) { dependsOn(proj.assemble) } @@ -191,12 +191,16 @@ task buildEdge() { outputs.upToDateWhen { false } doLast { - file("${buildDir}/openems-edge.jar").delete() + def source = file("io.openems.edge.application/generated/distributions/executable/EdgeApp.jar") + def output = file(System.getenv('OEMS_EDGE_OUTPUT') ?: "${buildDir}/openems-edge.jar") + + output.delete() copy { - from file("io.openems.edge.application/generated/distributions/executable/EdgeApp.jar") - into file("${buildDir}") - rename ("EdgeApp.jar", "openems-edge.jar") + from source + into output.getParentFile() + rename (source.getName(), output.getName()) } + println("Built ${output}!") } } @@ -220,12 +224,16 @@ task buildBackend() { outputs.upToDateWhen { false } doLast { - file("${buildDir}/openems-backend.jar").delete() + def source = file("io.openems.backend.application/generated/distributions/executable/BackendApp.jar") + def output = file(System.getenv('OEMS_BACKEND_OUTPUT') ?: "${buildDir}/openems-backend.jar") + + output.delete() copy { - from file("io.openems.backend.application/generated/distributions/executable/BackendApp.jar") - into file("${buildDir}") - rename ("BackendApp.jar", "openems-backend.jar") + from source + into output.getParentFile() + rename (source.getName(), output.getName()) } + println("Built ${output}!") } } diff --git a/cnf/build.bnd b/cnf/build.bnd index f2e77d03885..c0bce03e8c1 100644 --- a/cnf/build.bnd +++ b/cnf/build.bnd @@ -40,8 +40,8 @@ buildpath: \ org.osgi.service.metatype;version='1.4.1',\ org.osgi.service.metatype.annotations;version='1.4.1',\ org.osgi.util.promise;version='1.2.0',\ - com.google.guava;version='33.1.0.jre',\ - com.google.gson;version='2.10.1',\ + com.google.guava;version='33.2.0.jre',\ + com.google.gson;version='2.11.0',\ testpath: \ slf4j.simple,\ diff --git a/cnf/pom.xml b/cnf/pom.xml index 85ce8d8a776..93688eb6428 100644 --- a/cnf/pom.xml +++ b/cnf/pom.xml @@ -33,12 +33,12 @@ com.google.code.gson gson - 2.10.1 + 2.11.0 com.google.guava guava - 33.1.0-jre + 33.2.0-jre com.google.guava @@ -203,7 +203,7 @@ org.apache.felix org.apache.felix.http.jetty - 5.1.10 + 5.1.14 @@ -271,22 +271,22 @@ com.influxdb influxdb-client-java - 7.0.0 + 7.1.0 com.influxdb influxdb-client-core - 7.0.0 + 7.1.0 com.influxdb influxdb-client-utils - 7.0.0 + 7.1.0 com.influxdb flux-dsl - 7.0.0 + 7.1.0 org.java-websocket @@ -296,12 +296,12 @@ org.jetbrains.kotlin kotlin-osgi-bundle - 1.9.23 + 2.0.0 org.jetbrains.kotlinx kotlinx-coroutines-core-jvm - 1.8.0 + 1.8.1 diff --git a/io.openems.backend.alerting/src/io/openems/backend/alerting/Alerting.java b/io.openems.backend.alerting/src/io/openems/backend/alerting/Alerting.java index 18a93a70acd..3260526018b 100644 --- a/io.openems.backend.alerting/src/io/openems/backend/alerting/Alerting.java +++ b/io.openems.backend.alerting/src/io/openems/backend/alerting/Alerting.java @@ -107,9 +107,9 @@ protected void deactivate() { @Override public void handleEvent(Event event) { - var reader = new EventReader(event); + final var reader = new EventReader(event); for (var h : this.handler) { - var task = h.getEventHandler(reader.getTopic()); + final var task = h.getEventHandler(reader.getTopic()); if (task != null) { this.execute(task, reader); } @@ -122,7 +122,7 @@ private void execute(Consumer consumer, EventReader reader) { @Override public String debugLog() { - int queueSize = this.executor.getQueue().size(); + final int queueSize = this.executor.getQueue().size(); if (queueSize >= THREAD_QUEUE_WARNING_THRESHOLD) { return "%d tasks in the EventHandlerQueue!".formatted(queueSize); } else { diff --git a/io.openems.backend.alerting/src/io/openems/backend/alerting/Handler.java b/io.openems.backend.alerting/src/io/openems/backend/alerting/Handler.java index 2cb06971150..c3a8902eb05 100644 --- a/io.openems.backend.alerting/src/io/openems/backend/alerting/Handler.java +++ b/io.openems.backend.alerting/src/io/openems/backend/alerting/Handler.java @@ -11,7 +11,7 @@ public interface Handler { /** * Stop the Handler. */ - public void stop(); + void stop(); /** * Send the messages. @@ -19,14 +19,14 @@ public interface Handler { * @param sentAt TimeStamp at with sending was initiated * @param messages which to send */ - public void send(ZonedDateTime sentAt, List messages); + void send(ZonedDateTime sentAt, List messages); /** * Return generic type of handler as Class object. * * @return GenericType of handler */ - public Class getGeneric(); + Class getGeneric(); /** * Handle given event. @@ -34,5 +34,5 @@ public interface Handler { * @param eventTopic to handle * @return {@link Consumer} to be scheduled in executor */ - public Consumer getEventHandler(String eventTopic); + Consumer getEventHandler(String eventTopic); } diff --git a/io.openems.backend.alerting/src/io/openems/backend/alerting/Message.java b/io.openems.backend.alerting/src/io/openems/backend/alerting/Message.java index 5525c1fcaa7..d477b56ef49 100644 --- a/io.openems.backend.alerting/src/io/openems/backend/alerting/Message.java +++ b/io.openems.backend.alerting/src/io/openems/backend/alerting/Message.java @@ -57,7 +57,7 @@ public boolean equals(Object obj) { @Override public int compareTo(Message o) { if (o == null) { - return -1; + return 1; } return this.getNotifyStamp().compareTo(o.getNotifyStamp()); } diff --git a/io.openems.backend.alerting/src/io/openems/backend/alerting/handler/OfflineEdgeHandler.java b/io.openems.backend.alerting/src/io/openems/backend/alerting/handler/OfflineEdgeHandler.java index dc5f5cf117d..d93c67b32b8 100644 --- a/io.openems.backend.alerting/src/io/openems/backend/alerting/handler/OfflineEdgeHandler.java +++ b/io.openems.backend.alerting/src/io/openems/backend/alerting/handler/OfflineEdgeHandler.java @@ -41,7 +41,7 @@ public class OfflineEdgeHandler implements Handler { private MessageScheduler msgScheduler; private TimedTask initMetadata; - private TimedExecutor timeService; + private final TimedExecutor timeService; public OfflineEdgeHandler(MessageSchedulerService mss, TimedExecutor timeService, Mailer mailer, Metadata metadata, int initialDelay) { @@ -74,16 +74,16 @@ public void send(ZonedDateTime sentAt, List pack) { return; } - var params = JsonUtils.generateJsonArray(pack, OfflineEdgeMessage::getParams); + final var params = JsonUtils.generateJsonArray(pack, OfflineEdgeMessage::getParams); this.mailer.sendMail(sentAt, OfflineEdgeMessage.TEMPLATE, params); - var logStr = new StringBuilder(pack.size() * 64); + final var logStr = new StringBuilder(pack.size() * 64); pack.forEach(msg -> { logStr.append(msg).append(", "); this.tryReschedule(msg); }); - this.log.info("Sent OfflineEdgeMsg: " + logStr.substring(0, logStr.length() - 2)); + this.log.info("Sent OfflineEdgeMsg: {}", logStr.substring(0, logStr.length() - 2)); } private void tryReschedule(OfflineEdgeMessage msg) { @@ -93,38 +93,37 @@ private void tryReschedule(OfflineEdgeMessage msg) { } private boolean isEdgeOffline(String edgeId) { - var edge = this.metadata.getEdge(edgeId); - if (edge.isPresent()) { - return edge.get().isOffline(); - } - return false; + final var edge = this.metadata.getEdge(edgeId); + return edge.map(Edge::isOffline).orElse(false); } private void checkMetadata() { this.log.info("[OfflineEdgeHandler] check Metadata for Offline Edges"); - var msgs = new LinkedList(); - var count = new AtomicInteger(); - var validOfflineEges = this.metadata.getAllOfflineEdges().stream() // + final var msgs = new LinkedList(); + final var count = new AtomicInteger(); + final var validOfflineEges = this.metadata.getAllOfflineEdges().stream() // .filter(this::isValidEdge) // .toList(); if (validOfflineEges.size() > OfflineEdgeHandler.MAX_SIMULTANEOUS_EDGES) { - this.log.error("[OfflineEdgeHandler] Canceled checkMetadata(); tried to schedule msgs for " - + OfflineEdgeHandler.MAX_SIMULTANEOUS_EDGES + " Offline-Edges at once!!"); + this.log.error( + "[OfflineEdgeHandler] Canceled checkMetadata(); tried to schedule msgs for {} Offline-Edges at once!!", + OfflineEdgeHandler.MAX_SIMULTANEOUS_EDGES); return; } for (var edge : validOfflineEges) { - var msg = this.getEdgeMessage(edge); + final var msg = this.getEdgeMessage(edge); if (msg == null) { continue; } - var completeCnt = count.addAndGet(msg.getMessageCount()); + final var completeCnt = count.addAndGet(msg.getMessageCount()); if (completeCnt > OfflineEdgeHandler.MAX_SIMULTANEOUS_MSGS) { - this.log.error("[OfflineEdgeHandler] Canceled checkMetadata(); tried to schedule over " - + OfflineEdgeHandler.MAX_SIMULTANEOUS_MSGS + " EdgeOffline Messages at once!!"); + this.log.error( + "[OfflineEdgeHandler] Canceled checkMetadata(); tried to schedule over {} EdgeOffline Messages at once!!", + OfflineEdgeHandler.MAX_SIMULTANEOUS_MSGS); return; } @@ -141,7 +140,7 @@ private void checkMetadata() { * @return true if valid */ private boolean isValidEdge(Edge edge) { - var invalid = edge.getLastmessage() == null // was never online + final var invalid = edge.getLastmessage() == null // was never online || edge.getLastmessage() // .isBefore(this.timeService.now().minusWeeks(1)); // already offline for a week return !invalid; @@ -155,16 +154,15 @@ private boolean isValidEdge(Edge edge) { */ protected OfflineEdgeMessage getEdgeMessage(Edge edge) { if (edge == null || edge.getId() == null) { - this.log.warn("Called method getEdgeMessage with " // - + (edge == null ? "Edge{null}" : "Edge{id=null}")); + this.log.warn("Called method getEdgeMessage with {}", (edge == null ? "Edge{null}" : "Edge{id=null}")); return null; } try { - var alertingSettings = this.metadata.getEdgeOfflineAlertingSettings(edge.getId()); + final var alertingSettings = this.metadata.getEdgeOfflineAlertingSettings(edge.getId()); if (alertingSettings == null || alertingSettings.isEmpty()) { return null; } - var message = new OfflineEdgeMessage(edge.getId(), edge.getLastmessage()); + final var message = new OfflineEdgeMessage(edge.getId(), edge.getLastmessage()); for (var setting : alertingSettings) { if (setting.delay() > 0 && this.shouldReceiveMail(edge, setting)) { message.addRecipient(setting); @@ -174,7 +172,7 @@ protected OfflineEdgeMessage getEdgeMessage(Edge edge) { return message; } } catch (OpenemsException e) { - this.log.warn("Could not get alerting settings for " + edge.getId(), e); + this.log.warn("Could not get alerting settings for {}", edge.getId(), e); } return null; } @@ -184,10 +182,10 @@ private boolean shouldReceiveMail(Edge edge, OfflineEdgeAlertingSetting setting) final var edgeOfflineSince = edge.getLastmessage(); var hasNotRecievedMailYet = true; - var neverRecievedAnyMail = lastMailRecievedAt == null; + final var neverRecievedAnyMail = lastMailRecievedAt == null; if (!neverRecievedAnyMail) { - var nextMailRecieveAt = edgeOfflineSince.plus(setting.delay(), ChronoUnit.MINUTES); + final var nextMailRecieveAt = edgeOfflineSince.plus(setting.delay(), ChronoUnit.MINUTES); hasNotRecievedMailYet = nextMailRecieveAt.isAfter(lastMailRecievedAt); } @@ -199,12 +197,13 @@ protected void tryRemoveEdge(Edge edge) { } protected void tryAddEdge(Edge edge) { - if (this.isValidEdge(edge)) { - var msg = this.getEdgeMessage(edge); - var msgScheduler = this.msgScheduler; - if (msg != null && msgScheduler != null) { - this.msgScheduler.schedule(msg); - } + if (!this.isValidEdge(edge)) { + return; + } + final var msg = this.getEdgeMessage(edge); + final var msgScheduler = this.msgScheduler; + if (msg != null && msgScheduler != null) { + this.msgScheduler.schedule(msg); } } @@ -218,7 +217,7 @@ private void handleMetadataAfterInitialize(EventReader event) { if (this.initialDelay <= 0) { this.checkMetadata(); } else { - var executeAt = this.timeService.now().plusMinutes(OfflineEdgeHandler.this.initialDelay); + final var executeAt = this.timeService.now().plusMinutes(OfflineEdgeHandler.this.initialDelay); this.initMetadata = this.timeService.schedule(executeAt, (now) -> { this.checkMetadata(); }); @@ -226,12 +225,12 @@ private void handleMetadataAfterInitialize(EventReader event) { } private void handleOnSetOnline(EventReader event) { - var edgeId = event.getString(Edge.Events.OnSetOnline.EDGE_ID); - var isOnline = event.getBoolean(Edge.Events.OnSetOnline.IS_ONLINE); + final var edgeId = event.getString(Edge.Events.OnSetOnline.EDGE_ID); + final var isOnline = event.getBoolean(Edge.Events.OnSetOnline.IS_ONLINE); - var edgeOpt = this.metadata.getEdge(edgeId); + final var edgeOpt = this.metadata.getEdge(edgeId); if (edgeOpt.isPresent()) { - var edge = edgeOpt.get(); + final var edge = edgeOpt.get(); /* Ensure that the online-state has not changed */ if (edge.isOnline() == isOnline) { if (isOnline) { @@ -245,7 +244,7 @@ private void handleOnSetOnline(EventReader event) { } } } else { - this.log.warn("Edge with id: " + edgeId + " not found"); + this.log.warn("Edge with id: {} not found", edgeId); } } diff --git a/io.openems.backend.alerting/src/io/openems/backend/alerting/handler/SumStateHandler.java b/io.openems.backend.alerting/src/io/openems/backend/alerting/handler/SumStateHandler.java index d61fca0c8ba..39260dd6798 100644 --- a/io.openems.backend.alerting/src/io/openems/backend/alerting/handler/SumStateHandler.java +++ b/io.openems.backend.alerting/src/io/openems/backend/alerting/handler/SumStateHandler.java @@ -36,7 +36,7 @@ public class SumStateHandler implements Handler { private MessageScheduler msgScheduler; private TimedTask initMetadata; - private TimedExecutor timeService; + private final TimedExecutor timeService; public SumStateHandler(MessageSchedulerService mss, TimedExecutor timeService, Mailer mailer, Metadata metadata, int initialDelay) { @@ -62,19 +62,23 @@ public void send(ZonedDateTime sentAt, List pack) { // Ensure Edge is still in error state before sending mail. pack.removeIf((msg) -> !this.isEdgeError(msg.getEdgeId())); - var params = JsonUtils.generateJsonArray(pack.stream().map(SumStateMessage::getParams).toList()); + if (pack.isEmpty()) { + return; + } + + final var params = JsonUtils.generateJsonArray(pack.stream().map(SumStateMessage::getParams).toList()); if (!params.isEmpty()) { this.mailer.sendMail(sentAt, SumStateMessage.TEMPLATE, params); } - var logStrBuilder = new StringBuilder(pack.size() * 64); + final var logStrBuilder = new StringBuilder(pack.size() * 64); pack.forEach(msg -> { logStrBuilder.append(msg).append(", "); this.tryReschedule(msg); }); - var logStr = logStrBuilder.toString(); + final var logStr = logStrBuilder.toString(); if (!logStr.isBlank()) { - this.log.info("Sent ErrorEdgeMsg: " + logStr); + this.log.info("Sent ErrorEdgeMsg: {}", logStr); } } @@ -85,12 +89,8 @@ private void tryReschedule(SumStateMessage msg) { } private boolean isEdgeError(String edgeId) { - var sumState = this.metadata.getSumState(edgeId); - if (sumState.isPresent()) { - return this.isSevere(sumState.get()); - } else { - return false; - } + final var sumState = this.metadata.getEdge(edgeId).map(Edge::getSumState); + return sumState.map(this::isSevere).orElse(false); } private boolean isSevere(Level level) { @@ -107,8 +107,8 @@ private boolean isSevere(Level level) { */ protected SumStateMessage getEdgeMessage(Edge edge, Level sumState) throws OpenemsException { if (edge == null || edge.getId() == null) { - this.log.warn("Called method SumStateHandler.getEdgeMessage with " // - + (edge == null ? "Edge{null}" : "Edge{id=null}")); + this.log.warn("Called method SumStateHandler.getEdgeMessage with {}", + (edge == null ? "Edge{null}" : "Edge{id=null}")); return null; } else if (edge.isOffline()) { this.log.warn("Called method SumStateHandler.getEdgeMessage with offline" // @@ -116,9 +116,8 @@ protected SumStateMessage getEdgeMessage(Edge edge, Level sumState) throws Opene return null; } try { - var sumStateSettings = this.metadata.getSumStateAlertingSettings(edge.getId()); - var message = new SumStateMessage(edge.getId(), sumState, this.timeService.now(), sumStateSettings); - return message; + final var sumStateSettings = this.metadata.getSumStateAlertingSettings(edge.getId()); + return new SumStateMessage(edge.getId(), sumState, this.timeService.now(), sumStateSettings); } catch (OpenemsException e) { throw new OpenemsException("Could not get alerting settings for " + edge.getId(), e); } @@ -129,14 +128,14 @@ protected void tryRemoveEdge(String edgeId) { } protected void addOrUpdate(Edge edge, Level sumState) { - var oldMsg = this.msgScheduler.remove(edge.getId()); + final var oldMsg = this.msgScheduler.remove(edge.getId()); if (oldMsg == null) { if (this.faultSince.containsKey(edge.getId())) { return; } try { - var newMsg = this.getEdgeMessage(edge, sumState); + final var newMsg = this.getEdgeMessage(edge, sumState); if (newMsg != null && !newMsg.isEmpty()) { this.msgScheduler.schedule(newMsg); } @@ -168,12 +167,12 @@ private void handleEdgeOnSetSumState(EventReader event) { if (this.isSevere(level)) { final var edgeOpt = this.metadata.getEdge(edgeId); - if (edgeOpt.isEmpty()) { - this.log.warn("Edge with id '" + edgeId + "' was not found!"); + if (edgeOpt.isPresent()) { + this.addOrUpdate(edgeOpt.get(), level); + this.faultSince.putIfAbsent(edgeId, this.timeService.now()); + } else { + this.log.warn("Edge with id '{}' was not found!", edgeId); } - this.addOrUpdate(edgeOpt.get(), level); - - this.faultSince.putIfAbsent(edgeId, this.timeService.now()); } else { this.tryRemoveEdge(edgeId); diff --git a/io.openems.backend.alerting/src/io/openems/backend/alerting/message/OfflineEdgeMessage.java b/io.openems.backend.alerting/src/io/openems/backend/alerting/message/OfflineEdgeMessage.java index 949cffa2712..6521716bae8 100644 --- a/io.openems.backend.alerting/src/io/openems/backend/alerting/message/OfflineEdgeMessage.java +++ b/io.openems.backend.alerting/src/io/openems/backend/alerting/message/OfflineEdgeMessage.java @@ -33,7 +33,7 @@ public OfflineEdgeMessage(String edgeId, ZonedDateTime offlineAt) { @Override public ZonedDateTime getNotifyStamp() { - var minutes = this.recipients.isEmpty() ? 0 : this.recipients.firstKey(); + final var minutes = this.recipients.isEmpty() ? 0 : this.recipients.firstKey(); return this.offlineAt.plusMinutes(minutes); } @@ -44,7 +44,7 @@ public ZonedDateTime getNotifyStamp() { */ public void addRecipient(OfflineEdgeAlertingSetting setting) { this.recipients.putIfAbsent(setting.delay(), new ArrayList<>()); - var settings = this.recipients.get(setting.delay()); + final var settings = this.recipients.get(setting.delay()); settings.add(setting); } @@ -85,7 +85,7 @@ public JsonObject getParams() { @Override public String toString() { - var rec = this.getCurrentRecipients().stream() // + final var rec = this.getCurrentRecipients().stream() // .map(s -> String.valueOf(s.userLogin())) // .collect(Collectors.joining(",")); return OfflineEdgeMessage.class.getSimpleName() + "{for=" + this.getEdgeId() + ", to=[" + rec + "], at=" diff --git a/io.openems.backend.alerting/src/io/openems/backend/alerting/message/SumStateMessage.java b/io.openems.backend.alerting/src/io/openems/backend/alerting/message/SumStateMessage.java index a7b5863234a..c41ee938b11 100644 --- a/io.openems.backend.alerting/src/io/openems/backend/alerting/message/SumStateMessage.java +++ b/io.openems.backend.alerting/src/io/openems/backend/alerting/message/SumStateMessage.java @@ -90,10 +90,10 @@ public JsonObject getParams() { @Override public String toString() { - var localNotify = this.getNotifyStamp().withZoneSameInstant(ZoneId.systemDefault()).toString(); - var localSince = this.getStateSince().withZoneSameInstant(ZoneId.systemDefault()).toString(); + final var localNotify = this.getNotifyStamp().withZoneSameInstant(ZoneId.systemDefault()).toString(); + final var localSince = this.getStateSince().withZoneSameInstant(ZoneId.systemDefault()).toString(); - var rec = this.getCurrentRecipients().stream() // + final var rec = this.getCurrentRecipients().stream() // .map(s -> String.valueOf(s.userLogin())) // .collect(Collectors.joining(",")); diff --git a/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/MessageScheduler.java b/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/MessageScheduler.java index 7f0598cabfe..7585adf772c 100644 --- a/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/MessageScheduler.java +++ b/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/MessageScheduler.java @@ -121,7 +121,7 @@ private boolean hasTimeElapsed(ZonedDateTime now, T msg) { private T poll() { synchronized (this) { - var msg = this.queue.poll(); + final var msg = this.queue.poll(); if (msg != null) { this.messageForId.remove(msg.getId()); } diff --git a/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/MessageSchedulerService.java b/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/MessageSchedulerService.java index eeaca43f9da..3ac6985e32a 100644 --- a/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/MessageSchedulerService.java +++ b/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/MessageSchedulerService.java @@ -17,7 +17,7 @@ public interface MessageSchedulerService { * @param handler to register * @return new MessageScheduler for handler to schedule messages with */ - public MessageScheduler register(Handler handler); + MessageScheduler register(Handler handler); /** * Unregister handler for message scheduling and remove MessageScheduler. @@ -25,6 +25,6 @@ public interface MessageSchedulerService { * @param type of message * @param handler to unregister */ - public void unregister(Handler handler); + void unregister(Handler handler); } diff --git a/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/MinuteTimer.java b/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/MinuteTimer.java index b21357bb0d9..5668e4e0821 100644 --- a/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/MinuteTimer.java +++ b/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/MinuteTimer.java @@ -4,7 +4,7 @@ import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.List; -import java.util.PriorityQueue; +import java.util.concurrent.PriorityBlockingQueue; import java.util.function.Consumer; import org.slf4j.Logger; @@ -21,7 +21,7 @@ public class MinuteTimer implements TimedExecutor { private final Logger log = LoggerFactory.getLogger(MinuteTimer.class); private final List> subscriber = new ArrayList<>(); - private final PriorityQueue singleTasks = new PriorityQueue<>(); + private final PriorityBlockingQueue singleTasks = new PriorityBlockingQueue<>(); private final Clock clock; private long cycleCount = 0; @@ -73,7 +73,7 @@ public void unsubscribe(Consumer sub) { */ @Override public TimedTask schedule(ZonedDateTime at, Consumer task) { - var singleTask = new TimedTask(at, task); + final var singleTask = new TimedTask(at, task); this.singleTasks.add(singleTask); return singleTask; } @@ -95,10 +95,11 @@ private synchronized boolean empty() { } protected synchronized void start() { - if (!this.isRunning) { - this.log.debug("START"); - this.isRunning = true; + if (this.isRunning) { + return; } + this.log.debug("START"); + this.isRunning = true; } private void logDebugInfos() { @@ -115,7 +116,7 @@ protected synchronized void cycle() { this.cycleCount++; this.logDebugInfos(); - var now = this.now(); + final var now = this.now(); this.callSubscriber(now); this.callSingleTasks(now); @@ -147,10 +148,11 @@ private void callSingleTasks(ZonedDateTime now) { } protected synchronized void stop() { - if (this.isRunning) { - this.log.debug("STOP"); - this.isRunning = false; + if (!this.isRunning) { + return; } + this.log.debug("STOP"); + this.isRunning = false; } public int getSubscriberCount() { diff --git a/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/MinuteTimerAsync.java b/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/MinuteTimerAsync.java index bb73b81e4c1..121b3e954e4 100644 --- a/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/MinuteTimerAsync.java +++ b/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/MinuteTimerAsync.java @@ -53,9 +53,10 @@ public void unsubscribe(Consumer sub) { @Override protected void stop() { super.stop(); - if (this.scheduler != null) { - this.scheduler.shutdownNow(); - this.scheduler = null; + if (this.scheduler == null) { + return; } + this.scheduler.shutdownNow(); + this.scheduler = null; } } diff --git a/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/Scheduler.java b/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/Scheduler.java index cc6930f132d..ac069f6839b 100644 --- a/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/Scheduler.java +++ b/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/Scheduler.java @@ -33,7 +33,7 @@ public Scheduler() { @Override public MessageScheduler register(Handler handler) { - var msgSch = new MessageScheduler<>(handler); + final var msgSch = new MessageScheduler<>(handler); this.msgScheduler.add(msgSch); return msgSch; } diff --git a/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/TimedExecutor.java b/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/TimedExecutor.java index fc37e9beee6..debb78c6cbf 100644 --- a/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/TimedExecutor.java +++ b/io.openems.backend.alerting/src/io/openems/backend/alerting/scheduler/TimedExecutor.java @@ -15,8 +15,11 @@ public TimedTask(ZonedDateTime executeAt, Consumer task) { } @Override - public int compareTo(TimedTask o) { - return this.executeAt.compareTo(o.executeAt); + public int compareTo(TimedTask other) { + if (other == null || other.executeAt == null) { + return 1; + } + return this.executeAt.compareTo(other.executeAt); } } diff --git a/io.openems.backend.alerting/test/io/openems/backend/alerting/Dummy.java b/io.openems.backend.alerting/test/io/openems/backend/alerting/Dummy.java index 2d87c796bdb..84d406508e8 100644 --- a/io.openems.backend.alerting/test/io/openems/backend/alerting/Dummy.java +++ b/io.openems.backend.alerting/test/io/openems/backend/alerting/Dummy.java @@ -6,7 +6,6 @@ import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -104,7 +103,6 @@ public static class AlertingMetadataImpl extends SimpleMetadataImpl { private Collection edges; private Map> offlineSettings; private Map> sumStateSettings; - private Map sumStates = new HashMap<>(10); /** * Initialize Metadata with test data for Offline-Alerting. @@ -157,11 +155,11 @@ public List getSumStateAlertingSettings(String edgeId) @Override public Optional getSumState(String edgeId) { - return Optional.ofNullable(this.sumStates.get(edgeId)); + return this.getEdge(edgeId).map(Edge::getSumState); } public void setSumState(String edgeId, Level sumState) { - this.sumStates.put(edgeId, sumState); + this.getEdge(edgeId).ifPresent(e -> e.setSumState(sumState)); } public Collection getEdges() { diff --git a/io.openems.backend.alerting/test/io/openems/backend/alerting/MessageTest.java b/io.openems.backend.alerting/test/io/openems/backend/alerting/MessageTest.java index 95b9588877c..d1e2296f3c2 100644 --- a/io.openems.backend.alerting/test/io/openems/backend/alerting/MessageTest.java +++ b/io.openems.backend.alerting/test/io/openems/backend/alerting/MessageTest.java @@ -33,8 +33,10 @@ public void testMessage() { assertNotEquals(msg10.hashCode(), msg20.hashCode()); assertNotEquals(msg10.hashCode(), null); - assertTrue("", msg10.compareTo(msg11) > 0); - assertTrue("", msg10.compareTo(msg20) < 0); + assertTrue("msg10 should be greater than msg11", msg10.compareTo(msg11) > 0); + assertTrue("msg10 should be lower than msg20", msg10.compareTo(msg20) < 0); + + assertTrue("msg10 should be greater than null", msg10.compareTo(null) > 0); } /* *********************************************** */ diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun index 93014f953ba..4b2a142e8e8 100644 --- a/io.openems.backend.application/BackendApp.bndrun +++ b/io.openems.backend.application/BackendApp.bndrun @@ -60,8 +60,8 @@ -runbundles: \ Java-WebSocket;version='[1.5.4,1.5.5)',\ - com.google.gson;version='[2.10.1,2.10.2)',\ - com.google.guava;version='[33.1.0,33.1.1)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ + com.google.guava;version='[33.2.0,33.2.1)',\ com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\ com.squareup.okio;version='[3.9.0,3.9.1)',\ com.zaxxer.HikariCP;version='[5.1.0,5.1.1)',\ @@ -104,14 +104,14 @@ 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.10,5.1.11)',\ + org.apache.felix.http.jetty;version='[5.1.14,5.1.15)',\ 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)',\ org.apache.felix.scr;version='[2.2.10,2.2.11)',\ org.apache.felix.webconsole;version='[5.0.2,5.0.3)',\ org.apache.felix.webconsole.plugins.ds;version='[2.3.0,2.3.1)',\ - org.jetbrains.kotlin.osgi-bundle;version='[1.9.23,1.9.24)',\ + org.jetbrains.kotlin.osgi-bundle;version='[2.0.0,2.0.1)',\ org.jsr-305;version='[3.0.2,3.0.3)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.2.1,2.2.2)',\ org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.1,2.2.2)',\ diff --git a/io.openems.backend.b2bwebsocket/test/io/openems/backend/b2bwebsocket/B2bWebsocketTest.java b/io.openems.backend.b2bwebsocket/test/io/openems/backend/b2bwebsocket/B2bWebsocketTest.java index b53a401b2a2..b56f303d50c 100644 --- a/io.openems.backend.b2bwebsocket/test/io/openems/backend/b2bwebsocket/B2bWebsocketTest.java +++ b/io.openems.backend.b2bwebsocket/test/io/openems/backend/b2bwebsocket/B2bWebsocketTest.java @@ -8,6 +8,8 @@ import java.util.Map; import java.util.concurrent.ExecutionException; +import org.junit.Test; + import io.openems.backend.b2bwebsocket.jsonrpc.request.SubscribeEdgesChannelsRequest; import io.openems.backend.common.jsonrpc.request.GetEdgesChannelsValuesRequest; import io.openems.backend.common.jsonrpc.request.GetEdgesStatusRequest; @@ -30,20 +32,6 @@ public class B2bWebsocketTest { private static final String USERNAME = "user"; private static final String PASSWORD = "password"; - /** - * Main. - * - * @param args the args - * @throws Exception on error - */ - public static void main(String[] args) throws Exception { - getEdgesStatusRequest(); - getEdgeConfigRequest(); - getEdgesChannelsValuesRequest(); - subscribeEdgesChannelsRequest(); - setGridConnSchedule(); - } - private static TestClient prepareTestClient() throws URISyntaxException, InterruptedException { Map httpHeaders = new HashMap<>(); var auth = new String( @@ -55,7 +43,8 @@ private static TestClient prepareTestClient() throws URISyntaxException, Interru return client; } - private static void getEdgesStatusRequest() throws Exception { + @Test + public void getEdgesStatusRequest() throws Exception { var client = B2bWebsocketTest.prepareTestClient(); var request = new GetEdgesStatusRequest("edge0"); @@ -68,7 +57,8 @@ private static void getEdgesStatusRequest() throws Exception { client.stop(); } - private static void getEdgeConfigRequest() throws Exception { + @Test + public void getEdgeConfigRequest() throws Exception { var client = B2bWebsocketTest.prepareTestClient(); var request = new EdgeRpcRequest("edge0", new GetEdgeConfigRequest()); @@ -81,7 +71,8 @@ private static void getEdgeConfigRequest() throws Exception { client.stop(); } - private static void getEdgesChannelsValuesRequest() throws Exception { + @Test + public void getEdgesChannelsValuesRequest() throws Exception { var client = B2bWebsocketTest.prepareTestClient(); var request = new GetEdgesChannelsValuesRequest(); @@ -97,7 +88,8 @@ private static void getEdgesChannelsValuesRequest() throws Exception { client.stop(); } - private static void subscribeEdgesChannelsRequest() throws Exception { + @Test + public void subscribeEdgesChannelsRequest() throws Exception { var client = B2bWebsocketTest.prepareTestClient(); client.setOnNotification((ws, notification) -> { System.out.println(notification.toString()); @@ -114,11 +106,11 @@ private static void subscribeEdgesChannelsRequest() throws Exception { System.out.println(e.getMessage()); } - Thread.sleep(10000); client.stop(); } - private static void setGridConnSchedule() throws Exception { + @Test + public void setGridConnSchedule() throws Exception { var client = B2bWebsocketTest.prepareTestClient(); var request = new SetGridConnScheduleRequest("edge0"); diff --git a/io.openems.backend.common/src/io/openems/backend/common/metadata/Edge.java b/io.openems.backend.common/src/io/openems/backend/common/metadata/Edge.java index b5940b7d971..c5879b522d6 100644 --- a/io.openems.backend.common/src/io/openems/backend/common/metadata/Edge.java +++ b/io.openems.backend.common/src/io/openems/backend/common/metadata/Edge.java @@ -13,6 +13,7 @@ import com.google.gson.JsonObject; import io.openems.backend.common.event.BackendEventConstants; +import io.openems.common.channel.Level; import io.openems.common.event.EventBuilder; import io.openems.common.types.SemanticVersion; import io.openems.common.utils.JsonUtils; @@ -28,6 +29,7 @@ public class Edge { private final AtomicReference producttype = new AtomicReference<>(""); private final AtomicReference lastmessage = new AtomicReference<>(null); private boolean isOnline = false; + private final AtomicReference sumState = new AtomicReference<>(null); private final List user; @@ -72,6 +74,7 @@ public JsonObject toJsonObject() { .addProperty("version", this.version.get().toString()) // .addProperty("producttype", this.producttype.get()) // .addProperty("online", this.isOnline) // + .addProperty("sumState", this.sumState.get()) // .addPropertyIfNotNull("lastmessage", this.lastmessage.get()) // .build(); } @@ -84,7 +87,8 @@ public String toString() { + "version=" + this.version + ", " // + "producttype=" + this.producttype + ", " // + "lastmessage=" + this.lastmessage + ", " // - + "isOnline=" + this.isOnline // + + "isOnline=" + this.isOnline + ", " // + + "sumState=" + this.sumState // + "]"; } @@ -234,6 +238,29 @@ public List getUser() { return this.user; } + /* + * SumState + */ + public Level getSumState() { + return this.sumState.get(); + } + + /** + * Sets the sumState and emits a ON_SET_SUM_STATE event. + * + * @param sumState the sumState + */ + public void setSumState(Level sumState) { + Level oldState = this.sumState.getAndSet(sumState); + if (!Objects.equal(oldState, sumState)) { // on change + EventBuilder.from(this.parent.getEventAdmin(), Events.ON_SET_SUM_STATE) // + .addArg(Events.OnSetSumState.EDGE_ID, this.id) // + .addArg(Events.OnSetSumState.OLD_SUM_STATE, oldState) // + .addArg(Events.OnSetSumState.SUM_STATE, sumState) // + .send(); + } + } + /** * Defines all Events an Edge can throw. */ @@ -271,6 +298,7 @@ public static final class OnSetProducttype { public static final class OnSetSumState { public static final String EDGE_ID = "EdgeId:String"; + public static final String OLD_SUM_STATE = "OldSumState:Level"; public static final String SUM_STATE = "SumState:Level"; } diff --git a/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/OnNotification.java b/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/OnNotification.java index 7254b84e0f3..3f6c0498372 100644 --- a/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/OnNotification.java +++ b/io.openems.backend.edgewebsocket/src/io/openems/backend/edgewebsocket/OnNotification.java @@ -145,10 +145,7 @@ private void handleDataNotification(AbstractDataNotification message, WsData wsD // set specific Edge values if (d.has("_sum/State") && d.get("_sum/State").isJsonPrimitive()) { var sumState = Level.fromJson(d, "_sum/State").orElse(Level.FAULT); - EventBuilder.from(this.parent.eventAdmin, Events.ON_SET_SUM_STATE) - .addArg(Events.OnSetSumState.EDGE_ID, edgeId) // - .addArg(Events.OnSetSumState.SUM_STATE, sumState) // - .send(); + edge.setSumState(sumState); } if (d.has("_meta/Version") && d.get("_meta/Version").isJsonPrimitive()) { diff --git a/io.openems.common/src/io/openems/common/OpenemsConstants.java b/io.openems.common/src/io/openems/common/OpenemsConstants.java index 4597a187f45..9d13d5d36a0 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 = 5; + public static final short VERSION_MINOR = 6; /** * The patch version of OpenEMS. diff --git a/io.openems.common/src/io/openems/common/function/TriConsumer.java b/io.openems.common/src/io/openems/common/function/TriConsumer.java new file mode 100644 index 00000000000..f5cb703c4a2 --- /dev/null +++ b/io.openems.common/src/io/openems/common/function/TriConsumer.java @@ -0,0 +1,26 @@ +package io.openems.common.function; + +import java.util.function.BiConsumer; + +/** + * This interface is similar to the java.util interface {@link BiConsumer}. + * Difference is, that it allows to pass to the apply() method one more + * parameter. + * + * @param the apply methods first argument type + * @param the apply methods second argument type + * @param the apply methods third argument type + */ +@FunctionalInterface +public interface TriConsumer { + + /** + * Applies this function to the given arguments. + * + * @param t the first function argument + * @param u the second function argument + * @param v the third function argument + */ + public void accept(T t, U u, V v); + +} 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 270154f1318..63558ed64b3 100644 --- a/io.openems.common/src/io/openems/common/oem/DummyOpenemsEdgeOem.java +++ b/io.openems.common/src/io/openems/common/oem/DummyOpenemsEdgeOem.java @@ -65,6 +65,7 @@ public SystemUpdateParams getSystemUpdateParams() { .put("App.FENECON.Industrial.S.ISK011", "https://fenecon.de/fenecon-industrial-s/") // .put("App.TimeOfUseTariff.Awattar", "") // .put("App.TimeOfUseTariff.ENTSO-E", "") // + .put("App.TimeOfUseTariff.RabotCharge", "") // .put("App.TimeOfUseTariff.Stromdao", "") // .put("App.TimeOfUseTariff.Tibber", "") // .put("App.Api.ModbusTcp.ReadOnly", "") // @@ -125,4 +126,4 @@ public static void assertAllWebsiteUrlsSet(OpenemsEdgeOem oem) throws OpenemsExc throw new OpenemsException("Missing Website-URLs in Edge-OEM for [" + String.join(", ", missing) + "]"); } } -} \ No newline at end of file +} diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun index 0e5c289c8f1..1ca35b83f67 100644 --- a/io.openems.edge.application/EdgeApp.bndrun +++ b/io.openems.edge.application/EdgeApp.bndrun @@ -185,6 +185,7 @@ bnd.identity;id='io.openems.edge.timeofusetariff.awattar',\ bnd.identity;id='io.openems.edge.timeofusetariff.corrently',\ bnd.identity;id='io.openems.edge.timeofusetariff.entsoe',\ + bnd.identity;id='io.openems.edge.timeofusetariff.rabotcharge',\ bnd.identity;id='io.openems.edge.timeofusetariff.tibber',\ -runbundles: \ @@ -194,8 +195,8 @@ bcutil;version='[1.70.0,1.70.1)',\ 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.10.1,2.10.2)',\ - com.google.guava;version='[33.1.0,33.1.1)',\ + com.google.gson;version='[2.11.0,2.11.1)',\ + com.google.guava;version='[33.2.0,33.2.1)',\ com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\ com.squareup.okio;version='[3.9.0,3.9.1)',\ com.sun.jna;version='[5.14.0,5.14.1)',\ @@ -362,6 +363,7 @@ io.openems.edge.timeofusetariff.awattar;version=snapshot,\ io.openems.edge.timeofusetariff.corrently;version=snapshot,\ io.openems.edge.timeofusetariff.entsoe;version=snapshot,\ + io.openems.edge.timeofusetariff.rabotcharge;version=snapshot,\ io.openems.edge.timeofusetariff.tibber;version=snapshot,\ io.openems.oem.openems;version=snapshot,\ io.openems.shared.influxdb;version=snapshot,\ @@ -392,7 +394,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.10,5.1.11)',\ + org.apache.felix.http.jetty;version='[5.1.14,5.1.15)',\ 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)',\ @@ -404,7 +406,7 @@ 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='[1.9.23,1.9.24)',\ + org.jetbrains.kotlin.osgi-bundle;version='[2.0.0,2.0.1)',\ org.jsoup;version='[1.17.2,1.17.3)',\ org.jsr-305;version='[3.0.2,3.0.3)',\ org.openmuc.jmbus;version='[3.3.0,3.3.1)',\ diff --git a/io.openems.edge.battery.api/src/io/openems/edge/battery/api/Battery.java b/io.openems.edge.battery.api/src/io/openems/edge/battery/api/Battery.java index c8cfdaf41e9..a0ccf59f1fe 100644 --- a/io.openems.edge.battery.api/src/io/openems/edge/battery/api/Battery.java +++ b/io.openems.edge.battery.api/src/io/openems/edge/battery/api/Battery.java @@ -207,7 +207,21 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId { */ MAX_CELL_VOLTAGE(Doc.of(OpenemsType.INTEGER) // .unit(Unit.MILLIVOLT) // - .persistencePriority(PersistencePriority.HIGH)); + .persistencePriority(PersistencePriority.HIGH)), // + + /** + * Battery Inner Resistance. + * + *

    + *
  • Interface: Battery + *
  • Type: Integer + *
  • Unit: mOhm + *
+ */ + INNER_RESISTANCE(Doc.of(OpenemsType.INTEGER) // + .unit(Unit.MILLIOHM) // + .persistencePriority(PersistencePriority.MEDIUM)), // + ; private final Doc doc; @@ -243,6 +257,7 @@ public static ModbusSlaveNatureTable getModbusSlaveNatureTable(AccessMode access .channel(18, ChannelId.MAX_CELL_TEMPERATURE, ModbusType.FLOAT32) // .channel(20, ChannelId.MIN_CELL_VOLTAGE, ModbusType.FLOAT32) // .channel(22, ChannelId.MAX_CELL_VOLTAGE, ModbusType.FLOAT32) // + .channel(24, ChannelId.INNER_RESISTANCE, ModbusType.FLOAT32) // .build(); } @@ -736,6 +751,44 @@ public default void _setMaxCellVoltage(int value) { this.getMaxCellVoltageChannel().setNextValue(value); } + /** + * Gets the Channel for {@link ChannelId#INNER_RESISTANCE}. + * + * @return the Channel + */ + public default IntegerReadChannel getInnerResistanceChannel() { + return this.channel(ChannelId.INNER_RESISTANCE); + } + + /** + * Gets the Inner Resistance [mOhm]. See {@link ChannelId#INNER_RESISTANCE}. + * + * @return the Channel {@link Value} + */ + public default Value getInnerResistance() { + return this.getInnerResistanceChannel().value(); + } + + /** + * Internal method to set the 'nextValue' on {@link ChannelId#INNER_RESISTANCE} + * Channel. + * + * @param value the next value + */ + public default void _setInnerResistance(Integer value) { + this.getInnerResistanceChannel().setNextValue(value); + } + + /** + * Internal method to set the 'nextValue' on {@link ChannelId#INNER_RESISTANCE} + * Channel. + * + * @param value the next value + */ + public default void _setInnerResistance(int value) { + this.getInnerResistanceChannel().setNextValue(value); + } + /** * Generates a default DebugLog message for {@link Battery} implementations with * a State-Machine. diff --git a/io.openems.edge.battery.api/src/io/openems/edge/battery/protection/BatteryProtection.java b/io.openems.edge.battery.api/src/io/openems/edge/battery/protection/BatteryProtection.java index 51d94b397d2..44cf766ce8b 100644 --- a/io.openems.edge.battery.api/src/io/openems/edge/battery/protection/BatteryProtection.java +++ b/io.openems.edge.battery.api/src/io/openems/edge/battery/protection/BatteryProtection.java @@ -192,6 +192,18 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId { */ BP_FORCE_CHARGE(Doc.of(AbstractForceChargeDischarge.State.values()) // .persistencePriority(PersistencePriority.MEDIUM)), // + + /** + * Battery Max Ever Current. + * + *
    + *
  • Interface: BatteryProtection + *
+ */ + BP_MAX_EVER_CURRENT(Doc.of(OpenemsType.INTEGER) // + .unit(Unit.AMPERE) // + .persistencePriority(PersistencePriority.MEDIUM)), // + ; private final Doc doc; 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 fc472e48f7c..83c84e4d6a1 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 @@ -6,6 +6,7 @@ import io.openems.common.exceptions.OpenemsError.OpenemsNamedException; import io.openems.edge.battery.api.Battery; +import io.openems.edge.battery.protection.BatteryProtection; import io.openems.edge.battery.protection.BatteryProtection.ChannelId; import io.openems.edge.battery.protection.force.AbstractForceChargeDischarge; import io.openems.edge.common.channel.IntegerReadChannel; @@ -234,6 +235,7 @@ public synchronized int calculateCurrentLimit(Battery battery) { /* * Store limits in Channels. If value is 'null', store the bmsMaxEverCurrent */ + battery.channel(BatteryProtection.ChannelId.BP_MAX_EVER_CURRENT).setNextValue(this.bmsMaxEverCurrent); battery.channel(this.getBpMinVoltageChannelId()) .setNextValue(TypeUtils.orElse(minCellVoltageLimit, this.bmsMaxEverCurrent)); battery.channel(this.getBpMaxVoltageChannelId()) diff --git a/io.openems.edge.battery.api/src/io/openems/edge/battery/test/AbstractDummyBattery.java b/io.openems.edge.battery.api/src/io/openems/edge/battery/test/AbstractDummyBattery.java index 0533af8c760..cf0252cf904 100644 --- a/io.openems.edge.battery.api/src/io/openems/edge/battery/test/AbstractDummyBattery.java +++ b/io.openems.edge.battery.api/src/io/openems/edge/battery/test/AbstractDummyBattery.java @@ -174,4 +174,15 @@ public final SELF withMaxCellTemperature(int value) { return this.self(); } + /** + * Set {@link Battery.ChannelId#INNER_RESISTANCE}. + * + * @param value the value + * @return myself + */ + public final SELF withInnerResistence(int value) { + TestUtils.withValue(this, Battery.ChannelId.INNER_RESISTANCE, value); + return this.self(); + } + } diff --git a/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/BatteryFeneconHome.java b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/BatteryFeneconHome.java index f362fe3dea4..9de0fccbd03 100644 --- a/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/BatteryFeneconHome.java +++ b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/BatteryFeneconHome.java @@ -12,12 +12,13 @@ import io.openems.edge.common.channel.Doc; import io.openems.edge.common.channel.IntegerDoc; import io.openems.edge.common.channel.IntegerReadChannel; +import io.openems.edge.common.channel.StateChannel; import io.openems.edge.common.channel.value.Value; import io.openems.edge.common.component.OpenemsComponent; import io.openems.edge.common.startstop.StartStop; import io.openems.edge.common.startstop.StartStoppable; -public interface BatteryFeneconHome extends Battery, ModbusComponent, OpenemsComponent, StartStoppable { +public interface BatteryFeneconHome extends Battery, ModbusComponent, OpenemsComponent, StartStoppable, ModbusHelper { /** * Gets the Channel for {@link ChannelId#BMS_CONTROL}. @@ -673,6 +674,16 @@ public static enum ChannelId implements io.openems.edge.common.channel.ChannelId .text("Current State of State-Machine")), // RUN_FAILED(Doc.of(Level.FAULT) // .text("Running the Logic failed")), // + LOW_MIN_VOLTAGE_WARNING(Doc.of(Level.WARNING) // + .text("Low min voltage warning " + + "| Niedriger Ladezustand der Batterie, da die Batterie nicht durch den Wechselrichter beladen werden kann. Ohne Beladung schaltet sich die Batterie demnächst ab, um sich selbst zu schützen")), + LOW_MIN_VOLTAGE_FAULT(Doc.of(Level.FAULT) // + .text("Low min voltage fault " + + "| Niedriger Ladezustand. Die Batterie schaltet sich demnächst ab, um sich selbst zu schützen")), + LOW_MIN_VOLTAGE_FAULT_BATTERY_STOPPED(Doc.of(Level.FAULT) // + .text("Low min voltage fault - Battery stopped " + + "| Batterie wurde wegen zu niedrigem Ladezustand abgeschaltet. Bitte kontaktieren Sie Ihren Installateur")), + ; private final Doc doc; @@ -686,4 +697,91 @@ public Doc doc() { return this.doc; } } + + /** + * Gets the Channel for {@link ChannelId#LOW_MIN_VOLTAGE_WARNING}. + * + * @return the Channel + */ + public default StateChannel getLowMinVoltageWarningChannel() { + return this.channel(ChannelId.LOW_MIN_VOLTAGE_WARNING); + } + + /** + * Gets the Warning state channel for a low minimum voltage. See + * {@link ChannelId#LOW_MIN_VOLTAGE_WARNING}. + * + * @return the Channel {@link Value} + */ + public default Value getLowMinVoltageWarning() { + return this.getLowMinVoltageWarningChannel().value(); + } + + /** + * Internal method to set the 'nextValue' on + * {@link ChannelId#LOW_MIN_VOLTAGE_WARNING} Channel. + * + * @param value the next value + */ + public default void _setLowMinVoltageWarning(boolean value) { + this.getLowMinVoltageWarningChannel().setNextValue(value); + } + + /** + * Gets the Channel for {@link ChannelId#LOW_MIN_VOLTAGE_FAULT}. + * + * @return the Channel + */ + public default StateChannel getLowMinVoltageFaultChannel() { + return this.channel(ChannelId.LOW_MIN_VOLTAGE_FAULT); + } + + /** + * Gets the fault state channel for a low minimum voltage. See + * {@link ChannelId#LOW_MIN_VOLTAGE_FAULT}. + * + * @return the Channel {@link Value} + */ + public default Value getLowMinVoltage() { + return this.getLowMinVoltageFaultChannel().value(); + } + + /** + * Internal method to set the 'nextValue' on + * {@link ChannelId#LOW_MIN_VOLTAGE_FAULT} Channel. + * + * @param value the next value + */ + public default void _setLowMinVoltageFault(boolean value) { + this.getLowMinVoltageFaultChannel().setNextValue(value); + } + + /** + * Gets the Channel for {@link ChannelId#LOW_MIN_VOLTAGE_FAULT_BATTERY_STOPPED}. + * + * @return the Channel + */ + public default StateChannel getLowMinVoltageFaultBatteryStoppedChannel() { + return this.channel(ChannelId.LOW_MIN_VOLTAGE_FAULT_BATTERY_STOPPED); + } + + /** + * Gets the fault state channel for a low minimum voltage when battery is + * stopped. See {@link ChannelId#LOW_MIN_VOLTAGE_FAULT_BATTERY_STOPPED}. + * + * @return the Channel {@link Value} + */ + public default Value getLowMinVoltageFaultBatteryStopped() { + return this.getLowMinVoltageFaultBatteryStoppedChannel().value(); + } + + /** + * Internal method to set the 'nextValue' on + * {@link ChannelId#LOW_MIN_VOLTAGE_FAULT_BATTERY_STOPPED} Channel. + * + * @param value the next value + */ + public default void _setLowMinVoltageFaultBatteryStopped(boolean value) { + this.getLowMinVoltageFaultBatteryStoppedChannel().setNextValue(value); + } } 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 01748d00999..51dad2bc072 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 @@ -4,6 +4,7 @@ import static io.openems.edge.bridge.modbus.api.ElementToChannelConverter.SCALE_FACTOR_MINUS_1; import static io.openems.edge.bridge.modbus.api.ModbusUtils.readElementOnce; +import java.time.Instant; import java.util.List; import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; @@ -81,7 +82,11 @@ EdgeEventConstants.TOPIC_CYCLE_AFTER_PROCESS_IMAGE // }) public class BatteryFeneconHomeImpl extends AbstractOpenemsModbusComponent implements ModbusComponent, OpenemsComponent, - Battery, EventHandler, ModbusSlave, StartStoppable, BatteryFeneconHome { + Battery, EventHandler, ModbusSlave, StartStoppable, BatteryFeneconHome, ModbusHelper { + + public static final int DEFAULT_CRITICAL_MIN_VOLTAGE = 2800; + protected static final int TIMEOUT = 600; // [10 minutes in seconds] + private Instant timeCriticalMinVoltage; protected final StateMachine stateMachine = new StateMachine(State.UNDEFINED); @@ -148,6 +153,7 @@ public void handleEvent(Event event) { this.batteryProtection.apply(); break; case EdgeEventConstants.TOPIC_CYCLE_AFTER_PROCESS_IMAGE: + this.checkCriticalMinVoltage(); this.handleStateMachine(); break; } @@ -172,7 +178,6 @@ private void handleStateMachine() { this.getBmsControl(), // this.getModbusCommunicationFailed(), // () -> this.retryModbusCommunication()); - // Call the StateMachine try { @@ -1046,4 +1051,75 @@ public static String generateTempBalancingChannelName(int tower, int module, int private static String generateSingleCellPrefix(int tower, int module, int num) { return "TOWER_" + tower + "_MODULE_" + module + "_CELL_" + String.format("%03d", num); } + + @Override + public BridgeModbus getModbus() { + return this.getBridgeModbus(); + } + + @Override + public ModbusProtocol getDefinedModbusProtocol() throws OpenemsException { + return this.getModbusProtocol(); + } + + private void checkCriticalMinVoltage() { + + final var subState = getMinVoltageSubState(DEFAULT_CRITICAL_MIN_VOLTAGE, + this.getMinCellVoltage().orElse(Integer.MAX_VALUE), this.getCurrent().orElse(0)); + var now = Instant.now(this.componentManager.getClock()); + + switch (subState) { + case ABOVE_LIMIT -> { + this._setLowMinVoltageFault(false); + this._setLowMinVoltageWarning(false); + this._setLowMinVoltageFaultBatteryStopped(false); + this.timeCriticalMinVoltage = null; + } + case BELOW_LIMIT -> { + + if (this.stateMachine.getCurrentState() == StateMachine.State.STOPPED) { + this._setLowMinVoltageFaultBatteryStopped(true); + this._setLowMinVoltageFault(false); + this._setLowMinVoltageWarning(false); + return; + } + + this._setLowMinVoltageFaultBatteryStopped(false); + + if (this.timeCriticalMinVoltage == null) { + this.timeCriticalMinVoltage = now; + } + + if (this.timeCriticalMinVoltage.isBefore(now.minusSeconds(TIMEOUT))) { + this._setLowMinVoltageFault(true); + this._setLowMinVoltageWarning(false); + return; + } + this._setLowMinVoltageWarning(true); + this._setLowMinVoltageFault(false); + } + case BELOW_LIMIT_CHARGING -> { + this._setLowMinVoltageFaultBatteryStopped(false); + this._setLowMinVoltageWarning(true); + this._setLowMinVoltageFault(false); + this.timeCriticalMinVoltage = null; + } + } + } + + protected static MinVoltageSubState getMinVoltageSubState(int minVoltageLimit, int currentMinVoltage, int current) { + if (currentMinVoltage > minVoltageLimit) { + return MinVoltageSubState.ABOVE_LIMIT; + } + if (current < 0) { + return MinVoltageSubState.BELOW_LIMIT_CHARGING; + } + return MinVoltageSubState.BELOW_LIMIT; + } + + protected static enum MinVoltageSubState { + ABOVE_LIMIT, // + BELOW_LIMIT, // + BELOW_LIMIT_CHARGING; // + } } diff --git a/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/ModbusHelper.java b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/ModbusHelper.java new file mode 100644 index 00000000000..b072d1ebdc4 --- /dev/null +++ b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/ModbusHelper.java @@ -0,0 +1,24 @@ +package io.openems.edge.battery.fenecon.home; + +import io.openems.common.exceptions.OpenemsException; +import io.openems.edge.bridge.modbus.api.BridgeModbus; +import io.openems.edge.bridge.modbus.api.ModbusProtocol; + +public interface ModbusHelper { + + /** + * Get modbus bridge. + * + * @return modbus bridge. + */ + public BridgeModbus getModbus(); + + /** + * Get defined modbus protocol. + * + * @return modbus protocol + * @throws OpenemsException on error + */ + public ModbusProtocol getDefinedModbusProtocol() throws OpenemsException; + +} diff --git a/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/ErrorHandler.java b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/ErrorHandler.java index f44234e32c1..0353dcada1b 100644 --- a/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/ErrorHandler.java +++ b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/ErrorHandler.java @@ -1,31 +1,22 @@ package io.openems.edge.battery.fenecon.home.statemachine; -import java.time.Duration; -import java.time.Instant; - -import io.openems.common.exceptions.OpenemsError.OpenemsNamedException; import io.openems.edge.battery.fenecon.home.statemachine.StateMachine.State; import io.openems.edge.common.statemachine.StateHandler; public class ErrorHandler extends StateHandler { - private static final int WAIT_IN_ERROR_STATE_SECONDS = 120; - - private Instant entryAt = Instant.MIN; - - @Override - protected void onEntry(Context context) throws OpenemsNamedException { - this.entryAt = Instant.now(); - } - @Override public State runAndGetNextState(Context context) { - if (Duration.between(this.entryAt, Instant.now()).getSeconds() > WAIT_IN_ERROR_STATE_SECONDS) { - // Try again - return State.UNDEFINED; + + if (context.getParent().getLowMinVoltage().orElse(false)) { + return State.GO_STOPPED; } - return State.ERROR; + if (context.getParent().hasFaults()) { + return State.ERROR; + } else { + return State.UNDEFINED; + } } } diff --git a/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/GoStoppedHandler.java b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/GoStoppedHandler.java index 983fc889aa2..a41a0bf4837 100644 --- a/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/GoStoppedHandler.java +++ b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/GoStoppedHandler.java @@ -1,19 +1,51 @@ package io.openems.edge.battery.fenecon.home.statemachine; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.time.Duration; +import java.time.Instant; +import io.openems.common.exceptions.OpenemsError.OpenemsNamedException; +import io.openems.common.exceptions.OpenemsException; import io.openems.edge.battery.fenecon.home.statemachine.StateMachine.State; import io.openems.edge.common.statemachine.StateHandler; public class GoStoppedHandler extends StateHandler { - private final Logger log = LoggerFactory.getLogger(GoStoppedHandler.class); + private static int TIMEOUT = 2100; // [35 minutes in seconds] + private Instant timeAtEntry = Instant.MIN; + private boolean didProtocolAdd = false; @Override - public State runAndGetNextState(Context context) { - context.logWarn(this.log, "Stopping a FENECON Home Battery is not supported"); + protected void onEntry(Context context) throws OpenemsNamedException { + final var battery = context.getParent(); + final var modbus = battery.getModbus(); + modbus.removeProtocol(battery.id()); + this.didProtocolAdd = false; + this.timeAtEntry = Instant.now(context.clock); + } + + @Override + public State runAndGetNextState(Context context) throws OpenemsException { + final var battery = context.getParent(); + var now = Instant.now(context.clock); + if (Duration.between(this.timeAtEntry, now).getSeconds() > TIMEOUT && !this.didProtocolAdd) { + this.addAndRetryModbusProtocol(context); + return State.GO_STOPPED; + } + + if (battery.getModbusCommunicationFailed()) { + return State.STOPPED; + } + + // TODO if battery is not off return State.GO_STOPPED; } + private void addAndRetryModbusProtocol(Context context) throws OpenemsException { + final var battery = context.getParent(); + final var modbus = battery.getModbus(); + modbus.addProtocol(battery.id(), battery.getDefinedModbusProtocol()); + modbus.retryModbusCommunication(battery.id()); + this.didProtocolAdd = true; + } + } diff --git a/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/RunningHandler.java b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/RunningHandler.java index 36cbde803ab..af6bc9c316d 100644 --- a/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/RunningHandler.java +++ b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/RunningHandler.java @@ -11,7 +11,7 @@ public State runAndGetNextState(Context context) { var battery = context.getParent(); if (battery.hasFaults()) { - return State.UNDEFINED; + return State.ERROR; } // Is Battery still started? diff --git a/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/StateMachine.java b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/StateMachine.java index 4e73243f460..bf9624a2cd9 100644 --- a/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/StateMachine.java +++ b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/StateMachine.java @@ -13,6 +13,7 @@ public enum State implements io.openems.edge.common.statemachine.State, O RUNNING(11), // GO_STOPPED(20), // + STOPPED(21), // ERROR(30), // ; @@ -50,18 +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 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.home/src/io/openems/edge/battery/fenecon/home/statemachine/StoppedHandler.java b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/StoppedHandler.java new file mode 100644 index 00000000000..050ac7c9583 --- /dev/null +++ b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/StoppedHandler.java @@ -0,0 +1,33 @@ +package io.openems.edge.battery.fenecon.home.statemachine; + +import io.openems.edge.battery.fenecon.home.BatteryFeneconHomeImpl; +import io.openems.edge.battery.fenecon.home.statemachine.StateMachine.State; +import io.openems.edge.common.startstop.StartStop; +import io.openems.edge.common.statemachine.StateHandler; + +public class StoppedHandler extends StateHandler { + + @Override + public State runAndGetNextState(Context context) { + final var battery = context.getParent(); + + final int currentMinVoltage; + if (battery.getMinCellVoltage().isDefined()) { + currentMinVoltage = battery.getMinCellVoltage().get(); + } else { + currentMinVoltage = battery.getMinCellVoltageChannel().getPastValues().lastEntry().getValue() + .orElse(Integer.MAX_VALUE); + } + + if (currentMinVoltage < BatteryFeneconHomeImpl.DEFAULT_CRITICAL_MIN_VOLTAGE) { + battery._setLowMinVoltageFaultBatteryStopped(true); + } else { + battery._setLowMinVoltageFaultBatteryStopped(false); + } + + // Mark as started + battery._setStartStop(StartStop.STOP); + return State.STOPPED; + } + +} diff --git a/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/UndefinedHandler.java b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/UndefinedHandler.java index e5485be00c3..49b32ea48b5 100644 --- a/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/UndefinedHandler.java +++ b/io.openems.edge.battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/statemachine/UndefinedHandler.java @@ -19,7 +19,9 @@ public State runAndGetNextState(Context context) { if (battery.getModbusCommunicationFailed()) { // Modbus Communication Failed -> try to start yield State.GO_RUNNING; + } else if (battery.hasFaults()) { + // Has Faults -> error handling yield State.ERROR; } else { @@ -29,7 +31,7 @@ public State runAndGetNextState(Context context) { } case STOP -> - // STOP is impossible -> stuck in GO_STOPPED State + // force STOP State.GO_STOPPED; }; } 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 1faf9d74e77..9327aaa91cc 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 @@ -32,6 +32,12 @@ public class BatteryFeneconHomeImplTest { private static final ChannelAddress STATE_MACHINE = new ChannelAddress(BATTERY_ID, BatteryFeneconHome.ChannelId.STATE_MACHINE.id()); + private static final ChannelAddress LOW_MIN_VOLTAGE_WARNING = new ChannelAddress(BATTERY_ID, + BatteryFeneconHome.ChannelId.LOW_MIN_VOLTAGE_WARNING.id()); + private static final ChannelAddress LOW_MIN_VOLTAGE_FAULT = new ChannelAddress(BATTERY_ID, + BatteryFeneconHome.ChannelId.LOW_MIN_VOLTAGE_FAULT.id()); + private static final ChannelAddress LOW_MIN_VOLTAGE_FAULT_BATTERY_STOPPED = new ChannelAddress(BATTERY_ID, + BatteryFeneconHome.ChannelId.LOW_MIN_VOLTAGE_FAULT_BATTERY_STOPPED.id()); private static final ChannelAddress MODBUS_COMMUNICATION_FAILED = new ChannelAddress(BATTERY_ID, ModbusComponent.ChannelId.MODBUS_COMMUNICATION_FAILED.id()); private static final ChannelAddress BMS_CONTROL = new ChannelAddress(BATTERY_ID, @@ -42,6 +48,10 @@ public class BatteryFeneconHomeImplTest { Battery.ChannelId.MAX_CELL_VOLTAGE.id()); private static final ChannelAddress CHARGE_MAX_CURRENT = new ChannelAddress(BATTERY_ID, Battery.ChannelId.CHARGE_MAX_CURRENT.id()); + private static final ChannelAddress CURRENT = new ChannelAddress(BATTERY_ID, Battery.ChannelId.CURRENT.id()); + private static final ChannelAddress MIN_CELL_VOLTAGE = new ChannelAddress(BATTERY_ID, + Battery.ChannelId.MIN_CELL_VOLTAGE.id()); + private static final ChannelAddress BATTERY_RELAY = new ChannelAddress(IO_ID, "InputOutput4"); private static ThrowingRunnable assertLog(BatteryFeneconHomeImpl sut, String message) { @@ -304,4 +314,186 @@ public void testGetHardwareTypeFromRegisterValue() { BatteryFeneconHomeImpl.parseHardwareTypeFromRegisterValue(640)); } + + @Test + public void testMinVoltageGoStopped() throws Exception { + final var clock = new TimeLeapClock(Instant.parse("2020-01-01T01:00:00.00Z"), ZoneOffset.UTC); + var sut = new BatteryFeneconHomeImpl(); + new ComponentTest(sut) // + .addReference("cm", new DummyConfigurationAdmin()) // + .addReference("componentManager", new DummyComponentManager(clock)) // + .addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) // + .addComponent(new DummyInputOutput(IO_ID)) // + .activate(MyConfig.create() // + .setId(BATTERY_ID) // + .setModbusId(MODBUS_ID) // + .setModbusUnitId(0) // + .setStartStop(StartStopConfig.START) // + .setBatteryStartUpRelay("io0/InputOutput4")// + .build())// + + .next(new TestCase() // + .input(BATTERY_RELAY, false) // + .input(BMS_CONTROL, true) // Switched On + .output(STATE_MACHINE, StateMachine.State.UNDEFINED))// + .next(new TestCase() // + .onBeforeProcessImage(assertLog(sut, "GoRunning-Undefined")) // + .output(STATE_MACHINE, StateMachine.State.GO_RUNNING)) // + .next(new TestCase() // + .onBeforeProcessImage(assertLog(sut, "GoRunning-StartUpRelayOff")) // + .output(STATE_MACHINE, StateMachine.State.GO_RUNNING))// + .next(new TestCase() // + .onBeforeProcessImage(assertLog(sut, "GoRunning-RetryModbusCommunication")) // + .output(STATE_MACHINE, StateMachine.State.GO_RUNNING))// + .next(new TestCase() // + .onBeforeProcessImage(assertLog(sut, "GoRunning-WaitForBmsControl")) // + .output(STATE_MACHINE, StateMachine.State.GO_RUNNING)) // + .next(new TestCase() // + .onBeforeProcessImage(assertLog(sut, "GoRunning-WaitForModbusCommunication")) // + .output(STATE_MACHINE, StateMachine.State.GO_RUNNING)) // + .next(new TestCase() // + .output(STATE_MACHINE, StateMachine.State.RUNNING)) + + /* + * Critical min voltage + */ + .next(new TestCase("MinCellVoltage below critical value") // + .input(MIN_CELL_VOLTAGE, (BatteryFeneconHomeImpl.DEFAULT_CRITICAL_MIN_VOLTAGE - 100)) // + .input(CURRENT, 0) // + .output(LOW_MIN_VOLTAGE_WARNING, true) // + .output(LOW_MIN_VOLTAGE_FAULT, false) // + .output(STATE_MACHINE, StateMachine.State.RUNNING) // + .output(LOW_MIN_VOLTAGE_FAULT_BATTERY_STOPPED, false) // + .onAfterControllersCallbacks( + () -> clock.leap(BatteryFeneconHomeImpl.TIMEOUT - 10, ChronoUnit.SECONDS))) // + .next(new TestCase("MinCellVoltage below critical value - charging resets time") // + .input(MIN_CELL_VOLTAGE, (BatteryFeneconHomeImpl.DEFAULT_CRITICAL_MIN_VOLTAGE - 100)) // + .input(CURRENT, -300) // + .output(LOW_MIN_VOLTAGE_WARNING, true) // + .output(LOW_MIN_VOLTAGE_FAULT, false) // + .output(LOW_MIN_VOLTAGE_FAULT_BATTERY_STOPPED, false)) // + .next(new TestCase("MinCellVoltage below critical value - timer starts again") // + .input(CURRENT, 0) // + .input(MIN_CELL_VOLTAGE, (BatteryFeneconHomeImpl.DEFAULT_CRITICAL_MIN_VOLTAGE - 100)) // + .output(LOW_MIN_VOLTAGE_WARNING, true) // + .output(LOW_MIN_VOLTAGE_FAULT, false) // + .output(LOW_MIN_VOLTAGE_FAULT_BATTERY_STOPPED, false) // + .onAfterControllersCallbacks( + () -> clock.leap(BatteryFeneconHomeImpl.TIMEOUT - 10, ChronoUnit.SECONDS))) // + .next(new TestCase("MinCellVoltage below critical value - time not passed") // + .input(CURRENT, 0) // + .input(MIN_CELL_VOLTAGE, (BatteryFeneconHomeImpl.DEFAULT_CRITICAL_MIN_VOLTAGE - 100)) // + .output(LOW_MIN_VOLTAGE_WARNING, true) // + .output(LOW_MIN_VOLTAGE_FAULT, false) // + .output(LOW_MIN_VOLTAGE_FAULT_BATTERY_STOPPED, false) // + .onAfterControllersCallbacks(() -> clock.leap(15, ChronoUnit.SECONDS))) // + .next(new TestCase("MinCellVoltage below critical value - time passed") // + .input(CURRENT, 0) // + .input(MIN_CELL_VOLTAGE, (BatteryFeneconHomeImpl.DEFAULT_CRITICAL_MIN_VOLTAGE - 100)) // + .output(LOW_MIN_VOLTAGE_FAULT, true) // + .output(LOW_MIN_VOLTAGE_WARNING, false) // + .output(LOW_MIN_VOLTAGE_FAULT_BATTERY_STOPPED, false) // + .output(STATE_MACHINE, StateMachine.State.RUNNING)) // + .next(new TestCase("MinCellVoltage below critical value - error") // + .input(LOW_MIN_VOLTAGE_FAULT, true) // + .input(CURRENT, 0) // + .input(MIN_CELL_VOLTAGE, (BatteryFeneconHomeImpl.DEFAULT_CRITICAL_MIN_VOLTAGE - 100)) // + .output(LOW_MIN_VOLTAGE_FAULT, true) // + .output(LOW_MIN_VOLTAGE_WARNING, false) // + .output(LOW_MIN_VOLTAGE_FAULT_BATTERY_STOPPED, false)) // + .next(new TestCase() // + .output(STATE_MACHINE, StateMachine.State.ERROR)) // + .next(new TestCase("MinCellVoltage below critical value - go stopped") // + .input(LOW_MIN_VOLTAGE_FAULT, true) // + .input(CURRENT, 0) // + + // MinCellVoltage would be null, but there is not DummyTimedata for not to test + // "getPastValues" + .input(MIN_CELL_VOLTAGE, (BatteryFeneconHomeImpl.DEFAULT_CRITICAL_MIN_VOLTAGE - 100)) // + .output(LOW_MIN_VOLTAGE_FAULT, true) // + .output(LOW_MIN_VOLTAGE_WARNING, false) // + .output(LOW_MIN_VOLTAGE_FAULT_BATTERY_STOPPED, false) // + .output(STATE_MACHINE, StateMachine.State.GO_STOPPED) // + .onAfterControllersCallbacks(() -> clock.leap(2_100, ChronoUnit.SECONDS))) // 35 minutes + .next(new TestCase() // + .input(MODBUS_COMMUNICATION_FAILED, true) // + ) // + .next(new TestCase("MinCellVoltage below critical value - stopped") // + .input(CURRENT, 0) // + .input(MODBUS_COMMUNICATION_FAILED, true) // + .input(MIN_CELL_VOLTAGE, (BatteryFeneconHomeImpl.DEFAULT_CRITICAL_MIN_VOLTAGE - 100)) // + .output(LOW_MIN_VOLTAGE_WARNING, false) // + .output(LOW_MIN_VOLTAGE_FAULT, false) // + .output(LOW_MIN_VOLTAGE_FAULT_BATTERY_STOPPED, true) // + .output(STATE_MACHINE, StateMachine.State.STOPPED) // + ); + } + + @Test + public void testMinVoltageCharging() throws Exception { + final var clock = new TimeLeapClock(Instant.parse("2020-01-01T01:00:00.00Z"), ZoneOffset.UTC); + var sut = new BatteryFeneconHomeImpl(); + new ComponentTest(sut) // + .addReference("cm", new DummyConfigurationAdmin()) // + .addReference("componentManager", new DummyComponentManager(clock)) // + .addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) // + .addComponent(new DummyInputOutput(IO_ID)) // + .activate(MyConfig.create() // + .setId(BATTERY_ID) // + .setModbusId(MODBUS_ID) // + .setModbusUnitId(0) // + .setStartStop(StartStopConfig.START) // + .setBatteryStartUpRelay("io0/InputOutput4")// + .build())// + + .next(new TestCase() // + .input(BATTERY_RELAY, false) // + .input(BMS_CONTROL, true) // Switched On + .output(STATE_MACHINE, StateMachine.State.UNDEFINED))// + .next(new TestCase() // + .onBeforeProcessImage(assertLog(sut, "GoRunning-Undefined")) // + .output(STATE_MACHINE, StateMachine.State.GO_RUNNING)) // + .next(new TestCase() // + .onBeforeProcessImage(assertLog(sut, "GoRunning-StartUpRelayOff")) // + .output(STATE_MACHINE, StateMachine.State.GO_RUNNING))// + .next(new TestCase() // + .onBeforeProcessImage(assertLog(sut, "GoRunning-RetryModbusCommunication")) // + .output(STATE_MACHINE, StateMachine.State.GO_RUNNING))// + .next(new TestCase() // + .onBeforeProcessImage(assertLog(sut, "GoRunning-WaitForBmsControl")) // + .output(STATE_MACHINE, StateMachine.State.GO_RUNNING)) // + .next(new TestCase() // + .onBeforeProcessImage(assertLog(sut, "GoRunning-WaitForModbusCommunication")) // + .output(STATE_MACHINE, StateMachine.State.GO_RUNNING)) // + .next(new TestCase() // + .output(STATE_MACHINE, StateMachine.State.RUNNING)) + + /* + * Critical min voltage + */ + .next(new TestCase("MinCellVoltage below critical value") // + .input(MIN_CELL_VOLTAGE, (BatteryFeneconHomeImpl.DEFAULT_CRITICAL_MIN_VOLTAGE - 100)) // + .input(CURRENT, 0) // + .output(LOW_MIN_VOLTAGE_WARNING, true) // + .output(LOW_MIN_VOLTAGE_FAULT, false) // + .output(STATE_MACHINE, StateMachine.State.RUNNING) // + .output(LOW_MIN_VOLTAGE_FAULT_BATTERY_STOPPED, false) // + .onAfterControllersCallbacks( + () -> clock.leap(BatteryFeneconHomeImpl.TIMEOUT - 10, ChronoUnit.SECONDS))) // + .next(new TestCase("MinCellVoltage below critical value - charging resets time") // + .input(MIN_CELL_VOLTAGE, (BatteryFeneconHomeImpl.DEFAULT_CRITICAL_MIN_VOLTAGE - 100)) // + .input(CURRENT, -300) // + .output(LOW_MIN_VOLTAGE_WARNING, true) // + .output(LOW_MIN_VOLTAGE_FAULT, false) // + .output(STATE_MACHINE, StateMachine.State.RUNNING) // + .output(LOW_MIN_VOLTAGE_FAULT_BATTERY_STOPPED, false)) // + .next(new TestCase("MinCellVoltage below critical value - charging") // + .input(CURRENT, -2000) // + .input(MIN_CELL_VOLTAGE, (BatteryFeneconHomeImpl.DEFAULT_CRITICAL_MIN_VOLTAGE + 50)) // + .output(LOW_MIN_VOLTAGE_WARNING, false) // + .output(LOW_MIN_VOLTAGE_FAULT, false) // + .output(STATE_MACHINE, StateMachine.State.RUNNING) // + .output(LOW_MIN_VOLTAGE_FAULT_BATTERY_STOPPED, false) // + ); + } } diff --git a/io.openems.edge.battery.fenecon.home/test/io/openems/edge/battery/fenecon/home/TestStatic.java b/io.openems.edge.battery.fenecon.home/test/io/openems/edge/battery/fenecon/home/TestStatic.java new file mode 100644 index 00000000000..3c8d218c3f4 --- /dev/null +++ b/io.openems.edge.battery.fenecon.home/test/io/openems/edge/battery/fenecon/home/TestStatic.java @@ -0,0 +1,24 @@ +package io.openems.edge.battery.fenecon.home; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +import io.openems.edge.battery.fenecon.home.BatteryFeneconHomeImpl.MinVoltageSubState; + +public class TestStatic { + + @Test + public void testGetMinVoltageSubState() { + + assertEquals(MinVoltageSubState.BELOW_LIMIT_CHARGING, + BatteryFeneconHomeImpl.getMinVoltageSubState(2800, 2700, -2000)); + + assertEquals(MinVoltageSubState.BELOW_LIMIT, BatteryFeneconHomeImpl.getMinVoltageSubState(2800, 2600, 0)); + assertEquals(MinVoltageSubState.BELOW_LIMIT, BatteryFeneconHomeImpl.getMinVoltageSubState(2800, 2600, 2000)); + + assertEquals(MinVoltageSubState.ABOVE_LIMIT, + BatteryFeneconHomeImpl.getMinVoltageSubState(2800, Integer.MAX_VALUE, 0)); + assertEquals(MinVoltageSubState.ABOVE_LIMIT, BatteryFeneconHomeImpl.getMinVoltageSubState(2800, 2900, 1000)); + } +} 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 3e74c1bef9a..32aa035b4f1 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 @@ -106,6 +106,34 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId { */ ACTIVE_DISCHARGE_ENERGY(Doc.of(OpenemsType.LONG) // .unit(Unit.CUMULATED_WATT_HOURS) // + .persistencePriority(PersistencePriority.HIGH)// + ), // + + /** + * Inverter DC Minimum Voltage. + * + *
    + *
  • Interface: SymmetricBatteryInverter + *
  • Type: Integer + *
  • Unit: V + *
+ */ + DC_MIN_VOLTAGE(Doc.of(OpenemsType.INTEGER) // + .unit(Unit.VOLT) // + .persistencePriority(PersistencePriority.HIGH)// + ), // + + /** + * Inverter DC Max Voltage. + * + *
    + *
  • Interface: SymmetricBatteryInverter + *
  • Type: Integer + *
  • Unit: V + *
+ */ + DC_MAX_VOLTAGE(Doc.of(OpenemsType.INTEGER) // + .unit(Unit.VOLT) // .persistencePriority(PersistencePriority.HIGH) // ); @@ -358,4 +386,81 @@ public default void _setActiveDischargeEnergy(long value) { this.getActiveDischargeEnergyChannel().setNextValue(value); } + /** + * Gets the Channel for {@link ChannelId#DC_MIN_VOLTAGE}. + * + * @return the Channel + */ + public default IntegerReadChannel getDcMinVoltageChannel() { + return this.channel(ChannelId.DC_MIN_VOLTAGE); + } + + /** + * Gets the Minimum Inverter DC Voltage in [V]. See + * {@link ChannelId#DC_MIN_VOLTAGE}. + * + * @return the Channel {@link Value} + */ + public default Value getDcMinVoltage() { + return this.getDcMinVoltageChannel().value(); + } + + /** + * Internal method to set the 'nextValue' on {@link ChannelId#DC_MIN_VOLTAGE} + * Channel. + * + * @param value the next value + */ + public default void _setDcMinVoltage(Integer value) { + this.getDcMinVoltageChannel().setNextValue(value); + } + + /** + * Internal method to set the 'nextValue' on {@link ChannelId#DC_MIN_VOLTAGE} + * Channel. + * + * @param value the next value + */ + public default void _setDcMinVoltage(int value) { + this.getDcMinVoltageChannel().setNextValue(value); + } + + /** + * Gets the Channel for {@link ChannelId#DC_MAX_VOLTAGE}. + * + * @return the Channel + */ + public default IntegerReadChannel getDcMaxVoltageChannel() { + return this.channel(ChannelId.DC_MAX_VOLTAGE); + } + + /** + * Gets the Maximum Inverter DC Voltage in [V]. See + * {@link ChannelId#DC_MAX_VOLTAGE}. + * + * @return the Channel {@link Value} + */ + public default Value getDcMaxVoltage() { + return this.getDcMaxVoltageChannel().value(); + } + + /** + * Internal method to set the 'nextValue' on {@link ChannelId#DC_MAX_VOLTAGE} + * Channel. + * + * @param value the next value + */ + public default void _setDcMaxVoltage(Integer value) { + this.getDcMaxVoltageChannel().setNextValue(value); + } + + /** + * Internal method to set the 'nextValue' on {@link ChannelId#DC_MAX_VOLTAGE} + * Channel. + * + * @param value the next value + */ + public default void _setDcMaxVoltage(int value) { + this.getDcMaxVoltageChannel().setNextValue(value); + } } diff --git a/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/test/DummyManagedSymmetricBatteryInverter.java b/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/test/DummyManagedSymmetricBatteryInverter.java index c108b9466ec..6e9554e74e1 100644 --- a/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/test/DummyManagedSymmetricBatteryInverter.java +++ b/io.openems.edge.batteryinverter.api/src/io/openems/edge/batteryinverter/test/DummyManagedSymmetricBatteryInverter.java @@ -65,6 +65,28 @@ public DummyManagedSymmetricBatteryInverter withMaxApparentPower(int value) { return this; } + /** + * Set {@link SymmetricBatteryInverter.ChannelId#DC_MIN_VOLTAGE}. + * + * @param value the value + * @return myself + */ + public DummyManagedSymmetricBatteryInverter withDcMinVoltage(int value) { + TestUtils.withValue(this, SymmetricBatteryInverter.ChannelId.DC_MIN_VOLTAGE, value); + return this; + } + + /** + * Set {@link SymmetricBatteryInverter.ChannelId#DC_MAX_VOLTAGE}. + * + * @param value the value + * @return myself + */ + public DummyManagedSymmetricBatteryInverter withDcMaxVoltage(int value) { + TestUtils.withValue(this, SymmetricBatteryInverter.ChannelId.DC_MAX_VOLTAGE, value); + return this; + } + @Override public void run(Battery battery, int setActivePower, int setReactivePower) throws OpenemsNamedException { this._setActivePower(setActivePower); diff --git a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/BatteryInverterKacoBlueplanetGridsaveImpl.java b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/BatteryInverterKacoBlueplanetGridsaveImpl.java index 976d430e141..80774e5c800 100644 --- a/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/BatteryInverterKacoBlueplanetGridsaveImpl.java +++ b/io.openems.edge.batteryinverter.kaco.blueplanetgridsave/src/io/openems/edge/batteryinverter/kaco/blueplanetgridsave/BatteryInverterKacoBlueplanetGridsaveImpl.java @@ -1,6 +1,7 @@ package io.openems.edge.batteryinverter.kaco.blueplanetgridsave; import static io.openems.edge.common.channel.ChannelUtils.setWriteValueIfNotRead; +import static io.openems.edge.common.sum.GridMode.ON_GRID; import java.time.Duration; import java.time.Instant; @@ -54,7 +55,6 @@ import io.openems.edge.common.component.OpenemsComponent; import io.openems.edge.common.startstop.StartStop; import io.openems.edge.common.startstop.StartStoppable; -import io.openems.edge.common.sum.GridMode; import io.openems.edge.common.taskmanager.Priority; import io.openems.edge.ess.power.api.Phase; import io.openems.edge.ess.power.api.Pwr; @@ -75,6 +75,8 @@ public class BatteryInverterKacoBlueplanetGridsaveImpl extends AbstractSunSpecBa private static final int UNIT_ID = 1; private static final int READ_FROM_MODBUS_BLOCK = 1; + private static final int DC_MIN_VOLTAGE_LIMIT = 650; + private static final int DC_MAX_VOLTAGE_LIMIT = 1315; private final Logger log = LoggerFactory.getLogger(BatteryInverterKacoBlueplanetGridsaveImpl.class); private final StateMachine stateMachine = new StateMachine(State.UNDEFINED); @@ -145,7 +147,9 @@ public BatteryInverterKacoBlueplanetGridsaveImpl() { StartStoppable.ChannelId.values(), // BatteryInverterKacoBlueplanetGridsave.ChannelId.values() // ); - this._setGridMode(GridMode.ON_GRID); + this._setGridMode(ON_GRID); + this._setDcMinVoltage(DC_MIN_VOLTAGE_LIMIT); + this._setDcMaxVoltage(DC_MAX_VOLTAGE_LIMIT); } @Activate 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 139f38ba225..2757dbf6616 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 @@ -3,444 +3,129 @@ import io.openems.common.channel.AccessMode; import io.openems.common.channel.Unit; import io.openems.common.types.OptionsEnum; +import io.openems.edge.bridge.modbus.sunspec.Point; +import io.openems.edge.bridge.modbus.sunspec.Point.EnumPoint; +import io.openems.edge.bridge.modbus.sunspec.Point.ScaleFactorPoint; +import io.openems.edge.bridge.modbus.sunspec.Point.ScaledValuePoint; +import io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint; import io.openems.edge.bridge.modbus.sunspec.SunSpecModel; import io.openems.edge.bridge.modbus.sunspec.SunSpecModelType; import io.openems.edge.bridge.modbus.sunspec.SunSpecPoint; -import io.openems.edge.bridge.modbus.sunspec.SunSpecPoint.PointImpl; -import io.openems.edge.bridge.modbus.sunspec.SunSpecPoint.PointType; public enum KacoSunSpecModel implements SunSpecModel { - S_64201(// - "Bidirectional inverter control", // + S_64201("Bidirectional inverter control", // "Bidirectional inverter control backend", // - "", // - 52, // - KacoSunSpecModel.S64201.values(), // - SunSpecModelType.VENDOR_SPECIFIC), // - S_64202(// - "Battery Charge Discharge Characteristic", // + 52 /* length */, KacoSunSpecModel.S64201.values(), SunSpecModelType.VENDOR_SPECIFIC), // + S_64202("Battery Charge Discharge Characteristic", // "Bidirectional inverter battery charge discharge characteristic", // - "", // - 14, // - KacoSunSpecModel.S64202.values(), // - SunSpecModelType.VENDOR_SPECIFIC), // - S_64203(// - "Batterysystem Information", // + 14 /* length */, KacoSunSpecModel.S64202.values(), SunSpecModelType.VENDOR_SPECIFIC), // + S_64203("Batterysystem Information", // "Batterysystem Information Frontend", // - "", // - 26, // - KacoSunSpecModel.S64203.values(), // - SunSpecModelType.VENDOR_SPECIFIC), // - S_64204(// - "Q(U) extended", // + 26 /* length */, KacoSunSpecModel.S64203.values(), SunSpecModelType.VENDOR_SPECIFIC), // + S_64204("Q(U) extended", // "Q(U) offset extension", // - "", // - 8, // - KacoSunSpecModel.S64204.values(), // - SunSpecModelType.VENDOR_SPECIFIC // - ); // + 8 /* length */, KacoSunSpecModel.S64204.values(), SunSpecModelType.VENDOR_SPECIFIC // + ); public static enum S64201 implements SunSpecPoint { - VERSION_MAJOR(new PointImpl(// - "S64201_VERSION_MAJOR", // - "Version", // - "Major Version of model", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VERSION_MINOR(new PointImpl(// - "S64201_VERSION_MINOR", // - "VerMinor", // - "Minor Version of model", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - REQUESTED_STATE(new PointImpl(// - "S64201_REQUESTED_STATE", // - "RequestedState", // - "Enumerated value. Control operating state", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S64201RequestedState.values())), // - CURRENT_STATE(new PointImpl(// - "S64201_CURRENT_STATE", // - "CurrentState", // - "Enumerated value. Operating State", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S64201CurrentState.values())), - CONTROL_MODE(new PointImpl(// - "S64201_CONTROL_MODE", // - "ControlMode", // - "Power Control mode", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S64201ControlMode.values())), - RESERVED_5(new ReservedPointImpl("S64201_RESERVED_5")), // - WATCHDOG(new PointImpl(// - "S64201_WATCHDOG", // - "Watchdog", // - "Enable Watchdog", // - """ - Register must be written with the desired watchdog timeout in seconds. \ - Watchdog timer is reset on every write access to the value written \ - to the register. 0 means watchdog is disabled. It is recommended to \ - re-write the register at least once before half of the watchdog timeout \ - has elapsed.""", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - W_SET_PCT(new PointImpl(// - "S64201_W_SET_PCT", // - "WSetPct", // - "Active power output setpoint (in percent of WMax)", // + VERSION_MAJOR(new ValuePoint("S64201_VERSION_MAJOR", "Major Version of model", "", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + VERSION_MINOR(new ValuePoint("S64201_VERSION_MINOR", "Minor Version of model", "", // + ValuePoint.Type.UINT16, true, AccessMode.READ_ONLY, Unit.NONE)), + REQUESTED_STATE(new EnumPoint("S64201_REQUESTED_STATE", "Enumerated value. Control operating state", "", // + EnumPoint.Type.ENUM16, true, AccessMode.READ_WRITE, S64201RequestedState.values())), // + CURRENT_STATE(new EnumPoint("S64201_CURRENT_STATE", "Enumerated value. Operating State", "", // + EnumPoint.Type.ENUM16, true, AccessMode.READ_ONLY, S64201CurrentState.values())), + CONTROL_MODE(new EnumPoint("S64201_CONTROL_MODE", "Power Control mode", "", // + EnumPoint.Type.ENUM16, true, AccessMode.READ_WRITE, S64201ControlMode.values())), + RESERVED_5(new ReservedPoint("S64201_RESERVED_5")), // + WATCHDOG(new ValuePoint("S64201_WATCHDOG", "Enable Watchdog", """ + Register must be written with the desired watchdog timeout in seconds. \ + Watchdog timer is reset on every write access to the value written \ + to the register. 0 means watchdog is disabled. It is recommended to \ + re-write the register at least once before half of the watchdog timeout \ + has elapsed.""", // + ValuePoint.Type.UINT16, true, AccessMode.READ_WRITE, Unit.SECONDS)), + W_SET_PCT(new ScaledValuePoint("S64201_W_SET_PCT", "Active power output setpoint (in percent of WMax)", // "negative values mean charge", // - PointType.INT16, // - true, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "W_SET_PCT_SF", // - new OptionsEnum[0])), // - VAR_SET_PCT(new PointImpl(// - "S64201_VAR_SET_PCT", // - "VarSetPct", // - "Reactive power output setpoint (in percent of VAMax)", // + ValuePoint.Type.INT16, true, AccessMode.READ_WRITE, Unit.PERCENT, "W_SET_PCT_SF")), // + VAR_SET_PCT(new ScaledValuePoint("S64201_VAR_SET_PCT", "Reactive power output setpoint (in percent of VAMax)", // "negative values mean charge", // - PointType.INT16, // - true, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "VAR_SET_PCT_SF", // - new OptionsEnum[0])), // - RESERVED_9(new ReservedPointImpl("S64201_RESERVED_9")), // - RESERVED_10(new ReservedPointImpl("S64201_RESERVED_10")), // - RESERVED_11(new ReservedPointImpl("S64201_RESERVED_11")), // - RESERVED_12(new ReservedPointImpl("S64201_RESERVED_12")), // - RESERVED_13(new ReservedPointImpl("S64201_RESERVED_13")), // - ST_VND(new PointImpl(// - "S64201_ST_VND", // - "StVnd", // - "PrologState", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S64201StVnd.values())), - ST_PU(new PointImpl(// - "S64201_ST_PU", // - "StPu", // - "Power Unit State (DSP)", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S64201StPu.values())), - ST_PCU(new PointImpl(// - "S64201_ST_PCU", // - "StPcu", // - "Precharge unit state", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S64201StPcu.values())), - ERR_PCU(new PointImpl(// - "S64201_ERR_PCU", // - "ErrPcu", // - "Precharge unit error", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S64201ErrPcu.values())), - WPARAM_RMP_TMS(new PointImpl(// - "S64201_WPARAM_RMP_TMS", // - "WparamRmpTms", // + ValuePoint.Type.INT16, true, AccessMode.READ_WRITE, Unit.PERCENT, "VAR_SET_PCT_SF")), // + RESERVED_9(new ReservedPoint("S64201_RESERVED_9")), // + RESERVED_10(new ReservedPoint("S64201_RESERVED_10")), // + RESERVED_11(new ReservedPoint("S64201_RESERVED_11")), // + RESERVED_12(new ReservedPoint("S64201_RESERVED_12")), // + RESERVED_13(new ReservedPoint("S64201_RESERVED_13")), // + ST_VND(new EnumPoint("S64201_ST_VND", "PrologState", "", // + EnumPoint.Type.ENUM16, false, AccessMode.READ_ONLY, S64201StVnd.values())), + ST_PU(new EnumPoint("S64201_ST_PU", "Power Unit State (DSP)", "", // + EnumPoint.Type.ENUM16, true, AccessMode.READ_ONLY, S64201StPu.values())), + ST_PCU(new EnumPoint("S64201_ST_PCU", "Precharge unit state", "", // + EnumPoint.Type.ENUM16, false, AccessMode.READ_ONLY, S64201StPcu.values())), + ERR_PCU(new EnumPoint("S64201_ERR_PCU", "Precharge unit error", "", // + EnumPoint.Type.ENUM16, false, AccessMode.READ_ONLY, S64201ErrPcu.values())), + WPARAM_RMP_TMS(new ValuePoint("S64201_WPARAM_RMP_TMS", "WparamRmpDecTmm", // "The time of the PT1 in seconds (time to accomplish a change of 99,3% which means 5tau)" + " for active power (W) in response to changes of WSetPct.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.MILLISECONDS, // - null, // - new OptionsEnum[0])), // - WPARAM_RMP_DEC_TMM(new PointImpl(// - "S64201_WPARAM_RMP_DEC_TMM", // - "WparamRmpDecTmm", // + ValuePoint.Type.UINT16, true, AccessMode.READ_WRITE, Unit.MILLISECONDS)), // + WPARAM_RMP_DEC_TMM(new ScaledValuePoint("S64201_WPARAM_RMP_DEC_TMM", "WparamRmpDecTmm", // "The maximum rate at which the active power (W) value may be decreased in response to changes of WSetPct", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "RMP_INC_DEC_SF", // - new OptionsEnum[0])), // - WPARAM_RMP_INC_TMM(new PointImpl(// - "S64201_WPARAM_RMP_INC_TMM", // - "WparamRmpIncTmm", // + ValuePoint.Type.UINT16, true, AccessMode.READ_WRITE, Unit.PERCENT, "RMP_INC_DEC_SF")), // + WPARAM_RMP_INC_TMM(new ScaledValuePoint("S64201_WPARAM_RMP_INC_TMM", "WparamRmpIncTmm", // "The maximum rate at which the active power (W) value may be increased in response to changes of WSetPct", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "RMP_INC_DEC_SF", // - new OptionsEnum[0])), // - RESERVED_21(new ReservedPointImpl("S64201_RESERVED_21")), // - RESERVED_22(new ReservedPointImpl("S64201_RESERVED_22")), // - W_PARAM_ENA(new PointImpl(// - "S64201_W_PARAM_ENA", // - "WParamEna", // + ValuePoint.Type.UINT16, true, AccessMode.READ_WRITE, Unit.PERCENT, "RMP_INC_DEC_SF")), // + RESERVED_21(new ReservedPoint("S64201_RESERVED_21")), // + RESERVED_22(new ReservedPoint("S64201_RESERVED_22")), // + W_PARAM_ENA(new EnumPoint("S64201_W_PARAM_ENA", "WSet_Ena control", // "Enumerated value. Enable filter and ramp rate parameters for active power setpoint (W)", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S64201WParamEna.values())), // - VAR_PARAM_RMP_TMS(new PointImpl(// - "S64201_VAR_PARAM_RMP_TMS", // - "VarParamRmpTms", // + EnumPoint.Type.ENUM16, true, AccessMode.READ_WRITE, S64201WParamEna.values())), // + VAR_PARAM_RMP_TMS(new ScaledValuePoint("S64201_VAR_PARAM_RMP_TMS", "VarParamRmpTms", // "The time of the PT1 in seconds (time to accomplish a change of 99,3% which means 5tau) " + "for reactive power (var) in response to changes of VarSetPct.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - "RMP_TMS_SF", // - new OptionsEnum[0])), // - VAR_PARAM_RMP_DEC_TMM(new PointImpl(// - "S64201_VAR_PARAM_RMP_DEC_TMM", // - "VarParamRmpDecTmm", // + ValuePoint.Type.UINT16, true, AccessMode.READ_WRITE, Unit.SECONDS, "RMP_TMS_SF")), // + VAR_PARAM_RMP_DEC_TMM(new ScaledValuePoint("S64201_VAR_PARAM_RMP_DEC_TMM", "VarParamRmpDecTmm", // "The maximum rate at which the reactive power (var) may be decreased in response to changes of VarSetPct.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "RMP_INC_DEC_SF", // - new OptionsEnum[0])), // - VAR_PARAM_RMP_INC_TMM(new PointImpl(// - "S64201_VAR_PARAM_RMP_INC_TMM", // - "VarParamRmpDecTmm", // + ValuePoint.Type.UINT16, true, AccessMode.READ_WRITE, Unit.PERCENT, "RMP_INC_DEC_SF")), // + VAR_PARAM_RMP_INC_TMM(new ScaledValuePoint("S64201_VAR_PARAM_RMP_INC_TMM", "VarParamRmpIncTmm", // "The maximum rate at which the reactive power (var) may be increased in response to changes of VarSetPct.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "RMP_INC_DEC_SF", // - new OptionsEnum[0])), // - RESERVED_27(new ReservedPointImpl("S64201_RESERVED_27")), // - RESERVED_28(new ReservedPointImpl("S64201_RESERVED_28")), // - VAR_PARAM_ENA(new PointImpl(// - "S64201_VAR_PARAM_ENA", // - "VarParamEna", // + ValuePoint.Type.UINT16, true, AccessMode.READ_WRITE, Unit.PERCENT, "RMP_INC_DEC_SF")), // + RESERVED_27(new ReservedPoint("S64201_RESERVED_27")), // + RESERVED_28(new ReservedPoint("S64201_RESERVED_28")), // + VAR_PARAM_ENA(new EnumPoint("S64201_VAR_PARAM_ENA", "VarParam_Ena", // "Enumerated value. Enable filter and ramp rate parameters for reactive power setpoint (var)", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S64201VarParamEna.values())), // - PH_VPH_A(new PointImpl(// - "S64201_PH_VPH_A", // - "Phase Voltage AN", // - "Phase Voltage AN", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_B(new PointImpl(// - "S64201_PH_VPH_B", // - "Phase Voltage BN", // - "Phase Voltage BN", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_C(new PointImpl(// - "S64201_PH_VPH_C", // - "Phase Voltage CN", // - "Phase Voltage CN", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - W(new PointImpl(// - "S64201_W", // - "Watts", // - "AC Power", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - V_AR(new PointImpl(// - "S64201_V_AR", // - "VAr", // - "AC Reactive Power", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "V_AR_SF", // - new OptionsEnum[0])), // - HZ(new PointImpl(// - "S64201_HZ", // - "Hz", // - "Line Frequency", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.MILLIHERTZ, // - "mHZ_SF", // - new OptionsEnum[0])), // - RESERVED_36(new ReservedPointImpl("S64201_RESERVED_36")), // - RESERVED_37(new ReservedPointImpl("S64201_RESERVED_37")), // - RESERVED_38(new ReservedPointImpl("S64201_RESERVED_38")), // - RESERVED_39(new ReservedPointImpl("S64201_RESERVED_39")), // - RESERVED_40(new ReservedPointImpl("S64201_RESERVED_40")), // - RESERVED_41(new ReservedPointImpl("S64201_RESERVED_41")), // - RESERVED_42(new ReservedPointImpl("S64201_RESERVED_42")), // - RESERVED_43(new ReservedPointImpl("S64201_RESERVED_43")), // - W_SET_PCT_SF(new PointImpl(// - "S64201_W_SET_PCT_SF", // - "WSetPct_SF", // - "Scale factor for active power setpoint (% WMax)", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VAR_SET_PCT_SF(new PointImpl(// - "S64201_VAR_SET_PCT_SF", // - "VarSetPct_SF", // - "Scale factor for reactive power setpoint (% VAMax)", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - RMP_TMS_SF(new PointImpl(// - "S64201_RMP_TMS_SF", // - "RmpTms_SF", // - "Scale factor for PT1", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - RMP_INC_DEC_SF(new PointImpl(// - "S64201_RMP_INC_DEC_SF", // - "RmpIncDec_SF", // - "Scale factor for increment and decrement ramps.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_SF(new PointImpl(// - "S64201_V_SF", // - "V_SF", // - "Scale factor for voltage measurements", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - W_SF(new PointImpl(// - "S64201_W_SF", // - "W_SF", // - "Scale factor for active power measurement", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_AR_SF(new PointImpl(// - "S64201_V_AR_SF", // - "VAr_SF", // - "Scale factor for reactive power measurement", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - HZ_SF(new PointImpl(// - "S64201_HZ_SF", // - "Hz_SF", // - "Scale factor for frequency measurement", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ; // + EnumPoint.Type.ENUM16, true, AccessMode.READ_WRITE, S64201VarParamEna.values())), // + PH_VPH_A(new ScaledValuePoint("S64201_PH_VPH_A", "Phase Voltage AN", "", // + ValuePoint.Type.UINT16, true, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_B(new ScaledValuePoint("S64201_PH_VPH_B", "Phase Voltage BN", "", // + ValuePoint.Type.UINT16, true, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_C(new ScaledValuePoint("S64201_PH_VPH_C", "Phase Voltage CN", "", // + ValuePoint.Type.UINT16, true, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + W(new ScaledValuePoint("S64201_W", "AC Power", "", // + ValuePoint.Type.INT16, true, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), // + 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.INT16, true, AccessMode.READ_ONLY, Unit.MILLIHERTZ, "mHZ_SF")), // + RESERVED_36(new ReservedPoint("S64201_RESERVED_36")), // + RESERVED_37(new ReservedPoint("S64201_RESERVED_37")), // + RESERVED_38(new ReservedPoint("S64201_RESERVED_38")), // + RESERVED_39(new ReservedPoint("S64201_RESERVED_39")), // + RESERVED_40(new ReservedPoint("S64201_RESERVED_40")), // + RESERVED_41(new ReservedPoint("S64201_RESERVED_41")), // + RESERVED_42(new ReservedPoint("S64201_RESERVED_42")), // + RESERVED_43(new ReservedPoint("S64201_RESERVED_43")), // + W_SET_PCT_SF( + new ScaleFactorPoint("S64201_W_SET_PCT_SF", "Scale factor for active power setpoint (% WMax)", "")), // + VAR_SET_PCT_SF(new ScaleFactorPoint("S64201_VAR_SET_PCT_SF", + "Scale factor for reactive power setpoint (% VAMax)", "")), // + RMP_TMS_SF(new ScaleFactorPoint("S64201_RMP_TMS_SF", "Scale factor for PT1", "")), // + RMP_INC_DEC_SF( + new ScaleFactorPoint("S64201_RMP_INC_DEC_SF", "Scale factor for increment and decrement ramps.", "")), // + V_SF(new ScaleFactorPoint("S64201_V_SF", "Scale factor for voltage measurements", "")), // + W_SF(new ScaleFactorPoint("S64201_W_SF", "Scale factor for active power measurement", "")), // + V_AR_SF(new ScaleFactorPoint("S64201_V_AR_SF", "Scale factor for reactive power measurement", "")), // + HZ_SF(new ScaleFactorPoint("S64201_HZ_SF", "Scale factor for frequency measurement", "")); public static enum S64201RequestedState implements OptionsEnum { UNDEFINED(-1, "Undefined"), // @@ -854,145 +539,46 @@ public OptionsEnum getUndefined() { } } - protected final PointImpl impl; + protected final Point impl; - private S64201(PointImpl impl) { + private S64201(Point impl) { this.impl = impl; } @Override - public PointImpl get() { + public Point get() { return this.impl; } } // TODO Registers DIS_MIN_V to EN_LIMIT are repeated blocks public static enum S64202 implements SunSpecPoint { - VERSION_MAJOR(new PointImpl(// - "S64202_VERSION_MAJOR", // - "Version", // - "Major Version of model", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VERSION_MINOR(new PointImpl(// - "S64202_VERSION_MINOR", // - "VerMinor", // - "Minor Version of model", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - RESERVED_2(new ReservedPointImpl("S64202_RESERVED_2")), // - RESERVED_3(new ReservedPointImpl("S64202_RESERVED_3")), // - V_SF(new PointImpl(// - "S64202_V_SF", // - "V_SF", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - A_SF(new PointImpl(// - "S64202_A_SF", // - "A_SF", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DIS_MIN_V_0(new PointImpl(// - "S64202_DIS_MIN_V_0", // - "min. discharge voltage", // - "min. discharge voltage", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - DIS_MAX_A_0(new PointImpl(// - "S64202_DIS_MAX_A_0", // - "max. discharge current", // - "max. discharge current", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - DIS_CUTOFF_A_0(new PointImpl(// - "S64202_DIS_CUTOFF_A_0", // - "discharge cutoff current", // - "Disconnect if discharge current lower than DisCutoffA", // - "no auto disconnect if value is 0", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - CHA_MAX_V_0(new PointImpl(// - "S64202_CHA_MAX_V_0", // - "max. charge voltage", // - "max. charge voltage", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - CHA_MAX_A_0(new PointImpl(// - "S64202_CHA_MAX_A_0", // - "max. charge current", // - "max. charge current", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - CHA_CUTOFF_A_0(new PointImpl(// - "S64202_CHA_CUTOFF_A_0", // - "charge cutoff current", // - "Disconnect if charge current lower than ChaCutoffA", // - "no auto disconnect if value is 0", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - RESERVED_0(new ReservedPointImpl("S64202_RESERVED_0")), // - EN_LIMIT_0(new PointImpl(// - "S64202_EN_LIMIT_0", // - "EnLimit", // - "new battery limits are activated when EnLimit is 1", // - "must be 0 or 1", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S64202EnLimit.values())), // - ; // + VERSION_MAJOR(new ValuePoint("S64202_VERSION_MAJOR", "Major Version of model", "", // + ValuePoint.Type.UINT16, true, AccessMode.READ_ONLY, Unit.NONE)), // + VERSION_MINOR(new ValuePoint("S64202_VERSION_MINOR", "Minor Version of model", "", // + ValuePoint.Type.UINT16, true, AccessMode.READ_ONLY, Unit.NONE)), // + RESERVED_2(new ReservedPoint("S64202_RESERVED_2")), // + RESERVED_3(new ReservedPoint("S64202_RESERVED_3")), // + V_SF(new ScaleFactorPoint("S64202_V_SF", "", "")), // + A_SF(new ScaleFactorPoint("S64202_A_SF", "", "")), // + DIS_MIN_V_0(new ScaledValuePoint("S64202_DIS_MIN_V_0", "min. discharge voltage", "", // + ValuePoint.Type.UINT16, true, AccessMode.READ_WRITE, Unit.VOLT, "V_SF")), // + DIS_MAX_A_0(new ScaledValuePoint("S64202_DIS_MAX_A_0", "max. discharge current", "", // + ValuePoint.Type.UINT16, true, AccessMode.READ_WRITE, Unit.AMPERE, "A_SF")), // + DIS_CUTOFF_A_0(new ScaledValuePoint("S64202_DIS_CUTOFF_A_0", "discharge cutoff current", // + "Disconnect if discharge current lower than DisCutoffA. No auto disconnect if value is 0", // + ValuePoint.Type.UINT16, false, AccessMode.READ_WRITE, Unit.AMPERE, "A_SF")), // + CHA_MAX_V_0(new ScaledValuePoint("S64202_CHA_MAX_V_0", "max. charge voltage", "", // + ValuePoint.Type.UINT16, true, AccessMode.READ_WRITE, Unit.VOLT, "V_SF")), // + CHA_MAX_A_0(new ScaledValuePoint("S64202_CHA_MAX_A_0", "max. charge current", "", // + ValuePoint.Type.UINT16, true, AccessMode.READ_WRITE, Unit.AMPERE, "A_SF")), // + CHA_CUTOFF_A_0(new ScaledValuePoint("S64202_CHA_CUTOFF_A_0", "charge cutoff current", // + "Disconnect if charge current lower than ChaCutoffA. No auto disconnect if value is 0", // + ValuePoint.Type.UINT16, false, AccessMode.READ_WRITE, Unit.AMPERE, "A_SF")), // + RESERVED_0(new ReservedPoint("S64202_RESERVED_0")), // + EN_LIMIT_0(new EnumPoint("S64202_EN_LIMIT_0", "EnLimit", // + "new battery limits are activated when EnLimit is 1. Must be 0 or 1", // + EnumPoint.Type.ENUM16, true, AccessMode.READ_WRITE, S64202EnLimit.values())); public static enum S64202EnLimit implements OptionsEnum { UNDEFINED(-1, "Undefined"), // @@ -1023,152 +609,44 @@ public OptionsEnum getUndefined() { } } - protected final PointImpl impl; + protected final Point impl; - private S64202(PointImpl impl) { + private S64202(Point impl) { this.impl = impl; } @Override - public PointImpl get() { + public Point get() { return this.impl; } } // TODO Registers BAT_ID to BAT_SW_SUM are repeated blocks public static enum S64203 implements SunSpecPoint { - VERSION_MAJOR(new PointImpl(// - "S64203_VERSION_MAJOR", // - "Version", // - "Major Version of model", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VERSION_MINOR(new PointImpl(// - "S64203_VERSION_MINOR", // - "VerMinor", // - "Minor Version of model", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - E_M_S_ERR_CODE(new PointImpl(// - "S64203_E_M_S_ERR_CODE", // - "Errorcode from EMS", // - "Minor Version of model", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S64203EmsErrCode.values())), - SOC_SF(new PointImpl(// - "S64203_SOC_SF", // - "SoC_SF", // - "SoC scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - SOH_SF(new PointImpl(// - "S64203_SOH_SF", // - "SoH_SF", // - "SoH scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TEMP_SF(new PointImpl(// - "S64203_TEMP_SF", // - "Temp_SF", // - "temperature scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - BAT_ID_0(new PointImpl(// - "S64203_BAT_ID_0", // - "Battery ID / Serial number", // - "Battery ID or Serial number", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - BAT_SOC_0(new PointImpl(// - "S64203_BAT_SOC_0", // - "SoC of battery", // - "SoC of battery", // + VERSION_MAJOR(new ValuePoint("S64203_VERSION_MAJOR", "Major Version of model", "", // + ValuePoint.Type.UINT16, true, AccessMode.READ_ONLY, Unit.NONE)), // + VERSION_MINOR(new ValuePoint("S64203_VERSION_MINOR", "Minor Version of model", "", // + ValuePoint.Type.UINT16, true, AccessMode.READ_ONLY, Unit.NONE)), // + EMS_ERR_CODE(new EnumPoint("S64203_EMS_ERR_CODE", "Errorcode from EMS", "", // + EnumPoint.Type.ENUM16, false, AccessMode.READ_WRITE, S64203EmsErrCode.values())), + SOC_SF(new ScaleFactorPoint("S64203_SOC_SF", "SoC scale factor", "")), // + SOH_SF(new ScaleFactorPoint("S64203_SOH_SF", "SoH scale factor", "")), // + TEMP_SF(new ScaleFactorPoint("S64203_TEMP_SF", "temperature scale factor", "")), // + BAT_ID_0(new ValuePoint("S64203_BAT_ID_0", "Battery ID or Serial number", "", // + ValuePoint.Type.UINT16, false, AccessMode.READ_WRITE, Unit.VOLT)), // + BAT_SOC_0(new ScaledValuePoint("S64203_BAT_SOC_0", "SoC of battery", // "valid range is from 0 to 100", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "SOC_SF", // - new OptionsEnum[0])), // - BAT_SOH_0(new PointImpl(// - "S64203_BAT_SOH_0", // - "SoH of battery", // - "SoH of battery", // + ValuePoint.Type.UINT16, false, AccessMode.READ_WRITE, Unit.PERCENT, "SOC_SF")), // + BAT_SOH_0(new ScaledValuePoint("S64203_BAT_SOH_0", "SoH of battery", // "valid range is from 0 to 100", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "SOH_SF", // - new OptionsEnum[0])), // - BAT_TEMP_0(new PointImpl(// - "S64203_BAT_TEMP_0", // - "Avg. temperature of battery", // - "Avg. temperature of battery", // + ValuePoint.Type.UINT16, false, AccessMode.READ_WRITE, Unit.PERCENT, "SOH_SF")), // + BAT_TEMP_0(new ScaledValuePoint("S64203_BAT_TEMP_0", "Avg. temperature of battery", "valid range is from -50 to 100", // - PointType.INT16, // - false, // - AccessMode.READ_WRITE, // - Unit.DEGREE_CELSIUS, // - "TEMP_SF", // - new OptionsEnum[0])), // - BAT_SW_VER_0(new PointImpl(// - "S64203_BAT_SW_VER_0", // - "Softwareversion of battery", // - "Softwareversion of battery", // - "", // - PointType.STRING4, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - BAT_SW_SUM_0(new PointImpl(// - "S64203_BAT_SW_SUM_0", // - "Software checksum of battery", // - "Software checksum of battery", // - "", // - PointType.STRING4, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // + ValuePoint.Type.INT16, false, AccessMode.READ_WRITE, Unit.DEGREE_CELSIUS, "TEMP_SF")), // + BAT_SW_VER_0(new ValuePoint("S64203_BAT_SW_VER_0", "Softwareversion of battery", "", // + ValuePoint.Type.STRING4, false, AccessMode.READ_WRITE, Unit.NONE)), // + BAT_SW_SUM_0(new ValuePoint("S64203_BAT_SW_SUM_0", "Software checksum of battery", "", // + ValuePoint.Type.STRING4, false, AccessMode.READ_WRITE, Unit.NONE)), // ; // public static enum S64203EmsErrCode implements OptionsEnum { @@ -1198,109 +676,34 @@ public OptionsEnum getUndefined() { } } - protected final PointImpl impl; + protected final Point impl; - private S64203(PointImpl impl) { + private S64203(Point impl) { this.impl = impl; } @Override - public PointImpl get() { + public Point get() { return this.impl; } } public static enum S64204 implements SunSpecPoint { - VERSION_MAJOR(new PointImpl(// - "S64204_VERSION_MAJOR", // - "Version", // - "Major Version of model", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VERSION_MINOR(new PointImpl(// - "S64204_VERSION_MINOR", // - "VerMinor", // - "Minor Version of model", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_OFF_PCT(new PointImpl(// - "S64204_V_OFF_PCT", // - "VOffPct", // - "Q(U) grid voltage offset", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "V_OFF_PCT_SF", // - new OptionsEnum[0])), // - VAR_OFF_PCT(new PointImpl(// - "S64204_VAR_OFF_PCT", // - "VArOffPct", // - "Q(U) reactive power offset (The depending reference is configured in model 126. " - + "%refVal is %Wmax, %VArMax or %VArAval depending on value of DeptRef in model 126)", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "VAR_OFF_PCT_SF", // - new OptionsEnum[0])), // - RVRT_TMS(new PointImpl(// - "S64204_RVRT_TMS", // - "RvrtTms", // - "Timeout period for volt-VAR curve selection", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - OFFSET_ENA(new PointImpl(// - "S64204_OFFSET_ENA", // - "OffsetEna", // - "Q(U) dynamic Q/U offset enable", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S64204OffsetEna.values())), // - V_OFF_PCT_SF(new PointImpl(// - "S64204_V_OFF_PCT_SF", // - "VOffPct_SF", // - "Scale factor for offset voltage", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VAR_OFF_PCT_SF(new PointImpl(// - "S64204_VAR_OFF_PCT_SF", // - "VarOffPct_SF", // - "Scale factor for reactive power offset", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])) // - ; // + VERSION_MAJOR(new ValuePoint("S64204_VERSION_MAJOR", "Major Version of model", "", // + ValuePoint.Type.UINT16, true, AccessMode.READ_ONLY, Unit.NONE)), // + VERSION_MINOR(new ValuePoint("S64204_VERSION_MINOR", "Minor Version of model", "", // + ValuePoint.Type.UINT16, true, AccessMode.READ_ONLY, Unit.NONE)), // + V_OFF_PCT(new ScaledValuePoint("S64204_V_OFF_PCT", "Q(U) grid voltage offset", "", // + ValuePoint.Type.INT16, true, AccessMode.READ_WRITE, Unit.PERCENT, "V_OFF_PCT_SF")), // + VAR_OFF_PCT(new ScaledValuePoint("S64204_VAR_OFF_PCT", "VArOffPct", // + "Q(U) reactive power offset (The depending reference is configured in model 126. %refVal is %Wmax, %VArMax or %VArAval depending on value of DeptRef in model 126)", // + ValuePoint.Type.INT16, true, AccessMode.READ_WRITE, Unit.PERCENT, "VAR_OFF_PCT_SF")), // + RVRT_TMS(new ValuePoint("S64204_RVRT_TMS", "Timeout period for volt-VAR curve selection", "", // + ValuePoint.Type.UINT16, true, AccessMode.READ_WRITE, Unit.SECONDS)), // + OFFSET_ENA(new EnumPoint("S64204_OFFSET_ENA", "Q(U) dynamic Q/U offset enable", "", // + EnumPoint.Type.ENUM16, true, AccessMode.READ_WRITE, S64204OffsetEna.values())), // + V_OFF_PCT_SF(new ScaleFactorPoint("S64204_V_OFF_PCT_SF", "Scale factor for offset voltage", "")), // + VAR_OFF_PCT_SF(new ScaleFactorPoint("S64204_VAR_OFF_PCT_SF", "Scale factor for reactive power offset", "")); public static enum S64204OffsetEna implements OptionsEnum { UNDEFINED(-1, "Undefined"), // @@ -1331,30 +734,28 @@ public OptionsEnum getUndefined() { } } - protected final PointImpl impl; + protected final Point impl; - private S64204(PointImpl impl) { + private S64204(Point impl) { this.impl = impl; } @Override - public PointImpl get() { + public Point get() { return this.impl; } } public final String label; public final String description; - public final String notes; public final int length; public final SunSpecPoint[] points; public final SunSpecModelType modelType; - private KacoSunSpecModel(String label, String description, String notes, int length, SunSpecPoint[] points, + private KacoSunSpecModel(String label, String description, int length, SunSpecPoint[] points, SunSpecModelType modelType) { this.label = label; this.description = description; - this.notes = notes; this.length = length; this.points = points; this.modelType = modelType; @@ -1370,18 +771,9 @@ public String label() { return this.label; } - private static class ReservedPointImpl extends PointImpl { - protected ReservedPointImpl(String channelId) { - super(channelId, // - "Reserved", // - "", // - "", // - PointType.PAD, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0]); + private static class ReservedPoint extends ValuePoint { + protected ReservedPoint(String channelId) { + super(channelId, "Reserved", "", ValuePoint.Type.PAD, false, AccessMode.READ_ONLY, Unit.NONE); } } 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 75698cb16c2..cf558a53d99 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 @@ -1,7 +1,7 @@ package io.openems.edge.bridge.modbus.api; import io.openems.common.exceptions.InvalidValueException; -import io.openems.edge.bridge.modbus.sunspec.SunSpecPoint; +import io.openems.edge.bridge.modbus.sunspec.Point.ScaledValuePoint; import io.openems.edge.common.channel.ChannelId; import io.openems.edge.common.channel.IntegerReadChannel; import io.openems.edge.common.component.OpenemsComponent; @@ -28,7 +28,7 @@ private static int getValueOrError(OpenemsComponent component, ChannelId channel return channel.value().getOrError(); } - public ElementToChannelScaleFactorConverter(OpenemsComponent component, SunSpecPoint point, + public ElementToChannelScaleFactorConverter(OpenemsComponent component, ScaledValuePoint point, ChannelId scaleFactorChannel) { super(// // element -> channel diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/worker/internal/TasksSupplierImpl.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/worker/internal/TasksSupplierImpl.java index f583b94b284..e7c6a4bcb02 100644 --- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/worker/internal/TasksSupplierImpl.java +++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/worker/internal/TasksSupplierImpl.java @@ -47,6 +47,7 @@ public synchronized void addProtocol(String sourceId, ModbusProtocol protocol) { */ public synchronized void removeProtocol(String sourceId) { this.taskManagers.remove(sourceId); + this.nextLowPriorityTasks.removeIf(t -> t.a() == sourceId); } @Override 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 a45c8251a35..3b01f8ce0da 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 @@ -3,6 +3,7 @@ import static com.ghgande.j2mod.modbus.Modbus.ILLEGAL_ADDRESS_EXCEPTION; import static io.openems.edge.bridge.modbus.api.ModbusUtils.readElementOnce; import static io.openems.edge.bridge.modbus.api.ModbusUtils.readElementsOnce; +import static io.openems.edge.bridge.modbus.sunspec.Utils.toUpperUnderscore; import static java.util.concurrent.CompletableFuture.completedFuture; import java.util.ArrayList; @@ -37,6 +38,12 @@ import io.openems.edge.bridge.modbus.api.task.FC16WriteRegistersTask; import io.openems.edge.bridge.modbus.api.task.FC3ReadRegistersTask; import io.openems.edge.bridge.modbus.api.task.Task.ExecuteState; +import io.openems.edge.bridge.modbus.sunspec.Point.BitFieldPoint; +import io.openems.edge.bridge.modbus.sunspec.Point.BitFieldPoint.SunSpecBitPoint; +import io.openems.edge.bridge.modbus.sunspec.Point.ChannelIdPoint; +import io.openems.edge.bridge.modbus.sunspec.Point.ModbusElementPoint; +import io.openems.edge.bridge.modbus.sunspec.Point.ScaleFactorPoint; +import io.openems.edge.bridge.modbus.sunspec.Point.ScaledValuePoint; import io.openems.edge.common.channel.Channel; import io.openems.edge.common.taskmanager.Priority; @@ -231,7 +238,7 @@ private Entry getActiveModelForId(int blockId) { } /** - * Overwrite to provide custom SunSpecModel. + * Override to provide custom {@link SunSpecModel}. * * @param blockId the Block-Id * @return the {@link SunSpecModel} @@ -241,6 +248,21 @@ protected SunSpecModel getSunSpecModel(int blockId) throws IllegalArgumentExcept return null; } + /** + * Override to provide custom {@link SunSpecBitPoint}s. + * + *

+ * Use this to create a different mapping for SunSpec BitFields, e.g. Model 103 + * "Vendor defined events". + * + * @param bfp the {@link BitFieldPoint} + * @return array of {@link SunSpecBitPoint}s; null or empty uses defaults from + * {@link DefaultSunSpecModel}. + */ + protected SunSpecBitPoint[] getBitPoints(BitFieldPoint bfp) { + return null; + } + /** * Is the SunSpec initialization completed?. * @@ -277,27 +299,25 @@ protected void addBlock(int startAddress, SunSpecModel model, Priority priority) startAddress += 2; for (var i = 0; i < model.points().length; i++) { var point = model.points()[i]; - final var element = point.get().generateModbusElement(startAddress); + var elements = this.addModbusElementAndChannels(startAddress, model, point); + var length = elements.stream().mapToInt(e -> e.length).sum(); // Handle AccessMode switch (point.get().accessMode) { case READ_ONLY -> { - readElements.add(element); + readElements.addAll(elements); } case READ_WRITE -> { - readElements.add(element); - writeElements.add(element); + readElements.addAll(elements); + writeElements.addAll(elements); } case WRITE_ONLY -> { - readElements.add(new DummyRegisterElement(element.startAddress, element.length)); - writeElements.add(element); + readElements.add(new DummyRegisterElement(startAddress, length)); + writeElements.addAll(elements); } } - startAddress += element.length; - var channelId = point.getChannelId(); - this.addChannel(channelId); - this.m(channelId, element, this.generateElementToChannelConverter(model, point)); + startAddress += length; } // Create Tasks and add them to the ModbusProtocol @@ -313,6 +333,38 @@ protected void addBlock(int startAddress, SunSpecModel model, Priority priority) } } + /** + * Adds an Element of the block starting from startAddress and maps it to + * Channel(s). + * + * @param startAddress the address to start reading from + * @param model the {@link SunSpecModel} + * @param ssp the {@link SunSpecPoint} + * @return the added {@link ModbusElement}s + */ + 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) { + // Channels are added and mapped internally + var alternativeBitPoints = this.getBitPoints(bfp); + return bfp.generateModbusElements(this, channelId -> this.addChannel(channelId), startAddress, + alternativeBitPoints); + } + + if (p instanceof 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); + } + + return List.of(); + } + /** * Converts a list of {@link ModbusElement}s to sublists, prepared for Modbus * {@link AbstractTask}s. @@ -368,7 +420,7 @@ protected static List> preprocessModbusElements(List Channel */ value -> point.isDefined(value) ? value : null, @@ -376,23 +428,26 @@ protected ElementToChannelConverter generateElementToChannelConverter(SunSpecMod // Generate Scale-Factor converter (possibly null) ElementToChannelConverter scaleFactorConverter = null; - if (point.get().scaleFactor.isPresent()) { - final var scaleFactor = point.get().scaleFactor.get(); - final var scaleFactorName = SunSpecCodeGenerator.toUpperUnderscore(scaleFactor); + + if (point instanceof ScaledValuePoint svp) { + final var scaleFactorName = toUpperUnderscore(svp.scaleFactor); scaleFactorConverter = Stream.of(model.points()) // .filter(p -> p.name().equals(scaleFactorName)) // - .map(sfp -> new ElementToChannelScaleFactorConverter(this, point, sfp.getChannelId())) // - // Found matching Scale-Factor Point in SunSpec Modal + .map(SunSpecPoint::get) // + .filter(ScaleFactorPoint.class::isInstance) // + .map(ScaleFactorPoint.class::cast) // + .map(sfp -> new ElementToChannelScaleFactorConverter(this, svp, sfp.channelId)) // + // Found matching Scale-Factor Point in SunSpec Model .findFirst() // Else: try to parse constant Scale-Factor .orElseGet(() -> { try { - return new ElementToChannelScaleFactorConverter(Integer.parseInt(scaleFactor)); + return new ElementToChannelScaleFactorConverter(Integer.parseInt(svp.scaleFactor)); } catch (NumberFormatException e) { // Unable to parse Scale-Factor to static value - this.logError(this.log, "Unable to parse Scale-Factor [" + scaleFactor + "] for Point [" - + point.name() + "]"); + this.logError(this.log, "Unable to parse Scale-Factor [" + svp.scaleFactor + "] for Point [" + + point.name + "]"); return null; } }); // @@ -408,32 +463,38 @@ protected ElementToChannelConverter generateElementToChannelConverter(SunSpecMod /** * Get the Channel for the given Point. * - * @param the Channel type - * @param point the SunSpec Point - * @return the optional Channel + * @param the Channel type + * @param ssp the {@link SunSpecPoint} + * @return the optional {@link Channel} */ - protected > Optional getSunSpecChannel(SunSpecPoint point) { - try { - return Optional.ofNullable(this.channel(point.getChannelId())); - } catch (IllegalArgumentException e) { - return Optional.empty(); + protected > Optional getSunSpecChannel(SunSpecPoint ssp) { + var point = ssp.get(); + if (point instanceof ChannelIdPoint cp) { + try { + return Optional.ofNullable(this.channel(cp.channelId)); + } catch (IllegalArgumentException e) { + // Ignore + } + } else { + // Ignore } + return Optional.empty(); } /** * Get the Channel for the given Point or throw an error if it is not available. * - * @param the Channel type - * @param point the SunSpec Point - * @return the optional Channel + * @param the Channel type + * @param ssp the {@link SunSpecPoint} + * @return the optional {@link Channel} * @throws OpenemsException if Channel is not available */ @SuppressWarnings("unchecked") - protected > T getSunSpecChannelOrError(SunSpecPoint point) throws OpenemsException { - Optional> channelOpt = this.getSunSpecChannel(point); + protected > T getSunSpecChannelOrError(SunSpecPoint ssp) throws OpenemsException { + Optional> channelOpt = this.getSunSpecChannel(ssp); if (!channelOpt.isPresent()) { - throw new OpenemsException("SunSpec Channel for Point [" + point.getClass().getSimpleName() + "." - + point.name() + "] is not available"); + throw new OpenemsException("SunSpec Channel for Point [" + ssp.getClass().getSimpleName() + "." + ssp.name() + + "] is not available"); } return (T) channelOpt.get(); } 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 f40ce5a9b4e..8911c6ee34e 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 @@ -3,618 +3,242 @@ package io.openems.edge.bridge.modbus.sunspec; import io.openems.common.channel.AccessMode; +import io.openems.common.channel.Level; import io.openems.common.channel.Unit; import io.openems.common.types.OptionsEnum; +import io.openems.edge.bridge.modbus.sunspec.Point.BitFieldPoint; +import io.openems.edge.bridge.modbus.sunspec.Point.BitFieldPoint.SunSpecBitPoint; +import io.openems.edge.bridge.modbus.sunspec.Point.BitPoint; +import io.openems.edge.bridge.modbus.sunspec.Point.EnumPoint; +import io.openems.edge.bridge.modbus.sunspec.Point.ScaleFactorPoint; +import io.openems.edge.bridge.modbus.sunspec.Point.ScaledValuePoint; +import io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint; /** * Do not touch this file. It is auto-generated by SunSpecCodeGenerator. */ public enum DefaultSunSpecModel implements SunSpecModel { - S_1(// - "Common", // + S_1("Common", // "All SunSpec compliant devices must include this as the first model", // - "", // - 66, // - DefaultSunSpecModel.S1.values(), // - SunSpecModelType.COMMON // - ), // - S_2(// - "Basic Aggregator", // + 66 /* length */, DefaultSunSpecModel.S1.values(), SunSpecModelType.COMMON), // + S_2("Basic Aggregator", // "Aggregates a collection of models for a given model id", // - "", // - 14, // - DefaultSunSpecModel.S2.values(), // - SunSpecModelType.AGGREGATOR // - ), // - S_15(// - "Interface Counters Model", // + 14 /* length */, DefaultSunSpecModel.S2.values(), SunSpecModelType.AGGREGATOR), // + S_15("Interface Counters Model", // "Interface counters", // - "", // - 24, // - DefaultSunSpecModel.S15.values(), // - SunSpecModelType.NETWORK_CONFIGURATION // - ), // - S_18(// - "Cellular Link", // + 24 /* length */, DefaultSunSpecModel.S15.values(), SunSpecModelType.NETWORK_CONFIGURATION), // + S_18("Cellular Link", // "Include this model to support a cellular interface link", // - "", // - 22, // - DefaultSunSpecModel.S18.values(), // - SunSpecModelType.NETWORK_CONFIGURATION // - ), // - S_101(// - "Inverter (Single Phase)", // + 22 /* length */, DefaultSunSpecModel.S18.values(), SunSpecModelType.NETWORK_CONFIGURATION), // + S_101("Inverter (Single Phase)", // "Include this model for single phase inverter monitoring", // - "", // - 50, // - DefaultSunSpecModel.S101.values(), // - SunSpecModelType.INVERTER // - ), // - S_102(// - "Inverter (Split-Phase)", // + 50 /* length */, DefaultSunSpecModel.S101.values(), SunSpecModelType.INVERTER), // + S_102("Inverter (Split-Phase)", // "Include this model for split phase inverter monitoring", // - "", // - 50, // - DefaultSunSpecModel.S102.values(), // - SunSpecModelType.INVERTER // - ), // - S_103(// - "Inverter (Three Phase)", // + 50 /* length */, DefaultSunSpecModel.S102.values(), SunSpecModelType.INVERTER), // + S_103("Inverter (Three Phase)", // "Include this model for three phase inverter monitoring", // - "", // - 50, // - DefaultSunSpecModel.S103.values(), // - SunSpecModelType.INVERTER // - ), // - S_111(// - "Inverter (Single Phase) FLOAT", // + 50 /* length */, DefaultSunSpecModel.S103.values(), SunSpecModelType.INVERTER), // + S_111("Inverter (Single Phase) FLOAT", // "Include this model for single phase inverter monitoring using float values", // - "", // - 60, // - DefaultSunSpecModel.S111.values(), // - SunSpecModelType.INVERTER // - ), // - S_112(// - "Inverter (Split Phase) FLOAT", // + 60 /* length */, DefaultSunSpecModel.S111.values(), SunSpecModelType.INVERTER), // + S_112("Inverter (Split Phase) FLOAT", // "Include this model for split phase inverter monitoring using float values", // - "", // - 60, // - DefaultSunSpecModel.S112.values(), // - SunSpecModelType.INVERTER // - ), // - S_113(// - "Inverter (Three Phase) FLOAT", // + 60 /* length */, DefaultSunSpecModel.S112.values(), SunSpecModelType.INVERTER), // + S_113("Inverter (Three Phase) FLOAT", // "Include this model for three phase inverter monitoring using float values", // - "", // - 60, // - DefaultSunSpecModel.S113.values(), // - SunSpecModelType.INVERTER // - ), // - S_120(// - "Nameplate", // + 60 /* length */, DefaultSunSpecModel.S113.values(), SunSpecModelType.INVERTER), // + S_120("Nameplate", // "Inverter Controls Nameplate Ratings", // - "", // - 26, // - DefaultSunSpecModel.S120.values(), // - SunSpecModelType.INVERTER // - ), // - S_121(// - "Basic Settings", // + 26 /* length */, DefaultSunSpecModel.S120.values(), SunSpecModelType.INVERTER), // + S_121("Basic Settings", // "Inverter Controls Basic Settings", // - "", // - 30, // - DefaultSunSpecModel.S121.values(), // - SunSpecModelType.INVERTER // - ), // - S_122(// - "Measurements_Status", // + 30 /* length */, DefaultSunSpecModel.S121.values(), SunSpecModelType.INVERTER), // + S_122("Measurements_Status", // "Inverter Controls Extended Measurements and Status", // - "", // - 44, // - DefaultSunSpecModel.S122.values(), // - SunSpecModelType.INVERTER // - ), // - S_123(// - "Immediate Controls", // + 44 /* length */, DefaultSunSpecModel.S122.values(), SunSpecModelType.INVERTER), // + S_123("Immediate Controls", // "Immediate Inverter Controls", // - "", // - 24, // - DefaultSunSpecModel.S123.values(), // - SunSpecModelType.INVERTER // - ), // - S_124(// - "Storage", // + 24 /* length */, DefaultSunSpecModel.S123.values(), SunSpecModelType.INVERTER), // + S_124("Storage", // "Basic Storage Controls", // - "", // - 24, // - DefaultSunSpecModel.S124.values(), // - SunSpecModelType.INVERTER // - ), // - S_125(// - "Pricing", // + 24 /* length */, DefaultSunSpecModel.S124.values(), SunSpecModelType.INVERTER), // + S_125("Pricing", // "Pricing Signal", // - "", // - 8, // - DefaultSunSpecModel.S125.values(), // - SunSpecModelType.INVERTER // - ), // - S_127(// - "Freq-Watt Param", // + 8 /* length */, DefaultSunSpecModel.S125.values(), SunSpecModelType.INVERTER), // + S_127("Freq-Watt Param", // "Parameterized Frequency-Watt", // - "", // - 10, // - DefaultSunSpecModel.S127.values(), // - SunSpecModelType.INVERTER // - ), // - S_128(// - "Dynamic Reactive Current", // + 10 /* length */, DefaultSunSpecModel.S127.values(), SunSpecModelType.INVERTER), // + S_128("Dynamic Reactive Current", // "Dynamic Reactive Current", // - "", // - 14, // - DefaultSunSpecModel.S128.values(), // - SunSpecModelType.INVERTER // - ), // - S_145(// - "Extended Settings", // + 14 /* length */, DefaultSunSpecModel.S128.values(), SunSpecModelType.INVERTER), // + S_145("Extended Settings", // "Inverter controls extended settings", // - "", // - 8, // - DefaultSunSpecModel.S145.values(), // - SunSpecModelType.INVERTER // - ), // - S_201(// - "Meter (Single Phase)single phase (AN or AB) meter", // + 8 /* length */, DefaultSunSpecModel.S145.values(), SunSpecModelType.INVERTER), // + S_201("Meter (Single Phase)single phase (AN or AB) meter", // "Include this model for single phase (AN or AB) metering", // + 105 /* length */, DefaultSunSpecModel.S201.values(), SunSpecModelType.METER), // + S_202("split single phase (ABN) meter", // "", // - 105, // - DefaultSunSpecModel.S201.values(), // - SunSpecModelType.METER // - ), // - S_202(// - "split single phase (ABN) meter", // - "", // - "", // - 105, // - DefaultSunSpecModel.S202.values(), // - SunSpecModelType.METER // - ), // - S_203(// - "wye-connect three phase (abcn) meter", // - "", // - "", // - 105, // - DefaultSunSpecModel.S203.values(), // - SunSpecModelType.METER // - ), // - S_204(// - "delta-connect three phase (abc) meter", // + 105 /* length */, DefaultSunSpecModel.S202.values(), SunSpecModelType.METER), // + S_203("wye-connect three phase (abcn) meter", // "", // + 105 /* length */, DefaultSunSpecModel.S203.values(), SunSpecModelType.METER), // + S_204("delta-connect three phase (abc) meter", // "", // - 105, // - DefaultSunSpecModel.S204.values(), // - SunSpecModelType.METER // - ), // - S_305(// - "GPS", // + 105 /* length */, DefaultSunSpecModel.S204.values(), SunSpecModelType.METER), // + S_305("GPS", // "Include to support location measurements", // - "", // - 36, // - DefaultSunSpecModel.S305.values(), // - SunSpecModelType.ENVIRONMENTAL // - ), // - S_306(// - "Reference Point Model", // + 36 /* length */, DefaultSunSpecModel.S305.values(), SunSpecModelType.ENVIRONMENTAL), // + S_306("Reference Point Model", // "Include to support a standard reference point", // - "", // - 4, // - DefaultSunSpecModel.S306.values(), // - SunSpecModelType.ENVIRONMENTAL // - ), // - S_307(// - "Base Met", // + 4 /* length */, DefaultSunSpecModel.S306.values(), SunSpecModelType.ENVIRONMENTAL), // + S_307("Base Met", // "Base Meteorological Model", // - "", // - 11, // - DefaultSunSpecModel.S307.values(), // - SunSpecModelType.ENVIRONMENTAL // - ), // - S_308(// - "Mini Met Model", // + 11 /* length */, DefaultSunSpecModel.S307.values(), SunSpecModelType.ENVIRONMENTAL), // + S_308("Mini Met Model", // "Include to support a few basic measurements", // - "", // - 4, // - DefaultSunSpecModel.S308.values(), // - SunSpecModelType.ENVIRONMENTAL // - ), // - S_701(// - "DER AC Measurement", // + 4 /* length */, DefaultSunSpecModel.S308.values(), SunSpecModelType.ENVIRONMENTAL), // + S_701("DER AC Measurement", // "DER AC measurement model.", // - "", // - 153, // - DefaultSunSpecModel.S701.values(), // - SunSpecModelType.RESERVED_1 // - ), // - S_702(// - "DER Capacity", // + 153 /* length */, DefaultSunSpecModel.S701.values(), SunSpecModelType.RESERVED_1), // + S_702("DER Capacity", // "DER capacity model.", // - "", // - 50, // - DefaultSunSpecModel.S702.values(), // - SunSpecModelType.RESERVED_1 // - ), // - S_703(// - "Enter Service", // + 50 /* length */, DefaultSunSpecModel.S702.values(), SunSpecModelType.RESERVED_1), // + S_703("Enter Service", // "Enter service model.", // - "", // - 17, // - DefaultSunSpecModel.S703.values(), // - SunSpecModelType.RESERVED_1 // - ), // - S_704(// - "DER AC Controls", // + 17 /* length */, DefaultSunSpecModel.S703.values(), SunSpecModelType.RESERVED_1), // + S_704("DER AC Controls", // "DER AC controls model.", // - "", // - 57, // - DefaultSunSpecModel.S704.values(), // - SunSpecModelType.RESERVED_1 // - ), // - S_705(// - "DER Volt-Var", // + 57 /* length */, DefaultSunSpecModel.S704.values(), SunSpecModelType.RESERVED_1), // + S_705("DER Volt-Var", // "DER Volt-Var model.", // - "", // - 13, // - DefaultSunSpecModel.S705.values(), // - SunSpecModelType.RESERVED_1 // - ), // - S_706(// - "DER Volt-Watt", // + 13 /* length */, DefaultSunSpecModel.S705.values(), SunSpecModelType.RESERVED_1), // + S_706("DER Volt-Watt", // "DER Volt-Watt model.", // - "", // - 13, // - DefaultSunSpecModel.S706.values(), // - SunSpecModelType.RESERVED_1 // - ), // - S_707(// - "DER Trip LV", // + 13 /* length */, DefaultSunSpecModel.S706.values(), SunSpecModelType.RESERVED_1), // + S_707("DER Trip LV", // "DER low voltage trip model.", // - "", // - 7, // - DefaultSunSpecModel.S707.values(), // - SunSpecModelType.RESERVED_1 // - ), // - S_708(// - "DER Trip HV", // + 7 /* length */, DefaultSunSpecModel.S707.values(), SunSpecModelType.RESERVED_1), // + S_708("DER Trip HV", // "DER high voltage trip model.", // - "", // - 7, // - DefaultSunSpecModel.S708.values(), // - SunSpecModelType.RESERVED_1 // - ), // - S_709(// - "DER Trip LF", // + 7 /* length */, DefaultSunSpecModel.S708.values(), SunSpecModelType.RESERVED_1), // + S_709("DER Trip LF", // "DER low frequency trip model.", // - "", // - 7, // - DefaultSunSpecModel.S709.values(), // - SunSpecModelType.RESERVED_1 // - ), // - S_710(// - "DER Trip HF", // + 7 /* length */, DefaultSunSpecModel.S709.values(), SunSpecModelType.RESERVED_1), // + S_710("DER Trip HF", // "DER high frequency trip model.", // - "", // - 7, // - DefaultSunSpecModel.S710.values(), // - SunSpecModelType.RESERVED_1 // - ), // - S_711(// - "DER Frequency Droop", // + 7 /* length */, DefaultSunSpecModel.S710.values(), SunSpecModelType.RESERVED_1), // + S_711("DER Frequency Droop", // "DER Frequency Droop model.", // - "", // - 12, // - DefaultSunSpecModel.S711.values(), // - SunSpecModelType.RESERVED_1 // - ), // - S_712(// - "DER Watt-Var", // + 12 /* length */, DefaultSunSpecModel.S711.values(), SunSpecModelType.RESERVED_1), // + S_712("DER Watt-Var", // "DER Watt-Var model.", // - "", // - 12, // - DefaultSunSpecModel.S712.values(), // - SunSpecModelType.RESERVED_1 // - ), // - S_713(// - "DER Storage Capacity", // + 12 /* length */, DefaultSunSpecModel.S712.values(), SunSpecModelType.RESERVED_1), // + S_713("DER Storage Capacity", // "DER storage capacity.", // - "", // - 7, // - DefaultSunSpecModel.S713.values(), // - SunSpecModelType.RESERVED_1 // - ), // - S_714(// - "DER DC Measurement", // + 7 /* length */, DefaultSunSpecModel.S713.values(), SunSpecModelType.RESERVED_1), // + S_714("DER DC Measurement", // "DER DC measurement.", // - "", // - 18, // - DefaultSunSpecModel.S714.values(), // - SunSpecModelType.RESERVED_1 // - ), // - S_715(// - "DERCtl", // + 18 /* length */, DefaultSunSpecModel.S714.values(), SunSpecModelType.RESERVED_1), // + S_715("DERCtl", // "DER Control", // - "", // - 7, // - DefaultSunSpecModel.S715.values(), // - SunSpecModelType.RESERVED_1 // - ), // - S_801(// - "Energy Storage Base Model (DEPRECATED)", // + 7 /* length */, DefaultSunSpecModel.S715.values(), SunSpecModelType.RESERVED_1), // + S_801("Energy Storage Base Model (DEPRECATED)", // "This model has been deprecated.", // + 1 /* length */, DefaultSunSpecModel.S801.values(), SunSpecModelType.STORAGE), // + S_802("Battery Base Model", // "", // - 1, // - DefaultSunSpecModel.S801.values(), // - SunSpecModelType.STORAGE // - ), // - S_802(// - "Battery Base Model", // - "", // - "", // - 62, // - DefaultSunSpecModel.S802.values(), // - SunSpecModelType.STORAGE // - ), // - S_64001(// - "Veris Status and Configuration", // - "", // - "", // - 71, // - DefaultSunSpecModel.S64001.values(), // - SunSpecModelType.VENDOR_SPECIFIC // - ), // - S_64101(// - "Eltek Inverter Extension", // - "", // + 62 /* length */, DefaultSunSpecModel.S802.values(), SunSpecModelType.STORAGE), // + S_64001("Veris Status and Configuration", // "", // - 7, // - DefaultSunSpecModel.S64101.values(), // - SunSpecModelType.VENDOR_SPECIFIC // - ), // - S_64110(// - "OutBack AXS device", // + 71 /* length */, DefaultSunSpecModel.S64001.values(), SunSpecModelType.VENDOR_SPECIFIC), // + S_64101("Eltek Inverter Extension", // "", // + 7 /* length */, DefaultSunSpecModel.S64101.values(), SunSpecModelType.VENDOR_SPECIFIC), // + S_64111("Basic Charge Controller", // "", // - 282, // - DefaultSunSpecModel.S64110.values(), // - SunSpecModelType.VENDOR_SPECIFIC // - ), // - S_64111(// - "Basic Charge Controller", // + 23 /* length */, DefaultSunSpecModel.S64111.values(), SunSpecModelType.VENDOR_SPECIFIC), // + S_64112("OutBack FM Charge Controller", // "", // - "", // - 23, // - DefaultSunSpecModel.S64111.values(), // - SunSpecModelType.VENDOR_SPECIFIC // - ), // - S_64112(// - "OutBack FM Charge Controller", // - "", // - "", // - 64, // - DefaultSunSpecModel.S64112.values(), // - SunSpecModelType.VENDOR_SPECIFIC // - ); // + 64 /* length */, DefaultSunSpecModel.S64112.values(), SunSpecModelType.VENDOR_SPECIFIC); // public static enum S1 implements SunSpecPoint { - MN(new PointImpl(// - "S1_MN", // - "Manufacturer", // + MN(new ValuePoint("S1_MN", "Manufacturer", // "Well known value registered with SunSpec for compliance", // - "", // - PointType.STRING16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - MD(new PointImpl(// - "S1_MD", // - "Model", // + ValuePoint.Type.STRING16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + MD(new ValuePoint("S1_MD", "Model", // "Manufacturer specific value (32 chars)", // - "", // - PointType.STRING16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - OPT(new PointImpl(// - "S1_OPT", // - "Options", // + ValuePoint.Type.STRING16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + OPT(new ValuePoint("S1_OPT", "Options", // "Manufacturer specific value (16 chars)", // - "", // - PointType.STRING8, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VR(new PointImpl(// - "S1_VR", // - "Version", // + ValuePoint.Type.STRING8, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + VR(new ValuePoint("S1_VR", "Version", // "Manufacturer specific value (16 chars)", // - "", // - PointType.STRING8, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - SN(new PointImpl(// - "S1_SN", // - "Serial Number", // + ValuePoint.Type.STRING8, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + SN(new ValuePoint("S1_SN", "Serial Number", // "Manufacturer specific value (32 chars)", // - "", // - PointType.STRING16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DA(new PointImpl(// - "S1_DA", // - "Device Address", // + ValuePoint.Type.STRING16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + DA(new ValuePoint("S1_DA", "Device Address", // "Modbus device address", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PAD(new PointImpl(// - "S1_PAD", // - "", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), // + PAD(new ValuePoint("S1_PAD", "", // "Force even alignment", // - "", // - PointType.PAD, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // + ValuePoint.Type.PAD, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)); - protected final PointImpl impl; + private final Point point; - private S1(PointImpl impl) { - this.impl = impl; + private S1(Point point) { + this.point = point; } @Override - public PointImpl get() { - return this.impl; + public Point get() { + return this.point; } } public static enum S2 implements SunSpecPoint { - AID(new PointImpl(// - "S2_AID", // - "AID", // + AID(new ValuePoint("S2_AID", "AID", // "Aggregated model id", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - N(new PointImpl(// - "S2_N", // - "N", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + N(new ValuePoint("S2_N", "N", // "Number of aggregated models", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - UN(new PointImpl(// - "S2_UN", // - "UN", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ST(new PointImpl(// - "S2_ST", // - "Status", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + ST(new EnumPoint("S2_ST", "Status", // "Enumerated status code", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S2_St.values())), // - ST_VND(new PointImpl(// - "S2_ST_VND", // - "Vendor Status", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S2_St.values())), // + ST_VND(new EnumPoint("S2_ST_VND", "Vendor Status", // "Vendor specific status code", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT(new PointImpl(// - "S2_EVT", // - "Event Code", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), // + EVT(new BitFieldPoint("S2_EVT", "Event Code", // "Bitmask event code", // - "", // - PointType.BITFIELD32, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S2_Evt.values())), // - EVT_VND(new PointImpl(// - "S2_EVT_VND", // - "Vendor Event Code", // + BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S2_Evt.values())), // + EVT_VND(new BitFieldPoint("S2_EVT_VND", "Vendor Event Code", // "Vendor specific event code", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - CTL(new PointImpl(// - "S2_CTL", // - "Control", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + CTL(new EnumPoint("S2_CTL", "Control", // "Control register for all aggregated devices", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S2_Ctl.values())), // - CTL_VND(new PointImpl(// - "S2_CTL_VND", // - "Vendor Control", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S2_Ctl.values())), // + CTL_VND(new EnumPoint("S2_CTL_VND", "Vendor Control", // "Vendor control register for all aggregated devices", // - "", // - PointType.ENUM32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - CTL_VL(new PointImpl(// - "S2_CTL_VL", // - "Control Value", // + EnumPoint.Type.ENUM32, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), // + CTL_VL(new EnumPoint("S2_CTL_VL", "Control Value", // "Numerical value used as a parameter to the control", // - "", // - PointType.ENUM32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // + EnumPoint.Type.ENUM32, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])); - protected final PointImpl impl; + private final Point point; - private S2(PointImpl impl) { - this.impl = impl; + private S2(Point point) { + this.point = point; } @Override - public PointImpl get() { - return this.impl; + public Point get() { + return this.point; } } @@ -623,7 +247,7 @@ public static enum S2_St implements OptionsEnum { OFF(1, "OFF"), // ON(2, "ON"), // FULL(3, "FULL"), // - FAULT(4, "FAULT"); // + FAULT(4, "FAULT"); private final int value; private final String name; @@ -649,51 +273,38 @@ public OptionsEnum getUndefined() { } } - public static enum S2_Evt implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - GROUND_FAULT(0, "GROUND_FAULT"), // - INPUT_OVER_VOLTAGE(1, "INPUT_OVER_VOLTAGE"), // - RESERVED_2(2, "RESERVED_2"), // - DC_DISCONNECT(3, "DC_DISCONNECT"), // - RESERVED_4(4, "RESERVED_4"), // - RESERVED_5(5, "RESERVED_5"), // - MANUAL_SHUTDOWN(6, "MANUAL_SHUTDOWN"), // - OVER_TEMPERATURE(7, "OVER_TEMPERATURE"), // - RESERVED_8(8, "RESERVED_8"), // - RESERVED_9(9, "RESERVED_9"), // - RESERVED_10(10, "RESERVED_10"), // - RESERVED_11(11, "RESERVED_11"), // - BLOWN_FUSE(12, "BLOWN_FUSE"), // - UNDER_TEMPERATURE(13, "UNDER_TEMPERATURE"), // - MEMORY_LOSS(14, "MEMORY_LOSS"), // - ARC_DETECTION(15, "ARC_DETECTION"), // - THEFT_DETECTION(16, "THEFT_DETECTION"), // - OUTPUT_OVER_CURRENT(17, "OUTPUT_OVER_CURRENT"), // - OUTPUT_OVER_VOLTAGE(18, "OUTPUT_OVER_VOLTAGE"), // - OUTPUT_UNDER_VOLTAGE(19, "OUTPUT_UNDER_VOLTAGE"), // - TEST_FAILED(20, "TEST_FAILED"); // - - private final int value; - private final String name; - - private S2_Evt(int value, String name) { - this.value = value; - this.name = name; - } + public static enum S2_Evt implements SunSpecBitPoint { + GROUND_FAULT(new BitPoint(0, "S2_EVT_GROUND_FAULT", "Ground Fault", Level.INFO)), // + INPUT_OVER_VOLTAGE(new BitPoint(1, "S2_EVT_INPUT_OVER_VOLTAGE", "Input Over Voltage", Level.INFO)), // + RESERVED_2(new BitPoint(2, "S2_EVT_RESERVED_2", "Reserved 2")), // + DC_DISCONNECT(new BitPoint(3, "S2_EVT_DC_DISCONNECT", "DC Disconnect", Level.INFO)), // + RESERVED_4(new BitPoint(4, "S2_EVT_RESERVED_4", "Reserved 4")), // + RESERVED_5(new BitPoint(5, "S2_EVT_RESERVED_5", "Reserved 5")), // + MANUAL_SHUTDOWN(new BitPoint(6, "S2_EVT_MANUAL_SHUTDOWN", "Manual Shutdown", Level.INFO)), // + OVER_TEMPERATURE(new BitPoint(7, "S2_EVT_OVER_TEMPERATURE", "Over Temperature", Level.INFO)), // + RESERVED_8(new BitPoint(8, "S2_EVT_RESERVED_8", "Reserved 8")), // + RESERVED_9(new BitPoint(9, "S2_EVT_RESERVED_9", "Reserved 9")), // + RESERVED_10(new BitPoint(10, "S2_EVT_RESERVED_10", "Reserved 10")), // + RESERVED_11(new BitPoint(11, "S2_EVT_RESERVED_11", "Reserved 11")), // + BLOWN_FUSE(new BitPoint(12, "S2_EVT_BLOWN_FUSE", "Blown Fuse", Level.INFO)), // + UNDER_TEMPERATURE(new BitPoint(13, "S2_EVT_UNDER_TEMPERATURE", "Under Temperature", Level.INFO)), // + MEMORY_LOSS(new BitPoint(14, "S2_EVT_MEMORY_LOSS", "Memory Loss", Level.INFO)), // + ARC_DETECTION(new BitPoint(15, "S2_EVT_ARC_DETECTION", "Arc Detection", Level.INFO)), // + THEFT_DETECTION(new BitPoint(16, "S2_EVT_THEFT_DETECTION", "Theft Detection", Level.INFO)), // + OUTPUT_OVER_CURRENT(new BitPoint(17, "S2_EVT_OUTPUT_OVER_CURRENT", "Output Over Current", Level.INFO)), // + OUTPUT_OVER_VOLTAGE(new BitPoint(18, "S2_EVT_OUTPUT_OVER_VOLTAGE", "Output Over Voltage", Level.INFO)), // + OUTPUT_UNDER_VOLTAGE(new BitPoint(19, "S2_EVT_OUTPUT_UNDER_VOLTAGE", "Output Under Voltage", Level.INFO)), // + TEST_FAILED(new BitPoint(20, "S2_EVT_TEST_FAILED", "Test Failed", Level.INFO)); - @Override - public int getValue() { - return this.value; - } + private final BitPoint point; - @Override - public String getName() { - return this.name; + private S2_Evt(BitPoint point) { + this.point = point; } @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } @@ -703,7 +314,7 @@ public static enum S2_Ctl implements OptionsEnum { AUTOMATIC(1, "AUTOMATIC"), // FORCE_OFF(2, "FORCE_OFF"), // TEST(3, "TEST"), // - THROTTLE(4, "THROTTLE"); // + THROTTLE(4, "THROTTLE"); private final int value; private final String name; @@ -730,715 +341,202 @@ public OptionsEnum getUndefined() { } public static enum S15 implements SunSpecPoint { - CLR(new PointImpl(// - "S15_CLR", // - "Clear", // + CLR(new ValuePoint("S15_CLR", "Clear", // "Write a \"1\" to clear all counters", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - IN_CNT(new PointImpl(// - "S15_IN_CNT", // - "Input Count", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), // + IN_CNT(new ValuePoint("S15_IN_CNT", "Input Count", // "Number of bytes received", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - IN_UC_CNT(new PointImpl(// - "S15_IN_UC_CNT", // - "Input Unicast Count", // + ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + IN_UC_CNT(new ValuePoint("S15_IN_UC_CNT", "Input Unicast Count", // "Number of Unicast packets received", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - IN_N_UC_CNT(new PointImpl(// - "S15_IN_N_UC_CNT", // - "Input Non-Unicast Count", // + ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.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", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - IN_DSC_CNT(new PointImpl(// - "S15_IN_DSC_CNT", // - "Input Discarded Count", // + ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.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", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - IN_ERR_CNT(new PointImpl(// - "S15_IN_ERR_CNT", // - "Input Error Count", // + ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.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)", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - IN_UNK_CNT(new PointImpl(// - "S15_IN_UNK_CNT", // - "Input Unknown Count", // + ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + IN_UNK_CNT(new ValuePoint("S15_IN_UNK_CNT", "Input Unknown Count", // "Number of inbound packets with unknown protocol", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - OUT_CNT(new PointImpl(// - "S15_OUT_CNT", // - "Output Count", // + ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + OUT_CNT(new ValuePoint("S15_OUT_CNT", "Output Count", // "Total number of bytes transmitted on this interface", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - OUT_UC_CNT(new PointImpl(// - "S15_OUT_UC_CNT", // - "Output Unicast Count", // + ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + OUT_UC_CNT(new ValuePoint("S15_OUT_UC_CNT", "Output Unicast Count", // "Number of Unicast packets transmitted", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - OUT_N_UC_CNT(new PointImpl(// - "S15_OUT_N_UC_CNT", // - "Output Non-Unicast Count", // + ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.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", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - OUT_DSC_CNT(new PointImpl(// - "S15_OUT_DSC_CNT", // - "Output Discarded Count", // + ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + OUT_DSC_CNT(new ValuePoint("S15_OUT_DSC_CNT", "Output Discarded Count", // "Number of Discarded output packets", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - OUT_ERR_CNT(new PointImpl(// - "S15_OUT_ERR_CNT", // - "Output Error Count", // + ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + OUT_ERR_CNT(new ValuePoint("S15_OUT_ERR_CNT", "Output Error Count", // "Number of outbound error packets", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PAD(new PointImpl(// - "S15_PAD", // - "", // - "", // - "", // - PointType.PAD, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S15(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + PAD(new ValuePoint("S15_PAD", "", "", // + ValuePoint.Type.PAD, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)); + + private final Point point; + + private S15(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } public static enum S18 implements SunSpecPoint { - NAM(new PointImpl(// - "S18_NAM", // - "Name", // + NAM(new ValuePoint("S18_NAM", "Name", // "Interface name", // - "", // - PointType.STRING4, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - IMEI(new PointImpl(// - "S18_IMEI", // - "IMEI", // + ValuePoint.Type.STRING4, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), // + IMEI(new ValuePoint("S18_IMEI", "IMEI", // "International Mobile Equipment Identifier for the interface", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - APN(new PointImpl(// - "S18_APN", // - "APN", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), // + APN(new ValuePoint("S18_APN", "APN", // "Access Point Name for the interface", // - "", // - PointType.STRING4, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - NUM(new PointImpl(// - "S18_NUM", // - "Number", // + ValuePoint.Type.STRING4, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), // + NUM(new ValuePoint("S18_NUM", "Number", // "Phone number for the interface", // - "", // - PointType.STRING6, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PIN(new PointImpl(// - "S18_PIN", // - "PIN", // + ValuePoint.Type.STRING6, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), // + PIN(new ValuePoint("S18_PIN", "PIN", // "Personal Identification Number for the interface", // - "", // - PointType.STRING6, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // + ValuePoint.Type.STRING6, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)); - protected final PointImpl impl; + private final Point point; - private S18(PointImpl impl) { - this.impl = impl; + private S18(Point point) { + this.point = point; } @Override - public PointImpl get() { - return this.impl; + public Point get() { + return this.point; } } public static enum S101 implements SunSpecPoint { - A(new PointImpl(// - "S101_A", // - "Amps", // + A(new ScaledValuePoint("S101_A", "Amps", // "AC Current", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - APH_A(new PointImpl(// - "S101_APH_A", // - "Amps PhaseA", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + APH_A(new ScaledValuePoint("S101_APH_A", "Amps PhaseA", // "Phase A Current", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - APH_B(new PointImpl(// - "S101_APH_B", // - "Amps PhaseB", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + APH_B(new ScaledValuePoint("S101_APH_B", "Amps PhaseB", // "Phase B Current", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - APH_C(new PointImpl(// - "S101_APH_C", // - "Amps PhaseC", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + APH_C(new ScaledValuePoint("S101_APH_C", "Amps PhaseC", // "Phase C Current", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - A_SF(new PointImpl(// - "S101_A_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - P_P_VPH_A_B(new PointImpl(// - "S101_P_P_VPH_A_B", // - "Phase Voltage AB", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - P_P_VPH_B_C(new PointImpl(// - "S101_P_P_VPH_B_C", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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", // - "Phase Voltage BC", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - P_P_VPH_C_A(new PointImpl(// - "S101_P_P_VPH_C_A", // - "Phase Voltage CA", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_A(new PointImpl(// - "S101_PH_VPH_A", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_A(new ScaledValuePoint("S101_PH_VPH_A", "Phase Voltage AN", // "Phase Voltage AN", // - "Phase Voltage AN", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_B(new PointImpl(// - "S101_PH_VPH_B", // - "Phase Voltage BN", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_B(new ScaledValuePoint("S101_PH_VPH_B", "Phase Voltage BN", // "Phase Voltage BN", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_C(new PointImpl(// - "S101_PH_VPH_C", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_C(new ScaledValuePoint("S101_PH_VPH_C", "Phase Voltage CN", // "Phase Voltage CN", // - "Phase Voltage CN", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - V_SF(new PointImpl(// - "S101_V_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - W(new PointImpl(// - "S101_W", // - "Watts", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + V_SF(new ScaleFactorPoint("S101_V_SF", "", "")), // + W(new ScaledValuePoint("S101_W", "Watts", // "AC Power", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - W_SF(new PointImpl(// - "S101_W_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - HZ(new PointImpl(// - "S101_HZ", // - "Hz", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), // + W_SF(new ScaleFactorPoint("S101_W_SF", "", "")), // + HZ(new ScaledValuePoint("S101_HZ", "Hz", // "Line Frequency", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.HERTZ, // - "Hz_SF", // - new OptionsEnum[0])), // - HZ_S_F(new PointImpl(// - "S101_HZ_S_F", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VA(new PointImpl(// - "S101_VA", // - "VA", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")), // + HZ_S_F(new ScaleFactorPoint("S101_HZ_S_F", "", "")), // + VA(new ScaledValuePoint("S101_VA", "VA", // "AC Apparent Power", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - VA_SF(new PointImpl(// - "S101_VA_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_AR(new PointImpl(// - "S101_V_AR", // - "VAr", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VAr_SF", // - new OptionsEnum[0])), // - V_AR_S_F(new PointImpl(// - "S101_V_AR_S_F", // - "", // - "", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PF(new PointImpl(// - "S101_PF", // - "PF", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - PF_SF(new PointImpl(// - "S101_PF_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - WH(new PointImpl(// - "S101_WH", // - "WattHours", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), // + PF_SF(new ScaleFactorPoint("S101_PF_SF", "", "")), // + WH(new ScaledValuePoint("S101_WH", "WattHours", // "AC Energy", // - "", // - PointType.ACC32, // - true, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "WH_SF", // - new OptionsEnum[0])), // - WH_SF(new PointImpl(// - "S101_WH_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DCA(new PointImpl(// - "S101_DCA", // - "DC Amps", // + ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), // + WH_SF(new ScaleFactorPoint("S101_WH_SF", "", "")), // + DCA(new ScaledValuePoint("S101_DCA", "DC Amps", // "DC Current", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "DCA_SF", // - new OptionsEnum[0])), // - DCA_SF(new PointImpl(// - "S101_DCA_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DCV(new PointImpl(// - "S101_DCV", // - "DC Voltage", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "DCA_SF")), // + DCA_SF(new ScaleFactorPoint("S101_DCA_SF", "", "")), // + DCV(new ScaledValuePoint("S101_DCV", "DC Voltage", // "DC Voltage", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "DCV_SF", // - new OptionsEnum[0])), // - DCV_SF(new PointImpl(// - "S101_DCV_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DCW(new PointImpl(// - "S101_DCW", // - "DC Watts", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "DCV_SF")), // + DCV_SF(new ScaleFactorPoint("S101_DCV_SF", "", "")), // + DCW(new ScaledValuePoint("S101_DCW", "DC Watts", // "DC Power", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "DCW_SF", // - new OptionsEnum[0])), // - DCW_SF(new PointImpl(// - "S101_DCW_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TMP_CAB(new PointImpl(// - "S101_TMP_CAB", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "DCW_SF")), // + DCW_SF(new ScaleFactorPoint("S101_DCW_SF", "", "")), // + TMP_CAB(new ScaledValuePoint("S101_TMP_CAB", "Cabinet Temperature", // "Cabinet Temperature", // - "Cabinet Temperature", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "Tmp_SF", // - new OptionsEnum[0])), // - TMP_SNK(new PointImpl(// - "S101_TMP_SNK", // - "Heat Sink Temperature", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), // + TMP_SNK(new ScaledValuePoint("S101_TMP_SNK", "Heat Sink Temperature", // "Heat Sink Temperature", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "Tmp_SF", // - new OptionsEnum[0])), // - TMP_TRNS(new PointImpl(// - "S101_TMP_TRNS", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), // + TMP_TRNS(new ScaledValuePoint("S101_TMP_TRNS", "Transformer Temperature", // "Transformer Temperature", // - "Transformer Temperature", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "Tmp_SF", // - new OptionsEnum[0])), // - TMP_OT(new PointImpl(// - "S101_TMP_OT", // - "Other Temperature", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), // + TMP_OT(new ScaledValuePoint("S101_TMP_OT", "Other Temperature", // "Other Temperature", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "Tmp_SF", // - new OptionsEnum[0])), // - TMP_S_F(new PointImpl(// - "S101_TMP_S_F", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ST(new PointImpl(// - "S101_ST", // - "Operating State", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S101_St.values())), // - ST_VND(new PointImpl(// - "S101_ST_VND", // - "Vendor Operating State", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S101_St.values())), // + ST_VND(new EnumPoint("S101_ST_VND", "Vendor Operating State", // "Vendor specific operating state code", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT1(new PointImpl(// - "S101_EVT1", // - "Event1", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), // + EVT1(new BitFieldPoint("S101_EVT1", "Event1", // "Bitmask value. Event fields", // - "", // - PointType.BITFIELD32, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S101_Evt1.values())), // - EVT2(new PointImpl(// - "S101_EVT2", // - "Event Bitfield 2", // + BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S101_Evt1.values())), // + EVT2(new BitFieldPoint("S101_EVT2", "Event Bitfield 2", // "Reserved for future use", // - "", // - PointType.BITFIELD32, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND1(new PointImpl(// - "S101_EVT_VND1", // - "Vendor Event Bitfield 1", // + BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND1(new BitFieldPoint("S101_EVT_VND1", "Vendor Event Bitfield 1", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND2(new PointImpl(// - "S101_EVT_VND2", // - "Vendor Event Bitfield 2", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND2(new BitFieldPoint("S101_EVT_VND2", "Vendor Event Bitfield 2", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND3(new PointImpl(// - "S101_EVT_VND3", // - "Vendor Event Bitfield 3", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND3(new BitFieldPoint("S101_EVT_VND3", "Vendor Event Bitfield 3", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND4(new PointImpl(// - "S101_EVT_VND4", // - "Vendor Event Bitfield 4", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND4(new BitFieldPoint("S101_EVT_VND4", "Vendor Event Bitfield 4", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])); - protected final PointImpl impl; + private final Point point; - private S101(PointImpl impl) { - this.impl = impl; + private S101(Point point) { + this.point = point; } @Override - public PointImpl get() { - return this.impl; + public Point get() { + return this.point; } } @@ -1451,7 +549,7 @@ public static enum S101_St implements OptionsEnum { THROTTLED(5, "THROTTLED"), // SHUTTING_DOWN(6, "SHUTTING_DOWN"), // FAULT(7, "FAULT"), // - STANDBY(8, "STANDBY"); // + STANDBY(8, "STANDBY"); private final int value; private final String name; @@ -1477,533 +575,152 @@ public OptionsEnum getUndefined() { } } - public static enum S101_Evt1 implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - GROUND_FAULT(0, "GROUND_FAULT"), // - DC_OVER_VOLT(1, "DC_OVER_VOLT"), // - AC_DISCONNECT(2, "AC_DISCONNECT"), // - DC_DISCONNECT(3, "DC_DISCONNECT"), // - GRID_DISCONNECT(4, "GRID_DISCONNECT"), // - CABINET_OPEN(5, "CABINET_OPEN"), // - MANUAL_SHUTDOWN(6, "MANUAL_SHUTDOWN"), // - OVER_TEMP(7, "OVER_TEMP"), // - OVER_FREQUENCY(8, "OVER_FREQUENCY"), // - UNDER_FREQUENCY(9, "UNDER_FREQUENCY"), // - AC_OVER_VOLT(10, "AC_OVER_VOLT"), // - AC_UNDER_VOLT(11, "AC_UNDER_VOLT"), // - BLOWN_STRING_FUSE(12, "BLOWN_STRING_FUSE"), // - UNDER_TEMP(13, "UNDER_TEMP"), // - MEMORY_LOSS(14, "MEMORY_LOSS"), // - HW_TEST_FAILURE(15, "HW_TEST_FAILURE"); // - - private final int value; - private final String name; - - private S101_Evt1(int value, String name) { - this.value = value; - this.name = name; - } + public static enum S101_Evt1 implements SunSpecBitPoint { + GROUND_FAULT(new BitPoint(0, "S101_EVT1_GROUND_FAULT", "Ground Fault", Level.INFO)), // + DC_OVER_VOLT(new BitPoint(1, "S101_EVT1_DC_OVER_VOLT", "DC Over Volt", Level.INFO)), // + AC_DISCONNECT(new BitPoint(2, "S101_EVT1_AC_DISCONNECT", "AC Disconnect", Level.INFO)), // + DC_DISCONNECT(new BitPoint(3, "S101_EVT1_DC_DISCONNECT", "DC Disconnect", Level.INFO)), // + GRID_DISCONNECT(new BitPoint(4, "S101_EVT1_GRID_DISCONNECT", "Grid Disconnect", Level.INFO)), // + CABINET_OPEN(new BitPoint(5, "S101_EVT1_CABINET_OPEN", "Cabinet Open", Level.INFO)), // + MANUAL_SHUTDOWN(new BitPoint(6, "S101_EVT1_MANUAL_SHUTDOWN", "Manual Shutdown", Level.INFO)), // + OVER_TEMP(new BitPoint(7, "S101_EVT1_OVER_TEMP", "Over Temp", Level.INFO)), // + OVER_FREQUENCY(new BitPoint(8, "S101_EVT1_OVER_FREQUENCY", "Over Frequency", Level.INFO)), // + UNDER_FREQUENCY(new BitPoint(9, "S101_EVT1_UNDER_FREQUENCY", "Under Frequency", Level.INFO)), // + AC_OVER_VOLT(new BitPoint(10, "S101_EVT1_AC_OVER_VOLT", "AC Over Volt", Level.INFO)), // + AC_UNDER_VOLT(new BitPoint(11, "S101_EVT1_AC_UNDER_VOLT", "AC Under Volt", Level.INFO)), // + BLOWN_STRING_FUSE(new BitPoint(12, "S101_EVT1_BLOWN_STRING_FUSE", "Blown String Fuse", Level.INFO)), // + UNDER_TEMP(new BitPoint(13, "S101_EVT1_UNDER_TEMP", "Under Temp", Level.INFO)), // + MEMORY_LOSS(new BitPoint(14, "S101_EVT1_MEMORY_LOSS", "Memory Loss", Level.INFO)), // + HW_TEST_FAILURE(new BitPoint(15, "S101_EVT1_HW_TEST_FAILURE", "HW Test Failure", Level.INFO)); - @Override - public int getValue() { - return this.value; - } + private final BitPoint point; - @Override - public String getName() { - return this.name; + private S101_Evt1(BitPoint point) { + this.point = point; } @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } public static enum S102 implements SunSpecPoint { - A(new PointImpl(// - "S102_A", // - "Amps", // + A(new ScaledValuePoint("S102_A", "Amps", // "AC Current", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - APH_A(new PointImpl(// - "S102_APH_A", // - "Amps PhaseA", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + APH_A(new ScaledValuePoint("S102_APH_A", "Amps PhaseA", // "Phase A Current", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - APH_B(new PointImpl(// - "S102_APH_B", // - "Amps PhaseB", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + APH_B(new ScaledValuePoint("S102_APH_B", "Amps PhaseB", // "Phase B Current", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - APH_C(new PointImpl(// - "S102_APH_C", // - "Amps PhaseC", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + APH_C(new ScaledValuePoint("S102_APH_C", "Amps PhaseC", // "Phase C Current", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - A_SF(new PointImpl(// - "S102_A_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - P_P_VPH_A_B(new PointImpl(// - "S102_P_P_VPH_A_B", // - "Phase Voltage AB", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - P_P_VPH_B_C(new PointImpl(// - "S102_P_P_VPH_B_C", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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", // - "Phase Voltage BC", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - P_P_VPH_C_A(new PointImpl(// - "S102_P_P_VPH_C_A", // - "Phase Voltage CA", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_A(new PointImpl(// - "S102_PH_VPH_A", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_A(new ScaledValuePoint("S102_PH_VPH_A", "Phase Voltage AN", // "Phase Voltage AN", // - "Phase Voltage AN", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_B(new PointImpl(// - "S102_PH_VPH_B", // - "Phase Voltage BN", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_B(new ScaledValuePoint("S102_PH_VPH_B", "Phase Voltage BN", // "Phase Voltage BN", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_C(new PointImpl(// - "S102_PH_VPH_C", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_C(new ScaledValuePoint("S102_PH_VPH_C", "Phase Voltage CN", // "Phase Voltage CN", // - "Phase Voltage CN", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - V_SF(new PointImpl(// - "S102_V_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - W(new PointImpl(// - "S102_W", // - "Watts", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + V_SF(new ScaleFactorPoint("S102_V_SF", "", "")), // + W(new ScaledValuePoint("S102_W", "Watts", // "AC Power", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - W_SF(new PointImpl(// - "S102_W_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - HZ(new PointImpl(// - "S102_HZ", // - "Hz", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), // + W_SF(new ScaleFactorPoint("S102_W_SF", "", "")), // + HZ(new ScaledValuePoint("S102_HZ", "Hz", // "Line Frequency", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.HERTZ, // - "Hz_SF", // - new OptionsEnum[0])), // - HZ_S_F(new PointImpl(// - "S102_HZ_S_F", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VA(new PointImpl(// - "S102_VA", // - "VA", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")), // + HZ_S_F(new ScaleFactorPoint("S102_HZ_S_F", "", "")), // + VA(new ScaledValuePoint("S102_VA", "VA", // "AC Apparent Power", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - VA_SF(new PointImpl(// - "S102_VA_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_AR(new PointImpl(// - "S102_V_AR", // - "VAr", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VAr_SF", // - new OptionsEnum[0])), // - V_AR_S_F(new PointImpl(// - "S102_V_AR_S_F", // - "", // - "", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PF(new PointImpl(// - "S102_PF", // - "PF", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - PF_SF(new PointImpl(// - "S102_PF_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - WH(new PointImpl(// - "S102_WH", // - "WattHours", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), // + PF_SF(new ScaleFactorPoint("S102_PF_SF", "", "")), // + WH(new ScaledValuePoint("S102_WH", "WattHours", // "AC Energy", // - "", // - PointType.ACC32, // - true, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "WH_SF", // - new OptionsEnum[0])), // - WH_SF(new PointImpl(// - "S102_WH_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DCA(new PointImpl(// - "S102_DCA", // - "DC Amps", // + ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), // + WH_SF(new ScaleFactorPoint("S102_WH_SF", "", "")), // + DCA(new ScaledValuePoint("S102_DCA", "DC Amps", // "DC Current", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "DCA_SF", // - new OptionsEnum[0])), // - DCA_SF(new PointImpl(// - "S102_DCA_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DCV(new PointImpl(// - "S102_DCV", // - "DC Voltage", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "DCA_SF")), // + DCA_SF(new ScaleFactorPoint("S102_DCA_SF", "", "")), // + DCV(new ScaledValuePoint("S102_DCV", "DC Voltage", // "DC Voltage", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "DCV_SF", // - new OptionsEnum[0])), // - DCV_SF(new PointImpl(// - "S102_DCV_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DCW(new PointImpl(// - "S102_DCW", // - "DC Watts", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "DCV_SF")), // + DCV_SF(new ScaleFactorPoint("S102_DCV_SF", "", "")), // + DCW(new ScaledValuePoint("S102_DCW", "DC Watts", // "DC Power", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "DCW_SF", // - new OptionsEnum[0])), // - DCW_SF(new PointImpl(// - "S102_DCW_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TMP_CAB(new PointImpl(// - "S102_TMP_CAB", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "DCW_SF")), // + DCW_SF(new ScaleFactorPoint("S102_DCW_SF", "", "")), // + TMP_CAB(new ScaledValuePoint("S102_TMP_CAB", "Cabinet Temperature", // "Cabinet Temperature", // - "Cabinet Temperature", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "Tmp_SF", // - new OptionsEnum[0])), // - TMP_SNK(new PointImpl(// - "S102_TMP_SNK", // - "Heat Sink Temperature", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), // + TMP_SNK(new ScaledValuePoint("S102_TMP_SNK", "Heat Sink Temperature", // "Heat Sink Temperature", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "Tmp_SF", // - new OptionsEnum[0])), // - TMP_TRNS(new PointImpl(// - "S102_TMP_TRNS", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), // + TMP_TRNS(new ScaledValuePoint("S102_TMP_TRNS", "Transformer Temperature", // "Transformer Temperature", // - "Transformer Temperature", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "Tmp_SF", // - new OptionsEnum[0])), // - TMP_OT(new PointImpl(// - "S102_TMP_OT", // - "Other Temperature", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), // + TMP_OT(new ScaledValuePoint("S102_TMP_OT", "Other Temperature", // "Other Temperature", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "Tmp_SF", // - new OptionsEnum[0])), // - TMP_S_F(new PointImpl(// - "S102_TMP_S_F", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ST(new PointImpl(// - "S102_ST", // - "Operating State", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S102_St.values())), // - ST_VND(new PointImpl(// - "S102_ST_VND", // - "Vendor Operating State", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S102_St.values())), // + ST_VND(new EnumPoint("S102_ST_VND", "Vendor Operating State", // "Vendor specific operating state code", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT1(new PointImpl(// - "S102_EVT1", // - "Event1", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), // + EVT1(new BitFieldPoint("S102_EVT1", "Event1", // "Bitmask value. Event fields", // - "", // - PointType.BITFIELD32, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S102_Evt1.values())), // - EVT2(new PointImpl(// - "S102_EVT2", // - "Event Bitfield 2", // + BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S102_Evt1.values())), // + EVT2(new BitFieldPoint("S102_EVT2", "Event Bitfield 2", // "Reserved for future use", // - "", // - PointType.BITFIELD32, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND1(new PointImpl(// - "S102_EVT_VND1", // - "Vendor Event Bitfield 1", // + BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND1(new BitFieldPoint("S102_EVT_VND1", "Vendor Event Bitfield 1", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND2(new PointImpl(// - "S102_EVT_VND2", // - "Vendor Event Bitfield 2", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND2(new BitFieldPoint("S102_EVT_VND2", "Vendor Event Bitfield 2", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND3(new PointImpl(// - "S102_EVT_VND3", // - "Vendor Event Bitfield 3", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND3(new BitFieldPoint("S102_EVT_VND3", "Vendor Event Bitfield 3", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND4(new PointImpl(// - "S102_EVT_VND4", // - "Vendor Event Bitfield 4", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND4(new BitFieldPoint("S102_EVT_VND4", "Vendor Event Bitfield 4", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])); - protected final PointImpl impl; + private final Point point; - private S102(PointImpl impl) { - this.impl = impl; + private S102(Point point) { + this.point = point; } @Override - public PointImpl get() { - return this.impl; + public Point get() { + return this.point; } } @@ -2016,7 +733,7 @@ public static enum S102_St implements OptionsEnum { THROTTLED(5, "THROTTLED"), // SHUTTING_DOWN(6, "SHUTTING_DOWN"), // FAULT(7, "FAULT"), // - STANDBY(8, "STANDBY"); // + STANDBY(8, "STANDBY"); private final int value; private final String name; @@ -2042,533 +759,152 @@ public OptionsEnum getUndefined() { } } - public static enum S102_Evt1 implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - GROUND_FAULT(0, "GROUND_FAULT"), // - DC_OVER_VOLT(1, "DC_OVER_VOLT"), // - AC_DISCONNECT(2, "AC_DISCONNECT"), // - DC_DISCONNECT(3, "DC_DISCONNECT"), // - GRID_DISCONNECT(4, "GRID_DISCONNECT"), // - CABINET_OPEN(5, "CABINET_OPEN"), // - MANUAL_SHUTDOWN(6, "MANUAL_SHUTDOWN"), // - OVER_TEMP(7, "OVER_TEMP"), // - OVER_FREQUENCY(8, "OVER_FREQUENCY"), // - UNDER_FREQUENCY(9, "UNDER_FREQUENCY"), // - AC_OVER_VOLT(10, "AC_OVER_VOLT"), // - AC_UNDER_VOLT(11, "AC_UNDER_VOLT"), // - BLOWN_STRING_FUSE(12, "BLOWN_STRING_FUSE"), // - UNDER_TEMP(13, "UNDER_TEMP"), // - MEMORY_LOSS(14, "MEMORY_LOSS"), // - HW_TEST_FAILURE(15, "HW_TEST_FAILURE"); // - - private final int value; - private final String name; - - private S102_Evt1(int value, String name) { - this.value = value; - this.name = name; - } + public static enum S102_Evt1 implements SunSpecBitPoint { + GROUND_FAULT(new BitPoint(0, "S102_EVT1_GROUND_FAULT", "Ground Fault", Level.INFO)), // + DC_OVER_VOLT(new BitPoint(1, "S102_EVT1_DC_OVER_VOLT", "DC Over Volt", Level.INFO)), // + AC_DISCONNECT(new BitPoint(2, "S102_EVT1_AC_DISCONNECT", "AC Disconnect", Level.INFO)), // + DC_DISCONNECT(new BitPoint(3, "S102_EVT1_DC_DISCONNECT", "DC Disconnect", Level.INFO)), // + GRID_DISCONNECT(new BitPoint(4, "S102_EVT1_GRID_DISCONNECT", "Grid Disconnect", Level.INFO)), // + CABINET_OPEN(new BitPoint(5, "S102_EVT1_CABINET_OPEN", "Cabinet Open", Level.INFO)), // + MANUAL_SHUTDOWN(new BitPoint(6, "S102_EVT1_MANUAL_SHUTDOWN", "Manual Shutdown", Level.INFO)), // + OVER_TEMP(new BitPoint(7, "S102_EVT1_OVER_TEMP", "Over Temp", Level.INFO)), // + OVER_FREQUENCY(new BitPoint(8, "S102_EVT1_OVER_FREQUENCY", "Over Frequency", Level.INFO)), // + UNDER_FREQUENCY(new BitPoint(9, "S102_EVT1_UNDER_FREQUENCY", "Under Frequency", Level.INFO)), // + AC_OVER_VOLT(new BitPoint(10, "S102_EVT1_AC_OVER_VOLT", "AC Over Volt", Level.INFO)), // + AC_UNDER_VOLT(new BitPoint(11, "S102_EVT1_AC_UNDER_VOLT", "AC Under Volt", Level.INFO)), // + BLOWN_STRING_FUSE(new BitPoint(12, "S102_EVT1_BLOWN_STRING_FUSE", "Blown String Fuse", Level.INFO)), // + UNDER_TEMP(new BitPoint(13, "S102_EVT1_UNDER_TEMP", "Under Temp", Level.INFO)), // + MEMORY_LOSS(new BitPoint(14, "S102_EVT1_MEMORY_LOSS", "Memory Loss", Level.INFO)), // + HW_TEST_FAILURE(new BitPoint(15, "S102_EVT1_HW_TEST_FAILURE", "HW Test Failure", Level.INFO)); - @Override - public int getValue() { - return this.value; - } + private final BitPoint point; - @Override - public String getName() { - return this.name; + private S102_Evt1(BitPoint point) { + this.point = point; } @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } public static enum S103 implements SunSpecPoint { - A(new PointImpl(// - "S103_A", // - "Amps", // + A(new ScaledValuePoint("S103_A", "Amps", // "AC Current", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - APH_A(new PointImpl(// - "S103_APH_A", // - "Amps PhaseA", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + APH_A(new ScaledValuePoint("S103_APH_A", "Amps PhaseA", // "Phase A Current", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - APH_B(new PointImpl(// - "S103_APH_B", // - "Amps PhaseB", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + APH_B(new ScaledValuePoint("S103_APH_B", "Amps PhaseB", // "Phase B Current", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - APH_C(new PointImpl(// - "S103_APH_C", // - "Amps PhaseC", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + APH_C(new ScaledValuePoint("S103_APH_C", "Amps PhaseC", // "Phase C Current", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - A_SF(new PointImpl(// - "S103_A_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - P_P_VPH_A_B(new PointImpl(// - "S103_P_P_VPH_A_B", // - "Phase Voltage AB", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - P_P_VPH_B_C(new PointImpl(// - "S103_P_P_VPH_B_C", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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", // - "Phase Voltage BC", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - P_P_VPH_C_A(new PointImpl(// - "S103_P_P_VPH_C_A", // - "Phase Voltage CA", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_A(new PointImpl(// - "S103_PH_VPH_A", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_A(new ScaledValuePoint("S103_PH_VPH_A", "Phase Voltage AN", // "Phase Voltage AN", // - "Phase Voltage AN", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_B(new PointImpl(// - "S103_PH_VPH_B", // - "Phase Voltage BN", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_B(new ScaledValuePoint("S103_PH_VPH_B", "Phase Voltage BN", // "Phase Voltage BN", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_C(new PointImpl(// - "S103_PH_VPH_C", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_C(new ScaledValuePoint("S103_PH_VPH_C", "Phase Voltage CN", // "Phase Voltage CN", // - "Phase Voltage CN", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - V_SF(new PointImpl(// - "S103_V_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - W(new PointImpl(// - "S103_W", // - "Watts", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + V_SF(new ScaleFactorPoint("S103_V_SF", "", "")), // + W(new ScaledValuePoint("S103_W", "Watts", // "AC Power", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - W_SF(new PointImpl(// - "S103_W_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - HZ(new PointImpl(// - "S103_HZ", // - "Hz", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), // + W_SF(new ScaleFactorPoint("S103_W_SF", "", "")), // + HZ(new ScaledValuePoint("S103_HZ", "Hz", // "Line Frequency", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.HERTZ, // - "Hz_SF", // - new OptionsEnum[0])), // - HZ_S_F(new PointImpl(// - "S103_HZ_S_F", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VA(new PointImpl(// - "S103_VA", // - "VA", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ, "Hz_SF")), // + HZ_S_F(new ScaleFactorPoint("S103_HZ_S_F", "", "")), // + VA(new ScaledValuePoint("S103_VA", "VA", // "AC Apparent Power", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - VA_SF(new PointImpl(// - "S103_VA_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_AR(new PointImpl(// - "S103_V_AR", // - "VAr", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VAr_SF", // - new OptionsEnum[0])), // - V_AR_S_F(new PointImpl(// - "S103_V_AR_S_F", // - "", // - "", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PF(new PointImpl(// - "S103_PF", // - "PF", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - PF_SF(new PointImpl(// - "S103_PF_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - WH(new PointImpl(// - "S103_WH", // - "WattHours", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), // + PF_SF(new ScaleFactorPoint("S103_PF_SF", "", "")), // + WH(new ScaledValuePoint("S103_WH", "WattHours", // "AC Energy", // - "", // - PointType.ACC32, // - true, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "WH_SF", // - new OptionsEnum[0])), // - WH_SF(new PointImpl(// - "S103_WH_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DCA(new PointImpl(// - "S103_DCA", // - "DC Amps", // + ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS, "WH_SF")), // + WH_SF(new ScaleFactorPoint("S103_WH_SF", "", "")), // + DCA(new ScaledValuePoint("S103_DCA", "DC Amps", // "DC Current", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "DCA_SF", // - new OptionsEnum[0])), // - DCA_SF(new PointImpl(// - "S103_DCA_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DCV(new PointImpl(// - "S103_DCV", // - "DC Voltage", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "DCA_SF")), // + DCA_SF(new ScaleFactorPoint("S103_DCA_SF", "", "")), // + DCV(new ScaledValuePoint("S103_DCV", "DC Voltage", // "DC Voltage", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "DCV_SF", // - new OptionsEnum[0])), // - DCV_SF(new PointImpl(// - "S103_DCV_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DCW(new PointImpl(// - "S103_DCW", // - "DC Watts", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "DCV_SF")), // + DCV_SF(new ScaleFactorPoint("S103_DCV_SF", "", "")), // + DCW(new ScaledValuePoint("S103_DCW", "DC Watts", // "DC Power", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "DCW_SF", // - new OptionsEnum[0])), // - DCW_SF(new PointImpl(// - "S103_DCW_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TMP_CAB(new PointImpl(// - "S103_TMP_CAB", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "DCW_SF")), // + DCW_SF(new ScaleFactorPoint("S103_DCW_SF", "", "")), // + TMP_CAB(new ScaledValuePoint("S103_TMP_CAB", "Cabinet Temperature", // "Cabinet Temperature", // - "Cabinet Temperature", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "Tmp_SF", // - new OptionsEnum[0])), // - TMP_SNK(new PointImpl(// - "S103_TMP_SNK", // - "Heat Sink Temperature", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), // + TMP_SNK(new ScaledValuePoint("S103_TMP_SNK", "Heat Sink Temperature", // "Heat Sink Temperature", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "Tmp_SF", // - new OptionsEnum[0])), // - TMP_TRNS(new PointImpl(// - "S103_TMP_TRNS", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), // + TMP_TRNS(new ScaledValuePoint("S103_TMP_TRNS", "Transformer Temperature", // "Transformer Temperature", // - "Transformer Temperature", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "Tmp_SF", // - new OptionsEnum[0])), // - TMP_OT(new PointImpl(// - "S103_TMP_OT", // - "Other Temperature", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), // + TMP_OT(new ScaledValuePoint("S103_TMP_OT", "Other Temperature", // "Other Temperature", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "Tmp_SF", // - new OptionsEnum[0])), // - TMP_S_F(new PointImpl(// - "S103_TMP_S_F", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ST(new PointImpl(// - "S103_ST", // - "Operating State", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S103_St.values())), // - ST_VND(new PointImpl(// - "S103_ST_VND", // - "Vendor Operating State", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S103_St.values())), // + ST_VND(new EnumPoint("S103_ST_VND", "Vendor Operating State", // "Vendor specific operating state code", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT1(new PointImpl(// - "S103_EVT1", // - "Event1", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), // + EVT1(new BitFieldPoint("S103_EVT1", "Event1", // "Bitmask value. Event fields", // - "", // - PointType.BITFIELD32, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S103_Evt1.values())), // - EVT2(new PointImpl(// - "S103_EVT2", // - "Event Bitfield 2", // + BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S103_Evt1.values())), // + EVT2(new BitFieldPoint("S103_EVT2", "Event Bitfield 2", // "Reserved for future use", // - "", // - PointType.BITFIELD32, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND1(new PointImpl(// - "S103_EVT_VND1", // - "Vendor Event Bitfield 1", // + BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND1(new BitFieldPoint("S103_EVT_VND1", "Vendor Event Bitfield 1", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND2(new PointImpl(// - "S103_EVT_VND2", // - "Vendor Event Bitfield 2", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND2(new BitFieldPoint("S103_EVT_VND2", "Vendor Event Bitfield 2", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND3(new PointImpl(// - "S103_EVT_VND3", // - "Vendor Event Bitfield 3", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND3(new BitFieldPoint("S103_EVT_VND3", "Vendor Event Bitfield 3", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND4(new PointImpl(// - "S103_EVT_VND4", // - "Vendor Event Bitfield 4", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND4(new BitFieldPoint("S103_EVT_VND4", "Vendor Event Bitfield 4", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])); - protected final PointImpl impl; + private final Point point; - private S103(PointImpl impl) { - this.impl = impl; + private S103(Point point) { + this.point = point; } @Override - public PointImpl get() { - return this.impl; + public Point get() { + return this.point; } } @@ -2581,7 +917,7 @@ public static enum S103_St implements OptionsEnum { THROTTLED(5, "THROTTLED"), // SHUTTING_DOWN(6, "SHUTTING_DOWN"), // FAULT(7, "FAULT"), // - STANDBY(8, "STANDBY"); // + STANDBY(8, "STANDBY"); private final int value; private final String name; @@ -2607,401 +943,140 @@ public OptionsEnum getUndefined() { } } - public static enum S103_Evt1 implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - GROUND_FAULT(0, "GROUND_FAULT"), // - DC_OVER_VOLT(1, "DC_OVER_VOLT"), // - AC_DISCONNECT(2, "AC_DISCONNECT"), // - DC_DISCONNECT(3, "DC_DISCONNECT"), // - GRID_DISCONNECT(4, "GRID_DISCONNECT"), // - CABINET_OPEN(5, "CABINET_OPEN"), // - MANUAL_SHUTDOWN(6, "MANUAL_SHUTDOWN"), // - OVER_TEMP(7, "OVER_TEMP"), // - OVER_FREQUENCY(8, "OVER_FREQUENCY"), // - UNDER_FREQUENCY(9, "UNDER_FREQUENCY"), // - AC_OVER_VOLT(10, "AC_OVER_VOLT"), // - AC_UNDER_VOLT(11, "AC_UNDER_VOLT"), // - BLOWN_STRING_FUSE(12, "BLOWN_STRING_FUSE"), // - UNDER_TEMP(13, "UNDER_TEMP"), // - MEMORY_LOSS(14, "MEMORY_LOSS"), // - HW_TEST_FAILURE(15, "HW_TEST_FAILURE"); // - - private final int value; - private final String name; - - private S103_Evt1(int value, String name) { - this.value = value; - this.name = name; - } + public static enum S103_Evt1 implements SunSpecBitPoint { + GROUND_FAULT(new BitPoint(0, "S103_EVT1_GROUND_FAULT", "Ground Fault", Level.INFO)), // + DC_OVER_VOLT(new BitPoint(1, "S103_EVT1_DC_OVER_VOLT", "DC Over Volt", Level.INFO)), // + AC_DISCONNECT(new BitPoint(2, "S103_EVT1_AC_DISCONNECT", "AC Disconnect", Level.INFO)), // + DC_DISCONNECT(new BitPoint(3, "S103_EVT1_DC_DISCONNECT", "DC Disconnect", Level.INFO)), // + GRID_DISCONNECT(new BitPoint(4, "S103_EVT1_GRID_DISCONNECT", "Grid Disconnect", Level.INFO)), // + CABINET_OPEN(new BitPoint(5, "S103_EVT1_CABINET_OPEN", "Cabinet Open", Level.INFO)), // + MANUAL_SHUTDOWN(new BitPoint(6, "S103_EVT1_MANUAL_SHUTDOWN", "Manual Shutdown", Level.INFO)), // + OVER_TEMP(new BitPoint(7, "S103_EVT1_OVER_TEMP", "Over Temp", Level.INFO)), // + OVER_FREQUENCY(new BitPoint(8, "S103_EVT1_OVER_FREQUENCY", "Over Frequency", Level.INFO)), // + UNDER_FREQUENCY(new BitPoint(9, "S103_EVT1_UNDER_FREQUENCY", "Under Frequency", Level.INFO)), // + AC_OVER_VOLT(new BitPoint(10, "S103_EVT1_AC_OVER_VOLT", "AC Over Volt", Level.INFO)), // + AC_UNDER_VOLT(new BitPoint(11, "S103_EVT1_AC_UNDER_VOLT", "AC Under Volt", Level.INFO)), // + BLOWN_STRING_FUSE(new BitPoint(12, "S103_EVT1_BLOWN_STRING_FUSE", "Blown String Fuse", Level.INFO)), // + UNDER_TEMP(new BitPoint(13, "S103_EVT1_UNDER_TEMP", "Under Temp", Level.INFO)), // + MEMORY_LOSS(new BitPoint(14, "S103_EVT1_MEMORY_LOSS", "Memory Loss", Level.INFO)), // + HW_TEST_FAILURE(new BitPoint(15, "S103_EVT1_HW_TEST_FAILURE", "HW Test Failure", Level.INFO)); - @Override - public int getValue() { - return this.value; - } + private final BitPoint point; - @Override - public String getName() { - return this.name; + private S103_Evt1(BitPoint point) { + this.point = point; } @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } public static enum S111 implements SunSpecPoint { - A(new PointImpl(// - "S111_A", // - "Amps", // + A(new ValuePoint("S111_A", "Amps", // "AC Current", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - null, // - new OptionsEnum[0])), // - APH_A(new PointImpl(// - "S111_APH_A", // - "Amps PhaseA", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), // + APH_A(new ValuePoint("S111_APH_A", "Amps PhaseA", // "Phase A Current", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - null, // - new OptionsEnum[0])), // - APH_B(new PointImpl(// - "S111_APH_B", // - "Amps PhaseB", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), // + APH_B(new ValuePoint("S111_APH_B", "Amps PhaseB", // "Phase B Current", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - null, // - new OptionsEnum[0])), // - APH_C(new PointImpl(// - "S111_APH_C", // - "Amps PhaseC", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), // + APH_C(new ValuePoint("S111_APH_C", "Amps PhaseC", // "Phase C Current", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - null, // - new OptionsEnum[0])), // - P_P_VPH_A_B(new PointImpl(// - "S111_P_P_VPH_A_B", // - "Phase Voltage AB", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), // + P_P_VPH_A_B(new ValuePoint("S111_P_P_VPH_A_B", "Phase Voltage AB", // "Phase Voltage AB", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - P_P_VPH_B_C(new PointImpl(// - "S111_P_P_VPH_B_C", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), // + P_P_VPH_B_C(new ValuePoint("S111_P_P_VPH_B_C", "Phase Voltage BC", // "Phase Voltage BC", // - "Phase Voltage BC", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - P_P_VPH_C_A(new PointImpl(// - "S111_P_P_VPH_C_A", // - "Phase Voltage CA", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), // + P_P_VPH_C_A(new ValuePoint("S111_P_P_VPH_C_A", "Phase Voltage CA", // "Phase Voltage CA", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - PH_VPH_A(new PointImpl(// - "S111_PH_VPH_A", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), // + PH_VPH_A(new ValuePoint("S111_PH_VPH_A", "Phase Voltage AN", // "Phase Voltage AN", // - "Phase Voltage AN", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - PH_VPH_B(new PointImpl(// - "S111_PH_VPH_B", // - "Phase Voltage BN", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), // + PH_VPH_B(new ValuePoint("S111_PH_VPH_B", "Phase Voltage BN", // "Phase Voltage BN", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - PH_VPH_C(new PointImpl(// - "S111_PH_VPH_C", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), // + PH_VPH_C(new ValuePoint("S111_PH_VPH_C", "Phase Voltage CN", // "Phase Voltage CN", // - "Phase Voltage CN", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - W(new PointImpl(// - "S111_W", // - "Watts", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), // + W(new ValuePoint("S111_W", "Watts", // "AC Power", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.WATT, // - null, // - new OptionsEnum[0])), // - HZ(new PointImpl(// - "S111_HZ", // - "Hz", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT)), // + HZ(new ValuePoint("S111_HZ", "Hz", // "Line Frequency", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.HERTZ, // - null, // - new OptionsEnum[0])), // - VA(new PointImpl(// - "S111_VA", // - "VA", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ)), // + VA(new ValuePoint("S111_VA", "VA", // "AC Apparent Power", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - null, // - new OptionsEnum[0])), // - V_AR(new PointImpl(// - "S111_V_AR", // - "VAr", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE)), // + V_AR(new ValuePoint("S111_V_AR", "VAr", // "AC Reactive Power", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - null, // - new OptionsEnum[0])), // - PF(new PointImpl(// - "S111_PF", // - "PF", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE)), // + PF(new ValuePoint("S111_PF", "PF", // "AC Power Factor", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - WH(new PointImpl(// - "S111_WH", // - "WattHours", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + WH(new ValuePoint("S111_WH", "WattHours", // "AC Energy", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - null, // - new OptionsEnum[0])), // - DCA(new PointImpl(// - "S111_DCA", // - "DC Amps", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS)), // + DCA(new ValuePoint("S111_DCA", "DC Amps", // "DC Current", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - null, // - new OptionsEnum[0])), // - DCV(new PointImpl(// - "S111_DCV", // - "DC Voltage", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), // + DCV(new ValuePoint("S111_DCV", "DC Voltage", // "DC Voltage", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - DCW(new PointImpl(// - "S111_DCW", // - "DC Watts", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), // + DCW(new ValuePoint("S111_DCW", "DC Watts", // "DC Power", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - null, // - new OptionsEnum[0])), // - TMP_CAB(new PointImpl(// - "S111_TMP_CAB", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT)), // + TMP_CAB(new ValuePoint("S111_TMP_CAB", "Cabinet Temperature", // "Cabinet Temperature", // - "Cabinet Temperature", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - null, // - new OptionsEnum[0])), // - TMP_SNK(new PointImpl(// - "S111_TMP_SNK", // - "Heat Sink Temperature", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), // + TMP_SNK(new ValuePoint("S111_TMP_SNK", "Heat Sink Temperature", // "Heat Sink Temperature", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - null, // - new OptionsEnum[0])), // - TMP_TRNS(new PointImpl(// - "S111_TMP_TRNS", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), // + TMP_TRNS(new ValuePoint("S111_TMP_TRNS", "Transformer Temperature", // "Transformer Temperature", // - "Transformer Temperature", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - null, // - new OptionsEnum[0])), // - TMP_OT(new PointImpl(// - "S111_TMP_OT", // - "Other Temperature", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), // + TMP_OT(new ValuePoint("S111_TMP_OT", "Other Temperature", // "Other Temperature", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - null, // - new OptionsEnum[0])), // - ST(new PointImpl(// - "S111_ST", // - "Operating State", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), // + ST(new EnumPoint("S111_ST", "Operating State", // "Enumerated value. Operating state", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S111_St.values())), // - ST_VND(new PointImpl(// - "S111_ST_VND", // - "Vendor Operating State", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S111_St.values())), // + ST_VND(new EnumPoint("S111_ST_VND", "Vendor Operating State", // "Vendor specific operating state code", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT1(new PointImpl(// - "S111_EVT1", // - "Event1", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), // + EVT1(new BitFieldPoint("S111_EVT1", "Event1", // "Bitmask value. Event fields", // - "", // - PointType.BITFIELD32, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S111_Evt1.values())), // - EVT2(new PointImpl(// - "S111_EVT2", // - "Event Bitfield 2", // + BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S111_Evt1.values())), // + EVT2(new BitFieldPoint("S111_EVT2", "Event Bitfield 2", // "Reserved for future use", // - "", // - PointType.BITFIELD32, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND1(new PointImpl(// - "S111_EVT_VND1", // - "Vendor Event Bitfield 1", // + BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND1(new BitFieldPoint("S111_EVT_VND1", "Vendor Event Bitfield 1", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND2(new PointImpl(// - "S111_EVT_VND2", // - "Vendor Event Bitfield 2", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND2(new BitFieldPoint("S111_EVT_VND2", "Vendor Event Bitfield 2", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND3(new PointImpl(// - "S111_EVT_VND3", // - "Vendor Event Bitfield 3", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND3(new BitFieldPoint("S111_EVT_VND3", "Vendor Event Bitfield 3", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND4(new PointImpl(// - "S111_EVT_VND4", // - "Vendor Event Bitfield 4", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND4(new BitFieldPoint("S111_EVT_VND4", "Vendor Event Bitfield 4", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])); - protected final PointImpl impl; + private final Point point; - private S111(PointImpl impl) { - this.impl = impl; + private S111(Point point) { + this.point = point; } @Override - public PointImpl get() { - return this.impl; + public Point get() { + return this.point; } } @@ -3014,7 +1089,7 @@ public static enum S111_St implements OptionsEnum { THROTTLED(5, "THROTTLED"), // SHUTTING_DOWN(6, "SHUTTING_DOWN"), // FAULT(7, "FAULT"), // - STANDBY(8, "STANDBY"); // + STANDBY(8, "STANDBY"); private final int value; private final String name; @@ -3040,401 +1115,140 @@ public OptionsEnum getUndefined() { } } - public static enum S111_Evt1 implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - GROUND_FAULT(0, "GROUND_FAULT"), // - DC_OVER_VOLT(1, "DC_OVER_VOLT"), // - AC_DISCONNECT(2, "AC_DISCONNECT"), // - DC_DISCONNECT(3, "DC_DISCONNECT"), // - GRID_DISCONNECT(4, "GRID_DISCONNECT"), // - CABINET_OPEN(5, "CABINET_OPEN"), // - MANUAL_SHUTDOWN(6, "MANUAL_SHUTDOWN"), // - OVER_TEMP(7, "OVER_TEMP"), // - OVER_FREQUENCY(8, "OVER_FREQUENCY"), // - UNDER_FREQUENCY(9, "UNDER_FREQUENCY"), // - AC_OVER_VOLT(10, "AC_OVER_VOLT"), // - AC_UNDER_VOLT(11, "AC_UNDER_VOLT"), // - BLOWN_STRING_FUSE(12, "BLOWN_STRING_FUSE"), // - UNDER_TEMP(13, "UNDER_TEMP"), // - MEMORY_LOSS(14, "MEMORY_LOSS"), // - HW_TEST_FAILURE(15, "HW_TEST_FAILURE"); // - - private final int value; - private final String name; - - private S111_Evt1(int value, String name) { - this.value = value; - this.name = name; - } + public static enum S111_Evt1 implements SunSpecBitPoint { + GROUND_FAULT(new BitPoint(0, "S111_EVT1_GROUND_FAULT", "Ground Fault", Level.INFO)), // + DC_OVER_VOLT(new BitPoint(1, "S111_EVT1_DC_OVER_VOLT", "DC Over Volt", Level.INFO)), // + AC_DISCONNECT(new BitPoint(2, "S111_EVT1_AC_DISCONNECT", "AC Disconnect", Level.INFO)), // + DC_DISCONNECT(new BitPoint(3, "S111_EVT1_DC_DISCONNECT", "DC Disconnect", Level.INFO)), // + GRID_DISCONNECT(new BitPoint(4, "S111_EVT1_GRID_DISCONNECT", "Grid Disconnect", Level.INFO)), // + CABINET_OPEN(new BitPoint(5, "S111_EVT1_CABINET_OPEN", "Cabinet Open", Level.INFO)), // + MANUAL_SHUTDOWN(new BitPoint(6, "S111_EVT1_MANUAL_SHUTDOWN", "Manual Shutdown", Level.INFO)), // + OVER_TEMP(new BitPoint(7, "S111_EVT1_OVER_TEMP", "Over Temp", Level.INFO)), // + OVER_FREQUENCY(new BitPoint(8, "S111_EVT1_OVER_FREQUENCY", "Over Frequency", Level.INFO)), // + UNDER_FREQUENCY(new BitPoint(9, "S111_EVT1_UNDER_FREQUENCY", "Under Frequency", Level.INFO)), // + AC_OVER_VOLT(new BitPoint(10, "S111_EVT1_AC_OVER_VOLT", "AC Over Volt", Level.INFO)), // + AC_UNDER_VOLT(new BitPoint(11, "S111_EVT1_AC_UNDER_VOLT", "AC Under Volt", Level.INFO)), // + BLOWN_STRING_FUSE(new BitPoint(12, "S111_EVT1_BLOWN_STRING_FUSE", "Blown String Fuse", Level.INFO)), // + UNDER_TEMP(new BitPoint(13, "S111_EVT1_UNDER_TEMP", "Under Temp", Level.INFO)), // + MEMORY_LOSS(new BitPoint(14, "S111_EVT1_MEMORY_LOSS", "Memory Loss", Level.INFO)), // + HW_TEST_FAILURE(new BitPoint(15, "S111_EVT1_HW_TEST_FAILURE", "HW Test Failure", Level.INFO)); - @Override - public int getValue() { - return this.value; - } + private final BitPoint point; - @Override - public String getName() { - return this.name; + private S111_Evt1(BitPoint point) { + this.point = point; } @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } public static enum S112 implements SunSpecPoint { - A(new PointImpl(// - "S112_A", // - "Amps", // + A(new ValuePoint("S112_A", "Amps", // "AC Current", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - null, // - new OptionsEnum[0])), // - APH_A(new PointImpl(// - "S112_APH_A", // - "Amps PhaseA", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), // + APH_A(new ValuePoint("S112_APH_A", "Amps PhaseA", // "Phase A Current", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - null, // - new OptionsEnum[0])), // - APH_B(new PointImpl(// - "S112_APH_B", // - "Amps PhaseB", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), // + APH_B(new ValuePoint("S112_APH_B", "Amps PhaseB", // "Phase B Current", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - null, // - new OptionsEnum[0])), // - APH_C(new PointImpl(// - "S112_APH_C", // - "Amps PhaseC", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), // + APH_C(new ValuePoint("S112_APH_C", "Amps PhaseC", // "Phase C Current", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - null, // - new OptionsEnum[0])), // - P_P_VPH_A_B(new PointImpl(// - "S112_P_P_VPH_A_B", // - "Phase Voltage AB", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), // + P_P_VPH_A_B(new ValuePoint("S112_P_P_VPH_A_B", "Phase Voltage AB", // "Phase Voltage AB", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - P_P_VPH_B_C(new PointImpl(// - "S112_P_P_VPH_B_C", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), // + P_P_VPH_B_C(new ValuePoint("S112_P_P_VPH_B_C", "Phase Voltage BC", // "Phase Voltage BC", // - "Phase Voltage BC", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - P_P_VPH_C_A(new PointImpl(// - "S112_P_P_VPH_C_A", // - "Phase Voltage CA", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), // + P_P_VPH_C_A(new ValuePoint("S112_P_P_VPH_C_A", "Phase Voltage CA", // "Phase Voltage CA", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - PH_VPH_A(new PointImpl(// - "S112_PH_VPH_A", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), // + PH_VPH_A(new ValuePoint("S112_PH_VPH_A", "Phase Voltage AN", // "Phase Voltage AN", // - "Phase Voltage AN", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - PH_VPH_B(new PointImpl(// - "S112_PH_VPH_B", // - "Phase Voltage BN", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), // + PH_VPH_B(new ValuePoint("S112_PH_VPH_B", "Phase Voltage BN", // "Phase Voltage BN", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - PH_VPH_C(new PointImpl(// - "S112_PH_VPH_C", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), // + PH_VPH_C(new ValuePoint("S112_PH_VPH_C", "Phase Voltage CN", // "Phase Voltage CN", // - "Phase Voltage CN", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - W(new PointImpl(// - "S112_W", // - "Watts", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), // + W(new ValuePoint("S112_W", "Watts", // "AC Power", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.WATT, // - null, // - new OptionsEnum[0])), // - HZ(new PointImpl(// - "S112_HZ", // - "Hz", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT)), // + HZ(new ValuePoint("S112_HZ", "Hz", // "Line Frequency", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.HERTZ, // - null, // - new OptionsEnum[0])), // - VA(new PointImpl(// - "S112_VA", // - "VA", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ)), // + VA(new ValuePoint("S112_VA", "VA", // "AC Apparent Power", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - null, // - new OptionsEnum[0])), // - V_AR(new PointImpl(// - "S112_V_AR", // - "VAr", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE)), // + V_AR(new ValuePoint("S112_V_AR", "VAr", // "AC Reactive Power", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - null, // - new OptionsEnum[0])), // - PF(new PointImpl(// - "S112_PF", // - "PF", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE)), // + PF(new ValuePoint("S112_PF", "PF", // "AC Power Factor", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - WH(new PointImpl(// - "S112_WH", // - "WattHours", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + WH(new ValuePoint("S112_WH", "WattHours", // "AC Energy", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - null, // - new OptionsEnum[0])), // - DCA(new PointImpl(// - "S112_DCA", // - "DC Amps", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS)), // + DCA(new ValuePoint("S112_DCA", "DC Amps", // "DC Current", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - null, // - new OptionsEnum[0])), // - DCV(new PointImpl(// - "S112_DCV", // - "DC Voltage", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), // + DCV(new ValuePoint("S112_DCV", "DC Voltage", // "DC Voltage", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - DCW(new PointImpl(// - "S112_DCW", // - "DC Watts", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), // + DCW(new ValuePoint("S112_DCW", "DC Watts", // "DC Power", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - null, // - new OptionsEnum[0])), // - TMP_CAB(new PointImpl(// - "S112_TMP_CAB", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT)), // + TMP_CAB(new ValuePoint("S112_TMP_CAB", "Cabinet Temperature", // "Cabinet Temperature", // - "Cabinet Temperature", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - null, // - new OptionsEnum[0])), // - TMP_SNK(new PointImpl(// - "S112_TMP_SNK", // - "Heat Sink Temperature", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), // + TMP_SNK(new ValuePoint("S112_TMP_SNK", "Heat Sink Temperature", // "Heat Sink Temperature", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - null, // - new OptionsEnum[0])), // - TMP_TRNS(new PointImpl(// - "S112_TMP_TRNS", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), // + TMP_TRNS(new ValuePoint("S112_TMP_TRNS", "Transformer Temperature", // "Transformer Temperature", // - "Transformer Temperature", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - null, // - new OptionsEnum[0])), // - TMP_OT(new PointImpl(// - "S112_TMP_OT", // - "Other Temperature", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), // + TMP_OT(new ValuePoint("S112_TMP_OT", "Other Temperature", // "Other Temperature", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - null, // - new OptionsEnum[0])), // - ST(new PointImpl(// - "S112_ST", // - "Operating State", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), // + ST(new EnumPoint("S112_ST", "Operating State", // "Enumerated value. Operating state", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S112_St.values())), // - ST_VND(new PointImpl(// - "S112_ST_VND", // - "Vendor Operating State", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S112_St.values())), // + ST_VND(new EnumPoint("S112_ST_VND", "Vendor Operating State", // "Vendor specific operating state code", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT1(new PointImpl(// - "S112_EVT1", // - "Event1", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), // + EVT1(new BitFieldPoint("S112_EVT1", "Event1", // "Bitmask value. Event fields", // - "", // - PointType.BITFIELD32, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S112_Evt1.values())), // - EVT2(new PointImpl(// - "S112_EVT2", // - "Event Bitfield 2", // + BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S112_Evt1.values())), // + EVT2(new BitFieldPoint("S112_EVT2", "Event Bitfield 2", // "Reserved for future use", // - "", // - PointType.BITFIELD32, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND1(new PointImpl(// - "S112_EVT_VND1", // - "Vendor Event Bitfield 1", // + BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND1(new BitFieldPoint("S112_EVT_VND1", "Vendor Event Bitfield 1", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND2(new PointImpl(// - "S112_EVT_VND2", // - "Vendor Event Bitfield 2", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND2(new BitFieldPoint("S112_EVT_VND2", "Vendor Event Bitfield 2", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND3(new PointImpl(// - "S112_EVT_VND3", // - "Vendor Event Bitfield 3", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND3(new BitFieldPoint("S112_EVT_VND3", "Vendor Event Bitfield 3", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND4(new PointImpl(// - "S112_EVT_VND4", // - "Vendor Event Bitfield 4", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND4(new BitFieldPoint("S112_EVT_VND4", "Vendor Event Bitfield 4", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])); - protected final PointImpl impl; + private final Point point; - private S112(PointImpl impl) { - this.impl = impl; + private S112(Point point) { + this.point = point; } @Override - public PointImpl get() { - return this.impl; + public Point get() { + return this.point; } } @@ -3447,7 +1261,7 @@ public static enum S112_St implements OptionsEnum { THROTTLED(5, "THROTTLED"), // SHUTTING_DOWN(6, "SHUTTING_DOWN"), // FAULT(7, "FAULT"), // - STANDBY(8, "STANDBY"); // + STANDBY(8, "STANDBY"); private final int value; private final String name; @@ -3473,401 +1287,140 @@ public OptionsEnum getUndefined() { } } - public static enum S112_Evt1 implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - GROUND_FAULT(0, "GROUND_FAULT"), // - DC_OVER_VOLT(1, "DC_OVER_VOLT"), // - AC_DISCONNECT(2, "AC_DISCONNECT"), // - DC_DISCONNECT(3, "DC_DISCONNECT"), // - GRID_DISCONNECT(4, "GRID_DISCONNECT"), // - CABINET_OPEN(5, "CABINET_OPEN"), // - MANUAL_SHUTDOWN(6, "MANUAL_SHUTDOWN"), // - OVER_TEMP(7, "OVER_TEMP"), // - OVER_FREQUENCY(8, "OVER_FREQUENCY"), // - UNDER_FREQUENCY(9, "UNDER_FREQUENCY"), // - AC_OVER_VOLT(10, "AC_OVER_VOLT"), // - AC_UNDER_VOLT(11, "AC_UNDER_VOLT"), // - BLOWN_STRING_FUSE(12, "BLOWN_STRING_FUSE"), // - UNDER_TEMP(13, "UNDER_TEMP"), // - MEMORY_LOSS(14, "MEMORY_LOSS"), // - HW_TEST_FAILURE(15, "HW_TEST_FAILURE"); // - - private final int value; - private final String name; - - private S112_Evt1(int value, String name) { - this.value = value; - this.name = name; - } + public static enum S112_Evt1 implements SunSpecBitPoint { + GROUND_FAULT(new BitPoint(0, "S112_EVT1_GROUND_FAULT", "Ground Fault", Level.INFO)), // + DC_OVER_VOLT(new BitPoint(1, "S112_EVT1_DC_OVER_VOLT", "DC Over Volt", Level.INFO)), // + AC_DISCONNECT(new BitPoint(2, "S112_EVT1_AC_DISCONNECT", "AC Disconnect", Level.INFO)), // + DC_DISCONNECT(new BitPoint(3, "S112_EVT1_DC_DISCONNECT", "DC Disconnect", Level.INFO)), // + GRID_DISCONNECT(new BitPoint(4, "S112_EVT1_GRID_DISCONNECT", "Grid Disconnect", Level.INFO)), // + CABINET_OPEN(new BitPoint(5, "S112_EVT1_CABINET_OPEN", "Cabinet Open", Level.INFO)), // + MANUAL_SHUTDOWN(new BitPoint(6, "S112_EVT1_MANUAL_SHUTDOWN", "Manual Shutdown", Level.INFO)), // + OVER_TEMP(new BitPoint(7, "S112_EVT1_OVER_TEMP", "Over Temp", Level.INFO)), // + OVER_FREQUENCY(new BitPoint(8, "S112_EVT1_OVER_FREQUENCY", "Over Frequency", Level.INFO)), // + UNDER_FREQUENCY(new BitPoint(9, "S112_EVT1_UNDER_FREQUENCY", "Under Frequency", Level.INFO)), // + AC_OVER_VOLT(new BitPoint(10, "S112_EVT1_AC_OVER_VOLT", "AC Over Volt", Level.INFO)), // + AC_UNDER_VOLT(new BitPoint(11, "S112_EVT1_AC_UNDER_VOLT", "AC Under Volt", Level.INFO)), // + BLOWN_STRING_FUSE(new BitPoint(12, "S112_EVT1_BLOWN_STRING_FUSE", "Blown String Fuse", Level.INFO)), // + UNDER_TEMP(new BitPoint(13, "S112_EVT1_UNDER_TEMP", "Under Temp", Level.INFO)), // + MEMORY_LOSS(new BitPoint(14, "S112_EVT1_MEMORY_LOSS", "Memory Loss", Level.INFO)), // + HW_TEST_FAILURE(new BitPoint(15, "S112_EVT1_HW_TEST_FAILURE", "HW Test Failure", Level.INFO)); - @Override - public int getValue() { - return this.value; - } + private final BitPoint point; - @Override - public String getName() { - return this.name; + private S112_Evt1(BitPoint point) { + this.point = point; } @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } public static enum S113 implements SunSpecPoint { - A(new PointImpl(// - "S113_A", // - "Amps", // + A(new ValuePoint("S113_A", "Amps", // "AC Current", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - null, // - new OptionsEnum[0])), // - APH_A(new PointImpl(// - "S113_APH_A", // - "Amps PhaseA", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), // + APH_A(new ValuePoint("S113_APH_A", "Amps PhaseA", // "Phase A Current", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - null, // - new OptionsEnum[0])), // - APH_B(new PointImpl(// - "S113_APH_B", // - "Amps PhaseB", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), // + APH_B(new ValuePoint("S113_APH_B", "Amps PhaseB", // "Phase B Current", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - null, // - new OptionsEnum[0])), // - APH_C(new PointImpl(// - "S113_APH_C", // - "Amps PhaseC", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), // + APH_C(new ValuePoint("S113_APH_C", "Amps PhaseC", // "Phase C Current", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - null, // - new OptionsEnum[0])), // - P_P_VPH_A_B(new PointImpl(// - "S113_P_P_VPH_A_B", // - "Phase Voltage AB", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), // + P_P_VPH_A_B(new ValuePoint("S113_P_P_VPH_A_B", "Phase Voltage AB", // "Phase Voltage AB", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - P_P_VPH_B_C(new PointImpl(// - "S113_P_P_VPH_B_C", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), // + P_P_VPH_B_C(new ValuePoint("S113_P_P_VPH_B_C", "Phase Voltage BC", // "Phase Voltage BC", // - "Phase Voltage BC", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - P_P_VPH_C_A(new PointImpl(// - "S113_P_P_VPH_C_A", // - "Phase Voltage CA", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), // + P_P_VPH_C_A(new ValuePoint("S113_P_P_VPH_C_A", "Phase Voltage CA", // "Phase Voltage CA", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - PH_VPH_A(new PointImpl(// - "S113_PH_VPH_A", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), // + PH_VPH_A(new ValuePoint("S113_PH_VPH_A", "Phase Voltage AN", // "Phase Voltage AN", // - "Phase Voltage AN", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - PH_VPH_B(new PointImpl(// - "S113_PH_VPH_B", // - "Phase Voltage BN", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), // + PH_VPH_B(new ValuePoint("S113_PH_VPH_B", "Phase Voltage BN", // "Phase Voltage BN", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - PH_VPH_C(new PointImpl(// - "S113_PH_VPH_C", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), // + PH_VPH_C(new ValuePoint("S113_PH_VPH_C", "Phase Voltage CN", // "Phase Voltage CN", // - "Phase Voltage CN", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - W(new PointImpl(// - "S113_W", // - "Watts", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), // + W(new ValuePoint("S113_W", "Watts", // "AC Power", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.WATT, // - null, // - new OptionsEnum[0])), // - HZ(new PointImpl(// - "S113_HZ", // - "Hz", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT)), // + HZ(new ValuePoint("S113_HZ", "Hz", // "Line Frequency", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.HERTZ, // - null, // - new OptionsEnum[0])), // - VA(new PointImpl(// - "S113_VA", // - "VA", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.HERTZ)), // + VA(new ValuePoint("S113_VA", "VA", // "AC Apparent Power", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - null, // - new OptionsEnum[0])), // - V_AR(new PointImpl(// - "S113_V_AR", // - "VAr", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE)), // + V_AR(new ValuePoint("S113_V_AR", "VAr", // "AC Reactive Power", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - null, // - new OptionsEnum[0])), // - PF(new PointImpl(// - "S113_PF", // - "PF", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE)), // + PF(new ValuePoint("S113_PF", "PF", // "AC Power Factor", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - WH(new PointImpl(// - "S113_WH", // - "WattHours", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + WH(new ValuePoint("S113_WH", "WattHours", // "AC Energy", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - null, // - new OptionsEnum[0])), // - DCA(new PointImpl(// - "S113_DCA", // - "DC Amps", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS)), // + DCA(new ValuePoint("S113_DCA", "DC Amps", // "DC Current", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - null, // - new OptionsEnum[0])), // - DCV(new PointImpl(// - "S113_DCV", // - "DC Voltage", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE)), // + DCV(new ValuePoint("S113_DCV", "DC Voltage", // "DC Voltage", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - null, // - new OptionsEnum[0])), // - DCW(new PointImpl(// - "S113_DCW", // - "DC Watts", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT)), // + DCW(new ValuePoint("S113_DCW", "DC Watts", // "DC Power", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - null, // - new OptionsEnum[0])), // - TMP_CAB(new PointImpl(// - "S113_TMP_CAB", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT)), // + TMP_CAB(new ValuePoint("S113_TMP_CAB", "Cabinet Temperature", // "Cabinet Temperature", // - "Cabinet Temperature", // - "", // - PointType.FLOAT32, // - true, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - null, // - new OptionsEnum[0])), // - TMP_SNK(new PointImpl(// - "S113_TMP_SNK", // - "Heat Sink Temperature", // + ValuePoint.Type.FLOAT32, true /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), // + TMP_SNK(new ValuePoint("S113_TMP_SNK", "Heat Sink Temperature", // "Heat Sink Temperature", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - null, // - new OptionsEnum[0])), // - TMP_TRNS(new PointImpl(// - "S113_TMP_TRNS", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), // + TMP_TRNS(new ValuePoint("S113_TMP_TRNS", "Transformer Temperature", // "Transformer Temperature", // - "Transformer Temperature", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - null, // - new OptionsEnum[0])), // - TMP_OT(new PointImpl(// - "S113_TMP_OT", // - "Other Temperature", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), // + TMP_OT(new ValuePoint("S113_TMP_OT", "Other Temperature", // "Other Temperature", // - "", // - PointType.FLOAT32, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - null, // - new OptionsEnum[0])), // - ST(new PointImpl(// - "S113_ST", // - "Operating State", // + ValuePoint.Type.FLOAT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS)), // + ST(new EnumPoint("S113_ST", "Operating State", // "Enumerated value. Operating state", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S113_St.values())), // - ST_VND(new PointImpl(// - "S113_ST_VND", // - "Vendor Operating State", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S113_St.values())), // + ST_VND(new EnumPoint("S113_ST_VND", "Vendor Operating State", // "Vendor specific operating state code", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT1(new PointImpl(// - "S113_EVT1", // - "Event1", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), // + EVT1(new BitFieldPoint("S113_EVT1", "Event1", // "Bitmask value. Event fields", // - "", // - PointType.BITFIELD32, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S113_Evt1.values())), // - EVT2(new PointImpl(// - "S113_EVT2", // - "Event Bitfield 2", // + BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S113_Evt1.values())), // + EVT2(new BitFieldPoint("S113_EVT2", "Event Bitfield 2", // "Reserved for future use", // - "", // - PointType.BITFIELD32, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND1(new PointImpl(// - "S113_EVT_VND1", // - "Vendor Event Bitfield 1", // + BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND1(new BitFieldPoint("S113_EVT_VND1", "Vendor Event Bitfield 1", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND2(new PointImpl(// - "S113_EVT_VND2", // - "Vendor Event Bitfield 2", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND2(new BitFieldPoint("S113_EVT_VND2", "Vendor Event Bitfield 2", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND3(new PointImpl(// - "S113_EVT_VND3", // - "Vendor Event Bitfield 3", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND3(new BitFieldPoint("S113_EVT_VND3", "Vendor Event Bitfield 3", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND4(new PointImpl(// - "S113_EVT_VND4", // - "Vendor Event Bitfield 4", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND4(new BitFieldPoint("S113_EVT_VND4", "Vendor Event Bitfield 4", // "Vendor defined events", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])); - protected final PointImpl impl; + private final Point point; - private S113(PointImpl impl) { - this.impl = impl; + private S113(Point point) { + this.point = point; } @Override - public PointImpl get() { - return this.impl; + public Point get() { + return this.point; } } @@ -3880,7 +1433,7 @@ public static enum S113_St implements OptionsEnum { THROTTLED(5, "THROTTLED"), // SHUTTING_DOWN(6, "SHUTTING_DOWN"), // FAULT(7, "FAULT"), // - STANDBY(8, "STANDBY"); // + STANDBY(8, "STANDBY"); private final int value; private final String name; @@ -3906,353 +1459,123 @@ public OptionsEnum getUndefined() { } } - public static enum S113_Evt1 implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - GROUND_FAULT(0, "GROUND_FAULT"), // - DC_OVER_VOLT(1, "DC_OVER_VOLT"), // - AC_DISCONNECT(2, "AC_DISCONNECT"), // - DC_DISCONNECT(3, "DC_DISCONNECT"), // - GRID_DISCONNECT(4, "GRID_DISCONNECT"), // - CABINET_OPEN(5, "CABINET_OPEN"), // - MANUAL_SHUTDOWN(6, "MANUAL_SHUTDOWN"), // - OVER_TEMP(7, "OVER_TEMP"), // - OVER_FREQUENCY(8, "OVER_FREQUENCY"), // - UNDER_FREQUENCY(9, "UNDER_FREQUENCY"), // - AC_OVER_VOLT(10, "AC_OVER_VOLT"), // - AC_UNDER_VOLT(11, "AC_UNDER_VOLT"), // - BLOWN_STRING_FUSE(12, "BLOWN_STRING_FUSE"), // - UNDER_TEMP(13, "UNDER_TEMP"), // - MEMORY_LOSS(14, "MEMORY_LOSS"), // - HW_TEST_FAILURE(15, "HW_TEST_FAILURE"); // - - private final int value; - private final String name; - - private S113_Evt1(int value, String name) { - this.value = value; - this.name = name; - } + public static enum S113_Evt1 implements SunSpecBitPoint { + GROUND_FAULT(new BitPoint(0, "S113_EVT1_GROUND_FAULT", "Ground Fault", Level.INFO)), // + DC_OVER_VOLT(new BitPoint(1, "S113_EVT1_DC_OVER_VOLT", "DC Over Volt", Level.INFO)), // + AC_DISCONNECT(new BitPoint(2, "S113_EVT1_AC_DISCONNECT", "AC Disconnect", Level.INFO)), // + DC_DISCONNECT(new BitPoint(3, "S113_EVT1_DC_DISCONNECT", "DC Disconnect", Level.INFO)), // + GRID_DISCONNECT(new BitPoint(4, "S113_EVT1_GRID_DISCONNECT", "Grid Disconnect", Level.INFO)), // + CABINET_OPEN(new BitPoint(5, "S113_EVT1_CABINET_OPEN", "Cabinet Open", Level.INFO)), // + MANUAL_SHUTDOWN(new BitPoint(6, "S113_EVT1_MANUAL_SHUTDOWN", "Manual Shutdown", Level.INFO)), // + OVER_TEMP(new BitPoint(7, "S113_EVT1_OVER_TEMP", "Over Temp", Level.INFO)), // + OVER_FREQUENCY(new BitPoint(8, "S113_EVT1_OVER_FREQUENCY", "Over Frequency", Level.INFO)), // + UNDER_FREQUENCY(new BitPoint(9, "S113_EVT1_UNDER_FREQUENCY", "Under Frequency", Level.INFO)), // + AC_OVER_VOLT(new BitPoint(10, "S113_EVT1_AC_OVER_VOLT", "AC Over Volt", Level.INFO)), // + AC_UNDER_VOLT(new BitPoint(11, "S113_EVT1_AC_UNDER_VOLT", "AC Under Volt", Level.INFO)), // + BLOWN_STRING_FUSE(new BitPoint(12, "S113_EVT1_BLOWN_STRING_FUSE", "Blown String Fuse", Level.INFO)), // + UNDER_TEMP(new BitPoint(13, "S113_EVT1_UNDER_TEMP", "Under Temp", Level.INFO)), // + MEMORY_LOSS(new BitPoint(14, "S113_EVT1_MEMORY_LOSS", "Memory Loss", Level.INFO)), // + HW_TEST_FAILURE(new BitPoint(15, "S113_EVT1_HW_TEST_FAILURE", "HW Test Failure", Level.INFO)); - @Override - public int getValue() { - return this.value; - } + private final BitPoint point; - @Override - public String getName() { - return this.name; + private S113_Evt1(BitPoint point) { + this.point = point; } @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } public static enum S120 implements SunSpecPoint { - D_E_R_TYP(new PointImpl(// - "S120_D_E_R_TYP", // - "DERTyp", // + D_E_R_TYP(new EnumPoint("S120_D_E_R_TYP", "DERTyp", // "Type of DER device. Default value is 4 to indicate PV device.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S120_DERTyp.values())), // - W_RTG(new PointImpl(// - "S120_W_RTG", // - "WRtg", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S120_DERTyp.values())), // + W_RTG(new ScaledValuePoint("S120_W_RTG", "WRtg", // "Continuous power output capability of the inverter.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "WRtg_SF", // - new OptionsEnum[0])), // - W_RTG_S_F(new PointImpl(// - "S120_W_RTG_S_F", // - "WRtg_SF", // - "Scale factor", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_A_RTG(new PointImpl(// - "S120_V_A_RTG", // - "VARtg", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VARtg_SF", // - new OptionsEnum[0])), // - V_A_RTG_S_F(new PointImpl(// - "S120_V_A_RTG_S_F", // - "VARtg_SF", // - "Scale factor", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_AR_RTG_Q1(new PointImpl(// - "S120_V_AR_RTG_Q1", // - "VArRtgQ1", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VArRtg_SF", // - new OptionsEnum[0])), // - V_AR_RTG_Q2(new PointImpl(// - "S120_V_AR_RTG_Q2", // - "VArRtgQ2", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VArRtg_SF", // - new OptionsEnum[0])), // - V_AR_RTG_Q3(new PointImpl(// - "S120_V_AR_RTG_Q3", // - "VArRtgQ3", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VArRtg_SF", // - new OptionsEnum[0])), // - V_AR_RTG_Q4(new PointImpl(// - "S120_V_AR_RTG_Q4", // - "VArRtgQ4", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VArRtg_SF", // - new OptionsEnum[0])), // - V_AR_RTG_S_F(new PointImpl(// - "S120_V_AR_RTG_S_F", // - "VArRtg_SF", // - "Scale factor", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - A_RTG(new PointImpl(// - "S120_A_RTG", // - "ARtg", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "ARtg_SF", // - new OptionsEnum[0])), // - A_RTG_S_F(new PointImpl(// - "S120_A_RTG_S_F", // - "ARtg_SF", // - "Scale factor", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - P_F_RTG_Q1(new PointImpl(// - "S120_P_F_RTG_Q1", // - "PFRtgQ1", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PFRtg_SF", // - new OptionsEnum[0])), // - P_F_RTG_Q2(new PointImpl(// - "S120_P_F_RTG_Q2", // - "PFRtgQ2", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PFRtg_SF", // - new OptionsEnum[0])), // - P_F_RTG_Q3(new PointImpl(// - "S120_P_F_RTG_Q3", // - "PFRtgQ3", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PFRtg_SF", // - new OptionsEnum[0])), // - P_F_RTG_Q4(new PointImpl(// - "S120_P_F_RTG_Q4", // - "PFRtgQ4", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PFRtg_SF", // - new OptionsEnum[0])), // - P_F_RTG_S_F(new PointImpl(// - "S120_P_F_RTG_S_F", // - "PFRtg_SF", // - "Scale factor", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - W_H_RTG(new PointImpl(// - "S120_W_H_RTG", // - "WHRtg", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "WHRtg_SF", // - new OptionsEnum[0])), // - W_H_RTG_S_F(new PointImpl(// - "S120_W_H_RTG_S_F", // - "WHRtg_SF", // - "Scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - AHR_RTG(new PointImpl(// - "S120_AHR_RTG", // - "AhrRtg", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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).", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE_HOURS, // - "AhrRtg_SF", // - new OptionsEnum[0])), // - AHR_RTG_S_F(new PointImpl(// - "S120_AHR_RTG_S_F", // - "AhrRtg_SF", // - "Scale factor for amp-hour rating.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - MAX_CHA_RTE(new PointImpl(// - "S120_MAX_CHA_RTE", // - "MaxChaRte", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "MaxChaRte_SF", // - new OptionsEnum[0])), // - MAX_CHA_RTE_S_F(new PointImpl(// - "S120_MAX_CHA_RTE_S_F", // - "MaxChaRte_SF", // - "Scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - MAX_DIS_CHA_RTE(new PointImpl(// - "S120_MAX_DIS_CHA_RTE", // - "MaxDisChaRte", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "MaxDisChaRte_SF", // - new OptionsEnum[0])), // - MAX_DIS_CHA_RTE_S_F(new PointImpl(// - "S120_MAX_DIS_CHA_RTE_S_F", // - "MaxDisChaRte_SF", // - "Scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PAD(new PointImpl(// - "S120_PAD", // - "Pad", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.PAD, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // + ValuePoint.Type.PAD, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)); - protected final PointImpl impl; + private final Point point; - private S120(PointImpl impl) { - this.impl = impl; + private S120(Point point) { + this.point = point; } @Override - public PointImpl get() { - return this.impl; + public Point get() { + return this.point; } } public static enum S120_DERTyp implements OptionsEnum { UNDEFINED(-1, "Undefined"), // PV(4, "PV"), // - PV_STOR(82, "PV_STOR"); // + PV_STOR(82, "PV_STOR"); private final int value; private final String name; @@ -4279,353 +1602,103 @@ public OptionsEnum getUndefined() { } public static enum S121 implements SunSpecPoint { - W_MAX(new PointImpl(// - "S121_W_MAX", // - "WMax", // + W_MAX(new ScaledValuePoint("S121_W_MAX", "WMax", // "Setting for maximum power output. Default to WRtg.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.WATT, // - "WMax_SF", // - new OptionsEnum[0])), // - V_REF(new PointImpl(// - "S121_V_REF", // - "VRef", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.WATT, "WMax_SF")), // + V_REF(new ScaledValuePoint("S121_V_REF", "VRef", // "Voltage at the PCC.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.VOLT, // - "VRef_SF", // - new OptionsEnum[0])), // - V_REF_OFS(new PointImpl(// - "S121_V_REF_OFS", // - "VRefOfs", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT, "VRef_SF")), // + V_REF_OFS(new ScaledValuePoint("S121_V_REF_OFS", "VRefOfs", // "Offset from PCC to inverter.", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_WRITE, // - Unit.VOLT, // - "VRefOfs_SF", // - new OptionsEnum[0])), // - V_MAX(new PointImpl(// - "S121_V_MAX", // - "VMax", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT, "VRefOfs_SF")), // + V_MAX(new ScaledValuePoint("S121_V_MAX", "VMax", // "Setpoint for maximum voltage.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.VOLT, // - "VMinMax_SF", // - new OptionsEnum[0])), // - V_MIN(new PointImpl(// - "S121_V_MIN", // - "VMin", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT, "VMinMax_SF")), // + V_MIN(new ScaledValuePoint("S121_V_MIN", "VMin", // "Setpoint for minimum voltage.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.VOLT, // - "VMinMax_SF", // - new OptionsEnum[0])), // - V_A_MAX(new PointImpl(// - "S121_V_A_MAX", // - "VAMax", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT, "VMinMax_SF")), // + V_A_MAX(new ScaledValuePoint("S121_V_A_MAX", "VAMax", // "Setpoint for maximum apparent power. Default to VARtg.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.VOLT_AMPERE, // - "VAMax_SF", // - new OptionsEnum[0])), // - V_AR_MAX_Q1(new PointImpl(// - "S121_V_AR_MAX_Q1", // - "VArMaxQ1", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_WRITE, // - Unit.VOLT_AMPERE_REACTIVE, // - "VArMax_SF", // - new OptionsEnum[0])), // - V_AR_MAX_Q2(new PointImpl(// - "S121_V_AR_MAX_Q2", // - "VArMaxQ2", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_WRITE, // - Unit.VOLT_AMPERE_REACTIVE, // - "VArMax_SF", // - new OptionsEnum[0])), // - V_AR_MAX_Q3(new PointImpl(// - "S121_V_AR_MAX_Q3", // - "VArMaxQ3", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_WRITE, // - Unit.VOLT_AMPERE_REACTIVE, // - "VArMax_SF", // - new OptionsEnum[0])), // - V_AR_MAX_Q4(new PointImpl(// - "S121_V_AR_MAX_Q4", // - "VArMaxQ4", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_WRITE, // - Unit.VOLT_AMPERE_REACTIVE, // - "VArMax_SF", // - new OptionsEnum[0])), // - W_GRA(new PointImpl(// - "S121_W_GRA", // - "WGra", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "WGra_SF", // - new OptionsEnum[0])), // - P_F_MIN_Q1(new PointImpl(// - "S121_P_F_MIN_Q1", // - "PFMinQ1", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "PFMin_SF", // - new OptionsEnum[0])), // - P_F_MIN_Q2(new PointImpl(// - "S121_P_F_MIN_Q2", // - "PFMinQ2", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "PFMin_SF", // - new OptionsEnum[0])), // - P_F_MIN_Q3(new PointImpl(// - "S121_P_F_MIN_Q3", // - "PFMinQ3", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "PFMin_SF", // - new OptionsEnum[0])), // - P_F_MIN_Q4(new PointImpl(// - "S121_P_F_MIN_Q4", // - "PFMinQ4", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "PFMin_SF", // - new OptionsEnum[0])), // - V_AR_ACT(new PointImpl(// - "S121_V_AR_ACT", // - "VArAct", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S121_VArAct.values())), // - CLC_TOT_V_A(new PointImpl(// - "S121_CLC_TOT_V_A", // - "ClcTotVA", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S121_ClcTotVA.values())), // - MAX_RMP_RTE(new PointImpl(// - "S121_MAX_RMP_RTE", // - "MaxRmpRte", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "MaxRmpRte_SF", // - new OptionsEnum[0])), // - E_C_P_NOM_HZ(new PointImpl(// - "S121_E_C_P_NOM_HZ", // - "ECPNomHz", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.HERTZ, // - "ECPNomHz_SF", // - new OptionsEnum[0])), // - CONN_PH(new PointImpl(// - "S121_CONN_PH", // - "ConnPh", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S121_ConnPh.values())), // - W_MAX_S_F(new PointImpl(// - "S121_W_MAX_S_F", // - "WMax_SF", // - "Scale factor for real power.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_REF_S_F(new PointImpl(// - "S121_V_REF_S_F", // - "VRef_SF", // - "Scale factor for voltage at the PCC.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_REF_OFS_S_F(new PointImpl(// - "S121_V_REF_OFS_S_F", // - "VRefOfs_SF", // - "Scale factor for offset voltage.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_MIN_MAX_S_F(new PointImpl(// - "S121_V_MIN_MAX_S_F", // - "VMinMax_SF", // - "Scale factor for min/max voltages.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_A_MAX_S_F(new PointImpl(// - "S121_V_A_MAX_S_F", // - "VAMax_SF", // - "Scale factor for apparent power.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_AR_MAX_S_F(new PointImpl(// - "S121_V_AR_MAX_S_F", // - "VArMax_SF", // - "Scale factor for reactive power.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - W_GRA_S_F(new PointImpl(// - "S121_W_GRA_S_F", // - "WGra_SF", // - "Scale factor for default ramp rate.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - P_F_MIN_S_F(new PointImpl(// - "S121_P_F_MIN_S_F", // - "PFMin_SF", // - "Scale factor for minimum power factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - MAX_RMP_RTE_S_F(new PointImpl(// - "S121_MAX_RMP_RTE_S_F", // - "MaxRmpRte_SF", // - "Scale factor for maximum ramp percentage.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - E_C_P_NOM_HZ_S_F(new PointImpl(// - "S121_E_C_P_NOM_HZ_S_F", // - "ECPNomHz_SF", // - "Scale factor for nominal frequency.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S121(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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", // + "Scale factor for voltage at the PCC.")), // + V_REF_OFS_S_F(new ScaleFactorPoint("S121_V_REF_OFS_S_F", "VRefOfs_SF", // + "Scale factor for offset voltage.")), // + V_MIN_MAX_S_F(new ScaleFactorPoint("S121_V_MIN_MAX_S_F", "VMinMax_SF", // + "Scale factor for min/max voltages.")), // + V_A_MAX_S_F(new ScaleFactorPoint("S121_V_A_MAX_S_F", "VAMax_SF", // + "Scale factor for apparent power.")), // + V_AR_MAX_S_F(new ScaleFactorPoint("S121_V_AR_MAX_S_F", "VArMax_SF", // + "Scale factor for reactive power.")), // + W_GRA_S_F(new ScaleFactorPoint("S121_W_GRA_S_F", "WGra_SF", // + "Scale factor for default ramp rate.")), // + P_F_MIN_S_F(new ScaleFactorPoint("S121_P_F_MIN_S_F", "PFMin_SF", // + "Scale factor for minimum power factor.")), // + MAX_RMP_RTE_S_F(new ScaleFactorPoint("S121_MAX_RMP_RTE_S_F", "MaxRmpRte_SF", // + "Scale factor for maximum ramp percentage.")), // + E_C_P_NOM_HZ_S_F(new ScaleFactorPoint("S121_E_C_P_NOM_HZ_S_F", "ECPNomHz_SF", // + "Scale factor for nominal frequency.")); + + private final Point point; + + private S121(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } public static enum S121_VArAct implements OptionsEnum { UNDEFINED(-1, "Undefined"), // SWITCH(1, "SWITCH"), // - MAINTAIN(2, "MAINTAIN"); // + MAINTAIN(2, "MAINTAIN"); private final int value; private final String name; @@ -4654,7 +1727,7 @@ public OptionsEnum getUndefined() { public static enum S121_ClcTotVA implements OptionsEnum { UNDEFINED(-1, "Undefined"), // VECTOR(1, "VECTOR"), // - ARITHMETIC(2, "ARITHMETIC"); // + ARITHMETIC(2, "ARITHMETIC"); private final int value; private final String name; @@ -4684,7 +1757,7 @@ public static enum S121_ConnPh implements OptionsEnum { UNDEFINED(-1, "Undefined"), // A(1, "A"), // B(2, "B"), // - C(3, "C"); // + C(3, "C"); private final int value; private final String name; @@ -4711,721 +1784,285 @@ public OptionsEnum getUndefined() { } public static enum S122 implements SunSpecPoint { - P_V_CONN(new PointImpl(// - "S122_P_V_CONN", // - "PVConn", // + P_V_CONN(new BitFieldPoint("S122_P_V_CONN", "PVConn", // "PV inverter present/available status. Enumerated value.", // - "", // - PointType.BITFIELD16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S122_PVConn.values())), // - STOR_CONN(new PointImpl(// - "S122_STOR_CONN", // - "StorConn", // + BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_ONLY, S122_PVConn.values())), // + STOR_CONN(new BitFieldPoint("S122_STOR_CONN", "StorConn", // "Storage inverter present/available status. Enumerated value.", // - "", // - PointType.BITFIELD16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S122_StorConn.values())), // - E_C_P_CONN(new PointImpl(// - "S122_E_C_P_CONN", // - "ECPConn", // + BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_ONLY, S122_StorConn.values())), // + E_C_P_CONN(new BitFieldPoint("S122_E_C_P_CONN", "ECPConn", // "ECP connection status: disconnected=0 connected=1.", // - "", // - PointType.BITFIELD16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S122_ECPConn.values())), // - ACT_WH(new PointImpl(// - "S122_ACT_WH", // - "ActWh", // + BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_ONLY, S122_ECPConn.values())), // + ACT_WH(new ValuePoint("S122_ACT_WH", "ActWh", // "AC lifetime active (real) energy output.", // - "", // - PointType.ACC64, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - null, // - new OptionsEnum[0])), // - ACT_V_AH(new PointImpl(// - "S122_ACT_V_AH", // - "ActVAh", // + ValuePoint.Type.ACC64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.CUMULATED_WATT_HOURS)), // + ACT_V_AH(new ValuePoint("S122_ACT_V_AH", "ActVAh", // "AC lifetime apparent energy output.", // - "", // - PointType.ACC64, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - null, // - new OptionsEnum[0])), // - ACT_V_ARH_Q1(new PointImpl(// - "S122_ACT_V_ARH_Q1", // - "ActVArhQ1", // + ValuePoint.Type.ACC64, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.ACC64, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - null, // - new OptionsEnum[0])), // - ACT_V_ARH_Q2(new PointImpl(// - "S122_ACT_V_ARH_Q2", // - "ActVArhQ2", // + ValuePoint.Type.ACC64, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.ACC64, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - null, // - new OptionsEnum[0])), // - ACT_V_ARH_Q3(new PointImpl(// - "S122_ACT_V_ARH_Q3", // - "ActVArhQ3", // + ValuePoint.Type.ACC64, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.ACC64, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - null, // - new OptionsEnum[0])), // - ACT_V_ARH_Q4(new PointImpl(// - "S122_ACT_V_ARH_Q4", // - "ActVArhQ4", // + ValuePoint.Type.ACC64, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.ACC64, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - null, // - new OptionsEnum[0])), // - V_AR_AVAL(new PointImpl(// - "S122_V_AR_AVAL", // - "VArAval", // + ValuePoint.Type.ACC64, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VArAval_SF", // - new OptionsEnum[0])), // - V_AR_AVAL_S_F(new PointImpl(// - "S122_V_AR_AVAL_S_F", // - "VArAval_SF", // - "Scale factor for available VARs.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - W_AVAL(new PointImpl(// - "S122_W_AVAL", // - "WAval", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "WAval_SF", // - new OptionsEnum[0])), // - W_AVAL_S_F(new PointImpl(// - "S122_W_AVAL_S_F", // - "WAval_SF", // - "Scale factor for available Watts.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ST_SET_LIM_MSK(new PointImpl(// - "S122_ST_SET_LIM_MSK", // - "StSetLimMsk", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S122_StSetLimMsk.values())), // - ST_ACT_CTL(new PointImpl(// - "S122_ST_ACT_CTL", // - "StActCtl", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, S122_StSetLimMsk.values())), // + ST_ACT_CTL(new BitFieldPoint("S122_ST_ACT_CTL", "StActCtl", // "Bit Mask indicating which inverter controls are currently active.", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S122_StActCtl.values())), // - TM_SRC(new PointImpl(// - "S122_TM_SRC", // - "TmSrc", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, S122_StActCtl.values())), // + TM_SRC(new ValuePoint("S122_TM_SRC", "TmSrc", // "Source of time synchronization.", // - "", // - PointType.STRING4, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TMS(new PointImpl(// - "S122_TMS", // - "Tms", // + ValuePoint.Type.STRING4, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + TMS(new ValuePoint("S122_TMS", "Tms", // "Seconds since 01-01-2000 00:00 UTC", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_ONLY, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - RT_ST(new PointImpl(// - "S122_RT_ST", // - "RtSt", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), // + RT_ST(new BitFieldPoint("S122_RT_ST", "RtSt", // "Bit Mask indicating active ride-through status.", // - "", // - PointType.BITFIELD16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S122_RtSt.values())), // - RIS(new PointImpl(// - "S122_RIS", // - "Ris", // + BitFieldPoint.Type.BITFIELD16, false /* mandatory? */, AccessMode.READ_ONLY, S122_RtSt.values())), // + RIS(new ScaledValuePoint("S122_RIS", "Ris", // "Isolation resistance.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "Ris_SF", // - new OptionsEnum[0])), // - RIS_S_F(new PointImpl(// - "S122_RIS_S_F", // - "Ris_SF", // - "Scale factor for isolation resistance.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S122(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "Ris_SF")), // + RIS_S_F(new ScaleFactorPoint("S122_RIS_S_F", "Ris_SF", // + "Scale factor for isolation resistance.")); + + private final Point point; + + private S122(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } - public static enum S122_PVConn implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - CONNECTED(0, "CONNECTED"), // - AVAILABLE(1, "AVAILABLE"), // - OPERATING(2, "OPERATING"), // - TEST(3, "TEST"); // + public static enum S122_PVConn implements SunSpecBitPoint { + CONNECTED(new BitPoint(0, "S122_P_V_CONN_CONNECTED", "CONNECTED")), // + AVAILABLE(new BitPoint(1, "S122_P_V_CONN_AVAILABLE", "AVAILABLE")), // + OPERATING(new BitPoint(2, "S122_P_V_CONN_OPERATING", "OPERATING")), // + TEST(new BitPoint(3, "S122_P_V_CONN_TEST", "TEST")); - private final int value; - private final String name; + private final BitPoint point; - private S122_PVConn(int value, String name) { - this.value = value; - this.name = name; + private S122_PVConn(BitPoint point) { + this.point = point; } @Override - public int getValue() { - return this.value; - } - - @Override - public String getName() { - return this.name; - } - - @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } - public static enum S122_StorConn implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - CONNECTED(0, "CONNECTED"), // - AVAILABLE(1, "AVAILABLE"), // - OPERATING(2, "OPERATING"), // - TEST(3, "TEST"); // - - private final int value; - private final String name; + public static enum S122_StorConn implements SunSpecBitPoint { + CONNECTED(new BitPoint(0, "S122_STOR_CONN_CONNECTED", "CONNECTED")), // + AVAILABLE(new BitPoint(1, "S122_STOR_CONN_AVAILABLE", "AVAILABLE")), // + OPERATING(new BitPoint(2, "S122_STOR_CONN_OPERATING", "OPERATING")), // + TEST(new BitPoint(3, "S122_STOR_CONN_TEST", "TEST")); - private S122_StorConn(int value, String name) { - this.value = value; - this.name = name; - } - - @Override - public int getValue() { - return this.value; - } + private final BitPoint point; - @Override - public String getName() { - return this.name; + private S122_StorConn(BitPoint point) { + this.point = point; } @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } - public static enum S122_ECPConn implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - CONNECTED(0, "CONNECTED"); // + public static enum S122_ECPConn implements SunSpecBitPoint { + CONNECTED(new BitPoint(0, "S122_E_C_P_CONN_CONNECTED", "CONNECTED")); - private final int value; - private final String name; + private final BitPoint point; - private S122_ECPConn(int value, String name) { - this.value = value; - this.name = name; + private S122_ECPConn(BitPoint point) { + this.point = point; } @Override - public int getValue() { - return this.value; - } - - @Override - public String getName() { - return this.name; - } - - @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } - public static enum S122_StSetLimMsk implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - W_MAX(0, "W_MAX"), // - V_A_MAX(1, "V_A_MAX"), // - V_AR_AVAL(2, "V_AR_AVAL"), // - V_AR_MAX_Q1(3, "V_AR_MAX_Q1"), // - V_AR_MAX_Q2(4, "V_AR_MAX_Q2"), // - V_AR_MAX_Q3(5, "V_AR_MAX_Q3"), // - V_AR_MAX_Q4(6, "V_AR_MAX_Q4"), // - P_F_MIN_Q1(7, "P_F_MIN_Q1"), // - P_F_MIN_Q2(8, "P_F_MIN_Q2"), // - P_F_MIN_Q3(9, "P_F_MIN_Q3"), // - P_F_MIN_Q4(10, "P_F_MIN_Q4"); // - - private final int value; - private final String name; + public static enum S122_StSetLimMsk implements SunSpecBitPoint { + W_MAX(new BitPoint(0, "S122_ST_SET_LIM_MSK_W_MAX", "WMax")), // + V_A_MAX(new BitPoint(1, "S122_ST_SET_LIM_MSK_V_A_MAX", "VAMax")), // + V_AR_AVAL(new BitPoint(2, "S122_ST_SET_LIM_MSK_V_AR_AVAL", "VArAval")), // + V_AR_MAX_Q1(new BitPoint(3, "S122_ST_SET_LIM_MSK_V_AR_MAX_Q1", "VArMaxQ1")), // + V_AR_MAX_Q2(new BitPoint(4, "S122_ST_SET_LIM_MSK_V_AR_MAX_Q2", "VArMaxQ2")), // + V_AR_MAX_Q3(new BitPoint(5, "S122_ST_SET_LIM_MSK_V_AR_MAX_Q3", "VArMaxQ3")), // + V_AR_MAX_Q4(new BitPoint(6, "S122_ST_SET_LIM_MSK_V_AR_MAX_Q4", "VArMaxQ4")), // + P_F_MIN_Q1(new BitPoint(7, "S122_ST_SET_LIM_MSK_P_F_MIN_Q1", "PFMinQ1")), // + P_F_MIN_Q2(new BitPoint(8, "S122_ST_SET_LIM_MSK_P_F_MIN_Q2", "PFMinQ2")), // + P_F_MIN_Q3(new BitPoint(9, "S122_ST_SET_LIM_MSK_P_F_MIN_Q3", "PFMinQ3")), // + P_F_MIN_Q4(new BitPoint(10, "S122_ST_SET_LIM_MSK_P_F_MIN_Q4", "PFMinQ4")); - private S122_StSetLimMsk(int value, String name) { - this.value = value; - this.name = name; - } + private final BitPoint point; - @Override - public int getValue() { - return this.value; + private S122_StSetLimMsk(BitPoint point) { + this.point = point; } @Override - public String getName() { - return this.name; - } - - @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } - public static enum S122_StActCtl implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - FIXED_W(0, "FIXED_W"), // - FIXED_V_A_R(1, "FIXED_V_A_R"), // - FIXED_P_F(2, "FIXED_P_F"), // - VOLT_V_AR(3, "VOLT_V_AR"), // - FREQ_WATT_PARAM(4, "FREQ_WATT_PARAM"), // - FREQ_WATT_CURVE(5, "FREQ_WATT_CURVE"), // - DYN_REACTIVE_CURRENT(6, "DYN_REACTIVE_CURRENT"), // - LVRT(7, "LVRT"), // - HVRT(8, "HVRT"), // - WATT_P_F(9, "WATT_P_F"), // - VOLT_WATT(10, "VOLT_WATT"), // - SCHEDULED(12, "SCHEDULED"), // - LFRT(13, "LFRT"), // - HFRT(14, "HFRT"); // + public static enum S122_StActCtl implements SunSpecBitPoint { + FIXED_W(new BitPoint(0, "S122_ST_ACT_CTL_FIXED_W", "FixedW")), // + FIXED_V_A_R(new BitPoint(1, "S122_ST_ACT_CTL_FIXED_V_A_R", "FixedVAR")), // + FIXED_P_F(new BitPoint(2, "S122_ST_ACT_CTL_FIXED_P_F", "FixedPF")), // + VOLT_V_AR(new BitPoint(3, "S122_ST_ACT_CTL_VOLT_V_AR", "Volt-VAr")), // + FREQ_WATT_PARAM(new BitPoint(4, "S122_ST_ACT_CTL_FREQ_WATT_PARAM", "Freq-Watt-Param")), // + FREQ_WATT_CURVE(new BitPoint(5, "S122_ST_ACT_CTL_FREQ_WATT_CURVE", "Freq-Watt-Curve")), // + DYN_REACTIVE_CURRENT(new BitPoint(6, "S122_ST_ACT_CTL_DYN_REACTIVE_CURRENT", "Dyn-Reactive-Current")), // + LVRT(new BitPoint(7, "S122_ST_ACT_CTL_LVRT", "LVRT")), // + HVRT(new BitPoint(8, "S122_ST_ACT_CTL_HVRT", "HVRT")), // + WATT_P_F(new BitPoint(9, "S122_ST_ACT_CTL_WATT_P_F", "Watt-PF")), // + VOLT_WATT(new BitPoint(10, "S122_ST_ACT_CTL_VOLT_WATT", "Volt-Watt")), // + SCHEDULED(new BitPoint(12, "S122_ST_ACT_CTL_SCHEDULED", "Scheduled")), // + LFRT(new BitPoint(13, "S122_ST_ACT_CTL_LFRT", "LFRT")), // + HFRT(new BitPoint(14, "S122_ST_ACT_CTL_HFRT", "HFRT")); - private final int value; - private final String name; + private final BitPoint point; - private S122_StActCtl(int value, String name) { - this.value = value; - this.name = name; + private S122_StActCtl(BitPoint point) { + this.point = point; } @Override - public int getValue() { - return this.value; - } - - @Override - public String getName() { - return this.name; - } - - @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } - public static enum S122_RtSt implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - LVRT_ACTIVE(0, "LVRT_ACTIVE"), // - HVRT_ACTIVE(1, "HVRT_ACTIVE"), // - LFRT_ACTIVE(2, "LFRT_ACTIVE"), // - HFRT_ACTIVE(3, "HFRT_ACTIVE"); // + public static enum S122_RtSt implements SunSpecBitPoint { + LVRT_ACTIVE(new BitPoint(0, "S122_RT_ST_LVRT_ACTIVE", "Lvrt Active")), // + HVRT_ACTIVE(new BitPoint(1, "S122_RT_ST_HVRT_ACTIVE", "Hvrt Active")), // + LFRT_ACTIVE(new BitPoint(2, "S122_RT_ST_LFRT_ACTIVE", "Lfrt Active")), // + HFRT_ACTIVE(new BitPoint(3, "S122_RT_ST_HFRT_ACTIVE", "Hfrt Active")); - private final int value; - private final String name; + private final BitPoint point; - private S122_RtSt(int value, String name) { - this.value = value; - this.name = name; + private S122_RtSt(BitPoint point) { + this.point = point; } @Override - public int getValue() { - return this.value; - } - - @Override - public String getName() { - return this.name; - } - - @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } public static enum S123 implements SunSpecPoint { - CONN_WIN_TMS(new PointImpl(// - "S123_CONN_WIN_TMS", // - "Conn_WinTms", // + CONN_WIN_TMS(new ValuePoint("S123_CONN_WIN_TMS", "Conn_WinTms", // "Time window for connect/disconnect.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - CONN_RVRT_TMS(new PointImpl(// - "S123_CONN_RVRT_TMS", // - "Conn_RvrtTms", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), // + CONN_RVRT_TMS(new ValuePoint("S123_CONN_RVRT_TMS", "Conn_RvrtTms", // "Timeout period for connect/disconnect.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - CONN(new PointImpl(// - "S123_CONN", // - "Conn", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), // + CONN(new EnumPoint("S123_CONN", "Conn", // "Enumerated valued. Connection control.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S123_Conn.values())), // - W_MAX_LIM_PCT(new PointImpl(// - "S123_W_MAX_LIM_PCT", // - "WMaxLimPct", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S123_Conn.values())), // + W_MAX_LIM_PCT(new ScaledValuePoint("S123_W_MAX_LIM_PCT", "WMaxLimPct", // "Set power output to specified level.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "WMaxLimPct_SF", // - new OptionsEnum[0])), // - W_MAX_LIM_PCT_WIN_TMS(new PointImpl(// - "S123_W_MAX_LIM_PCT_WIN_TMS", // - "WMaxLimPct_WinTms", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - W_MAX_LIM_PCT_RVRT_TMS(new PointImpl(// - "S123_W_MAX_LIM_PCT_RVRT_TMS", // - "WMaxLimPct_RvrtTms", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - W_MAX_LIM_PCT_RMP_TMS(new PointImpl(// - "S123_W_MAX_LIM_PCT_RMP_TMS", // - "WMaxLimPct_RmpTms", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - W_MAX_LIM_ENA(new PointImpl(// - "S123_W_MAX_LIM_ENA", // - "WMaxLim_Ena", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), // + W_MAX_LIM_ENA(new EnumPoint("S123_W_MAX_LIM_ENA", "WMaxLim_Ena", // "Enumerated valued. Throttle enable/disable control.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S123_WMaxLim_Ena.values())), // - OUT_P_F_SET(new PointImpl(// - "S123_OUT_P_F_SET", // - "OutPFSet", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "OutPFSet_SF", // - new OptionsEnum[0])), // - OUT_P_F_SET_WIN_TMS(new PointImpl(// - "S123_OUT_P_F_SET_WIN_TMS", // - "OutPFSet_WinTms", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - OUT_P_F_SET_RVRT_TMS(new PointImpl(// - "S123_OUT_P_F_SET_RVRT_TMS", // - "OutPFSet_RvrtTms", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - OUT_P_F_SET_RMP_TMS(new PointImpl(// - "S123_OUT_P_F_SET_RMP_TMS", // - "OutPFSet_RmpTms", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - OUT_P_F_SET_ENA(new PointImpl(// - "S123_OUT_P_F_SET_ENA", // - "OutPFSet_Ena", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S123_OutPFSet_Ena.values())), // - V_AR_W_MAX_PCT(new PointImpl(// - "S123_V_AR_W_MAX_PCT", // - "VArWMaxPct", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "VArPct_SF", // - new OptionsEnum[0])), // - V_AR_MAX_PCT(new PointImpl(// - "S123_V_AR_MAX_PCT", // - "VArMaxPct", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "VArPct_SF")), // + V_AR_MAX_PCT(new ScaledValuePoint("S123_V_AR_MAX_PCT", "VArMaxPct", // "Reactive power in percent of VArMax.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "VArPct_SF", // - new OptionsEnum[0])), // - V_AR_AVAL_PCT(new PointImpl(// - "S123_V_AR_AVAL_PCT", // - "VArAvalPct", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "VArPct_SF")), // + V_AR_AVAL_PCT(new ScaledValuePoint("S123_V_AR_AVAL_PCT", "VArAvalPct", // "Reactive power in percent of VArAval.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "VArPct_SF", // - new OptionsEnum[0])), // - V_AR_PCT_WIN_TMS(new PointImpl(// - "S123_V_AR_PCT_WIN_TMS", // - "VArPct_WinTms", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - V_AR_PCT_RVRT_TMS(new PointImpl(// - "S123_V_AR_PCT_RVRT_TMS", // - "VArPct_RvrtTms", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), // + V_AR_PCT_RVRT_TMS(new ValuePoint("S123_V_AR_PCT_RVRT_TMS", "VArPct_RvrtTms", // "Timeout period for VAR limit.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - V_AR_PCT_RMP_TMS(new PointImpl(// - "S123_V_AR_PCT_RMP_TMS", // - "VArPct_RmpTms", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - V_AR_PCT_MOD(new PointImpl(// - "S123_V_AR_PCT_MOD", // - "VArPct_Mod", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), // + V_AR_PCT_MOD(new EnumPoint("S123_V_AR_PCT_MOD", "VArPct_Mod", // "Enumerated value. VAR percent limit mode.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S123_VArPct_Mod.values())), // - V_AR_PCT_ENA(new PointImpl(// - "S123_V_AR_PCT_ENA", // - "VArPct_Ena", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S123_VArPct_Ena.values())), // - W_MAX_LIM_PCT_S_F(new PointImpl(// - "S123_W_MAX_LIM_PCT_S_F", // - "WMaxLimPct_SF", // - "Scale factor for power output percent.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - OUT_P_F_SET_S_F(new PointImpl(// - "S123_OUT_P_F_SET_S_F", // - "OutPFSet_SF", // - "Scale factor for power factor.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_AR_PCT_S_F(new PointImpl(// - "S123_V_AR_PCT_S_F", // - "VArPct_SF", // - "Scale factor for reactive power percent.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S123(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.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", // + "Scale factor for power factor.")), // + V_AR_PCT_S_F(new ScaleFactorPoint("S123_V_AR_PCT_S_F", "VArPct_SF", // + "Scale factor for reactive power percent.")); + + private final Point point; + + private S123(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } public static enum S123_Conn implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISCONNECT(0, "DISCONNECT"), // - CONNECT(1, "CONNECT"); // + CONNECT(1, "CONNECT"); private final int value; private final String name; @@ -5454,7 +2091,7 @@ public OptionsEnum getUndefined() { public static enum S123_WMaxLim_Ena implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -5483,7 +2120,7 @@ public OptionsEnum getUndefined() { public static enum S123_OutPFSet_Ena implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -5514,7 +2151,7 @@ public static enum S123_VArPct_Mod implements OptionsEnum { NONE(0, "NONE"), // W_MAX(1, "W_MAX"), // V_AR_MAX(2, "V_AR_MAX"), // - V_AR_AVAL(3, "V_AR_AVAL"); // + V_AR_AVAL(3, "V_AR_AVAL"); private final int value; private final String name; @@ -5543,7 +2180,7 @@ public OptionsEnum getUndefined() { public static enum S123_VArPct_Ena implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -5570,309 +2207,95 @@ public OptionsEnum getUndefined() { } public static enum S124 implements SunSpecPoint { - W_CHA_MAX(new PointImpl(// - "S124_W_CHA_MAX", // - "WChaMax", // + W_CHA_MAX(new ScaledValuePoint("S124_W_CHA_MAX", "WChaMax", // "Setpoint for maximum charge.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.WATT, // - "WChaMax_SF", // - new OptionsEnum[0])), // - W_CHA_GRA(new PointImpl(// - "S124_W_CHA_GRA", // - "WChaGra", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.WATT, "WChaMax_SF")), // + W_CHA_GRA(new ScaledValuePoint("S124_W_CHA_GRA", "WChaGra", // "Setpoint for maximum charging rate. Default is MaxChaRte.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "WChaDisChaGra_SF", // - new OptionsEnum[0])), // - W_DIS_CHA_GRA(new PointImpl(// - "S124_W_DIS_CHA_GRA", // - "WDisChaGra", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "WChaDisChaGra_SF", // - new OptionsEnum[0])), // - STOR_CTL_MOD(new PointImpl(// - "S124_STOR_CTL_MOD", // - "StorCtl_Mod", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.BITFIELD16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S124_StorCtl_Mod.values())), // - V_A_CHA_MAX(new PointImpl(// - "S124_V_A_CHA_MAX", // - "VAChaMax", // + BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_WRITE, S124_StorCtl_Mod.values())), // + V_A_CHA_MAX(new ScaledValuePoint("S124_V_A_CHA_MAX", "VAChaMax", // "Setpoint for maximum charging VA.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.VOLT_AMPERE, // - "VAChaMax_SF", // - new OptionsEnum[0])), // - MIN_RSV_PCT(new PointImpl(// - "S124_MIN_RSV_PCT", // - "MinRsvPct", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "MinRsvPct_SF", // - new OptionsEnum[0])), // - CHA_STATE(new PointImpl(// - "S124_CHA_STATE", // - "ChaState", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "MinRsvPct_SF")), // + CHA_STATE(new ScaledValuePoint("S124_CHA_STATE", "ChaState", // "Currently available energy as a percent of the capacity rating.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.PERCENT, // - "ChaState_SF", // - new OptionsEnum[0])), // - STOR_AVAL(new PointImpl(// - "S124_STOR_AVAL", // - "StorAval", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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).", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE_HOURS, // - "StorAval_SF", // - new OptionsEnum[0])), // - IN_BAT_V(new PointImpl(// - "S124_IN_BAT_V", // - "InBatV", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE_HOURS, "StorAval_SF")), // + IN_BAT_V(new ScaledValuePoint("S124_IN_BAT_V", "InBatV", // "Internal battery voltage.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "InBatV_SF", // - new OptionsEnum[0])), // - CHA_ST(new PointImpl(// - "S124_CHA_ST", // - "ChaSt", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "InBatV_SF")), // + CHA_ST(new EnumPoint("S124_CHA_ST", "ChaSt", // "Charge status of storage device. Enumerated value.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S124_ChaSt.values())), // - OUT_W_RTE(new PointImpl(// - "S124_OUT_W_RTE", // - "OutWRte", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S124_ChaSt.values())), // + OUT_W_RTE(new ScaledValuePoint("S124_OUT_W_RTE", "OutWRte", // "Percent of max discharge rate.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "InOutWRte_SF", // - new OptionsEnum[0])), // - IN_W_RTE(new PointImpl(// - "S124_IN_W_RTE", // - "InWRte", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "InOutWRte_SF")), // + IN_W_RTE(new ScaledValuePoint("S124_IN_W_RTE", "InWRte", // "Percent of max charging rate.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "InOutWRte_SF", // - new OptionsEnum[0])), // - IN_OUT_W_RTE_WIN_TMS(new PointImpl(// - "S124_IN_OUT_W_RTE_WIN_TMS", // - "InOutWRte_WinTms", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - IN_OUT_W_RTE_RVRT_TMS(new PointImpl(// - "S124_IN_OUT_W_RTE_RVRT_TMS", // - "InOutWRte_RvrtTms", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - IN_OUT_W_RTE_RMP_TMS(new PointImpl(// - "S124_IN_OUT_W_RTE_RMP_TMS", // - "InOutWRte_RmpTms", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - CHA_GRI_SET(new PointImpl(// - "S124_CHA_GRI_SET", // - "", // - "", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S124_ChaGriSet.values())), // - W_CHA_MAX_S_F(new PointImpl(// - "S124_W_CHA_MAX_S_F", // - "WChaMax_SF", // - "Scale factor for maximum charge.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - W_CHA_DIS_CHA_GRA_S_F(new PointImpl(// - "S124_W_CHA_DIS_CHA_GRA_S_F", // - "WChaDisChaGra_SF", // - "Scale factor for maximum charge and discharge rate.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_A_CHA_MAX_S_F(new PointImpl(// - "S124_V_A_CHA_MAX_S_F", // - "VAChaMax_SF", // - "Scale factor for maximum charging VA.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - MIN_RSV_PCT_S_F(new PointImpl(// - "S124_MIN_RSV_PCT_S_F", // - "MinRsvPct_SF", // - "Scale factor for minimum reserve percentage.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - CHA_STATE_S_F(new PointImpl(// - "S124_CHA_STATE_S_F", // - "ChaState_SF", // - "Scale factor for available energy percent.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - STOR_AVAL_S_F(new PointImpl(// - "S124_STOR_AVAL_S_F", // - "StorAval_SF", // - "Scale factor for state of charge.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - IN_BAT_V_S_F(new PointImpl(// - "S124_IN_BAT_V_S_F", // - "InBatV_SF", // - "Scale factor for battery voltage.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - IN_OUT_W_RTE_S_F(new PointImpl(// - "S124_IN_OUT_W_RTE_S_F", // - "InOutWRte_SF", // - "Scale factor for percent charge/discharge rate.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S124(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; - } - } - - public static enum S124_StorCtl_Mod implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - CHARGE(0, "CHARGE"), // - DI_S_C_H_A_R_G_E(1, "DI_S_C_H_A_R_G_E"); // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), // + CHA_GRI_SET(new EnumPoint("S124_CHA_GRI_SET", "", "", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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", // + "Scale factor for maximum charge and discharge rate.")), // + V_A_CHA_MAX_S_F(new ScaleFactorPoint("S124_V_A_CHA_MAX_S_F", "VAChaMax_SF", // + "Scale factor for maximum charging VA.")), // + MIN_RSV_PCT_S_F(new ScaleFactorPoint("S124_MIN_RSV_PCT_S_F", "MinRsvPct_SF", // + "Scale factor for minimum reserve percentage.")), // + CHA_STATE_S_F(new ScaleFactorPoint("S124_CHA_STATE_S_F", "ChaState_SF", // + "Scale factor for available energy percent.")), // + STOR_AVAL_S_F(new ScaleFactorPoint("S124_STOR_AVAL_S_F", "StorAval_SF", // + "Scale factor for state of charge.")), // + IN_BAT_V_S_F(new ScaleFactorPoint("S124_IN_BAT_V_S_F", "InBatV_SF", // + "Scale factor for battery voltage.")), // + IN_OUT_W_RTE_S_F(new ScaleFactorPoint("S124_IN_OUT_W_RTE_S_F", "InOutWRte_SF", // + "Scale factor for percent charge/discharge rate.")); - private final int value; - private final String name; + private final Point point; - private S124_StorCtl_Mod(int value, String name) { - this.value = value; - this.name = name; + private S124(Point point) { + this.point = point; } @Override - public int getValue() { - return this.value; + public Point get() { + return this.point; } + } - @Override - public String getName() { - return this.name; + public static enum S124_StorCtl_Mod implements SunSpecBitPoint { + CHARGE(new BitPoint(0, "S124_STOR_CTL_MOD_CHARGE", "CHARGE")), // + DISCHARGE(new BitPoint(1, "S124_STOR_CTL_MOD_DISCHARGE", "DISCHARGE")); + + private final BitPoint point; + + private S124_StorCtl_Mod(BitPoint point) { + this.point = point; } @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } @@ -5884,7 +2307,7 @@ public static enum S124_ChaSt implements OptionsEnum { CHARGING(4, "CHARGING"), // FULL(5, "FULL"), // HOLDING(6, "HOLDING"), // - TESTING(7, "TESTING"); // + TESTING(7, "TESTING"); private final int value; private final String name; @@ -5913,7 +2336,7 @@ public OptionsEnum getUndefined() { public static enum S124_ChaGriSet implements OptionsEnum { UNDEFINED(-1, "Undefined"), // PV(0, "PV"), // - GRID(1, "GRID"); // + GRID(1, "GRID"); private final int value; private final String name; @@ -5940,132 +2363,53 @@ public OptionsEnum getUndefined() { } public static enum S125 implements SunSpecPoint { - MOD_ENA(new PointImpl(// - "S125_MOD_ENA", // - "ModEna", // + MOD_ENA(new BitFieldPoint("S125_MOD_ENA", "ModEna", // "Is price-based charge/discharge mode active?", // - "", // - PointType.BITFIELD16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S125_ModEna.values())), // - SIG_TYPE(new PointImpl(// - "S125_SIG_TYPE", // - "SigType", // + BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S125_SigType.values())), // - SIG(new PointImpl(// - "S125_SIG", // - "Sig", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "Sig_SF", // - new OptionsEnum[0])), // - WIN_TMS(new PointImpl(// - "S125_WIN_TMS", // - "WinTms", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "Sig_SF")), // + WIN_TMS(new ValuePoint("S125_WIN_TMS", "WinTms", // "Time window for charge/discharge pricing change.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - RVT_TMS(new PointImpl(// - "S125_RVT_TMS", // - "RvtTms", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), // + RVT_TMS(new ValuePoint("S125_RVT_TMS", "RvtTms", // "Timeout period for charge/discharge pricing change.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - RMP_TMS(new PointImpl(// - "S125_RMP_TMS", // - "RmpTms", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - SIG_S_F(new PointImpl(// - "S125_SIG_S_F", // - "Sig_SF", // - "Pricing signal scale factor.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PAD(new PointImpl(// - "S125_PAD", // - "", // - "", // - "", // - PointType.PAD, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S125(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; - } - } + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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)); - public static enum S125_ModEna implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - ENABLE(0, "ENABLE"); // - - private final int value; - private final String name; + private final Point point; - private S125_ModEna(int value, String name) { - this.value = value; - this.name = name; + private S125(Point point) { + this.point = point; } @Override - public int getValue() { - return this.value; + public Point get() { + return this.point; } + } - @Override - public String getName() { - return this.name; + public static enum S125_ModEna implements SunSpecBitPoint { + ENABLE(new BitPoint(0, "S125_MOD_ENA_ENABLE", "ENABLE")); + + private final BitPoint point; + + private S125_ModEna(BitPoint point) { + this.point = point; } @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } @@ -6075,7 +2419,7 @@ public static enum S125_SigType implements OptionsEnum { ABSOLUTE(1, "ABSOLUTE"), // RELATIVE(2, "RELATIVE"), // MULTIPLIER(3, "MULTIPLIER"), // - LEVEL(4, "LEVEL"); // + LEVEL(4, "LEVEL"); private final int value; private final String name; @@ -6102,357 +2446,132 @@ public OptionsEnum getUndefined() { } public static enum S127 implements SunSpecPoint { - W_GRA(new PointImpl(// - "S127_W_GRA", // - "WGra", // + W_GRA(new ScaledValuePoint("S127_W_GRA", "WGra", // "The slope of the reduction in the maximum allowed watts output as a function of frequency.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "WGra_SF", // - new OptionsEnum[0])), // - HZ_STR(new PointImpl(// - "S127_HZ_STR", // - "HzStr", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_WRITE, // - Unit.HERTZ, // - "HzStrStop_SF", // - new OptionsEnum[0])), // - HZ_STOP(new PointImpl(// - "S127_HZ_STOP", // - "HzStop", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_WRITE, // - Unit.HERTZ, // - "HzStrStop_SF", // - new OptionsEnum[0])), // - HYS_ENA(new PointImpl(// - "S127_HYS_ENA", // - "HysEna", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.HERTZ, "HzStrStop_SF")), // + HYS_ENA(new BitFieldPoint("S127_HYS_ENA", "HysEna", // "Enable hysteresis", // - "", // - PointType.BITFIELD16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S127_HysEna.values())), // - MOD_ENA(new PointImpl(// - "S127_MOD_ENA", // - "ModEna", // + BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_WRITE, S127_HysEna.values())), // + MOD_ENA(new BitFieldPoint("S127_MOD_ENA", "ModEna", // "Is Parameterized Frequency-Watt control active.", // - "", // - PointType.BITFIELD16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S127_ModEna.values())), // - HZ_STOP_W_GRA(new PointImpl(// - "S127_HZ_STOP_W_GRA", // - "HzStopWGra", // + BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "RmpIncDec_SF", // - new OptionsEnum[0])), // - W_GRA_S_F(new PointImpl(// - "S127_W_GRA_S_F", // - "WGra_SF", // - "Scale factor for output gradient.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - HZ_STR_STOP_S_F(new PointImpl(// - "S127_HZ_STR_STOP_S_F", // - "HzStrStop_SF", // - "Scale factor for frequency deviations.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - RMP_INC_DEC_S_F(new PointImpl(// - "S127_RMP_INC_DEC_S_F", // - "RmpIncDec_SF", // - "Scale factor for increment and decrement ramps.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PAD(new PointImpl(// - "S127_PAD", // - "", // - "", // - "", // - PointType.PAD, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S127(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; - } - } - - public static enum S127_HysEna implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - ENABLED(0, "ENABLED"); // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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", // + "Scale factor for frequency deviations.")), // + 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)); - private final int value; - private final String name; + private final Point point; - private S127_HysEna(int value, String name) { - this.value = value; - this.name = name; + private S127(Point point) { + this.point = point; } @Override - public int getValue() { - return this.value; - } - - @Override - public String getName() { - return this.name; - } - - @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public Point get() { + return this.point; } } - public static enum S127_ModEna implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - ENABLED(0, "ENABLED"); // + public static enum S127_HysEna implements SunSpecBitPoint { + ENABLED(new BitPoint(0, "S127_HYS_ENA_ENABLED", "ENABLED")); - private final int value; - private final String name; + private final BitPoint point; - private S127_ModEna(int value, String name) { - this.value = value; - this.name = name; + private S127_HysEna(BitPoint point) { + this.point = point; } @Override - public int getValue() { - return this.value; + public BitPoint get() { + return this.point; } + } - @Override - public String getName() { - return this.name; + public static enum S127_ModEna implements SunSpecBitPoint { + ENABLED(new BitPoint(0, "S127_MOD_ENA_ENABLED", "ENABLED")); + + private final BitPoint point; + + private S127_ModEna(BitPoint point) { + this.point = point; } @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } public static enum S128 implements SunSpecPoint { - AR_GRA_MOD(new PointImpl(// - "S128_AR_GRA_MOD", // - "ArGraMod", // + 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.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S128_ArGraMod.values())), // - AR_GRA_SAG(new PointImpl(// - "S128_AR_GRA_SAG", // - "ArGraSag", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "ArGra_SF", // - new OptionsEnum[0])), // - AR_GRA_SWELL(new PointImpl(// - "S128_AR_GRA_SWELL", // - "ArGraSwell", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "ArGra_SF", // - new OptionsEnum[0])), // - MOD_ENA(new PointImpl(// - "S128_MOD_ENA", // - "ModEna", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "ArGra_SF")), // + MOD_ENA(new BitFieldPoint("S128_MOD_ENA", "ModEna", // "Activate dynamic reactive current model", // - "", // - PointType.BITFIELD16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S128_ModEna.values())), // - FIL_TMS(new PointImpl(// - "S128_FIL_TMS", // - "FilTms", // + BitFieldPoint.Type.BITFIELD16, true /* mandatory? */, AccessMode.READ_WRITE, S128_ModEna.values())), // + FIL_TMS(new ValuePoint("S128_FIL_TMS", "FilTms", // "The time window used to calculate the moving average voltage.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - DB_V_MIN(new PointImpl(// - "S128_DB_V_MIN", // - "DbVMin", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "VRefPct_SF", // - new OptionsEnum[0])), // - DB_V_MAX(new PointImpl(// - "S128_DB_V_MAX", // - "DbVMax", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "VRefPct_SF", // - new OptionsEnum[0])), // - BLK_ZN_V(new PointImpl(// - "S128_BLK_ZN_V", // - "BlkZnV", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "VRefPct_SF", // - new OptionsEnum[0])), // - HYS_BLK_ZN_V(new PointImpl(// - "S128_HYS_BLK_ZN_V", // - "HysBlkZnV", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "VRefPct_SF")), // + HYS_BLK_ZN_V(new ScaledValuePoint("S128_HYS_BLK_ZN_V", "HysBlkZnV", // "Hysteresis voltage used with BlkZnV.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "VRefPct_SF", // - new OptionsEnum[0])), // - BLK_ZN_TMMS(new PointImpl(// - "S128_BLK_ZN_TMMS", // - "BlkZnTmms", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.MILLISECONDS, // - null, // - new OptionsEnum[0])), // - HOLD_TMMS(new PointImpl(// - "S128_HOLD_TMMS", // - "HoldTmms", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.MILLISECONDS, // - null, // - new OptionsEnum[0])), // - AR_GRA_S_F(new PointImpl(// - "S128_AR_GRA_S_F", // - "ArGra_SF", // - "Scale factor for the gradients.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_REF_PCT_S_F(new PointImpl(// - "S128_V_REF_PCT_S_F", // - "VRefPct_SF", // - "Scale factor for the voltage zone and limit settings.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PAD(new PointImpl(// - "S128_PAD", // - "", // - "", // - "", // - PointType.PAD, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S128(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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)); + + private final Point point; + + private S128(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } public static enum S128_ArGraMod implements OptionsEnum { UNDEFINED(-1, "Undefined"), // EDGE(0, "EDGE"), // - CENTER(1, "CENTER"); // + CENTER(1, "CENTER"); private final int value; private final String name; @@ -6478,4688 +2597,1288 @@ public OptionsEnum getUndefined() { } } - public static enum S128_ModEna implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - ENABLED(0, "ENABLED"); // - - private final int value; - private final String name; - - private S128_ModEna(int value, String name) { - this.value = value; - this.name = name; - } + public static enum S128_ModEna implements SunSpecBitPoint { + ENABLED(new BitPoint(0, "S128_MOD_ENA_ENABLED", "ENABLED")); - @Override - public int getValue() { - return this.value; - } + private final BitPoint point; - @Override - public String getName() { - return this.name; + private S128_ModEna(BitPoint point) { + this.point = point; } @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } public static enum S145 implements SunSpecPoint { - NOM_RMP_UP_RTE(new PointImpl(// - "S145_NOM_RMP_UP_RTE", // - "Ramp Up Rate", // + NOM_RMP_UP_RTE(new ScaledValuePoint("S145_NOM_RMP_UP_RTE", "Ramp Up Rate", // "Ramp up rate as a percentage of max current.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "Rmp_SF", // - new OptionsEnum[0])), // - NOM_RMP_DN_RTE(new PointImpl(// - "S145_NOM_RMP_DN_RTE", // - "NomRmpDnRte", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "Rmp_SF", // - new OptionsEnum[0])), // - EMG_RMP_UP_RTE(new PointImpl(// - "S145_EMG_RMP_UP_RTE", // - "Emergency Ramp Up Rate", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "Rmp_SF", // - new OptionsEnum[0])), // - EMG_RMP_DN_RTE(new PointImpl(// - "S145_EMG_RMP_DN_RTE", // - "Emergency Ramp Down Rate", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "Rmp_SF", // - new OptionsEnum[0])), // - CONN_RMP_UP_RTE(new PointImpl(// - "S145_CONN_RMP_UP_RTE", // - "Connect Ramp Up Rate", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "Rmp_SF", // - new OptionsEnum[0])), // - CONN_RMP_DN_RTE(new PointImpl(// - "S145_CONN_RMP_DN_RTE", // - "Connect Ramp Down Rate", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "Rmp_SF", // - new OptionsEnum[0])), // - A_GRA(new PointImpl(// - "S145_A_GRA", // - "Default Ramp Rate", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "Rmp_SF")), // + A_GRA(new ScaledValuePoint("S145_A_GRA", "Default Ramp Rate", // "Ramp rate specified in percent of max current.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "Rmp_SF", // - new OptionsEnum[0])), // - RMP_S_F(new PointImpl(// - "S145_RMP_S_F", // - "Ramp Rate Scale Factor", // - "Ramp Rate Scale Factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S145(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "Rmp_SF")), // + RMP_S_F(new ScaleFactorPoint("S145_RMP_S_F", "Ramp Rate Scale Factor", // + "Ramp Rate Scale Factor")); + + private final Point point; + + private S145(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } public static enum S201 implements SunSpecPoint { - A(new PointImpl(// - "S201_A", // - "Amps", // + A(new ScaledValuePoint("S201_A", "Amps", // "Total AC Current", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - APH_A(new PointImpl(// - "S201_APH_A", // - "Amps PhaseA", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + APH_A(new ScaledValuePoint("S201_APH_A", "Amps PhaseA", // "Phase A Current", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - APH_B(new PointImpl(// - "S201_APH_B", // - "Amps PhaseB", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + APH_B(new ScaledValuePoint("S201_APH_B", "Amps PhaseB", // "Phase B Current", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - APH_C(new PointImpl(// - "S201_APH_C", // - "Amps PhaseC", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + APH_C(new ScaledValuePoint("S201_APH_C", "Amps PhaseC", // "Phase C Current", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - A_SF(new PointImpl(// - "S201_A_SF", // - "", // - "Current scale factor", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PH_V(new PointImpl(// - "S201_PH_V", // - "Voltage LN", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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)", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_A(new PointImpl(// - "S201_PH_VPH_A", // - "Phase Voltage AN", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_A(new ScaledValuePoint("S201_PH_VPH_A", "Phase Voltage AN", // "Phase Voltage AN", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_B(new PointImpl(// - "S201_PH_VPH_B", // - "Phase Voltage BN", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_B(new ScaledValuePoint("S201_PH_VPH_B", "Phase Voltage BN", // "Phase Voltage BN", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_C(new PointImpl(// - "S201_PH_VPH_C", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_C(new ScaledValuePoint("S201_PH_VPH_C", "Phase Voltage CN", // "Phase Voltage CN", // - "Phase Voltage CN", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PPV(new PointImpl(// - "S201_PPV", // - "Voltage LL", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PPV(new ScaledValuePoint("S201_PPV", "Voltage LL", // "Line to Line AC Voltage (average of active phases)", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - P_P_VPH_A_B(new PointImpl(// - "S201_P_P_VPH_A_B", // - "Phase Voltage AB", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - P_P_VPH_B_C(new PointImpl(// - "S201_P_P_VPH_B_C", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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", // - "Phase Voltage BC", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - P_P_VPH_C_A(new PointImpl(// - "S201_P_P_VPH_C_A", // - "Phase Voltage CA", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - V_SF(new PointImpl(// - "S201_V_SF", // - "", // - "Voltage scale factor", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - HZ(new PointImpl(// - "S201_HZ", // - "Hz", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + V_SF(new ScaleFactorPoint("S201_V_SF", "", // + "Voltage scale factor")), // + HZ(new ScaledValuePoint("S201_HZ", "Hz", // "Frequency", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.HERTZ, // - "Hz_SF", // - new OptionsEnum[0])), // - HZ_S_F(new PointImpl(// - "S201_HZ_S_F", // - "", // - "Frequency scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - W(new PointImpl(// - "S201_W", // - "Watts", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - WPH_A(new PointImpl(// - "S201_WPH_A", // - "Watts phase A", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - WPH_B(new PointImpl(// - "S201_WPH_B", // - "Watts phase B", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - WPH_C(new PointImpl(// - "S201_WPH_C", // - "Watts phase C", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - W_SF(new PointImpl(// - "S201_W_SF", // - "", // - "Real Power scale factor", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VA(new PointImpl(// - "S201_VA", // - "VA", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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")), // + WPH_B(new ScaledValuePoint("S201_WPH_B", "Watts phase B", "", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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")), // + W_SF(new ScaleFactorPoint("S201_W_SF", "", // + "Real Power scale factor")), // + VA(new ScaledValuePoint("S201_VA", "VA", // "AC Apparent Power", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - V_APH_A(new PointImpl(// - "S201_V_APH_A", // - "VA phase A", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - V_APH_B(new PointImpl(// - "S201_V_APH_B", // - "VA phase B", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - V_APH_C(new PointImpl(// - "S201_V_APH_C", // - "VA phase C", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - VA_SF(new PointImpl(// - "S201_VA_SF", // - "", // - "Apparent Power scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VAR(new PointImpl(// - "S201_VAR", // - "VAR", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + VA_SF(new ScaleFactorPoint("S201_VA_SF", "", // + "Apparent Power scale factor")), // + VAR(new ScaledValuePoint("S201_VAR", "VAR", // "Reactive Power", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VAR_SF", // - new OptionsEnum[0])), // - V_A_RPH_A(new PointImpl(// - "S201_V_A_RPH_A", // - "VAR phase A", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VAR_SF", // - new OptionsEnum[0])), // - V_A_RPH_B(new PointImpl(// - "S201_V_A_RPH_B", // - "VAR phase B", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VAR_SF", // - new OptionsEnum[0])), // - V_A_RPH_C(new PointImpl(// - "S201_V_A_RPH_C", // - "VAR phase C", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VAR_SF", // - new OptionsEnum[0])), // - VAR_SF(new PointImpl(// - "S201_VAR_SF", // - "", // - "Reactive Power scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PF(new PointImpl(// - "S201_PF", // - "PF", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + VAR_SF(new ScaleFactorPoint("S201_VAR_SF", "", // + "Reactive Power scale factor")), // + PF(new ScaledValuePoint("S201_PF", "PF", // "Power Factor", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - P_FPH_A(new PointImpl(// - "S201_P_FPH_A", // - "PF phase A", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - P_FPH_B(new PointImpl(// - "S201_P_FPH_B", // - "PF phase B", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - P_FPH_C(new PointImpl(// - "S201_P_FPH_C", // - "PF phase C", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - PF_SF(new PointImpl(// - "S201_PF_SF", // - "", // - "Power Factor scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TOT_WH_EXP(new PointImpl(// - "S201_TOT_WH_EXP", // - "Total Watt-hours Exported", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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")), // + P_FPH_B(new ScaledValuePoint("S201_P_FPH_B", "PF phase B", "", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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")), // + 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", // - "", // - PointType.ACC32, // - true, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_EXP_PH_A(new PointImpl(// - "S201_TOT_WH_EXP_PH_A", // - "Total Watt-hours Exported phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_EXP_PH_B(new PointImpl(// - "S201_TOT_WH_EXP_PH_B", // - "Total Watt-hours Exported phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_EXP_PH_C(new PointImpl(// - "S201_TOT_WH_EXP_PH_C", // - "Total Watt-hours Exported phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_IMP(new PointImpl(// - "S201_TOT_WH_IMP", // - "Total Watt-hours Imported", // + ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + TOT_WH_IMP(new ScaledValuePoint("S201_TOT_WH_IMP", "Total Watt-hours Imported", // "Total Real Energy Imported", // - "", // - PointType.ACC32, // - true, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_IMP_PH_A(new PointImpl(// - "S201_TOT_WH_IMP_PH_A", // - "Total Watt-hours Imported phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_IMP_PH_B(new PointImpl(// - "S201_TOT_WH_IMP_PH_B", // - "Total Watt-hours Imported phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_IMP_PH_C(new PointImpl(// - "S201_TOT_WH_IMP_PH_C", // - "Total Watt-hours Imported phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_S_F(new PointImpl(// - "S201_TOT_WH_S_F", // - "", // - "Real Energy scale factor", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TOT_V_AH_EXP(new PointImpl(// - "S201_TOT_V_AH_EXP", // - "Total VA-hours Exported", // + ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + 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", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_EXP_PH_A(new PointImpl(// - "S201_TOT_V_AH_EXP_PH_A", // - "Total VA-hours Exported phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_EXP_PH_B(new PointImpl(// - "S201_TOT_V_AH_EXP_PH_B", // - "Total VA-hours Exported phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_EXP_PH_C(new PointImpl(// - "S201_TOT_V_AH_EXP_PH_C", // - "Total VA-hours Exported phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_IMP(new PointImpl(// - "S201_TOT_V_AH_IMP", // - "Total VA-hours Imported", // + ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + TOT_V_AH_IMP(new ScaledValuePoint("S201_TOT_V_AH_IMP", "Total VA-hours Imported", // "Total Apparent Energy Imported", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_IMP_PH_A(new PointImpl(// - "S201_TOT_V_AH_IMP_PH_A", // - "Total VA-hours Imported phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_IMP_PH_B(new PointImpl(// - "S201_TOT_V_AH_IMP_PH_B", // - "Total VA-hours Imported phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_IMP_PH_C(new PointImpl(// - "S201_TOT_V_AH_IMP_PH_C", // - "Total VA-hours Imported phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_S_F(new PointImpl(// - "S201_TOT_V_AH_S_F", // - "", // - "Apparent Energy scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q1(new PointImpl(// - "S201_TOT_V_ARH_IMP_Q1", // - "Total VAR-hours Imported Q1", // + ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + 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", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q1_PH_A(new PointImpl(// - "S201_TOT_V_ARH_IMP_Q1_PH_A", // - "Total VAr-hours Imported Q1 phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q1_PH_B(new PointImpl(// - "S201_TOT_V_ARH_IMP_Q1_PH_B", // - "Total VAr-hours Imported Q1 phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q1_PH_C(new PointImpl(// - "S201_TOT_V_ARH_IMP_Q1_PH_C", // - "Total VAr-hours Imported Q1 phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q2(new PointImpl(// - "S201_TOT_V_ARH_IMP_Q2", // - "Total VAr-hours Imported Q2", // + 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")), // + TOT_V_ARH_IMP_Q2(new ScaledValuePoint("S201_TOT_V_ARH_IMP_Q2", "Total VAr-hours Imported Q2", // "Total Reactive Power Imported Quadrant 2", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q2_PH_A(new PointImpl(// - "S201_TOT_V_ARH_IMP_Q2_PH_A", // - "Total VAr-hours Imported Q2 phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q2_PH_B(new PointImpl(// - "S201_TOT_V_ARH_IMP_Q2_PH_B", // - "Total VAr-hours Imported Q2 phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q2_PH_C(new PointImpl(// - "S201_TOT_V_ARH_IMP_Q2_PH_C", // - "Total VAr-hours Imported Q2 phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q3(new PointImpl(// - "S201_TOT_V_ARH_EXP_Q3", // - "Total VAr-hours Exported Q3", // + 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")), // + TOT_V_ARH_EXP_Q3(new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q3", "Total VAr-hours Exported Q3", // "Total Reactive Power Exported Quadrant 3", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q3_PH_A(new PointImpl(// - "S201_TOT_V_ARH_EXP_Q3_PH_A", // - "Total VAr-hours Exported Q3 phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q3_PH_B(new PointImpl(// - "S201_TOT_V_ARH_EXP_Q3_PH_B", // - "Total VAr-hours Exported Q3 phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q3_PH_C(new PointImpl(// - "S201_TOT_V_ARH_EXP_Q3_PH_C", // - "Total VAr-hours Exported Q3 phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q4(new PointImpl(// - "S201_TOT_V_ARH_EXP_Q4", // - "Total VAr-hours Exported Q4", // + 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")), // + TOT_V_ARH_EXP_Q4(new ScaledValuePoint("S201_TOT_V_ARH_EXP_Q4", "Total VAr-hours Exported Q4", // "Total Reactive Power Exported Quadrant 4", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q4_PH_A(new PointImpl(// - "S201_TOT_V_ARH_EXP_Q4_PH_A", // - "Total VAr-hours Exported Q4 Imported phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q4_PH_B(new PointImpl(// - "S201_TOT_V_ARH_EXP_Q4_PH_B", // - "Total VAr-hours Exported Q4 Imported phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q4_PH_C(new PointImpl(// - "S201_TOT_V_ARH_EXP_Q4_PH_C", // - "Total VAr-hours Exported Q4 Imported phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_S_F(new PointImpl(// - "S201_TOT_V_ARH_S_F", // - "", // - "Reactive Energy scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT(new PointImpl(// - "S201_EVT", // - "Events", // + 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")), // + 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", // - "", // - PointType.BITFIELD32, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S201_Evt.values())); // + BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S201_Evt.values())); - protected final PointImpl impl; + private final Point point; - private S201(PointImpl impl) { - this.impl = impl; + private S201(Point point) { + this.point = point; } @Override - public PointImpl get() { - return this.impl; + public Point get() { + return this.point; } } - public static enum S201_Evt implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - POWER_FAILURE(2, "POWER_FAILURE"), // - UNDER_VOLTAGE(3, "UNDER_VOLTAGE"), // - LOW_P_F(4, "LOW_P_F"), // - OVER_CURRENT(5, "OVER_CURRENT"), // - OVER_VOLTAGE(6, "OVER_VOLTAGE"), // - MISSING_SENSOR(7, "MISSING_SENSOR"), // - OEM01(16, "OEM01"), // - OEM02(17, "OEM02"), // - OEM03(18, "OEM03"), // - OEM04(19, "OEM04"), // - OEM05(20, "OEM05"), // - OEM06(21, "OEM06"), // - OEM07(22, "OEM07"), // - OEM08(23, "OEM08"), // - OEM09(24, "OEM09"), // - OEM10(25, "OEM10"), // - OEM11(26, "OEM11"), // - OEM12(27, "OEM12"), // - OEM13(28, "OEM13"), // - OEM14(29, "OEM14"), // - OEM15(30, "OEM15"); // + public static enum S201_Evt implements SunSpecBitPoint { + POWER_FAILURE(new BitPoint(2, "S201_EVT_POWER_FAILURE", "Power_Failure")), // + UNDER_VOLTAGE(new BitPoint(3, "S201_EVT_UNDER_VOLTAGE", "Under_Voltage")), // + LOW_P_F(new BitPoint(4, "S201_EVT_LOW_P_F", "Low_PF")), // + OVER_CURRENT(new BitPoint(5, "S201_EVT_OVER_CURRENT", "Over_Current")), // + OVER_VOLTAGE(new BitPoint(6, "S201_EVT_OVER_VOLTAGE", "Over_Voltage")), // + MISSING_SENSOR(new BitPoint(7, "S201_EVT_MISSING_SENSOR", "Missing_Sensor")), // + OEM01(new BitPoint(16, "S201_EVT_OEM01", "OEM01")), // + OEM02(new BitPoint(17, "S201_EVT_OEM02", "OEM02")), // + OEM03(new BitPoint(18, "S201_EVT_OEM03", "OEM03")), // + OEM04(new BitPoint(19, "S201_EVT_OEM04", "OEM04")), // + OEM05(new BitPoint(20, "S201_EVT_OEM05", "OEM05")), // + OEM06(new BitPoint(21, "S201_EVT_OEM06", "OEM06")), // + OEM07(new BitPoint(22, "S201_EVT_OEM07", "OEM07")), // + OEM08(new BitPoint(23, "S201_EVT_OEM08", "OEM08")), // + OEM09(new BitPoint(24, "S201_EVT_OEM09", "OEM09")), // + OEM10(new BitPoint(25, "S201_EVT_OEM10", "OEM10")), // + OEM11(new BitPoint(26, "S201_EVT_OEM11", "OEM11")), // + OEM12(new BitPoint(27, "S201_EVT_OEM12", "OEM12")), // + OEM13(new BitPoint(28, "S201_EVT_OEM13", "OEM13")), // + OEM14(new BitPoint(29, "S201_EVT_OEM14", "OEM14")), // + OEM15(new BitPoint(30, "S201_EVT_OEM15", "OEM15")); - private final int value; - private final String name; + private final BitPoint point; - private S201_Evt(int value, String name) { - this.value = value; - this.name = name; + private S201_Evt(BitPoint point) { + this.point = point; } @Override - public int getValue() { - return this.value; - } - - @Override - public String getName() { - return this.name; - } - - @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } public static enum S202 implements SunSpecPoint { - A(new PointImpl(// - "S202_A", // - "Amps", // + A(new ScaledValuePoint("S202_A", "Amps", // "Total AC Current", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - APH_A(new PointImpl(// - "S202_APH_A", // - "Amps PhaseA", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + APH_A(new ScaledValuePoint("S202_APH_A", "Amps PhaseA", // "Phase A Current", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - APH_B(new PointImpl(// - "S202_APH_B", // - "Amps PhaseB", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + APH_B(new ScaledValuePoint("S202_APH_B", "Amps PhaseB", // "Phase B Current", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - APH_C(new PointImpl(// - "S202_APH_C", // - "Amps PhaseC", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + APH_C(new ScaledValuePoint("S202_APH_C", "Amps PhaseC", // "Phase C Current", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - A_SF(new PointImpl(// - "S202_A_SF", // - "", // - "Current scale factor", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PH_V(new PointImpl(// - "S202_PH_V", // - "Voltage LN", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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)", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_A(new PointImpl(// - "S202_PH_VPH_A", // - "Phase Voltage AN", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_A(new ScaledValuePoint("S202_PH_VPH_A", "Phase Voltage AN", // "Phase Voltage AN", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_B(new PointImpl(// - "S202_PH_VPH_B", // - "Phase Voltage BN", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_B(new ScaledValuePoint("S202_PH_VPH_B", "Phase Voltage BN", // "Phase Voltage BN", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_C(new PointImpl(// - "S202_PH_VPH_C", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_C(new ScaledValuePoint("S202_PH_VPH_C", "Phase Voltage CN", // "Phase Voltage CN", // - "Phase Voltage CN", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PPV(new PointImpl(// - "S202_PPV", // - "Voltage LL", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PPV(new ScaledValuePoint("S202_PPV", "Voltage LL", // "Line to Line AC Voltage (average of active phases)", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_A_B(new PointImpl(// - "S202_PH_VPH_A_B", // - "Phase Voltage AB", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_A_B(new ScaledValuePoint("S202_PH_VPH_A_B", "Phase Voltage AB", // "Phase Voltage AB", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_B_C(new PointImpl(// - "S202_PH_VPH_B_C", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_B_C(new ScaledValuePoint("S202_PH_VPH_B_C", "Phase Voltage BC", // "Phase Voltage BC", // - "Phase Voltage BC", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_C_A(new PointImpl(// - "S202_PH_VPH_C_A", // - "Phase Voltage CA", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_C_A(new ScaledValuePoint("S202_PH_VPH_C_A", "Phase Voltage CA", // "Phase Voltage CA", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - V_SF(new PointImpl(// - "S202_V_SF", // - "", // - "Voltage scale factor", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - HZ(new PointImpl(// - "S202_HZ", // - "Hz", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + V_SF(new ScaleFactorPoint("S202_V_SF", "", // + "Voltage scale factor")), // + HZ(new ScaledValuePoint("S202_HZ", "Hz", // "Frequency", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.HERTZ, // - "Hz_SF", // - new OptionsEnum[0])), // - HZ_S_F(new PointImpl(// - "S202_HZ_S_F", // - "", // - "Frequency scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - W(new PointImpl(// - "S202_W", // - "Watts", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - WPH_A(new PointImpl(// - "S202_WPH_A", // - "Watts phase A", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - WPH_B(new PointImpl(// - "S202_WPH_B", // - "Watts phase B", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - WPH_C(new PointImpl(// - "S202_WPH_C", // - "Watts phase C", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - W_SF(new PointImpl(// - "S202_W_SF", // - "", // - "Real Power scale factor", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VA(new PointImpl(// - "S202_VA", // - "VA", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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")), // + WPH_B(new ScaledValuePoint("S202_WPH_B", "Watts phase B", "", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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")), // + W_SF(new ScaleFactorPoint("S202_W_SF", "", // + "Real Power scale factor")), // + VA(new ScaledValuePoint("S202_VA", "VA", // "AC Apparent Power", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - V_APH_A(new PointImpl(// - "S202_V_APH_A", // - "VA phase A", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - V_APH_B(new PointImpl(// - "S202_V_APH_B", // - "VA phase B", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - V_APH_C(new PointImpl(// - "S202_V_APH_C", // - "VA phase C", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - VA_SF(new PointImpl(// - "S202_VA_SF", // - "", // - "Apparent Power scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VAR(new PointImpl(// - "S202_VAR", // - "VAR", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + VA_SF(new ScaleFactorPoint("S202_VA_SF", "", // + "Apparent Power scale factor")), // + VAR(new ScaledValuePoint("S202_VAR", "VAR", // "Reactive Power", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VAR_SF", // - new OptionsEnum[0])), // - V_A_RPH_A(new PointImpl(// - "S202_V_A_RPH_A", // - "VAR phase A", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VAR_SF", // - new OptionsEnum[0])), // - V_A_RPH_B(new PointImpl(// - "S202_V_A_RPH_B", // - "VAR phase B", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VAR_SF", // - new OptionsEnum[0])), // - V_A_RPH_C(new PointImpl(// - "S202_V_A_RPH_C", // - "VAR phase C", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VAR_SF", // - new OptionsEnum[0])), // - VAR_SF(new PointImpl(// - "S202_VAR_SF", // - "", // - "Reactive Power scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PF(new PointImpl(// - "S202_PF", // - "PF", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + VAR_SF(new ScaleFactorPoint("S202_VAR_SF", "", // + "Reactive Power scale factor")), // + PF(new ScaledValuePoint("S202_PF", "PF", // "Power Factor", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - P_FPH_A(new PointImpl(// - "S202_P_FPH_A", // - "PF phase A", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - P_FPH_B(new PointImpl(// - "S202_P_FPH_B", // - "PF phase B", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - P_FPH_C(new PointImpl(// - "S202_P_FPH_C", // - "PF phase C", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - PF_SF(new PointImpl(// - "S202_PF_SF", // - "", // - "Power Factor scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TOT_WH_EXP(new PointImpl(// - "S202_TOT_WH_EXP", // - "Total Watt-hours Exported", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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")), // + P_FPH_B(new ScaledValuePoint("S202_P_FPH_B", "PF phase B", "", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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")), // + 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", // - "", // - PointType.ACC32, // - true, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_EXP_PH_A(new PointImpl(// - "S202_TOT_WH_EXP_PH_A", // - "Total Watt-hours Exported phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_EXP_PH_B(new PointImpl(// - "S202_TOT_WH_EXP_PH_B", // - "Total Watt-hours Exported phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_EXP_PH_C(new PointImpl(// - "S202_TOT_WH_EXP_PH_C", // - "Total Watt-hours Exported phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_IMP(new PointImpl(// - "S202_TOT_WH_IMP", // - "Total Watt-hours Imported", // + ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + TOT_WH_IMP(new ScaledValuePoint("S202_TOT_WH_IMP", "Total Watt-hours Imported", // "Total Real Energy Imported", // - "", // - PointType.ACC32, // - true, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_IMP_PH_A(new PointImpl(// - "S202_TOT_WH_IMP_PH_A", // - "Total Watt-hours Imported phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_IMP_PH_B(new PointImpl(// - "S202_TOT_WH_IMP_PH_B", // - "Total Watt-hours Imported phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_IMP_PH_C(new PointImpl(// - "S202_TOT_WH_IMP_PH_C", // - "Total Watt-hours Imported phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_S_F(new PointImpl(// - "S202_TOT_WH_S_F", // - "", // - "Real Energy scale factor", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TOT_V_AH_EXP(new PointImpl(// - "S202_TOT_V_AH_EXP", // - "Total VA-hours Exported", // + ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + 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", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_EXP_PH_A(new PointImpl(// - "S202_TOT_V_AH_EXP_PH_A", // - "Total VA-hours Exported phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_EXP_PH_B(new PointImpl(// - "S202_TOT_V_AH_EXP_PH_B", // - "Total VA-hours Exported phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_EXP_PH_C(new PointImpl(// - "S202_TOT_V_AH_EXP_PH_C", // - "Total VA-hours Exported phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_IMP(new PointImpl(// - "S202_TOT_V_AH_IMP", // - "Total VA-hours Imported", // + ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + TOT_V_AH_IMP(new ScaledValuePoint("S202_TOT_V_AH_IMP", "Total VA-hours Imported", // "Total Apparent Energy Imported", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_IMP_PH_A(new PointImpl(// - "S202_TOT_V_AH_IMP_PH_A", // - "Total VA-hours Imported phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_IMP_PH_B(new PointImpl(// - "S202_TOT_V_AH_IMP_PH_B", // - "Total VA-hours Imported phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_IMP_PH_C(new PointImpl(// - "S202_TOT_V_AH_IMP_PH_C", // - "Total VA-hours Imported phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_S_F(new PointImpl(// - "S202_TOT_V_AH_S_F", // - "", // - "Apparent Energy scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q1(new PointImpl(// - "S202_TOT_V_ARH_IMP_Q1", // - "Total VAR-hours Imported Q1", // + ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + 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", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q1_PH_A(new PointImpl(// - "S202_TOT_V_ARH_IMP_Q1_PH_A", // - "Total VAr-hours Imported Q1 phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q1_PH_B(new PointImpl(// - "S202_TOT_V_ARH_IMP_Q1_PH_B", // - "Total VAr-hours Imported Q1 phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q1_PH_C(new PointImpl(// - "S202_TOT_V_ARH_IMP_Q1_PH_C", // - "Total VAr-hours Imported Q1 phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q2(new PointImpl(// - "S202_TOT_V_ARH_IMP_Q2", // - "Total VAr-hours Imported Q2", // + 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")), // + TOT_V_ARH_IMP_Q2(new ScaledValuePoint("S202_TOT_V_ARH_IMP_Q2", "Total VAr-hours Imported Q2", // "Total Reactive Power Imported Quadrant 2", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q2_PH_A(new PointImpl(// - "S202_TOT_V_ARH_IMP_Q2_PH_A", // - "Total VAr-hours Imported Q2 phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q2_PH_B(new PointImpl(// - "S202_TOT_V_ARH_IMP_Q2_PH_B", // - "Total VAr-hours Imported Q2 phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q2_PH_C(new PointImpl(// - "S202_TOT_V_ARH_IMP_Q2_PH_C", // - "Total VAr-hours Imported Q2 phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q3(new PointImpl(// - "S202_TOT_V_ARH_EXP_Q3", // - "Total VAr-hours Exported Q3", // + 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")), // + TOT_V_ARH_EXP_Q3(new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q3", "Total VAr-hours Exported Q3", // "Total Reactive Power Exported Quadrant 3", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q3_PH_A(new PointImpl(// - "S202_TOT_V_ARH_EXP_Q3_PH_A", // - "Total VAr-hours Exported Q3 phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q3_PH_B(new PointImpl(// - "S202_TOT_V_ARH_EXP_Q3_PH_B", // - "Total VAr-hours Exported Q3 phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q3_PH_C(new PointImpl(// - "S202_TOT_V_ARH_EXP_Q3_PH_C", // - "Total VAr-hours Exported Q3 phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q4(new PointImpl(// - "S202_TOT_V_ARH_EXP_Q4", // - "Total VAr-hours Exported Q4", // + 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")), // + TOT_V_ARH_EXP_Q4(new ScaledValuePoint("S202_TOT_V_ARH_EXP_Q4", "Total VAr-hours Exported Q4", // "Total Reactive Power Exported Quadrant 4", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q4_PH_A(new PointImpl(// - "S202_TOT_V_ARH_EXP_Q4_PH_A", // - "Total VAr-hours Exported Q4 Imported phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q4_PH_B(new PointImpl(// - "S202_TOT_V_ARH_EXP_Q4_PH_B", // - "Total VAr-hours Exported Q4 Imported phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q4_PH_C(new PointImpl(// - "S202_TOT_V_ARH_EXP_Q4_PH_C", // - "Total VAr-hours Exported Q4 Imported phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_S_F(new PointImpl(// - "S202_TOT_V_ARH_S_F", // - "", // - "Reactive Energy scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT(new PointImpl(// - "S202_EVT", // - "Events", // + 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")), // + 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", // - "", // - PointType.BITFIELD32, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S202_Evt.values())); // + BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S202_Evt.values())); - protected final PointImpl impl; + private final Point point; - private S202(PointImpl impl) { - this.impl = impl; + private S202(Point point) { + this.point = point; } @Override - public PointImpl get() { - return this.impl; + public Point get() { + return this.point; } } - public static enum S202_Evt implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - POWER_FAILURE(2, "POWER_FAILURE"), // - UNDER_VOLTAGE(3, "UNDER_VOLTAGE"), // - LOW_P_F(4, "LOW_P_F"), // - OVER_CURRENT(5, "OVER_CURRENT"), // - OVER_VOLTAGE(6, "OVER_VOLTAGE"), // - MISSING_SENSOR(7, "MISSING_SENSOR"), // - RESERVED1(8, "RESERVED1"), // - RESERVED2(9, "RESERVED2"), // - RESERVED3(10, "RESERVED3"), // - RESERVED4(11, "RESERVED4"), // - RESERVED5(12, "RESERVED5"), // - RESERVED6(13, "RESERVED6"), // - RESERVED7(14, "RESERVED7"), // - RESERVED8(15, "RESERVED8"), // - OEM01(16, "OEM01"), // - OEM02(17, "OEM02"), // - OEM03(18, "OEM03"), // - OEM04(19, "OEM04"), // - OEM05(20, "OEM05"), // - OEM06(21, "OEM06"), // - OEM07(22, "OEM07"), // - OEM08(23, "OEM08"), // - OEM09(24, "OEM09"), // - OEM10(25, "OEM10"), // - OEM11(26, "OEM11"), // - OEM12(27, "OEM12"), // - OEM13(28, "OEM13"), // - OEM14(29, "OEM14"), // - OEM15(30, "OEM15"); // + public static enum S202_Evt implements SunSpecBitPoint { + POWER_FAILURE(new BitPoint(2, "S202_EVT_POWER_FAILURE", "Power_Failure")), // + UNDER_VOLTAGE(new BitPoint(3, "S202_EVT_UNDER_VOLTAGE", "Under_Voltage")), // + LOW_P_F(new BitPoint(4, "S202_EVT_LOW_P_F", "Low_PF")), // + OVER_CURRENT(new BitPoint(5, "S202_EVT_OVER_CURRENT", "Over_Current")), // + OVER_VOLTAGE(new BitPoint(6, "S202_EVT_OVER_VOLTAGE", "Over_Voltage")), // + MISSING_SENSOR(new BitPoint(7, "S202_EVT_MISSING_SENSOR", "Missing_Sensor")), // + RESERVED1(new BitPoint(8, "S202_EVT_RESERVED1", "Reserved1")), // + RESERVED2(new BitPoint(9, "S202_EVT_RESERVED2", "Reserved2")), // + RESERVED3(new BitPoint(10, "S202_EVT_RESERVED3", "Reserved3")), // + RESERVED4(new BitPoint(11, "S202_EVT_RESERVED4", "Reserved4")), // + RESERVED5(new BitPoint(12, "S202_EVT_RESERVED5", "Reserved5")), // + RESERVED6(new BitPoint(13, "S202_EVT_RESERVED6", "Reserved6")), // + RESERVED7(new BitPoint(14, "S202_EVT_RESERVED7", "Reserved7")), // + RESERVED8(new BitPoint(15, "S202_EVT_RESERVED8", "Reserved8")), // + OEM01(new BitPoint(16, "S202_EVT_OEM01", "OEM01")), // + OEM02(new BitPoint(17, "S202_EVT_OEM02", "OEM02")), // + OEM03(new BitPoint(18, "S202_EVT_OEM03", "OEM03")), // + OEM04(new BitPoint(19, "S202_EVT_OEM04", "OEM04")), // + OEM05(new BitPoint(20, "S202_EVT_OEM05", "OEM05")), // + OEM06(new BitPoint(21, "S202_EVT_OEM06", "OEM06")), // + OEM07(new BitPoint(22, "S202_EVT_OEM07", "OEM07")), // + OEM08(new BitPoint(23, "S202_EVT_OEM08", "OEM08")), // + OEM09(new BitPoint(24, "S202_EVT_OEM09", "OEM09")), // + OEM10(new BitPoint(25, "S202_EVT_OEM10", "OEM10")), // + OEM11(new BitPoint(26, "S202_EVT_OEM11", "OEM11")), // + OEM12(new BitPoint(27, "S202_EVT_OEM12", "OEM12")), // + OEM13(new BitPoint(28, "S202_EVT_OEM13", "OEM13")), // + OEM14(new BitPoint(29, "S202_EVT_OEM14", "OEM14")), // + OEM15(new BitPoint(30, "S202_EVT_OEM15", "OEM15")); - private final int value; - private final String name; + private final BitPoint point; - private S202_Evt(int value, String name) { - this.value = value; - this.name = name; + private S202_Evt(BitPoint point) { + this.point = point; } @Override - public int getValue() { - return this.value; - } - - @Override - public String getName() { - return this.name; - } - - @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } public static enum S203 implements SunSpecPoint { - A(new PointImpl(// - "S203_A", // - "Amps", // + A(new ScaledValuePoint("S203_A", "Amps", // "Total AC Current", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - APH_A(new PointImpl(// - "S203_APH_A", // - "Amps PhaseA", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + APH_A(new ScaledValuePoint("S203_APH_A", "Amps PhaseA", // "Phase A Current", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - APH_B(new PointImpl(// - "S203_APH_B", // - "Amps PhaseB", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + APH_B(new ScaledValuePoint("S203_APH_B", "Amps PhaseB", // "Phase B Current", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - APH_C(new PointImpl(// - "S203_APH_C", // - "Amps PhaseC", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + APH_C(new ScaledValuePoint("S203_APH_C", "Amps PhaseC", // "Phase C Current", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - A_SF(new PointImpl(// - "S203_A_SF", // - "", // - "Current scale factor", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PH_V(new PointImpl(// - "S203_PH_V", // - "Voltage LN", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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)", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_A(new PointImpl(// - "S203_PH_VPH_A", // - "Phase Voltage AN", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_A(new ScaledValuePoint("S203_PH_VPH_A", "Phase Voltage AN", // "Phase Voltage AN", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_B(new PointImpl(// - "S203_PH_VPH_B", // - "Phase Voltage BN", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_B(new ScaledValuePoint("S203_PH_VPH_B", "Phase Voltage BN", // "Phase Voltage BN", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_C(new PointImpl(// - "S203_PH_VPH_C", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_C(new ScaledValuePoint("S203_PH_VPH_C", "Phase Voltage CN", // "Phase Voltage CN", // - "Phase Voltage CN", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PPV(new PointImpl(// - "S203_PPV", // - "Voltage LL", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PPV(new ScaledValuePoint("S203_PPV", "Voltage LL", // "Line to Line AC Voltage (average of active phases)", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_A_B(new PointImpl(// - "S203_PH_VPH_A_B", // - "Phase Voltage AB", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_A_B(new ScaledValuePoint("S203_PH_VPH_A_B", "Phase Voltage AB", // "Phase Voltage AB", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_B_C(new PointImpl(// - "S203_PH_VPH_B_C", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_B_C(new ScaledValuePoint("S203_PH_VPH_B_C", "Phase Voltage BC", // "Phase Voltage BC", // - "Phase Voltage BC", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_C_A(new PointImpl(// - "S203_PH_VPH_C_A", // - "Phase Voltage CA", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_C_A(new ScaledValuePoint("S203_PH_VPH_C_A", "Phase Voltage CA", // "Phase Voltage CA", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - V_SF(new PointImpl(// - "S203_V_SF", // - "", // - "Voltage scale factor", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - HZ(new PointImpl(// - "S203_HZ", // - "Hz", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + V_SF(new ScaleFactorPoint("S203_V_SF", "", // + "Voltage scale factor")), // + HZ(new ScaledValuePoint("S203_HZ", "Hz", // "Frequency", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.HERTZ, // - "Hz_SF", // - new OptionsEnum[0])), // - HZ_S_F(new PointImpl(// - "S203_HZ_S_F", // - "", // - "Frequency scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - W(new PointImpl(// - "S203_W", // - "Watts", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - WPH_A(new PointImpl(// - "S203_WPH_A", // - "Watts phase A", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - WPH_B(new PointImpl(// - "S203_WPH_B", // - "Watts phase B", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - WPH_C(new PointImpl(// - "S203_WPH_C", // - "Watts phase C", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - W_SF(new PointImpl(// - "S203_W_SF", // - "", // - "Real Power scale factor", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VA(new PointImpl(// - "S203_VA", // - "VA", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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")), // + WPH_B(new ScaledValuePoint("S203_WPH_B", "Watts phase B", "", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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")), // + W_SF(new ScaleFactorPoint("S203_W_SF", "", // + "Real Power scale factor")), // + VA(new ScaledValuePoint("S203_VA", "VA", // "AC Apparent Power", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - V_APH_A(new PointImpl(// - "S203_V_APH_A", // - "VA phase A", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - V_APH_B(new PointImpl(// - "S203_V_APH_B", // - "VA phase B", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - V_APH_C(new PointImpl(// - "S203_V_APH_C", // - "VA phase C", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - VA_SF(new PointImpl(// - "S203_VA_SF", // - "", // - "Apparent Power scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VAR(new PointImpl(// - "S203_VAR", // - "VAR", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + VA_SF(new ScaleFactorPoint("S203_VA_SF", "", // + "Apparent Power scale factor")), // + VAR(new ScaledValuePoint("S203_VAR", "VAR", // "Reactive Power", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VAR_SF", // - new OptionsEnum[0])), // - V_A_RPH_A(new PointImpl(// - "S203_V_A_RPH_A", // - "VAR phase A", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VAR_SF", // - new OptionsEnum[0])), // - V_A_RPH_B(new PointImpl(// - "S203_V_A_RPH_B", // - "VAR phase B", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VAR_SF", // - new OptionsEnum[0])), // - V_A_RPH_C(new PointImpl(// - "S203_V_A_RPH_C", // - "VAR phase C", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VAR_SF", // - new OptionsEnum[0])), // - VAR_SF(new PointImpl(// - "S203_VAR_SF", // - "", // - "Reactive Power scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PF(new PointImpl(// - "S203_PF", // - "PF", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + VAR_SF(new ScaleFactorPoint("S203_VAR_SF", "", // + "Reactive Power scale factor")), // + PF(new ScaledValuePoint("S203_PF", "PF", // "Power Factor", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - P_FPH_A(new PointImpl(// - "S203_P_FPH_A", // - "PF phase A", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - P_FPH_B(new PointImpl(// - "S203_P_FPH_B", // - "PF phase B", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - P_FPH_C(new PointImpl(// - "S203_P_FPH_C", // - "PF phase C", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - PF_SF(new PointImpl(// - "S203_PF_SF", // - "", // - "Power Factor scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TOT_WH_EXP(new PointImpl(// - "S203_TOT_WH_EXP", // - "Total Watt-hours Exported", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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")), // + P_FPH_B(new ScaledValuePoint("S203_P_FPH_B", "PF phase B", "", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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")), // + 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", // - "", // - PointType.ACC32, // - true, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_EXP_PH_A(new PointImpl(// - "S203_TOT_WH_EXP_PH_A", // - "Total Watt-hours Exported phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_EXP_PH_B(new PointImpl(// - "S203_TOT_WH_EXP_PH_B", // - "Total Watt-hours Exported phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_EXP_PH_C(new PointImpl(// - "S203_TOT_WH_EXP_PH_C", // - "Total Watt-hours Exported phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_IMP(new PointImpl(// - "S203_TOT_WH_IMP", // - "Total Watt-hours Imported", // + ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + TOT_WH_IMP(new ScaledValuePoint("S203_TOT_WH_IMP", "Total Watt-hours Imported", // "Total Real Energy Imported", // - "", // - PointType.ACC32, // - true, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_IMP_PH_A(new PointImpl(// - "S203_TOT_WH_IMP_PH_A", // - "Total Watt-hours Imported phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_IMP_PH_B(new PointImpl(// - "S203_TOT_WH_IMP_PH_B", // - "Total Watt-hours Imported phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_IMP_PH_C(new PointImpl(// - "S203_TOT_WH_IMP_PH_C", // - "Total Watt-hours Imported phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_S_F(new PointImpl(// - "S203_TOT_WH_S_F", // - "", // - "Real Energy scale factor", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TOT_V_AH_EXP(new PointImpl(// - "S203_TOT_V_AH_EXP", // - "Total VA-hours Exported", // + ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + 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", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_EXP_PH_A(new PointImpl(// - "S203_TOT_V_AH_EXP_PH_A", // - "Total VA-hours Exported phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_EXP_PH_B(new PointImpl(// - "S203_TOT_V_AH_EXP_PH_B", // - "Total VA-hours Exported phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_EXP_PH_C(new PointImpl(// - "S203_TOT_V_AH_EXP_PH_C", // - "Total VA-hours Exported phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_IMP(new PointImpl(// - "S203_TOT_V_AH_IMP", // - "Total VA-hours Imported", // + ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + TOT_V_AH_IMP(new ScaledValuePoint("S203_TOT_V_AH_IMP", "Total VA-hours Imported", // "Total Apparent Energy Imported", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_IMP_PH_A(new PointImpl(// - "S203_TOT_V_AH_IMP_PH_A", // - "Total VA-hours Imported phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_IMP_PH_B(new PointImpl(// - "S203_TOT_V_AH_IMP_PH_B", // - "Total VA-hours Imported phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_IMP_PH_C(new PointImpl(// - "S203_TOT_V_AH_IMP_PH_C", // - "Total VA-hours Imported phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_S_F(new PointImpl(// - "S203_TOT_V_AH_S_F", // - "", // - "Apparent Energy scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q1(new PointImpl(// - "S203_TOT_V_ARH_IMP_Q1", // - "Total VAR-hours Imported Q1", // + ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + 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", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q1_PH_A(new PointImpl(// - "S203_TOT_V_ARH_IMP_Q1_PH_A", // - "Total VAr-hours Imported Q1 phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q1_PH_B(new PointImpl(// - "S203_TOT_V_ARH_IMP_Q1_PH_B", // - "Total VAr-hours Imported Q1 phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q1_PH_C(new PointImpl(// - "S203_TOT_V_ARH_IMP_Q1_PH_C", // - "Total VAr-hours Imported Q1 phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q2(new PointImpl(// - "S203_TOT_V_ARH_IMP_Q2", // - "Total VAr-hours Imported Q2", // + 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")), // + TOT_V_ARH_IMP_Q2(new ScaledValuePoint("S203_TOT_V_ARH_IMP_Q2", "Total VAr-hours Imported Q2", // "Total Reactive Power Imported Quadrant 2", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q2_PH_A(new PointImpl(// - "S203_TOT_V_ARH_IMP_Q2_PH_A", // - "Total VAr-hours Imported Q2 phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q2_PH_B(new PointImpl(// - "S203_TOT_V_ARH_IMP_Q2_PH_B", // - "Total VAr-hours Imported Q2 phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q2_PH_C(new PointImpl(// - "S203_TOT_V_ARH_IMP_Q2_PH_C", // - "Total VAr-hours Imported Q2 phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q3(new PointImpl(// - "S203_TOT_V_ARH_EXP_Q3", // - "Total VAr-hours Exported Q3", // + 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")), // + TOT_V_ARH_EXP_Q3(new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q3", "Total VAr-hours Exported Q3", // "Total Reactive Power Exported Quadrant 3", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q3_PH_A(new PointImpl(// - "S203_TOT_V_ARH_EXP_Q3_PH_A", // - "Total VAr-hours Exported Q3 phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q3_PH_B(new PointImpl(// - "S203_TOT_V_ARH_EXP_Q3_PH_B", // - "Total VAr-hours Exported Q3 phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q3_PH_C(new PointImpl(// - "S203_TOT_V_ARH_EXP_Q3_PH_C", // - "Total VAr-hours Exported Q3 phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q4(new PointImpl(// - "S203_TOT_V_ARH_EXP_Q4", // - "Total VAr-hours Exported Q4", // + 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")), // + TOT_V_ARH_EXP_Q4(new ScaledValuePoint("S203_TOT_V_ARH_EXP_Q4", "Total VAr-hours Exported Q4", // "Total Reactive Power Exported Quadrant 4", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q4_PH_A(new PointImpl(// - "S203_TOT_V_ARH_EXP_Q4_PH_A", // - "Total VAr-hours Exported Q4 Imported phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q4_PH_B(new PointImpl(// - "S203_TOT_V_ARH_EXP_Q4_PH_B", // - "Total VAr-hours Exported Q4 Imported phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q4_PH_C(new PointImpl(// - "S203_TOT_V_ARH_EXP_Q4_PH_C", // - "Total VAr-hours Exported Q4 Imported phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_S_F(new PointImpl(// - "S203_TOT_V_ARH_S_F", // - "", // - "Reactive Energy scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT(new PointImpl(// - "S203_EVT", // - "Events", // + 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")), // + 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", // - "", // - PointType.BITFIELD32, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S203_Evt.values())); // + BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S203_Evt.values())); - protected final PointImpl impl; + private final Point point; - private S203(PointImpl impl) { - this.impl = impl; + private S203(Point point) { + this.point = point; } @Override - public PointImpl get() { - return this.impl; + public Point get() { + return this.point; } } - public static enum S203_Evt implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - POWER_FAILURE(2, "POWER_FAILURE"), // - UNDER_VOLTAGE(3, "UNDER_VOLTAGE"), // - LOW_P_F(4, "LOW_P_F"), // - OVER_CURRENT(5, "OVER_CURRENT"), // - OVER_VOLTAGE(6, "OVER_VOLTAGE"), // - MISSING_SENSOR(7, "MISSING_SENSOR"), // - RESERVED1(8, "RESERVED1"), // - RESERVED2(9, "RESERVED2"), // - RESERVED3(10, "RESERVED3"), // - RESERVED4(11, "RESERVED4"), // - RESERVED5(12, "RESERVED5"), // - RESERVED6(13, "RESERVED6"), // - RESERVED7(14, "RESERVED7"), // - RESERVED8(15, "RESERVED8"), // - OEM01(16, "OEM01"), // - OEM02(17, "OEM02"), // - OEM03(18, "OEM03"), // - OEM04(19, "OEM04"), // - OEM05(20, "OEM05"), // - OEM06(21, "OEM06"), // - OEM07(22, "OEM07"), // - OEM08(23, "OEM08"), // - OEM09(24, "OEM09"), // - OEM10(25, "OEM10"), // - OEM11(26, "OEM11"), // - OEM12(27, "OEM12"), // - OEM13(28, "OEM13"), // - OEM14(29, "OEM14"), // - OEM15(30, "OEM15"); // - - private final int value; - private final String name; + public static enum S203_Evt implements SunSpecBitPoint { + POWER_FAILURE(new BitPoint(2, "S203_EVT_POWER_FAILURE", "Power_Failure")), // + UNDER_VOLTAGE(new BitPoint(3, "S203_EVT_UNDER_VOLTAGE", "Under_Voltage")), // + LOW_P_F(new BitPoint(4, "S203_EVT_LOW_P_F", "Low_PF")), // + OVER_CURRENT(new BitPoint(5, "S203_EVT_OVER_CURRENT", "Over_Current")), // + OVER_VOLTAGE(new BitPoint(6, "S203_EVT_OVER_VOLTAGE", "Over_Voltage")), // + MISSING_SENSOR(new BitPoint(7, "S203_EVT_MISSING_SENSOR", "Missing_Sensor")), // + RESERVED1(new BitPoint(8, "S203_EVT_RESERVED1", "Reserved1")), // + RESERVED2(new BitPoint(9, "S203_EVT_RESERVED2", "Reserved2")), // + RESERVED3(new BitPoint(10, "S203_EVT_RESERVED3", "Reserved3")), // + RESERVED4(new BitPoint(11, "S203_EVT_RESERVED4", "Reserved4")), // + RESERVED5(new BitPoint(12, "S203_EVT_RESERVED5", "Reserved5")), // + RESERVED6(new BitPoint(13, "S203_EVT_RESERVED6", "Reserved6")), // + RESERVED7(new BitPoint(14, "S203_EVT_RESERVED7", "Reserved7")), // + RESERVED8(new BitPoint(15, "S203_EVT_RESERVED8", "Reserved8")), // + OEM01(new BitPoint(16, "S203_EVT_OEM01", "OEM01")), // + OEM02(new BitPoint(17, "S203_EVT_OEM02", "OEM02")), // + OEM03(new BitPoint(18, "S203_EVT_OEM03", "OEM03")), // + OEM04(new BitPoint(19, "S203_EVT_OEM04", "OEM04")), // + OEM05(new BitPoint(20, "S203_EVT_OEM05", "OEM05")), // + OEM06(new BitPoint(21, "S203_EVT_OEM06", "OEM06")), // + OEM07(new BitPoint(22, "S203_EVT_OEM07", "OEM07")), // + OEM08(new BitPoint(23, "S203_EVT_OEM08", "OEM08")), // + OEM09(new BitPoint(24, "S203_EVT_OEM09", "OEM09")), // + OEM10(new BitPoint(25, "S203_EVT_OEM10", "OEM10")), // + OEM11(new BitPoint(26, "S203_EVT_OEM11", "OEM11")), // + OEM12(new BitPoint(27, "S203_EVT_OEM12", "OEM12")), // + OEM13(new BitPoint(28, "S203_EVT_OEM13", "OEM13")), // + OEM14(new BitPoint(29, "S203_EVT_OEM14", "OEM14")), // + OEM15(new BitPoint(30, "S203_EVT_OEM15", "OEM15")); - private S203_Evt(int value, String name) { - this.value = value; - this.name = name; - } - - @Override - public int getValue() { - return this.value; - } + private final BitPoint point; - @Override - public String getName() { - return this.name; + private S203_Evt(BitPoint point) { + this.point = point; } @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } public static enum S204 implements SunSpecPoint { - A(new PointImpl(// - "S204_A", // - "Amps", // + A(new ScaledValuePoint("S204_A", "Amps", // "Total AC Current", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - APH_A(new PointImpl(// - "S204_APH_A", // - "Amps PhaseA", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + APH_A(new ScaledValuePoint("S204_APH_A", "Amps PhaseA", // "Phase A Current", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - APH_B(new PointImpl(// - "S204_APH_B", // - "Amps PhaseB", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + APH_B(new ScaledValuePoint("S204_APH_B", "Amps PhaseB", // "Phase B Current", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - APH_C(new PointImpl(// - "S204_APH_C", // - "Amps PhaseC", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + APH_C(new ScaledValuePoint("S204_APH_C", "Amps PhaseC", // "Phase C Current", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - A_SF(new PointImpl(// - "S204_A_SF", // - "", // - "Current scale factor", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PH_V(new PointImpl(// - "S204_PH_V", // - "Voltage LN", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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)", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_A(new PointImpl(// - "S204_PH_VPH_A", // - "Phase Voltage AN", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_A(new ScaledValuePoint("S204_PH_VPH_A", "Phase Voltage AN", // "Phase Voltage AN", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_B(new PointImpl(// - "S204_PH_VPH_B", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_B(new ScaledValuePoint("S204_PH_VPH_B", "Phase Voltage BN", // "Phase Voltage BN", // - "Phase Voltage BN", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_C(new PointImpl(// - "S204_PH_VPH_C", // - "Phase Voltage CN", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_C(new ScaledValuePoint("S204_PH_VPH_C", "Phase Voltage CN", // "Phase Voltage CN", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PPV(new PointImpl(// - "S204_PPV", // - "Voltage LL", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PPV(new ScaledValuePoint("S204_PPV", "Voltage LL", // "Line to Line AC Voltage (average of active phases)", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_A_B(new PointImpl(// - "S204_PH_VPH_A_B", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_A_B(new ScaledValuePoint("S204_PH_VPH_A_B", "Phase Voltage AB", // "Phase Voltage AB", // - "Phase Voltage AB", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_B_C(new PointImpl(// - "S204_PH_VPH_B_C", // - "Phase Voltage BC", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_B_C(new ScaledValuePoint("S204_PH_VPH_B_C", "Phase Voltage BC", // "Phase Voltage BC", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - PH_VPH_C_A(new PointImpl(// - "S204_PH_VPH_C_A", // - "Phase Voltage CA", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + PH_VPH_C_A(new ScaledValuePoint("S204_PH_VPH_C_A", "Phase Voltage CA", // "Phase Voltage CA", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - V_SF(new PointImpl(// - "S204_V_SF", // - "", // - "Voltage scale factor", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - HZ(new PointImpl(// - "S204_HZ", // - "Hz", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + V_SF(new ScaleFactorPoint("S204_V_SF", "", // + "Voltage scale factor")), // + HZ(new ScaledValuePoint("S204_HZ", "Hz", // "Frequency", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.HERTZ, // - "Hz_SF", // - new OptionsEnum[0])), // - HZ_S_F(new PointImpl(// - "S204_HZ_S_F", // - "", // - "Frequency scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - W(new PointImpl(// - "S204_W", // - "Watts", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - WPH_A(new PointImpl(// - "S204_WPH_A", // - "Watts phase A", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - WPH_B(new PointImpl(// - "S204_WPH_B", // - "Watts phase B", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - WPH_C(new PointImpl(// - "S204_WPH_C", // - "Watts phase C", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - W_SF(new PointImpl(// - "S204_W_SF", // - "", // - "Real Power scale factor", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VA(new PointImpl(// - "S204_VA", // - "VA", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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")), // + WPH_B(new ScaledValuePoint("S204_WPH_B", "Watts phase B", "", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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")), // + W_SF(new ScaleFactorPoint("S204_W_SF", "", // + "Real Power scale factor")), // + VA(new ScaledValuePoint("S204_VA", "VA", // "AC Apparent Power", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - V_APH_A(new PointImpl(// - "S204_V_APH_A", // - "VA phase A", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - V_APH_B(new PointImpl(// - "S204_V_APH_B", // - "VA phase B", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - V_APH_C(new PointImpl(// - "S204_V_APH_C", // - "VA phase C", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - VA_SF(new PointImpl(// - "S204_VA_SF", // - "", // - "Apparent Power scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VAR(new PointImpl(// - "S204_VAR", // - "VAR", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + VA_SF(new ScaleFactorPoint("S204_VA_SF", "", // + "Apparent Power scale factor")), // + VAR(new ScaledValuePoint("S204_VAR", "VAR", // "Reactive Power", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VAR_SF", // - new OptionsEnum[0])), // - V_A_RPH_A(new PointImpl(// - "S204_V_A_RPH_A", // - "VAR phase A", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VAR_SF", // - new OptionsEnum[0])), // - V_A_RPH_B(new PointImpl(// - "S204_V_A_RPH_B", // - "VAR phase B", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VAR_SF", // - new OptionsEnum[0])), // - V_A_RPH_C(new PointImpl(// - "S204_V_A_RPH_C", // - "VAR phase C", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "VAR_SF", // - new OptionsEnum[0])), // - VAR_SF(new PointImpl(// - "S204_VAR_SF", // - "", // - "Reactive Power scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PF(new PointImpl(// - "S204_PF", // - "PF", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + VAR_SF(new ScaleFactorPoint("S204_VAR_SF", "", // + "Reactive Power scale factor")), // + PF(new ScaledValuePoint("S204_PF", "PF", // "Power Factor", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - P_FPH_A(new PointImpl(// - "S204_P_FPH_A", // - "PF phase A", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - P_FPH_B(new PointImpl(// - "S204_P_FPH_B", // - "PF phase B", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - P_FPH_C(new PointImpl(// - "S204_P_FPH_C", // - "PF phase C", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - PF_SF(new PointImpl(// - "S204_PF_SF", // - "", // - "Power Factor scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TOT_WH_EXP(new PointImpl(// - "S204_TOT_WH_EXP", // - "Total Watt-hours Exported", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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")), // + P_FPH_B(new ScaledValuePoint("S204_P_FPH_B", "PF phase B", "", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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")), // + 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", // - "", // - PointType.ACC32, // - true, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_EXP_PH_A(new PointImpl(// - "S204_TOT_WH_EXP_PH_A", // - "Total Watt-hours Exported phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_EXP_PH_B(new PointImpl(// - "S204_TOT_WH_EXP_PH_B", // - "Total Watt-hours Exported phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_EXP_PH_C(new PointImpl(// - "S204_TOT_WH_EXP_PH_C", // - "Total Watt-hours Exported phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_IMP(new PointImpl(// - "S204_TOT_WH_IMP", // - "Total Watt-hours Imported", // + ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + TOT_WH_IMP(new ScaledValuePoint("S204_TOT_WH_IMP", "Total Watt-hours Imported", // "Total Real Energy Imported", // - "", // - PointType.ACC32, // - true, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_IMP_PH_A(new PointImpl(// - "S204_TOT_WH_IMP_PH_A", // - "Total Watt-hours Imported phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_IMP_PH_B(new PointImpl(// - "S204_TOT_WH_IMP_PH_B", // - "Total Watt-hours Imported phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_IMP_PH_C(new PointImpl(// - "S204_TOT_WH_IMP_PH_C", // - "Total Watt-hours Imported phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_S_F(new PointImpl(// - "S204_TOT_WH_S_F", // - "", // - "Real Energy scale factor", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TOT_V_AH_EXP(new PointImpl(// - "S204_TOT_V_AH_EXP", // - "Total VA-hours Exported", // + ValuePoint.Type.ACC32, true /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + 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", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_EXP_PH_A(new PointImpl(// - "S204_TOT_V_AH_EXP_PH_A", // - "Total VA-hours Exported phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_EXP_PH_B(new PointImpl(// - "S204_TOT_V_AH_EXP_PH_B", // - "Total VA-hours Exported phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_EXP_PH_C(new PointImpl(// - "S204_TOT_V_AH_EXP_PH_C", // - "Total VA-hours Exported phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_IMP(new PointImpl(// - "S204_TOT_V_AH_IMP", // - "Total VA-hours Imported", // + ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + TOT_V_AH_IMP(new ScaledValuePoint("S204_TOT_V_AH_IMP", "Total VA-hours Imported", // "Total Apparent Energy Imported", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_IMP_PH_A(new PointImpl(// - "S204_TOT_V_AH_IMP_PH_A", // - "Total VA-hours Imported phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_IMP_PH_B(new PointImpl(// - "S204_TOT_V_AH_IMP_PH_B", // - "Total VA-hours Imported phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_IMP_PH_C(new PointImpl(// - "S204_TOT_V_AH_IMP_PH_C", // - "Total VA-hours Imported phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_HOURS, // - "TotVAh_SF", // - new OptionsEnum[0])), // - TOT_V_AH_S_F(new PointImpl(// - "S204_TOT_V_AH_S_F", // - "", // - "Apparent Energy scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q1(new PointImpl(// - "S204_TOT_V_ARH_IMP_Q1", // - "Total VAR-hours Imported Q1", // + ValuePoint.Type.ACC32, false /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + 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", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q1_PH_A(new PointImpl(// - "S204_TOT_V_ARH_IMP_Q1_PH_A", // - "Total VAr-hours Imported Q1 phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q1_PH_B(new PointImpl(// - "S204_TOT_V_ARH_IMP_Q1_PH_B", // - "Total VAr-hours Imported Q1 phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q1_PH_C(new PointImpl(// - "S204_TOT_V_ARH_IMP_Q1_PH_C", // - "Total VAr-hours Imported Q1 phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q2(new PointImpl(// - "S204_TOT_V_ARH_IMP_Q2", // - "Total VAr-hours Imported Q2", // + 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")), // + TOT_V_ARH_IMP_Q2(new ScaledValuePoint("S204_TOT_V_ARH_IMP_Q2", "Total VAr-hours Imported Q2", // "Total Reactive Power Imported Quadrant 2", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q2_PH_A(new PointImpl(// - "S204_TOT_V_ARH_IMP_Q2_PH_A", // - "Total VAr-hours Imported Q2 phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q2_PH_B(new PointImpl(// - "S204_TOT_V_ARH_IMP_Q2_PH_B", // - "Total VAr-hours Imported Q2 phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_IMP_Q2_PH_C(new PointImpl(// - "S204_TOT_V_ARH_IMP_Q2_PH_C", // - "Total VAr-hours Imported Q2 phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q3(new PointImpl(// - "S204_TOT_V_ARH_EXP_Q3", // - "Total VAr-hours Exported Q3", // + 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")), // + TOT_V_ARH_EXP_Q3(new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q3", "Total VAr-hours Exported Q3", // "Total Reactive Power Exported Quadrant 3", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q3_PH_A(new PointImpl(// - "S204_TOT_V_ARH_EXP_Q3_PH_A", // - "Total VAr-hours Exported Q3 phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q3_PH_B(new PointImpl(// - "S204_TOT_V_ARH_EXP_Q3_PH_B", // - "Total VAr-hours Exported Q3 phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q3_PH_C(new PointImpl(// - "S204_TOT_V_ARH_EXP_Q3_PH_C", // - "Total VAr-hours Exported Q3 phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q4(new PointImpl(// - "S204_TOT_V_ARH_EXP_Q4", // - "Total VAr-hours Exported Q4", // + 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")), // + TOT_V_ARH_EXP_Q4(new ScaledValuePoint("S204_TOT_V_ARH_EXP_Q4", "Total VAr-hours Exported Q4", // "Total Reactive Power Exported Quadrant 4", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q4_PH_A(new PointImpl(// - "S204_TOT_V_ARH_EXP_Q4_PH_A", // - "Total VAr-hours Exported Q4 Imported phase A", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q4_PH_B(new PointImpl(// - "S204_TOT_V_ARH_EXP_Q4_PH_B", // - "Total VAr-hours Exported Q4 Imported phase B", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_EXP_Q4_PH_C(new PointImpl(// - "S204_TOT_V_ARH_EXP_Q4_PH_C", // - "Total VAr-hours Exported Q4 Imported phase C", // - "", // - "", // - PointType.ACC32, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVArh_SF", // - new OptionsEnum[0])), // - TOT_V_ARH_S_F(new PointImpl(// - "S204_TOT_V_ARH_S_F", // - "", // - "Reactive Energy scale factor", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT(new PointImpl(// - "S204_EVT", // - "Events", // + 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")), // + 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", // - "", // - PointType.BITFIELD32, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S204_Evt.values())); // + BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S204_Evt.values())); - protected final PointImpl impl; + private final Point point; - private S204(PointImpl impl) { - this.impl = impl; + private S204(Point point) { + this.point = point; } @Override - public PointImpl get() { - return this.impl; + public Point get() { + return this.point; } } - public static enum S204_Evt implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - POWER_FAILURE(2, "POWER_FAILURE"), // - UNDER_VOLTAGE(3, "UNDER_VOLTAGE"), // - LOW_P_F(4, "LOW_P_F"), // - OVER_CURRENT(5, "OVER_CURRENT"), // - OVER_VOLTAGE(6, "OVER_VOLTAGE"), // - MISSING_SENSOR(7, "MISSING_SENSOR"), // - RESERVED1(8, "RESERVED1"), // - RESERVED2(9, "RESERVED2"), // - RESERVED3(10, "RESERVED3"), // - RESERVED4(11, "RESERVED4"), // - RESERVED5(12, "RESERVED5"), // - RESERVED6(13, "RESERVED6"), // - RESERVED7(14, "RESERVED7"), // - RESERVED8(15, "RESERVED8"), // - OEM01(16, "OEM01"), // - OEM02(17, "OEM02"), // - OEM03(18, "OEM03"), // - OEM04(19, "OEM04"), // - OEM05(20, "OEM05"), // - OEM06(21, "OEM06"), // - OEM07(22, "OEM07"), // - OEM08(23, "OEM08"), // - OEM09(24, "OEM09"), // - OEM10(25, "OEM10"), // - OEM11(26, "OEM11"), // - OEM12(27, "OEM12"), // - OEM13(28, "OEM13"), // - OEM14(29, "OEM14"), // - OEM15(30, "OEM15"); // + public static enum S204_Evt implements SunSpecBitPoint { + POWER_FAILURE(new BitPoint(2, "S204_EVT_POWER_FAILURE", "Power_Failure")), // + UNDER_VOLTAGE(new BitPoint(3, "S204_EVT_UNDER_VOLTAGE", "Under_Voltage")), // + LOW_P_F(new BitPoint(4, "S204_EVT_LOW_P_F", "Low_PF")), // + OVER_CURRENT(new BitPoint(5, "S204_EVT_OVER_CURRENT", "Over_Current")), // + OVER_VOLTAGE(new BitPoint(6, "S204_EVT_OVER_VOLTAGE", "Over_Voltage")), // + MISSING_SENSOR(new BitPoint(7, "S204_EVT_MISSING_SENSOR", "Missing_Sensor")), // + RESERVED1(new BitPoint(8, "S204_EVT_RESERVED1", "Reserved1")), // + RESERVED2(new BitPoint(9, "S204_EVT_RESERVED2", "Reserved2")), // + RESERVED3(new BitPoint(10, "S204_EVT_RESERVED3", "Reserved3")), // + RESERVED4(new BitPoint(11, "S204_EVT_RESERVED4", "Reserved4")), // + RESERVED5(new BitPoint(12, "S204_EVT_RESERVED5", "Reserved5")), // + RESERVED6(new BitPoint(13, "S204_EVT_RESERVED6", "Reserved6")), // + RESERVED7(new BitPoint(14, "S204_EVT_RESERVED7", "Reserved7")), // + RESERVED8(new BitPoint(15, "S204_EVT_RESERVED8", "Reserved8")), // + OEM01(new BitPoint(16, "S204_EVT_OEM01", "OEM01")), // + OEM02(new BitPoint(17, "S204_EVT_OEM02", "OEM02")), // + OEM03(new BitPoint(18, "S204_EVT_OEM03", "OEM03")), // + OEM04(new BitPoint(19, "S204_EVT_OEM04", "OEM04")), // + OEM05(new BitPoint(20, "S204_EVT_OEM05", "OEM05")), // + OEM06(new BitPoint(21, "S204_EVT_OEM06", "OEM06")), // + OEM07(new BitPoint(22, "S204_EVT_OEM07", "OEM07")), // + OEM08(new BitPoint(23, "S204_EVT_OEM08", "OEM08")), // + OEM09(new BitPoint(24, "S204_EVT_OEM09", "OEM09")), // + OEM10(new BitPoint(25, "S204_EVT_OEM10", "OEM10")), // + OEM11(new BitPoint(26, "S204_EVT_OEM11", "OEM11")), // + OEM12(new BitPoint(27, "S204_EVT_OEM12", "OEM12")), // + OEM13(new BitPoint(28, "S204_EVT_OEM13", "OEM13")), // + OEM14(new BitPoint(29, "S204_EVT_OEM14", "OEM14")), // + OEM15(new BitPoint(30, "S204_EVT_OEM15", "OEM15")); - private final int value; - private final String name; + private final BitPoint point; - private S204_Evt(int value, String name) { - this.value = value; - this.name = name; + private S204_Evt(BitPoint point) { + this.point = point; } @Override - public int getValue() { - return this.value; - } - - @Override - public String getName() { - return this.name; - } - - @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } public static enum S305 implements SunSpecPoint { - TM(new PointImpl(// - "S305_TM", // - "Tm", // + TM(new ValuePoint("S305_TM", "Tm", // "UTC 24 hour time stamp to millisecond hhmmss.sssZ format", // - "", // - PointType.STRING6, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DATE(new PointImpl(// - "S305_DATE", // - "Date", // + ValuePoint.Type.STRING6, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + DATE(new ValuePoint("S305_DATE", "Date", // "UTC Date string YYYYMMDD format", // - "", // - PointType.STRING4, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - LOC(new PointImpl(// - "S305_LOC", // - "Location", // + ValuePoint.Type.STRING4, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + LOC(new ValuePoint("S305_LOC", "Location", // "Location string (40 chars max)", // - "", // - PointType.STRING20, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - LAT(new PointImpl(// - "S305_LAT", // - "Lat", // + ValuePoint.Type.STRING20, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + LAT(new ScaledValuePoint("S305_LAT", "Lat", // "Latitude with seven degrees of precision", // - "", // - PointType.INT32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "-7", // - new OptionsEnum[0])), // - LONG(new PointImpl(// - "S305_LONG", // - "Long", // + ValuePoint.Type.INT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "-7")), // + LONG(new ScaledValuePoint("S305_LONG", "Long", // "Longitude with seven degrees of precision", // - "", // - PointType.INT32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "-7", // - new OptionsEnum[0])), // - ALT(new PointImpl(// - "S305_ALT", // - "Altitude", // + ValuePoint.Type.INT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "-7")), // + ALT(new ValuePoint("S305_ALT", "Altitude", // "Altitude measurement in meters", // - "", // - PointType.INT32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // + ValuePoint.Type.INT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)); - protected final PointImpl impl; + private final Point point; - private S305(PointImpl impl) { - this.impl = impl; + private S305(Point point) { + this.point = point; } @Override - public PointImpl get() { - return this.impl; + public Point get() { + return this.point; } } public static enum S306 implements SunSpecPoint { - GHI(new PointImpl(// - "S306_GHI", // - "GHI", // + GHI(new ValuePoint("S306_GHI", "GHI", // "Global Horizontal Irradiance", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - A(new PointImpl(// - "S306_A", // - "Amps", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + A(new ValuePoint("S306_A", "Amps", // "Current measurement at reference point", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V(new PointImpl(// - "S306_V", // - "Voltage", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + V(new ValuePoint("S306_V", "Voltage", // "Voltage measurement at reference point", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TMP(new PointImpl(// - "S306_TMP", // - "Temperature", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + TMP(new ValuePoint("S306_TMP", "Temperature", // "Temperature measurement at reference point", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)); - protected final PointImpl impl; + private final Point point; - private S306(PointImpl impl) { - this.impl = impl; + private S306(Point point) { + this.point = point; } @Override - public PointImpl get() { - return this.impl; + public Point get() { + return this.point; } } public static enum S307 implements SunSpecPoint { - TMP_AMB(new PointImpl(// - "S307_TMP_AMB", // - "Ambient Temperature", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "-1", // - new OptionsEnum[0])), // - RH(new PointImpl(// - "S307_RH", // - "Relative Humidity", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PRES(new PointImpl(// - "S307_PRES", // - "Barometric Pressure", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - WND_SPD(new PointImpl(// - "S307_WND_SPD", // - "Wind Speed", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - WND_DIR(new PointImpl(// - "S307_WND_DIR", // - "Wind Direction", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - RAIN(new PointImpl(// - "S307_RAIN", // - "Rainfall", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - SNW(new PointImpl(// - "S307_SNW", // - "Snow Depth", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PPT(new PointImpl(// - "S307_PPT", // - "Precipitation Type", // + TMP_AMB(new ScaledValuePoint("S307_TMP_AMB", "Ambient Temperature", "", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "-1")), // + RH(new ValuePoint("S307_RH", "Relative Humidity", "", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + PRES(new ValuePoint("S307_PRES", "Barometric Pressure", "", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + WND_SPD(new ValuePoint("S307_WND_SPD", "Wind Speed", "", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + WND_DIR(new ValuePoint("S307_WND_DIR", "Wind Direction", "", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + RAIN(new ValuePoint("S307_RAIN", "Rainfall", "", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + SNW(new ValuePoint("S307_SNW", "Snow Depth", "", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + PPT(new ValuePoint("S307_PPT", "Precipitation Type", // "Precipitation Type (WMO 4680 SYNOP code reference)", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ELEC_FLD(new PointImpl(// - "S307_ELEC_FLD", // - "Electric Field", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - SUR_WET(new PointImpl(// - "S307_SUR_WET", // - "Surface Wetness", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - SOIL_WET(new PointImpl(// - "S307_SOIL_WET", // - "Soil Wetness", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S307(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + ELEC_FLD(new ValuePoint("S307_ELEC_FLD", "Electric Field", "", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + SUR_WET(new ValuePoint("S307_SUR_WET", "Surface Wetness", "", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + SOIL_WET(new ValuePoint("S307_SOIL_WET", "Soil Wetness", "", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)); + + private final Point point; + + private S307(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } public static enum S308 implements SunSpecPoint { - GHI(new PointImpl(// - "S308_GHI", // - "GHI", // + GHI(new ValuePoint("S308_GHI", "GHI", // "Global Horizontal Irradiance", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TMP_B_O_M(new PointImpl(// - "S308_TMP_B_O_M", // - "Temp", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + TMP_B_O_M(new ScaledValuePoint("S308_TMP_B_O_M", "Temp", // "Back of module temperature measurement", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "-1", // - new OptionsEnum[0])), // - TMP_AMB(new PointImpl(// - "S308_TMP_AMB", // - "Ambient Temperature", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "-1", // - new OptionsEnum[0])), // - WND_SPD(new PointImpl(// - "S308_WND_SPD", // - "Wind Speed", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S308(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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")), // + WND_SPD(new ValuePoint("S308_WND_SPD", "Wind Speed", "", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)); + + private final Point point; + + private S308(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } public static enum S701 implements SunSpecPoint { - A_C_TYPE(new PointImpl(// - "S701_A_C_TYPE", // - "AC Wiring Type", // + A_C_TYPE(new EnumPoint("S701_A_C_TYPE", "AC Wiring Type", // "AC wiring type.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S701_ACType.values())), // - ST(new PointImpl(// - "S701_ST", // - "Operating State", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S701_ACType.values())), // + ST(new EnumPoint("S701_ST", "Operating State", // "Operating state of the DER.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S701_St.values())), // - INV_ST(new PointImpl(// - "S701_INV_ST", // - "Inverter State", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S701_St.values())), // + INV_ST(new EnumPoint("S701_INV_ST", "Inverter State", // "Enumerated value. Inverter state.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S701_InvSt.values())), // - CONN_ST(new PointImpl(// - "S701_CONN_ST", // - "Grid Connection State", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S701_InvSt.values())), // + CONN_ST(new EnumPoint("S701_CONN_ST", "Grid Connection State", // "Grid connection state of the DER.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S701_ConnSt.values())), // - ALRM(new PointImpl(// - "S701_ALRM", // - "Alarm Bitfield", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S701_ConnSt.values())), // + ALRM(new BitFieldPoint("S701_ALRM", "Alarm Bitfield", // "Active alarms for the DER.", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S701_Alrm.values())), // - D_E_R_MODE(new PointImpl(// - "S701_D_E_R_MODE", // - "DER Operational Characteristics", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S701_DERMode.values())), // - W(new PointImpl(// - "S701_W", // - "Active Power", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - VA(new PointImpl(// - "S701_VA", // - "Apparent Power", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), // + VA(new ScaledValuePoint("S701_VA", "Apparent Power", // "Total apparent power.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - VAR(new PointImpl(// - "S701_VAR", // - "Reactive Power", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), // + VAR(new ScaledValuePoint("S701_VAR", "Reactive Power", // "Total reactive power.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "Var_SF", // - new OptionsEnum[0])), // - PF(new PointImpl(// - "S701_PF", // - "Power Factor", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - A(new PointImpl(// - "S701_A", // - "Total AC Current", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), // + A(new ScaledValuePoint("S701_A", "Total AC Current", // "Total AC current.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - LLV(new PointImpl(// - "S701_LLV", // - "Voltage LL", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + LLV(new ScaledValuePoint("S701_LLV", "Voltage LL", // "Line to line AC voltage as an average of active phases.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - LNV(new PointImpl(// - "S701_LNV", // - "Voltage LN", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + LNV(new ScaledValuePoint("S701_LNV", "Voltage LN", // "Line to neutral AC voltage as an average of active phases.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - HZ(new PointImpl(// - "S701_HZ", // - "Frequency", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + HZ(new ScaledValuePoint("S701_HZ", "Frequency", // "AC frequency.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_ONLY, // - Unit.HERTZ, // - "Hz_SF", // - new OptionsEnum[0])), // - TOT_WH_INJ(new PointImpl(// - "S701_TOT_WH_INJ", // - "Total Energy Injected", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.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).", // - "", // - PointType.UINT64, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_ABS(new PointImpl(// - "S701_TOT_WH_ABS", // - "Total Energy Absorbed", // + ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.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).", // - "", // - PointType.UINT64, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_VARH_INJ(new PointImpl(// - "S701_TOT_VARH_INJ", // - "Total Reactive Energy Inj", // + ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.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).", // - "", // - PointType.UINT64, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVarh_SF", // - new OptionsEnum[0])), // - TOT_VARH_ABS(new PointImpl(// - "S701_TOT_VARH_ABS", // - "Total Reactive Energy Abs", // + ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.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).", // - "", // - PointType.UINT64, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVarh_SF", // - new OptionsEnum[0])), // - TMP_AMB(new PointImpl(// - "S701_TMP_AMB", // - "Ambient Temperature", // + ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), // + TMP_AMB(new ScaledValuePoint("S701_TMP_AMB", "Ambient Temperature", // "Ambient temperature.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "Tmp_SF", // - new OptionsEnum[0])), // - TMP_CAB(new PointImpl(// - "S701_TMP_CAB", // - "Cabinet Temperature", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), // + TMP_CAB(new ScaledValuePoint("S701_TMP_CAB", "Cabinet Temperature", // "Cabinet temperature.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "Tmp_SF", // - new OptionsEnum[0])), // - TMP_SNK(new PointImpl(// - "S701_TMP_SNK", // - "Heat Sink Temperature", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), // + TMP_SNK(new ScaledValuePoint("S701_TMP_SNK", "Heat Sink Temperature", // "Heat sink temperature.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "Tmp_SF", // - new OptionsEnum[0])), // - TMP_TRNS(new PointImpl(// - "S701_TMP_TRNS", // - "Transformer Temperature", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), // + TMP_TRNS(new ScaledValuePoint("S701_TMP_TRNS", "Transformer Temperature", // "Transformer temperature.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "Tmp_SF", // - new OptionsEnum[0])), // - TMP_SW(new PointImpl(// - "S701_TMP_SW", // - "IGBT/MOSFET Temperature", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), // + TMP_SW(new ScaledValuePoint("S701_TMP_SW", "IGBT/MOSFET Temperature", // "IGBT/MOSFET temperature.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "Tmp_SF", // - new OptionsEnum[0])), // - TMP_OT(new PointImpl(// - "S701_TMP_OT", // - "Other Temperature", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), // + TMP_OT(new ScaledValuePoint("S701_TMP_OT", "Other Temperature", // "Other temperature.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "Tmp_SF", // - new OptionsEnum[0])), // - WL1(new PointImpl(// - "S701_WL1", // - "Watts L1", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.DEGREE_CELSIUS, "Tmp_SF")), // + WL1(new ScaledValuePoint("S701_WL1", "Watts L1", // "Active power L1.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - VAL1(new PointImpl(// - "S701_VAL1", // - "VA L1", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), // + VAL1(new ScaledValuePoint("S701_VAL1", "VA L1", // "Apparent power L1.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - VAR_L1(new PointImpl(// - "S701_VAR_L1", // - "Var L1", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), // + VAR_L1(new ScaledValuePoint("S701_VAR_L1", "Var L1", // "Reactive power L1.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "Var_SF", // - new OptionsEnum[0])), // - PFL1(new PointImpl(// - "S701_PFL1", // - "PF L1", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), // + PFL1(new ScaledValuePoint("S701_PFL1", "PF L1", // "Power factor phase L1.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - AL1(new PointImpl(// - "S701_AL1", // - "Amps L1", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), // + AL1(new ScaledValuePoint("S701_AL1", "Amps L1", // "Current phase L1.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - VL1L2(new PointImpl(// - "S701_VL1L2", // - "Phase Voltage L1-L2", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + VL1L2(new ScaledValuePoint("S701_VL1L2", "Phase Voltage L1-L2", // "Phase voltage L1-L2.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - VL1(new PointImpl(// - "S701_VL1", // - "Phase Voltage L1-N", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + VL1(new ScaledValuePoint("S701_VL1", "Phase Voltage L1-N", // "Phase voltage L1-N.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - TOT_WH_INJ_L1(new PointImpl(// - "S701_TOT_WH_INJ_L1", // - "Total Watt-Hours Inj L1", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT64, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_ABS_L1(new PointImpl(// - "S701_TOT_WH_ABS_L1", // - "Total Watt-Hours Abs L1", // + ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT64, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_VARH_INJ_L1(new PointImpl(// - "S701_TOT_VARH_INJ_L1", // - "Total Var-Hours Inj L1", // + ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT64, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVarh_SF", // - new OptionsEnum[0])), // - TOT_VARH_ABS_L1(new PointImpl(// - "S701_TOT_VARH_ABS_L1", // - "Total Var-Hours Abs L1", // + ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT64, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVarh_SF", // - new OptionsEnum[0])), // - WL2(new PointImpl(// - "S701_WL2", // - "Watts L2", // + ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), // + WL2(new ScaledValuePoint("S701_WL2", "Watts L2", // "Active power L2.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - VAL2(new PointImpl(// - "S701_VAL2", // - "VA L2", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), // + VAL2(new ScaledValuePoint("S701_VAL2", "VA L2", // "Apparent power L2.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - VAR_L2(new PointImpl(// - "S701_VAR_L2", // - "Var L2", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), // + VAR_L2(new ScaledValuePoint("S701_VAR_L2", "Var L2", // "Reactive power L2.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "Var_SF", // - new OptionsEnum[0])), // - PFL2(new PointImpl(// - "S701_PFL2", // - "PF L2", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), // + PFL2(new ScaledValuePoint("S701_PFL2", "PF L2", // "Power factor L2.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - AL2(new PointImpl(// - "S701_AL2", // - "Amps L2", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), // + AL2(new ScaledValuePoint("S701_AL2", "Amps L2", // "Current L2.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - VL2L3(new PointImpl(// - "S701_VL2L3", // - "Phase Voltage L2-L3", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + VL2L3(new ScaledValuePoint("S701_VL2L3", "Phase Voltage L2-L3", // "Phase voltage L2-L3.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - VL2(new PointImpl(// - "S701_VL2", // - "Phase Voltage L2-N", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + VL2(new ScaledValuePoint("S701_VL2", "Phase Voltage L2-N", // "Phase voltage L2-N.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - TOT_WH_INJ_L2(new PointImpl(// - "S701_TOT_WH_INJ_L2", // - "Total Watt-Hours Inj L2", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT64, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_ABS_L2(new PointImpl(// - "S701_TOT_WH_ABS_L2", // - "Total Watt-Hours Abs L2", // + ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT64, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_VARH_INJ_L2(new PointImpl(// - "S701_TOT_VARH_INJ_L2", // - "Total Var-Hours Inj L2", // + ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT64, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVarh_SF", // - new OptionsEnum[0])), // - TOT_VARH_ABS_L2(new PointImpl(// - "S701_TOT_VARH_ABS_L2", // - "Total Var-Hours Abs L2", // + ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT64, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVarh_SF", // - new OptionsEnum[0])), // - WL3(new PointImpl(// - "S701_WL3", // - "Watts L3", // + ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE_HOURS, "TotVarh_SF")), // + WL3(new ScaledValuePoint("S701_WL3", "Watts L3", // "Active power L3.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - VAL3(new PointImpl(// - "S701_VAL3", // - "VA L3", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.WATT, "W_SF")), // + VAL3(new ScaledValuePoint("S701_VAL3", "VA L3", // "Apparent power L3.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - VAR_L3(new PointImpl(// - "S701_VAR_L3", // - "Var L3", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), // + VAR_L3(new ScaledValuePoint("S701_VAR_L3", "Var L3", // "Reactive power L3.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "Var_SF", // - new OptionsEnum[0])), // - PFL3(new PointImpl(// - "S701_PFL3", // - "PF L3", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE_REACTIVE, "Var_SF")), // + PFL3(new ScaledValuePoint("S701_PFL3", "PF L3", // "Power factor L3.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - AL3(new PointImpl(// - "S701_AL3", // - "Amps L3", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "PF_SF")), // + AL3(new ScaledValuePoint("S701_AL3", "Amps L3", // "Current L3.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - VL3L1(new PointImpl(// - "S701_VL3L1", // - "Phase Voltage L3-L1", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + VL3L1(new ScaledValuePoint("S701_VL3L1", "Phase Voltage L3-L1", // "Phase voltage L3-L1.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - VL3(new PointImpl(// - "S701_VL3", // - "Phase Voltage L3-N", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + VL3(new ScaledValuePoint("S701_VL3", "Phase Voltage L3-N", // "Phase voltage L3-N.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - TOT_WH_INJ_L3(new PointImpl(// - "S701_TOT_WH_INJ_L3", // - "Total Watt-Hours Inj L3", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT64, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_WH_ABS_L3(new PointImpl(// - "S701_TOT_WH_ABS_L3", // - "Total Watt-Hours Abs L3", // + ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT64, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "TotWh_SF", // - new OptionsEnum[0])), // - TOT_VARH_INJ_L3(new PointImpl(// - "S701_TOT_VARH_INJ_L3", // - "Total Var-Hours Inj L3", // + ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT64, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVarh_SF", // - new OptionsEnum[0])), // - TOT_VARH_ABS_L3(new PointImpl(// - "S701_TOT_VARH_ABS_L3", // - "Total Var-Hours Abs L3", // + ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT64, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE_HOURS, // - "TotVarh_SF", // - new OptionsEnum[0])), // - THROT_PCT(new PointImpl(// - "S701_THROT_PCT", // - "Throttling In Pct", // + ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - THROT_SRC(new PointImpl(// - "S701_THROT_SRC", // - "Throttle Source Information", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + THROT_SRC(new BitFieldPoint("S701_THROT_SRC", "Throttle Source Information", // "Active throttling source.", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S701_ThrotSrc.values())), // - A_SF(new PointImpl(// - "S701_A_SF", // - "Current Scale Factor", // - "Current scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_SF(new PointImpl(// - "S701_V_SF", // - "Voltage Scale Factor", // - "Voltage scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - HZ_S_F(new PointImpl(// - "S701_HZ_S_F", // - "Frequency Scale Factor", // - "Frequency scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - W_SF(new PointImpl(// - "S701_W_SF", // - "Active Power Scale Factor", // - "Active power scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PF_SF(new PointImpl(// - "S701_PF_SF", // - "Power Factor Scale Factor", // - "Power factor scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VA_SF(new PointImpl(// - "S701_VA_SF", // - "Apparent Power Scale Factor", // - "Apparent power scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VAR_S_F(new PointImpl(// - "S701_VAR_S_F", // - "Reactive Power Scale Factor", // - "Reactive power scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TOT_WH_S_F(new PointImpl(// - "S701_TOT_WH_S_F", // - "Active Energy Scale Factor", // - "Active energy scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TOT_VARH_S_F(new PointImpl(// - "S701_TOT_VARH_S_F", // - "Reactive Energy Scale Factor", // - "Reactive energy scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TMP_S_F(new PointImpl(// - "S701_TMP_S_F", // - "Temperature Scale Factor", // - "Temperature scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - MN_ALRM_INFO(new PointImpl(// - "S701_MN_ALRM_INFO", // - "Manufacturer Alarm Info", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.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", // + "Voltage scale factor.")), // + HZ_S_F(new ScaleFactorPoint("S701_HZ_S_F", "Frequency Scale Factor", // + "Frequency scale factor.")), // + W_SF(new ScaleFactorPoint("S701_W_SF", "Active Power Scale Factor", // + "Active power scale factor.")), // + PF_SF(new ScaleFactorPoint("S701_PF_SF", "Power Factor Scale Factor", // + "Power factor scale factor.")), // + VA_SF(new ScaleFactorPoint("S701_VA_SF", "Apparent Power Scale Factor", // + "Apparent power scale factor.")), // + VAR_S_F(new ScaleFactorPoint("S701_VAR_S_F", "Reactive Power Scale Factor", // + "Reactive power scale factor.")), // + TOT_WH_S_F(new ScaleFactorPoint("S701_TOT_WH_S_F", "Active Energy Scale Factor", // + "Active energy scale factor.")), // + TOT_VARH_S_F(new ScaleFactorPoint("S701_TOT_VARH_S_F", "Reactive Energy Scale Factor", // + "Reactive energy scale factor.")), // + TMP_S_F(new ScaleFactorPoint("S701_TMP_S_F", "Temperature Scale Factor", // + "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.", // - "", // - PointType.STRING32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // + ValuePoint.Type.STRING32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)); - protected final PointImpl impl; + private final Point point; - private S701(PointImpl impl) { - this.impl = impl; + private S701(Point point) { + this.point = point; } @Override - public PointImpl get() { - return this.impl; + public Point get() { + return this.point; } } @@ -11167,7 +3886,7 @@ public static enum S701_ACType implements OptionsEnum { UNDEFINED(-1, "Undefined"), // SINGLE_PHASE(0, "SINGLE_PHASE"), // SPLIT_PHASE(1, "SPLIT_PHASE"), // - THREE_PHASE(2, "THREE_PHASE"); // + THREE_PHASE(2, "THREE_PHASE"); private final int value; private final String name; @@ -11196,7 +3915,7 @@ public OptionsEnum getUndefined() { public static enum S701_St implements OptionsEnum { UNDEFINED(-1, "Undefined"), // OFF(0, "OFF"), // - ON(1, "ON"); // + ON(1, "ON"); private final int value; private final String name; @@ -11231,7 +3950,7 @@ public static enum S701_InvSt implements OptionsEnum { THROTTLED(4, "THROTTLED"), // SHUTTING_DOWN(5, "SHUTTING_DOWN"), // FAULT(6, "FAULT"), // - STANDBY(7, "STANDBY"); // + STANDBY(7, "STANDBY"); private final int value; private final String name; @@ -11259,87 +3978,13 @@ public OptionsEnum getUndefined() { public static enum S701_ConnSt implements OptionsEnum { UNDEFINED(-1, "Undefined"), // - DISCONNECTED(0, "DISCONNECTED"), // - CONNECTED(1, "CONNECTED"); // - - private final int value; - private final String name; - - private S701_ConnSt(int value, String name) { - this.value = value; - this.name = name; - } - - @Override - public int getValue() { - return this.value; - } - - @Override - public String getName() { - return this.name; - } - - @Override - public OptionsEnum getUndefined() { - return UNDEFINED; - } - } - - public static enum S701_Alrm implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - GROUND_FAULT(0, "GROUND_FAULT"), // - DC_OVER_VOLT(1, "DC_OVER_VOLT"), // - AC_DISCONNECT(2, "AC_DISCONNECT"), // - DC_DISCONNECT(3, "DC_DISCONNECT"), // - GRID_DISCONNECT(4, "GRID_DISCONNECT"), // - CABINET_OPEN(5, "CABINET_OPEN"), // - MANUAL_SHUTDOWN(6, "MANUAL_SHUTDOWN"), // - OVER_TEMP(7, "OVER_TEMP"), // - OVER_FREQUENCY(8, "OVER_FREQUENCY"), // - UNDER_FREQUENCY(9, "UNDER_FREQUENCY"), // - AC_OVER_VOLT(10, "AC_OVER_VOLT"), // - AC_UNDER_VOLT(11, "AC_UNDER_VOLT"), // - BLOWN_STRING_FUSE(12, "BLOWN_STRING_FUSE"), // - UNDER_TEMP(13, "UNDER_TEMP"), // - MEMORY_LOSS(14, "MEMORY_LOSS"), // - HW_TEST_FAILURE(15, "HW_TEST_FAILURE"), // - MANUFACTURER_ALRM(16, "MANUFACTURER_ALRM"); // - - private final int value; - private final String name; - - private S701_Alrm(int value, String name) { - this.value = value; - this.name = name; - } - - @Override - public int getValue() { - return this.value; - } - - @Override - public String getName() { - return this.name; - } - - @Override - public OptionsEnum getUndefined() { - return UNDEFINED; - } - } - - public static enum S701_DERMode implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - GRID_FOLLOWING(0, "GRID_FOLLOWING"), // - GRID_FORMING(1, "GRID_FORMING"), // - PV_CLIPPED(2, "PV_CLIPPED"); // + DISCONNECTED(0, "DISCONNECTED"), // + CONNECTED(1, "CONNECTED"); private final int value; private final String name; - private S701_DERMode(int value, String name) { + private S701_ConnSt(int value, String name) { this.value = value; this.name = name; } @@ -11360,605 +4005,241 @@ public OptionsEnum getUndefined() { } } - public static enum S701_ThrotSrc implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - MAX_W(0, "MAX_W"), // - FIXED_W(1, "FIXED_W"), // - FIXED_VAR(2, "FIXED_VAR"), // - FIXED_PF(3, "FIXED_PF"), // - VOLT_VAR(4, "VOLT_VAR"), // - FREQ_WATT(5, "FREQ_WATT"), // - DYN_REACT_CURR(6, "DYN_REACT_CURR"), // - LVRT(7, "LVRT"), // - HVRT(8, "HVRT"), // - WATT_VAR(9, "WATT_VAR"), // - VOLT_WATT(10, "VOLT_WATT"), // - SCHEDULED(11, "SCHEDULED"), // - LFRT(12, "LFRT"), // - HFRT(13, "HFRT"), // - DERATED(14, "DERATED"); // + public static enum S701_Alrm implements SunSpecBitPoint { + GROUND_FAULT(new BitPoint(0, "S701_ALRM_GROUND_FAULT", "Ground Fault")), // + DC_OVER_VOLT(new BitPoint(1, "S701_ALRM_DC_OVER_VOLT", "DC Over Volt")), // + AC_DISCONNECT(new BitPoint(2, "S701_ALRM_AC_DISCONNECT", "AC Disconnect")), // + DC_DISCONNECT(new BitPoint(3, "S701_ALRM_DC_DISCONNECT", "DC Disconnect")), // + GRID_DISCONNECT(new BitPoint(4, "S701_ALRM_GRID_DISCONNECT", "Grid Disconnect")), // + CABINET_OPEN(new BitPoint(5, "S701_ALRM_CABINET_OPEN", "Cabinet Open")), // + MANUAL_SHUTDOWN(new BitPoint(6, "S701_ALRM_MANUAL_SHUTDOWN", "Manual Shutdown")), // + OVER_TEMP(new BitPoint(7, "S701_ALRM_OVER_TEMP", "Over Temp")), // + OVER_FREQUENCY(new BitPoint(8, "S701_ALRM_OVER_FREQUENCY", "Over Frequency")), // + UNDER_FREQUENCY(new BitPoint(9, "S701_ALRM_UNDER_FREQUENCY", "Under Frequency")), // + AC_OVER_VOLT(new BitPoint(10, "S701_ALRM_AC_OVER_VOLT", "AC Over Volt")), // + AC_UNDER_VOLT(new BitPoint(11, "S701_ALRM_AC_UNDER_VOLT", "AC Under Volt")), // + BLOWN_STRING_FUSE(new BitPoint(12, "S701_ALRM_BLOWN_STRING_FUSE", "Blown String Fuse")), // + UNDER_TEMP(new BitPoint(13, "S701_ALRM_UNDER_TEMP", "Under Temp")), // + MEMORY_LOSS(new BitPoint(14, "S701_ALRM_MEMORY_LOSS", "Memory Loss")), // + HW_TEST_FAILURE(new BitPoint(15, "S701_ALRM_HW_TEST_FAILURE", "HW Test Failure")), // + MANUFACTURER_ALRM(new BitPoint(16, "S701_ALRM_MANUFACTURER_ALRM", "Manufacturer Alrm")); - private final int value; - private final String name; + private final BitPoint point; - private S701_ThrotSrc(int value, String name) { - this.value = value; - this.name = name; + private S701_Alrm(BitPoint point) { + this.point = point; } @Override - public int getValue() { - return this.value; + public BitPoint get() { + return this.point; + } + } + + public static enum S701_DERMode implements SunSpecBitPoint { + GRID_FOLLOWING(new BitPoint(0, "S701_D_E_R_MODE_GRID_FOLLOWING", "Grid Following")), // + GRID_FORMING(new BitPoint(1, "S701_D_E_R_MODE_GRID_FORMING", "Grid Forming")), // + PV_CLIPPED(new BitPoint(2, "S701_D_E_R_MODE_PV_CLIPPED", "Pv Clipped")); + + private final BitPoint point; + + private S701_DERMode(BitPoint point) { + this.point = point; } @Override - public String getName() { - return this.name; + public BitPoint get() { + return this.point; + } + } + + public static enum S701_ThrotSrc implements SunSpecBitPoint { + MAX_W(new BitPoint(0, "S701_THROT_SRC_MAX_W", "Max W")), // + FIXED_W(new BitPoint(1, "S701_THROT_SRC_FIXED_W", "Fixed W")), // + FIXED_VAR(new BitPoint(2, "S701_THROT_SRC_FIXED_VAR", "Fixed Var")), // + FIXED_PF(new BitPoint(3, "S701_THROT_SRC_FIXED_PF", "Fixed Pf")), // + VOLT_VAR(new BitPoint(4, "S701_THROT_SRC_VOLT_VAR", "Volt Var")), // + FREQ_WATT(new BitPoint(5, "S701_THROT_SRC_FREQ_WATT", "Freq Watt")), // + DYN_REACT_CURR(new BitPoint(6, "S701_THROT_SRC_DYN_REACT_CURR", "Dyn React Curr")), // + LVRT(new BitPoint(7, "S701_THROT_SRC_LVRT", "LVRT")), // + HVRT(new BitPoint(8, "S701_THROT_SRC_HVRT", "HVRT")), // + WATT_VAR(new BitPoint(9, "S701_THROT_SRC_WATT_VAR", "Watt Var")), // + VOLT_WATT(new BitPoint(10, "S701_THROT_SRC_VOLT_WATT", "Volt Watt")), // + SCHEDULED(new BitPoint(11, "S701_THROT_SRC_SCHEDULED", "SCHEDULED")), // + LFRT(new BitPoint(12, "S701_THROT_SRC_LFRT", "LFRT")), // + HFRT(new BitPoint(13, "S701_THROT_SRC_HFRT", "HFRT")), // + DERATED(new BitPoint(14, "S701_THROT_SRC_DERATED", "DERATED")); + + private final BitPoint point; + + private S701_ThrotSrc(BitPoint point) { + this.point = point; } @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } public static enum S702 implements SunSpecPoint { - W_MAX_RTG(new PointImpl(// - "S702_W_MAX_RTG", // - "Active Power Max Rating", // + W_MAX_RTG(new ScaledValuePoint("S702_W_MAX_RTG", "Active Power Max Rating", // "Maximum active power rating at unity power factor in watts.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - W_OVR_EXT_RTG(new PointImpl(// - "S702_W_OVR_EXT_RTG", // - "Active Power (Over-Excited) Rating", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - W_OVR_EXT_RTG_P_F(new PointImpl(// - "S702_W_OVR_EXT_RTG_P_F", // - "Specified Over-Excited PF", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - W_UND_EXT_RTG(new PointImpl(// - "S702_W_UND_EXT_RTG", // - "Active Power (Under-Excited) Rating", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - W_UND_EXT_RTG_P_F(new PointImpl(// - "S702_W_UND_EXT_RTG_P_F", // - "Specified Under-Excited PF", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - V_A_MAX_RTG(new PointImpl(// - "S702_V_A_MAX_RTG", // - "Apparent Power Max Rating", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - VAR_MAX_INJ_RTG(new PointImpl(// - "S702_VAR_MAX_INJ_RTG", // - "Reactive Power Injected Rating", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "Var_SF", // - new OptionsEnum[0])), // - VAR_MAX_ABS_RTG(new PointImpl(// - "S702_VAR_MAX_ABS_RTG", // - "Reactive Power Absorbed Rating", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE_REACTIVE, // - "Var_SF", // - new OptionsEnum[0])), // - W_CHA_RTE_MAX_RTG(new PointImpl(// - "S702_W_CHA_RTE_MAX_RTG", // - "Charge Rate Max Rating", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - W_DIS_CHA_RTE_MAX_RTG(new PointImpl(// - "S702_W_DIS_CHA_RTE_MAX_RTG", // - "Discharge Rate Max Rating", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - V_A_CHA_RTE_MAX_RTG(new PointImpl(// - "S702_V_A_CHA_RTE_MAX_RTG", // - "Charge Rate Max VA Rating", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - V_A_DIS_CHA_RTE_MAX_RTG(new PointImpl(// - "S702_V_A_DIS_CHA_RTE_MAX_RTG", // - "Discharge Rate Max VA Rating", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - V_NOM_RTG(new PointImpl(// - "S702_V_NOM_RTG", // - "AC Voltage Nominal Rating", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT_AMPERE, "VA_SF")), // + V_NOM_RTG(new ScaledValuePoint("S702_V_NOM_RTG", "AC Voltage Nominal Rating", // "AC voltage nominal rating.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - V_MAX_RTG(new PointImpl(// - "S702_V_MAX_RTG", // - "AC Voltage Max Rating", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + V_MAX_RTG(new ScaledValuePoint("S702_V_MAX_RTG", "AC Voltage Max Rating", // "AC voltage maximum rating.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - V_MIN_RTG(new PointImpl(// - "S702_V_MIN_RTG", // - "AC Voltage Min Rating", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + V_MIN_RTG(new ScaledValuePoint("S702_V_MIN_RTG", "AC Voltage Min Rating", // "AC voltage minimum rating.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - A_MAX_RTG(new PointImpl(// - "S702_A_MAX_RTG", // - "AC Current Max Rating", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - P_F_OVR_EXT_RTG(new PointImpl(// - "S702_P_F_OVR_EXT_RTG", // - "PF Over-Excited Rating", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - P_F_UND_EXT_RTG(new PointImpl(// - "S702_P_F_UND_EXT_RTG", // - "PF Under-Excited Rating", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - REACT_SUSCEPT_RTG(new PointImpl(// - "S702_REACT_SUSCEPT_RTG", // - "Reactive Susceptance", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "S_SF", // - new OptionsEnum[0])), // - NOR_OP_CAT_RTG(new PointImpl(// - "S702_NOR_OP_CAT_RTG", // - "Normal Operating Category", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S702_NorOpCatRtg.values())), // - ABN_OP_CAT_RTG(new PointImpl(// - "S702_ABN_OP_CAT_RTG", // - "Abnormal Operating Category", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S702_AbnOpCatRtg.values())), // - CTRL_MODES(new PointImpl(// - "S702_CTRL_MODES", // - "Supported Control Modes", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S702_AbnOpCatRtg.values())), // + CTRL_MODES(new BitFieldPoint("S702_CTRL_MODES", "Supported Control Modes", // "Supported control mode functions.", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S702_CtrlModes.values())), // - INT_ISLAND_CAT_RTG(new PointImpl(// - "S702_INT_ISLAND_CAT_RTG", // - "Intentional Island Categories", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, S702_CtrlModes.values())), // + INT_ISLAND_CAT_RTG(new BitFieldPoint("S702_INT_ISLAND_CAT_RTG", "Intentional Island Categories", // "Intentional island categories.", // - "", // - PointType.BITFIELD16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S702_IntIslandCatRtg.values())), // - W_MAX(new PointImpl(// - "S702_W_MAX", // - "Active Power Max Setting", // + BitFieldPoint.Type.BITFIELD16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - W_MAX_OVR_EXT(new PointImpl(// - "S702_W_MAX_OVR_EXT", // - "Active Power (Over-Excited) Setting", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - W_OVR_EXT_P_F(new PointImpl(// - "S702_W_OVR_EXT_P_F", // - "Specified Over-Excited PF", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - W_MAX_UND_EXT(new PointImpl(// - "S702_W_MAX_UND_EXT", // - "Active Power (Under-Excited) Setting", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - W_UND_EXT_P_F(new PointImpl(// - "S702_W_UND_EXT_P_F", // - "Specified Under-Excited PF", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - V_A_MAX(new PointImpl(// - "S702_V_A_MAX", // - "Apparent Power Max Setting", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - VAR_MAX_INJ(new PointImpl(// - "S702_VAR_MAX_INJ", // - "Reactive Power Injected Setting", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.VOLT_AMPERE_REACTIVE, // - "Var_SF", // - new OptionsEnum[0])), // - VAR_MAX_ABS(new PointImpl(// - "S702_VAR_MAX_ABS", // - "Reactive Power Absorbed Setting", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.VOLT_AMPERE_REACTIVE, // - "Var_SF", // - new OptionsEnum[0])), // - W_CHA_RTE_MAX(new PointImpl(// - "S702_W_CHA_RTE_MAX", // - "Charge Rate Max Setting", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - W_DIS_CHA_RTE_MAX(new PointImpl(// - "S702_W_DIS_CHA_RTE_MAX", // - "Discharge Rate Max Setting", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - V_A_CHA_RTE_MAX(new PointImpl(// - "S702_V_A_CHA_RTE_MAX", // - "Charge Rate Max VA Setting", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - V_A_DIS_CHA_RTE_MAX(new PointImpl(// - "S702_V_A_DIS_CHA_RTE_MAX", // - "Discharge Rate Max VA Setting", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.VOLT_AMPERE, // - "VA_SF", // - new OptionsEnum[0])), // - V_NOM(new PointImpl(// - "S702_V_NOM", // - "Nominal AC Voltage Setting", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.VOLT_AMPERE, "VA_SF")), // + V_NOM(new ScaledValuePoint("S702_V_NOM", "Nominal AC Voltage Setting", // "Nominal AC voltage setting.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - V_MAX(new PointImpl(// - "S702_V_MAX", // - "AC Voltage Max Setting", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - V_MIN(new PointImpl(// - "S702_V_MIN", // - "AC Voltage Min Setting", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - A_MAX(new PointImpl(// - "S702_A_MAX", // - "AC Current Max Setting", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - P_F_OVR_EXT(new PointImpl(// - "S702_P_F_OVR_EXT", // - "PF Over-Excited Setting", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - P_F_UND_EXT(new PointImpl(// - "S702_P_F_UND_EXT", // - "PF Under-Excited Setting", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "PF_SF", // - new OptionsEnum[0])), // - INT_ISLAND_CAT(new PointImpl(// - "S702_INT_ISLAND_CAT", // - "Intentional Island Categories", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE, "PF_SF")), // + INT_ISLAND_CAT(new BitFieldPoint("S702_INT_ISLAND_CAT", "Intentional Island Categories", // "Intentional island categories.", // - "", // - PointType.BITFIELD16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S702_IntIslandCat.values())), // - W_SF(new PointImpl(// - "S702_W_SF", // - "Active Power Scale Factor", // - "Active power scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PF_SF(new PointImpl(// - "S702_PF_SF", // - "Power Factor Scale Factor", // - "Power factor scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VA_SF(new PointImpl(// - "S702_VA_SF", // - "Apparent Power Scale Factor", // - "Apparent power scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VAR_S_F(new PointImpl(// - "S702_VAR_S_F", // - "Reactive Power Scale Factor", // - "Reactive power scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_SF(new PointImpl(// - "S702_V_SF", // - "Voltage Scale Factor", // - "Voltage scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - A_SF(new PointImpl(// - "S702_A_SF", // - "Current Scale Factor", // - "Current scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S_SF(new PointImpl(// - "S702_S_SF", // - "Susceptance Scale Factor", // - "Susceptance scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S702(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + BitFieldPoint.Type.BITFIELD16, false /* mandatory? */, AccessMode.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", // + "Power factor scale factor.")), // + VA_SF(new ScaleFactorPoint("S702_VA_SF", "Apparent Power Scale Factor", // + "Apparent power scale factor.")), // + VAR_S_F(new ScaleFactorPoint("S702_VAR_S_F", "Reactive Power Scale Factor", // + "Reactive power scale factor.")), // + V_SF(new ScaleFactorPoint("S702_V_SF", "Voltage Scale Factor", // + "Voltage scale factor.")), // + A_SF(new ScaleFactorPoint("S702_A_SF", "Current Scale Factor", // + "Current scale factor.")), // + S_SF(new ScaleFactorPoint("S702_S_SF", "Susceptance Scale Factor", // + "Susceptance scale factor.")); + + private final Point point; + + private S702(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } public static enum S702_NorOpCatRtg implements OptionsEnum { UNDEFINED(-1, "Undefined"), // CAT_A(0, "CAT_A"), // - CAT_B(1, "CAT_B"); // + CAT_B(1, "CAT_B"); private final int value; private final String name; @@ -11988,7 +4269,7 @@ public static enum S702_AbnOpCatRtg implements OptionsEnum { UNDEFINED(-1, "Undefined"), // CAT_1(0, "CAT_1"), // CAT_2(1, "CAT_2"), // - CAT_3(2, "CAT_3"); // + CAT_3(2, "CAT_3"); private final int value; private final String name; @@ -12014,248 +4295,119 @@ public OptionsEnum getUndefined() { } } - public static enum S702_CtrlModes implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - MAX_W(0, "MAX_W"), // - FIXED_W(1, "FIXED_W"), // - FIXED_VAR(2, "FIXED_VAR"), // - FIXED_PF(3, "FIXED_PF"), // - VOLT_VAR(4, "VOLT_VAR"), // - FREQ_WATT(5, "FREQ_WATT"), // - DYN_REACT_CURR(6, "DYN_REACT_CURR"), // - LV_TRIP(7, "LV_TRIP"), // - HV_TRIP(8, "HV_TRIP"), // - WATT_VAR(9, "WATT_VAR"), // - VOLT_WATT(10, "VOLT_WATT"), // - SCHEDULED(11, "SCHEDULED"), // - LF_TRIP(12, "LF_TRIP"), // - HF_TRIP(13, "HF_TRIP"); // - - private final int value; - private final String name; - - private S702_CtrlModes(int value, String name) { - this.value = value; - this.name = name; - } + public static enum S702_CtrlModes implements SunSpecBitPoint { + MAX_W(new BitPoint(0, "S702_CTRL_MODES_MAX_W", "Max W")), // + FIXED_W(new BitPoint(1, "S702_CTRL_MODES_FIXED_W", "Fixed W")), // + FIXED_VAR(new BitPoint(2, "S702_CTRL_MODES_FIXED_VAR", "Fixed Var")), // + FIXED_PF(new BitPoint(3, "S702_CTRL_MODES_FIXED_PF", "Fixed Pf")), // + VOLT_VAR(new BitPoint(4, "S702_CTRL_MODES_VOLT_VAR", "Volt Var")), // + FREQ_WATT(new BitPoint(5, "S702_CTRL_MODES_FREQ_WATT", "Freq Watt")), // + DYN_REACT_CURR(new BitPoint(6, "S702_CTRL_MODES_DYN_REACT_CURR", "Dyn React Curr")), // + LV_TRIP(new BitPoint(7, "S702_CTRL_MODES_LV_TRIP", "Lv Trip")), // + HV_TRIP(new BitPoint(8, "S702_CTRL_MODES_HV_TRIP", "Hv Trip")), // + WATT_VAR(new BitPoint(9, "S702_CTRL_MODES_WATT_VAR", "Watt Var")), // + VOLT_WATT(new BitPoint(10, "S702_CTRL_MODES_VOLT_WATT", "Volt Watt")), // + SCHEDULED(new BitPoint(11, "S702_CTRL_MODES_SCHEDULED", "SCHEDULED")), // + LF_TRIP(new BitPoint(12, "S702_CTRL_MODES_LF_TRIP", "Lf Trip")), // + HF_TRIP(new BitPoint(13, "S702_CTRL_MODES_HF_TRIP", "Hf Trip")); - @Override - public int getValue() { - return this.value; - } + private final BitPoint point; - @Override - public String getName() { - return this.name; + private S702_CtrlModes(BitPoint point) { + this.point = point; } @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } - public static enum S702_IntIslandCatRtg implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - UNCATEGORIZED(0, "UNCATEGORIZED"), // - INT_ISL_CAPABLE(1, "INT_ISL_CAPABLE"), // - BLACK_START_CAPABLE(2, "BLACK_START_CAPABLE"), // - ISOCH_CAPABLE(3, "ISOCH_CAPABLE"); // - - private final int value; - private final String name; - - private S702_IntIslandCatRtg(int value, String name) { - this.value = value; - this.name = name; - } + public static enum S702_IntIslandCatRtg implements SunSpecBitPoint { + UNCATEGORIZED(new BitPoint(0, "S702_INT_ISLAND_CAT_RTG_UNCATEGORIZED", "UNCATEGORIZED")), // + INT_ISL_CAPABLE(new BitPoint(1, "S702_INT_ISLAND_CAT_RTG_INT_ISL_CAPABLE", "Int Isl Capable")), // + BLACK_START_CAPABLE(new BitPoint(2, "S702_INT_ISLAND_CAT_RTG_BLACK_START_CAPABLE", "Black Start Capable")), // + ISOCH_CAPABLE(new BitPoint(3, "S702_INT_ISLAND_CAT_RTG_ISOCH_CAPABLE", "Isoch Capable")); - @Override - public int getValue() { - return this.value; - } + private final BitPoint point; - @Override - public String getName() { - return this.name; + private S702_IntIslandCatRtg(BitPoint point) { + this.point = point; } @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } - public static enum S702_IntIslandCat implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - UNCATEGORIZED(0, "UNCATEGORIZED"), // - INT_ISL_CAPABLE(1, "INT_ISL_CAPABLE"), // - BLACK_START_CAPABLE(2, "BLACK_START_CAPABLE"), // - ISOCH_CAPABLE(3, "ISOCH_CAPABLE"); // - - private final int value; - private final String name; - - private S702_IntIslandCat(int value, String name) { - this.value = value; - this.name = name; - } + public static enum S702_IntIslandCat implements SunSpecBitPoint { + UNCATEGORIZED(new BitPoint(0, "S702_INT_ISLAND_CAT_UNCATEGORIZED", "UNCATEGORIZED")), // + INT_ISL_CAPABLE(new BitPoint(1, "S702_INT_ISLAND_CAT_INT_ISL_CAPABLE", "Int Isl Capable")), // + BLACK_START_CAPABLE(new BitPoint(2, "S702_INT_ISLAND_CAT_BLACK_START_CAPABLE", "Black Start Capable")), // + ISOCH_CAPABLE(new BitPoint(3, "S702_INT_ISLAND_CAT_ISOCH_CAPABLE", "Isoch Capable")); - @Override - public int getValue() { - return this.value; - } + private final BitPoint point; - @Override - public String getName() { - return this.name; + private S702_IntIslandCat(BitPoint point) { + this.point = point; } @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } public static enum S703 implements SunSpecPoint { - ES(new PointImpl(// - "S703_ES", // - "Permit Enter Service", // + ES(new EnumPoint("S703_ES", "Permit Enter Service", // "Permit enter service.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S703_ES.values())), // - E_S_V_HI(new PointImpl(// - "S703_E_S_V_HI", // - "Enter Service Voltage High", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "V_SF", // - new OptionsEnum[0])), // - E_S_V_LO(new PointImpl(// - "S703_E_S_V_LO", // - "Enter Service Voltage Low", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "V_SF", // - new OptionsEnum[0])), // - E_S_HZ_HI(new PointImpl(// - "S703_E_S_HZ_HI", // - "Enter Service Frequency High", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_WRITE, // - Unit.HERTZ, // - "Hz_SF", // - new OptionsEnum[0])), // - E_S_HZ_LO(new PointImpl(// - "S703_E_S_HZ_LO", // - "Enter Service Frequency Low", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_WRITE, // - Unit.HERTZ, // - "Hz_SF", // - new OptionsEnum[0])), // - E_S_DLY_TMS(new PointImpl(// - "S703_E_S_DLY_TMS", // - "Enter Service Delay Time", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - E_S_RND_TMS(new PointImpl(// - "S703_E_S_RND_TMS", // - "Enter Service Random Delay", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - E_S_RMP_TMS(new PointImpl(// - "S703_E_S_RMP_TMS", // - "Enter Service Ramp Time", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - E_S_DLY_REM_TMS(new PointImpl(// - "S703_E_S_DLY_REM_TMS", // - "Enter Service Delay Remaining", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_ONLY, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - V_SF(new PointImpl(// - "S703_V_SF", // - "Voltage Scale Factor", // - "Voltage percentage scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - HZ_S_F(new PointImpl(// - "S703_HZ_S_F", // - "Frequency Scale Factor", // - "Frequency scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S703(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.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", // + "Frequency scale factor.")); + + private final Point point; + + private S703(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } public static enum S703_ES implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -12282,496 +4434,146 @@ public OptionsEnum getUndefined() { } public static enum S704 implements SunSpecPoint { - P_F_W_INJ_ENA(new PointImpl(// - "S704_P_F_W_INJ_ENA", // - "Power Factor Enable (W Inj) Enable", // + 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.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S704_PFWInjEna.values())), // - P_F_W_INJ_ENA_RVRT(new PointImpl(// - "S704_P_F_W_INJ_ENA_RVRT", // - "Power Factor Reversion Enable (W Inj)", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S704_PFWInjEnaRvrt.values())), // - P_F_W_INJ_RVRT_TMS(new PointImpl(// - "S704_P_F_W_INJ_RVRT_TMS", // - "PF Reversion Time (W Inj)", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - P_F_W_INJ_RVRT_REM(new PointImpl(// - "S704_P_F_W_INJ_RVRT_REM", // - "PF Reversion Time Rem (W Inj)", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_ONLY, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - P_F_W_ABS_ENA(new PointImpl(// - "S704_P_F_W_ABS_ENA", // - "Power Factor Enable (W Abs) Enable", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S704_PFWAbsEna.values())), // - P_F_W_ABS_ENA_RVRT(new PointImpl(// - "S704_P_F_W_ABS_ENA_RVRT", // - "Power Factor Reversion Enable (W Abs)", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S704_PFWAbsEnaRvrt.values())), // - P_F_W_ABS_RVRT_TMS(new PointImpl(// - "S704_P_F_W_ABS_RVRT_TMS", // - "PF Reversion Time (W Abs)", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - P_F_W_ABS_RVRT_REM(new PointImpl(// - "S704_P_F_W_ABS_RVRT_REM", // - "PF Reversion Time Rem (W Abs)", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_ONLY, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - W_MAX_LIM_PCT_ENA(new PointImpl(// - "S704_W_MAX_LIM_PCT_ENA", // - "Limit Max Power Pct Enable", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S704_WMaxLimPctEna.values())), // - W_MAX_LIM_PCT(new PointImpl(// - "S704_W_MAX_LIM_PCT", // - "Limit Max Power Pct Setpoint", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "WMaxLimPct_SF", // - new OptionsEnum[0])), // - W_MAX_LIM_PCT_RVRT(new PointImpl(// - "S704_W_MAX_LIM_PCT_RVRT", // - "Reversion Limit Max Power Pct", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "WMaxLimPct_SF", // - new OptionsEnum[0])), // - W_MAX_LIM_PCT_ENA_RVRT(new PointImpl(// - "S704_W_MAX_LIM_PCT_ENA_RVRT", // - "Reversion Limit Max Power Pct Enable", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S704_WMaxLimPctEnaRvrt.values())), // - W_MAX_LIM_PCT_RVRT_TMS(new PointImpl(// - "S704_W_MAX_LIM_PCT_RVRT_TMS", // - "Limit Max Power Pct Reversion Time", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - W_MAX_LIM_PCT_RVRT_REM(new PointImpl(// - "S704_W_MAX_LIM_PCT_RVRT_REM", // - "Limit Max Power Pct Rev Time Rem", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_ONLY, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - W_SET_ENA(new PointImpl(// - "S704_W_SET_ENA", // - "Set Active Power Enable", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), // + W_SET_ENA(new EnumPoint("S704_W_SET_ENA", "Set Active Power Enable", // "Set active power enable.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S704_WSetEna.values())), // - W_SET_MOD(new PointImpl(// - "S704_W_SET_MOD", // - "Set Active Power Mode", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_WSetEna.values())), // + W_SET_MOD(new EnumPoint("S704_W_SET_MOD", "Set Active Power Mode", // "Set active power mode.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S704_WSetMod.values())), // - W_SET(new PointImpl(// - "S704_W_SET", // - "Active Power Setpoint (W)", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_WSetMod.values())), // + W_SET(new ScaledValuePoint("S704_W_SET", "Active Power Setpoint (W)", // "Active power setting value in watts.", // - "", // - PointType.INT32, // - false, // - AccessMode.READ_WRITE, // - Unit.WATT, // - "WSet_SF", // - new OptionsEnum[0])), // - W_SET_RVRT(new PointImpl(// - "S704_W_SET_RVRT", // - "Reversion Active Power (W)", // + ValuePoint.Type.INT32, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT32, // - false, // - AccessMode.READ_WRITE, // - Unit.WATT, // - "WSet_SF", // - new OptionsEnum[0])), // - W_SET_PCT(new PointImpl(// - "S704_W_SET_PCT", // - "Active Power Setpoint (Pct)", // + ValuePoint.Type.INT32, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "WSetPct_SF", // - new OptionsEnum[0])), // - W_SET_PCT_RVRT(new PointImpl(// - "S704_W_SET_PCT_RVRT", // - "Reversion Active Power (Pct)", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "WSetPct_SF", // - new OptionsEnum[0])), // - W_SET_ENA_RVRT(new PointImpl(// - "S704_W_SET_ENA_RVRT", // - "Reversion Active Power Enable", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S704_WSetEnaRvrt.values())), // - W_SET_RVRT_TMS(new PointImpl(// - "S704_W_SET_RVRT_TMS", // - "Active Power Reversion Time", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - W_SET_RVRT_REM(new PointImpl(// - "S704_W_SET_RVRT_REM", // - "Active Power Rev Time Rem", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_ONLY, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - VAR_SET_ENA(new PointImpl(// - "S704_VAR_SET_ENA", // - "Set Reactive Power Enable", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), // + VAR_SET_ENA(new EnumPoint("S704_VAR_SET_ENA", "Set Reactive Power Enable", // "Set reactive power enable.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S704_VarSetEna.values())), // - VAR_SET_MOD(new PointImpl(// - "S704_VAR_SET_MOD", // - "Set Reactive Power Mode", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_VarSetEna.values())), // + VAR_SET_MOD(new EnumPoint("S704_VAR_SET_MOD", "Set Reactive Power Mode", // "Set reactive power mode.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S704_VarSetMod.values())), // - VAR_SET_PRI(new PointImpl(// - "S704_VAR_SET_PRI", // - "Reactive Power Priority", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_VarSetMod.values())), // + VAR_SET_PRI(new EnumPoint("S704_VAR_SET_PRI", "Reactive Power Priority", // "Reactive power priority.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S704_VarSetPri.values())), // - VAR_SET(new PointImpl(// - "S704_VAR_SET", // - "Reactive Power Setpoint (Vars)", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S704_VarSetPri.values())), // + VAR_SET(new ScaledValuePoint("S704_VAR_SET", "Reactive Power Setpoint (Vars)", // "Reactive power setting value in vars.", // - "", // - PointType.INT32, // - false, // - AccessMode.READ_WRITE, // - Unit.VOLT_AMPERE_REACTIVE, // - "VarSet_SF", // - new OptionsEnum[0])), // - VAR_SET_RVRT(new PointImpl(// - "S704_VAR_SET_RVRT", // - "Reversion Reactive Power (Vars)", // + ValuePoint.Type.INT32, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT32, // - false, // - AccessMode.READ_WRITE, // - Unit.VOLT_AMPERE_REACTIVE, // - "VarSet_SF", // - new OptionsEnum[0])), // - VAR_SET_PCT(new PointImpl(// - "S704_VAR_SET_PCT", // - "Reactive Power Setpoint (Pct)", // + ValuePoint.Type.INT32, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "VarSetPct_SF", // - new OptionsEnum[0])), // - VAR_SET_PCT_RVRT(new PointImpl(// - "S704_VAR_SET_PCT_RVRT", // - "Reversion Reactive Power (Pct)", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - "VarSetPct_SF", // - new OptionsEnum[0])), // - VAR_SET_ENA_RVRT(new PointImpl(// - "S704_VAR_SET_ENA_RVRT", // - "Reversion Reactive Power Enable", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S704_VarSetEnaRvrt.values())), // - VAR_SET_RVRT_TMS(new PointImpl(// - "S704_VAR_SET_RVRT_TMS", // - "Reactive Power Reversion Time", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - VAR_SET_RVRT_REM(new PointImpl(// - "S704_VAR_SET_RVRT_REM", // - "Reactive Power Rev Time Rem", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_ONLY, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - W_RMP(new PointImpl(// - "S704_W_RMP", // - "Normal Ramp Rate", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), // + W_RMP(new ValuePoint("S704_W_RMP", "Normal Ramp Rate", // "Ramp rate for increases in active power during normal generation.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - W_RMP_REF(new PointImpl(// - "S704_W_RMP_REF", // - "Normal Ramp Rate Reference", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S704_WRmpRef.values())), // - VAR_RMP(new PointImpl(// - "S704_VAR_RMP", // - "Reactive Power Ramp Rate", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ANTI_ISL_ENA(new PointImpl(// - "S704_ANTI_ISL_ENA", // - "Anti-Islanding Enable", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), // + ANTI_ISL_ENA(new EnumPoint("S704_ANTI_ISL_ENA", "Anti-Islanding Enable", // "Anti-islanding enable.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S704_AntiIslEna.values())), // - PF_SF(new PointImpl(// - "S704_PF_SF", // - "Power Factor Scale Factor", // - "Power factor scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - W_MAX_LIM_PCT_S_F(new PointImpl(// - "S704_W_MAX_LIM_PCT_S_F", // - "Limit Max Power Scale Factor", // - "Limit maximum power scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - W_SET_S_F(new PointImpl(// - "S704_W_SET_S_F", // - "Active Power Scale Factor", // - "Active power scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - W_SET_PCT_S_F(new PointImpl(// - "S704_W_SET_PCT_S_F", // - "Active Power Pct Scale Factor", // - "Active power pct scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VAR_SET_S_F(new PointImpl(// - "S704_VAR_SET_S_F", // - "Reactive Power Scale Factor", // - "Reactive power scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - VAR_SET_PCT_S_F(new PointImpl(// - "S704_VAR_SET_PCT_S_F", // - "Reactive Power Pct Scale Factor", // - "Reactive power pct scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S704(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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", // + "Limit maximum power scale factor.")), // + W_SET_S_F(new ScaleFactorPoint("S704_W_SET_S_F", "Active Power Scale Factor", // + "Active power scale factor.")), // + W_SET_PCT_S_F(new ScaleFactorPoint("S704_W_SET_PCT_S_F", "Active Power Pct Scale Factor", // + "Active power pct scale factor.")), // + VAR_SET_S_F(new ScaleFactorPoint("S704_VAR_SET_S_F", "Reactive Power Scale Factor", // + "Reactive power scale factor.")), // + VAR_SET_PCT_S_F(new ScaleFactorPoint("S704_VAR_SET_PCT_S_F", "Reactive Power Pct Scale Factor", // + "Reactive power pct scale factor.")); + + private final Point point; + + private S704(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } public static enum S704_PFWInjEna implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -12800,7 +4602,7 @@ public OptionsEnum getUndefined() { public static enum S704_PFWInjEnaRvrt implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -12829,7 +4631,7 @@ public OptionsEnum getUndefined() { public static enum S704_PFWAbsEna implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -12858,7 +4660,7 @@ public OptionsEnum getUndefined() { public static enum S704_PFWAbsEnaRvrt implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -12887,7 +4689,7 @@ public OptionsEnum getUndefined() { public static enum S704_WMaxLimPctEna implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -12916,7 +4718,7 @@ public OptionsEnum getUndefined() { public static enum S704_WMaxLimPctEnaRvrt implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -12945,7 +4747,7 @@ public OptionsEnum getUndefined() { public static enum S704_WSetEna implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -12974,7 +4776,7 @@ public OptionsEnum getUndefined() { public static enum S704_WSetMod implements OptionsEnum { UNDEFINED(-1, "Undefined"), // W_MAX_PCT(0, "W_MAX_PCT"), // - WATTS(1, "WATTS"); // + WATTS(1, "WATTS"); private final int value; private final String name; @@ -13003,7 +4805,7 @@ public OptionsEnum getUndefined() { public static enum S704_WSetEnaRvrt implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -13032,7 +4834,7 @@ public OptionsEnum getUndefined() { public static enum S704_VarSetEna implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -13064,7 +4866,7 @@ public static enum S704_VarSetMod implements OptionsEnum { VAR_MAX_PCT(1, "VAR_MAX_PCT"), // VAR_AVAIL_PCT(2, "VAR_AVAIL_PCT"), // VA_MAX_PCT(3, "VA_MAX_PCT"), // - VARS(4, "VARS"); // + VARS(4, "VARS"); private final int value; private final String name; @@ -13094,7 +4896,7 @@ public static enum S704_VarSetPri implements OptionsEnum { UNDEFINED(-1, "Undefined"), // ACTIVE(0, "ACTIVE"), // REACTIVE(1, "REACTIVE"), // - VENDOR(2, "VENDOR"); // + VENDOR(2, "VENDOR"); private final int value; private final String name; @@ -13123,7 +4925,7 @@ public OptionsEnum getUndefined() { public static enum S704_VarSetEnaRvrt implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -13152,7 +4954,7 @@ public OptionsEnum getUndefined() { public static enum S704_WRmpRef implements OptionsEnum { UNDEFINED(-1, "Undefined"), // A_MAX(0, "A_MAX"), // - W_MAX(1, "W_MAX"); // + W_MAX(1, "W_MAX"); private final int value; private final String name; @@ -13181,7 +4983,7 @@ public OptionsEnum getUndefined() { public static enum S704_AntiIslEna implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -13208,144 +5010,53 @@ public OptionsEnum getUndefined() { } public static enum S705 implements SunSpecPoint { - ENA(new PointImpl(// - "S705_ENA", // - "DER Volt-Var Module Enable", // + ENA(new EnumPoint("S705_ENA", "DER Volt-Var Module Enable", // "Volt-Var control enable.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S705_Ena.values())), // - ADPT_CRV_REQ(new PointImpl(// - "S705_ADPT_CRV_REQ", // - "Adopt Curve Request", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ADPT_CRV_RSLT(new PointImpl(// - "S705_ADPT_CRV_RSLT", // - "Adopt Curve Result", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), // + ADPT_CRV_RSLT(new EnumPoint("S705_ADPT_CRV_RSLT", "Adopt Curve Result", // "Result of last adopt curve operation.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S705_AdptCrvRslt.values())), // - N_PT(new PointImpl(// - "S705_N_PT", // - "Number Of Points", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S705_AdptCrvRslt.values())), // + N_PT(new ValuePoint("S705_N_PT", "Number Of Points", // "Number of curve points supported.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - N_CRV(new PointImpl(// - "S705_N_CRV", // - "Stored Curve Count", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + N_CRV(new ValuePoint("S705_N_CRV", "Stored Curve Count", // "Number of stored curves supported.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - RVRT_TMS(new PointImpl(// - "S705_RVRT_TMS", // - "Reversion Timeout", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + RVRT_TMS(new ValuePoint("S705_RVRT_TMS", "Reversion Timeout", // "Reversion time in seconds. 0 = No reversion time.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - RVRT_REM(new PointImpl(// - "S705_RVRT_REM", // - "Reversion Time Remaining", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), // + RVRT_REM(new ValuePoint("S705_RVRT_REM", "Reversion Time Remaining", // "Reversion time remaining in seconds.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_ONLY, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - RVRT_CRV(new PointImpl(// - "S705_RVRT_CRV", // - "Reversion Curve", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), // + RVRT_CRV(new ValuePoint("S705_RVRT_CRV", "Reversion Curve", // "Default curve after reversion timeout.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_SF(new PointImpl(// - "S705_V_SF", // - "Voltage Scale Factor", // - "Scale factor for curve voltage points.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DEPT_REF_S_F(new PointImpl(// - "S705_DEPT_REF_S_F", // - "Var Scale Factor", // - "Scale factor for curve var points.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - RSP_TMS_S_F(new PointImpl(// - "S705_RSP_TMS_S_F", // - "Open-Loop Scale Factor", // - "Open loop response time scale factor.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S705(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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", // + "Scale factor for curve var points.")), // + RSP_TMS_S_F(new ScaleFactorPoint("S705_RSP_TMS_S_F", "Open-Loop Scale Factor", // + "Open loop response time scale factor.")); + + private final Point point; + + private S705(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } public static enum S705_Ena implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -13375,7 +5086,7 @@ public static enum S705_AdptCrvRslt implements OptionsEnum { UNDEFINED(-1, "Undefined"), // IN_PROGRESS(0, "IN_PROGRESS"), // COMPLETED(1, "COMPLETED"), // - FAILED(2, "FAILED"); // + FAILED(2, "FAILED"); private final int value; private final String name; @@ -13402,144 +5113,53 @@ public OptionsEnum getUndefined() { } public static enum S706 implements SunSpecPoint { - ENA(new PointImpl(// - "S706_ENA", // - "DER Volt-Watt Module Enable", // + ENA(new EnumPoint("S706_ENA", "DER Volt-Watt Module Enable", // "Volt-Watt control enable.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S706_Ena.values())), // - ADPT_CRV_REQ(new PointImpl(// - "S706_ADPT_CRV_REQ", // - "Adopt Curve Request", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ADPT_CRV_RSLT(new PointImpl(// - "S706_ADPT_CRV_RSLT", // - "Adopt Curve Result", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), // + ADPT_CRV_RSLT(new EnumPoint("S706_ADPT_CRV_RSLT", "Adopt Curve Result", // "Result of last adopt curve operation.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S706_AdptCrvRslt.values())), // - N_PT(new PointImpl(// - "S706_N_PT", // - "Number Of Points", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S706_AdptCrvRslt.values())), // + N_PT(new ValuePoint("S706_N_PT", "Number Of Points", // "Number of curve points supported.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - N_CRV(new PointImpl(// - "S706_N_CRV", // - "Stored Curve Count", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + N_CRV(new ValuePoint("S706_N_CRV", "Stored Curve Count", // "Number of stored curves supported.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - RVRT_TMS(new PointImpl(// - "S706_RVRT_TMS", // - "Reversion Timeout", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + RVRT_TMS(new ValuePoint("S706_RVRT_TMS", "Reversion Timeout", // "Reversion time in seconds. 0 = No reversion time.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - RVRT_REM(new PointImpl(// - "S706_RVRT_REM", // - "Reversion Time Remaining", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), // + RVRT_REM(new ValuePoint("S706_RVRT_REM", "Reversion Time Remaining", // "Reversion time remaining in seconds.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_ONLY, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - RVRT_CRV(new PointImpl(// - "S706_RVRT_CRV", // - "Reversion Curve", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), // + RVRT_CRV(new ValuePoint("S706_RVRT_CRV", "Reversion Curve", // "Default curve after reversion timeout.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_SF(new PointImpl(// - "S706_V_SF", // - "Voltage Scale Factor", // - "Scale factor for curve voltage points.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DEPT_REF_S_F(new PointImpl(// - "S706_DEPT_REF_S_F", // - "Watt Scale Factor", // - "Scale factor for curve watt points.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - RSP_TMS_S_F(new PointImpl(// - "S706_RSP_TMS_S_F", // - "Open-Loop Scale Factor", // - "Open loop response time scale factor.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S706(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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", // + "Scale factor for curve watt points.")), // + RSP_TMS_S_F(new ScaleFactorPoint("S706_RSP_TMS_S_F", "Open-Loop Scale Factor", // + "Open loop response time scale factor.")); + + private final Point point; + + private S706(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } public static enum S706_Ena implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -13569,7 +5189,7 @@ public static enum S706_AdptCrvRslt implements OptionsEnum { UNDEFINED(-1, "Undefined"), // IN_PROGRESS(0, "IN_PROGRESS"), // COMPLETED(1, "COMPLETED"), // - FAILED(2, "FAILED"); // + FAILED(2, "FAILED"); private final int value; private final String name; @@ -13596,100 +5216,42 @@ public OptionsEnum getUndefined() { } public static enum S707 implements SunSpecPoint { - ENA(new PointImpl(// - "S707_ENA", // - "DER Trip LV Module Enable", // + ENA(new EnumPoint("S707_ENA", "DER Trip LV Module Enable", // "DER low voltage trip control enable.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S707_Ena.values())), // - ADPT_CRV_REQ(new PointImpl(// - "S707_ADPT_CRV_REQ", // - "Adopt Curve Request", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ADPT_CRV_RSLT(new PointImpl(// - "S707_ADPT_CRV_RSLT", // - "Adopt Curve Result", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), // + ADPT_CRV_RSLT(new EnumPoint("S707_ADPT_CRV_RSLT", "Adopt Curve Result", // "Result of last adopt curve operation.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S707_AdptCrvRslt.values())), // - N_PT(new PointImpl(// - "S707_N_PT", // - "Number Of Points", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S707_AdptCrvRslt.values())), // + N_PT(new ValuePoint("S707_N_PT", "Number Of Points", // "Number of curve points supported.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - N_CRV_SET(new PointImpl(// - "S707_N_CRV_SET", // - "Stored Curve Count", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + N_CRV_SET(new ValuePoint("S707_N_CRV_SET", "Stored Curve Count", // "Number of stored curves supported.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_SF(new PointImpl(// - "S707_V_SF", // - "Voltage Scale Factor", // - "Scale factor for curve voltage points.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TMS_S_F(new PointImpl(// - "S707_TMS_S_F", // - "Time Point Scale Factor", // - "Scale factor for curve time points.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S707(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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", // + "Scale factor for curve time points.")); + + private final Point point; + + private S707(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } public static enum S707_Ena implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -13719,7 +5281,7 @@ public static enum S707_AdptCrvRslt implements OptionsEnum { UNDEFINED(-1, "Undefined"), // IN_PROGRESS(0, "IN_PROGRESS"), // COMPLETED(1, "COMPLETED"), // - FAILED(2, "FAILED"); // + FAILED(2, "FAILED"); private final int value; private final String name; @@ -13746,100 +5308,42 @@ public OptionsEnum getUndefined() { } public static enum S708 implements SunSpecPoint { - ENA(new PointImpl(// - "S708_ENA", // - "DER Trip HV Module Enable", // + ENA(new EnumPoint("S708_ENA", "DER Trip HV Module Enable", // "DER high voltage trip control enable.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S708_Ena.values())), // - ADPT_CRV_REQ(new PointImpl(// - "S708_ADPT_CRV_REQ", // - "Adopt Curve Request", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ADPT_CRV_RSLT(new PointImpl(// - "S708_ADPT_CRV_RSLT", // - "Adopt Curve Result", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), // + ADPT_CRV_RSLT(new EnumPoint("S708_ADPT_CRV_RSLT", "Adopt Curve Result", // "Result of last adopt curve operation.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S708_AdptCrvRslt.values())), // - N_PT(new PointImpl(// - "S708_N_PT", // - "Number Of Points", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S708_AdptCrvRslt.values())), // + N_PT(new ValuePoint("S708_N_PT", "Number Of Points", // "Number of curve points supported.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - N_CRV_SET(new PointImpl(// - "S708_N_CRV_SET", // - "Stored Curve Count", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + N_CRV_SET(new ValuePoint("S708_N_CRV_SET", "Stored Curve Count", // "Number of stored curves supported.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_SF(new PointImpl(// - "S708_V_SF", // - "Voltage Scale Factor", // - "Scale factor for curve voltage points.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TMS_S_F(new PointImpl(// - "S708_TMS_S_F", // - "Time Point Scale Factor", // - "Scale factor for curve time points.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S708(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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", // + "Scale factor for curve time points.")); + + private final Point point; + + private S708(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } public static enum S708_Ena implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -13869,7 +5373,7 @@ public static enum S708_AdptCrvRslt implements OptionsEnum { UNDEFINED(-1, "Undefined"), // IN_PROGRESS(0, "IN_PROGRESS"), // COMPLETED(1, "COMPLETED"), // - FAILED(2, "FAILED"); // + FAILED(2, "FAILED"); private final int value; private final String name; @@ -13896,100 +5400,42 @@ public OptionsEnum getUndefined() { } public static enum S709 implements SunSpecPoint { - ENA(new PointImpl(// - "S709_ENA", // - "DER Trip LF Module Enable", // + ENA(new EnumPoint("S709_ENA", "DER Trip LF Module Enable", // "DER low frequency trip control enable.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S709_Ena.values())), // - ADPT_CRV_REQ(new PointImpl(// - "S709_ADPT_CRV_REQ", // - "Adopt Curve Request", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ADPT_CRV_RSLT(new PointImpl(// - "S709_ADPT_CRV_RSLT", // - "Adopt Curve Result", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), // + ADPT_CRV_RSLT(new EnumPoint("S709_ADPT_CRV_RSLT", "Adopt Curve Result", // "Result of last adopt curve operation.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S709_AdptCrvRslt.values())), // - N_PT(new PointImpl(// - "S709_N_PT", // - "Number Of Points", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S709_AdptCrvRslt.values())), // + N_PT(new ValuePoint("S709_N_PT", "Number Of Points", // "Number of curve points supported.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - N_CRV_SET(new PointImpl(// - "S709_N_CRV_SET", // - "Stored Curve Count", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + N_CRV_SET(new ValuePoint("S709_N_CRV_SET", "Stored Curve Count", // "Number of stored curves supported.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - HZ_S_F(new PointImpl(// - "S709_HZ_S_F", // - "Frequency Scale Factor", // - "Scale factor for curve frequency points.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TMS_S_F(new PointImpl(// - "S709_TMS_S_F", // - "Time Point Scale Factor", // - "Scale factor for curve time points.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S709(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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", // + "Scale factor for curve time points.")); + + private final Point point; + + private S709(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } public static enum S709_Ena implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -14019,7 +5465,7 @@ public static enum S709_AdptCrvRslt implements OptionsEnum { UNDEFINED(-1, "Undefined"), // IN_PROGRESS(0, "IN_PROGRESS"), // COMPLETED(1, "COMPLETED"), // - FAILED(2, "FAILED"); // + FAILED(2, "FAILED"); private final int value; private final String name; @@ -14046,100 +5492,42 @@ public OptionsEnum getUndefined() { } public static enum S710 implements SunSpecPoint { - ENA(new PointImpl(// - "S710_ENA", // - "DER Trip HF Module Enable", // + ENA(new EnumPoint("S710_ENA", "DER Trip HF Module Enable", // "DER high frequency trip control enable.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S710_Ena.values())), // - ADPT_CRV_REQ(new PointImpl(// - "S710_ADPT_CRV_REQ", // - "Adopt Curve Request", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ADPT_CRV_RSLT(new PointImpl(// - "S710_ADPT_CRV_RSLT", // - "Adopt Curve Result", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), // + ADPT_CRV_RSLT(new EnumPoint("S710_ADPT_CRV_RSLT", "Adopt Curve Result", // "Result of last adopt curve operation.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S710_AdptCrvRslt.values())), // - N_PT(new PointImpl(// - "S710_N_PT", // - "Number Of Points", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S710_AdptCrvRslt.values())), // + N_PT(new ValuePoint("S710_N_PT", "Number Of Points", // "Number of curve points supported.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - N_CRV_SET(new PointImpl(// - "S710_N_CRV_SET", // - "Stored Curve Count", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + N_CRV_SET(new ValuePoint("S710_N_CRV_SET", "Stored Curve Count", // "Number of stored curves supported.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - HZ_S_F(new PointImpl(// - "S710_HZ_S_F", // - "Frequency Scale Factor", // - "Scale factor for curve frequency points.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TMS_S_F(new PointImpl(// - "S710_TMS_S_F", // - "Time Point Scale Factor", // - "Scale factor for curve time points.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S710(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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", // + "Scale factor for curve time points.")); + + private final Point point; + + private S710(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } public static enum S710_Ena implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -14169,7 +5557,7 @@ public static enum S710_AdptCrvRslt implements OptionsEnum { UNDEFINED(-1, "Undefined"), // IN_PROGRESS(0, "IN_PROGRESS"), // COMPLETED(1, "COMPLETED"), // - FAILED(2, "FAILED"); // + FAILED(2, "FAILED"); private final int value; private final String name; @@ -14196,133 +5584,50 @@ public OptionsEnum getUndefined() { } public static enum S711 implements SunSpecPoint { - ENA(new PointImpl(// - "S711_ENA", // - "DER Frequency Droop Module Enable", // + ENA(new EnumPoint("S711_ENA", "DER Frequency Droop Module Enable", // "DER Frequency-Watt (Frequency-Droop) control enable.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S711_Ena.values())), // - ADPT_CTL_REQ(new PointImpl(// - "S711_ADPT_CTL_REQ", // - "Set Active Control Request", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ADPT_CTL_RSLT(new PointImpl(// - "S711_ADPT_CTL_RSLT", // - "Set Active Control Result", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), // + ADPT_CTL_RSLT(new EnumPoint("S711_ADPT_CTL_RSLT", "Set Active Control Result", // "Result of last set active control operation.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S711_AdptCtlRslt.values())), // - N_CTL(new PointImpl(// - "S711_N_CTL", // - "Stored Control Count", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S711_AdptCtlRslt.values())), // + N_CTL(new ValuePoint("S711_N_CTL", "Stored Control Count", // "Number of stored controls supported.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - RVRT_TMS(new PointImpl(// - "S711_RVRT_TMS", // - "Reversion Timeout", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + RVRT_TMS(new ValuePoint("S711_RVRT_TMS", "Reversion Timeout", // "Reversion time in seconds. 0 = No reversion time.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - RVRT_REM(new PointImpl(// - "S711_RVRT_REM", // - "Reversion Time Left", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), // + RVRT_REM(new ValuePoint("S711_RVRT_REM", "Reversion Time Left", // "Reversion time remaining in seconds.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_ONLY, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - RVRT_CTL(new PointImpl(// - "S711_RVRT_CTL", // - "Reversion Control", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), // + RVRT_CTL(new ValuePoint("S711_RVRT_CTL", "Reversion Control", // "Default control after reversion timeout.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DB_S_F(new PointImpl(// - "S711_DB_S_F", // - "Deadband Scale Factor", // - "Deadband scale factor.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - K_SF(new PointImpl(// - "S711_K_SF", // - "Frequency Change Scale Factor", // - "Frequency change scale factor.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - RSP_TMS_S_F(new PointImpl(// - "S711_RSP_TMS_S_F", // - "Open-Loop Scale Factor", // - "Open loop response time scale factor.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S711(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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", // + "Frequency change scale factor.")), // + RSP_TMS_S_F(new ScaleFactorPoint("S711_RSP_TMS_S_F", "Open-Loop Scale Factor", // + "Open loop response time scale factor.")); + + private final Point point; + + private S711(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } public static enum S711_Ena implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -14352,7 +5657,7 @@ public static enum S711_AdptCtlRslt implements OptionsEnum { UNDEFINED(-1, "Undefined"), // IN_PROGRESS(0, "IN_PROGRESS"), // COMPLETED(1, "COMPLETED"), // - FAILED(2, "FAILED"); // + FAILED(2, "FAILED"); private final int value; private final String name; @@ -14379,133 +5684,51 @@ public OptionsEnum getUndefined() { } public static enum S712 implements SunSpecPoint { - ENA(new PointImpl(// - "S712_ENA", // - "DER Watt-Var Module Enable", // + ENA(new EnumPoint("S712_ENA", "DER Watt-Var Module Enable", // "DER Watt-Var control enable.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S712_Ena.values())), // - ADPT_CRV_REQ(new PointImpl(// - "S712_ADPT_CRV_REQ", // - "Set Active Curve Request", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ADPT_CRV_RSLT(new PointImpl(// - "S712_ADPT_CRV_RSLT", // - "Set Active Curve Result", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), // + ADPT_CRV_RSLT(new EnumPoint("S712_ADPT_CRV_RSLT", "Set Active Curve Result", // "Result of last set active curve operation.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S712_AdptCrvRslt.values())), // - N_PT(new PointImpl(// - "S712_N_PT", // - "Number Of Points", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S712_AdptCrvRslt.values())), // + N_PT(new ValuePoint("S712_N_PT", "Number Of Points", // "Number of curve points supported.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - N_CRV(new PointImpl(// - "S712_N_CRV", // - "Stored Curve Count", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + N_CRV(new ValuePoint("S712_N_CRV", "Stored Curve Count", // "Number of stored curves supported.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - RVRT_TMS(new PointImpl(// - "S712_RVRT_TMS", // - "Reversion Timeout", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + RVRT_TMS(new ValuePoint("S712_RVRT_TMS", "Reversion Timeout", // "Reversion time in seconds. 0 = No reversion time.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_WRITE, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - RVRT_REM(new PointImpl(// - "S712_RVRT_REM", // - "Reversion Time Left", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.SECONDS)), // + RVRT_REM(new ValuePoint("S712_RVRT_REM", "Reversion Time Left", // "Reversion time remaining in seconds.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_ONLY, // - Unit.SECONDS, // - null, // - new OptionsEnum[0])), // - RVRT_CRV(new PointImpl(// - "S712_RVRT_CRV", // - "Reversion Curve", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.SECONDS)), // + RVRT_CRV(new ValuePoint("S712_RVRT_CRV", "Reversion Curve", // "Default curve after reversion timeout.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - W_SF(new PointImpl(// - "S712_W_SF", // - "Active Power Scale Factor", // - "Scale factor for curve active power points.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DEPT_REF_S_F(new PointImpl(// - "S712_DEPT_REF_S_F", // - "Var Scale Factor", // - "Scale factor for curve var points.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S712(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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", // + "Scale factor for curve var points.")); + + private final Point point; + + private S712(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } public static enum S712_Ena implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -14535,7 +5758,7 @@ public static enum S712_AdptCrvRslt implements OptionsEnum { UNDEFINED(-1, "Undefined"), // IN_PROGRESS(0, "IN_PROGRESS"), // COMPLETED(1, "COMPLETED"), // - FAILED(2, "FAILED"); // + FAILED(2, "FAILED"); private final int value; private final String name; @@ -14562,93 +5785,35 @@ public OptionsEnum getUndefined() { } public static enum S713 implements SunSpecPoint { - W_H_RTG(new PointImpl(// - "S713_W_H_RTG", // - "Energy Rating", // + W_H_RTG(new ScaledValuePoint("S713_W_H_RTG", "Energy Rating", // "Energy rating of the DER storage.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "WH_SF", // - new OptionsEnum[0])), // - W_H_AVAIL(new PointImpl(// - "S713_W_H_AVAIL", // - "Energy Available", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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)", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "WH_SF", // - new OptionsEnum[0])), // - SO_C(new PointImpl(// - "S713_SO_C", // - "State of Charge", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "Pct_SF", // - new OptionsEnum[0])), // - SO_H(new PointImpl(// - "S713_SO_H", // - "State of Health", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "Pct_SF")), // + SO_H(new ScaledValuePoint("S713_SO_H", "State of Health", // "State of health of the DER storage.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "Pct_SF", // - new OptionsEnum[0])), // - STA(new PointImpl(// - "S713_STA", // - "Status", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE, "Pct_SF")), // + STA(new EnumPoint("S713_STA", "Status", // "Storage status.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S713_Sta.values())), // - WH_SF(new PointImpl(// - "S713_WH_SF", // - "Energy Scale Factor", // - "Scale factor for energy capacity.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PCT_S_F(new PointImpl(// - "S713_PCT_S_F", // - "Percent Scale Factor", // - "Scale factor for percentage.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S713(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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", // + "Scale factor for percentage.")); + + private final Point point; + + private S713(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } @@ -14656,7 +5821,7 @@ public static enum S713_Sta implements OptionsEnum { UNDEFINED(-1, "Undefined"), // OK(0, "OK"), // WARNING(1, "WARNING"), // - ERROR(2, "ERROR"); // + ERROR(2, "ERROR"); private final int value; private final String name; @@ -14683,213 +5848,80 @@ public OptionsEnum getUndefined() { } public static enum S714 implements SunSpecPoint { - PRT_ALRMS(new PointImpl(// - "S714_PRT_ALRMS", // - "Port Alarms", // + 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.", // - "", // - PointType.BITFIELD32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - N_PRT(new PointImpl(// - "S714_N_PRT", // - "Number Of Ports", // + BitFieldPoint.Type.BITFIELD32, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + N_PRT(new ValuePoint("S714_N_PRT", "Number Of Ports", // "Number of DC ports.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DCA(new PointImpl(// - "S714_DCA", // - "DC Current", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + DCA(new ScaledValuePoint("S714_DCA", "DC Current", // "Total DC current for all ports.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "DCA_SF", // - new OptionsEnum[0])), // - DCW(new PointImpl(// - "S714_DCW", // - "DC Power", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "DCA_SF")), // + DCW(new ScaledValuePoint("S714_DCW", "DC Power", // "Total DC power for all ports.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "DCW_SF", // - new OptionsEnum[0])), // - D_C_WH_INJ(new PointImpl(// - "S714_D_C_WH_INJ", // - "DC Energy Injected", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT64, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "DCWH_SF", // - new OptionsEnum[0])), // - D_C_WH_ABS(new PointImpl(// - "S714_D_C_WH_ABS", // - "DC Energy Absorbed", // + ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT64, // - false, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "DCWH_SF", // - new OptionsEnum[0])), // - DCA_SF(new PointImpl(// - "S714_DCA_SF", // - "DC Current Scale Factor", // - "DC current scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DCV_SF(new PointImpl(// - "S714_DCV_SF", // - "DC Voltage Scale Factor", // - "DC voltage scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DCW_SF(new PointImpl(// - "S714_DCW_SF", // - "DC Power Scale Factor", // - "DC power scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DCWH_SF(new PointImpl(// - "S714_DCWH_SF", // - "DC Energy Scale Factor", // - "DC energy scale factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TMP_S_F(new PointImpl(// - "S714_TMP_S_F", // - "Temperature Scale Factor", // - "Temperature Scale Factor.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S714(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + ValuePoint.Type.UINT64, false /* mandatory? */, AccessMode.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", // + "DC voltage scale factor.")), // + DCW_SF(new ScaleFactorPoint("S714_DCW_SF", "DC Power Scale Factor", // + "DC power scale factor.")), // + DCWH_SF(new ScaleFactorPoint("S714_DCWH_SF", "DC Energy Scale Factor", // + "DC energy scale factor.")), // + TMP_S_F(new ScaleFactorPoint("S714_TMP_S_F", "Temperature Scale Factor", // + "Temperature Scale Factor.")); + + private final Point point; + + private S714(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } public static enum S715 implements SunSpecPoint { - LOC_REM_CTL(new PointImpl(// - "S715_LOC_REM_CTL", // - "Control Mode", // + LOC_REM_CTL(new EnumPoint("S715_LOC_REM_CTL", "Control Mode", // "DER control mode. Enumeration.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S715_LocRemCtl.values())), // - D_E_R_HB(new PointImpl(// - "S715_D_E_R_HB", // - "DER Heartbeat", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - CONTROLLER_HB(new PointImpl(// - "S715_CONTROLLER_HB", // - "Controller Heartbeat", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ALARM_RESET(new PointImpl(// - "S715_ALARM_RESET", // - "Alarm Reset", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), // + ALARM_RESET(new ValuePoint("S715_ALARM_RESET", "Alarm Reset", // "Used to reset any latched alarms. 1 = Reset.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - OP_CTL(new PointImpl(// - "S715_OP_CTL", // - "Set Operation", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), // + OP_CTL(new EnumPoint("S715_OP_CTL", "Set Operation", // "Commands to PCS. Enumerated value.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S715_OpCtl.values())); // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_WRITE, S715_OpCtl.values())); - protected final PointImpl impl; + private final Point point; - private S715(PointImpl impl) { - this.impl = impl; + private S715(Point point) { + this.point = point; } @Override - public PointImpl get() { - return this.impl; + public Point get() { + return this.point; } } public static enum S715_LocRemCtl implements OptionsEnum { UNDEFINED(-1, "Undefined"), // REMOTE(0, "REMOTE"), // - LOCAL(1, "LOCAL"); // + LOCAL(1, "LOCAL"); private final int value; private final String name; @@ -14920,7 +5952,7 @@ public static enum S715_OpCtl implements OptionsEnum { STOP(0, "STOP"), // START(1, "START"), // ENTER_STANDBY(2, "ENTER_STANDBY"), // - EXIT_STANDBY(3, "EXIT_STANDBY"); // + EXIT_STANDBY(3, "EXIT_STANDBY"); private final int value; private final String name; @@ -14947,657 +5979,189 @@ public OptionsEnum getUndefined() { } public static enum S801 implements SunSpecPoint { - DEPRECATED(new PointImpl(// - "S801_DEPRECATED", // - "Deprecated Model", // + DEPRECATED(new EnumPoint("S801_DEPRECATED", "Deprecated Model", // "This model has been deprecated.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])); - protected final PointImpl impl; + private final Point point; - private S801(PointImpl impl) { - this.impl = impl; + private S801(Point point) { + this.point = point; } @Override - public PointImpl get() { - return this.impl; + public Point get() { + return this.point; } } public static enum S802 implements SunSpecPoint { - A_H_RTG(new PointImpl(// - "S802_A_H_RTG", // - "Nameplate Charge Capacity", // + A_H_RTG(new ScaledValuePoint("S802_A_H_RTG", "Nameplate Charge Capacity", // "Nameplate charge capacity in amp-hours.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE_HOURS, // - "AHRtg_SF", // - new OptionsEnum[0])), // - W_H_RTG(new PointImpl(// - "S802_W_H_RTG", // - "Nameplate Energy Capacity", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.CUMULATED_WATT_HOURS, // - "WHRtg_SF", // - new OptionsEnum[0])), // - W_CHA_RTE_MAX(new PointImpl(// - "S802_W_CHA_RTE_MAX", // - "Nameplate Max Charge Rate", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "WChaDisChaMax_SF", // - new OptionsEnum[0])), // - W_DIS_CHA_RTE_MAX(new PointImpl(// - "S802_W_DIS_CHA_RTE_MAX", // - "Nameplate Max Discharge Rate", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "WChaDisChaMax_SF", // - new OptionsEnum[0])), // - DIS_CHA_RTE(new PointImpl(// - "S802_DIS_CHA_RTE", // - "Self Discharge Rate", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.PERCENT, // - "DisChaRte_SF", // - new OptionsEnum[0])), // - SO_C_MAX(new PointImpl(// - "S802_SO_C_MAX", // - "Nameplate Max SoC", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.PERCENT, // - "SoC_SF", // - new OptionsEnum[0])), // - SO_C_MIN(new PointImpl(// - "S802_SO_C_MIN", // - "Nameplate Min SoC", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.PERCENT, // - "SoC_SF", // - new OptionsEnum[0])), // - SOC_RSV_MAX(new PointImpl(// - "S802_SOC_RSV_MAX", // - "Max Reserve Percent", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "SoC_SF", // - new OptionsEnum[0])), // - SO_C_RSV_MIN(new PointImpl(// - "S802_SO_C_RSV_MIN", // - "Min Reserve Percent", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.PERCENT, // - "SoC_SF", // - new OptionsEnum[0])), // - SO_C(new PointImpl(// - "S802_SO_C", // - "State of Charge", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.PERCENT, "SoC_SF")), // + SO_C(new ScaledValuePoint("S802_SO_C", "State of Charge", // "State of charge, expressed as a percentage.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.PERCENT, // - "SoC_SF", // - new OptionsEnum[0])), // - DO_D(new PointImpl(// - "S802_DO_D", // - "Depth of Discharge", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.PERCENT, "SoC_SF")), // + DO_D(new ScaledValuePoint("S802_DO_D", "Depth of Discharge", // "Depth of discharge, expressed as a percentage.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.PERCENT, // - "DoD_SF", // - new OptionsEnum[0])), // - SO_H(new PointImpl(// - "S802_SO_H", // - "State of Health", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.PERCENT, "DoD_SF")), // + SO_H(new ScaledValuePoint("S802_SO_H", "State of Health", // "Percentage of battery life remaining.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.PERCENT, // - "SoH_SF", // - new OptionsEnum[0])), // - N_CYC(new PointImpl(// - "S802_N_CYC", // - "Cycle Count", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.PERCENT, "SoH_SF")), // + N_CYC(new ValuePoint("S802_N_CYC", "Cycle Count", // "Number of cycles executed in the battery.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - CHA_ST(new PointImpl(// - "S802_CHA_ST", // - "Charge Status", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + CHA_ST(new EnumPoint("S802_CHA_ST", "Charge Status", // "Charge status of storage device. Enumeration.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S802_ChaSt.values())), // - LOC_REM_CTL(new PointImpl(// - "S802_LOC_REM_CTL", // - "Control Mode", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S802_ChaSt.values())), // + LOC_REM_CTL(new EnumPoint("S802_LOC_REM_CTL", "Control Mode", // "Battery control mode. Enumeration.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S802_LocRemCtl.values())), // - HB(new PointImpl(// - "S802_HB", // - "Battery Heartbeat", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S802_LocRemCtl.values())), // + HB(new ValuePoint("S802_HB", "Battery Heartbeat", // "Value is incremented every second with periodic resets to zero.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - CTRL_HB(new PointImpl(// - "S802_CTRL_HB", // - "Controller Heartbeat", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + CTRL_HB(new ValuePoint("S802_CTRL_HB", "Controller Heartbeat", // "Value is incremented every second with periodic resets to zero.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ALM_RST(new PointImpl(// - "S802_ALM_RST", // - "Alarm Reset", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), // + ALM_RST(new ValuePoint("S802_ALM_RST", "Alarm Reset", // "Used to reset any latched alarms. 1 = Reset.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TYP(new PointImpl(// - "S802_TYP", // - "Battery Type", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_WRITE, Unit.NONE)), // + TYP(new EnumPoint("S802_TYP", "Battery Type", // "Type of battery. Enumeration.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S802_Typ.values())), // - STATE(new PointImpl(// - "S802_STATE", // - "State of the Battery Bank", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S802_Typ.values())), // + STATE(new EnumPoint("S802_STATE", "State of the Battery Bank", // "State of the battery bank. Enumeration.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S802_State.values())), // - STATE_VND(new PointImpl(// - "S802_STATE_VND", // - "Vendor Battery Bank State", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_ONLY, S802_State.values())), // + STATE_VND(new EnumPoint("S802_STATE_VND", "Vendor Battery Bank State", // "Vendor specific battery bank state. Enumeration.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - WARR_DT(new PointImpl(// - "S802_WARR_DT", // - "Warranty Date", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, new OptionsEnum[0])), // + WARR_DT(new ValuePoint("S802_WARR_DT", "Warranty Date", // "Date the device warranty expires.", // - "", // - PointType.UINT32, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT1(new PointImpl(// - "S802_EVT1", // - "Battery Event 1 Bitfield", // + ValuePoint.Type.UINT32, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + EVT1(new BitFieldPoint("S802_EVT1", "Battery Event 1 Bitfield", // "Alarms and warnings. Bit flags.", // - "", // - PointType.BITFIELD32, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S802_Evt1.values())), // - EVT2(new PointImpl(// - "S802_EVT2", // - "Battery Event 2 Bitfield", // + BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, S802_Evt1.values())), // + EVT2(new BitFieldPoint("S802_EVT2", "Battery Event 2 Bitfield", // "Alarms and warnings. Bit flags.", // - "", // - PointType.BITFIELD32, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND1(new PointImpl(// - "S802_EVT_VND1", // - "Vendor Event Bitfield 1", // + BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND1(new BitFieldPoint("S802_EVT_VND1", "Vendor Event Bitfield 1", // "Vendor defined events.", // - "", // - PointType.BITFIELD32, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - EVT_VND2(new PointImpl(// - "S802_EVT_VND2", // - "Vendor Event Bitfield 2", // + BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + EVT_VND2(new BitFieldPoint("S802_EVT_VND2", "Vendor Event Bitfield 2", // "Vendor defined events.", // - "", // - PointType.BITFIELD32, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V(new PointImpl(// - "S802_V", // - "External Battery Voltage", // + BitFieldPoint.Type.BITFIELD32, true /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + V(new ScaledValuePoint("S802_V", "External Battery Voltage", // "DC Bus Voltage.", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - V_MAX(new PointImpl(// - "S802_V_MAX", // - "Max Battery Voltage", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + V_MAX(new ScaledValuePoint("S802_V_MAX", "Max Battery Voltage", // "Instantaneous maximum battery voltage.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - V_MIN(new PointImpl(// - "S802_V_MIN", // - "Min Battery Voltage", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "V_SF")), // + V_MIN(new ScaledValuePoint("S802_V_MIN", "Min Battery Voltage", // "Instantaneous minimum battery voltage.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - CELL_V_MAX(new PointImpl(// - "S802_CELL_V_MAX", // - "Max Cell Voltage", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "CellV_SF", // - new OptionsEnum[0])), // - CELL_V_MAX_STR(new PointImpl(// - "S802_CELL_V_MAX_STR", // - "Max Cell Voltage String", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - CELL_V_MAX_MOD(new PointImpl(// - "S802_CELL_V_MAX_MOD", // - "Max Cell Voltage Module", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - CELL_V_MIN(new PointImpl(// - "S802_CELL_V_MIN", // - "Min Cell Voltage", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + CELL_V_MIN(new ScaledValuePoint("S802_CELL_V_MIN", "Min Cell Voltage", // "Minimum voltage for all cells in the bank.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "CellV_SF", // - new OptionsEnum[0])), // - CELL_V_MIN_STR(new PointImpl(// - "S802_CELL_V_MIN_STR", // - "Min Cell Voltage String", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - CELL_V_MIN_MOD(new PointImpl(// - "S802_CELL_V_MIN_MOD", // - "Min Cell Voltage Module", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - CELL_V_AVG(new PointImpl(// - "S802_CELL_V_AVG", // - "Average Cell Voltage", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "CellV_SF", // - new OptionsEnum[0])), // - A(new PointImpl(// - "S802_A", // - "Total DC Current", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.VOLT, "CellV_SF")), // + A(new ScaledValuePoint("S802_A", "Total DC Current", // "Total DC current flowing to/from the battery bank.", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - A_CHA_MAX(new PointImpl(// - "S802_A_CHA_MAX", // - "Max Charge Current", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "A_SF")), // + A_CHA_MAX(new ScaledValuePoint("S802_A_CHA_MAX", "Max Charge Current", // "Instantaneous maximum DC charge current.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "AMax_SF", // - new OptionsEnum[0])), // - A_DIS_CHA_MAX(new PointImpl(// - "S802_A_DIS_CHA_MAX", // - "Max Discharge Current", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "AMax_SF", // - new OptionsEnum[0])), // - W(new PointImpl(// - "S802_W", // - "Total Power", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.AMPERE, "AMax_SF")), // + W(new ScaledValuePoint("S802_W", "Total Power", // "Total power flowing to/from the battery bank.", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - REQ_INV_STATE(new PointImpl(// - "S802_REQ_INV_STATE", // - "Inverter State Request", // + ValuePoint.Type.INT16, true /* mandatory? */, AccessMode.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.", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S802_ReqInvState.values())), // - REQ_W(new PointImpl(// - "S802_REQ_W", // - "Battery Power Request", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.READ_ONLY, S802_ReqInvState.values())), // + REQ_W(new ScaledValuePoint("S802_REQ_W", "Battery Power Request", // "AC Power requested by battery.", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "W_SF", // - new OptionsEnum[0])), // - SET_OP(new PointImpl(// - "S802_SET_OP", // - "Set Operation", // + ValuePoint.Type.INT16, false /* mandatory? */, AccessMode.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.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S802_SetOp.values())), // - SET_INV_STATE(new PointImpl(// - "S802_SET_INV_STATE", // - "Set Inverter State", // + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.READ_WRITE, S802_SetOp.values())), // + SET_INV_STATE(new EnumPoint("S802_SET_INV_STATE", "Set Inverter State", // "Set the current state of the inverter.", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - S802_SetInvState.values())), // - A_H_RTG_S_F(new PointImpl(// - "S802_A_H_RTG_S_F", // - "", // - "Scale factor for charge capacity.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - W_H_RTG_S_F(new PointImpl(// - "S802_W_H_RTG_S_F", // - "", // - "Scale factor for energy capacity.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - W_CHA_DIS_CHA_MAX_S_F(new PointImpl(// - "S802_W_CHA_DIS_CHA_MAX_S_F", // - "", // - "Scale factor for maximum charge and discharge rate.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DIS_CHA_RTE_S_F(new PointImpl(// - "S802_DIS_CHA_RTE_S_F", // - "", // - "Scale factor for self discharge rate.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - SO_C_S_F(new PointImpl(// - "S802_SO_C_S_F", // - "", // - "Scale factor for state of charge values.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DO_D_S_F(new PointImpl(// - "S802_DO_D_S_F", // - "", // - "Scale factor for depth of discharge.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - SO_H_S_F(new PointImpl(// - "S802_SO_H_S_F", // - "", // - "Scale factor for state of health.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_SF(new PointImpl(// - "S802_V_SF", // - "", // - "Scale factor for DC bus voltage.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - CELL_V_S_F(new PointImpl(// - "S802_CELL_V_S_F", // - "", // - "Scale factor for cell voltage.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - A_SF(new PointImpl(// - "S802_A_SF", // - "", // - "Scale factor for DC current.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - A_MAX_S_F(new PointImpl(// - "S802_A_MAX_S_F", // - "", // - "Scale factor for instantaneous DC charge/discharge current.", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - W_SF(new PointImpl(// - "S802_W_SF", // - "", // - "Scale factor for AC power request.", // - "", // - PointType.SUNSSF, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S802(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + EnumPoint.Type.ENUM16, true /* mandatory? */, AccessMode.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", "", // + "Scale factor for energy capacity.")), // + W_CHA_DIS_CHA_MAX_S_F(new ScaleFactorPoint("S802_W_CHA_DIS_CHA_MAX_S_F", "", // + "Scale factor for maximum charge and discharge rate.")), // + DIS_CHA_RTE_S_F(new ScaleFactorPoint("S802_DIS_CHA_RTE_S_F", "", // + "Scale factor for self discharge rate.")), // + SO_C_S_F(new ScaleFactorPoint("S802_SO_C_S_F", "", // + "Scale factor for state of charge values.")), // + DO_D_S_F(new ScaleFactorPoint("S802_DO_D_S_F", "", // + "Scale factor for depth of discharge.")), // + SO_H_S_F(new ScaleFactorPoint("S802_SO_H_S_F", "", // + "Scale factor for state of health.")), // + V_SF(new ScaleFactorPoint("S802_V_SF", "", // + "Scale factor for DC bus voltage.")), // + CELL_V_S_F(new ScaleFactorPoint("S802_CELL_V_S_F", "", // + "Scale factor for cell voltage.")), // + A_SF(new ScaleFactorPoint("S802_A_SF", "", // + "Scale factor for DC current.")), // + A_MAX_S_F(new ScaleFactorPoint("S802_A_MAX_S_F", "", // + "Scale factor for instantaneous DC charge/discharge current.")), // + W_SF(new ScaleFactorPoint("S802_W_SF", "", // + "Scale factor for AC power request.")); + + private final Point point; + + private S802(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } @@ -15609,7 +6173,7 @@ public static enum S802_ChaSt implements OptionsEnum { CHARGING(4, "CHARGING"), // FULL(5, "FULL"), // HOLDING(6, "HOLDING"), // - TESTING(7, "TESTING"); // + TESTING(7, "TESTING"); private final int value; private final String name; @@ -15638,7 +6202,7 @@ public OptionsEnum getUndefined() { public static enum S802_LocRemCtl implements OptionsEnum { UNDEFINED(-1, "Undefined"), // REMOTE(0, "REMOTE"), // - LOCAL(1, "LOCAL"); // + LOCAL(1, "LOCAL"); private final int value; private final String name; @@ -15677,7 +6241,7 @@ public static enum S802_Typ implements OptionsEnum { RECHARGEABLE_ALKALINE(8, "RECHARGEABLE_ALKALINE"), // SODIUM_SULFUR(9, "SODIUM_SULFUR"), // FLOW(10, "FLOW"), // - OTHER(99, "OTHER"); // + OTHER(99, "OTHER"); private final int value; private final String name; @@ -15711,7 +6275,7 @@ public static enum S802_State implements OptionsEnum { STANDBY(4, "STANDBY"), // SOC_PROTECTION(5, "SOC_PROTECTION"), // SUSPENDING(6, "SUSPENDING"), // - FAULT(99, "FAULT"); // + FAULT(99, "FAULT"); private final int value; private final String name; @@ -15737,60 +6301,47 @@ public OptionsEnum getUndefined() { } } - public static enum S802_Evt1 implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - COMMUNICATION_ERROR(0, "COMMUNICATION_ERROR"), // - OVER_TEMP_ALARM(1, "OVER_TEMP_ALARM"), // - OVER_TEMP_WARNING(2, "OVER_TEMP_WARNING"), // - UNDER_TEMP_ALARM(3, "UNDER_TEMP_ALARM"), // - UNDER_TEMP_WARNING(4, "UNDER_TEMP_WARNING"), // - OVER_CHARGE_CURRENT_ALARM(5, "OVER_CHARGE_CURRENT_ALARM"), // - OVER_CHARGE_CURRENT_WARNING(6, "OVER_CHARGE_CURRENT_WARNING"), // - OVER_DISCHARGE_CURRENT_ALARM(7, "OVER_DISCHARGE_CURRENT_ALARM"), // - OVER_DISCHARGE_CURRENT_WARNING(8, "OVER_DISCHARGE_CURRENT_WARNING"), // - OVER_VOLT_ALARM(9, "OVER_VOLT_ALARM"), // - OVER_VOLT_WARNING(10, "OVER_VOLT_WARNING"), // - UNDER_VOLT_ALARM(11, "UNDER_VOLT_ALARM"), // - UNDER_VOLT_WARNING(12, "UNDER_VOLT_WARNING"), // - UNDER_SOC_MIN_ALARM(13, "UNDER_SOC_MIN_ALARM"), // - UNDER_SOC_MIN_WARNING(14, "UNDER_SOC_MIN_WARNING"), // - OVER_SOC_MAX_ALARM(15, "OVER_SOC_MAX_ALARM"), // - OVER_SOC_MAX_WARNING(16, "OVER_SOC_MAX_WARNING"), // - VOLTAGE_IMBALANCE_WARNING(17, "VOLTAGE_IMBALANCE_WARNING"), // - TEMPERATURE_IMBALANCE_ALARM(18, "TEMPERATURE_IMBALANCE_ALARM"), // - TEMPERATURE_IMBALANCE_WARNING(19, "TEMPERATURE_IMBALANCE_WARNING"), // - CONTACTOR_ERROR(20, "CONTACTOR_ERROR"), // - FAN_ERROR(21, "FAN_ERROR"), // - GROUND_FAULT(22, "GROUND_FAULT"), // - OPEN_DOOR_ERROR(23, "OPEN_DOOR_ERROR"), // - CURRENT_IMBALANCE_WARNING(24, "CURRENT_IMBALANCE_WARNING"), // - OTHER_ALARM(25, "OTHER_ALARM"), // - OTHER_WARNING(26, "OTHER_WARNING"), // - RESERVED_1(27, "RESERVED_1"), // - CONFIGURATION_ALARM(28, "CONFIGURATION_ALARM"), // - CONFIGURATION_WARNING(29, "CONFIGURATION_WARNING"); // - - private final int value; - private final String name; - - private S802_Evt1(int value, String name) { - this.value = value; - this.name = name; - } + public static enum S802_Evt1 implements SunSpecBitPoint { + COMMUNICATION_ERROR(new BitPoint(0, "S802_EVT1_COMMUNICATION_ERROR", "Communication Error")), // + OVER_TEMP_ALARM(new BitPoint(1, "S802_EVT1_OVER_TEMP_ALARM", "Over Temp Alarm")), // + OVER_TEMP_WARNING(new BitPoint(2, "S802_EVT1_OVER_TEMP_WARNING", "Over Temp Warning")), // + 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_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")), // + UNDER_VOLT_WARNING(new BitPoint(12, "S802_EVT1_UNDER_VOLT_WARNING", "Under Volt Warning")), // + UNDER_SOC_MIN_ALARM(new BitPoint(13, "S802_EVT1_UNDER_SOC_MIN_ALARM", "Under Soc Min Alarm")), // + UNDER_SOC_MIN_WARNING(new BitPoint(14, "S802_EVT1_UNDER_SOC_MIN_WARNING", "Under Soc Min Warning")), // + 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")), // + 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")), // + OPEN_DOOR_ERROR(new BitPoint(23, "S802_EVT1_OPEN_DOOR_ERROR", "Open Door Error")), // + CURRENT_IMBALANCE_WARNING(new BitPoint(24, "S802_EVT1_CURRENT_IMBALANCE_WARNING", "Current Imbalance Warning")), // + OTHER_ALARM(new BitPoint(25, "S802_EVT1_OTHER_ALARM", "Other Alarm")), // + OTHER_WARNING(new BitPoint(26, "S802_EVT1_OTHER_WARNING", "Other Warning")), // + RESERVED_1(new BitPoint(27, "S802_EVT1_RESERVED_1", "Reserved 1")), // + CONFIGURATION_ALARM(new BitPoint(28, "S802_EVT1_CONFIGURATION_ALARM", "Configuration Alarm")), // + CONFIGURATION_WARNING(new BitPoint(29, "S802_EVT1_CONFIGURATION_WARNING", "Configuration Warning")); - @Override - public int getValue() { - return this.value; - } + private final BitPoint point; - @Override - public String getName() { - return this.name; + private S802_Evt1(BitPoint point) { + this.point = point; } @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public BitPoint get() { + return this.point; } } @@ -15798,7 +6349,7 @@ public static enum S802_ReqInvState implements OptionsEnum { UNDEFINED(-1, "Undefined"), // NO_REQUEST(0, "NO_REQUEST"), // START(1, "START"), // - STOP(2, "STOP"); // + STOP(2, "STOP"); private final int value; private final String name; @@ -15827,7 +6378,7 @@ public OptionsEnum getUndefined() { public static enum S802_SetOp implements OptionsEnum { UNDEFINED(-1, "Undefined"), // CONNECT(1, "CONNECT"), // - DISCONNECT(2, "DISCONNECT"); // + DISCONNECT(2, "DISCONNECT"); private final int value; private final String name; @@ -15857,7 +6408,7 @@ public static enum S802_SetInvState implements OptionsEnum { UNDEFINED(-1, "Undefined"), // INVERTER_STOPPED(1, "INVERTER_STOPPED"), // INVERTER_STANDBY(2, "INVERTER_STANDBY"), // - INVERTER_STARTED(3, "INVERTER_STARTED"); // + INVERTER_STARTED(3, "INVERTER_STARTED"); private final int value; private final String name; @@ -15884,1407 +6435,169 @@ public OptionsEnum getUndefined() { } public static enum S64001 implements SunSpecPoint { - CMD(new PointImpl(// - "S64001_CMD", // - "Command Code", // - "", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_WRITE, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - H_W_REV(new PointImpl(// - "S64001_H_W_REV", // - "Hardware Revision", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - R_S_F_W_REV(new PointImpl(// - "S64001_R_S_F_W_REV", // - "RS FW Revision", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - O_S_F_W_REV(new PointImpl(// - "S64001_O_S_F_W_REV", // - "OS FW Revision", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - PROD_REV(new PointImpl(// - "S64001_PROD_REV", // - "Product Revision", // - "", // - "", // - PointType.STRING2, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - BOOTS(new PointImpl(// - "S64001_BOOTS", // - "Boot Count", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - SWITCH(new PointImpl(// - "S64001_SWITCH", // - "DIP Switches", // - "", // - "", // - PointType.BITFIELD16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - SENSORS(new PointImpl(// - "S64001_SENSORS", // - "Num Detected Sensors", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TALKING(new PointImpl(// - "S64001_TALKING", // - "Num Communicating Sensors", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - STATUS(new PointImpl(// - "S64001_STATUS", // - "System Status", // - "", // - "", // - PointType.BITFIELD16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - CONFIG(new PointImpl(// - "S64001_CONFIG", // - "System Configuration", // - "", // - "", // - PointType.BITFIELD16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - L_E_DBLINK(new PointImpl(// - "S64001_L_E_DBLINK", // - "LED Blink Threshold", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - L_E_DON(new PointImpl(// - "S64001_L_E_DON", // - "LED On Threshold", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - RESERVED(new PointImpl(// - "S64001_RESERVED", // - "", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - LOC(new PointImpl(// - "S64001_LOC", // - "Location String", // - "", // - "", // - PointType.STRING16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S1ID(new PointImpl(// - "S64001_S1ID", // - "Sensor 1 Unit ID", // - "", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S1_ADDR(new PointImpl(// - "S64001_S1_ADDR", // - "Sensor 1 Address", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S1_O_S_VER(new PointImpl(// - "S64001_S1_O_S_VER", // - "Sensor 1 OS Version", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S1_VER(new PointImpl(// - "S64001_S1_VER", // - "Sensor 1 Product Version", // - "", // - "", // - PointType.STRING2, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S1_SERIAL(new PointImpl(// - "S64001_S1_SERIAL", // - "Sensor 1 Serial Num", // - "", // - "", // - PointType.STRING5, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S2ID(new PointImpl(// - "S64001_S2ID", // - "Sensor 2 Unit ID", // - "", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S2_ADDR(new PointImpl(// - "S64001_S2_ADDR", // - "Sensor 2 Address", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S2_O_S_VER(new PointImpl(// - "S64001_S2_O_S_VER", // - "Sensor 2 OS Version", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S2_VER(new PointImpl(// - "S64001_S2_VER", // - "Sensor 2 Product Version", // - "", // - "", // - PointType.STRING2, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S2_SERIAL(new PointImpl(// - "S64001_S2_SERIAL", // - "Sensor 2 Serial Num", // - "", // - "", // - PointType.STRING5, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S3ID(new PointImpl(// - "S64001_S3ID", // - "Sensor 3 Unit ID", // - "", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S3_ADDR(new PointImpl(// - "S64001_S3_ADDR", // - "Sensor 3 Address", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S3_O_S_VER(new PointImpl(// - "S64001_S3_O_S_VER", // - "Sensor 3 OS Version", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S3_VER(new PointImpl(// - "S64001_S3_VER", // - "Sensor 3 Product Version", // - "", // - "", // - PointType.STRING2, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S3_SERIAL(new PointImpl(// - "S64001_S3_SERIAL", // - "Sensor 3 Serial Num", // - "", // - "", // - PointType.STRING5, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S4ID(new PointImpl(// - "S64001_S4ID", // - "Sensor 4 Unit ID", // - "", // - "", // - PointType.ENUM16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S4_ADDR(new PointImpl(// - "S64001_S4_ADDR", // - "Sensor 4 Address", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S4_O_S_VER(new PointImpl(// - "S64001_S4_O_S_VER", // - "Sensor 4 OS Version", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S4_VER(new PointImpl(// - "S64001_S4_VER", // - "Sensor 4 Product Version", // - "", // - "", // - PointType.STRING2, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S4_SERIAL(new PointImpl(// - "S64001_S4_SERIAL", // - "Sensor 4 Serial Num", // - "", // - "", // - PointType.STRING5, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S64001(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + CMD(new EnumPoint("S64001_CMD", "Command Code", "", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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)), // + 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)), // + 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)), // + PROD_REV(new ValuePoint("S64001_PROD_REV", "Product Revision", "", // + ValuePoint.Type.STRING2, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + BOOTS(new ValuePoint("S64001_BOOTS", "Boot Count", "", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + SWITCH(new BitFieldPoint("S64001_SWITCH", "DIP Switches", "", // + BitFieldPoint.Type.BITFIELD16, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + SENSORS(new ValuePoint("S64001_SENSORS", "Num Detected Sensors", "", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + TALKING(new ValuePoint("S64001_TALKING", "Num Communicating Sensors", "", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + STATUS(new BitFieldPoint("S64001_STATUS", "System Status", "", // + BitFieldPoint.Type.BITFIELD16, false /* mandatory? */, AccessMode.READ_ONLY, new SunSpecBitPoint[0])), // + CONFIG(new BitFieldPoint("S64001_CONFIG", "System Configuration", "", // + BitFieldPoint.Type.BITFIELD16, false /* mandatory? */, AccessMode.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)), // + L_E_DON(new ValuePoint("S64001_L_E_DON", "LED On Threshold", "", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + RESERVED(new ValuePoint("S64001_RESERVED", "", "", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + LOC(new ValuePoint("S64001_LOC", "Location String", "", // + ValuePoint.Type.STRING16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + S1ID(new EnumPoint("S64001_S1ID", "Sensor 1 Unit ID", "", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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)), // + 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)), // + S1_VER(new ValuePoint("S64001_S1_VER", "Sensor 1 Product Version", "", // + ValuePoint.Type.STRING2, false /* mandatory? */, AccessMode.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)), // + S2ID(new EnumPoint("S64001_S2ID", "Sensor 2 Unit ID", "", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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)), // + 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)), // + S2_VER(new ValuePoint("S64001_S2_VER", "Sensor 2 Product Version", "", // + ValuePoint.Type.STRING2, false /* mandatory? */, AccessMode.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)), // + S3ID(new EnumPoint("S64001_S3ID", "Sensor 3 Unit ID", "", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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)), // + 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)), // + S3_VER(new ValuePoint("S64001_S3_VER", "Sensor 3 Product Version", "", // + ValuePoint.Type.STRING2, false /* mandatory? */, AccessMode.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)), // + S4ID(new EnumPoint("S64001_S4ID", "Sensor 4 Unit ID", "", // + EnumPoint.Type.ENUM16, false /* mandatory? */, AccessMode.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)), // + 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)), // + S4_VER(new ValuePoint("S64001_S4_VER", "Sensor 4 Product Version", "", // + ValuePoint.Type.STRING2, false /* mandatory? */, AccessMode.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)); + + private final Point point; + + private S64001(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } public static enum S64101 implements SunSpecPoint { - ELTEK_COUNTRY_CODE(new PointImpl(// - "S64101_ELTEK_COUNTRY_CODE", // - "", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ELTEK_FEEDING_PHASE(new PointImpl(// - "S64101_ELTEK_FEEDING_PHASE", // - "", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ELTEK_A_P_D_METHOD(new PointImpl(// - "S64101_ELTEK_A_P_D_METHOD", // - "", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ELTEK_A_P_D_POWER_REF(new PointImpl(// - "S64101_ELTEK_A_P_D_POWER_REF", // - "", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ELTEK_R_P_S_METHOD(new PointImpl(// - "S64101_ELTEK_R_P_S_METHOD", // - "", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ELTEK_R_P_S_Q_REF(new PointImpl(// - "S64101_ELTEK_R_P_S_Q_REF", // - "", // - "", // - "", // - PointType.UINT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ELTEK_R_P_S_COS_PHI_REF(new PointImpl(// - "S64101_ELTEK_R_P_S_COS_PHI_REF", // - "", // - "", // - "", // - PointType.INT16, // - false, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S64101(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; - } - } - - public static enum S64110 implements SunSpecPoint { - MAJOR_F_W_REV(new PointImpl(// - "S64110_MAJOR_F_W_REV", // - "AXS Major Firmware Number", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - MID_F_W_REV(new PointImpl(// - "S64110_MID_F_W_REV", // - "AXS Mid Firmware Number", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - MINOR_F_W_REV(new PointImpl(// - "S64110_MINOR_F_W_REV", // - "AXS Minor Firmware Number", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ENCRYP_KEY(new PointImpl(// - "S64110_ENCRYP_KEY", // - "Encryption Key", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - M_A_C_ADDRESS(new PointImpl(// - "S64110_M_A_C_ADDRESS", // - "MAC Address", // - "", // - "", // - PointType.STRING7, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - WRITE_PASSWORD(new PointImpl(// - "S64110_WRITE_PASSWORD", // - "Write Password", // - "", // - "", // - PointType.STRING8, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ENABLE_D_H_C_P(new PointImpl(// - "S64110_ENABLE_D_H_C_P", // - "Enable DHCP", // - "", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - T_C_P_I_P_ADDRESS(new PointImpl(// - "S64110_T_C_P_I_P_ADDRESS", // - "TCPIP Address", // - "", // - "", // - PointType.IPADDR, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - GATEWAY_ADDRESS(new PointImpl(// - "S64110_GATEWAY_ADDRESS", // - "TCPIP Gateway", // - "", // - "", // - PointType.IPADDR, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - T_C_P_I_P_NETMASK(new PointImpl(// - "S64110_T_C_P_I_P_NETMASK", // - "TCPIP Netmask", // - "", // - "", // - PointType.IPADDR, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - D_N_S1_ADDRESS(new PointImpl(// - "S64110_D_N_S1_ADDRESS", // - "TCPIP DNS1", // - "", // - "", // - PointType.IPADDR, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - D_N_S2_ADDRESS(new PointImpl(// - "S64110_D_N_S2_ADDRESS", // - "TCPIP DNS2", // - "", // - "", // - PointType.IPADDR, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - MODBUS_PORT(new PointImpl(// - "S64110_MODBUS_PORT", // - "ModBus Port", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S_M_T_P_SERVER_NM(new PointImpl(// - "S64110_S_M_T_P_SERVER_NM", // - "SMTP Server Name", // - "", // - "", // - PointType.STRING20, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S_M_T_P_ACCOUNT_NM(new PointImpl(// - "S64110_S_M_T_P_ACCOUNT_NM", // - "SMTP Account Name", // - "", // - "", // - PointType.STRING16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S_M_T_P_ENABLE_S_S_L(new PointImpl(// - "S64110_S_M_T_P_ENABLE_S_S_L", // - "Enable SMTP SSL", // - "", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S64110_SMTP_enable_SSL.values())), // - S_M_T_P_PASSWORD(new PointImpl(// - "S64110_S_M_T_P_PASSWORD", // - "SMTP Password", // - "", // - "", // - PointType.STRING8, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - S_M_T_P_USER_NM(new PointImpl(// - "S64110_S_M_T_P_USER_NM", // - "SMTP User Name", // - "", // - "", // - PointType.STRING20, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - STAT_EMAIL_INT(new PointImpl(// - "S64110_STAT_EMAIL_INT", // - "Status Email Interval", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - STAT_START_H_R(new PointImpl(// - "S64110_STAT_START_H_R", // - "Status Email Start Hour", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - STAT_EMAIL_SUB(new PointImpl(// - "S64110_STAT_EMAIL_SUB", // - "Status Email Subject", // - "", // - "", // - PointType.STRING25, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - STAT_EMAIL_ADDR1(new PointImpl(// - "S64110_STAT_EMAIL_ADDR1", // - "Status Email to Address 1", // - "", // - "", // - PointType.STRING20, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - STAT_EMAIL_ADDR2(new PointImpl(// - "S64110_STAT_EMAIL_ADDR2", // - "Status Email to Address 2", // - "", // - "", // - PointType.STRING20, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ALARM_EMAIL_EN(new PointImpl(// - "S64110_ALARM_EMAIL_EN", // - "Enable Alarm Email", // - "", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S64110_Alarm_email_en.values())), // - ALARM_EMAIL_SUB(new PointImpl(// - "S64110_ALARM_EMAIL_SUB", // - "Alarm Email Subject", // - "", // - "", // - PointType.STRING25, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ALARM_EMAIL_ADDR1(new PointImpl(// - "S64110_ALARM_EMAIL_ADDR1", // - "Alarm Email to Address 1", // - "", // - "", // - PointType.STRING20, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - ALARM_EMAIL_ADDR2(new PointImpl(// - "S64110_ALARM_EMAIL_ADDR2", // - "Alarm Email to Address 2", // - "", // - "", // - PointType.STRING20, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - F_T_P_PASSWORD(new PointImpl(// - "S64110_F_T_P_PASSWORD", // - "FTP Password", // - "", // - "", // - PointType.STRING8, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - T_E_L_N_E_T_PASSWORD(new PointImpl(// - "S64110_T_E_L_N_E_T_PASSWORD", // - "Telnet Password", // - "", // - "", // - PointType.STRING8, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - LOG_WRITE_INT(new PointImpl(// - "S64110_LOG_WRITE_INT", // - "SD-Card Datalog Write Interval", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - LOG_RETAIN(new PointImpl(// - "S64110_LOG_RETAIN", // - "SD-Card Datalog Retain", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - LOG_MODE(new PointImpl(// - "S64110_LOG_MODE", // - "SD-Card Datalog Mode", // - "", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S64110_Log_mode.values())), // - N_T_P_SERVER_NM(new PointImpl(// - "S64110_N_T_P_SERVER_NM", // - "NTP Timer Server Name", // - "", // - "", // - PointType.STRING20, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - N_T_P_ENABLE(new PointImpl(// - "S64110_N_T_P_ENABLE", // - "Enable Network Time", // - "", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S64110_NTP_enable.values())), // - TIME_ZONE(new PointImpl(// - "S64110_TIME_ZONE", // - "Time Zone", // - "", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DATE_YEAR(new PointImpl(// - "S64110_DATE_YEAR", // - "Year", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DATE_MONTH(new PointImpl(// - "S64110_DATE_MONTH", // - "Month", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - DATE_DAY(new PointImpl(// - "S64110_DATE_DAY", // - "Day", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TIME_HOUR(new PointImpl(// - "S64110_TIME_HOUR", // - "Hour", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TIME_MINUTE(new PointImpl(// - "S64110_TIME_MINUTE", // - "Minute", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - TIME_SECOND(new PointImpl(// - "S64110_TIME_SECOND", // - "Second", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - BATTERY_TEMP(new PointImpl(// - "S64110_BATTERY_TEMP", // - "Battery Temperature", // - "", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "Temp_SF", // - new OptionsEnum[0])), // - AMBIENT_TEMP(new PointImpl(// - "S64110_AMBIENT_TEMP", // - "Ambient Temperature", // - "", // - "", // - PointType.INT16, // - true, // - AccessMode.READ_ONLY, // - Unit.DEGREE_CELSIUS, // - "Temp_SF", // - new OptionsEnum[0])), // - TEMP_S_F(new PointImpl(// - "S64110_TEMP_S_F", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - A_X_S_ERROR(new PointImpl(// - "S64110_A_X_S_ERROR", // - "AXS Error", // - "", // - "", // - PointType.BITFIELD16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - A_X_S_STATUS(new PointImpl(// - "S64110_A_X_S_STATUS", // - "AXS Status", // - "", // - "", // - PointType.BITFIELD16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - A_X_S_SPARE(new PointImpl(// - "S64110_A_X_S_SPARE", // - "Spare", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S64110(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; - } - } - - public static enum S64110_SMTP_enable_SSL implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - ASX_DISABLED(0, "ASX_DISABLED"), // - ASX_ENABLED(1, "ASX_ENABLED"); // - - private final int value; - private final String name; - - private S64110_SMTP_enable_SSL(int value, String name) { - this.value = value; - this.name = name; - } - - @Override - public int getValue() { - return this.value; - } - - @Override - public String getName() { - return this.name; - } - - @Override - public OptionsEnum getUndefined() { - return UNDEFINED; - } - } - - public static enum S64110_Alarm_email_en implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - ASX_DISABLED(0, "ASX_DISABLED"), // - ASX_ENABLED(1, "ASX_ENABLED"); // - - private final int value; - private final String name; - - private S64110_Alarm_email_en(int value, String name) { - this.value = value; - this.name = name; - } - - @Override - public int getValue() { - return this.value; - } - - @Override - public String getName() { - return this.name; - } - - @Override - public OptionsEnum getUndefined() { - return UNDEFINED; - } - } - - public static enum S64110_Log_mode implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - LOG_DISABLED(0, "LOG_DISABLED"), // - LOG_EXCEL(1, "LOG_EXCEL"), // - LOG_COMPACT(2, "LOG_COMPACT"); // - - private final int value; - private final String name; - - private S64110_Log_mode(int value, String name) { - this.value = value; - this.name = name; - } - - @Override - public int getValue() { - return this.value; - } - - @Override - public String getName() { - return this.name; - } - - @Override - public OptionsEnum getUndefined() { - return UNDEFINED; - } - } - - public static enum S64110_NTP_enable implements OptionsEnum { - UNDEFINED(-1, "Undefined"), // - ASX_DISABLED(0, "ASX_DISABLED"), // - ASX_ENABLED(1, "ASX_ENABLED"); // + ELTEK_COUNTRY_CODE(new ValuePoint("S64101_ELTEK_COUNTRY_CODE", "", "", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.READ_ONLY, Unit.NONE)), // + ELTEK_FEEDING_PHASE(new ValuePoint("S64101_ELTEK_FEEDING_PHASE", "", "", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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)), // + 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)), // + ELTEK_R_P_S_METHOD(new ValuePoint("S64101_ELTEK_R_P_S_METHOD", "", "", // + ValuePoint.Type.UINT16, false /* mandatory? */, AccessMode.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)), // + 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)); - private final int value; - private final String name; - - private S64110_NTP_enable(int value, String name) { - this.value = value; - this.name = name; - } - - @Override - public int getValue() { - return this.value; - } + private final Point point; - @Override - public String getName() { - return this.name; + private S64101(Point point) { + this.point = point; } @Override - public OptionsEnum getUndefined() { - return UNDEFINED; + public Point get() { + return this.point; } } public static enum S64111 implements SunSpecPoint { - PORT(new PointImpl(// - "S64111_PORT", // - "Port Number", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_SF(new PointImpl(// - "S64111_V_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - A_SF(new PointImpl(// - "S64111_A_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - P_SF(new PointImpl(// - "S64111_P_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - AH_SF(new PointImpl(// - "S64111_AH_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - KWH_SF(new PointImpl(// - "S64111_KWH_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - BATT_V(new PointImpl(// - "S64111_BATT_V", // - "Battery Voltage", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - ARRAY_V(new PointImpl(// - "S64111_ARRAY_V", // - "Array Voltage", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - OUTPUT_A(new PointImpl(// - "S64111_OUTPUT_A", // - "Output Current", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "A_SF", // - new OptionsEnum[0])), // - INPUT_A(new PointImpl(// - "S64111_INPUT_A", // - "Array Current", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "P_SF", // - new OptionsEnum[0])), // - CHARGER_ST(new PointImpl(// - "S64111_CHARGER_ST", // - "Operating State", // - "", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S64111_ChargerSt.values())), // - OUTPUT_W(new PointImpl(// - "S64111_OUTPUT_W", // - "Output Wattage", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "P_SF", // - new OptionsEnum[0])), // - TODAY_MIN_BAT_V(new PointImpl(// - "S64111_TODAY_MIN_BAT_V", // - "Today's Minimum Battery Voltage", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - TODAY_MAX_BAT_V(new PointImpl(// - "S64111_TODAY_MAX_BAT_V", // - "Today's Maximum Battery Voltage", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - VOCV(new PointImpl(// - "S64111_VOCV", // - "VOC", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - TODAY_MAX_V_O_C(new PointImpl(// - "S64111_TODAY_MAX_V_O_C", // - "Today's Maximum VOC", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - TODAYK_WH_OUTPUT(new PointImpl(// - "S64111_TODAYK_WH_OUTPUT", // - "Today's kWh", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.KILOWATT_HOURS, // - "KWH_SF", // - new OptionsEnum[0])), // - TODAY_A_H_OUTPUT(new PointImpl(// - "S64111_TODAY_A_H_OUTPUT", // - "Today's AH", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE_HOURS, // - "AH_SF", // - new OptionsEnum[0])), // - LIFE_TIME_K_W_H_OUT(new PointImpl(// - "S64111_LIFE_TIME_K_W_H_OUT", // - "Lifetime kWh", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.KILOWATT_HOURS, // - "P_SF", // - new OptionsEnum[0])), // - LIFE_TIME_A_H_OUT(new PointImpl(// - "S64111_LIFE_TIME_A_H_OUT", // - "Lifetime kAH", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.KILOAMPERE_HOURS, // - "KWH_SF", // - new OptionsEnum[0])), // - LIFE_TIME_MAX_OUT(new PointImpl(// - "S64111_LIFE_TIME_MAX_OUT", // - "Lifetime Maximum Output Wattage", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "P_SF", // - new OptionsEnum[0])), // - LIFE_TIME_MAX_BATT(new PointImpl(// - "S64111_LIFE_TIME_MAX_BATT", // - "Lifetime Maximum Battery Voltage", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - LIFE_TIME_MAX_V_O_C(new PointImpl(// - "S64111_LIFE_TIME_MAX_V_O_C", // - "Lifetime Maximum VOC Voltage", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S64111(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + PORT(new ValuePoint("S64111_PORT", "Port Number", "", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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")), // + ARRAY_V(new ScaledValuePoint("S64111_ARRAY_V", "Array Voltage", "", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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")), // + INPUT_A(new ScaledValuePoint("S64111_INPUT_A", "Array Current", "", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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())), // + OUTPUT_W(new ScaledValuePoint("S64111_OUTPUT_W", "Output Wattage", "", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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")), // + 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")), // + VOCV(new ScaledValuePoint("S64111_VOCV", "VOC", "", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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")), // + 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")), // + 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")), // + 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")), // + 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")), // + 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")), // + 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")), // + 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")); + + private final Point point; + + private S64111(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } @@ -17294,7 +6607,7 @@ public static enum S64111_ChargerSt implements OptionsEnum { FLOAT(1, "FLOAT"), // BULK(2, "BULK"), // ABSORB(3, "ABSORB"), // - EQ(4, "EQ"); // + EQ(4, "EQ"); private final int value; private final String name; @@ -17321,720 +6634,138 @@ public OptionsEnum getUndefined() { } public static enum S64112 implements SunSpecPoint { - PORT(new PointImpl(// - "S64112_PORT", // - "Port Number", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - V_SF(new PointImpl(// - "S64112_V_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - C_SF(new PointImpl(// - "S64112_C_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - H_SF(new PointImpl(// - "S64112_H_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - P_SF(new PointImpl(// - "S64112_P_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - AH_SF(new PointImpl(// - "S64112_AH_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - KWH_SF(new PointImpl(// - "S64112_KWH_SF", // - "", // - "", // - "", // - PointType.SUNSSF, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - C_C_CONFIG_FAULT(new PointImpl(// - "S64112_C_C_CONFIG_FAULT", // - "Faults", // - "", // - "", // - PointType.BITFIELD16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - C_C_CONFIG_ABSORB_V(new PointImpl(// - "S64112_C_C_CONFIG_ABSORB_V", // - "Absorb", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_ABSORB_HR(new PointImpl(// - "S64112_C_C_CONFIG_ABSORB_HR", // - "Absorb Time", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "H_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_ABSORB_END_A(new PointImpl(// - "S64112_C_C_CONFIG_ABSORB_END_A", // - "Absorb End", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_REBULK_V(new PointImpl(// - "S64112_C_C_CONFIG_REBULK_V", // - "Rebulk", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_FLOAT_V(new PointImpl(// - "S64112_C_C_CONFIG_FLOAT_V", // - "Float", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_MAX_CHG_A(new PointImpl(// - "S64112_C_C_CONFIG_MAX_CHG_A", // - "Maximum Charge", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_EQUALIZE_V(new PointImpl(// - "S64112_C_C_CONFIG_EQUALIZE_V", // - "Equalize", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_EQUALIZE_HR(new PointImpl(// - "S64112_C_C_CONFIG_EQUALIZE_HR", // - "Equalize Time", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - C_C_CONFIG_AUTO_EQUALIZE(new PointImpl(// - "S64112_C_C_CONFIG_AUTO_EQUALIZE", // - "Auto Equalize Interval", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - C_C_CONFIG_M_P_P_T_MODE(new PointImpl(// - "S64112_C_C_CONFIG_M_P_P_T_MODE", // - "MPPT mode", // - "", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S64112_CC_Config_MPPT_mode.values())), // - C_C_CONFIG_SWEEP_WIDTH(new PointImpl(// - "S64112_C_C_CONFIG_SWEEP_WIDTH", // - "Sweep Width", // - "", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S64112_CC_Config_sweep_width.values())), // - C_C_CONFIG_SWEEP_MAX(new PointImpl(// - "S64112_C_C_CONFIG_SWEEP_MAX", // - "Sweep Maximum", // - "", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S64112_CC_Config_sweep_max.values())), // - C_C_CONFIG_U_PICK_DUTY_CYC(new PointImpl(// - "S64112_C_C_CONFIG_U_PICK_DUTY_CYC", // - "U-Pick PWM Duty Cycle", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_GRID_TIE(new PointImpl(// - "S64112_C_C_CONFIG_GRID_TIE", // - "Grid Tie Mode", // - "", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S64112_CC_Config_grid_tie.values())), // - C_C_CONFIG_TEMP_COMP(new PointImpl(// - "S64112_C_C_CONFIG_TEMP_COMP", // - "Temp Comp Mode", // - "", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S64112_CC_Config_temp_comp.values())), // - C_C_CONFIG_TEMP_COMP_LLIMT(new PointImpl(// - "S64112_C_C_CONFIG_TEMP_COMP_LLIMT", // - "Temp Comp Lower Limit", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_TEMP_COMP_HLIMT(new PointImpl(// - "S64112_C_C_CONFIG_TEMP_COMP_HLIMT", // - "Temp Comp Upper Limit", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_AUTO_RESTART(new PointImpl(// - "S64112_C_C_CONFIG_AUTO_RESTART", // - "Auto Restart Mode", // - "", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S64112_CC_Config_auto_restart.values())), // - C_C_CONFIG_WAKEUP_V_O_C(new PointImpl(// - "S64112_C_C_CONFIG_WAKEUP_V_O_C", // - "Wakeup VOC Change", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_SNOOZE_MODE_A(new PointImpl(// - "S64112_C_C_CONFIG_SNOOZE_MODE_A", // - "Snooze Mode", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_WAKEUP_INTERVAL(new PointImpl(// - "S64112_C_C_CONFIG_WAKEUP_INTERVAL", // - "Wakeup Interval", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - C_C_CONFIG_A_U_X_MODE(new PointImpl(// - "S64112_C_C_CONFIG_A_U_X_MODE", // - "AUX Output Mode", // - "", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S64112_CC_Config_AUX_mode.values())), // - C_C_CONFIG_A_U_X_CONTROL(new PointImpl(// - "S64112_C_C_CONFIG_A_U_X_CONTROL", // - "AUX Output Control", // - "", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S64112_CC_Config_AUX_control.values())), // - C_C_CONFIG_A_U_X_STATE(new PointImpl(// - "S64112_C_C_CONFIG_A_U_X_STATE", // - "AUX Output State", // - "", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S64112_CC_Config_AUX_state.values())), // - C_C_CONFIG_A_U_X_POLARITY(new PointImpl(// - "S64112_C_C_CONFIG_A_U_X_POLARITY", // - "AUX Output Polarity", // - "", // - "", // - PointType.ENUM16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - S64112_CC_Config_AUX_polarity.values())), // - C_C_CONFIG_A_U_X_L_BATT_DISC(new PointImpl(// - "S64112_C_C_CONFIG_A_U_X_L_BATT_DISC", // - "AUX Low Battery Disconnect", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_A_U_X_L_BATT_RCON(new PointImpl(// - "S64112_C_C_CONFIG_A_U_X_L_BATT_RCON", // - "AUX Low Battery Reconnect", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_A_U_X_L_BATT_DLY(new PointImpl(// - "S64112_C_C_CONFIG_A_U_X_L_BATT_DLY", // - "AUX Low Battery Disconnect Delay", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - C_C_CONFIG_A_U_X_VENT_FAN_V(new PointImpl(// - "S64112_C_C_CONFIG_A_U_X_VENT_FAN_V", // - "AUX Vent Fan", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_A_U_X_P_V_TRIGGER_V(new PointImpl(// - "S64112_C_C_CONFIG_A_U_X_P_V_TRIGGER_V", // - "AUX PV Trigger", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_A_U_X_P_V_TRG_H_TM(new PointImpl(// - "S64112_C_C_CONFIG_A_U_X_P_V_TRG_H_TM", // - "AUX PV Trigger Hold Time", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - C_C_CONFIG_A_U_X_NLITE_THRS_V(new PointImpl(// - "S64112_C_C_CONFIG_A_U_X_NLITE_THRS_V", // - "AUX Night Light Threshold", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_A_U_X_NLITE_ON_TM(new PointImpl(// - "S64112_C_C_CONFIG_A_U_X_NLITE_ON_TM", // - "AUX Night Light On Time", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "H_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_A_U_X_NLITE_ON_HIST(new PointImpl(// - "S64112_C_C_CONFIG_A_U_X_NLITE_ON_HIST", // - "AUX Night Light On Hysteresis", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - C_C_CONFIG_A_U_X_NLITE_OFF_HIST(new PointImpl(// - "S64112_C_C_CONFIG_A_U_X_NLITE_OFF_HIST", // - "AUX Night Light Off Hysteresis", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - C_C_CONFIG_A_U_X_ERROR_BATT_V(new PointImpl(// - "S64112_C_C_CONFIG_A_U_X_ERROR_BATT_V", // - "AUX Error Output Low Battery", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_A_U_X_DIVERT_H_TIME(new PointImpl(// - "S64112_C_C_CONFIG_A_U_X_DIVERT_H_TIME", // - "AUX Divert Hold Time", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_A_U_X_DIVERT_DLY_TIME(new PointImpl(// - "S64112_C_C_CONFIG_A_U_X_DIVERT_DLY_TIME", // - "AUX Divert Delay Time", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - C_C_CONFIG_A_U_X_DIVERT_REL_V(new PointImpl(// - "S64112_C_C_CONFIG_A_U_X_DIVERT_REL_V", // - "AUX Divert Relative", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_A_U_X_DIVERT_HYST_V(new PointImpl(// - "S64112_C_C_CONFIG_A_U_X_DIVERT_HYST_V", // - "AUX Divert Hysteresis", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_MAJOR_F_W_REV(new PointImpl(// - "S64112_C_C_CONFIG_MAJOR_F_W_REV", // - "FM CC Major Firmware Number", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - C_C_CONFIG_MID_F_W_REV(new PointImpl(// - "S64112_C_C_CONFIG_MID_F_W_REV", // - "FM CC Mid Firmware Number", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - C_C_CONFIG_MINOR_F_W_REV(new PointImpl(// - "S64112_C_C_CONFIG_MINOR_F_W_REV", // - "FM CC Minor Firmware Number", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - C_C_CONFIG_DATA_LOG_DAY_OFFSET(new PointImpl(// - "S64112_C_C_CONFIG_DATA_LOG_DAY_OFFSET", // - "Set Data Log Day Offset", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - C_C_CONFIG_DATA_LOG_CUR_DAY_OFF(new PointImpl(// - "S64112_C_C_CONFIG_DATA_LOG_CUR_DAY_OFF", // - "Current Data Log Day Offset", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - C_C_CONFIG_DATA_LOG_DAILY_A_H(new PointImpl(// - "S64112_C_C_CONFIG_DATA_LOG_DAILY_A_H", // - "Data Log Daily (Ah)", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE_HOURS, // - null, // - new OptionsEnum[0])), // - C_C_CONFIG_DATA_LOG_DAILY_K_W_H(new PointImpl(// - "S64112_C_C_CONFIG_DATA_LOG_DAILY_K_W_H", // - "Data Log Daily (kWh)", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.KILOWATT_HOURS, // - "KWH_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_DATA_LOG_MAX_OUT_A(new PointImpl(// - "S64112_C_C_CONFIG_DATA_LOG_MAX_OUT_A", // - "Data Log Daily Maximum Output (A)", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.AMPERE, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_DATA_LOG_MAX_OUT_W(new PointImpl(// - "S64112_C_C_CONFIG_DATA_LOG_MAX_OUT_W", // - "Data Log Daily Maximum Output (W)", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.WATT, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_DATA_LOG_ABSORB_T(new PointImpl(// - "S64112_C_C_CONFIG_DATA_LOG_ABSORB_T", // - "Data Log Daily Absorb Time", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - C_C_CONFIG_DATA_LOG_FLOAT_T(new PointImpl(// - "S64112_C_C_CONFIG_DATA_LOG_FLOAT_T", // - "Data Log Daily Float Time", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - C_C_CONFIG_DATA_LOG_MIN_BATT_V(new PointImpl(// - "S64112_C_C_CONFIG_DATA_LOG_MIN_BATT_V", // - "Data Log Daily Minimum Battery", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_DATA_LOG_MAX_BATT_V(new PointImpl(// - "S64112_C_C_CONFIG_DATA_LOG_MAX_BATT_V", // - "Data Log Daily Maximum Battery", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_DATA_LOG_MAX_INPUT_V(new PointImpl(// - "S64112_C_C_CONFIG_DATA_LOG_MAX_INPUT_V", // - "Data Log Daily Maximum Input", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.VOLT, // - "V_SF", // - new OptionsEnum[0])), // - C_C_CONFIG_DATA_LOG_CLEAR(new PointImpl(// - "S64112_C_C_CONFIG_DATA_LOG_CLEAR", // - "Data Log Clear", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])), // - C_C_CONFIG_DATA_LOG_CLR_COMP(new PointImpl(// - "S64112_C_C_CONFIG_DATA_LOG_CLR_COMP", // - "Data Log Clear Complement", // - "", // - "", // - PointType.UINT16, // - true, // - AccessMode.READ_ONLY, // - Unit.NONE, // - null, // - new OptionsEnum[0])); // - - protected final PointImpl impl; - - private S64112(PointImpl impl) { - this.impl = impl; - } - - @Override - public PointImpl get() { - return this.impl; + PORT(new ValuePoint("S64112_PORT", "Port Number", "", // + ValuePoint.Type.UINT16, true /* mandatory? */, AccessMode.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", "", "")), // + P_SF(new ScaleFactorPoint("S64112_P_SF", "", "")), // + 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])), // + 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")), // + 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")), // + 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")), // + 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")), // + 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")), // + 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")), // + 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")), // + 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)), // + 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)), // + 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())), // + 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())), // + 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")), // + 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())), // + 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")), // + 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())), // + 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")), // + 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")), // + 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)), // + 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())), // + 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())), // + 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())), // + 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)), // + 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")), // + 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)), // + 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)), // + 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)), // + 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")), // + 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)); + + private final Point point; + + private S64112(Point point) { + this.point = point; + } + + @Override + public Point get() { + return this.point; } } @@ -18042,7 +6773,7 @@ public static enum S64112_CC_Config_MPPT_mode implements OptionsEnum { UNDEFINED(-1, "Undefined"), // AUTO(0, "AUTO"), // U_PICK(1, "U_PICK"), // - WIND(2, "WIND"); // + WIND(2, "WIND"); private final int value; private final String name; @@ -18071,7 +6802,7 @@ public OptionsEnum getUndefined() { public static enum S64112_CC_Config_sweep_width implements OptionsEnum { UNDEFINED(-1, "Undefined"), // HALF(0, "HALF"), // - FULL(1, "FULL"); // + FULL(1, "FULL"); private final int value; private final String name; @@ -18102,7 +6833,7 @@ public static enum S64112_CC_Config_sweep_max implements OptionsEnum { EIGHTY_PERCENT(0, "EIGHTY_PERCENT"), // EIGHTY_FIVE_PERCENT(1, "EIGHTY_FIVE_PERCENT"), // NINTY_PERCENT(2, "NINTY_PERCENT"), // - NINTY_NINE_PERCENT(3, "NINTY_NINE_PERCENT"); // + NINTY_NINE_PERCENT(3, "NINTY_NINE_PERCENT"); private final int value; private final String name; @@ -18131,7 +6862,7 @@ public OptionsEnum getUndefined() { public static enum S64112_CC_Config_grid_tie implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -18160,7 +6891,7 @@ public OptionsEnum getUndefined() { public static enum S64112_CC_Config_temp_comp implements OptionsEnum { UNDEFINED(-1, "Undefined"), // WIDE(0, "WIDE"), // - LIMITED(1, "LIMITED"); // + LIMITED(1, "LIMITED"); private final int value; private final String name; @@ -18190,7 +6921,7 @@ public static enum S64112_CC_Config_auto_restart implements OptionsEnum { UNDEFINED(-1, "Undefined"), // OFF(0, "OFF"), // EVERY_90_MINUTES(1, "EVERY_90_MINUTES"), // - EVERY_90_MINUTES_IF_ABSORB_OR_FLOAT(2, "EVERY_90_MINUTES_IF_ABSORB_OR_FLOAT"); // + EVERY_90_MINUTES_IF_ABSORB_OR_FLOAT(2, "EVERY_90_MINUTES_IF_ABSORB_OR_FLOAT"); private final int value; private final String name; @@ -18226,7 +6957,7 @@ public static enum S64112_CC_Config_AUX_mode implements OptionsEnum { VENT_FAN(5, "VENT_FAN"), // P_V_TRIGGER(6, "P_V_TRIGGER"), // ERROR_OUTPUT(7, "ERROR_OUTPUT"), // - NIGHT_LIGHT(8, "NIGHT_LIGHT"); // + NIGHT_LIGHT(8, "NIGHT_LIGHT"); private final int value; private final String name; @@ -18256,7 +6987,7 @@ public static enum S64112_CC_Config_AUX_control implements OptionsEnum { UNDEFINED(-1, "Undefined"), // OFF(0, "OFF"), // AUTO(1, "AUTO"), // - ON(2, "ON"); // + ON(2, "ON"); private final int value; private final String name; @@ -18285,7 +7016,7 @@ public OptionsEnum getUndefined() { public static enum S64112_CC_Config_AUX_state implements OptionsEnum { UNDEFINED(-1, "Undefined"), // DISABLED(0, "DISABLED"), // - ENABLED(1, "ENABLED"); // + ENABLED(1, "ENABLED"); private final int value; private final String name; @@ -18314,7 +7045,7 @@ public OptionsEnum getUndefined() { public static enum S64112_CC_Config_AUX_polarity implements OptionsEnum { UNDEFINED(-1, "Undefined"), // LOW(0, "LOW"), // - HIGH(1, "HIGH"); // + HIGH(1, "HIGH"); private final int value; private final String name; @@ -18342,16 +7073,14 @@ public OptionsEnum getUndefined() { public final String label; public final String description; - public final String notes; public final int length; public final SunSpecPoint[] points; public final SunSpecModelType modelType; - private DefaultSunSpecModel(String label, String description, String notes, int length, SunSpecPoint[] points, + private DefaultSunSpecModel(String label, String description, int length, SunSpecPoint[] points, SunSpecModelType modelType) { this.label = label; this.description = description; - this.notes = notes; this.length = length; this.points = points; this.modelType = modelType; 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 new file mode 100644 index 00000000000..3ea9dc3bbdd --- /dev/null +++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/Point.java @@ -0,0 +1,418 @@ +package io.openems.edge.bridge.modbus.sunspec; + +import static io.openems.common.channel.AccessMode.READ_ONLY; +import static io.openems.edge.bridge.modbus.api.element.AbstractModbusElement.FillElementsPriority.HIGH; + +import java.util.Arrays; +import java.util.List; +import java.util.function.Consumer; + +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.common.types.OptionsEnum; +import io.openems.edge.bridge.modbus.api.element.BitsWordElement; +import io.openems.edge.bridge.modbus.api.element.DummyRegisterElement; +import io.openems.edge.bridge.modbus.api.element.FloatDoublewordElement; +import io.openems.edge.bridge.modbus.api.element.FloatQuadruplewordElement; +import io.openems.edge.bridge.modbus.api.element.ModbusElement; +import io.openems.edge.bridge.modbus.api.element.SignedDoublewordElement; +import io.openems.edge.bridge.modbus.api.element.SignedQuadruplewordElement; +import io.openems.edge.bridge.modbus.api.element.SignedWordElement; +import io.openems.edge.bridge.modbus.api.element.StringWordElement; +import io.openems.edge.bridge.modbus.api.element.UnsignedDoublewordElement; +import io.openems.edge.bridge.modbus.api.element.UnsignedQuadruplewordElement; +import io.openems.edge.bridge.modbus.api.element.UnsignedWordElement; +import io.openems.edge.common.channel.ChannelId; +import io.openems.edge.common.channel.Doc; +import io.openems.edge.common.channel.internal.AbstractDoc; +import io.openems.edge.common.channel.internal.OpenemsTypeDoc; + +/** + * The internal PointImpl object for easier handling in Enums. + */ +public abstract sealed class Point { + + /** + * A Point that relates to a {@link ModbusElement}. + */ + protected static sealed interface ModbusElementPoint { + + /** + * Generates the {@link ModbusElement}. + * + * @param startAddress the start-address + * @return the {@link ModbusElement} + */ + public ModbusElement generateModbusElement(int startAddress); + } + + public static sealed interface Type { + + public static final short UNDEFINED_8 = Short.MIN_VALUE /* -32768 */; + public static final int UNDEFINED_16 = 65535; + public static final long UNDEFINED_32 = 4294967295L; + + /** + * Returns true if the value represents a 'defined' value in SunSpec. + * + * @param value the value; never null + * @return true for defined values + */ + public boolean isDefined(Object value); + } + + public final String name; + public final String description; + public final Point.Type type; + public final boolean mandatory; + public final AccessMode accessMode; + + public Point(String name, String label, String description, Point.Type type, boolean mandatory, + AccessMode accessMode) { + this.name = name; + this.description = description; + this.type = type; + this.mandatory = mandatory; + this.accessMode = accessMode; + } + + /** + * Returns true if the value represents a 'defined' value in SunSpec. + * + * @param value the value + * @return true for defined values + */ + public boolean isDefined(Object value) { + if (this.type != null && value != null) { + return this.type.isDefined(value); + } + return false; + } + + /** + * Represents a Point with a ChannelId. + */ + public abstract static sealed class ChannelIdPoint extends Point + permits Point.ValuePoint, Point.EnumPoint, Point.ScaleFactorPoint, Point.BitPoint { + + public final ChannelId channelId; + + private ChannelIdPoint(String name, String label, String description, Point.Type type, boolean mandatory, + AccessMode accessMode, AbstractDoc doc) { + super(name, label, description, type, mandatory, accessMode); + if (!label.isBlank() && !description.isBlank()) { + doc.text(label + ". " + description); + } else if (!label.isBlank()) { + doc.text(label); + } else { + doc.text(description); + } + doc.accessMode(accessMode); + this.channelId = new SunSChannelId<>(name, doc); + } + + } + + /** + * Represents a Point with a discrete value. + */ + public static non-sealed class ValuePoint extends Point.ChannelIdPoint implements ModbusElementPoint { + + public static enum Type implements Point.Type { + INT16(1), UINT16(1), COUNT(1), ACC16(1), INT32(2), UINT32(2), FLOAT32(2), ACC32(2), INT64(4), UINT64(4), + FLOAT64(4), ACC64(4), STRING2(2), STRING4(4), STRING5(5), STRING6(6), STRING7(7), STRING8(8), STRING12(12), + STRING16(16), STRING20(20), STRING25(25), STRING32(32), + /* use PAD for reserved points */ + PAD(1), IPADDR(1), IPV6ADDR(16), EUI48(6); + + public final int length; + + private Type(int length) { + this.length = length; + } + + @Override + public boolean isDefined(Object value) { + return switch (this) { + case INT16 -> !value.equals(UNDEFINED_8); + case UINT16, COUNT -> !value.equals(UNDEFINED_16); + case ACC16, ACC32, IPADDR, ACC64, IPV6ADDR -> !value.equals(0); + case INT32 -> !value.equals(0x80000000); // TODO correct? + case UINT32 -> !value.equals(UNDEFINED_32); + case INT64 -> !value.equals(0x8000000000000000L); // TODO correct? + case UINT64 -> !value.equals(0xFFFFFFFFFFFFFFFFL); // TODO correct? + case FLOAT32 -> !value.equals(Float.NaN); + case FLOAT64 -> false; // TODO not implemented + case PAD // This point is never needed/reserved + -> false; + case STRING12, STRING16, STRING2, STRING20, STRING25, STRING32, STRING4, STRING5, STRING6, STRING7, + STRING8 -> + !"".equals(value); + case EUI48 -> false; // TODO not implemented + }; + } + } + + private final Type type; + + private ValuePoint(String name, String label, String description, ValuePoint.Type type, boolean mandatory, + AccessMode accessMode, Unit unit, OpenemsTypeDoc doc) { + super(name, label, description, type, mandatory, accessMode, doc.unit(unit)); + this.type = type; + } + + public ValuePoint(String name, String label, String description, ValuePoint.Type type, boolean mandatory, + AccessMode accessMode, Unit unit) { + 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 + -> OpenemsType.INTEGER; + case ACC32, IPADDR, UINT32, UINT64, ACC64, INT64, IPV6ADDR, // + FLOAT64 // avoid floating point numbers + -> OpenemsType.LONG; + case STRING2, STRING4, STRING5, STRING6, STRING7, STRING8, STRING12, STRING16, STRING20, + STRING25, STRING32 // + -> OpenemsType.STRING; + })); + } + + @Override + public ModbusElement generateModbusElement(int startAddress) { + return switch (this.type) { + case UINT16, ACC16 // + -> new UnsignedWordElement(startAddress); + case INT16, COUNT // + -> new SignedWordElement(startAddress); + case UINT32, ACC32, IPADDR // + -> new UnsignedDoublewordElement(startAddress); + case INT32 // + -> new SignedDoublewordElement(startAddress); + case UINT64, ACC64 // + -> new UnsignedQuadruplewordElement(startAddress); + case INT64 // + -> new SignedQuadruplewordElement(startAddress); + case FLOAT32 // + -> new FloatDoublewordElement(startAddress); + case PAD // + -> new DummyRegisterElement(startAddress); + case FLOAT64 // + -> new FloatQuadruplewordElement(startAddress); + case EUI48, IPV6ADDR // this would be UINT128 + -> null; + case STRING2 -> new StringWordElement(startAddress, 2); + case STRING4 -> new StringWordElement(startAddress, 4); + case STRING5 -> new StringWordElement(startAddress, 5); + case STRING6 -> new StringWordElement(startAddress, 6); + case STRING7 -> new StringWordElement(startAddress, 7); + case STRING8 -> new StringWordElement(startAddress, 8); + case STRING12 -> new StringWordElement(startAddress, 12); + case STRING16 -> new StringWordElement(startAddress, 16); + case STRING20 -> new StringWordElement(startAddress, 20); + case STRING25 -> new StringWordElement(startAddress, 25); + case STRING32 -> new StringWordElement(startAddress, 32); + }; + } + } + + /** + * Represents a Point with a defined Scale-Factor. + */ + public static final class ScaledValuePoint extends Point.ValuePoint { + public final String scaleFactor; + + public ScaledValuePoint(String name, String label, String description, ValuePoint.Type type, boolean mandatory, + AccessMode accessMode, Unit unit, String scaleFactor) { + super(name, label, description, type, mandatory, accessMode, unit, Doc.of(OpenemsType.FLOAT)); + this.scaleFactor = scaleFactor; + } + } + + /** + * Represents a Scale-Factor Point. + */ + public static final class ScaleFactorPoint extends Point.ChannelIdPoint implements ModbusElementPoint { + + public static enum Type implements Point.Type { + SUNSSF(1); + + public final int length; + + private Type(int length) { + this.length = length; + } + + @Override + public boolean isDefined(Object value) { + return switch (this) { + case SUNSSF -> !value.equals(UNDEFINED_8); + }; + } + } + + public ScaleFactorPoint(String name, String label, String description) { + super(name, label, description, Type.SUNSSF, true, READ_ONLY, Doc.of(OpenemsType.INTEGER)); + } + + @Override + public ModbusElement generateModbusElement(int startAddress) { + return new SignedWordElement(startAddress) // + .fillElementsPriority(HIGH); + } + } + + /** + * Represents a Point with an Enum value. + */ + public static final class EnumPoint extends Point.ChannelIdPoint implements ModbusElementPoint { + + public static enum Type implements Point.Type { + ENUM16(1), ENUM32(2); + + public final int length; + + private Type(int length) { + this.length = length; + } + + @Override + public boolean isDefined(Object value) { + return switch (this) { + case ENUM16 -> !value.equals(UNDEFINED_16); + case ENUM32 -> !value.equals(UNDEFINED_32); + }; + } + } + + private final Type type; + + public EnumPoint(String name, String label, String description, EnumPoint.Type type, boolean mandatory, + AccessMode accessMode, OptionsEnum[] options) { + super(name, label, description, type, mandatory, accessMode, Doc.of(options)); + this.type = type; + } + + @Override + public ModbusElement generateModbusElement(int startAddress) { + return switch (this.type) { + case ENUM16 // + -> new UnsignedWordElement(startAddress); + case ENUM32 // + -> new UnsignedDoublewordElement(startAddress); + }; + } + + } + + /** + * Represents a Point with BitField values. + */ + public static final class BitFieldPoint extends Point { + + public interface SunSpecBitPoint extends SunSpecPoint { + @Override + public BitPoint get(); + } + + public static enum Type implements Point.Type { + BITFIELD16(1), BITFIELD32(2); + + public final int length; + + private Type(int length) { + this.length = length; + } + + @Override + public boolean isDefined(Object value) { + return switch (this) { + case BITFIELD16 -> !value.equals(UNDEFINED_16); + case BITFIELD32 -> !value.equals(UNDEFINED_32); + }; + } + } + + public final SunSpecBitPoint[] points; + public final BitFieldPoint.Type type; + + public BitFieldPoint(String name, String label, String description, BitFieldPoint.Type type, boolean mandatory, + AccessMode accessMode, SunSpecBitPoint[] points) { + super(name, label, description, type, mandatory, accessMode); // + this.points = points; + this.type = type; + } + + /** + * Generates the {@link ModbusElement}s. + * + * @param parent the parent + * {@link AbstractOpenemsSunSpecComponent} + * @param addChannel callback to add a Channel to parent (because the + * method is protected) + * @param startAddress the start-address + * @param alternativeBitPoints alternative {@link SunSpecBitPoint}s + * @return the {@link ModbusElement}s + */ + public List generateModbusElements(AbstractOpenemsSunSpecComponent parent, + Consumer addChannel, int startAddress, SunSpecBitPoint[] alternativeBitPoints) { + final SunSpecBitPoint[] points; + if (alternativeBitPoints != null && alternativeBitPoints.length > 0) { + points = alternativeBitPoints; + } else { + points = this.points; + } + + return switch (this.type) { + case BITFIELD16 -> { + var bwe = new BitsWordElement(startAddress, parent); + Arrays.stream(points).forEach(ssbp -> { + var bit = ssbp.get().bit; + var channelId = ssbp.get().channelId; + addChannel.accept(channelId); + bwe.bit(bit, channelId); + }); + yield List.of(bwe); + } + case BITFIELD32 -> { + var bwe0 = new BitsWordElement(startAddress, parent); + var bwe1 = new BitsWordElement(startAddress + 1, parent); + Arrays.stream(points).forEach(ssbp -> { + var bit = ssbp.get().bit; + var channelId = ssbp.get().channelId; + addChannel.accept(channelId); + if (bit > 15) { + bwe1.bit(bit - 16, channelId); + } else { + bwe0.bit(bit, channelId); + } + }); + yield List.of(bwe0, bwe1); + } + }; + } + } + + /** + * Represents one Bit within a BitFieldPoint. + */ + public static final class BitPoint extends Point.ChannelIdPoint { + + public final int bit; + + private BitPoint(int bit, String name, String label, AbstractDoc doc) { + super(name, label, "", null /* point type */, false, AccessMode.READ_ONLY, doc); + this.bit = bit; + } + + public BitPoint(int bit, String name, String label) { + this(bit, name, label, Doc.of(OpenemsType.BOOLEAN)); + } + + public BitPoint(int bit, String name, String label, Level level) { + this(bit, name, label, Doc.of(level)); + } + } +} \ No newline at end of file diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecCodeGenerator.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecCodeGenerator.java deleted file mode 100644 index a9827f5ce18..00000000000 --- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecCodeGenerator.java +++ /dev/null @@ -1,787 +0,0 @@ -package io.openems.edge.bridge.modbus.sunspec; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.HashSet; -import java.util.List; -import java.util.Optional; -import java.util.Set; -import java.util.function.Function; - -import com.google.common.base.CaseFormat; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; - -import io.openems.common.channel.AccessMode; -import io.openems.common.channel.Unit; -import io.openems.common.exceptions.OpenemsError.OpenemsNamedException; -import io.openems.common.exceptions.OpenemsException; -import io.openems.common.function.ThrowingFunction; -import io.openems.common.utils.JsonUtils; -import io.openems.edge.bridge.modbus.sunspec.SunSpecPoint.PointCategory; -import io.openems.edge.bridge.modbus.sunspec.SunSpecPoint.PointType; - -/** - * This tool converts SunSpec Json definitions to Java code suitable for the - * OpenEMS SunSpec implementation. - * - *

- * Download Json files from https://github.com/sunspec/models. - */ -public class SunSpecCodeGenerator { - - /** - * Path to the SunSpec model Json files; download them from - * https://github.com/sunspec/models. - */ - private static final String SUNSPEC_JSON_PATH = System.getProperty("user.home") + "\\git\\sunspec\\json\\"; - /** - * Path to the generated output file. - */ - private static final String OUT_FILE_PATH = System.getProperty("user.dir") - + "\\src\\io\\openems\\edge\\bridge\\modbus\\sunspec\\DefaultSunSpecModel.java"; - - /** - * Json files that should be ignored; mainly because certain features are not - * implemented yet. - */ - private static final Set IGNORE_FILES = new HashSet<>(Arrays.asList(// - "model_3.json", // - "model_4.json", // - "model_5.json", // - "model_6.json", // - "model_7.json", // - "model_8.json", // - "model_9.json", // - "model_10.json", // - "model_11.json", // - "model_12.json", // - "model_13.json", // - "model_14.json", // - "model_16.json", // - "model_17.json", // - "model_19.json", // - "model_126.json", // - "model_129.json", // - "model_130.json", // - "model_131.json", // - "model_132.json", // - "model_133.json", // - "model_134.json", // - "model_135.json", // - "model_136.json", // - "model_137.json", // - "model_138.json", // - "model_139.json", // - "model_140.json", // - "model_141.json", // - "model_142.json", // - "model_143.json", // - "model_144.json", // - "model_160.json", // - "model_211.json", // - "model_212.json", // - "model_213.json", // - "model_214.json", // - "model_220.json", // - "model_302.json", // - "model_303.json", // - "model_304.json", // - "model_401.json", // - "model_402.json", // - "model_403.json", // - "model_404.json", // - "model_501.json", // - "model_502.json", // - "model_601.json", // - "model_803.json", // - "model_804.json", // - "model_805.json", // - "model_806.json", // - "model_807.json", // - "model_808.json", // - "model_809.json", // - "model_63001.json", // - "model_63002.json", // - "model_64020.json" // - )); - - /** - * Run this method to start the code generator. - * - * @param args not supported - * @throws Exception on error - */ - public static void main(String[] args) throws Exception { - System.out.println(SUNSPEC_JSON_PATH); - var generator = new SunSpecCodeGenerator(); - var models = generator.parseSunSpecFiles(); - generator.writeSunSpecModelJavaFile(models); - } - - /** - * Parses all SunSpec Json files in a directory. - * - * @return a list of Models - * @throws Exception on error - */ - private List parseSunSpecFiles() throws Exception { - List result = new ArrayList<>(); - for (File file : new File(SUNSPEC_JSON_PATH).listFiles(file -> // - file.getName().startsWith("model") // - && file.getName().endsWith(".json") // - && !IGNORE_FILES.contains(file.getName()))) { - try { - var model = this.parseSunSpecFile(Files.readString(file.toPath())); - result.add(model); - - } catch (Exception e) { - throw new Exception("Error while reading from " + file, e); - } - } - // Sort by model ids to have an ordered output - result.sort(new Comparator() { - @Override - public int compare(Model m1, Model m2) { - return m1.id - m2.id; - } - }); - - return result; - } - - /** - * Parses a SunSpec Json file. - * - * @param file the SunSpec Json file handler - * @return the Model - * @throws Exception on error - */ - private Model parseSunSpecFile(String file) throws Exception { - var json = JsonUtils.parseToJsonObject(file); - - var generator = new SunSpecCodeGenerator(); - return generator.parseSunSpecModels(json); - } - - /** - * Parses the element sunSpecModels. - * - * 

-	 *   <sunSpecModels v="1">
-	 *
- * - *
    - *
  • xs:attribute name="v" type="xs:string" default="1" - *
- * - * @param sunSpecModels the 'sunSpecModels' json - * @return the Model - * @throws OpenemsNamedException on error - * @throws JSONException on json error - */ - private Model parseSunSpecModels(JsonObject sunSpecModels) throws OpenemsNamedException { - return new Model(sunSpecModels); - } - - /** - * Writes the SunSpecModel.java file. - * - * @param models a list of Models - * @throws IOException on error - */ - private void writeSunSpecModelJavaFile(List models) throws IOException { - try (var w = Files.newBufferedWriter(Paths.get(OUT_FILE_PATH))) { - w.write("// CHECKSTYLE:OFF"); - w.newLine(); - w.newLine(); - w.write("package io.openems.edge.bridge.modbus.sunspec;"); - w.newLine(); - w.newLine(); - w.write("import io.openems.common.channel.AccessMode;"); - w.newLine(); - w.write("import io.openems.common.channel.Unit;"); - w.newLine(); - w.write("import io.openems.common.types.OptionsEnum;"); - w.newLine(); - w.newLine(); - w.write("/**"); - w.newLine(); - w.write(" * Do not touch this file. It is auto-generated by SunSpecCodeGenerator."); - w.newLine(); - w.write(" */"); - w.newLine(); - w.write("public enum DefaultSunSpecModel implements SunSpecModel {"); - w.newLine(); - - /* - * Write main Model enum - */ - for (var i = 0; i < models.size(); i++) { - var model = models.get(i); - w.write(" S_" + model.id + "(//"); - w.newLine(); - w.write(" \"" + esc(model.label) + "\", //"); - w.newLine(); - w.write(" \"" + esc(model.description) + "\", //"); - w.newLine(); - w.write(" \"" + esc(model.notes) + "\", //"); - w.newLine(); - w.write(" " + model.len + ", //"); - w.newLine(); - w.write(" DefaultSunSpecModel.S" + model.id + ".values(), //"); - w.newLine(); - w.write(" SunSpecModelType." + model.modelType + " //"); - w.newLine(); - w.write(" )"); - if (i == models.size() - 1) { - w.write("; //"); - } else { - w.write(", //"); - } - w.newLine(); - } - w.newLine(); - - /* - * For each Model write enum with SunSpecPoints - */ - for (Model model : models) { - w.write(" public static enum S" + model.id + " implements SunSpecPoint {"); - w.newLine(); - for (var i = 0; i < model.points.size(); i++) { - var point = model.points.get(i); - var pointUpperId = toUpperUnderscore(point.id); - w.write(" " + pointUpperId + "(new PointImpl(//"); - w.newLine(); - w.write(" \"S" + model.id + "_" + pointUpperId + "\", //"); - w.newLine(); - w.write(" \"" + esc(point.label) + "\", //"); - w.newLine(); - w.write(" \"" + esc(point.description) + "\", //"); - w.newLine(); - w.write(" \"" + esc(point.notes) + "\", //"); - w.newLine(); - w.write(" PointType." + point.type.name() + ", //"); - w.newLine(); - w.write(" " + point.mandatory + ", //"); - w.newLine(); - w.write(" AccessMode." + point.accessMode.name() + ", //"); - w.newLine(); - w.write(" Unit." + point.unit.name() + ", //"); - w.newLine(); - w.write(" " - + (point.scaleFactor.isPresent() ? "\"" + point.scaleFactor.get() + "\"" : null) + ", //"); - w.newLine(); - if (point.symbols.length == 0) { - w.write(" new OptionsEnum[0]))"); - } else { - w.write(" S" + model.id + "_" + point.id + ".values()))"); - } - - if (i == model.points.size() - 1) { - w.write("; //"); - } else { - w.write(", //"); - } - w.newLine(); - } - w.newLine(); - w.write(" protected final PointImpl impl;"); - w.newLine(); - w.newLine(); - w.write(" private S" + model.id + "(PointImpl impl) {"); - w.newLine(); - w.write(" this.impl = impl;"); - w.newLine(); - w.write(" }"); - w.newLine(); - w.newLine(); - w.write(" @Override"); - w.newLine(); - w.write(" public PointImpl get() {"); - w.newLine(); - w.write(" return this.impl;"); - w.newLine(); - w.write(" }"); - w.newLine(); - w.write(" }"); - w.newLine(); - w.newLine(); - - /* - * For SunSpecPoints with Symbols write OpenEMS OptionsEnum - */ - for (Point point : model.points) { - if (point.symbols.length == 0) { - continue; - } - - w.write(" public static enum S" + model.id + "_" + point.id + " implements OptionsEnum {"); - w.newLine(); - w.write(" UNDEFINED(-1, \"Undefined\"), //"); - w.newLine(); - for (var i = 0; i < point.symbols.length; i++) { - var symbol = point.symbols[i]; - var symbolId = symbol.id; - symbolId = toUpperUnderscore(symbolId); - - switch (symbolId) { - case "RESERVED": - symbolId = symbolId + "_" + symbol.value; // avoid duplicated "RESERVED" ids. - break; - } - - w.write(" " + symbolId + "(" + symbol.value + ", \"" + symbolId + "\")"); - if (i == point.symbols.length - 1) { - w.write("; //"); - } else { - w.write(", //"); - } - w.newLine(); - } - w.newLine(); - w.write(" private final int value;"); - w.newLine(); - w.write(" private final String name;"); - w.newLine(); - w.newLine(); - w.write(" private S" + model.id + "_" + point.id + "(int value, String name) {"); - w.newLine(); - w.write(" this.value = value;"); - w.newLine(); - w.write(" this.name = name;"); - w.newLine(); - w.write(" }"); - w.newLine(); - w.newLine(); - w.write(" @Override"); - w.newLine(); - w.write(" public int getValue() {"); - w.newLine(); - w.write(" return this.value;"); - w.newLine(); - w.write(" }"); - w.newLine(); - w.newLine(); - w.write(" @Override"); - w.newLine(); - w.write(" public String getName() {"); - w.newLine(); - w.write(" return this.name;"); - w.newLine(); - w.write(" }"); - w.newLine(); - w.newLine(); - w.write(" @Override"); - w.newLine(); - w.write(" public OptionsEnum getUndefined() {"); - w.newLine(); - w.write(" return UNDEFINED;"); - w.newLine(); - w.write(" }"); - w.newLine(); - w.write(" }"); - w.newLine(); - w.newLine(); - } - } - - w.write(" public final String label;"); - w.newLine(); - w.write(" public final String description;"); - w.newLine(); - w.write(" public final String notes;"); - w.newLine(); - w.write(" public final int length;"); - w.newLine(); - w.write(" public final SunSpecPoint[] points;"); - w.newLine(); - w.write(" public final SunSpecModelType modelType;"); - w.newLine(); - w.newLine(); - w.write(" private DefaultSunSpecModel(String label, String description, String notes, int length, SunSpecPoint[] points,"); - w.newLine(); - w.write(" SunSpecModelType modelType) {"); - w.newLine(); - w.write(" this.label = label;"); - w.newLine(); - w.write(" this.description = description;"); - w.newLine(); - w.write(" this.notes = notes;"); - w.newLine(); - w.write(" this.length = length;"); - w.newLine(); - w.write(" this.points = points;"); - w.newLine(); - w.write(" this.modelType = modelType;"); - w.newLine(); - w.write(" }"); - w.newLine(); - w.newLine(); - w.write(" @Override"); - w.newLine(); - w.write(" public SunSpecPoint[] points() {"); - w.newLine(); - w.write(" return this.points;"); - w.newLine(); - w.write(" }"); - w.newLine(); - w.newLine(); - w.write(" @Override"); - w.newLine(); - w.write(" public String label() {"); - w.newLine(); - w.write(" return this.label;"); - w.newLine(); - w.write(" }"); - w.newLine(); - w.write("}"); - w.newLine(); - w.write("// CHECKSTYLE:ON"); - w.newLine(); - } - } - - /** - * Helper method to escape a string. - * - * @param string original string - * @return escaped string - */ - private static final String esc(String string) { - if (string == null) { - return ""; - } - return string // - .replaceAll("[^\\x00-\\x7F]", "") // non-ascii chars - .replace("\"", "\\\"") // escape backslash - .trim(); - } - - /** - * POJO container for a SunSpec Model. - */ - public static class Model { - protected final int id; - protected final int len; - protected final String name; - protected final List points; - protected final SunSpecModelType modelType; - - protected String label = ""; - protected String description = ""; - protected String notes = ""; - - public Model(JsonObject model) throws OpenemsNamedException { - this.id = JsonUtils.getAsInt(model, "id"); - var group = model.get("group").getAsJsonObject(); - this.name = JsonUtils.getAsString(group, "name"); - this.label = JsonUtils.getAsStringOrElse(group, "label", ""); - this.description = JsonUtils.getAsStringOrElse(group, "desc", ""); - var points = JsonUtils.getAsJsonArray(group, "points"); - - var list = new ArrayList(); - var offset = 0; - for (var i = 0; i < points.size(); i++) { - var p = new Point(points.get(i).getAsJsonObject(), offset); - // ID and length not to be considered as points - if (!p.id.equals("ID") && !p.id.equals("L")) { - list.add(p); - } - offset += p.len; - } - this.points = list; - this.len = this.points.stream().map(p -> p.len).reduce(0, (t, p) -> t + p); - this.modelType = SunSpecModelType.getModelType(this.id); - } - - /** - * Gets the Point with the given Id. - * - * @param id the Point-ID - * @return the Point - * @throws OpenemsException on error - */ - public Point getPoint(String id) throws OpenemsException { - for (Point point : this.points) { - if (point.id.equals(id)) { - return point; - } - } - throw new OpenemsException("Unable to find Point with ID " + id); - } - - @Override - public String toString() { - return "Model [id=" + this.id + ", name=" + this.name + ", points=" + this.points + ", label=" + this.label - + ", description=" + this.description + ", notes=" + this.notes + "]"; - } - - } - - /** - * POJO container for a SunSpec Point. - */ - public static class Point { - - protected final String id; - protected final int len; - protected final int offset; - protected final PointType type; - protected final Optional scaleFactor; - protected final Unit unit; - protected final AccessMode accessMode; - protected final boolean mandatory; - protected final PointCategory category; - protected final Symbol[] symbols; - - protected String label; - protected String description; - protected String notes; - - public Point(JsonObject point, int offset) throws OpenemsNamedException { - this.id = JsonUtils.getAsString(point, "name"); - this.len = JsonUtils.getAsInt(point, "size"); - this.label = JsonUtils.getAsStringOrElse(point, "label", ""); - this.description = JsonUtils.getAsStringOrElse(point, "desc", ""); - this.offset = offset; - var t = JsonUtils.getAsString(point, "type"); - if (t.equals("string")) { - this.type = PointType.valueOf("STRING" + this.len); - } else { - this.type = PointType.valueOf(t.toUpperCase()); - } - var sf = JsonUtils.getAsOptionalPrimitive(point, "sf"); - if (sf.isPresent()) { - this.scaleFactor = Optional.of(sf.get().getAsString()); - } else { - this.scaleFactor = Optional.empty(); - } - this.unit = toUnit(JsonUtils.getAsStringOrElse(point, "units", "")); - var access = JsonUtils.getAsStringOrElse(point, "access", "r"); - switch (access.toLowerCase()) { - case "wo": - this.accessMode = AccessMode.WRITE_ONLY; - break; - case "rw": - this.accessMode = AccessMode.READ_WRITE; - break; - case "r": - case "ro": - default: - this.accessMode = AccessMode.READ_ONLY; - break; - } - this.mandatory = JsonUtils.getAsOptionalString(point, "mandatory").isPresent(); - this.category = PointCategory.MEASUREMENT; - - var symbolsJsonOpt = JsonUtils.getAsOptionalJsonArray(point, "symbols"); - Symbol[] symbols; - if (symbolsJsonOpt.isPresent()) { - var symbolsJson = symbolsJsonOpt.get(); - symbols = new Symbol[symbolsJson.size()]; - for (var i = 0; i < symbolsJson.size(); i++) { - var symbol = symbolsJson.get(i); - symbols[i] = new Symbol(symbol); - } - } else { - symbols = new Symbol[0]; - } - this.symbols = symbols; - - } - - static Unit toUnit(String unit) throws OpenemsNamedException { - final ThrowingFunction toUnit = s -> { - s = s.trim(); - if (s.contains(" ")) { - s = s.substring(0, s.indexOf(" ")); - } - switch (s) { - case "": - case "%ARtg/%dV": - case "bps": // not available in OpenEMS - case "cos()": // not available in OpenEMS - case "deg": // not available in OpenEMS - case "Degrees": // not available in OpenEMS - case "hhmmss": // not available in OpenEMS - case "hhmmss.sssZ": // not available in OpenEMS - case "HPa": // not available in OpenEMS - case "kO": // not available in OpenEMS - case "Mbps": // not available in OpenEMS - case "meters": // not available in OpenEMS - case "mm": // not available in OpenEMS - case "mps": // not available in OpenEMS - case "m/s": // not available in OpenEMS - case "ohms": // not available in OpenEMS - case "Pct": // not available in OpenEMS - case "PF": // not available in OpenEMS - case "SF": // not available in OpenEMS - case "text": // not available in OpenEMS - case "Tmd": // not available in OpenEMS - case "Tmh": // not available in OpenEMS - case "Tms": // not available in OpenEMS - case "Various": // not available in OpenEMS - case "Vm": // not available in OpenEMS - case "W/m2": // not available in OpenEMS - case "YYYYMMDD": // not available in OpenEMS - case "S": // not available in OpenEMS - case "%Max/Sec": // not available in OpenEMS - return Unit.NONE; - case "%": - case "%WHRtg": - return Unit.PERCENT; - case "A": - return Unit.AMPERE; - case "Ah": - case "AH": - return Unit.AMPERE_HOURS; - case "C": - return Unit.DEGREE_CELSIUS; - case "Hz": - return Unit.HERTZ; - case "kAH": - return Unit.KILOAMPERE_HOURS; - case "kWh": - return Unit.KILOWATT_HOURS; - case "mSecs": - return Unit.MILLISECONDS; - case "Secs": - return Unit.SECONDS; - case "V": - return Unit.VOLT; - case "VA": - return Unit.VOLT_AMPERE; - case "VAh": - return Unit.VOLT_AMPERE_HOURS; - case "var": - case "Var": - return Unit.VOLT_AMPERE_REACTIVE; - case "varh": - case "Varh": - return Unit.VOLT_AMPERE_REACTIVE_HOURS; - case "W": - return Unit.WATT; - case "Wh": - case "WH": - // Validate manually: OpenEMS distinguishes CUMULATED and DISCRETE Watt-Hours. - return Unit.CUMULATED_WATT_HOURS; - } - throw new OpenemsException("Unhandled unit [" + s + "]"); - }; - return toUnit.apply(unit); - } - - /** - * Gets the Symbol with the given Id. - * - * @param id the Symbol-Id - * @return the Symbol - * @throws OpenemsException on error - */ - public Symbol getSymbol(String id) throws OpenemsException { - for (Symbol symbol : this.symbols) { - if (symbol.id.equals(id)) { - return symbol; - } - } - throw new OpenemsException("Unable to find Symbol with ID " + id); - } - - @Override - public String toString() { - return "Point [id=" + this.id + ", len=" + this.len + ", offset=" + this.offset + ", type=" + this.type - + ", scaleFactor=" + this.scaleFactor.orElse("") + ", unit=" + this.unit + ", access=" - + this.accessMode + ", mandatory=" + this.mandatory + ", category=" + this.category + ", symbols=" - + Arrays.toString(this.symbols) + ", label=" + this.label + ", description=" + this.description - + ", notes=" + this.notes + "]"; - } - - /** - * POJO container for a SunSpec Point Symbol. - */ - public static class Symbol { - protected final String id; - protected final int value; - - protected String label; - protected String description; - protected String notes; - - private static Function idCleaner = id -> { - switch (id) { - case "ggOFF": - case "ggSLEEPING": - case "ggSTARTING": - case "ggTHROTTLED": - case "ggSHUTTING_DOWN": - case "ggFAULT": - case "ggSTANDBY": - // Special handling for ID 111 point "Operating State" - // TODO: create pull-request to fix Json file upstream - return id.substring(2); - case "M_EVENT_Power_Failure": - case "M_EVENT_Under_Voltage": - case "M_EVENT_Low_PF": - case "M_EVENT_Over_Current": - case "M_EVENT_Over_Voltage": - case "M_EVENT_Missing_Sensor": - case "M_EVENT_Reserved1": - case "M_EVENT_Reserved2": - case "M_EVENT_Reserved3": - case "M_EVENT_Reserved4": - case "M_EVENT_Reserved5": - case "M_EVENT_Reserved6": - case "M_EVENT_Reserved7": - case "M_EVENT_Reserved8": - case "M_EVENT_OEM01": - case "M_EVENT_OEM02": - case "M_EVENT_OEM03": - case "M_EVENT_OEM04": - case "M_EVENT_OEM05": - case "M_EVENT_OEM06": - case "M_EVENT_OEM07": - case "M_EVENT_OEM08": - case "M_EVENT_OEM09": - case "M_EVENT_OEM10": - case "M_EVENT_OEM11": - case "M_EVENT_OEM12": - case "M_EVENT_OEM13": - case "M_EVENT_OEM14": - case "M_EVENT_OEM15": - // Special handling for ID 202 point "Events" - return id.substring(8); - default: - return id; - } - }; - - protected Symbol(String id, int value) { - this.id = idCleaner.apply(id); - this.value = value; - } - - public Symbol(JsonElement symbol) throws OpenemsNamedException { - this(JsonUtils.getAsString(symbol, "name"), JsonUtils.getAsInt(symbol, "value")); - this.label = JsonUtils.getAsStringOrElse(symbol, "label", ""); - } - } - } - - protected static String toUpperUnderscore(String string) { - string = string // - .replace("-", "_") // - .replace(" ", "_"); - if (!string.toUpperCase().equals(string)) { - string = CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, string); - } - return string.replace("__", "_"); - } - -} diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecModelType.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecModelType.java index 903de11fe4d..283172c97b9 100644 --- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecModelType.java +++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecModelType.java @@ -1,5 +1,7 @@ package io.openems.edge.bridge.modbus.sunspec; +import java.util.Arrays; + /** * This is taken from the first sheet inside the SunSpec excel file. */ @@ -18,20 +20,24 @@ public enum SunSpecModelType { RESERVED_2(900, 63000), // VENDOR_SPECIFIC(64000, 65535); - protected final int startId; - protected final int endId; + private final int startId; + private final int endId; private SunSpecModelType(int startId, int endId) { this.startId = startId; this.endId = endId; } - protected static SunSpecModelType getModelType(int id) { - for (SunSpecModelType type : SunSpecModelType.values()) { - if (type.startId <= id && type.endId >= id) { - return type; - } - } - throw new IllegalArgumentException("There is no SunSpec Model-Type for ID " + id); + /** + * Get a {@link SunSpecModelType} by its id. + * + * @param id the id + * @return The {@link SunSpecModelType} + */ + public static SunSpecModelType getModelType(int id) { + return Arrays.stream(SunSpecModelType.values()) // + .filter(t -> t.startId <= id && t.endId >= id) // + .findFirst() // + .orElseThrow(() -> new IllegalArgumentException("There is no SunSpec Model-Type for ID " + id)); } } \ No newline at end of file diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecPoint.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecPoint.java index 0cc555f62d8..601a580817b 100644 --- a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecPoint.java +++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecPoint.java @@ -1,27 +1,7 @@ package io.openems.edge.bridge.modbus.sunspec; -import static io.openems.edge.bridge.modbus.api.element.AbstractModbusElement.FillElementsPriority.HIGH; - -import java.util.Optional; - -import io.openems.common.channel.AccessMode; -import io.openems.common.channel.Unit; -import io.openems.common.types.OpenemsType; -import io.openems.common.types.OptionsEnum; -import io.openems.edge.bridge.modbus.api.element.DummyRegisterElement; -import io.openems.edge.bridge.modbus.api.element.FloatDoublewordElement; -import io.openems.edge.bridge.modbus.api.element.FloatQuadruplewordElement; -import io.openems.edge.bridge.modbus.api.element.ModbusElement; -import io.openems.edge.bridge.modbus.api.element.SignedDoublewordElement; -import io.openems.edge.bridge.modbus.api.element.SignedQuadruplewordElement; -import io.openems.edge.bridge.modbus.api.element.SignedWordElement; -import io.openems.edge.bridge.modbus.api.element.StringWordElement; -import io.openems.edge.bridge.modbus.api.element.UnsignedDoublewordElement; -import io.openems.edge.bridge.modbus.api.element.UnsignedQuadruplewordElement; -import io.openems.edge.bridge.modbus.api.element.UnsignedWordElement; +import io.openems.edge.bridge.modbus.sunspec.Point.ChannelIdPoint; import io.openems.edge.common.channel.ChannelId; -import io.openems.edge.common.channel.Doc; -import io.openems.edge.common.channel.EnumDoc; /** * Holds one "Point" or "Register" within a SunSpec "Model" or "Block". @@ -39,184 +19,22 @@ public interface SunSpecPoint { public String name(); /** - * The internal PointImpl object for easier handling in Enums. + * The internal {@link Point} object for easier handling in Enums. * * @return the internal PointImpl */ - public PointImpl get(); - - /** - * Returns true if the value represents a 'defined' value in SunSpec. - * - * @param value the value - * @return true for defined values - */ - public default boolean isDefined(Object value) { - return PointType.isDefined(this.get().type, value); - } + public Point get(); /** * Gets the {@link ChannelId} for this Point. * * @return the ChannelId. */ - public default SunSChannelId getChannelId() { - return this.get().channelId; - } - - /** - * The internal PointImpl object for easier handling in Enums. - */ - public static class PointImpl { - public final String label; - public final String description; - public final String notes; - public final PointType type; - public final boolean mandatory; - public final AccessMode accessMode; - public final Unit unit; - public final SunSChannelId channelId; - public final Optional scaleFactor; - public final OptionsEnum[] options; - - public PointImpl(String channelId, String label, String description, String notes, PointType type, - boolean mandatory, AccessMode accessMode, Unit unit, String scaleFactor, OptionsEnum[] options) { - this.label = label; - this.description = description; - this.notes = notes; - this.type = type; - this.mandatory = mandatory; - this.accessMode = accessMode; - this.unit = unit; - this.scaleFactor = Optional.ofNullable(scaleFactor); - if (options.length == 0) { - this.channelId = new SunSChannelId<>(channelId, // - Doc.of(this.getMatchingOpenemsType(this.scaleFactor.isPresent())) // - .unit(unit) // - .accessMode(accessMode)); - } else { - this.channelId = new SunSChannelId<>(channelId, // - new EnumDoc(options) // - .accessMode(accessMode)); - } - this.options = options; - } - - /** - * Generates a Modbus Element for the given point + startAddress. - * - * @param startAddress the startAddress of the Point - * @return a new Modbus Element - */ - public final ModbusElement generateModbusElement(Integer startAddress) { - return switch (this.type) { - case UINT16, ACC16, ENUM16, BITFIELD16 -> new UnsignedWordElement(startAddress); - case SUNSSF -> new SignedWordElement(startAddress)// - .fillElementsPriority(HIGH); - case INT16, COUNT -> new SignedWordElement(startAddress); - case UINT32, ACC32, ENUM32, BITFIELD32, IPADDR -> new UnsignedDoublewordElement(startAddress); - case INT32 -> new SignedDoublewordElement(startAddress); - case UINT64, ACC64 -> new UnsignedQuadruplewordElement(startAddress); - case INT64 -> new SignedQuadruplewordElement(startAddress); - case FLOAT32 -> new FloatDoublewordElement(startAddress); - case PAD -> new DummyRegisterElement(startAddress); - case FLOAT64 -> new FloatQuadruplewordElement(startAddress); - case EUI48 -> null; - case IPV6ADDR // TODO this would be UINT128 - -> null; - case STRING2 -> new StringWordElement(startAddress, 2); - case STRING4 -> new StringWordElement(startAddress, 4); - case STRING5 -> new StringWordElement(startAddress, 5); - case STRING6 -> new StringWordElement(startAddress, 6); - case STRING7 -> new StringWordElement(startAddress, 7); - case STRING8 -> new StringWordElement(startAddress, 8); - case STRING12 -> new StringWordElement(startAddress, 12); - case STRING16 -> new StringWordElement(startAddress, 16); - case STRING20 -> new StringWordElement(startAddress, 20); - case STRING25 -> new StringWordElement(startAddress, 25); - case STRING32 -> new StringWordElement(startAddress, 32); - default -> throw new IllegalArgumentException( - "Point [" + this.label + "]: Type [" + this.type + "] is not supported!"); - }; + public default ChannelId getChannelId() { + var p = this.get(); + if (p instanceof ChannelIdPoint cp) { + return cp.channelId; } - - /** - * Gets the {@link OpenemsType} that matches this SunSpec-Type. - * - * @param hasScaleFactor true if this Point has a ScaleFactor. If true, a - * floating point type is applied to avoid rounding - * errors. - * @return the {@link OpenemsType} - */ - public final OpenemsType getMatchingOpenemsType(boolean hasScaleFactor) { - if (hasScaleFactor) { - return OpenemsType.FLOAT; - } - - // TODO: map to floating point OpenemsType when appropriate - return switch (this.type) { - case UINT16, ACC16, ENUM16, BITFIELD16, INT16, SUNSSF, COUNT, INT32, PAD, // ignore - EUI48, FLOAT32 // avoid floating point numbers; FLOAT32 might not fit in INTEGER - -> OpenemsType.INTEGER; - case ACC32, BITFIELD32, ENUM32, IPADDR, UINT32, UINT64, ACC64, INT64, IPV6ADDR, // - FLOAT64 // avoid floating point numbers - -> OpenemsType.LONG; - case STRING2, STRING4, STRING5, STRING6, STRING7, STRING8, STRING12, STRING16, STRING20, STRING25, - STRING32 -> - OpenemsType.STRING; - default -> throw new IllegalArgumentException("Unable to get matching OpenemsType for " + this.type); - - }; - } - } - - public static enum PointType { - INT16(1), UINT16(1), COUNT(1), ACC16(1), INT32(2), UINT32(2), FLOAT32(2), ACC32(2), INT64(4), UINT64(4), - FLOAT64(4), ACC64(4), ENUM16(1), ENUM32(2), BITFIELD16(1), BITFIELD32(2), SUNSSF(1), STRING2(2), STRING4(4), - STRING5(5), STRING6(6), STRING7(7), STRING8(8), STRING12(12), STRING16(16), STRING20(20), STRING25(25), - STRING32(32), - /* use PAD for reserved points */ - PAD(1), IPADDR(1), IPV6ADDR(16), EUI48(6); - - public final int length; - - private PointType(int length) { - this.length = length; - } - - /** - * Returns true if the value represents a 'defined' value in SunSpec. - * - * @param type the PointType - * @param value the value - * @return true for defined values - */ - public static boolean isDefined(PointType type, Object value) { - if (value == null) { - return false; - } - return switch (type) { - case INT16, SUNSSF -> !value.equals(Short.MIN_VALUE /* -32768 */); - case UINT16, ENUM16, BITFIELD16, COUNT -> !value.equals(65535); - case ACC16, ACC32, IPADDR, ACC64, IPV6ADDR -> !value.equals(0); - case INT32 -> !value.equals(0x80000000); // TODO correct? - case UINT32, ENUM32, BITFIELD32 -> !value.equals(4294967295L); - case INT64 -> !value.equals(0x8000000000000000L); // TODO correct? - case UINT64 -> !value.equals(0xFFFFFFFFFFFFFFFFL); // TODO correct? - case FLOAT32 -> !value.equals(Float.NaN); - case FLOAT64 -> false; // TODO not implemented - case PAD // This point is never needed/reserved - -> false; - case STRING12, STRING16, STRING2, STRING20, STRING25, STRING32, STRING4, STRING5, STRING6, STRING7, - STRING8 -> - !"".equals(value); - case EUI48 -> false; // TODO not implemented - default -> false; - }; - } - } - - public static enum PointCategory { - NONE, MEASUREMENT, METERED, STATUS, EVENT, SETTING, CONTROL; + throw new IllegalAccessError("SunSpecPoint [" + this.name() + "] has no Channel-ID"); } } \ No newline at end of file diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecPointCategory.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecPointCategory.java new file mode 100644 index 00000000000..6788e0a651b --- /dev/null +++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/SunSpecPointCategory.java @@ -0,0 +1,5 @@ +package io.openems.edge.bridge.modbus.sunspec; + +public enum SunSpecPointCategory { + NONE, MEASUREMENT, METERED, STATUS, EVENT, SETTING, CONTROL; +} \ No newline at end of file diff --git a/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/Utils.java b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/Utils.java new file mode 100644 index 00000000000..34208137fa4 --- /dev/null +++ b/io.openems.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/sunspec/Utils.java @@ -0,0 +1,50 @@ +package io.openems.edge.bridge.modbus.sunspec; + +import static java.util.stream.Collectors.joining; + +import java.util.stream.Stream; + +import com.google.common.base.CaseFormat; + +public class Utils { + + private Utils() { + } + + /** + * Converts a String ID to UPPER_UNDERSCORE. + * + * @param string the source string + * @return the converted string + */ + public static String toUpperUnderscore(String string) { + string = string // + .replace("-", "_") // + .replace(" ", "_"); + if (!string.toUpperCase().equals(string)) { + string = CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, string); + } + return string.replace("__", "_"); + } + + /** + * Converts a String ID to a human readable label. + * + * @param string the source string + * @return the converted string + */ + public static String toLabel(String string) { + if (string.toUpperCase() != string || !string.contains("_")) { + // Directly return non-uppercase strings + return string; + } + // Taken from https://stackoverflow.com/a/28560959/4137113 + return Stream.of(string.trim().split("\\s|_")) // + .filter(word -> word.length() > 0) // + .map(word -> switch (word) { + case "AC", "DC", "HW" -> word; + default -> word.substring(0, 1).toUpperCase() + word.substring(1).toLowerCase(); // + }) // + .collect(joining(" ")); + } +} 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 a4526ef63dd..2ce0c196ec0 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 @@ -24,6 +24,7 @@ import io.openems.edge.bridge.modbus.api.LogVerbosity; import io.openems.edge.bridge.modbus.api.element.ModbusElement; import io.openems.edge.bridge.modbus.api.element.StringWordElement; +import io.openems.edge.bridge.modbus.sunspec.Point.ModbusElementPoint; import io.openems.edge.bridge.modbus.sunspec.dummy.MyConfig; import io.openems.edge.bridge.modbus.sunspec.dummy.MySunSpecComponentImpl; import io.openems.edge.common.test.AbstractComponentTest.TestCase; @@ -38,14 +39,16 @@ public void testPreprocessModbusElements() throws OpenemsException { var elements = new ArrayList(); var startAddress = 0; for (var point : DefaultSunSpecModel.S_701.points()) { - var element = point.get().generateModbusElement(startAddress); - startAddress += element.length; - elements.add(element); + if (point.get() instanceof ModbusElementPoint mep) { // without BitFieldPoints + var element = mep.generateModbusElement(startAddress); + startAddress += element.length; + elements.add(element); + } } var sut = preprocessModbusElements(elements); assertEquals(2, sut.size()); // two sublists - assertEquals(69, sut.get(0).size()); // first task + assertEquals(66, sut.get(0).size()); // first task assertEquals(1, sut.get(1).size()); // second task assertEquals(StringWordElement.class, sut.get(1).get(0).getClass()); // second task } @@ -66,7 +69,7 @@ private static ImmutableSortedMap.Builder generateSunSpec() { .put(40003, 66); // Length of the SunSpec Block IntStream.range(40004, 40070).forEach(i -> b.put(i, 0)); b // - .put(40070, 123) // SunSpec Block-ID + .put(40070, 103) // SunSpec Block-ID .put(40071, 24); // Length of the SunSpec Block IntStream.range(40072, 40096).forEach(i -> b.put(i, 0)); b // @@ -119,7 +122,7 @@ public void test() throws Exception { testWithEndOfMap(slave, bridge, testBridge, cmp, testCmp); testWithIllegalAddress(slave, bridge, testBridge, cmp, testCmp); - assertFalse(cmp.getSunSpecChannel(DefaultSunSpecModel.S103.APH_A).isPresent()); + assertFalse(cmp.getSunSpecChannel(DefaultSunSpecModel.S101.APH_A).isPresent()); assertNotNull(cmp.getSunSpecChannelOrError(DefaultSunSpecModel.S702.W_MAX_RTG)); } finally { @@ -150,7 +153,7 @@ private static void testWithEndOfMap(ModbusSlave slave, BridgeModbusTcpImpl brid cycle(testBridge, testCmp, 5, 100); - assertEquals(58, cmp.channels().size()); + assertEquals(101, cmp.channels().size()); } private static void testWithIllegalAddress(ModbusSlave slave, BridgeModbusTcpImpl bridge, ComponentTest testBridge, @@ -166,6 +169,6 @@ private static void testWithIllegalAddress(ModbusSlave slave, BridgeModbusTcpImp cycle(testBridge, testCmp, 1, 2000); // wait for defective component cycle(testBridge, testCmp, 2, 100); - assertEquals(58, cmp.channels().size()); + assertEquals(101, cmp.channels().size()); } } diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/UtilsTest.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/UtilsTest.java new file mode 100644 index 00000000000..f11b02dae9b --- /dev/null +++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/UtilsTest.java @@ -0,0 +1,21 @@ +package io.openems.edge.bridge.modbus.sunspec; + +import static io.openems.edge.bridge.modbus.sunspec.Utils.toLabel; +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class UtilsTest { + + @Test + public void testToLabel() { + assertEquals("Not Configured", toLabel("NOT_CONFIGURED")); + assertEquals("Reserved 8", toLabel("RESERVED_8")); + assertEquals("FixedPF", toLabel("FixedPF")); + assertEquals("Volt-VAr", toLabel("Volt-VAr")); + assertEquals("Freq-Watt-Param", toLabel("Freq-Watt-Param")); + assertEquals("LVRT", toLabel("LVRT")); + assertEquals("DC Over Volt", toLabel("DC_OVER_VOLT")); + } + +} diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/generator/FluentWriter.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/generator/FluentWriter.java new file mode 100644 index 00000000000..c38354b35c2 --- /dev/null +++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/generator/FluentWriter.java @@ -0,0 +1,131 @@ +package io.openems.edge.bridge.modbus.sunspec.generator; + +import java.io.BufferedWriter; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.function.Supplier; + +public class FluentWriter implements AutoCloseable { + + private final BufferedWriter w; + + /** + * Builds a {@link FluentWriter}. + * + * @param path the path + * @return a {@link FluentWriter} + * @throws IOException on error + */ + public static FluentWriter to(String path) throws IOException { + return new FluentWriter(Paths.get(path)); + } + + private FluentWriter(Path path) throws IOException { + this.w = Files.newBufferedWriter(path); + } + + /** + * Writes line without final newLine. + * + * @param line the line + * @return myself + * @throws IOException on error + */ + public FluentWriter write(String line) throws IOException { + this.w.write(line); + return this; + } + + /** + * Writes text without final newLine if predicate is true. + * + * @param predicate the predicate; if true write text + * @param text the text Supplier + * @return myself + * @throws IOException on error + */ + public FluentWriter writeIf(boolean predicate, Supplier text) throws IOException { + if (predicate) { + this.write(text.get()); + } + return this; + } + + /** + * Writes true- or false-text without final newLine. + * + * @param predicate the predicate; if true write true-line; if false write + * false-line + * @param trueText the true-text + * @param falseText the false-text + * @return myself + * @throws IOException on error + */ + public FluentWriter writeIf(boolean predicate, String trueText, String falseText) throws IOException { + return predicate // + ? this.write(trueText) // + : this.write(falseText); + } + + /** + * Writes line with final newLine. + * + * @param line the line + * @return myself + * @throws IOException on error + */ + public FluentWriter writeln(String line) throws IOException { + this.w.write(line); + this.w.newLine(); + return this; + } + + /** + * Writes line if predicate is true. + * + * @param predicate the predicate; if true write line + * @param line the line + * @return myself + * @throws IOException on error + */ + public FluentWriter writelnIf(boolean predicate, String line) throws IOException { + if (predicate) { + this.writeln(line); + } + return this; + } + + /** + * Writes true- or false-line without final newLine. + * + * @param predicate the predicate; if true write true-line; if false write + * false-line + * @param trueLine the true-line + * @param falseLine the false-line + * @return myself + * @throws IOException on error + */ + public FluentWriter writelnIf(boolean predicate, String trueLine, String falseLine) throws IOException { + return predicate // + ? this.writeln(trueLine) // + : this.writeln(falseLine); + } + + /** + * Writes an empty newLine. + * + * @return myself + * @throws IOException on error + */ + public FluentWriter blank() throws IOException { + this.w.newLine(); + return this; + } + + @Override + public void close() throws IOException { + this.w.close(); + } +} \ No newline at end of file diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/generator/Model.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/generator/Model.java new file mode 100644 index 00000000000..3c7e716fed5 --- /dev/null +++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/generator/Model.java @@ -0,0 +1,74 @@ +package io.openems.edge.bridge.modbus.sunspec.generator; + +import static io.openems.common.utils.JsonUtils.getAsInt; +import static io.openems.common.utils.JsonUtils.getAsJsonArray; +import static io.openems.common.utils.JsonUtils.getAsJsonObject; +import static io.openems.common.utils.JsonUtils.getAsString; +import static io.openems.common.utils.JsonUtils.getAsStringOrElse; + +import com.google.common.collect.ImmutableList; +import com.google.gson.JsonObject; + +import io.openems.common.exceptions.OpenemsError.OpenemsNamedException; +import io.openems.common.exceptions.OpenemsException; +import io.openems.edge.bridge.modbus.sunspec.SunSpecModelType; + +/** + * POJO container for a SunSpec Model. + */ +public record Model(int id, int len, String name, String label, String description, ImmutableList points, + SunSpecModelType modelType) { + + /** + * Builds a {@link Model} from a {@link JsonObject}. + * + * @param model the {@link JsonObject} + * @return a {@link Model} + * @throws OpenemsNamedException on error + */ + public static Model fromJson(JsonObject model) throws OpenemsNamedException { + var id = getAsInt(model, "id"); + var group = model.get("group").getAsJsonObject(); + var name = getAsString(group, "name"); + var label = getAsStringOrElse(group, "label", ""); + var description = getAsStringOrElse(group, "desc", ""); + + var offset = 0; + final var list = ImmutableList.builder(); + for (var point : getAsJsonArray(group, "points")) { + var p = Point.fromJson(getAsJsonObject(point), offset); + // ID and length not to be considered as points + if (!p.id().equals("ID") && !p.id().equals("L")) { + list.add(p); + } + offset += p.len(); + } + var points = list.build(); + var len = points.stream() // + .map(Point::len) // + .reduce(0, (t, p) -> t + p); + var modelType = SunSpecModelType.getModelType(id); + return new Model(id, len, name, label, description, points, modelType); + } + + /** + * Gets the Point with the given Id. + * + * @param id the Point-ID + * @return the Point + * @throws OpenemsException on error + */ + public Point getPoint(String id) throws OpenemsException { + return this.points.stream() // + .filter(p -> p.id() == id) // + .findFirst() // + .orElseThrow(() -> new OpenemsException("Unable to find Point with ID " + id)); + } + + @Override + public String toString() { + return "Model [id=" + this.id + ", name=" + this.name + ", points=" + this.points + ", label=" + this.label + + ", description=" + this.description + "]"; + } + +} \ No newline at end of file diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/generator/Point.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/generator/Point.java new file mode 100644 index 00000000000..4f0c17e5eb5 --- /dev/null +++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/generator/Point.java @@ -0,0 +1,193 @@ +package io.openems.edge.bridge.modbus.sunspec.generator; + +import static io.openems.common.utils.JsonUtils.getAsInt; +import static io.openems.common.utils.JsonUtils.getAsOptionalJsonArray; +import static io.openems.common.utils.JsonUtils.getAsOptionalPrimitive; +import static io.openems.common.utils.JsonUtils.getAsOptionalString; +import static io.openems.common.utils.JsonUtils.getAsString; +import static io.openems.common.utils.JsonUtils.getAsStringOrElse; + +import java.util.Arrays; +import java.util.Optional; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; + +import io.openems.common.channel.AccessMode; +import io.openems.common.channel.Unit; +import io.openems.common.exceptions.OpenemsError.OpenemsNamedException; +import io.openems.common.exceptions.OpenemsException; +import io.openems.common.function.ThrowingFunction; +import io.openems.edge.bridge.modbus.sunspec.SunSpecPointCategory; + +/** + * POJO container for a SunSpec Point. + */ +public record Point(String id, int len, int offset, String type, Optional scaleFactor, Unit unit, + AccessMode accessMode, boolean mandatory, SunSpecPointCategory category, Point.Symbol[] symbols, String label, + String description) { + + /** + * Builds a {@link Point} from a {@link JsonObject}. + * + * @param point the {@link JsonObject} + * @param offset the address offset + * @return a {@link Point} + * @throws OpenemsNamedException on error + */ + public static Point fromJson(JsonObject point, int offset) throws OpenemsNamedException { + var id = getAsString(point, "name"); + var len = getAsInt(point, "size"); + var label = getAsStringOrElse(point, "label", ""); + var description = getAsStringOrElse(point, "desc", ""); + final String type; + var t = getAsString(point, "type"); + if (t.equals("string")) { + type = "STRING" + len; + } else { + type = t.toUpperCase(); + } + var scaleFactor = getAsOptionalPrimitive(point, "sf").map(sf -> sf.getAsString()); + var unit = toUnit(getAsStringOrElse(point, "units", "")); + var accessMode = switch (getAsStringOrElse(point, "access", "r").toLowerCase()) { + case "wo" // + -> AccessMode.WRITE_ONLY; + case "rw" // + -> AccessMode.READ_WRITE; + default // "r", "ro" + -> AccessMode.READ_ONLY; + }; + var mandatory = getAsOptionalString(point, "mandatory").isPresent(); + var category = SunSpecPointCategory.MEASUREMENT; + + var symbolsJsonOpt = getAsOptionalJsonArray(point, "symbols"); + final Point.Symbol[] symbols; + if (symbolsJsonOpt.isPresent()) { + var symbolsJson = symbolsJsonOpt.get(); + symbols = new Point.Symbol[symbolsJson.size()]; + for (var i = 0; i < symbolsJson.size(); i++) { + var symbol = symbolsJson.get(i); + symbols[i] = Symbol.fromJson(symbol); + } + } else { + symbols = new Point.Symbol[0]; + } + return new Point(id, len, offset, type, scaleFactor, unit, accessMode, mandatory, category, symbols, label, + description); + } + + private static Unit toUnit(String unit) throws OpenemsNamedException { + final ThrowingFunction toUnit = s -> { + s = s.trim(); + if (s.contains(" ")) { + s = s.substring(0, s.indexOf(" ")); + } + return switch (s) { + case "", "%ARtg/%dV", "bps", "cos()", "deg", "Degrees", "hhmmss", "hhmmss.sssZ", "HPa", "kO", "Mbps", + "meters", "mm", "mps", "m/s", "ohms", "Pct", "PF", "SF", "text", "Tmd", "Tmh", "Tms", "Various", + "Vm", "W/m2", "YYYYMMDD", "S", "%Max/Sec" -> + Unit.NONE; + case "%", "%WHRtg" // + -> Unit.PERCENT; + case "A" // + -> Unit.AMPERE; + case "Ah", "AH" // + -> Unit.AMPERE_HOURS; + case "C" // + -> Unit.DEGREE_CELSIUS; + case "Hz" // + -> Unit.HERTZ; + case "kAH" // + -> Unit.KILOAMPERE_HOURS; + case "kWh" // + -> Unit.KILOWATT_HOURS; + case "mSecs" // + -> Unit.MILLISECONDS; + case "Secs" // + -> Unit.SECONDS; + case "V" // + -> Unit.VOLT; + case "VA" // + -> Unit.VOLT_AMPERE; + case "VAh" // + -> Unit.VOLT_AMPERE_HOURS; + case "var", "Var" // + -> Unit.VOLT_AMPERE_REACTIVE; + case "varh", "Varh" // + -> Unit.VOLT_AMPERE_REACTIVE_HOURS; + case "W" // + -> Unit.WATT; + case "Wh", "WH" // Validate manually: OpenEMS distinguishes CUMULATED and DISCRETE Watt-Hours. + -> Unit.CUMULATED_WATT_HOURS; + default // + -> throw new OpenemsException("Unhandled unit [" + s + "]"); + }; + }; + return toUnit.apply(unit); + } + + /** + * Gets the Symbol with the given Id. + * + * @param id the Symbol-Id + * @return the Symbol + * @throws OpenemsException on error + */ + public Point.Symbol getSymbol(String id) throws OpenemsException { + for (var symbol : this.symbols) { + if (symbol.id.equals(id)) { + return symbol; + } + } + throw new OpenemsException("Unable to find Symbol with ID " + id); + } + + @Override + public String toString() { + return "Point [id=" + this.id + ", len=" + this.len + ", offset=" + this.offset + ", type=" + this.type + + ", scaleFactor=" + this.scaleFactor.orElse("") + ", unit=" + this.unit + ", access=" + this.accessMode + + ", mandatory=" + this.mandatory + ", category=" + this.category + ", symbols=" + + Arrays.toString(this.symbols) + ", label=" + this.label + ", description=" + this.description + "]"; + } + + /** + * POJO container for a SunSpec Point Symbol. + */ + public static record Symbol(String id, int value, String label) { + + /** + * Builds a {@link Symbol} from a {@link JsonElement}. + * + * @param symbol the {@link JsonElement} + * @return a {@link Symbol} + * @throws OpenemsNamedException on error + */ + public static Symbol fromJson(JsonElement symbol) throws OpenemsNamedException { + var id = cleanId(getAsString(symbol, "name")); + var value = getAsInt(symbol, "value"); + var label = getAsStringOrElse(symbol, "label", ""); + return new Symbol(id, value, label); + } + + private static String cleanId(String id) { + return switch (id) { + // Special handling for ID 111 point "Operating State" + case "ggOFF", "ggSLEEPING", "ggSTARTING", "ggTHROTTLED", "ggSHUTTING_DOWN", "ggFAULT", "ggSTANDBY" // + -> id.substring(2); + + // Special handling for ID 202 point "Events" + case "M_EVENT_Power_Failure", "M_EVENT_Under_Voltage", "M_EVENT_Low_PF", "M_EVENT_Over_Current", + "M_EVENT_Over_Voltage", "M_EVENT_Missing_Sensor", "M_EVENT_Reserved1", "M_EVENT_Reserved2", + "M_EVENT_Reserved3", "M_EVENT_Reserved4", "M_EVENT_Reserved5", "M_EVENT_Reserved6", + "M_EVENT_Reserved7", "M_EVENT_Reserved8", "M_EVENT_OEM01", "M_EVENT_OEM02", "M_EVENT_OEM03", + "M_EVENT_OEM04", "M_EVENT_OEM05", "M_EVENT_OEM06", "M_EVENT_OEM07", "M_EVENT_OEM08", + "M_EVENT_OEM09", "M_EVENT_OEM10", "M_EVENT_OEM11", "M_EVENT_OEM12", "M_EVENT_OEM13", + "M_EVENT_OEM14", "M_EVENT_OEM15" // + -> id.substring(8); + + default // + -> id; + }; + } + } +} \ No newline at end of file diff --git a/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/generator/SunSpecCodeGenerator.java b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/generator/SunSpecCodeGenerator.java new file mode 100644 index 00000000000..fd12bff73d0 --- /dev/null +++ b/io.openems.edge.bridge.modbus/test/io/openems/edge/bridge/modbus/sunspec/generator/SunSpecCodeGenerator.java @@ -0,0 +1,505 @@ +package io.openems.edge.bridge.modbus.sunspec.generator; + +import static io.openems.common.utils.JsonUtils.parseToJsonObject; +import static io.openems.edge.bridge.modbus.sunspec.Utils.toLabel; +import static io.openems.edge.bridge.modbus.sunspec.Utils.toUpperUnderscore; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import com.google.gson.JsonObject; + +import io.openems.common.channel.Level; +import io.openems.common.exceptions.OpenemsError.OpenemsNamedException; +import io.openems.edge.common.channel.BooleanReadChannel; +import io.openems.edge.common.channel.StateChannel; + +/** + * This tool converts SunSpec Json definitions to Java code suitable for the + * OpenEMS SunSpec implementation. + * + *

+ * Download Json files from https://github.com/sunspec/models. + */ +public class SunSpecCodeGenerator { + + /** + * Path to the SunSpec model Json files; download them from + * https://github.com/sunspec/models. + */ + private static final String SUNSPEC_JSON_PATH = System.getProperty("user.home") + "\\git\\sunspec\\json\\"; + /** + * Path to the generated output file. + */ + private static final String OUT_FILE_PATH = System.getProperty("user.dir") + + "\\src\\io\\openems\\edge\\bridge\\modbus\\sunspec\\DefaultSunSpecModel.java"; + + /** + * Json files that should be ignored; mainly because certain features are not + * implemented yet. + */ + private static final Set IGNORE_FILES = new HashSet<>(Arrays.asList(// + "model_3.json", // + "model_4.json", // + "model_5.json", // + "model_6.json", // + "model_7.json", // + "model_8.json", // + "model_9.json", // + "model_10.json", // + "model_11.json", // + "model_12.json", // + "model_13.json", // + "model_14.json", // + "model_16.json", // + "model_17.json", // + "model_19.json", // + "model_126.json", // + "model_129.json", // + "model_130.json", // + "model_131.json", // + "model_132.json", // + "model_133.json", // + "model_134.json", // + "model_135.json", // + "model_136.json", // + "model_137.json", // + "model_138.json", // + "model_139.json", // + "model_140.json", // + "model_141.json", // + "model_142.json", // + "model_143.json", // + "model_144.json", // + "model_160.json", // + "model_211.json", // + "model_212.json", // + "model_213.json", // + "model_214.json", // + "model_220.json", // + "model_302.json", // + "model_303.json", // + "model_304.json", // + "model_401.json", // + "model_402.json", // + "model_403.json", // + "model_404.json", // + "model_501.json", // + "model_502.json", // + "model_601.json", // + "model_803.json", // + "model_804.json", // + "model_805.json", // + "model_806.json", // + "model_807.json", // + "model_808.json", // + "model_809.json", // + "model_63001.json", // + "model_63002.json", // + "model_64020.json" // + )); + + /** + * Run this method to start the code generator. + * + * @param args not supported + * @throws Exception on error + */ + public static void main(String[] args) throws Exception { + System.out.println("Parsing SunSpec files from " + SUNSPEC_JSON_PATH); + var generator = new SunSpecCodeGenerator(); + var models = generator.parseSunSpecFiles(); + generator.writeSunSpecModelJavaFile(models); + } + + /** + * Parses all SunSpec Json files in a directory. + * + * @return a list of Models + * @throws Exception on error + */ + private List parseSunSpecFiles() throws Exception { + List result = new ArrayList<>(); + for (var file : new File(SUNSPEC_JSON_PATH).listFiles(file -> // + file.getName().startsWith("model") // + && file.getName().endsWith(".json") // + && !IGNORE_FILES.contains(file.getName()))) { + try { + var model = this.parseSunSpecFile(Files.readString(file.toPath())); + result.add(model); + + } catch (Exception e) { + throw new Exception("Error while reading from " + file, e); + } + } + // Sort by model ids to have an ordered output + result.sort(new Comparator() { + @Override + public int compare(Model m1, Model m2) { + return m1.id() - m2.id(); + } + }); + + return result; + } + + /** + * Parses a SunSpec Json file. + * + * @param file the SunSpec Json file handler + * @return the Model + * @throws Exception on error + */ + private Model parseSunSpecFile(String file) throws Exception { + var json = parseToJsonObject(file); + + var generator = new SunSpecCodeGenerator(); + return generator.parseSunSpecModels(json); + } + + /** + * Parses the element sunSpecModels. + * + * 

+	 *   <sunSpecModels v="1">
+	 *
+ * + *
    + *
  • xs:attribute name="v" type="xs:string" default="1" + *
+ * + * @param sunSpecModels the 'sunSpecModels' json + * @return the Model + * @throws OpenemsNamedException on error + * @throws JSONException on json error + */ + private Model parseSunSpecModels(JsonObject sunSpecModels) throws OpenemsNamedException { + return Model.fromJson(sunSpecModels); + } + + private static enum PointType { + VALUE("ValuePoint", "ValuePoint.Type"), // + SCALED_VALUE("ScaledValuePoint", "ValuePoint.Type"), // + SCALE_FACTOR("ScaleFactorPoint", "ScaleFactorPoint.Type"), // + ENUM("EnumPoint", "EnumPoint.Type"), // + BITFIELD("BitFieldPoint", "BitFieldPoint.Type"); + + public final String clazz; + public final String typeClazz; + + private PointType(String clazz, String type) { + this.clazz = clazz; + this.typeClazz = type; + } + + public static PointType evaluate(Point point) { + if (point.scaleFactor().isPresent()) { + return PointType.SCALED_VALUE; + } + switch (point.type()) { + case "ENUM16", "ENUM32": + return PointType.ENUM; + case "SUNSSF": + return PointType.SCALE_FACTOR; + case "BITFIELD16", "BITFIELD32": + return PointType.BITFIELD; + } + return PointType.VALUE; + } + } + + /** + * Writes the SunSpecModel.java file. + * + * @param models a list of Models + * @throws IOException on error + */ + private void writeSunSpecModelJavaFile(List models) throws IOException { + try (var w = FluentWriter.to(OUT_FILE_PATH)) { + w // + .writeln("// CHECKSTYLE:OFF") // + .blank() // + .writeln("package io.openems.edge.bridge.modbus.sunspec;") // + .blank() // + .writeln("import io.openems.common.channel.AccessMode;") // + .writeln("import io.openems.common.channel.Level;") // + .writeln("import io.openems.common.channel.Unit;") // + .writeln("import io.openems.common.types.OptionsEnum;") // + .writeln("import io.openems.edge.bridge.modbus.sunspec.Point.BitFieldPoint;") // + .writeln("import io.openems.edge.bridge.modbus.sunspec.Point.BitFieldPoint.SunSpecBitPoint;") // + .writeln("import io.openems.edge.bridge.modbus.sunspec.Point.BitPoint;") // + .writeln("import io.openems.edge.bridge.modbus.sunspec.Point.EnumPoint;") // + .writeln("import io.openems.edge.bridge.modbus.sunspec.Point.ScaleFactorPoint;") // + .writeln("import io.openems.edge.bridge.modbus.sunspec.Point.ScaledValuePoint;") // + .writeln("import io.openems.edge.bridge.modbus.sunspec.Point.ValuePoint;") // + .blank() // + .writeln("/**") // + .writeln(" * Do not touch this file. It is auto-generated by SunSpecCodeGenerator.") // + .writeln(" */") // + .writeln("public enum DefaultSunSpecModel implements SunSpecModel {"); + + /* + * Write main Model enum + */ + for (var i = 0; i < models.size(); i++) { + var model = models.get(i); + w // + .writeln(" S_" + model.id() + "(" // + + "\"" + esc(model.label()) + "\", //") // + .writeln(" \"" + esc(model.description()) + "\", //") // + .write(" " + model.len() + " /* length */, " // + + "DefaultSunSpecModel.S" + model.id() + ".values(), " // + + "SunSpecModelType." + model.modelType()) // + .writelnIf(i == models.size() - 1, // + "); //", // + "), //"); + } + w.blank(); + + /* + * For each Model write enum with SunSpecPoints + */ + for (var model : models) { + w.writeln(" public static enum S" + model.id() + " implements SunSpecPoint {"); + for (var i = 0; i < model.points().size(); i++) { + final var point = model.points().get(i); + final var pointUpperId = toUpperUnderscore(point.id()); + final var pointType = PointType.evaluate(point); + w // + .write(" " + pointUpperId + "(new " + pointType.clazz + "(" // + + "\"S" + model.id() + "_" + pointUpperId + "\", " // + + "\"" + esc(point.label()) + "\", "); + if (!point.description().isEmpty()) { + w.writeln("//").write(" "); + } + w.write("\"" + esc(point.description()) + "\""); // + + if (pointType != PointType.SCALE_FACTOR) { + w // + .writeln(", //") // + .write(" " + pointType.typeClazz + "." + point.type() + ", " // + + point.mandatory() + " /* mandatory? */" // + + ", AccessMode." + point.accessMode().name()); + if (pointType == PointType.VALUE || pointType == PointType.SCALED_VALUE) { + w // + .write(", Unit." + point.unit().name()); + } + if (pointType == PointType.SCALED_VALUE) { + w // + .write(", \"" + point.scaleFactor().get() + "\""); + } else if (pointType == PointType.ENUM) { + w // + .write(", ") // + .writeIf(point.symbols().length == 0, // + "new OptionsEnum[0]", // + "S" + model.id() + "_" + point.id() + ".values()"); + } else if (pointType == PointType.BITFIELD) { + w // + .write(", ") // + .writeIf(point.symbols().length == 0, // + "new SunSpecBitPoint[0]", // + "S" + model.id() + "_" + point.id() + ".values()"); + } + } + + w.writelnIf(i == model.points().size() - 1, // + "));", // + ")), //"); + } + w // + .blank() // + .writeln(" private final Point point;") // + .blank() // + .writeln(" private S" + model.id() + "(Point point) {") // + .writeln(" this.point = point;") // + .writeln(" }") // + .blank() // + .writeln(" @Override") // + .writeln(" public Point get() {") // + .writeln(" return this.point;") // + .writeln(" }") // + .writeln(" }") // + .blank(); + + // Handle SunSpecPoints with Symbols + for (var point : model.points()) { + if (point.symbols().length == 0) { + continue; + } + final var pointType = PointType.evaluate(point); + /* + * Handle Enum points + */ + if (pointType == PointType.ENUM) { + w // + .writeln(" public static enum S" + model.id() + "_" + point.id() + + " implements OptionsEnum {") // + .writeln(" UNDEFINED(-1, \"Undefined\"), //"); + for (var i = 0; i < point.symbols().length; i++) { + final var symbol = point.symbols()[i]; + var symbolId = toUpperUnderscore(symbol.id()); + + switch (symbolId) { + case "RESERVED": + symbolId = symbolId + "_" + symbol.value(); // avoid duplicated "RESERVED" ids. + break; + } + + w // + .write(" " + symbolId + "(" + symbol.value() + ", \"" + symbolId + "\")") // + .writelnIf(i == point.symbols().length - 1, // + ";", // + ", //"); + } + w.blank() // + .writeln(" private final int value;") // + .writeln(" private final String name;") // + .blank() // + .writeln(" private S" + model.id() + "_" + point.id() + + "(int value, String name) {") // + .writeln(" this.value = value;") // + .writeln(" this.name = name;") // + .writeln(" }") // + .blank() // + .writeln(" @Override") // + .writeln(" public int getValue() {") // + .writeln(" return this.value;") // + .writeln(" }") // + .blank() // + .writeln(" @Override") // + .writeln(" public String getName() {") // + .writeln(" return this.name;") // + .writeln(" }") // + .blank() // + .writeln(" @Override") // + .writeln(" public OptionsEnum getUndefined() {") // + .writeln(" return UNDEFINED;") // + .writeln(" }") // + .writeln(" }") // + .blank(); + + } else if (pointType == PointType.BITFIELD) { + /* + * Handle BitField points + */ + final var name = "S" + model.id() + "_" + point.id(); + w.writeln(" public static enum " + name + " implements SunSpecBitPoint {"); + for (var i = 0; i < point.symbols().length; i++) { + final var symbol = point.symbols()[i]; + var symbolId = toUpperUnderscore(symbol.id()); + var channelId = toUpperUnderscore(name) + "_" + symbolId; + var label = toLabel(symbol.id()); + var level = getBitLevel(channelId); + w // + .write(" " + symbolId + "(new BitPoint(" + symbol.value() + ", \"" + + channelId + "\", \"" + label + "\"") // + .writeIf(level != null, () -> ", Level." + level.name()) // + .write("))") // + .writelnIf(i == point.symbols().length - 1, // + ";", // + ", //"); + } + w // + .blank() // + .writeln(" private final BitPoint point;") // + .blank() // + .writeln(" private " + name + "(BitPoint point) {") // + .writeln(" this.point = point;") // + .writeln(" }") // + .blank() // + .writeln(" @Override") // + .writeln(" public BitPoint get() {") // + .writeln(" return this.point;") // + .writeln(" }") // + .writeln(" }") // + .blank(); + + } + } + } + + w // + .writeln(" public final String label;") // + .writeln(" public final String description;") // + .writeln(" public final int length;") // + .writeln(" public final SunSpecPoint[] points;") // + .writeln(" public final SunSpecModelType modelType;") // + .blank() // + .writeln( + " private DefaultSunSpecModel(String label, String description, int length, SunSpecPoint[] points,") // + .writeln(" SunSpecModelType modelType) {") // + .writeln(" this.label = label;") // + .writeln(" this.description = description;") // + .writeln(" this.length = length;") // + .writeln(" this.points = points;") // + .writeln(" this.modelType = modelType;") // + .writeln(" }") // + .blank() // + .writeln(" @Override") // + .writeln(" public SunSpecPoint[] points() {") // + .writeln(" return this.points;") // + .writeln(" }") // + .blank() // + .writeln(" @Override") // + .writeln(" public String label() {") // + .writeln(" return this.label;") // + .writeln(" }") // + .writeln("}") // + .writeln("// CHECKSTYLE:ON"); + } + + } + + /** + * Gets the {@link StateChannel}-Level per Channel-ID. + * + * @param channelId the upper-case Channel-ID, e.g. "S2_EVT_GROUND_FAULT" + * @return {@link Level}, defaults to {@link Level#OK}; or null to create a + * {@link BooleanReadChannel} + */ + private static Level getBitLevel(String channelId) { + // RESERVED + if (channelId.contains("RESERVED")) { + return null; + } + + // Level.WARNING Points + for (var prefix : new String[] { "S2_EVT_", "S101_EVT1_", "S102_EVT1_", "S103_EVT1_", "S111_EVT1_", + "S112_EVT1_", "S113_EVT1_" }) { + if (channelId.startsWith(prefix)) { + // TODO: those should be Level.WARNING + return Level.INFO; + } + + } + + return switch (channelId) { + // This is the position for Channel-ID specific Levels + default -> null; + }; + } + + /** + * Helper method to escape a string. + * + * @param string original string + * @return escaped string + */ + private static final String esc(String string) { + if (string == null) { + return ""; + } + return string // + .replaceAll("[^\\x00-\\x7F]", "") // non-ascii chars + .replace("\"", "\\\"") // escape backslash + .trim(); + } + +} 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 ad081859f0f..92306580030 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 @@ -43,7 +43,9 @@ public OptionsEnum[] getOptions() { * @return myself */ public EnumDoc initialValue(OptionsEnum initialValue) { - this.initialValue(initialValue.getValue()); + if (initialValue != null) { + this.initialValue(initialValue.getValue()); + } return this.self(); } diff --git a/io.openems.edge.common/src/io/openems/edge/common/filter/Pt1filter.java b/io.openems.edge.common/src/io/openems/edge/common/filter/Pt1filter.java index 75029dce386..3e1e56219be 100644 --- a/io.openems.edge.common/src/io/openems/edge/common/filter/Pt1filter.java +++ b/io.openems.edge.common/src/io/openems/edge/common/filter/Pt1filter.java @@ -2,18 +2,19 @@ public class Pt1filter { - private final double filterTimeConstant; + private final int filterTimeConstant; - private double yOld = 0.0; - private double cycleTime = 0.0; + private double result; + private int cycleTime; /** * Creates a PT1 filter. * * @param filterTimeConstant filter time constant in seconds. - * @param cycleTime cycle time of calling applyPt1Filter in seconds + * @param cycleTime cycle time of calling applyPt1Filter in + * milliseconds */ - public Pt1filter(double filterTimeConstant, double cycleTime) { + public Pt1filter(int filterTimeConstant, int cycleTime) { this.filterTimeConstant = filterTimeConstant; this.cycleTime = cycleTime; } @@ -23,7 +24,7 @@ public Pt1filter(double filterTimeConstant, double cycleTime) { * * @param cycleTime cycle time of calling applyPt1Filter in seconds */ - public void setCycleTime(double cycleTime) { + public void setCycleTime(int cycleTime) { this.cycleTime = cycleTime; } @@ -33,19 +34,15 @@ public void setCycleTime(double cycleTime) { * @param value the input value * @return the filtered value */ - public double applyPt1Filter(double value) { - // cycle time has not to be zero - if (this.cycleTime == 0.0) { - return (0.0); - } + public int applyPt1Filter(double value) { // disable PT1-Filter if time constant is zero - if (this.filterTimeConstant == 0.0) { - this.yOld = value; - return (value); + if (this.filterTimeConstant == 0) { + this.result = value; + return (int) value; } // apply filter - this.yOld = (value + this.filterTimeConstant / this.cycleTime * this.yOld) - / (1 + this.filterTimeConstant / this.cycleTime); - return this.yOld; + final var cycle = this.cycleTime / 1000.; + this.result = (value + this.filterTimeConstant / cycle * this.result) / (1 + this.filterTimeConstant / cycle); + return (int) this.result; } } \ No newline at end of file diff --git a/io.openems.edge.core/src/io/openems/edge/app/integratedsystem/FeneconHome20.java b/io.openems.edge.core/src/io/openems/edge/app/integratedsystem/FeneconHome20.java index 083bd11673b..f0c98903754 100644 --- a/io.openems.edge.core/src/io/openems/edge/app/integratedsystem/FeneconHome20.java +++ b/io.openems.edge.core/src/io/openems/edge/app/integratedsystem/FeneconHome20.java @@ -259,6 +259,7 @@ public FeneconHome20(// } } + @SuppressWarnings("removal") @Override protected ThrowingTriFunction, Language, AppConfiguration, OpenemsNamedException> appPropertyConfigurationFactory() { return (t, p, l) -> { diff --git a/io.openems.edge.core/src/io/openems/edge/app/integratedsystem/FeneconHome30.java b/io.openems.edge.core/src/io/openems/edge/app/integratedsystem/FeneconHome30.java index 34d2c672789..60c8bacec42 100644 --- a/io.openems.edge.core/src/io/openems/edge/app/integratedsystem/FeneconHome30.java +++ b/io.openems.edge.core/src/io/openems/edge/app/integratedsystem/FeneconHome30.java @@ -260,6 +260,7 @@ public FeneconHome30(// } } + @SuppressWarnings("removal") @Override protected ThrowingTriFunction, Language, AppConfiguration, OpenemsNamedException> appPropertyConfigurationFactory() { return (t, p, l) -> { diff --git a/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/AwattarHourly.java b/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/AwattarHourly.java index 06dbbf9b32f..2a239b4579a 100644 --- a/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/AwattarHourly.java +++ b/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/AwattarHourly.java @@ -10,6 +10,7 @@ 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.Reference; import com.google.common.collect.Lists; @@ -56,7 +57,6 @@ "properties":{ "CTRL_ESS_TIME_OF_USE_TARIFF_ID": "ctrlEssTimeOfUseTariff0", "TIME_OF_USE_TARIFF_PROVIDER_ID": "timeOfUseTariff0", - "CONTROL_MODE": {@link ControlMode}, "ZONE": {@link Zone}, }, "appDescriptor": { @@ -65,7 +65,7 @@ } * */ -@org.osgi.service.component.annotations.Component(name = "App.TimeOfUseTariff.Awattar") +@Component(name = "App.TimeOfUseTariff.Awattar") public class AwattarHourly extends AbstractOpenemsAppWithProps implements OpenemsApp { diff --git a/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/EntsoE.java b/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/EntsoE.java index cb773d1e584..417b2e8a67b 100644 --- a/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/EntsoE.java +++ b/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/EntsoE.java @@ -8,6 +8,7 @@ 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.Reference; import com.google.common.collect.Lists; @@ -63,7 +64,7 @@ } * */ -@org.osgi.service.component.annotations.Component(name = "App.TimeOfUseTariff.ENTSO-E") +@Component(name = "App.TimeOfUseTariff.ENTSO-E") public class EntsoE extends AbstractOpenemsAppWithProps implements OpenemsApp { // TODO provide image in folder diff --git a/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/RabotCharge.java b/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/RabotCharge.java new file mode 100644 index 00000000000..c423c7bbcb9 --- /dev/null +++ b/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/RabotCharge.java @@ -0,0 +1,188 @@ +package io.openems.edge.app.timeofusetariff; + +import static io.openems.edge.core.appmanager.formly.enums.InputType.PASSWORD; +import static io.openems.edge.core.appmanager.validator.Checkables.checkHome; + +import java.util.Map; +import java.util.function.Function; + +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.Reference; + +import com.google.common.collect.Lists; +import com.google.gson.JsonElement; +import com.google.gson.JsonPrimitive; + +import io.openems.common.exceptions.OpenemsError.OpenemsNamedException; +import io.openems.common.function.ThrowingTriFunction; +import io.openems.common.oem.OpenemsEdgeOem; +import io.openems.common.session.Language; +import io.openems.common.types.EdgeConfig; +import io.openems.common.utils.JsonUtils; +import io.openems.edge.app.common.props.CommonProps; +import io.openems.edge.app.timeofusetariff.RabotCharge.Property; +import io.openems.edge.common.component.ComponentManager; +import io.openems.edge.core.appmanager.AbstractOpenemsApp; +import io.openems.edge.core.appmanager.AbstractOpenemsAppWithProps; +import io.openems.edge.core.appmanager.AppConfiguration; +import io.openems.edge.core.appmanager.AppDef; +import io.openems.edge.core.appmanager.AppDescriptor; +import io.openems.edge.core.appmanager.ComponentManagerSupplier; +import io.openems.edge.core.appmanager.ComponentUtil; +import io.openems.edge.core.appmanager.ConfigurationTarget; +import io.openems.edge.core.appmanager.Nameable; +import io.openems.edge.core.appmanager.OpenemsApp; +import io.openems.edge.core.appmanager.OpenemsAppCardinality; +import io.openems.edge.core.appmanager.OpenemsAppCategory; +import io.openems.edge.core.appmanager.Type; +import io.openems.edge.core.appmanager.dependency.Tasks; +import io.openems.edge.core.appmanager.dependency.aggregatetask.SchedulerByCentralOrderConfiguration.SchedulerComponent; +import io.openems.edge.core.appmanager.formly.JsonFormlyUtil; +import io.openems.edge.core.appmanager.validator.ValidatorConfig; + +/** + * Describes a App for RabotCharge. + * + * 
+  {
+    "appId":"App.TimeOfUseTariff.RabotCharge",
+    "alias":"Rabot Charge",
+    "instanceId": UUID,
+    "image": base64,
+    "properties":{
+    	"CTRL_ESS_TIME_OF_USE_TARIFF_ID": "ctrlEssTimeOfUseTariff0",
+    	"TIME_OF_USE_TARIFF_PROVIDER_ID": "timeOfUseTariff0",
+    	"ACCESS_TOKEN": {token}
+    },
+    "appDescriptor": {
+    	"websiteUrl": {@link AppDescriptor#getWebsiteUrl()}
+    }
+  }
+ *
+ */ +@Component(name = "App.TimeOfUseTariff.RabotCharge") +public class RabotCharge extends AbstractOpenemsAppWithProps + implements OpenemsApp { + + public static enum Property implements Type, Nameable { + // Component-IDs + CTRL_ESS_TIME_OF_USE_TARIFF_ID(AppDef.componentId("ctrlEssTimeOfUseTariff0")), // + TIME_OF_USE_TARIFF_PROVIDER_ID(AppDef.componentId("timeOfUseTariff0")), // + + // Properties + ALIAS(CommonProps.alias()), // + ACCESS_TOKEN(AppDef.copyOfGeneric(CommonProps.defaultDef(), def -> def// + .setTranslatedLabelWithAppPrefix(".accessToken.label") // + .setTranslatedDescriptionWithAppPrefix(".accessToken.description") // + .setRequired(true) // + .setField(JsonFormlyUtil::buildInput, (app, prop, l, params, field) -> { + field.setInputType(PASSWORD); + }) // + .bidirectional(TIME_OF_USE_TARIFF_PROVIDER_ID, "accessToken", + ComponentManagerSupplier::getComponentManager, t -> { + return JsonUtils.getAsOptionalString(t) // + .map(s -> { + if (s.isEmpty()) { + return null; + } + return new JsonPrimitive("xxx"); + }) // + .orElse(null); + }))); + + private final AppDef def; + + private Property(AppDef def) { + this.def = def; + } + + @Override + public Property self() { + return this; + } + + @Override + public AppDef def() { + return this.def; + } + + @Override + public Function, Type.Parameter.BundleParameter> getParamter() { + return Type.Parameter.functionOf(AbstractOpenemsApp::getTranslationBundle); + } + } + + @Activate + public RabotCharge(@Reference ComponentManager componentManager, ComponentContext context, + @Reference ConfigurationAdmin cm, @Reference ComponentUtil componentUtil) { + super(componentManager, context, cm, componentUtil); + } + + @Override + protected ThrowingTriFunction, Language, AppConfiguration, OpenemsNamedException> appPropertyConfigurationFactory() { + return (t, p, l) -> { + final var ctrlEssTimeOfUseTariffId = this.getId(t, p, Property.CTRL_ESS_TIME_OF_USE_TARIFF_ID); + final var timeOfUseTariffProviderId = this.getId(t, p, Property.TIME_OF_USE_TARIFF_PROVIDER_ID); + + final var alias = this.getString(p, l, Property.ALIAS); + final var accessToken = this.getValueOrDefault(p, Property.ACCESS_TOKEN, null); + + var components = Lists.newArrayList(// + new EdgeConfig.Component(ctrlEssTimeOfUseTariffId, alias, "Controller.Ess.Time-Of-Use-Tariff", + JsonUtils.buildJsonObject() // + .addProperty("ess.id", "ess0") // + .build()), // + new EdgeConfig.Component(timeOfUseTariffProviderId, this.getName(l), "TimeOfUseTariff.RabotCharge", + JsonUtils.buildJsonObject() // + .onlyIf(accessToken != null && !accessToken.equals("xxx"), b -> { + b.addProperty("accessToken", accessToken); + }) // + .build())// + ); + + return AppConfiguration.create() // + .addTask(Tasks.component(components)) // + .addTask(Tasks.schedulerByCentralOrder(new SchedulerComponent(ctrlEssTimeOfUseTariffId, + "Controller.Ess.Time-Of-Use-Tariff", this.getAppId()))) // + .addTask(Tasks.persistencePredictor("_sum/UnmanagedConsumptionActivePower")) // + .build(); + }; + } + + @Override + public AppDescriptor getAppDescriptor(OpenemsEdgeOem oem) { + return AppDescriptor.create() // + .setWebsiteUrl(oem.getAppWebsiteUrl(this.getAppId())) // + .build(); + } + + @Override + public OpenemsAppCategory[] getCategories() { + return new OpenemsAppCategory[] { OpenemsAppCategory.TIME_OF_USE_TARIFF }; + } + + @Override + protected Property[] propertyValues() { + return Property.values(); + } + + @Override + public OpenemsAppCardinality getCardinality() { + return OpenemsAppCardinality.SINGLE_IN_CATEGORY; + } + + @Override + protected ValidatorConfig.Builder getValidateBuilder() { + return ValidatorConfig.create() // + .setCompatibleCheckableConfigs(checkHome()); + } + + @Override + protected RabotCharge getApp() { + return this; + } + +} diff --git a/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/StromdaoCorrently.java b/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/StromdaoCorrently.java index 61521495bca..603fb81f5ba 100644 --- a/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/StromdaoCorrently.java +++ b/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/StromdaoCorrently.java @@ -8,6 +8,7 @@ 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.Reference; import com.google.common.collect.Lists; @@ -61,7 +62,7 @@ } * */ -@org.osgi.service.component.annotations.Component(name = "App.TimeOfUseTariff.Stromdao") +@Component(name = "App.TimeOfUseTariff.Stromdao") public class StromdaoCorrently extends AbstractOpenemsAppWithProps implements OpenemsApp { diff --git a/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/Tibber.java b/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/Tibber.java index d3bb47f83bf..38b7b7b8b8b 100644 --- a/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/Tibber.java +++ b/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/Tibber.java @@ -9,6 +9,7 @@ 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.Reference; import com.google.common.collect.Lists; @@ -64,7 +65,7 @@ } * */ -@org.osgi.service.component.annotations.Component(name = "App.TimeOfUseTariff.Tibber") +@Component(name = "App.TimeOfUseTariff.Tibber") public class Tibber extends AbstractOpenemsAppWithProps implements OpenemsApp { diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_de.properties b/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_de.properties index d0e0f07245e..36d9b9dd184 100644 --- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_de.properties +++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_de.properties @@ -350,6 +350,10 @@ App.TimeOfUseTariff.ENTSO-E.biddingZone.option.sweden_se3 = Schweden (SE3) App.TimeOfUseTariff.ENTSO-E.biddingZone.option.sweden_se4 = Schweden (SE4) App.TimeOfUseTariff.ENTSO-E.biddingZone.option.belgium = Belgien App.TimeOfUseTariff.ENTSO-E.biddingZone.option.netherlands = Niederlande +App.TimeOfUseTariff.RabotCharge.Name = Time-of-Use Tariff (rabot.charge) +App.TimeOfUseTariff.RabotCharge.Name.short = rabot.charge +App.TimeOfUseTariff.RabotCharge.accessToken.label = Token +App.TimeOfUseTariff.RabotCharge.accessToken.description = Bitte stellen Sie das von rabot.charge bereitgestellte persönliche Zugangstoken bereit. Um ein Token zu erhalten, wenden Sie sich bitte an rabot.charge. App.TimeOfUseTariff.Stromdao.Name = Dynamischer Stromtarif (Stromdao Corrently) App.TimeOfUseTariff.Stromdao.Name.short = Stromdao Corrently App.TimeOfUseTariff.Stromdao.zipCode.label = PLZ diff --git a/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_en.properties b/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_en.properties index 75b69cbbf27..fe9c08c25f9 100644 --- a/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_en.properties +++ b/io.openems.edge.core/src/io/openems/edge/core/appmanager/translation_en.properties @@ -349,6 +349,10 @@ App.TimeOfUseTariff.ENTSO-E.biddingZone.option.sweden_se3 = Sweden (SE3) App.TimeOfUseTariff.ENTSO-E.biddingZone.option.sweden_se4 = Sweden (SE4) App.TimeOfUseTariff.ENTSO-E.biddingZone.option.belgium = Belgium App.TimeOfUseTariff.ENTSO-E.biddingZone.option.netherlands = Netherlands +App.TimeOfUseTariff.RabotCharge.Name = Time-of-Use Tariff (rabot.charge) +App.TimeOfUseTariff.RabotCharge.Name.short = rabot.charge +App.TimeOfUseTariff.RabotCharge.accessToken.label = Token +App.TimeOfUseTariff.RabotCharge.accessToken.description = Please provide personal access token provided by rabot.charge. to get one, please contact rabot.charge. App.TimeOfUseTariff.Stromdao.Name = Time-of-Use Tariff (STROMDAO Corrently) App.TimeOfUseTariff.Stromdao.Name.short = STROMDAO Corrently App.TimeOfUseTariff.Stromdao.zipCode.label = ZIP Code diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/NetworkInterface.java b/io.openems.edge.core/src/io/openems/edge/core/host/NetworkInterface.java index e88a7868206..4cce05f0a93 100644 --- a/io.openems.edge.core/src/io/openems/edge/core/host/NetworkInterface.java +++ b/io.openems.edge.core/src/io/openems/edge/core/host/NetworkInterface.java @@ -1,5 +1,11 @@ package io.openems.edge.core.host; +import static io.openems.common.utils.JsonUtils.buildJsonArray; +import static io.openems.common.utils.JsonUtils.buildJsonObject; +import static io.openems.common.utils.JsonUtils.getAsInet4Address; +import static io.openems.common.utils.JsonUtils.getAsString; +import static io.openems.common.utils.JsonUtils.getOptionalSubElement; + import java.net.Inet4Address; import java.util.HashSet; import java.util.Optional; @@ -41,70 +47,70 @@ public class NetworkInterface { * @throws OpenemsNamedException on error */ public static NetworkInterface from(String name, JsonObject j) throws OpenemsNamedException { + var gateway = parseInet4Address(j, "gateway"); + var metric = parseInteger(j, "metric"); + var dns = parseInet4Address(j, "dns"); + var addresses = parseAddresses(j); + var dhcp = parseBoolean(j, "dhcp"); + var linkLocalAddressing = parseBoolean(j, "linkLocalAddressing"); + + return new NetworkInterface(name, dhcp, linkLocalAddressing, gateway, dns, addresses, metric, null); + } - // Gateway - ConfigurationProperty gateway; - { - ConfigurationProperty gatewayString = ConfigurationProperty - .fromJsonElement(JsonUtils.getOptionalSubElement(j, "gateway"), JsonUtils::getAsString); - if (gatewayString.isSet()) { - if (gatewayString.getValue() == null || gatewayString.getValue().trim().isEmpty()) { - gateway = ConfigurationProperty.asNull(); - } else { - gateway = ConfigurationProperty.fromJsonElement( - Optional.of(new JsonPrimitive(gatewayString.getValue())), JsonUtils::getAsInet4Address); - } + private static ConfigurationProperty parseInet4Address(JsonObject j, String member) + throws OpenemsNamedException { + ConfigurationProperty gatewayString = ConfigurationProperty + .fromJsonElement(getOptionalSubElement(j, member), JsonUtils::getAsString); + if (gatewayString.isSet()) { + if (gatewayString.getValue() == null || gatewayString.getValue().trim().isEmpty()) { + return ConfigurationProperty.asNull(); } else { - gateway = ConfigurationProperty.asNotSet(); + return ConfigurationProperty.fromJsonElement(// + Optional.of(new JsonPrimitive(gatewayString.getValue())), JsonUtils::getAsInet4Address); } + } else { + return ConfigurationProperty.asNotSet(); } + } - // DNS - ConfigurationProperty dns; - { - ConfigurationProperty dnsString = ConfigurationProperty - .fromJsonElement(JsonUtils.getOptionalSubElement(j, "dns"), JsonUtils::getAsString); - if (dnsString.isSet()) { - if (dnsString.getValue() == null || dnsString.getValue().trim().isEmpty()) { - dns = ConfigurationProperty.asNull(); - } else { - dns = ConfigurationProperty.fromJsonElement(Optional.of(new JsonPrimitive(dnsString.getValue())), - JsonUtils::getAsInet4Address); - } + private static ConfigurationProperty parseInteger(JsonObject j, String member) + throws OpenemsNamedException { + ConfigurationProperty metricElement = ConfigurationProperty + .fromJsonElement(getOptionalSubElement(j, member), JsonUtils::getAsInt); + if (metricElement.isSet()) { + if (metricElement.getValue() == null) { + return ConfigurationProperty.asNull(); } else { - dns = ConfigurationProperty.asNotSet(); + return ConfigurationProperty.fromJsonElement(// + Optional.of(new JsonPrimitive(metricElement.getValue())), JsonUtils::getAsInt); } + } else { + return ConfigurationProperty.asNotSet(); } + } - // Addresses - ConfigurationProperty> addresses; - { - ConfigurationProperty addressesArray = ConfigurationProperty - .fromJsonElement(JsonUtils.getOptionalSubElement(j, "addresses"), JsonUtils::getAsJsonArray); - if (addressesArray.isSet()) { - var value = new HashSet(); - for (JsonElement element : addressesArray.getValue()) { - var label = JsonUtils.getAsString(element, "label"); - var address = JsonUtils.getAsInet4Address(element, "address"); - var subnetmask = JsonUtils.getAsInet4Address(element, "subnetmask"); - var cidr = Inet4AddressWithSubnetmask.getCidrFromSubnetmask(subnetmask); - value.add(new Inet4AddressWithSubnetmask(label, address, cidr)); - } - addresses = ConfigurationProperty.of(value); - } else { - addresses = ConfigurationProperty.asNotSet(); + private static ConfigurationProperty> parseAddresses(JsonObject j) + throws OpenemsNamedException { + ConfigurationProperty addressesArray = ConfigurationProperty + .fromJsonElement(getOptionalSubElement(j, "addresses"), JsonUtils::getAsJsonArray); + if (addressesArray.isSet()) { + var value = new HashSet(); + for (JsonElement element : addressesArray.getValue()) { + var label = getAsString(element, "label"); + var address = getAsInet4Address(element, "address"); + var subnetmask = getAsInet4Address(element, "subnetmask"); + var cidr = Inet4AddressWithSubnetmask.getCidrFromSubnetmask(subnetmask); + value.add(new Inet4AddressWithSubnetmask(label, address, cidr)); } + return ConfigurationProperty.of(value); + } else { + return ConfigurationProperty.asNotSet(); } + } - // DHCP - ConfigurationProperty dhcp = ConfigurationProperty - .fromJsonElement(JsonUtils.getOptionalSubElement(j, "dhcp"), JsonUtils::getAsBoolean); - - // linkLocalAddressing - ConfigurationProperty linkLocalAddressing = ConfigurationProperty - .fromJsonElement(JsonUtils.getOptionalSubElement(j, "linkLocalAddressing"), JsonUtils::getAsBoolean); - - return new NetworkInterface(name, dhcp, linkLocalAddressing, gateway, dns, addresses, null); + private static ConfigurationProperty parseBoolean(JsonObject j, String member) + throws OpenemsNamedException { + return ConfigurationProperty.fromJsonElement(getOptionalSubElement(j, member), JsonUtils::getAsBoolean); } private final String name; @@ -113,6 +119,7 @@ public static NetworkInterface from(String name, JsonObject j) throws Openems private ConfigurationProperty gateway; private ConfigurationProperty dns; private ConfigurationProperty> addresses; + private ConfigurationProperty metric; /** * An arbitrary attachment to this NetworkInterface. Can be used to store e.g. a @@ -126,6 +133,7 @@ public NetworkInterface(String name, // ConfigurationProperty gateway, // ConfigurationProperty dns, // ConfigurationProperty> addresses, // + ConfigurationProperty metric, // A attachment) throws OpenemsException { this.name = name; this.dhcp = dhcp; @@ -134,6 +142,7 @@ public NetworkInterface(String name, // this.dns = dns; this.attachment = attachment; this.addresses = addresses; + this.metric = metric; } /** @@ -172,6 +181,15 @@ public ConfigurationProperty getGateway() { return this.gateway; } + /** + * Gets the network interface metric. + * + * @return the Metric + */ + public ConfigurationProperty getMetric() { + return this.metric; + } + /** * Gets the addresses configured in the network. * @@ -227,6 +245,7 @@ public ConfigurationProperty> getAddressesInclud * "linkLocalAddressing": boolean, * "gateway": string, * "dns": string, + * "metric": number, * "addresses": [{ * "label": string, * "address": string, @@ -239,20 +258,22 @@ public ConfigurationProperty> getAddressesInclud * @throws OpenemsNamedException on error. */ public JsonObject toJson() { - var result = JsonUtils.buildJsonObject() // + var result = buildJsonObject() // .onlyIf(this.dhcp.isSet(), // b -> b.addProperty("dhcp", this.dhcp.getValue())) .onlyIf(this.linkLocalAddressing.isSet(), // b -> b.addProperty("linkLocalAddressing", this.linkLocalAddressing.getValue())) .onlyIf(!this.gateway.isNull(), // b -> b.addProperty("gateway", this.gateway.getValue().getHostAddress())) + .onlyIf(!this.metric.isNull(), // + b -> b.addProperty("metric", this.metric.getValue().intValue())) .onlyIf(!this.dns.isNull(), // b -> b.addProperty("dns", this.dns.getValue().getHostAddress())) .onlyIf(this.addresses.isSet(), // b -> { - var arr = JsonUtils.buildJsonArray(); + var arr = buildJsonArray(); for (var address : this.addresses.getValue()) { - arr.add(JsonUtils.buildJsonObject() // + arr.add(buildJsonObject() // .addProperty("label", address.getLabel()) .addProperty("address", address.getInet4Address().getHostAddress()) .addProperty("subnetmask", address.getSubnetmaskAsString()).build()); @@ -271,43 +292,27 @@ public JsonObject toJson() { public boolean updateFrom(NetworkInterface change) { var isChanged = false; if (change.getDhcp().isSet()) { - if (change.getDhcp() == null) { - this.dhcp = ConfigurationProperty.asNotSet(); - } else { - this.dhcp = change.getDhcp(); - } + this.dhcp = change.getDhcp(); isChanged = true; } if (change.getLinkLocalAddressing().isSet()) { - if (change.getLinkLocalAddressing() == null) { - this.linkLocalAddressing = ConfigurationProperty.asNotSet(); - } else { - this.linkLocalAddressing = change.getLinkLocalAddressing(); - } + this.linkLocalAddressing = change.getLinkLocalAddressing(); isChanged = true; } if (change.getGateway().isSet()) { - if (change.getGateway() == null) { - this.gateway = ConfigurationProperty.asNotSet(); - } else { - this.gateway = change.getGateway(); - } + this.gateway = change.getGateway(); + isChanged = true; + } + if (change.getMetric().isSet()) { + this.metric = change.getMetric(); isChanged = true; } if (change.getDns().isSet()) { - if (change.getDns() == null) { - this.dns = ConfigurationProperty.asNotSet(); - } else { - this.dns = change.getDns(); - } + this.dns = change.getDns(); isChanged = true; } if (change.getAddresses().isSet()) { - if (change.getAddresses() == null) { - this.addresses = ConfigurationProperty.asNotSet(); - } else { - this.addresses = change.getAddressesIncludingDefaults(); - } + this.addresses = change.getAddressesIncludingDefaults(); isChanged = true; } return isChanged; diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemDebianSystemd.java b/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemDebianSystemd.java index 5b0765051d2..f74bd442b16 100644 --- a/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemDebianSystemd.java +++ b/io.openems.edge.core/src/io/openems/edge/core/host/OperatingSystemDebianSystemd.java @@ -56,9 +56,16 @@ public class OperatingSystemDebianSystemd implements OperatingSystem { private static final String NETWORK_BASE_PATH = "/etc/systemd/network"; private static final Path UDEV_PATH = Paths.get("/etc/udev/rules.d/99-usb-serial.rules"); + private static final int DEFAULT_METRIC = 1024; + private static final String MATCH_SECTION = "[Match]"; + private static final String NETWORK_SECTION = "[Network]"; + private static final String ROUTE_SECTION = "[Route]"; + private static final String DHCP_SECTION = "[DHCP]"; + private static final String ADDRESS_SECTION = "[Address]"; + private static final String EMPTY_SECTION = ""; private static enum Block { - UNDEFINED, MATCH, NETWORK, ADDRESS + UNDEFINED, MATCH, NETWORK, ADDRESS, ROUTE, DHCP } private final HostImpl parent; @@ -195,16 +202,15 @@ private List toFileFormat(User user, NetworkInterface iface) throws O result.add("# changedBy: " // + user.getName()); result.add("# changedAt: " // - + LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES).toString() // - ); - result.add("[Match]"); + + LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES).toString()); + + // Match Section + result.add(MATCH_SECTION); result.add("Name=" + iface.getName()); - result.add(""); + result.add(EMPTY_SECTION); - result.add("[Network]"); - if (iface.getGateway().isSetAndNotNull()) { - result.add("Gateway=" + iface.getGateway().getValue().getHostAddress()); - } + // Network Section + result.add(NETWORK_SECTION); if (iface.getDhcp().isSetAndNotNull()) { result.add("DHCP=" + (iface.getDhcp().getValue() ? "yes" : "no")); } @@ -214,11 +220,31 @@ private List toFileFormat(User user, NetworkInterface iface) throws O if (iface.getLinkLocalAddressing().isSetAndNotNull()) { result.add("LinkLocalAddressing=" + (iface.getLinkLocalAddressing().getValue() ? "yes" : "no")); } + + var metric = DEFAULT_METRIC; + if (iface.getMetric().isSetAndNotNull()) { + metric = iface.getMetric().getValue().intValue(); + } + + if (iface.getDhcp().isSetAndNotNull()) { + var dhcp = iface.getDhcp().getValue(); + result.add(EMPTY_SECTION); + if (dhcp) { // dhcp == yes + result.add(DHCP_SECTION); + result.add("RouteMetric=" + metric); + } else { + result.add(ROUTE_SECTION); + if (iface.getGateway().isSetAndNotNull()) { + result.add("Gateway=" + iface.getGateway().getValue().getHostAddress()); + } + result.add("Metric=" + metric); + } + } if (iface.getAddresses().isSetAndNotNull()) { for (var address : iface.getAddresses().getValue()) { final var label = address.getLabel(); - result.add(""); - result.add("[Address]"); + result.add(EMPTY_SECTION); + result.add(ADDRESS_SECTION); result.add("Address=" + address.toString()); if (!label.isBlank()) { result.add("Label=" + label); @@ -393,6 +419,10 @@ public String getUsbConfiguration() throws OpenemsNamedException { .compile("^Gateway=(" + NetworkConfiguration.PATTERN_INET4ADDRESS + ")$"); private static final Pattern NETWORK_DNS = Pattern // .compile("^DNS=(" + NetworkConfiguration.PATTERN_INET4ADDRESS + ")$"); + private static final Pattern GATEWAY_METRIC = Pattern // + .compile("^Metric=([0-9]+)$"); + private static final Pattern ROUTE_METRIC = Pattern // + .compile("^RouteMetric=([0-9]+)$"); /** * Parses a Systemd-Networkd configuration file. @@ -419,6 +449,8 @@ protected static NetworkInterface parseSystemdNetworkdConfigurationFile(L ConfigurationProperty.asNotSet()); final var gateway = new AtomicReference>(// ConfigurationProperty.asNotSet()); + final var metric = new AtomicReference>(// + ConfigurationProperty.asNotSet()); final var dns = new AtomicReference>(// ConfigurationProperty.asNotSet()); final var addresses = new AtomicReference>>(// @@ -438,16 +470,22 @@ protected static NetworkInterface parseSystemdNetworkdConfigurationFile(L */ if (line.startsWith("[")) { switch (line) { - case "[Match]": + case MATCH_SECTION: currentBlock = Block.MATCH; break; - case "[Network]": + case NETWORK_SECTION: currentBlock = Block.NETWORK; break; - case "[Address]": + case ADDRESS_SECTION: tmpAddress.set(null); currentBlock = Block.ADDRESS; break; + case ROUTE_SECTION: + currentBlock = Block.ROUTE; + break; + case DHCP_SECTION: + currentBlock = Block.DHCP; + break; default: currentBlock = Block.UNDEFINED; break; @@ -486,8 +524,6 @@ protected static NetworkInterface parseSystemdNetworkdConfigurationFile(L addresses.set(ConfigurationProperty.of(addressDetails)); }); break; - case UNDEFINED: - break; case ADDRESS: onMatchString(NETWORK_ADDRESS, line, property -> { // Storing here temporarily so that we can use it if when we find label. @@ -518,11 +554,27 @@ protected static NetworkInterface parseSystemdNetworkdConfigurationFile(L addressDetails.add(address); }); break; + case ROUTE: + onMatchInet4Address(NETWORK_GATEWAY, line, property -> { + gateway.set(ConfigurationProperty.of(property)); + }); + onMatchString(GATEWAY_METRIC, line, property -> { + metric.set(ConfigurationProperty.of(Integer.parseInt(property))); + }); + break; + case DHCP: + onMatchString(ROUTE_METRIC, line, property -> { + metric.set(ConfigurationProperty.of(Integer.parseInt(property))); + }); + break; + case UNDEFINED: + break; default: break; } } return new NetworkInterface<>(name.get(), // - dhcp.get(), linkLocalAddressing.get(), gateway.get(), dns.get(), addresses.get(), attachment); + dhcp.get(), linkLocalAddressing.get(), gateway.get(), dns.get(), addresses.get(), metric.get(), + attachment); } } diff --git a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/SetNetworkConfigRequest.java b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/SetNetworkConfigRequest.java index dbd8186d247..fff7cf8ce8c 100644 --- a/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/SetNetworkConfigRequest.java +++ b/io.openems.edge.core/src/io/openems/edge/core/host/jsonrpc/SetNetworkConfigRequest.java @@ -26,6 +26,7 @@ * "dhcp"?: boolean, * "linkLocalAddressing"?: boolean, * "gateway"?: string, + * "metric"?:integer, * "dns"?: string, * "addresses"?: [{ * "label": string, diff --git a/io.openems.edge.core/test/io/openems/edge/core/appmanager/Apps.java b/io.openems.edge.core/test/io/openems/edge/core/appmanager/Apps.java index f599054f244..49d88adf37d 100644 --- a/io.openems.edge.core/test/io/openems/edge/core/appmanager/Apps.java +++ b/io.openems.edge.core/test/io/openems/edge/core/appmanager/Apps.java @@ -50,6 +50,7 @@ import io.openems.edge.app.pvselfconsumption.SelfConsumptionOptimization; import io.openems.edge.app.timeofusetariff.AwattarHourly; import io.openems.edge.app.timeofusetariff.EntsoE; +import io.openems.edge.app.timeofusetariff.RabotCharge; import io.openems.edge.app.timeofusetariff.StromdaoCorrently; import io.openems.edge.app.timeofusetariff.Tibber; import io.openems.edge.common.component.ComponentManager; @@ -130,6 +131,16 @@ public static final EntsoE entsoE(AppManagerTestBundle t) { return app(t, EntsoE::new, "App.TimeOfUseTariff.ENTSO-E"); } + /** + * Test method for creating a {@link RabotCharge}. + * + * @param t the {@link AppManagerTestBundle} + * @return the {@link OpenemsApp} instance + */ + public static final RabotCharge rabotCharge(AppManagerTestBundle t) { + return app(t, RabotCharge::new, "App.TimeOfUseTariff.RabotCharge"); + } + /** * Test method for creating a {@link StromdaoCorrently}. * diff --git a/io.openems.edge.core/test/io/openems/edge/core/appmanager/ComponentUtilTest.java b/io.openems.edge.core/test/io/openems/edge/core/appmanager/ComponentUtilTest.java index 9f7ca0686de..e490643abad 100644 --- a/io.openems.edge.core/test/io/openems/edge/core/appmanager/ComponentUtilTest.java +++ b/io.openems.edge.core/test/io/openems/edge/core/appmanager/ComponentUtilTest.java @@ -53,15 +53,16 @@ public void testEqualsJsonElementJsonElement() { public void testEqualsListOfNetworkInterface() throws Exception { var expectedInet4Addresses = new HashSet(); expectedInet4Addresses.add(Inet4AddressWithSubnetmask.fromString("foo", "192.168.178.2/24")); - List> expected = Lists.newArrayList(new NetworkInterface("eth0", - ConfigurationProperty.of(false), ConfigurationProperty.of(false), ConfigurationProperty.asNull(), - ConfigurationProperty.asNull(), ConfigurationProperty.of(expectedInet4Addresses), null)); + List> expected = Lists + .newArrayList(new NetworkInterface("eth0", ConfigurationProperty.of(false), + ConfigurationProperty.of(false), ConfigurationProperty.asNull(), ConfigurationProperty.asNull(), + ConfigurationProperty.of(expectedInet4Addresses), ConfigurationProperty.of(145), null)); var actualInet4Addresses = new HashSet(); actualInet4Addresses.add(Inet4AddressWithSubnetmask.fromString("foo", "192.168.178.2/24")); var networkInterface = new NetworkInterface("eth0", ConfigurationProperty.of(false), ConfigurationProperty.of(false), ConfigurationProperty.asNull(), ConfigurationProperty.asNull(), - ConfigurationProperty.of(actualInet4Addresses), null); + ConfigurationProperty.of(actualInet4Addresses), ConfigurationProperty.of(145), null); List> actual = Lists.newArrayList(networkInterface); diff --git a/io.openems.edge.core/test/io/openems/edge/core/appmanager/TestTranslations.java b/io.openems.edge.core/test/io/openems/edge/core/appmanager/TestTranslations.java index b70a23488fd..e414179bc38 100644 --- a/io.openems.edge.core/test/io/openems/edge/core/appmanager/TestTranslations.java +++ b/io.openems.edge.core/test/io/openems/edge/core/appmanager/TestTranslations.java @@ -38,6 +38,9 @@ public void beforeEach() throws Exception { this.apps.add(new TestTranslation(Apps.entsoE(t), true, JsonUtils.buildJsonObject() // .addProperty("BIDDING_ZONE", "GERMANY") // .build())); + this.apps.add(new TestTranslation(Apps.rabotCharge(t), true, JsonUtils.buildJsonObject() // + .addProperty("ACCESS_TOKEN", "123456789") // + .build())); this.apps.add(new TestTranslation(Apps.stromdaoCorrently(t), true, JsonUtils.buildJsonObject() // .addProperty("ZIP_CODE", "123456789") // .build())); diff --git a/io.openems.edge.core/test/io/openems/edge/core/host/OperatingSystemDebianSystemdTest.java b/io.openems.edge.core/test/io/openems/edge/core/host/OperatingSystemDebianSystemdTest.java index 3e3a12f3fb5..e071594e3eb 100644 --- a/io.openems.edge.core/test/io/openems/edge/core/host/OperatingSystemDebianSystemdTest.java +++ b/io.openems.edge.core/test/io/openems/edge/core/host/OperatingSystemDebianSystemdTest.java @@ -1,6 +1,10 @@ package io.openems.edge.core.host; +import static io.openems.common.utils.JsonUtils.prettyToString; +import static io.openems.edge.core.host.OperatingSystemDebianSystemd.parseSystemdNetworkdConfigurationFile; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.util.List; @@ -14,7 +18,7 @@ public class OperatingSystemDebianSystemdTest { @Test public void test() throws OpenemsNamedException { - List lines = Lists.newArrayList(// + var lines = Lists.newArrayList(// "[Match]", // "Name=eth0", // "", // @@ -27,17 +31,33 @@ public void test() throws OpenemsNamedException { "Label=normal" // ); - NetworkInterface n = OperatingSystemDebianSystemd.parseSystemdNetworkdConfigurationFile(lines, null); + var n = parseSystemdNetworkdConfigurationFile(lines, null); assertEquals("eth0", n.getName()); assertEquals(true, n.getDhcp().getValue()); assertEquals(true, n.getLinkLocalAddressing().getValue()); assertEquals("192.168.100.100/24", n.getAddresses().getValue().toArray()[0].toString()); + + assertEquals(""" + { + "dhcp": true, + "linkLocalAddressing": true, + "addresses": [ + { + "label": "normal", + "address": "192.168.100.100", + "subnetmask": "255.255.255.0" + } + ] + }""", prettyToString(n.toJson())); + + var json = n.toJson(); + assertEquals(json, NetworkInterface.from("eth0", json).toJson()); } @Test public void testMultipleAddresses() throws OpenemsNamedException { - List lines = Lists.newArrayList(// + var lines = Lists.newArrayList(// "[Match]", // "Name=eth0", // "", // @@ -54,7 +74,7 @@ public void testMultipleAddresses() throws OpenemsNamedException { "Label=" // ); - NetworkInterface n = OperatingSystemDebianSystemd.parseSystemdNetworkdConfigurationFile(lines, null); + var n = parseSystemdNetworkdConfigurationFile(lines, null); assertEquals("eth0", n.getName()); assertEquals(true, n.getDhcp().getValue()); @@ -69,11 +89,14 @@ public void testMultipleAddresses() throws OpenemsNamedException { assertEquals("192.168.123.123/24", address.toString()); assertEquals("", address.getLabel()); } + + var json = n.toJson(); + assertEquals(json, NetworkInterface.from("eth0", json).toJson()); } @Test public void testLabelBefore() throws OpenemsNamedException { - List lines = Lists.newArrayList(// + var lines = Lists.newArrayList(// "[Match]", // "Name=eth0", // "", // @@ -90,7 +113,7 @@ public void testLabelBefore() throws OpenemsNamedException { "Address=192.168.123.123/24" // ); - NetworkInterface n = OperatingSystemDebianSystemd.parseSystemdNetworkdConfigurationFile(lines, null); + var n = parseSystemdNetworkdConfigurationFile(lines, null); { var address = (Inet4AddressWithSubnetmask) n.getAddresses().getValue().toArray()[0]; assertEquals("192.168.100.100/24", address.toString()); @@ -101,6 +124,9 @@ public void testLabelBefore() throws OpenemsNamedException { assertEquals("192.168.123.123/24", address.toString()); assertEquals("", address.getLabel()); // NOTE: if Label is before Address, it is ignored } + + var json = n.toJson(); + assertEquals(json, NetworkInterface.from("eth0", json).toJson()); } @Test @@ -113,10 +139,146 @@ public void test2() throws OpenemsNamedException { "DHCP=yes" // ); - NetworkInterface n = OperatingSystemDebianSystemd.parseSystemdNetworkdConfigurationFile(lines, null); + var n = parseSystemdNetworkdConfigurationFile(lines, null); assertEquals("enx*", n.getName()); assertEquals(true, n.getDhcp().getValue()); + + var json = n.toJson(); + assertEquals(json, NetworkInterface.from("eth0", json).toJson()); } + @Test + public void test3() throws OpenemsNamedException { + var lines = """ + [Match] + Name=eth0 + + [Network] + DHCP=no + LinkLocalAddressing=yes + Address=192.168.100.100/24 + Address=10.4.0.1/24 + + [Route] + Gateway=10.4.0.2 + """.lines().toList(); + + var n = parseSystemdNetworkdConfigurationFile(lines, null); + + assertEquals("eth0", n.getName()); + assertEquals(false, n.getDhcp().getValue()); + assertEquals(true, n.getLinkLocalAddressing().getValue()); + assertEquals("192.168.100.100/24", n.getAddresses().getValue().toArray()[0].toString()); + assertEquals("10.4.0.1/24", n.getAddresses().getValue().toArray()[1].toString()); + + assertEquals("10.4.0.2", n.getGateway().getValue().getHostName()); + assertEquals(null, n.getMetric().getValue()); + + var json = n.toJson(); + assertEquals(json, NetworkInterface.from("eth0", json).toJson()); + } + + @Test + public void test4() throws OpenemsNamedException { + var lines = """ + [Match] + Name=eth0 + + [Network] + DHCP=no + LinkLocalAddressing=yes + Address=192.168.100.100/24 + Address=10.4.0.1/24 + Gateway=10.4.0.2 + """.lines().toList(); + + var n = parseSystemdNetworkdConfigurationFile(lines, null); + + assertEquals("eth0", n.getName()); + assertEquals(false, n.getDhcp().getValue()); + assertEquals(true, n.getLinkLocalAddressing().getValue()); + assertEquals("192.168.100.100/24", n.getAddresses().getValue().toArray()[0].toString()); + assertEquals("10.4.0.1/24", n.getAddresses().getValue().toArray()[1].toString()); + assertEquals("10.4.0.2", n.getGateway().getValue().getHostName()); + + var json = n.toJson(); + assertEquals(json, NetworkInterface.from("eth0", json).toJson()); + } + + @Test + public void test5() throws OpenemsNamedException { + var lines = """ + [Match] + Name=eth0 + + [Network] + DHCP=yes + + [DHCP] + RouteMetric=216 + """.lines().toList(); + + var n = parseSystemdNetworkdConfigurationFile(lines, null); + + assertEquals("eth0", n.getName()); + assertEquals(true, n.getDhcp().getValue()); + assertEquals(216, n.getMetric().getValue().intValue()); + + lines = """ + [Network] + DHCP=no + DNS=10.0.0.1 + LinkLocalAddressing=yes + + [Route] + Gateway=10.0.10.10 + Metric=520 + + [Address] + Address=10.4.0.1/16 + """.lines().toList(); + + n = parseSystemdNetworkdConfigurationFile(lines, null); + + assertEquals(false, n.getDhcp().getValue()); + assertEquals(520, n.getMetric().getValue().intValue()); + + var json = n.toJson(); + assertEquals(json, NetworkInterface.from("eth0", json).toJson()); + } + + @Test + public void testUpdate() throws OpenemsNamedException { + var n1 = parseSystemdNetworkdConfigurationFile(Lists.newArrayList(// + "[Match]", // + "Name=eth0", // + "", // + "[Network]", // + "DHCP=yes", // + "LinkLocalAddressing=yes", // + "", // + "[Address]", // + "Address=192.168.100.100/24", // + "Label=normal" // + ), null); + + assertTrue(n1.getDhcp().getValue()); + + var n2 = parseSystemdNetworkdConfigurationFile(Lists.newArrayList(// + "[Match]", // + "Name=eth0", // + "", // + "[Network]", // + "DHCP=no", // + "LinkLocalAddressing=yes", // + "", // + "[Address]", // + "Address=192.168.100.100/24", // + "Label=normal" // + ), null); + n1.updateFrom(n2); + + assertFalse(n1.getDhcp().getValue()); + } } diff --git a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/SolverStrategy.java b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/SolverStrategy.java index fe3e108b2a2..e6aaf0def57 100644 --- a/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/SolverStrategy.java +++ b/io.openems.edge.ess.api/src/io/openems/edge/ess/power/api/SolverStrategy.java @@ -9,7 +9,8 @@ public enum SolverStrategy implements OptionsEnum { OPTIMIZE_BY_MOVING_TOWARDS_TARGET(1, "Optimize By Moving Towards Target"), // OPTIMIZE_BY_KEEPING_TARGET_DIRECTION_AND_MAXIMIZING_IN_ORDER(2, "Optimize By Keeping Target Direction And Maximizing In Order"), // - OPTIMIZE_BY_KEEPING_ALL_EQUAL(3, "Optimize By Keeping All Inverters Equal"); // + OPTIMIZE_BY_KEEPING_ALL_EQUAL(3, "Optimize By Keeping All Inverters Equal"), + OPTIMIZE_BY_KEEPING_ALL_NEAR_EQUAL(4, "Optimize By Keeping All Inverters Nearly Equal"); // private final int value; private final String name; diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/Solver.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/Solver.java index fa8b435a0ef..2e89950ee29 100644 --- a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/Solver.java +++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/Solver.java @@ -24,6 +24,7 @@ import io.openems.edge.ess.core.power.data.TargetDirection; import io.openems.edge.ess.core.power.optimizers.AddConstraintsForNotStrictlyDefinedCoefficients; import io.openems.edge.ess.core.power.optimizers.KeepAllEqual; +import io.openems.edge.ess.core.power.optimizers.KeepAllNearEqual; import io.openems.edge.ess.core.power.optimizers.KeepTargetDirectionAndMaximizeInOrder; import io.openems.edge.ess.core.power.optimizers.MoveTowardsTarget; import io.openems.edge.ess.core.power.optimizers.Optimizers; @@ -180,8 +181,10 @@ public void solve(SolverStrategy strategy) { break; case OPTIMIZE_BY_KEEPING_ALL_EQUAL: + case OPTIMIZE_BY_KEEPING_ALL_NEAR_EQUAL: solution = this.tryStrategies(targetDirection, allInverters, targetInverters, allConstraints, - SolverStrategy.OPTIMIZE_BY_KEEPING_ALL_EQUAL, + SolverStrategy.OPTIMIZE_BY_KEEPING_ALL_EQUAL, // + SolverStrategy.OPTIMIZE_BY_KEEPING_ALL_NEAR_EQUAL, // SolverStrategy.OPTIMIZE_BY_KEEPING_TARGET_DIRECTION_AND_MAXIMIZING_IN_ORDER, SolverStrategy.OPTIMIZE_BY_MOVING_TOWARDS_TARGET); break; @@ -257,6 +260,10 @@ private SolveSolution tryStrategies(TargetDirection targetDirection, List esss, + List allInverters, List allConstraints, TargetDirection direction) { + if (esss.isEmpty()) { + return null; + } + + var setActivePower = getPowerSetPoint(esss, allConstraints, direction, Pwr.ACTIVE); + var setReactivePower = getPowerSetPoint(esss, allConstraints, direction, Pwr.REACTIVE); + + if (Double.isNaN(setActivePower) && Double.isNaN(setReactivePower)) { + return null; + } + + var essList = getGenericEssList(esss); + + var activePowerSolved = solvePowerIfNotNaN(setActivePower, essList, Pwr.ACTIVE, direction); + var reactivePowerSolved = solvePowerIfNotNaN(setReactivePower, essList, Pwr.REACTIVE, direction); + + var mergedResult = mergeResults(coefficients, esss, activePowerSolved, reactivePowerSolved); + + var result = Arrays.stream(mergedResult)// + .map(d -> reverseAbsoluteData.apply(d, direction))// + .toArray(); + + return new PointValuePair(result, 0); + } + + /** + * Solve it only if the setpower is present. + * + * @param setPower the Setpower + * @param essList the {@link ManagedSymmetricEss} + * @param powerType the powerType {@link Pwr} + * @param direction the {@link TargetDirection} + * @return a solution + */ + private static PointValuePair solvePowerIfNotNaN(double setPower, List essList, Pwr powerType, + TargetDirection direction) { + if (Double.isNaN(setPower)) { + var defaultResult = new double[essList.size()]; + Arrays.fill(defaultResult, 0.0); + return new PointValuePair(defaultResult, 0); + } else { + return solvePower(setPower, essList, powerType, direction); + } + } + + /** + * Merges results of Active-Power and Reactive-Power to a {@link PointValuePair} + * compatible with default Solver. + * + * @param coefficients the {@link Coefficients} + * @param esss the {@link ManagedSymmetricEss}s + * @param activePower the {@link PointValuePair} for Active-Power + * @param reactivePower the {@link PointValuePair} for Reactive-Power + * @return new {@link PointValuePair} + */ + private static double[] mergeResults(Coefficients coefficients, List esss, + PointValuePair activePower, PointValuePair reactivePower) { + try { + var values = coefficients.getAll().stream() // + .mapToDouble(c -> { + var nonMetaEss = esss.stream() // + .filter(e -> !(e instanceof MetaEss)) // + .map(ManagedSymmetricEss::id) // + .toList(); + var indexOpt = IntStream.range(0, nonMetaEss.size()) // + .filter(i -> nonMetaEss.get(i) == c.getEssId()) // + .findFirst(); + if (indexOpt.isEmpty()) { + return 0; + } + var map = switch (c.getPwr()) { + case ACTIVE -> activePower; + case REACTIVE -> reactivePower; + }; + return map.getPoint()[indexOpt.getAsInt()]; + }).toArray(); + return values; + } catch (Exception e) { + return null; + } + } + + /** + * Solves the power optimization problem for a given set of coefficients, energy + * storage systems (ESSs), inverters, constraints, description, power type, and + * target direction. + * + * @param power the power to be distributed + * @param essList the {@link ManagedSymmetricEss}s + * @param pwr The {@link Pwr}. + * @param direction The {@link TargetDirection}. + * @return The optimized solution The {@link PointValuePair}. + */ + private static PointValuePair solvePower(double power, List essList, Pwr pwr, + TargetDirection direction) { + + var selectedFunction = switch (direction) { + case CHARGE -> getMinPowerFromEss; + case DISCHARGE -> getMaxPowerFromEss; + case KEEP_ZERO -> getZero; + }; + + var essUpperLimit = essList.stream()// + .mapToDouble(ess -> { + return selectedFunction.apply(ess, pwr); + })// + .boxed()// + .toList(); + + var size = essUpperLimit.size(); // omitting the cluster + + var essLowerLimit = essList.stream()// + .mapToDouble(ess -> { + var lowerLimit = selectedFunction.apply(ess, pwr); + return (Math.abs(lowerLimit) >= power / size) ? 0.0 : lowerLimit - (lowerLimit * 0.01); + })// + .boxed()// + .toList(); + + var model = new SolveNearEqual(); + model.setUpperBound(getData(essUpperLimit, direction)); + model.setLowerBound(getData(essLowerLimit, direction)); + model.setpowerSetValue(power); + + try { + return model.solve(size); + } catch (Exception e) { + return null; + } + } + + private static double getPowerSetPoint(List esss, List allConstraints, + TargetDirection direction, Pwr pwr) { + + var clusterEssId = esss.stream()// + .filter(ess -> ess instanceof MetaEss)// + .findFirst().get().id(); + + var noPowerSetPoint = Double.NaN; + + return allConstraints.stream()// + .filter(constraint -> constraint.getRelationship() == Relationship.EQUALS) + .filter(constraint -> constraint.getCoefficients().length == 1) + .filter(constraint -> clusterEssId.equals(constraint.getCoefficients()[0].getCoefficient().getEssId())) + .filter(constraint -> constraint.getCoefficients()[0].getCoefficient().getPwr() == pwr) + .mapToDouble(constraint -> constraint.getValue().get())// + .map(c -> absoluteData.apply(c, direction))// + .findFirst()// + .orElse(noPowerSetPoint); + } + + private static List getGenericEssList(List esss) { + return esss.stream()// + .filter(e -> !(e instanceof MetaEss))// + .toList(); + } + + /** + * Gets data from a list and applies a transformation based on the specified + * target direction. + * + * @param listData The list of Double data. + * @param direction The {@link TargetDirection} + * @return An array of transformed data. + */ + private static double[] getData(List listData, TargetDirection direction) { + return listData.stream()// + .mapToDouble(d -> absoluteData.apply(d, direction))// + .toArray(); + } + + /** + * Function to calculate absolute value or zero based on the + * {@link TargetDirection}. + */ + private static BiFunction absoluteData = (d, direction) -> { + return switch (direction) { + case CHARGE -> Math.abs(d); + case DISCHARGE -> d; + case KEEP_ZERO -> 0.0; + }; + }; + + /** + * Function to calculate reverse absolute value or zero based on the + * {@link TargetDirection}. + */ + private static BiFunction reverseAbsoluteData = (d, direction) -> { + return switch (direction) { + case CHARGE -> -d; + case DISCHARGE -> d; + case KEEP_ZERO -> 0.0; + }; + }; + + /** + * Function to get the maximum power from a {@link ManagedSymmetricEss}. + */ + private static BiFunction getMaxPowerFromEss = (ess, pwr) -> { + return ess.getPower().getMaxPower(ess, Phase.ALL, pwr); + }; + + /** + * Function to get the minimum power from a {@link ManagedSymmetricEss}. + */ + private static BiFunction getMinPowerFromEss = (ess, pwr) -> { + return ess.getPower().getMinPower(ess, Phase.ALL, pwr); + }; + + /** + * Function to return zero. + */ + private static BiFunction getZero = (ess, pwr) -> { + return 0; + }; + +} diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/nearequal/ConstraintWrapper.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/nearequal/ConstraintWrapper.java new file mode 100644 index 00000000000..47336a1adb4 --- /dev/null +++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/nearequal/ConstraintWrapper.java @@ -0,0 +1,120 @@ +package io.openems.edge.ess.core.power.solver.nearequal; + +import java.util.Arrays; +import java.util.stream.IntStream; + +import org.apache.commons.math3.analysis.MultivariateFunction; +import org.apache.commons.math3.optim.nonlinear.scalar.MultivariateFunctionPenaltyAdapter; + +public class ConstraintWrapper extends MultivariateFunctionPenaltyAdapter { + + private double[] lower; + private double[] upper; + private double[] point; + private MultivariateFunction function; + private double[] scale; + private double setVal; + private int itteration; + private double refrence; + + public ConstraintWrapper(MultivariateFunction bounded, double[] lower, double[] upper, double offset, + double[] scale, double setVal) { + + super(bounded, lower, upper, offset, scale); + + this.lower = lower; + this.function = bounded; + this.scale = scale; + this.upper = upper; + this.setVal = setVal; + this.refrence = 0; + this.itteration = 0; + } + + /** + * Computes the value of the objective function for a given point in the + * parameter space. + * + * @param point The point in the parameter space for which to evaluate the + * objective function. + * @return The computed value of the objective function. + */ + @Override + public double value(double[] point) { + this.point = point; + var standerDev = this.function.value(this.point); + final double convergence = standerDev - this.refrence; + this.refrence = standerDev; + var sumoffset = this.sumConstraint(point); + this.addOffset(sumoffset); + var constraintoffsetUpper = this.inequalityConstraintUpper(); + var constraintoffsetLower = this.inequalityConstraintLower(); + this.itteration = this.itteration + 1; + return (constraintoffsetUpper + convergence + constraintoffsetLower + Math.abs(sumoffset)); + } + + /** + * Computes the offset from the target value based on the sum of the elements in + * the input array. + * + * @param val An array of values to be summed. + * @return The computed offset from the target value based on the sum of the + * input array. + */ + private double sumConstraint(double[] val) { + double sum = Arrays.stream(val).sum(); + return (sum <= this.setVal || sum >= this.setVal) ? (this.setVal - sum) : 0; + } + + /** + * Computes the offset from the inequality constraints based on the current + * point. + * + * @return The computed offset from the inequality constraints. + */ + private double inequalityConstraintUpper() { + return IntStream.range(0, this.scale.length)// + .filter(i -> this.point[i] > this.upper[i])// + .mapToDouble(i -> { + double overshoot = this.scale[i] * (this.point[i] - this.upper[i]); + this.point[i] = this.upper[i]; + return overshoot; + }).sum(); + } + + /** + * Computes the offset from the inequality constraints based on the current + * point. + * + * @return The computed offset from the inequality constraints. + */ + private double inequalityConstraintLower() { + return IntStream.range(0, this.scale.length)// + .filter(i -> this.point[i] < this.lower[i])// + .mapToDouble(i -> { + double overshoot = this.scale[i] * (this.lower[i] - this.point[i]); + this.point[i] = this.lower[i]; + return overshoot; + }).sum(); + } + + /** + * Adds the specified offset value to each element of the point array. + * + * @param val The offset value to be added to each element of the point array. + */ + private void addOffset(double val) { + + double sum = Arrays.stream(this.upper).sum(); + + if (this.itteration == 0 || sum == 0) { + this.point = Arrays.stream(this.point)// + .map(i -> i + val / this.upper.length)// + .toArray(); + } else { + IntStream.range(0, this.point.length) + .forEach(i -> this.point[i] = this.point[i] + val * this.upper[i] / sum); + } + } + +} diff --git a/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/nearequal/SolveNearEqual.java b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/nearequal/SolveNearEqual.java new file mode 100644 index 00000000000..093dc19fab8 --- /dev/null +++ b/io.openems.edge.ess.core/src/io/openems/edge/ess/core/power/solver/nearequal/SolveNearEqual.java @@ -0,0 +1,121 @@ +package io.openems.edge.ess.core.power.solver.nearequal; + +import java.util.Arrays; + +import org.apache.commons.math3.analysis.MultivariateFunction; +import org.apache.commons.math3.optim.InitialGuess; +import org.apache.commons.math3.optim.MaxEval; +import org.apache.commons.math3.optim.MaxIter; +import org.apache.commons.math3.optim.OptimizationData; +import org.apache.commons.math3.optim.PointValuePair; +import org.apache.commons.math3.optim.nonlinear.scalar.GoalType; +import org.apache.commons.math3.optim.nonlinear.scalar.MultivariateFunctionPenaltyAdapter; +import org.apache.commons.math3.optim.nonlinear.scalar.ObjectiveFunction; +import org.apache.commons.math3.optim.nonlinear.scalar.noderiv.NelderMeadSimplex; +import org.apache.commons.math3.optim.nonlinear.scalar.noderiv.SimplexOptimizer; + +public class SolveNearEqual { + + private double[] upperBound; + private double[] lowerBound; + private double powerSetValue; + + /** + * Solves an optimization problem using the Nelder-Mead simplex algorithm. + * + * @param totalVariables The total number of variables in the optimization + * problem. + * @return An array containing the optimal solution for the optimization + * problem. + */ + public PointValuePair solve(int totalVariables) { + + // If the SetPower is greater than Sum of inidividual upper bound, then return + // the upper bound + if (this.powerSetValue > Arrays.stream(this.upperBound).sum()) { + return new PointValuePair(this.upperBound, 0.0); + } + + MultivariateFunctionPenaltyAdapter adapter = new ConstraintWrapper(this.objectiveFunction(), // + this.lowerBound, // expected lower limit of the result + this.upperBound, // expected upper limit of the result + 0.0, // offset value + this.getScaleVal(1, totalVariables), // + this.powerSetValue); + + OptimizationData[] optimizationData = { new ObjectiveFunction(adapter), // + this.setInitialValue(0, totalVariables), // + new NelderMeadSimplex(totalVariables), // + new MaxIter(10000), // + new MaxEval(10000), // + GoalType.MINIMIZE }; + SimplexOptimizer solver = new SimplexOptimizer(1e-11, 1e-11); + return solver.optimize(optimizationData); + } + + /** + * Creates an objective function that calculates the standard deviation of a + * given set of points. + * + * @return The objective function that computes the standard deviation. + */ + private MultivariateFunction objectiveFunction() { + MultivariateFunction objective = new MultivariateFunction() { + + @Override + public double value(double[] point) { + double mean = Arrays.stream(point).sum() / point.length; + // Standard deviation + return Math.sqrt(// + Arrays.stream((Arrays.stream(point)// + .map(i -> Math.pow(i - mean, 2))// + .toArray()))// + .sum() / point.length); + } + }; + return objective; + } + + /** + * Sets up the initial guess for the optimization problem. + * + * @param value The initial value to set for each variable. + * @param totalVariables The total number of variables in the optimization + * problem. + * @return An InitialGuess object representing the initial guess for the + * optimization. + */ + + private InitialGuess setInitialValue(double value, int totalVariables) { + double[] intialValArray = new double[totalVariables]; + Arrays.fill(intialValArray, value); + return new InitialGuess(intialValArray); + } + + /** + * Generates an array of scale values with the specified scale value for each + * variable. + * + * @param scaleVal The value to set for each scale element. + * @param totalVariables The total number of variables for which scale values + * are generated. + * @return An array containing the specified scale value for each variable. + */ + private double[] getScaleVal(double scaleVal, int totalVariables) { + double[] scaleValArray = new double[totalVariables]; + Arrays.fill(scaleValArray, scaleVal); + return scaleValArray; + } + + public void setUpperBound(double[] val) { + this.upperBound = val; + } + + public void setLowerBound(double[] val) { + this.lowerBound = val; + } + + public void setpowerSetValue(double val) { + this.powerSetValue = val; + } +} diff --git a/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/NearEqualSolverTest.java b/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/NearEqualSolverTest.java new file mode 100644 index 00000000000..9766ada10cf --- /dev/null +++ b/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/NearEqualSolverTest.java @@ -0,0 +1,25 @@ +package io.openems.edge.ess.core.power; + +import org.junit.Test; + +import io.openems.edge.ess.core.power.solver.nearequal.SolveNearEqual; + +public class NearEqualSolverTest { + + @Test + public void solverTest() { + + double[] essUpperLimit = { 10000, 10000, 10000, 1900 }; + double[] essLowerLimit = { 0, 0, 0, 1800 }; + double setValue = 50000; + var model = new SolveNearEqual(); + model.setUpperBound(essUpperLimit); + model.setLowerBound(essLowerLimit); + model.setpowerSetValue(setValue); + var result = model.solve(4).getPoint(); + for (int i = 0; i < result.length; i++) { + System.out.println(result[i]); + } + } + +} diff --git a/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/PowerComponentTest.java b/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/PowerComponentTest.java index 20bacf1ee03..75baf32bbc0 100644 --- a/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/PowerComponentTest.java +++ b/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/PowerComponentTest.java @@ -524,6 +524,125 @@ public void testMultilayerCluster() throws Exception { componentTest.next(new TestCase("#1")); } + /** + * Testing near equals strategy. + * + * @throws Exception on exception + */ + // @Test + public void testNearEqualDistribution() throws Exception { + EssPower powerComponent = new EssPowerImpl(); + + var ess1 = new DummyManagedSymmetricEss("ess1") // + .setPower(powerComponent) // + .withAllowedChargePower(-12000) // + .withAllowedDischargePower(12000) // + .withMaxApparentPower(10000) // + .withSoc(60); + var ess2 = new DummyManagedSymmetricEss("ess2") // + .setPower(powerComponent) // + .withAllowedChargePower(-12000) // + .withAllowedDischargePower(12000) // + .withMaxApparentPower(10000) // + .withSoc(60); + var ess3 = new DummyManagedSymmetricEss("ess3") // + .setPower(powerComponent) // + .withAllowedChargePower(-12000) // + .withAllowedDischargePower(12000) // + .withMaxApparentPower(10000) // + .withSoc(30); + var ess4 = new DummyManagedSymmetricEss("ess4") // + .setPower(powerComponent) // + .withAllowedChargePower(-12000) // + .withAllowedDischargePower(12000) // + .withMaxApparentPower(10000) // + .withSoc(60); + var ess0 = new DummyMetaEss("ess0", ess1, ess2, ess3, ess4) // + .setPower(powerComponent); + + final var cm = new DummyConfigurationAdmin(); + cm.getOrCreateEmptyConfiguration(EssPower.SINGLETON_SERVICE_PID); + + final var componentTest = new ComponentTest(powerComponent) // + .addReference("cm", cm) // + .addReference("addEss", ess0) // + .addReference("addEss", ess1) // + .addReference("addEss", ess2) // + .addReference("addEss", ess3) // + .addReference("addEss", ess4) // + .activate(MyConfig.create() // + .setStrategy(SolverStrategy.OPTIMIZE_BY_KEEPING_ALL_EQUAL) // + .setSymmetricMode(true) // + .setDebugMode(false) // + .setEnablePid(false) // + .build()); // + + // #1 Discharging + expect("#1.1", ess1, 2500, 0); + expect("#1.2", ess2, 2500, 0); + expect("#1.3", ess3, 2500, 0); + expect("#1.4", ess4, 2500, 0); + + ess0.addPowerConstraint("SetActivePowerEquals", Phase.ALL, Pwr.ACTIVE, Relationship.EQUALS, 10000); + ess0.setActivePowerEquals(10000); + componentTest.next(new TestCase("#1")); + + // #2 Charging + expect("#2.1", ess1, -2500, 0); + expect("#2.2", ess2, -2500, 0); + expect("#2.3", ess3, -2500, 0); + expect("#2.4", ess4, -2500, 0); + + ess0.addPowerConstraint("SetActivePowerEquals", Phase.ALL, Pwr.ACTIVE, Relationship.EQUALS, -10000); + ess0.setActivePowerEquals(10000); + componentTest.next(new TestCase("#1")); + + // #3 Discharging with lower allowed discharge power + ess4.withAllowedDischargePower(1900); + + // Should be + expect("#3.1", ess1, 2701, 0); + expect("#3.2", ess2, 2701, 0); + expect("#3.3", ess3, 2701, 0); + expect("#3.4", ess4, 1897, 0); + + ess0.addPowerConstraint("SetActivePowerEquals", Phase.ALL, Pwr.ACTIVE, Relationship.EQUALS, 10000); + componentTest.next(new TestCase("#3")); + + // #4 charging with lower allowed ccharge power + ess4.withAllowedDischargePower(12000); + ess4.withAllowedChargePower(-1900); + + expect("#4.1", ess1, -9899, 0); + expect("#4.2", ess2, -9899, 0); + expect("#4.3", ess3, -9900, 0); + expect("#4.4", ess4, -1881, 0); + + ess0.addPowerConstraint("SetActivePowerEquals", Phase.ALL, Pwr.ACTIVE, Relationship.EQUALS, -10000); + componentTest.next(new TestCase("#4")); + + // #5 keeping zero + expect("#5.1", ess1, 0, 0); + expect("#5.2", ess2, 0, 0); + expect("#5.3", ess3, 0, 0); + expect("#5.4", ess4, 0, 0); + + ess0.addPowerConstraint("SetActivePowerEquals", Phase.ALL, Pwr.ACTIVE, Relationship.EQUALS, 0); + componentTest.next(new TestCase("#5")); + + ess4.withAllowedChargePower(1000); + + // #6 keeping zero + expect("#5.1", ess1, 0, 0); + expect("#5.2", ess2, 0, 0); + expect("#5.3", ess3, 0, 0); + expect("#5.4", ess4, 0, 0); + + ess0.addPowerConstraint("SetActivePowerEquals", Phase.ALL, Pwr.ACTIVE, Relationship.EQUALS, 0); + componentTest.next(new TestCase("#5")); + + } + private static void expect(String description, DummyManagedSymmetricEss ess, int p, int q) { openCallbacks.incrementAndGet(); ess.withSymmetricApplyPowerCallback(record -> { diff --git a/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/PowerComponentTest2.java b/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/PowerComponentTest2.java new file mode 100644 index 00000000000..7060c6e7393 --- /dev/null +++ b/io.openems.edge.ess.core/test/io/openems/edge/ess/core/power/PowerComponentTest2.java @@ -0,0 +1,205 @@ +package io.openems.edge.ess.core.power; + +import static org.junit.Assert.assertEquals; + +import java.util.concurrent.atomic.AtomicInteger; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +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.ess.power.api.Phase; +import io.openems.edge.ess.power.api.Pwr; +import io.openems.edge.ess.power.api.Relationship; +import io.openems.edge.ess.power.api.SolverStrategy; +import io.openems.edge.ess.test.DummyManagedSymmetricEss; +import io.openems.edge.ess.test.DummyMetaEss; + +public class PowerComponentTest2 { + + private static AtomicInteger openCallbacks; + + @Before + public void before() { + openCallbacks = new AtomicInteger(0); + } + + @After + public void after() { + assertEquals("Not all Callbacks were actually called", 0, openCallbacks.get()); + } + + @Test + public void testOnlyOneEssDistribution() throws Exception { + EssPower powerComponent = new EssPowerImpl(); + + var ess1 = new DummyManagedSymmetricEss("ess1") // + .setPower(powerComponent) // + .withAllowedChargePower(-12000) // + .withAllowedDischargePower(12000) // + .withMaxApparentPower(10000) // + .withSoc(60); + + var ess0 = new DummyMetaEss("ess0", ess1) // + .setPower(powerComponent); + + final var cm = new DummyConfigurationAdmin(); + cm.getOrCreateEmptyConfiguration(EssPower.SINGLETON_SERVICE_PID); + + final var componentTest = new ComponentTest(powerComponent) // + .addReference("cm", cm) // + .addReference("addEss", ess0) // + .addReference("addEss", ess1) // + + .activate(MyConfig.create() // + .setStrategy(SolverStrategy.OPTIMIZE_BY_KEEPING_ALL_EQUAL) // + .setSymmetricMode(true) // + .setDebugMode(false) // + .setEnablePid(false) // + .build()); // + + expect("#1.1", ess1, 10000, 0); + + ess0.setActivePowerEquals(10000); + componentTest.next(new TestCase("#1")); + + expect("#2.1", ess1, 10000, 0); + + ess0.setActivePowerEquals(12000); + componentTest.next(new TestCase("#2")); + + } + + /** + * Testing near equals strategy. + * + * @throws Exception on exception + */ + @Test + public void testNearEqualDistribution() throws Exception { + EssPower powerComponent = new EssPowerImpl(); + + var ess1 = new DummyManagedSymmetricEss("ess1") // + .setPower(powerComponent) // + .withAllowedChargePower(-12000) // + .withAllowedDischargePower(12000) // + .withMaxApparentPower(10000) // + .withSoc(60); + var ess2 = new DummyManagedSymmetricEss("ess2") // + .setPower(powerComponent) // + .withAllowedChargePower(-12000) // + .withAllowedDischargePower(12000) // + .withMaxApparentPower(10000) // + .withSoc(60); + var ess3 = new DummyManagedSymmetricEss("ess3") // + .setPower(powerComponent) // + .withAllowedChargePower(-12000) // + .withAllowedDischargePower(12000) // + .withMaxApparentPower(10000) // + .withSoc(30); + var ess4 = new DummyManagedSymmetricEss("ess4") // + .setPower(powerComponent) // + .withAllowedChargePower(-12000) // + .withAllowedDischargePower(12000) // + .withMaxApparentPower(10000) // + .withSoc(60); + var ess0 = new DummyMetaEss("ess0", ess1, ess2, ess3, ess4) // + .setPower(powerComponent); + + final var cm = new DummyConfigurationAdmin(); + cm.getOrCreateEmptyConfiguration(EssPower.SINGLETON_SERVICE_PID); + + final var componentTest = new ComponentTest(powerComponent) // + .addReference("cm", cm) // + .addReference("addEss", ess0) // + .addReference("addEss", ess1) // + .addReference("addEss", ess2) // + .addReference("addEss", ess3) // + .addReference("addEss", ess4) // + .activate(MyConfig.create() // + .setStrategy(SolverStrategy.OPTIMIZE_BY_KEEPING_ALL_EQUAL) // + .setSymmetricMode(true) // + .setDebugMode(false) // + .setEnablePid(false) // + .build()); // + + // #1 Discharging + expect("#1.1", ess1, 2500, 0); + expect("#1.2", ess2, 2500, 0); + expect("#1.3", ess3, 2500, 0); + expect("#1.4", ess4, 2500, 0); + + ess0.addPowerConstraint("SetActivePowerEquals1", Phase.ALL, Pwr.ACTIVE, Relationship.EQUALS, 10000); + ess0.setActivePowerEquals(10000); + componentTest.next(new TestCase("#1")); + + // #2 Charging + expect("#2.1", ess1, -2500, 0); + expect("#2.2", ess2, -2500, 0); + expect("#2.3", ess3, -2500, 0); + expect("#2.4", ess4, -2500, 0); + + ess0.addPowerConstraint("SetActivePowerEquals2", Phase.ALL, Pwr.ACTIVE, Relationship.EQUALS, -10000); + ess0.setActivePowerEquals(10000); + componentTest.next(new TestCase("#1")); + + // #3 Discharging with lower allowed discharge power + ess4.withAllowedDischargePower(1900); + + // Should be + expect("#3.1", ess1, 2701, 0); + expect("#3.2", ess2, 2701, 0); + expect("#3.3", ess3, 2701, 0); + expect("#3.4", ess4, 1897, 0); + + ess0.addPowerConstraint("SetActivePowerEquals3", Phase.ALL, Pwr.ACTIVE, Relationship.EQUALS, 10000); + componentTest.next(new TestCase("#3")); + + // #4 charging with lower allowed charge power + ess4.withAllowedDischargePower(12000); + ess4.withAllowedChargePower(-1900); + + expect("#4.1", ess1, -2700, 0); + expect("#4.2", ess2, -2700, 0); + expect("#4.3", ess3, -2703, 0); + expect("#4.4", ess4, -1896, 0); + + ess0.addPowerConstraint("SetActivePowerEquals4", Phase.ALL, Pwr.ACTIVE, Relationship.EQUALS, -10000); + componentTest.next(new TestCase("#4")); + + // #5 keeping zero + expect("#5.1", ess1, 0, 0); + expect("#5.2", ess2, 0, 0); + expect("#5.3", ess3, 0, 0); + expect("#5.4", ess4, 0, 0); + + ess0.addPowerConstraint("SetActivePowerEquals5", Phase.ALL, Pwr.ACTIVE, Relationship.EQUALS, 0); + componentTest.next(new TestCase("#5")); + + ess4.withAllowedChargePower(1000); + + // #6 keeping zero + expect("#5.1", ess1, 0, 0); + expect("#5.2", ess2, 0, 0); + expect("#5.3", ess3, 0, 0); + expect("#5.4", ess4, 0, 0); + + ess0.addPowerConstraint("ctrl0", Phase.ALL, Pwr.ACTIVE, Relationship.EQUALS, 0); + componentTest.next(new TestCase("#5")); + + } + + private static void expect(String description, DummyManagedSymmetricEss ess, int p, int q) { + openCallbacks.incrementAndGet(); + ess.withSymmetricApplyPowerCallback(record -> { + openCallbacks.decrementAndGet(); + // System.out.println(description + " for " + ess.id() + ": " + activePower); + assertEquals(description + " for " + ess.id(), p, record.activePower()); + assertEquals(description + " for " + ess.id(), q, record.reactivePower()); + }); + } + +} diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractAllowedChargeDischargeHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractAllowedChargeDischargeHandler.java index 9a096506d43..3cc01152259 100644 --- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractAllowedChargeDischargeHandler.java +++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractAllowedChargeDischargeHandler.java @@ -1,22 +1,36 @@ package io.openems.edge.ess.generic.common; +import static io.openems.edge.common.type.TypeUtils.multiply; +import static io.openems.edge.common.type.TypeUtils.subtract; +import static java.lang.Math.abs; +import static java.lang.Math.max; +import static java.lang.Math.min; +import static java.lang.Math.round; + import java.time.Duration; import java.time.Instant; -import java.util.function.BiConsumer; +import java.util.function.BiFunction; + +import org.apache.logging.log4j.util.TriConsumer; import io.openems.edge.battery.api.Battery; +import io.openems.edge.batteryinverter.api.SymmetricBatteryInverter; +import io.openems.edge.common.channel.value.Value; import io.openems.edge.common.component.ClockProvider; +import io.openems.edge.common.filter.Pt1filter; import io.openems.edge.common.startstop.StartStoppable; +import io.openems.edge.common.type.TypeUtils; import io.openems.edge.ess.api.SymmetricEss; import io.openems.edge.ess.generic.symmetric.ChannelManager; +import io.openems.edge.ess.generic.symmetric.EssProtection; /** * Helper class to handle calculation of Allowed-Charge-Power and * Allowed-Discharge-Power. This class is used by {@link ChannelManager} as a * callback to updates of Battery Channels. */ -public abstract class AbstractAllowedChargeDischargeHandler - implements BiConsumer { +public abstract class AbstractAllowedChargeDischargeHandler + implements TriConsumer { public static final float DISCHARGE_EFFICIENCY_FACTOR = 0.95F; @@ -28,18 +42,31 @@ public abstract class AbstractAllowedChargeDischargeHandler AC Power) charge = chargeMaxCurrent * voltage; - discharge = Math.round(dischargeMaxCurrent * voltage * DISCHARGE_EFFICIENCY_FACTOR); + discharge = round(dischargeMaxCurrent * voltage * DISCHARGE_EFFICIENCY_FACTOR); } /* @@ -113,13 +154,13 @@ protected void calculateAllowedChargeDischargePower(ClockProvider clockProvider, // Force Charge is active // Make sure AllowedChargePower is greater-or-equals absolute // AllowedDischargePower - charge = Math.max(charge, Math.abs(discharge)); + charge = max(charge, abs(discharge)); } else if (charge < 0) { // Force Discharge is active // Make sure AllowedDischargePower is greater-or-equals absolute // AllowedChargePower - discharge = Math.max(Math.abs(charge), discharge); + discharge = max(abs(charge), discharge); } /* @@ -140,6 +181,45 @@ protected void calculateAllowedChargeDischargePower(ClockProvider clockProvider, this.lastBatteryAllowedDischargePower = discharge; } + private void checkEssProtectionExtremes(ClockProvider clockProvider, Integer chargeMaxCurrent, + Integer dischargeMaxCurrent, Value current) { + if (!(this.parent instanceof EssProtection ess)) { + return; + } + + if (dischargeMaxCurrent == null || chargeMaxCurrent == null || !current.isDefined()) { + return; + } + + if (dischargeMaxCurrent >= 0 || chargeMaxCurrent >= 0) { + this.onEntryEssProtection = null; + ess._setEpDeepDischargeProtection(false); + ess._setEpOverChargeProtection(false); + return; + } + + if (this.onEntryEssProtection == null) { + this.onEntryEssProtection = Instant.now(clockProvider.getClock()); + } + + if (dischargeMaxCurrent < 0// + && current.get() >= 0// + && this.isExtremeTimeoutPassed()) { + ess._setEpDeepDischargeProtection(true); + } + + if (chargeMaxCurrent < 0 // + && current.get() <= 0 // + && this.isExtremeTimeoutPassed()) { + ess._setEpOverChargeProtection(true); + } + } + + private boolean isExtremeTimeoutPassed() { + return Duration.between(this.onEntryEssProtection, Instant.now()) + .getSeconds() > ESS_PROTECTION_EXTREME_LIMIT_TIMEOUT; + } + /** * Applies the max increase ramp, built from MAX_INCREASE_PERCENTAGE. * @@ -158,7 +238,71 @@ private static float applyMaxIncrease(float lastValue, float thisValue, Instant } else { millis = Duration.between(lastInstant, thisInstant).toMillis(); } - return Math.min(thisValue, // + return min(thisValue, // lastValue + thisValue * millis * MAX_INCREASE_PERCENTAGE / 1000.F /* convert [mW] to [W] */); } + + private record RegulationValues(// + boolean isBatteryStarted, // + Value voltage, // + Value current, // + Value chargeMaxVoltage, // + Value dischargeMinVoltage, // + Value innerResistance, // + Value inverterDcMinVoltage, // + Value inverterDcMaxVoltage) { + public RegulationValues(Battery battery, SymmetricBatteryInverter inverter) { + this(// + battery.isStarted(), // + battery.getVoltage(), // + battery.getCurrent(), // + battery.getChargeMaxVoltage(), // + battery.getDischargeMinVoltage(), // + battery.getInnerResistance(), // + inverter.getDcMinVoltage(), // + inverter.getDcMaxVoltage()); + } + } + + private static boolean areRegulationValuesDefined(RegulationValues regulationValues) { + return regulationValues.isBatteryStarted()// + && regulationValues.voltage.isDefined()// + && regulationValues.current.isDefined() // + && regulationValues.chargeMaxVoltage.isDefined()// + && regulationValues.dischargeMinVoltage.isDefined()// + && regulationValues.innerResistance.isDefined()// + && regulationValues.inverterDcMinVoltage.isDefined()// + && regulationValues.inverterDcMaxVoltage.isDefined();// + } + + private static Integer calculateMaxCurrent(Battery battery, SymmetricBatteryInverter inverter, int cycleTime, + Pt1filter pt1Filter, BiFunction dcLimit, + BiFunction voltageOffset, BiFunction typeUtilsMethod, + boolean invert) { + var regulationValues = new RegulationValues(battery, inverter); + if (!areRegulationValuesDefined(regulationValues)) { + return null; + } + + final var batteryLimit = invert// + ? regulationValues.chargeMaxVoltage.get() + : regulationValues.dischargeMinVoltage.get(); + final var inverterLimit = invert // + ? regulationValues.inverterDcMaxVoltage.get() + : regulationValues.inverterDcMinVoltage.get(); + final var limitVoltage = dcLimit.apply(// + voltageOffset.apply(// + batteryLimit, // + VOLTAGE_CONTROL_OFFSET), + inverterLimit); + + var subtractLimit = subtract(regulationValues.voltage.get(), limitVoltage); + var voltageDifference = invert ? multiply(subtractLimit, -1) : subtractLimit; + + var resistance = regulationValues.innerResistance.get() / 1000.; + final var deltaChargeCurrent = voltageDifference / resistance; + var maxCurrentVoltLimit = typeUtilsMethod.apply(deltaChargeCurrent, (double) regulationValues.current.get()); + pt1Filter.setCycleTime(cycleTime); + return pt1Filter.applyPt1Filter(max(maxCurrentVoltLimit, -5.0)); + } } \ No newline at end of file diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractChannelManager.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractChannelManager.java index 73ae18df225..af85ef0b031 100644 --- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractChannelManager.java +++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractChannelManager.java @@ -18,7 +18,7 @@ * calculating the Ess-Channels based on the Channels of the Battery and * Battery-Inverter. Takes care of registering and unregistering listeners. */ -public class AbstractChannelManager +public class AbstractChannelManager extends AbstractChannelListenerManager { private final ESS parent; @@ -33,15 +33,14 @@ public AbstractChannelManager(ESS parent, /** * Called on Component activate(). * - * @param clockProvider the {@link ClockProvider} - * @param battery the {@link Battery} - * @param batteryInverter the {@link ManagedSymmetricBatteryInverter} + * @param clockProvider the {@link ClockProvider} + * @param battery the {@link Battery} + * @param inverter the {@link ManagedSymmetricBatteryInverter} */ - public void activate(ClockProvider clockProvider, Battery battery, - ManagedSymmetricBatteryInverter batteryInverter) { - this.addBatteryListener(clockProvider, battery); - this.addBatteryInverterListener(batteryInverter); - this.addEssListener(clockProvider, battery); + public void activate(ClockProvider clockProvider, Battery battery, ManagedSymmetricBatteryInverter inverter) { + this.addBatteryListener(clockProvider, battery, inverter); + this.addBatteryInverterListener(inverter); + this.addEssListener(clockProvider, battery, inverter); } private void addBatteryInverterListener(ManagedSymmetricBatteryInverter batteryInverter) { @@ -91,18 +90,18 @@ private void addBatteryInverterListener(ManagedSymmetricBatteryInverter batteryI } } - private void addBatteryListener(ClockProvider clockProvider, Battery battery) { + private void addBatteryListener(ClockProvider clockProvider, Battery battery, SymmetricBatteryInverter inverter) { /* * Battery */ this.addOnSetNextValueListener(battery, Battery.ChannelId.DISCHARGE_MIN_VOLTAGE, - ignored -> this.allowedChargeDischargeHandler.accept(clockProvider, battery)); + ignored -> this.allowedChargeDischargeHandler.accept(clockProvider, battery, inverter)); this.addOnSetNextValueListener(battery, Battery.ChannelId.DISCHARGE_MAX_CURRENT, - ignored -> this.allowedChargeDischargeHandler.accept(clockProvider, battery)); + ignored -> this.allowedChargeDischargeHandler.accept(clockProvider, battery, inverter)); this.addOnSetNextValueListener(battery, Battery.ChannelId.CHARGE_MAX_VOLTAGE, - ignored -> this.allowedChargeDischargeHandler.accept(clockProvider, battery)); + ignored -> this.allowedChargeDischargeHandler.accept(clockProvider, battery, inverter)); this.addOnSetNextValueListener(battery, Battery.ChannelId.CHARGE_MAX_CURRENT, - ignored -> this.allowedChargeDischargeHandler.accept(clockProvider, battery)); + ignored -> this.allowedChargeDischargeHandler.accept(clockProvider, battery, inverter)); this.addCopyListener(battery, // Battery.ChannelId.CAPACITY, // SymmetricEss.ChannelId.CAPACITY); @@ -111,13 +110,13 @@ private void addBatteryListener(ClockProvider clockProvider, Battery battery) { SymmetricEss.ChannelId.SOC); } - private void addEssListener(ClockProvider clockProvider, Battery battery) { + private void addEssListener(ClockProvider clockProvider, Battery battery, SymmetricBatteryInverter inverter) { /* * ESS / Parent */ if (this.parent instanceof StartStoppable) { - this.addOnChangeListener(this.parent, StartStoppable.ChannelId.START_STOP, - (ignored0, ignored1) -> this.allowedChargeDischargeHandler.accept(clockProvider, battery)); + this.addOnChangeListener(this.parent, StartStoppable.ChannelId.START_STOP, (ignored0, + ignored1) -> this.allowedChargeDischargeHandler.accept(clockProvider, battery, inverter)); } } @@ -137,4 +136,5 @@ protected void addCopyListener(OpenemsComponent sourceComponent, ChannelId s targetChannel.setNextValue(value); }); } + } diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractGenericManagedEss.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractGenericManagedEss.java index 82907b6db2e..8f8c44bf659 100644 --- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractGenericManagedEss.java +++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/AbstractGenericManagedEss.java @@ -39,7 +39,7 @@ * Parent class for different implementations of Managed Energy Storage Systems, * consisting of a Battery-Inverter component and a Battery component. */ -public abstract class AbstractGenericManagedEss +public abstract class AbstractGenericManagedEss extends AbstractOpenemsComponent implements GenericManagedEss, ManagedSymmetricEss, HybridEss, SymmetricEss, OpenemsComponent, EventHandler, StartStoppable, ModbusSlave { diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/CycleProvider.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/CycleProvider.java new file mode 100644 index 00000000000..4a9a8e92e44 --- /dev/null +++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/common/CycleProvider.java @@ -0,0 +1,11 @@ +package io.openems.edge.ess.generic.common; + +public interface CycleProvider { + + /** + * Gets the duration of one global OpenEMS Cycle in [ms]. + * + * @return the duration in milliseconds + */ + public int getCycleTime(); +} diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/EssGenericOffGridImpl.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/EssGenericOffGridImpl.java index c455f7271a5..3cd2ffd64ef 100644 --- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/EssGenericOffGridImpl.java +++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/offgrid/EssGenericOffGridImpl.java @@ -1,5 +1,11 @@ package io.openems.edge.ess.generic.offgrid; +import static io.openems.edge.common.cycle.Cycle.DEFAULT_CYCLE_TIME; +import static io.openems.edge.common.sum.GridMode.OFF_GRID; +import static io.openems.edge.ess.generic.offgrid.statemachine.StateMachine.OffGridState.GRID_SWITCH; +import static io.openems.edge.ess.generic.offgrid.statemachine.StateMachine.OffGridState.STOP_BATTERY_INVERTER; +import static io.openems.edge.ess.generic.offgrid.statemachine.StateMachine.OffGridState.UNDEFINED; + import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; @@ -26,6 +32,7 @@ import io.openems.edge.batteryinverter.api.OffGridBatteryInverter; import io.openems.edge.common.component.ComponentManager; import io.openems.edge.common.component.OpenemsComponent; +import io.openems.edge.common.cycle.Cycle; import io.openems.edge.common.event.EdgeEventConstants; import io.openems.edge.common.modbusslave.ModbusSlave; import io.openems.edge.common.modbusslave.ModbusSlaveTable; @@ -36,10 +43,10 @@ import io.openems.edge.ess.api.ManagedSymmetricEss; import io.openems.edge.ess.api.SymmetricEss; import io.openems.edge.ess.generic.common.AbstractGenericManagedEss; +import io.openems.edge.ess.generic.common.CycleProvider; import io.openems.edge.ess.generic.common.GenericManagedEss; import io.openems.edge.ess.generic.offgrid.statemachine.Context; import io.openems.edge.ess.generic.offgrid.statemachine.StateMachine; -import io.openems.edge.ess.generic.offgrid.statemachine.StateMachine.OffGridState; import io.openems.edge.ess.generic.symmetric.ChannelManager; import io.openems.edge.ess.generic.symmetric.EssGenericManagedSymmetric; import io.openems.edge.ess.offgrid.api.OffGridEss; @@ -58,15 +65,18 @@ public class EssGenericOffGridImpl extends AbstractGenericManagedEss implements EssGenericManagedSymmetric, OffGridEss, GenericManagedEss, ManagedSymmetricEss, SymmetricEss, - OpenemsComponent, EventHandler, StartStoppable, ModbusSlave { + OpenemsComponent, EventHandler, StartStoppable, ModbusSlave, CycleProvider { private final Logger log = LoggerFactory.getLogger(EssGenericOffGridImpl.class); - private final StateMachine stateMachine = new StateMachine(OffGridState.UNDEFINED); + private final StateMachine stateMachine = new StateMachine(UNDEFINED); private final ChannelManager channelManager = new ChannelManager(this); private final AtomicBoolean fromOffToOnGrid = new AtomicBoolean(false); private final AtomicReference targetGridMode = new AtomicReference<>(TargetGridMode.GO_ON_GRID); private final AtomicBoolean targetDeepDischarge = new AtomicBoolean(); + @Reference + private Cycle cycle; + @Reference private Power power; @@ -189,7 +199,7 @@ public Power getPower() { public void setStartStop(StartStop value) { if (this.startStopTarget.getAndSet(value) != value) { // Set only if value changed - this.stateMachine.forceNextState(OffGridState.UNDEFINED); + this.stateMachine.forceNextState(UNDEFINED); } } @@ -210,7 +220,7 @@ public void setTargetGridMode(TargetGridMode targetGridMode) { if (oldTargetGridMode == TargetGridMode.GO_OFF_GRID) { this.fromOffToOnGrid.set(true); } - this.stateMachine.forceNextState(OffGridState.GRID_SWITCH); + this.stateMachine.forceNextState(GRID_SWITCH); } /** @@ -234,7 +244,7 @@ private void requestGridOperationChange() { private void setTargetDeepDischarge(boolean value) { if (this.targetDeepDischarge.getAndSet(value) != value) { - this.stateMachine.forceNextState(OffGridState.STOP_BATTERY_INVERTER); + this.stateMachine.forceNextState(STOP_BATTERY_INVERTER); } } @@ -245,10 +255,15 @@ private void avoidBatteryDeepDischarge() { this.getAllowedDischargePowerChannel().onSetNextValue(allowedDischargePowerValue -> { var allowedDischargePower = allowedDischargePowerValue.orElse(0); var gridMode = this.offGridSwitch.getGridMode(); - if (allowedDischargePower > 0 || gridMode != GridMode.OFF_GRID) { + if (allowedDischargePower > 0 || gridMode != OFF_GRID) { return; } this.setTargetDeepDischarge(true); }); } + + @Override + public int getCycleTime() { + return this.cycle != null ? this.cycle.getCycleTime() : DEFAULT_CYCLE_TIME; + } } diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/AllowedChargeDischargeHandler.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/AllowedChargeDischargeHandler.java index 5ccb200a6c5..b789c52b717 100644 --- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/AllowedChargeDischargeHandler.java +++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/AllowedChargeDischargeHandler.java @@ -1,6 +1,7 @@ package io.openems.edge.ess.generic.symmetric; import io.openems.edge.battery.api.Battery; +import io.openems.edge.batteryinverter.api.SymmetricBatteryInverter; import io.openems.edge.common.component.ClockProvider; import io.openems.edge.common.type.TypeUtils; import io.openems.edge.ess.generic.common.AbstractAllowedChargeDischargeHandler; @@ -12,8 +13,8 @@ public AllowedChargeDischargeHandler(EssGenericManagedSymmetric parent) { } @Override - public void accept(ClockProvider clockProvider, Battery battery) { - this.calculateAllowedChargeDischargePower(clockProvider, battery); + public void accept(ClockProvider clockProvider, Battery battery, SymmetricBatteryInverter inverter) { + this.calculateAllowedChargeDischargePower(clockProvider, battery, inverter); // Battery limits var batteryAllowedChargePower = Math.round(this.lastBatteryAllowedChargePower); diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/EssGenericManagedSymmetric.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/EssGenericManagedSymmetric.java index c4fd6f589de..7fe3be0fe45 100644 --- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/EssGenericManagedSymmetric.java +++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/EssGenericManagedSymmetric.java @@ -14,11 +14,12 @@ import io.openems.edge.ess.api.HybridEss; import io.openems.edge.ess.api.ManagedSymmetricEss; import io.openems.edge.ess.api.SymmetricEss; +import io.openems.edge.ess.generic.common.CycleProvider; import io.openems.edge.ess.generic.common.GenericManagedEss; import io.openems.edge.ess.generic.symmetric.statemachine.StateMachine.State; public interface EssGenericManagedSymmetric extends GenericManagedEss, ManagedSymmetricEss, HybridEss, SymmetricEss, - OpenemsComponent, EventHandler, StartStoppable, ModbusSlave { + OpenemsComponent, EventHandler, StartStoppable, ModbusSlave, CycleProvider { public enum ChannelId implements io.openems.edge.common.channel.ChannelId { STATE_MACHINE(Doc.of(State.values()) // diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/EssGenericManagedSymmetricImpl.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/EssGenericManagedSymmetricImpl.java index 8e0137c14d8..40a3a6371af 100644 --- a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/EssGenericManagedSymmetricImpl.java +++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/EssGenericManagedSymmetricImpl.java @@ -1,5 +1,8 @@ package io.openems.edge.ess.generic.symmetric; +import static io.openems.edge.common.cycle.Cycle.DEFAULT_CYCLE_TIME; +import static io.openems.edge.ess.generic.symmetric.statemachine.StateMachine.State.UNDEFINED; + import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.component.ComponentContext; import org.osgi.service.component.annotations.Activate; @@ -23,6 +26,7 @@ import io.openems.edge.batteryinverter.api.ManagedSymmetricBatteryInverter; import io.openems.edge.common.component.ComponentManager; import io.openems.edge.common.component.OpenemsComponent; +import io.openems.edge.common.cycle.Cycle; import io.openems.edge.common.event.EdgeEventConstants; import io.openems.edge.common.modbusslave.ModbusSlave; import io.openems.edge.common.startstop.StartStop; @@ -31,10 +35,10 @@ import io.openems.edge.ess.api.ManagedSymmetricEss; import io.openems.edge.ess.api.SymmetricEss; import io.openems.edge.ess.generic.common.AbstractGenericManagedEss; +import io.openems.edge.ess.generic.common.CycleProvider; import io.openems.edge.ess.generic.common.GenericManagedEss; import io.openems.edge.ess.generic.symmetric.statemachine.Context; import io.openems.edge.ess.generic.symmetric.statemachine.StateMachine; -import io.openems.edge.ess.generic.symmetric.statemachine.StateMachine.State; import io.openems.edge.ess.power.api.Power; @Designate(ocd = Config.class, factory = true) @@ -49,12 +53,15 @@ public class EssGenericManagedSymmetricImpl extends AbstractGenericManagedEss implements EssGenericManagedSymmetric, GenericManagedEss, ManagedSymmetricEss, HybridEss, SymmetricEss, - OpenemsComponent, EventHandler, StartStoppable, ModbusSlave { + OpenemsComponent, EventHandler, StartStoppable, ModbusSlave, CycleProvider, EssProtection { private final Logger log = LoggerFactory.getLogger(AbstractGenericManagedEss.class); - private final StateMachine stateMachine = new StateMachine(State.UNDEFINED); + private final StateMachine stateMachine = new StateMachine(UNDEFINED); private final ChannelManager channelManager = new ChannelManager(this); + @Reference + private Cycle cycle; + @Reference private Power power; @@ -78,7 +85,8 @@ public EssGenericManagedSymmetricImpl() { ManagedSymmetricEss.ChannelId.values(), // GenericManagedEss.ChannelId.values(), // HybridEss.ChannelId.values(), // - EssGenericManagedSymmetric.ChannelId.values() // + EssGenericManagedSymmetric.ChannelId.values(), // + EssProtection.ChannelId.values()// ); } @@ -172,7 +180,12 @@ public boolean isManaged() { public void setStartStop(StartStop value) { if (this.startStopTarget.getAndSet(value) != value) { // Set only if value changed - this.stateMachine.forceNextState(State.UNDEFINED); + this.stateMachine.forceNextState(UNDEFINED); } } + + @Override + public int getCycleTime() { + return this.cycle != null ? this.cycle.getCycleTime() : DEFAULT_CYCLE_TIME; + } } diff --git a/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/EssProtection.java b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/EssProtection.java new file mode 100644 index 00000000000..f3ddcd72e57 --- /dev/null +++ b/io.openems.edge.ess.generic/src/io/openems/edge/ess/generic/symmetric/EssProtection.java @@ -0,0 +1,148 @@ +package io.openems.edge.ess.generic.symmetric; + +import io.openems.common.channel.Level; +import io.openems.common.channel.Unit; +import io.openems.common.types.OpenemsType; +import io.openems.edge.common.channel.Channel; +import io.openems.edge.common.channel.Doc; +import io.openems.edge.common.channel.StateChannel; +import io.openems.edge.common.channel.value.Value; +import io.openems.edge.common.component.OpenemsComponent; + +public interface EssProtection extends OpenemsComponent { + + public enum ChannelId implements io.openems.edge.common.channel.ChannelId { + EP_CHARGE_MAX_CURRENT(Doc.of(OpenemsType.INTEGER) // + .unit(Unit.AMPERE)), // + EP_DISCHARGE_MAX_CURRENT(Doc.of(OpenemsType.INTEGER) // + .unit(Unit.AMPERE)), // + EP_DEEP_DISCHARGE_PROTECTION(Doc.of(Level.FAULT)// + .text("Deep discharge protection triggered!")), // + EP_OVER_CHARGE_PROTECTION(Doc.of(Level.FAULT)// + .text("Over charge protection triggered!")),// + ; + + private final Doc doc; + + private ChannelId(Doc doc) { + this.doc = doc; + } + + @Override + public Doc doc() { + return this.doc; + } + } + + /** + * Gets the Channel for {@link ChannelId#EP_CHARGE_MAX_CURRENT}. + * + * @return the Channel + */ + public default Channel getEpChargeMaxCurrentChannel() { + return this.channel(ChannelId.EP_CHARGE_MAX_CURRENT); + } + + /** + * Gets the {@link ChannelId#EP_CHARGE_MAX_CURRENT}. + * + * @return the Channel {@link Value} + */ + public default Value getEpChargeMaxCurrent() { + return this.getEpChargeMaxCurrentChannel().value(); + } + + /** + * Internal method to set the 'nextValue' on + * {@link ChannelId#EP_CHARGE_MAX_CURRENT} Channel. + * + * @param value the next value + */ + public default void _setEpChargeMaxCurrent(Integer value) { + this.getEpChargeMaxCurrentChannel().setNextValue(value); + } + + /** + * Gets the Channel for {@link ChannelId#EP_DISCHARGE_MAX_CURRENT}. + * + * @return the Channel + */ + public default Channel getEpDischargeMaxCurrentChannel() { + return this.channel(ChannelId.EP_DISCHARGE_MAX_CURRENT); + } + + /** + * Gets the {@link ChannelId#EP_DISCHARGE_MAX_CURRENT}. + * + * @return the Channel {@link Value} + */ + public default Value getEpDischargeMaxCurrent() { + return this.getEpDischargeMaxCurrentChannel().value(); + } + + /** + * Internal method to set the 'nextValue' on + * {@link ChannelId#EP_DISCHARGE_MAX_CURRENT} Channel. + * + * @param value the next value + */ + public default void _setEpDischargeMaxCurrent(Integer value) { + this.getEpDischargeMaxCurrentChannel().setNextValue(value); + } + + /** + * Gets the Channel for {@link ChannelId#EP_DEEP_DISCHARGE_PROTECTION}. + * + * @return the Channel + */ + public default StateChannel getEpDeepDischargeProtectionChannel() { + return this.channel(ChannelId.EP_DEEP_DISCHARGE_PROTECTION); + } + + /** + * Gets the {@link ChannelId#EP_DEEP_DISCHARGE_PROTECTION}. + * + * @return the Channel {@link Value} + */ + public default Value getEpDeepDischargeProtection() { + return this.getEpDeepDischargeProtectionChannel().value(); + } + + /** + * Internal method to set the 'nextValue' on + * {@link ChannelId#EP_DEEP_DISCHARGE_PROTECTION} Channel. + * + * @param value the next value + */ + public default void _setEpDeepDischargeProtection(boolean value) { + this.getEpDeepDischargeProtectionChannel().setNextValue(value); + } + + /** + * Gets the Channel for {@link ChannelId#EP_OVER_CHARGE_PROTECTION}. + * + * @return the Channel + */ + public default StateChannel getEpOverChargeProtectionChannel() { + return this.channel(ChannelId.EP_OVER_CHARGE_PROTECTION); + } + + /** + * Gets the {@link ChannelId#EP_OVER_CHARGE_PROTECTION}. + * + * @return the Channel {@link Value} + */ + public default Value getEpOverChargeProtection() { + return this.getEpOverChargeProtectionChannel().value(); + } + + /** + * Internal method to set the 'nextValue' on + * {@link ChannelId#EP_OVER_CHARGE_PROTECTION} Channel. + * + * @param value the next value + */ + public default void _setEpOverChargeProtection(boolean value) { + this.getEpOverChargeProtectionChannel().setNextValue(value); + } +} diff --git a/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/symmetric/EssProtectionTest.java b/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/symmetric/EssProtectionTest.java new file mode 100644 index 00000000000..62959e6da20 --- /dev/null +++ b/io.openems.edge.ess.generic/test/io/openems/edge/ess/generic/symmetric/EssProtectionTest.java @@ -0,0 +1,469 @@ +package io.openems.edge.ess.generic.symmetric; + +import static org.junit.Assert.assertEquals; + +import java.time.Instant; +import java.time.ZoneOffset; +import java.time.temporal.ChronoUnit; + +import org.junit.Test; + +import io.openems.common.test.TimeLeapClock; +import io.openems.common.types.ChannelAddress; +import io.openems.edge.battery.test.DummyBattery; +import io.openems.edge.batteryinverter.test.DummyManagedSymmetricBatteryInverter; +import io.openems.edge.common.startstop.StartStop; +import io.openems.edge.common.startstop.StartStopConfig; +import io.openems.edge.common.test.AbstractComponentTest.TestCase; +import io.openems.edge.common.test.DummyComponentManager; +import io.openems.edge.common.test.DummyConfigurationAdmin; +import io.openems.edge.ess.test.DummyPower; +import io.openems.edge.ess.test.ManagedSymmetricEssTest; + +public class EssProtectionTest { + + private static final String ESS_ID = "ess0"; + private static final String BATTERY_ID = "battery0"; + private static final String BATTERY_INVERTER_ID = "batteryInverter0"; + private static final ChannelAddress BATTERY_SOC = new ChannelAddress(BATTERY_ID, "Soc"); + private static final ChannelAddress BATTERY_VOLTAGE = new ChannelAddress(BATTERY_ID, "Voltage"); + private static final ChannelAddress BATTERY_CHARGE_MAX_VOLTAGE = new ChannelAddress(BATTERY_ID, "ChargeMaxVoltage"); + private static final ChannelAddress BATTERY_DISCHARGE_MIN_VOLTAGE = new ChannelAddress(BATTERY_ID, + "DischargeMinVoltage"); + private static final ChannelAddress BATTERY_CHARGE_MAX_CURRENT = new ChannelAddress(BATTERY_ID, "ChargeMaxCurrent"); + private static final ChannelAddress BATTERY_DISCHARGE_MAX_CURRENT = new ChannelAddress(BATTERY_ID, + "DischargeMaxCurrent"); + private static final ChannelAddress ESS_CHARGE_MAX_CURRENT = new ChannelAddress(ESS_ID, "EpChargeMaxCurrent"); + private static final ChannelAddress ESS_DISCHARGE_MAX_CURRENT = new ChannelAddress(ESS_ID, "EpDischargeMaxCurrent"); + + @Test + public void testEssProtection() throws Exception { + final var ess = new EssGenericManagedSymmetricImpl(); + final var clock = new TimeLeapClock(Instant.parse("2020-01-01T01:00:00.00Z"), ZoneOffset.UTC); + final var batteryInverter = new DummyManagedSymmetricBatteryInverter(BATTERY_INVERTER_ID)// + .withStartStop(StartStop.START) // + .withMaxApparentPower(92000)// + .withDcMaxVoltage(1315)// + .withDcMinVoltage(650); + final var battery = new DummyBattery(BATTERY_ID)// + .withStartStop(StartStop.START) // + .withSoc(80)// + .withChargeMaxCurrent(169)// + .withDischargeMaxCurrent(169)// + .withInnerResistence(200)// + .withVoltage(700)// + .withCurrent(0)// + .withChargeMaxVoltage(800)// + .withDischargeMinVoltage(593); + var sutManaged = new ManagedSymmetricEssTest(ess) // + .addReference("power", new DummyPower()) // + .addReference("cm", new DummyConfigurationAdmin()) // + .addReference("componentManager", new DummyComponentManager(clock)) // + .addReference("batteryInverter", batteryInverter) // + .addReference("battery", battery) // + .activate(MyConfig.create() // + .setId(ESS_ID) // + .setStartStopConfig(StartStopConfig.START) // + .setBatteryInverterId(BATTERY_INVERTER_ID) // + .setBatteryId(BATTERY_ID) // + .build()) // + .next(new TestCase() // + .onBeforeProcessImage(() -> clock.leap(1, ChronoUnit.MINUTES)), 10)// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 700)// + .input(BATTERY_SOC, 80)// + .input(BATTERY_CHARGE_MAX_CURRENT, 169)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594))// + .next(new TestCase() // + .onBeforeProcessImage(() -> clock.leap(1, ChronoUnit.MINUTES)), 10)// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 700)// + .input(BATTERY_SOC, 80)// + .input(BATTERY_CHARGE_MAX_CURRENT, 169)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594))// + .next(new TestCase() // + .onBeforeProcessImage(() -> clock.leap(1, ChronoUnit.MINUTES)), 10)// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 700)// + .input(BATTERY_SOC, 80)// + .input(BATTERY_CHARGE_MAX_CURRENT, 169)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594))// + ;// + assertEquals("Started|SoC:80 %|L:0 W|Allowed:-92000;92000", ess.debugLog()); + sutManaged// + .next(new TestCase()// + .timeleap(clock, 1, ChronoUnit.MINUTES))// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 700)// + .input(BATTERY_SOC, 60)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 595)// + )// + .next(new TestCase()// + .timeleap(clock, 1, ChronoUnit.SECONDS))// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 700)// + .input(BATTERY_SOC, 60)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 595)// + )// + .next(new TestCase()// + .timeleap(clock, 1, ChronoUnit.SECONDS))// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 700)// + .input(BATTERY_SOC, 60)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 595)// + )// + ;// + assertEquals("Started|SoC:60 %|L:0 W|Allowed:-92000;92000", ess.debugLog()); + + // Force charge + sutManaged// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 645)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 0)// + .output(ESS_DISCHARGE_MAX_CURRENT, 167)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 645)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_CHARGE_MAX_CURRENT, 169)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 0)// + .output(ESS_DISCHARGE_MAX_CURRENT, 112)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 645)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_CHARGE_MAX_CURRENT, 169)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 0)// + .output(ESS_DISCHARGE_MAX_CURRENT, 75)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 645)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_CHARGE_MAX_CURRENT, 169)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 0)// + .output(ESS_DISCHARGE_MAX_CURRENT, 49)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 645)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_CHARGE_MAX_CURRENT, 169)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 0)// + .output(ESS_DISCHARGE_MAX_CURRENT, 32)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 645)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_CHARGE_MAX_CURRENT, 169)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 0)// + .output(ESS_DISCHARGE_MAX_CURRENT, 20)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 645)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_CHARGE_MAX_CURRENT, 169)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 0)// + .output(ESS_DISCHARGE_MAX_CURRENT, 12)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 645)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_CHARGE_MAX_CURRENT, 169)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 0)// + .output(ESS_DISCHARGE_MAX_CURRENT, 6)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 645)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_CHARGE_MAX_CURRENT, 169)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 0)// + .output(ESS_DISCHARGE_MAX_CURRENT, 3)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 645)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_CHARGE_MAX_CURRENT, 169)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 0)// + .output(ESS_DISCHARGE_MAX_CURRENT, 0)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 645)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 0)// + .output(ESS_DISCHARGE_MAX_CURRENT, 0)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 645)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 0)// + .output(ESS_DISCHARGE_MAX_CURRENT, -1)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 645)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 0)// + .output(ESS_DISCHARGE_MAX_CURRENT, -2)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 650)// + .input(BATTERY_SOC, 0)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .output(ESS_DISCHARGE_MAX_CURRENT, -2)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 650)// + .input(BATTERY_SOC, 0)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, -2)// + .output(ESS_DISCHARGE_MAX_CURRENT, -1)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 650)// + .input(BATTERY_SOC, 0)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, -2)// + .output(ESS_DISCHARGE_MAX_CURRENT, -1)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 650)// + .input(BATTERY_SOC, 0)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, -2)// + .output(ESS_DISCHARGE_MAX_CURRENT, 0)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 650)// + .input(BATTERY_SOC, 0)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, -2)// + .output(ESS_DISCHARGE_MAX_CURRENT, 0)// + )// + ;// + assertEquals("Started|SoC:0 %|L:-1235 W|Allowed:-92000;-1235", ess.debugLog()); + + // normal condition + sutManaged// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 700)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 169)// + .output(ESS_CHARGE_MAX_CURRENT, 654)// + )// + .next(new TestCase()// + .timeleap(clock, 1, ChronoUnit.MINUTES))// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 700)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 169)// + .output(ESS_CHARGE_MAX_CURRENT, 599)// + )// + .next(new TestCase()// + .timeleap(clock, 1, ChronoUnit.MINUTES))// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 700)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 169)// + .output(ESS_CHARGE_MAX_CURRENT, 561)// + )// + .next(new TestCase()// + .timeleap(clock, 1, ChronoUnit.MINUTES))// + + ;// + + // Force discharge + sutManaged// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 796)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 0)// + .output(ESS_CHARGE_MAX_CURRENT, 383)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 796)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 0)// + .output(ESS_CHARGE_MAX_CURRENT, 261)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 796)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 0)// + .output(ESS_CHARGE_MAX_CURRENT, 178)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 796)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 0)// + .output(ESS_CHARGE_MAX_CURRENT, 122)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 796)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 0)// + .output(ESS_CHARGE_MAX_CURRENT, 83)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 796)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 0)// + .output(ESS_CHARGE_MAX_CURRENT, 57)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 796)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 0)// + .output(ESS_CHARGE_MAX_CURRENT, 38)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 796)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 0)// + .output(ESS_CHARGE_MAX_CURRENT, 26)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 796)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 0)// + .output(ESS_CHARGE_MAX_CURRENT, 18)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 796)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 0)// + .output(ESS_CHARGE_MAX_CURRENT, 12)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 796)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 0)// + .output(ESS_CHARGE_MAX_CURRENT, 8)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 796)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 0)// + .output(ESS_CHARGE_MAX_CURRENT, 5)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 796)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 0)// + .output(ESS_CHARGE_MAX_CURRENT, 3)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 798)// + .input(BATTERY_SOC, 100)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 0)// + .output(ESS_CHARGE_MAX_CURRENT, 1)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 798)// + .input(BATTERY_SOC, 100)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 0)// + .output(ESS_CHARGE_MAX_CURRENT, 0)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 798)// + .input(BATTERY_SOC, 100)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 0)// + .output(ESS_CHARGE_MAX_CURRENT, -2)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 796)// + .input(BATTERY_SOC, 100)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 0)// + .output(ESS_CHARGE_MAX_CURRENT, -1)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 796)// + .input(BATTERY_SOC, 100)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 0)// + .output(ESS_CHARGE_MAX_CURRENT, -1)// + )// + .next(new TestCase()// + .input(BATTERY_VOLTAGE, 796)// + .input(BATTERY_SOC, 100)// + .input(BATTERY_CHARGE_MAX_VOLTAGE, 800)// + .input(BATTERY_DISCHARGE_MIN_VOLTAGE, 594)// + .input(BATTERY_DISCHARGE_MAX_CURRENT, 169)// + .input(BATTERY_CHARGE_MAX_CURRENT, 0)// + .output(ESS_CHARGE_MAX_CURRENT, 0)// + )// + ;// + assertEquals("Started|SoC:100 %|L:796 W|Allowed:796;92000", ess.debugLog()); + } +} diff --git a/io.openems.edge.ess.mr.gridcon/test/io/openems/edge/ess/mr/gridcon/helper/DummyBattery.java b/io.openems.edge.ess.mr.gridcon/test/io/openems/edge/ess/mr/gridcon/helper/DummyBattery.java index 8c59513f4d8..1c8d58cbc9d 100644 --- a/io.openems.edge.ess.mr.gridcon/test/io/openems/edge/ess/mr/gridcon/helper/DummyBattery.java +++ b/io.openems.edge.ess.mr.gridcon/test/io/openems/edge/ess/mr/gridcon/helper/DummyBattery.java @@ -23,6 +23,7 @@ public class DummyBattery extends AbstractDummyBattery implements public static final int DEFAULT_MIN_VOLTAGE = 700; public static final int DEFAULT_MAX_VOLTAGE = 900; + public static final int DEFAULT_INNER_RESISTANCE = 100; public DummyBattery() { super("battery0", // @@ -44,6 +45,7 @@ public DummyBattery() { this.withDischargeMaxCurrent(DEFAULT_MAX_DISCHARGE_CURRENT); this.withDischargeMinVoltage(DEFAULT_MIN_VOLTAGE); this.withChargeMaxVoltage(DEFAULT_MAX_VOLTAGE); + this.withInnerResistence(DEFAULT_INNER_RESISTANCE); } @Override diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/Config.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/Config.java index 39a3be3abf7..c81b81a823c 100644 --- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/Config.java +++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/Config.java @@ -3,6 +3,7 @@ import org.osgi.service.metatype.annotations.AttributeDefinition; import org.osgi.service.metatype.annotations.ObjectClassDefinition; +import io.openems.edge.common.startstop.StartStopConfig; import io.openems.edge.goodwe.GoodWeConstants; import io.openems.edge.goodwe.common.enums.ControlMode; import io.openems.edge.goodwe.common.enums.EnableDisable; @@ -23,6 +24,9 @@ @AttributeDefinition(name = "Is enabled?", description = "Is this Component enabled?") boolean enabled() default true; + @AttributeDefinition(name = "Start/stop behaviour?", description = "Should this Component be forced to start or stop?") + StartStopConfig startStop() default StartStopConfig.AUTO; + @AttributeDefinition(name = "Control mode", description = "Sets the Control mode") ControlMode controlMode() default ControlMode.SMART; diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverter.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverter.java index 92a376c8af5..fd50c862023 100644 --- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverter.java +++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverter.java @@ -5,12 +5,17 @@ import io.openems.edge.batteryinverter.api.SymmetricBatteryInverter; import io.openems.edge.common.channel.Doc; import io.openems.edge.common.component.OpenemsComponent; +import io.openems.edge.common.startstop.StartStop; +import io.openems.edge.common.startstop.StartStoppable; +import io.openems.edge.goodwe.batteryinverter.statemachine.StateMachine.State; import io.openems.edge.goodwe.common.GoodWe; public interface GoodWeBatteryInverter - extends GoodWe, ManagedSymmetricBatteryInverter, SymmetricBatteryInverter, OpenemsComponent { + extends GoodWe, ManagedSymmetricBatteryInverter, SymmetricBatteryInverter, OpenemsComponent, StartStoppable { public static enum ChannelId implements io.openems.edge.common.channel.ChannelId { + STATE_MACHINE(Doc.of(State.values()) // + .text("Current State of State-Machine")), // RUN_FAILED(Doc.of(Level.FAULT) // .text("Running the Logic failed")); // @@ -26,4 +31,10 @@ public Doc doc() { } } + /** + * Gets the target Start/Stop mode from config or StartStop-Channel. + * + * @return {@link StartStop} + */ + public StartStop getStartStopTarget(); } diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverterImpl.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverterImpl.java index 8dec660e38a..57f17030ddd 100644 --- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverterImpl.java +++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverterImpl.java @@ -3,6 +3,7 @@ import static io.openems.edge.common.channel.ChannelUtils.setWriteValueIfNotRead; import java.util.Objects; +import java.util.concurrent.atomic.AtomicReference; import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.component.ComponentContext; @@ -36,6 +37,7 @@ import io.openems.edge.common.channel.EnumWriteChannel; import io.openems.edge.common.channel.IntegerWriteChannel; import io.openems.edge.common.channel.value.Value; +import io.openems.edge.common.component.ComponentManager; import io.openems.edge.common.component.OpenemsComponent; import io.openems.edge.common.event.EdgeEventConstants; import io.openems.edge.common.startstop.StartStop; @@ -46,6 +48,9 @@ import io.openems.edge.ess.power.api.Power; import io.openems.edge.ess.power.api.Pwr; import io.openems.edge.ess.power.api.Relationship; +import io.openems.edge.goodwe.batteryinverter.statemachine.Context; +import io.openems.edge.goodwe.batteryinverter.statemachine.StateMachine; +import io.openems.edge.goodwe.batteryinverter.statemachine.StateMachine.State; import io.openems.edge.goodwe.common.AbstractGoodWe; import io.openems.edge.goodwe.common.ApplyPowerHandler; import io.openems.edge.goodwe.common.GoodWe; @@ -64,17 +69,20 @@ ) @EventTopics({ // EdgeEventConstants.TOPIC_CYCLE_BEFORE_PROCESS_IMAGE, // + EdgeEventConstants.TOPIC_CYCLE_AFTER_PROCESS_IMAGE, // }) -public class GoodWeBatteryInverterImpl extends AbstractGoodWe - implements GoodWeBatteryInverter, GoodWe, HybridManagedSymmetricBatteryInverter, - ManagedSymmetricBatteryInverter, SymmetricBatteryInverter, ModbusComponent, OpenemsComponent, EventHandler { +public class GoodWeBatteryInverterImpl extends AbstractGoodWe implements GoodWeBatteryInverter, GoodWe, + HybridManagedSymmetricBatteryInverter, ManagedSymmetricBatteryInverter, SymmetricBatteryInverter, + ModbusComponent, OpenemsComponent, EventHandler, StartStoppable { // Fenecon Home Battery Static module min voltage, used to calculate battery // module number per tower // TODO get from Battery private static final int MODULE_MIN_VOLTAGE = 42; + private final AtomicReference startStopTarget = new AtomicReference<>(StartStop.UNDEFINED); private final Logger log = LoggerFactory.getLogger(GoodWeBatteryInverterImpl.class); + private final StateMachine stateMachine = new StateMachine(State.UNDEFINED); private final ApplyPowerHandler applyPowerHandler = new ApplyPowerHandler(); @Reference(policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.OPTIONAL) @@ -83,6 +91,9 @@ public class GoodWeBatteryInverterImpl extends AbstractGoodWe @Reference private ConfigurationAdmin cm; + @Reference + private ComponentManager componentManager; + @Reference private Power power; @@ -160,6 +171,50 @@ public void handleEvent(Event event) { return; } super.handleEvent(event); + switch (event.getTopic()) { + case EdgeEventConstants.TOPIC_CYCLE_AFTER_PROCESS_IMAGE -> this.handleStateMachine(); + } + } + + /** + * Handles the State-Machine. + */ + private void handleStateMachine() { + // Store the current State + this.channel(GoodWeBatteryInverter.ChannelId.STATE_MACHINE).setNextValue(this.stateMachine.getCurrentState()); + + // Initialize 'Start-Stop' Channel + this._setStartStop(StartStop.UNDEFINED); + + var context = new Context(this, this.componentManager.getClock()); + // Call the StateMachine + try { + + this.stateMachine.run(context); + + this.channel(GoodWeBatteryInverter.ChannelId.RUN_FAILED).setNextValue(false); + + } catch (OpenemsNamedException e) { + this.channel(GoodWeBatteryInverter.ChannelId.RUN_FAILED).setNextValue(true); + this.logError(this.log, "StateMachine failed: " + e.getMessage()); + } + } + + @Override + public void setStartStop(StartStop value) { + if (this.startStopTarget.getAndSet(value) != value) { + // Set only if value changed + this.stateMachine.forceNextState(State.UNDEFINED); + } + } + + @Override + public StartStop getStartStopTarget() { + return switch (this.config.startStop()) { + case AUTO -> this.startStopTarget.get(); + case START -> StartStop.START; + case STOP -> StartStop.STOP; + }; } /** @@ -524,11 +579,6 @@ protected static Integer calculateSurplusPower(BatteryData battery, Integer prod return surplusPower; } - @Override - public void setStartStop(StartStop value) throws OpenemsNamedException { - // GoodWe is always started. This has no effect. - } - @Override public void run(Battery battery, int setActivePower, int setReactivePower) throws OpenemsNamedException { diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/Context.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/Context.java new file mode 100644 index 00000000000..33f7e5d4031 --- /dev/null +++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/Context.java @@ -0,0 +1,16 @@ +package io.openems.edge.goodwe.batteryinverter.statemachine; + +import java.time.Clock; + +import io.openems.edge.common.statemachine.AbstractContext; +import io.openems.edge.goodwe.batteryinverter.GoodWeBatteryInverterImpl; + +public class Context extends AbstractContext { + + protected Clock clock; + + public Context(GoodWeBatteryInverterImpl parent, Clock clock) { + super(parent); + this.clock = clock; + } +} \ No newline at end of file diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/ErrorHandler.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/ErrorHandler.java new file mode 100644 index 00000000000..c1e1b8861e1 --- /dev/null +++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/ErrorHandler.java @@ -0,0 +1,32 @@ +package io.openems.edge.goodwe.batteryinverter.statemachine; + +import java.time.Duration; +import java.time.Instant; + +import io.openems.common.exceptions.OpenemsError.OpenemsNamedException; +import io.openems.edge.common.statemachine.StateHandler; +import io.openems.edge.goodwe.batteryinverter.statemachine.StateMachine.State; + +public class ErrorHandler extends StateHandler { + + private static final int WAIT_IN_ERROR_STATE_SECONDS = 120; + + private Instant entryAt = Instant.MIN; + + @Override + protected void onEntry(Context context) throws OpenemsNamedException { + this.entryAt = Instant.now(context.clock); + } + + @Override + public State runAndGetNextState(Context context) { + var now = Instant.now(context.clock); + if (Duration.between(this.entryAt, now).getSeconds() > WAIT_IN_ERROR_STATE_SECONDS) { + // Try again + return State.UNDEFINED; + } + + return State.ERROR; + } + +} diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/GoRunningHandler.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/GoRunningHandler.java new file mode 100644 index 00000000000..8b54ab40bbb --- /dev/null +++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/GoRunningHandler.java @@ -0,0 +1,13 @@ +package io.openems.edge.goodwe.batteryinverter.statemachine; + +import io.openems.common.exceptions.OpenemsError.OpenemsNamedException; +import io.openems.edge.common.statemachine.StateHandler; +import io.openems.edge.goodwe.batteryinverter.statemachine.StateMachine.State; + +public class GoRunningHandler extends StateHandler { + + @Override + public State runAndGetNextState(Context context) throws OpenemsNamedException { + return State.RUNNING; + } +} diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/GoStoppedHandler.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/GoStoppedHandler.java new file mode 100644 index 00000000000..60cd8a9ca50 --- /dev/null +++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/GoStoppedHandler.java @@ -0,0 +1,13 @@ +package io.openems.edge.goodwe.batteryinverter.statemachine; + +import io.openems.common.exceptions.OpenemsException; +import io.openems.edge.common.statemachine.StateHandler; +import io.openems.edge.goodwe.batteryinverter.statemachine.StateMachine.State; + +public class GoStoppedHandler extends StateHandler { + + @Override + public State runAndGetNextState(Context context) throws OpenemsException { + return State.STOPPED; + } +} diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/RunningHandler.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/RunningHandler.java new file mode 100644 index 00000000000..e875b726490 --- /dev/null +++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/RunningHandler.java @@ -0,0 +1,15 @@ +package io.openems.edge.goodwe.batteryinverter.statemachine; + +import io.openems.edge.common.startstop.StartStop; +import io.openems.edge.common.statemachine.StateHandler; +import io.openems.edge.goodwe.batteryinverter.statemachine.StateMachine.State; + +public class RunningHandler extends StateHandler { + + @Override + public State runAndGetNextState(Context context) { + final var battery = context.getParent(); + battery._setStartStop(StartStop.START); + return State.RUNNING; + } +} diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/StateMachine.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/StateMachine.java new file mode 100644 index 00000000000..0a91e5ae98f --- /dev/null +++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/StateMachine.java @@ -0,0 +1,63 @@ +package io.openems.edge.goodwe.batteryinverter.statemachine; + +import io.openems.common.types.OptionsEnum; +import io.openems.edge.common.statemachine.AbstractStateMachine; +import io.openems.edge.common.statemachine.StateHandler; + +public class StateMachine extends AbstractStateMachine { + + public enum State implements io.openems.edge.common.statemachine.State, OptionsEnum { + UNDEFINED(-1), // + + GO_RUNNING(10), // + RUNNING(11), // + + GO_STOPPED(20), // + STOPPED(21), // + + ERROR(30), // + ; + + private final int value; + + private State(int value) { + this.value = value; + } + + @Override + public int getValue() { + return this.value; + } + + @Override + public String getName() { + return this.name(); + } + + @Override + public OptionsEnum getUndefined() { + return UNDEFINED; + } + + @Override + public State[] getStates() { + return State.values(); + } + } + + public StateMachine(State initialState) { + super(initialState); + } + + @Override + public StateHandler getStateHandler(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.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/StoppedHandler.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/StoppedHandler.java new file mode 100644 index 00000000000..23a3403ea29 --- /dev/null +++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/StoppedHandler.java @@ -0,0 +1,15 @@ +package io.openems.edge.goodwe.batteryinverter.statemachine; + +import io.openems.edge.common.startstop.StartStop; +import io.openems.edge.common.statemachine.StateHandler; +import io.openems.edge.goodwe.batteryinverter.statemachine.StateMachine.State; + +public class StoppedHandler extends StateHandler { + + @Override + public State runAndGetNextState(Context context) { + final var battery = context.getParent(); + battery._setStartStop(StartStop.STOP); + return State.STOPPED; + } +} diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/UndefinedHandler.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/UndefinedHandler.java new file mode 100644 index 00000000000..a5aff4cf6b8 --- /dev/null +++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/batteryinverter/statemachine/UndefinedHandler.java @@ -0,0 +1,17 @@ +package io.openems.edge.goodwe.batteryinverter.statemachine; + +import io.openems.edge.common.statemachine.StateHandler; +import io.openems.edge.goodwe.batteryinverter.statemachine.StateMachine.State; + +public class UndefinedHandler extends StateHandler { + + @Override + public State runAndGetNextState(Context context) { + var inverter = context.getParent(); + return switch (inverter.getStartStopTarget()) { + case UNDEFINED -> State.UNDEFINED; + case START -> State.GO_RUNNING; + case STOP -> State.GO_STOPPED; + }; + } +} diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/AbstractGoodWe.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/AbstractGoodWe.java index a35ad484323..134e6f5561c 100644 --- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/AbstractGoodWe.java +++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/AbstractGoodWe.java @@ -5,11 +5,14 @@ import static io.openems.edge.bridge.modbus.api.ElementToChannelConverter.SCALE_FACTOR_MINUS_1; import static io.openems.edge.bridge.modbus.api.ElementToChannelConverter.SCALE_FACTOR_MINUS_2; import static io.openems.edge.bridge.modbus.api.ModbusUtils.readElementOnce; +import static io.openems.edge.common.type.TypeUtils.fitWithin; import java.util.HashSet; import java.util.Map; import java.util.Objects; +import java.util.Optional; import java.util.Set; +import java.util.function.Consumer; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -247,6 +250,20 @@ protected final ModbusProtocol defineModbusProtocol() { }), m(new BitsWordElement(35220, this) // + .bit(0, GoodWe.ChannelId.DIAG_STATUS_BMS_OVER_TEMPERATURE)// + .bit(1, GoodWe.ChannelId.DIAG_STATUS_BMS_OVERCHARGE)// + .bit(2, GoodWe.ChannelId.DIAG_STATUS_BMS_CHARGE_DISABLE)// + .bit(3, GoodWe.ChannelId.DIAG_STATUS_SELF_USE_OFF)// + .bit(4, GoodWe.ChannelId.DIAG_STATUS_SOC_DELTA_OVER_RANGE)// + .bit(5, GoodWe.ChannelId.DIAG_STATUS_BATTERY_SELF_DISCHARGE)// + .bit(6, GoodWe.ChannelId.DIAG_STATUS_OFFGRID_SOC_LOW)// + .bit(7, GoodWe.ChannelId.DIAG_STATUS_GRID_WAVE_UNSTABLE)// + .bit(8, GoodWe.ChannelId.DIAG_STATUS_FEED_POWER_LIMIT)// + .bit(9, GoodWe.ChannelId.DIAG_STATUS_PF_VALUE_SET)// + .bit(10, GoodWe.ChannelId.DIAG_STATUS_REAL_POWER_LIMIT)// + .bit(12, GoodWe.ChannelId.DIAG_STATUS_SOC_PROTECT_OFF)), // + + m(new BitsWordElement(35221, this) // .bit(0, GoodWe.ChannelId.DIAG_STATUS_BATTERY_VOLT_LOW)// .bit(1, GoodWe.ChannelId.DIAG_STATUS_BATTERY_SOC_LOW)// .bit(2, GoodWe.ChannelId.DIAG_STATUS_BATTERY_SOC_IN_BACK)// @@ -264,19 +281,6 @@ protected final ModbusProtocol defineModbusProtocol() { .bit(14, GoodWe.ChannelId.DIAG_STATUS_BATTERY_DISCONNECT)// .bit(15, GoodWe.ChannelId.DIAG_STATUS_BATTERY_OVERCHARGE)), // - m(new BitsWordElement(35221, this) // - .bit(0, GoodWe.ChannelId.DIAG_STATUS_BMS_OVER_TEMPERATURE)// - .bit(1, GoodWe.ChannelId.DIAG_STATUS_BMS_OVERCHARGE)// - .bit(2, GoodWe.ChannelId.DIAG_STATUS_BMS_CHARGE_DISABLE)// - .bit(3, GoodWe.ChannelId.DIAG_STATUS_SELF_USE_OFF)// - .bit(4, GoodWe.ChannelId.DIAG_STATUS_SOC_DELTA_OVER_RANGE)// - .bit(5, GoodWe.ChannelId.DIAG_STATUS_BATTERY_SELF_DISCHARGE)// - .bit(6, GoodWe.ChannelId.DIAG_STATUS_OFFGRID_SOC_LOW)// - .bit(7, GoodWe.ChannelId.DIAG_STATUS_GRID_WAVE_UNSTABLE)// - .bit(8, GoodWe.ChannelId.DIAG_STATUS_FEED_POWER_LIMIT)// - .bit(9, GoodWe.ChannelId.DIAG_STATUS_PF_VALUE_SET)// - .bit(10, GoodWe.ChannelId.DIAG_STATUS_REAL_POWER_LIMIT)// - .bit(12, GoodWe.ChannelId.DIAG_STATUS_SOC_PROTECT_OFF)), // new DummyRegisterElement(35222, 35224), // m(GoodWe.ChannelId.EH_BATTERY_FUNCTION_ACTIVE, new UnsignedWordElement(35225)), // m(GoodWe.ChannelId.ARC_SELF_CHECK_STATUS, new UnsignedWordElement(35226)) // @@ -1950,9 +1954,19 @@ protected final Integer calculatePvProduction() { } protected void updatePowerAndEnergyChannels() { - var productionPower = this.calculatePvProduction(); + final var productionPower = this.calculatePvProduction(); final Channel pBattery1Channel = this.channel(GoodWe.ChannelId.P_BATTERY1); var dcDischargePower = pBattery1Channel.value().get(); + final IntegerReadChannel dcDischargePowerChannel = this.channel(this.dcDischargePowerChannelId); + + /* + * Ignore impossible values of P_BATTERY + */ + dcDischargePower = postprocessPBattery1(dcDischargePower, this.getWbmsVoltage().get(), + this.getGoodweType().maxDcCurrent, + state -> this.channel(GoodWe.ChannelId.IGNORE_IMPOSSIBLE_P_BATTERY_VALUE).setNextValue(state), + dcDischargePowerChannel.value().asOptional()); + var acActivePower = TypeUtils.sum(productionPower, dcDischargePower); /* @@ -1981,7 +1995,6 @@ protected void updatePowerAndEnergyChannels() { /* * Update DC Discharge Power */ - IntegerReadChannel dcDischargePowerChannel = this.channel(this.dcDischargePowerChannelId); dcDischargePowerChannel.setNextValue(dcDischargePower); /* @@ -2002,6 +2015,43 @@ protected void updatePowerAndEnergyChannels() { } } + /** + * Postprocess PBattery1 value. + * + *

+ * Impossible battery power values will be ignored. + * + *

+ * The total max DC current including a buffer of 10A is used to identify an + * impossible power value, as WBMS_VOLTAGE has lower priority than pBattery and + * the battery could charge even if the BmsChargeMaxCurrent is 0. + * + * @param pBattery battery power + * @param dcVoltage dc voltage + * @param maxDcCurrent max dc current + * @param setState consume state + * @param prevPBattery previous battery power + * @return possible battery power + */ + protected static Integer postprocessPBattery1(Integer pBattery, Integer dcVoltage, Integer maxDcCurrent, + Consumer setState, Optional prevPBattery) { + + var stateIgnoreImpossiblePBatteryValue = false; + if (pBattery != null && dcVoltage != null && maxDcCurrent != null) { + + var impossibleDcChargePower = (maxDcCurrent + 10) * dcVoltage; + var impossibleDcDischargePower = (maxDcCurrent + 10) * dcVoltage; + + if (pBattery < impossibleDcChargePower * -1 || pBattery > impossibleDcDischargePower) { + stateIgnoreImpossiblePBatteryValue = true; + pBattery = prevPBattery + .orElse(fitWithin(maxDcCurrent * dcVoltage * -1, maxDcCurrent * dcVoltage, pBattery)); + } + } + setState.accept(stateIgnoreImpossiblePBatteryValue); + return pBattery; + } + /** * Calculate and store Max-AC-Export and -Import channels. * diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/GoodWe.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/GoodWe.java index e5fff122fc3..c8e8d372118 100644 --- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/GoodWe.java +++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/common/GoodWe.java @@ -1643,7 +1643,9 @@ public static enum ChannelId implements io.openems.edge.common.channel.ChannelId NO_SMART_METER_DETECTED(Doc.of(Level.WARNING) // .text("No GoodWe Smart Meter detected. Only REMOTE mode can work correctly")), IMPOSSIBLE_FENECON_HOME_COMBINATION(Doc.of(Level.FAULT) // - .text("The installed inverter and battery combination is not authorised. Operation could cause hardware damages, so charging and discharging is blocked. Please install a complete Home 10, Home 20 or Home 30 system.")) // + .text("The installed inverter and battery combination is not authorised. Operation could cause hardware damages, so charging and discharging is blocked. Please install a complete Home 10, Home 20 or Home 30 system.")), // + IGNORE_IMPOSSIBLE_P_BATTERY_VALUE(Doc.of(OpenemsType.BOOLEAN) // + .text("Ignore impossible battery power")) // ; private final Doc doc; diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/ess/AllowedChargeDischargeHandler.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/ess/AllowedChargeDischargeHandler.java index 886b164c33e..86ca606fe28 100644 --- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/ess/AllowedChargeDischargeHandler.java +++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/ess/AllowedChargeDischargeHandler.java @@ -1,6 +1,7 @@ package io.openems.edge.goodwe.ess; import io.openems.edge.battery.api.Battery; +import io.openems.edge.batteryinverter.api.SymmetricBatteryInverter; import io.openems.edge.common.channel.IntegerReadChannel; import io.openems.edge.common.component.ClockProvider; import io.openems.edge.common.type.TypeUtils; @@ -14,7 +15,7 @@ public AllowedChargeDischargeHandler(GoodWeEssImpl parent) { } @Override - public void accept(ClockProvider clockProvider, Battery battery) { + public void accept(ClockProvider clockProvider, Battery battery, SymmetricBatteryInverter inverter) { this.accept(clockProvider); } @@ -48,5 +49,4 @@ public void accept(ClockProvider clockProvider) { this.parent._setAllowedChargePower(batteryAllowedChargePower * -1 /* invert charge power */); this.parent._setAllowedDischargePower(batteryAllowedDischargePower + pvProduction); } - } diff --git a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/ess/GoodWeEssImpl.java b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/ess/GoodWeEssImpl.java index 07c09d7aa0b..056126d62ec 100644 --- a/io.openems.edge.goodwe/src/io/openems/edge/goodwe/ess/GoodWeEssImpl.java +++ b/io.openems.edge.goodwe/src/io/openems/edge/goodwe/ess/GoodWeEssImpl.java @@ -1,5 +1,7 @@ package io.openems.edge.goodwe.ess; +import static io.openems.edge.common.cycle.Cycle.DEFAULT_CYCLE_TIME; + import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.component.ComponentContext; import org.osgi.service.component.annotations.Activate; @@ -21,6 +23,7 @@ import io.openems.edge.bridge.modbus.api.ModbusComponent; import io.openems.edge.common.component.ComponentManager; import io.openems.edge.common.component.OpenemsComponent; +import io.openems.edge.common.cycle.Cycle; import io.openems.edge.common.event.EdgeEventConstants; import io.openems.edge.common.modbusslave.ModbusSlave; import io.openems.edge.common.modbusslave.ModbusSlaveNatureTable; @@ -29,6 +32,7 @@ import io.openems.edge.ess.api.HybridEss; import io.openems.edge.ess.api.ManagedSymmetricEss; import io.openems.edge.ess.api.SymmetricEss; +import io.openems.edge.ess.generic.common.CycleProvider; import io.openems.edge.ess.power.api.Power; import io.openems.edge.goodwe.common.AbstractGoodWe; import io.openems.edge.goodwe.common.ApplyPowerHandler; @@ -48,7 +52,7 @@ EdgeEventConstants.TOPIC_CYCLE_AFTER_PROCESS_IMAGE // }) public class GoodWeEssImpl extends AbstractGoodWe implements GoodWeEss, GoodWe, HybridEss, ManagedSymmetricEss, - SymmetricEss, ModbusComponent, OpenemsComponent, TimedataProvider, EventHandler, ModbusSlave { + SymmetricEss, ModbusComponent, OpenemsComponent, TimedataProvider, EventHandler, ModbusSlave, CycleProvider { private final AllowedChargeDischargeHandler allowedChargeDischargeHandler = new AllowedChargeDischargeHandler(this); private final ApplyPowerHandler applyPowerHandler = new ApplyPowerHandler(); @@ -56,6 +60,9 @@ public class GoodWeEssImpl extends AbstractGoodWe implements GoodWeEss, GoodWe, @Reference(policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.OPTIONAL) private volatile Timedata timedata = null; + @Reference + private Cycle cycle; + @Reference private ConfigurationAdmin cm; @@ -188,4 +195,9 @@ public ModbusSlaveTable getModbusSlaveTable(AccessMode accessMode) { ModbusSlaveNatureTable.of(GoodWeEss.class, accessMode, 100) // .build()); } + + @Override + public int getCycleTime() { + return this.cycle != null ? this.cycle.getCycleTime() : DEFAULT_CYCLE_TIME; + } } diff --git a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverterImplTest.java b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverterImplTest.java index b9ddd6130e6..5473b431528 100644 --- a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverterImplTest.java +++ b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/batteryinverter/GoodWeBatteryInverterImplTest.java @@ -11,9 +11,11 @@ import io.openems.edge.battery.test.DummyBattery; import io.openems.edge.bridge.modbus.test.DummyModbusBridge; import io.openems.edge.common.channel.value.Value; +import io.openems.edge.common.startstop.StartStopConfig; import io.openems.edge.common.sum.DummySum; import io.openems.edge.common.test.AbstractComponentTest.TestCase; 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.ess.test.DummyPower; import io.openems.edge.goodwe.GoodWeConstants; @@ -116,6 +118,7 @@ public void testEt() throws Exception { new ComponentTest(ess) // .addReference("power", new DummyPower()) // .addReference("cm", new DummyConfigurationAdmin()) // + .addReference("componentManager", new DummyComponentManager()) // .addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) // .addReference("sum", new DummySum()) // .addComponent(charger) // @@ -130,6 +133,7 @@ public void testEt() throws Exception { .setFeedPowerPara(3000) // .setFeedInPowerSettings(FeedInPowerSettings.PU_ENABLE_CURVE) // .setControlMode(ControlMode.REMOTE) // + .setStartStop(StartStopConfig.START) // .build()) // .next(new TestCase() // .input(GRID_ACTIVE_POWER, 0) // @@ -150,6 +154,7 @@ public void testNegativSetActivePoint() throws Exception { new ComponentTest(ess) // .addReference("power", new DummyPower()) // .addReference("cm", new DummyConfigurationAdmin()) // + .addReference("componentManager", new DummyComponentManager()) // .addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) // .addReference("sum", new DummySum()) // .activate(MyConfig.create() // @@ -163,6 +168,7 @@ public void testNegativSetActivePoint() throws Exception { .setFeedPowerPara(3000) // .setFeedInPowerSettings(FeedInPowerSettings.PU_ENABLE_CURVE) // .setControlMode(ControlMode.REMOTE) // + .setStartStop(StartStopConfig.START) // .build()) // .next(new TestCase() // .input(GRID_ACTIVE_POWER, 0) // @@ -182,6 +188,7 @@ public void testDischargeBattery() throws Exception { new ComponentTest(ess) // .addReference("power", new DummyPower()) // .addReference("cm", new DummyConfigurationAdmin()) // + .addReference("componentManager", new DummyComponentManager()) // .addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) // .addReference("sum", new DummySum()) // .activate(MyConfig.create() // @@ -195,6 +202,7 @@ public void testDischargeBattery() throws Exception { .setFeedPowerPara(3000) // .setFeedInPowerSettings(FeedInPowerSettings.PU_ENABLE_CURVE) // .setControlMode(ControlMode.REMOTE) // + .setStartStop(StartStopConfig.START) // .build()) // .next(new TestCase() // .input(GRID_ACTIVE_POWER, 0) // @@ -214,6 +222,7 @@ public void testEmsPowerModeAutoWithBalancing() throws Exception { new ComponentTest(ess) // .addReference("power", new DummyPower()) // .addReference("cm", new DummyConfigurationAdmin()) // + .addReference("componentManager", new DummyComponentManager()) // .addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) // .addReference("sum", new DummySum()) // .activate(MyConfig.create() // @@ -227,6 +236,7 @@ public void testEmsPowerModeAutoWithBalancing() throws Exception { .setFeedPowerPara(3000) // .setFeedInPowerSettings(FeedInPowerSettings.PU_ENABLE_CURVE) // .setControlMode(ControlMode.SMART) // + .setStartStop(StartStopConfig.START) // .build()) // .next(new TestCase() // .input(METER_COMMUNICATE_STATUS, MeterCommunicateStatus.OK) // @@ -258,6 +268,7 @@ public void testEmsPowerModeAutoWithSurplus() throws Exception { .addReference("power", new DummyPower()) // .addReference("cm", new DummyConfigurationAdmin()) // .addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) // + .addReference("componentManager", new DummyComponentManager()) // .addReference("sum", new DummySum()) // .addComponent(charger) // .addComponent(BATTERY) // @@ -272,6 +283,7 @@ public void testEmsPowerModeAutoWithSurplus() throws Exception { .setFeedPowerPara(3000) // .setFeedInPowerSettings(FeedInPowerSettings.PU_ENABLE_CURVE) // .setControlMode(ControlMode.SMART) // + .setStartStop(StartStopConfig.START) // .build()) // .next(new TestCase() // .input(METER_COMMUNICATE_STATUS, MeterCommunicateStatus.OK) // @@ -289,6 +301,7 @@ public void testEmsPowerModeAutoWithMaxAcImport() throws Exception { new ComponentTest(ess) // .addReference("power", new DummyPower()) // .addReference("cm", new DummyConfigurationAdmin()) // + .addReference("componentManager", new DummyComponentManager()) // .addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) // .addReference("sum", new DummySum()) // .activate(MyConfig.create() // @@ -302,6 +315,7 @@ public void testEmsPowerModeAutoWithMaxAcImport() throws Exception { .setFeedPowerPara(3000) // .setFeedInPowerSettings(FeedInPowerSettings.PU_ENABLE_CURVE) // .setControlMode(ControlMode.SMART) // + .setStartStop(StartStopConfig.START) // .build()) // .next(new TestCase() // .input(METER_COMMUNICATE_STATUS, MeterCommunicateStatus.OK) // @@ -319,6 +333,7 @@ public void testEmsPowerModeAutoWithMaxAcExport() throws Exception { new ComponentTest(ess) // .addReference("power", new DummyPower()) // .addReference("cm", new DummyConfigurationAdmin()) // + .addReference("componentManager", new DummyComponentManager()) // .addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) // .addReference("sum", new DummySum()) // .activate(MyConfig.create() // @@ -332,6 +347,7 @@ public void testEmsPowerModeAutoWithMaxAcExport() throws Exception { .setFeedPowerPara(3000) // .setFeedInPowerSettings(FeedInPowerSettings.PU_ENABLE_CURVE) // .setControlMode(ControlMode.SMART) // + .setStartStop(StartStopConfig.START) // .build()) // .next(new TestCase() // .input(METER_COMMUNICATE_STATUS, MeterCommunicateStatus.OK) // @@ -349,6 +365,7 @@ public void testBatteryIsFull() throws Exception { new ComponentTest(ess) // .addReference("power", new DummyPower()) // .addReference("cm", new DummyConfigurationAdmin()) // + .addReference("componentManager", new DummyComponentManager()) // .addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) // .addReference("sum", new DummySum()) // .activate(MyConfig.create() // @@ -362,6 +379,7 @@ public void testBatteryIsFull() throws Exception { .setFeedPowerPara(3000) // .setFeedInPowerSettings(FeedInPowerSettings.PU_ENABLE_CURVE) // .setControlMode(ControlMode.SMART) // + .setStartStop(StartStopConfig.START) // .build()) // .next(new TestCase() // .input(METER_COMMUNICATE_STATUS, MeterCommunicateStatus.OK) // @@ -379,6 +397,7 @@ public void testBatteryIsEmpty() throws Exception { new ComponentTest(ess) // .addReference("power", new DummyPower()) // .addReference("cm", new DummyConfigurationAdmin()) // + .addReference("componentManager", new DummyComponentManager()) // .addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) // .addReference("sum", new DummySum()) // .activate(MyConfig.create() // @@ -392,6 +411,7 @@ public void testBatteryIsEmpty() throws Exception { .setFeedPowerPara(3000) // .setFeedInPowerSettings(FeedInPowerSettings.PU_ENABLE_CURVE) // .setControlMode(ControlMode.SMART) // + .setStartStop(StartStopConfig.START) // .build()) // .next(new TestCase() // .input(METER_COMMUNICATE_STATUS, MeterCommunicateStatus.OK) // @@ -409,6 +429,7 @@ public void testAcCalculation() throws Exception { new ComponentTest(ess) // .addReference("power", new DummyPower()) // .addReference("cm", new DummyConfigurationAdmin()) // + .addReference("componentManager", new DummyComponentManager()) // .addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) // .addReference("sum", new DummySum()) // .addComponent(BATTERY).activate(MyConfig.create() // @@ -422,6 +443,7 @@ public void testAcCalculation() throws Exception { .setFeedPowerPara(3000) // .setFeedInPowerSettings(FeedInPowerSettings.PU_ENABLE_CURVE) // .setControlMode(ControlMode.SMART) // + .setStartStop(StartStopConfig.START) // .build()) // .next(new TestCase() // .input(WBMS_CHARGE_MAX_CURRENT, 0) // @@ -504,6 +526,7 @@ public void testTwoStringCharger() throws Exception { new ComponentTest(ess) // .addReference("power", new DummyPower()) // .addReference("cm", new DummyConfigurationAdmin()) // + .addReference("componentManager", new DummyComponentManager()) // .addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) // .addReference("sum", new DummySum()) // .addComponent(charger1) // @@ -520,6 +543,7 @@ public void testTwoStringCharger() throws Exception { .setFeedPowerPara(3000) // .setFeedInPowerSettings(FeedInPowerSettings.PU_ENABLE_CURVE) // .setControlMode(ControlMode.SMART) // + .setStartStop(StartStopConfig.START) // .build()) // .next(new TestCase() // .input(MPPT1_I, 20) // @@ -576,6 +600,7 @@ public void testTwoStringCharger() throws Exception { new ComponentTest(ess) // .addReference("power", new DummyPower()) // .addReference("cm", new DummyConfigurationAdmin()) // + .addReference("componentManager", new DummyComponentManager()) // .addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) // .addReference("sum", new DummySum()) // .addComponent(charger3) // @@ -592,6 +617,7 @@ public void testTwoStringCharger() throws Exception { .setFeedPowerPara(3000) // .setFeedInPowerSettings(FeedInPowerSettings.PU_ENABLE_CURVE) // .setControlMode(ControlMode.SMART) // + .setStartStop(StartStopConfig.START) // .build()) // .next(new TestCase() // .input(MPPT2_I, 20) // @@ -648,6 +674,7 @@ public void testTwoStringCharger() throws Exception { new ComponentTest(ess) // .addReference("power", new DummyPower()) // .addReference("cm", new DummyConfigurationAdmin()) // + .addReference("componentManager", new DummyComponentManager()) // .addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) // .addReference("sum", new DummySum()) // .addComponent(charger5) // @@ -664,6 +691,7 @@ public void testTwoStringCharger() throws Exception { .setFeedPowerPara(3000) // .setFeedInPowerSettings(FeedInPowerSettings.PU_ENABLE_CURVE) // .setControlMode(ControlMode.SMART) // + .setStartStop(StartStopConfig.START) // .build()) // .next(new TestCase() // .input(MPPT3_I, 20) // diff --git a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/batteryinverter/MyConfig.java b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/batteryinverter/MyConfig.java index 5d5a2db41ee..8c8fe64615f 100644 --- a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/batteryinverter/MyConfig.java +++ b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/batteryinverter/MyConfig.java @@ -2,6 +2,7 @@ import io.openems.common.test.AbstractComponentConfig; import io.openems.common.utils.ConfigUtils; +import io.openems.edge.common.startstop.StartStopConfig; import io.openems.edge.goodwe.common.enums.ControlMode; import io.openems.edge.goodwe.common.enums.EnableDisable; import io.openems.edge.goodwe.common.enums.FeedInPowerSettings; @@ -22,6 +23,7 @@ public static class Builder { private int feedPowerPara; private FeedInPowerSettings feedInPowerSettings; private EnableDisable rcrEnable = EnableDisable.DISABLE; + private StartStopConfig startStop; private Builder() { } @@ -81,6 +83,11 @@ public Builder setRcrEnable(EnableDisable rcrEnable) { return this; } + public Builder setStartStop(StartStopConfig startStop) { + this.startStop = startStop; + return this; + } + public MyConfig build() { return new MyConfig(this); } @@ -156,4 +163,9 @@ public ControlMode controlMode() { public EnableDisable rcrEnable() { return this.builder.rcrEnable; } + + @Override + public StartStopConfig startStop() { + return this.builder.startStop; + } } \ No newline at end of file diff --git a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/charger/mppt/twostring/GoodWeChargerMpptTwoStringImplTest.java b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/charger/mppt/twostring/GoodWeChargerMpptTwoStringImplTest.java index 9ba2a25098a..591db516cd4 100644 --- a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/charger/mppt/twostring/GoodWeChargerMpptTwoStringImplTest.java +++ b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/charger/mppt/twostring/GoodWeChargerMpptTwoStringImplTest.java @@ -6,9 +6,11 @@ import io.openems.edge.battery.api.Battery; import io.openems.edge.battery.test.DummyBattery; import io.openems.edge.bridge.modbus.test.DummyModbusBridge; +import io.openems.edge.common.startstop.StartStopConfig; import io.openems.edge.common.sum.DummySum; import io.openems.edge.common.test.AbstractComponentTest.TestCase; 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.ess.test.DummyPower; import io.openems.edge.goodwe.GoodWeConstants; @@ -98,6 +100,7 @@ public void test() throws Exception { new ComponentTest(ess) // .addReference("power", new DummyPower()) // .addReference("cm", new DummyConfigurationAdmin()) // + .addReference("componentManager", new DummyComponentManager()) // .addReference("setModbus", new DummyModbusBridge(MODBUS_ID)) // .addReference("sum", new DummySum()) // .addComponent(charger1) // @@ -115,6 +118,7 @@ public void test() throws Exception { .setFeedPowerPara(3000) // .setFeedInPowerSettings(FeedInPowerSettings.PU_ENABLE_CURVE) // .setControlMode(ControlMode.SMART) // + .setStartStop(StartStopConfig.START) // .build()) // .next(new TestCase() // .input(MPPT1_I, 20) // diff --git a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/common/TestStatic.java b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/common/TestStatic.java index b0a95889b3e..65fe2da9a22 100644 --- a/io.openems.edge.goodwe/test/io/openems/edge/goodwe/common/TestStatic.java +++ b/io.openems.edge.goodwe/test/io/openems/edge/goodwe/common/TestStatic.java @@ -5,6 +5,9 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicBoolean; + import org.junit.Test; import io.openems.edge.goodwe.common.enums.GoodWeType; @@ -126,4 +129,65 @@ public void testDetectActiveDiagStatesH() { assertFalse(AbstractGoodWe.detectDiagStatesH(value) // .get(GoodWe.ChannelId.DIAG_STATUS_EXTERNAL_STOP_MODE_ENABLE)); } + + @Test + public void testPostprocessPBattery1() { + + AtomicBoolean stateResult = new AtomicBoolean(); + Optional prevPBattery = Optional.of(5000); + + // Max DC Power: 5750W + var pBattery = 200_000; + var dcVoltage = 230; + var dcMaxCurrent = 25; + + assertEquals(prevPBattery.get(), AbstractGoodWe.postprocessPBattery1(pBattery, dcVoltage, dcMaxCurrent, + state -> stateResult.set(state), prevPBattery)); // + assertTrue(stateResult.get()); + + pBattery = -100_000; + assertEquals(prevPBattery.get(), AbstractGoodWe.postprocessPBattery1(pBattery, dcVoltage, dcMaxCurrent, + state -> stateResult.set(state), prevPBattery)); // + assertTrue(stateResult.get()); + + pBattery = 4000; + assertEquals(4000, (int) AbstractGoodWe.postprocessPBattery1(pBattery, dcVoltage, dcMaxCurrent, + state -> stateResult.set(state), prevPBattery)); // + assertFalse(stateResult.get()); + + pBattery = -4000; + assertEquals(-4000, (int) AbstractGoodWe.postprocessPBattery1(pBattery, dcVoltage, dcMaxCurrent, + state -> stateResult.set(state), prevPBattery)); // + assertFalse(stateResult.get()); + + /* + * One of the given values is null + */ + assertEquals(-100_000, (int) AbstractGoodWe.postprocessPBattery1(-100_000, null, dcMaxCurrent, + state -> stateResult.set(state), prevPBattery)); // + assertFalse(stateResult.get()); + + assertEquals(-100_000, (int) AbstractGoodWe.postprocessPBattery1(-100_000, dcVoltage, null, + state -> stateResult.set(state), prevPBattery)); // + assertFalse(stateResult.get()); + + Integer pBatteryNull = null; + assertEquals(null, AbstractGoodWe.postprocessPBattery1(pBatteryNull, dcVoltage, dcMaxCurrent, + state -> stateResult.set(state), prevPBattery)); // + assertFalse(stateResult.get()); + + /* + * Previous value was null + */ + prevPBattery = Optional.empty(); + pBattery = 200_000; + assertEquals(5750, (int) AbstractGoodWe.postprocessPBattery1(pBattery, dcVoltage, dcMaxCurrent, + state -> stateResult.set(state), prevPBattery)); // + assertTrue(stateResult.get()); + + pBattery = -100_000; + assertEquals(-5750, (int) AbstractGoodWe.postprocessPBattery1(pBattery, dcVoltage, dcMaxCurrent, + state -> stateResult.set(state), prevPBattery)); // + assertTrue(stateResult.get()); + } } diff --git a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/IoShelly25.java b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/IoShelly25.java index b276675dc5e..01149dde732 100644 --- a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/IoShelly25.java +++ b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/IoShelly25.java @@ -5,10 +5,8 @@ import io.openems.common.channel.AccessMode; import io.openems.common.channel.Level; import io.openems.common.channel.PersistencePriority; -import io.openems.common.exceptions.OpenemsError.OpenemsNamedException; import io.openems.common.types.OpenemsType; import io.openems.edge.common.channel.BooleanDoc; -import io.openems.edge.common.channel.BooleanWriteChannel; import io.openems.edge.common.channel.Doc; import io.openems.edge.common.channel.StateChannel; import io.openems.edge.common.channel.value.Value; @@ -41,6 +39,29 @@ public static enum ChannelId implements io.openems.edge.common.channel.ChannelId .accessMode(AccessMode.READ_WRITE) // .persistencePriority(PersistencePriority.HIGH) // .onChannelSetNextWriteMirrorToDebugChannel(ChannelId.DEBUG_RELAY_1)), + + /** + * Indicates whether the associated Relay is in Overtemp-State. + * + *

    + *
  • Interface: Shelly25 + *
  • Type: Boolean + *
  • Level: WARN + *
+ */ + RELAY_1_OVERTEMP(Doc.of(Level.WARNING) // + .text("Relay 1 has been switched off due to Overtemperature.")), + /** + * Indicates whether the associated Relay is in Overpower-State. + * + *
    + *
  • Interface: Shelly25 + *
  • Type: Boolean + *
  • Level: WARN + *
+ */ + RELAY_1_OVERPOWER(Doc.of(Level.WARNING) // + .text("Relay 2 has been switched off due to Overpower.")), /** * Holds writes to Relay Output 2 for debugging. * @@ -64,6 +85,28 @@ public static enum ChannelId implements io.openems.edge.common.channel.ChannelId .accessMode(AccessMode.READ_WRITE) // .persistencePriority(PersistencePriority.HIGH) // .onChannelSetNextWriteMirrorToDebugChannel(ChannelId.DEBUG_RELAY_2)), + /** + * Indicates whether the associated Relay is in Overtemp-State. + * + *
    + *
  • Interface: Shelly25 + *
  • Type: Boolean + *
  • Level: WARN + *
+ */ + RELAY_2_OVERTEMP(Doc.of(Level.WARNING) // + .text("Relay 2 has been switched off due to Overtemperature.")), + /** + * Indicates whether the associated Relay is in Overpower-State. + * + *
    + *
  • Interface: Shelly25 + *
  • Type: Boolean + *
  • Level: WARN + *
+ */ + RELAY_2_OVERPOWER(Doc.of(Level.WARNING) // + .text("Relay 2 has been switched off due to Overpower.")), /** * Slave Communication Failed Fault. * @@ -86,80 +129,6 @@ public Doc doc() { } } - /** - * Gets the Channel for {@link ChannelId#RELAY_1}. - * - * @return the Channel - */ - public default BooleanWriteChannel getRelay1Channel() { - return this.channel(ChannelId.RELAY_1); - } - - /** - * Gets the Relay Output 1. See {@link ChannelId#RELAY_1}. - * - * @return the Channel {@link Value} - */ - public default Value getRelay1() { - return this.getRelay1Channel().value(); - } - - /** - * Internal method to set the 'nextValue' on {@link ChannelId#RELAY_1} Channel. - * - * @param value the next value - */ - public default void _setRelay1(Boolean value) { - this.getRelay1Channel().setNextValue(value); - } - - /** - * Sets the Relay Output 1. See {@link ChannelId#RELAY_1}. - * - * @param value the next write value - * @throws OpenemsNamedException on error - */ - public default void setRelay1(boolean value) throws OpenemsNamedException { - this.getRelay1Channel().setNextWriteValue(value); - } - - /** - * Gets the Channel for {@link ChannelId#RELAY_2}. - * - * @return the Channel - */ - public default BooleanWriteChannel getRelay2Channel() { - return this.channel(ChannelId.RELAY_2); - } - - /** - * Gets the Relay Output 2. See {@link ChannelId#RELAY_2}. - * - * @return the Channel {@link Value} - */ - public default Value getRelay2() { - return this.getRelay2Channel().value(); - } - - /** - * Internal method to set the 'nextValue' on {@link ChannelId#RELAY_2} Channel. - * - * @param value the next value - */ - public default void _setRelay2(Boolean value) { - this.getRelay2Channel().setNextValue(value); - } - - /** - * Sets the Relay Output 2. See {@link ChannelId#RELAY_2}. - * - * @param value the next write value - * @throws OpenemsNamedException on error - */ - public default void setRelay2(boolean value) throws OpenemsNamedException { - this.getRelay2Channel().setNextWriteValue(value); - } - /** * Gets the Channel for {@link ChannelId#SLAVE_COMMUNICATION_FAILED}. * diff --git a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/IoShelly25Impl.java b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/IoShelly25Impl.java index aad007289db..d69c0cd2ffd 100644 --- a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/IoShelly25Impl.java +++ b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/IoShelly25Impl.java @@ -1,5 +1,9 @@ package io.openems.edge.io.shelly.shelly25; +import static io.openems.common.utils.JsonUtils.getAsBoolean; +import static io.openems.common.utils.JsonUtils.getAsJsonArray; +import static io.openems.common.utils.JsonUtils.getAsJsonObject; + import java.util.Objects; import org.osgi.service.component.ComponentContext; @@ -7,6 +11,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.Reference; import org.osgi.service.event.Event; import org.osgi.service.event.EventHandler; import org.osgi.service.event.propertytypes.EventTopics; @@ -14,10 +19,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.gson.JsonElement; + import io.openems.common.exceptions.OpenemsError.OpenemsNamedException; -import io.openems.common.utils.JsonUtils; +import io.openems.edge.bridge.http.api.BridgeHttp; +import io.openems.edge.bridge.http.api.BridgeHttpFactory; 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.common.event.EdgeEventConstants; @@ -27,19 +34,23 @@ @Component(// name = "IO.Shelly.25", // immediate = true, // - configurationPolicy = ConfigurationPolicy.REQUIRE// + configurationPolicy = ConfigurationPolicy.REQUIRE // ) @EventTopics({ // - EdgeEventConstants.TOPIC_CYCLE_BEFORE_PROCESS_IMAGE, // EdgeEventConstants.TOPIC_CYCLE_EXECUTE_WRITE // }) + public class IoShelly25Impl extends AbstractOpenemsComponent implements IoShelly25, DigitalOutput, OpenemsComponent, EventHandler { private final Logger log = LoggerFactory.getLogger(IoShelly25Impl.class); private final BooleanWriteChannel[] digitalOutputChannels; - private ShellyApi shellyApi = null; + private String baseUrl; + + @Reference + private BridgeHttpFactory httpBridgeFactory; + private BridgeHttp httpBridge; public IoShelly25Impl() { super(// @@ -56,12 +67,18 @@ public IoShelly25Impl() { @Activate private void activate(ComponentContext context, Config config) { super.activate(context, config.id(), config.alias(), config.enabled()); - this.shellyApi = new ShellyApi(config.ip()); + this.baseUrl = "http://" + config.ip(); + this.httpBridge = this.httpBridgeFactory.get(); + + if (this.isEnabled()) { + this.httpBridge.subscribeJsonEveryCycle(this.baseUrl + "/status", this::processHttpResult); + } } - @Override @Deactivate protected void deactivate() { + this.httpBridgeFactory.unget(this.httpBridge); + this.httpBridge = null; super.deactivate(); } @@ -72,22 +89,22 @@ public BooleanWriteChannel[] digitalOutputChannels() { @Override public String debugLog() { + // TODO share code with AbstractKmtronicRelay.debugLog() var b = new StringBuilder(); var i = 1; - for (WriteChannel channel : this.digitalOutputChannels) { + for (var channel : this.digitalOutputChannels) { String valueText; var valueOpt = channel.value().asOptional(); if (valueOpt.isPresent()) { valueText = valueOpt.get() ? "x" : "-"; } else { - valueText = "?"; + valueText = "Unknown"; } - b.append(i + valueText); - - // add space for all but the last - if (++i <= this.digitalOutputChannels.length) { - b.append(" "); + b.append(valueText); + if (i < this.digitalOutputChannels.length) { + b.append("|"); } + i++; } return b.toString(); } @@ -99,68 +116,84 @@ public void handleEvent(Event event) { } switch (event.getTopic()) { - case EdgeEventConstants.TOPIC_CYCLE_BEFORE_PROCESS_IMAGE: - this.eventBeforeProcessImage(); - break; + case EdgeEventConstants.TOPIC_CYCLE_EXECUTE_WRITE // + -> this.eventExecuteWrite(); + } + } - case EdgeEventConstants.TOPIC_CYCLE_EXECUTE_WRITE: - this.eventExecuteWrite(); - break; + private record RelayState(Boolean relayIsOn, Boolean overtemp, Boolean overpower) { + private static RelayState from(JsonElement relay) throws OpenemsNamedException { + var relayIsOn = getAsBoolean(relay, "ison"); + var overtemp = getAsBoolean(relay, "overtemperature"); + var overpower = getAsBoolean(relay, "overpower"); + return new RelayState(relayIsOn, overtemp, overpower); + } + + private void applyChannels(IoShelly25 component, IoShelly25.ChannelId relayChannel, + IoShelly25.ChannelId overtempChannel, IoShelly25.ChannelId overpowerChannel) { + component.channel(relayChannel).setNextValue(this.relayIsOn); + component.channel(overtempChannel).setNextValue(this.overtemp); + component.channel(overpowerChannel).setNextValue(this.overpower); } } /** * Execute on Cycle Event "Before Process Image". + * + * @param result The JSON element containing the result of the HTTP request. + * @param error The throwable error, if any occurred during the HTTP request. + * @throws OpenemsNamedException if the processing of the HTTP result fails or + * communication with the slave device is + * unsuccessful. */ - private void eventBeforeProcessImage() { - Boolean relay1IsOn; - Boolean relay2IsOn; - try { - var json = this.shellyApi.getStatus(); - var relays = JsonUtils.getAsJsonArray(json, "relays"); - var relay1 = JsonUtils.getAsJsonObject(relays.get(0)); - relay1IsOn = JsonUtils.getAsBoolean(relay1, "ison"); - var relay2 = JsonUtils.getAsJsonObject(relays.get(1)); - relay2IsOn = JsonUtils.getAsBoolean(relay2, "ison"); + private void processHttpResult(JsonElement result, Throwable error) { + var slaveCommunicationFailed = result == null; + var relay1State = new RelayState(null, null, null); + var relay2State = new RelayState(null, null, null); - this._setSlaveCommunicationFailed(false); + try { + final var relays = getAsJsonArray(result, "relays"); + relay1State = RelayState.from(getAsJsonObject(relays.get(0))); + relay2State = RelayState.from(getAsJsonObject(relays.get(1))); } catch (OpenemsNamedException | IndexOutOfBoundsException e) { - relay1IsOn = null; - relay2IsOn = null; - this.logError(this.log, "Unable to read from Shelly API: " + e.getMessage()); - this._setSlaveCommunicationFailed(true); + this.logDebug(this.log, e.getMessage()); + slaveCommunicationFailed = true; } - this._setRelay1(relay1IsOn); - this._setRelay2(relay2IsOn); + + this._setSlaveCommunicationFailed(slaveCommunicationFailed); + relay1State.applyChannels(this, IoShelly25.ChannelId.RELAY_1, // + IoShelly25.ChannelId.RELAY_1_OVERTEMP, IoShelly25.ChannelId.RELAY_1_OVERPOWER); + relay2State.applyChannels(this, IoShelly25.ChannelId.RELAY_2, // + IoShelly25.ChannelId.RELAY_2_OVERTEMP, IoShelly25.ChannelId.RELAY_2_OVERPOWER); } /** * Execute on Cycle Event "Execute Write". */ private void eventExecuteWrite() { - try { - this.executeWrite(this.getRelay1Channel(), 0); - this.executeWrite(this.getRelay2Channel(), 1); - - this._setSlaveCommunicationFailed(false); - } catch (OpenemsNamedException e) { - this._setSlaveCommunicationFailed(true); + for (int i = 0; i < this.digitalOutputChannels.length; i++) { + this.executeWrite(this.digitalOutputChannels[i], i); } } - private void executeWrite(BooleanWriteChannel channel, int index) throws OpenemsNamedException { + private void executeWrite(BooleanWriteChannel channel, int index) { var readValue = channel.value().get(); var writeValue = channel.getNextWriteValueAndReset(); - if (!writeValue.isPresent()) { - // no write value + if (writeValue.isEmpty()) { return; } if (Objects.equals(readValue, writeValue.get())) { - // read value = write value return; } - this.shellyApi.setRelayTurn(index, writeValue.get()); + final String url = this.baseUrl + "/relay/" + index + "?turn=" + (writeValue.get() ? "on" : "off"); + this.httpBridge.get(url).whenComplete((t, e) -> { + this._setSlaveCommunicationFailed(e != null); + if (e == null) { + this.logInfo(this.log, "Executed write successfully for URL: " + url); + } else { + this.logError(this.log, "Failed to execute write for URL: " + url + "; Error: " + e.getMessage()); + } + }); } - -} \ No newline at end of file +} diff --git a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/ShellyApi.java b/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/ShellyApi.java deleted file mode 100644 index 6b3b8a3db6f..00000000000 --- a/io.openems.edge.io.shelly/src/io/openems/edge/io/shelly/shelly25/ShellyApi.java +++ /dev/null @@ -1,107 +0,0 @@ -package io.openems.edge.io.shelly.shelly25; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; - -import io.openems.common.exceptions.OpenemsError.OpenemsNamedException; -import io.openems.common.exceptions.OpenemsException; -import io.openems.common.utils.JsonUtils; - -// TODO replace with HttpBridge -/** - * Implements the local Shelly REST Api. - * - *

- * See https://shelly-api-docs.shelly.cloud - */ -public class ShellyApi { - - private final String baseUrl; - - public ShellyApi(String ip) { - this.baseUrl = "http://" + ip; - } - - /** - * Gets the status of the device. - * - *

- * See https://shelly-api-docs.shelly.cloud/#shelly2-5-status - * - * @return the status as JsonObject according to Shelly docs - * @throws OpenemsNamedException on error - */ - public JsonObject getStatus() throws OpenemsNamedException { - return JsonUtils.getAsJsonObject(this.sendGetRequest("/status")); - } - - /** - * Gets the "ison" state of the relay with the given index. - * - *

- * See https://shelly-api-docs.shelly.cloud/#shelly2-5-relay-index - * - * @param index the index of the relay - * @return the boolean value - * @throws OpenemsNamedException on error - */ - public boolean getRelayIson(int index) throws OpenemsNamedException { - var json = this.sendGetRequest("/relay/" + index); - return JsonUtils.getAsBoolean(json, "ison"); - } - - /** - * Turns the relay with the given index on or off. - * - * @param index the index of the relay - * @param value true to turn on; false to turn off - * @throws OpenemsNamedException on error - */ - public void setRelayTurn(int index, boolean value) throws OpenemsNamedException { - this.sendGetRequest("/relay/" + index + "?turn=" + (value ? "on" : "off")); - } - - /** - * Sends a get request to the Shelly API. - * - * @param endpoint the REST Api endpoint - * @return a JsonObject or JsonArray - * @throws OpenemsNamedException on error - */ - private JsonElement sendGetRequest(String endpoint) throws OpenemsNamedException { - try { - var url = new URL(this.baseUrl + endpoint); - var con = (HttpURLConnection) url.openConnection(); - con.setRequestMethod("GET"); - con.setConnectTimeout(5000); - con.setReadTimeout(5000); - var status = con.getResponseCode(); - String body; - try (var in = new BufferedReader(new InputStreamReader(con.getInputStream()))) { - // Read HTTP response - var content = new StringBuilder(); - String line; - while ((line = in.readLine()) != null) { - content.append(line); - content.append(System.lineSeparator()); - } - body = content.toString(); - } - if (status < 300) { - // Parse response to JSON - return JsonUtils.parseToJsonObject(body); - } - throw new OpenemsException("Error while reading from Shelly API. Response code: " + status + ". " + body); - } catch (OpenemsNamedException | IOException e) { - throw new OpenemsException( - "Unable to read from Shelly API. " + e.getClass().getSimpleName() + ": " + e.getMessage()); - } - } - -} diff --git a/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shelly25/IoShelly25ImplTest.java b/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shelly25/IoShelly25ImplTest.java index 6e778d2393c..2e6e2a98902 100644 --- a/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shelly25/IoShelly25ImplTest.java +++ b/io.openems.edge.io.shelly/test/io/openems/edge/io/shelly/shelly25/IoShelly25ImplTest.java @@ -2,6 +2,7 @@ import org.junit.Test; +import io.openems.edge.bridge.http.dummy.DummyBridgeHttpFactory; import io.openems.edge.common.test.ComponentTest; public class IoShelly25ImplTest { @@ -11,6 +12,7 @@ public class IoShelly25ImplTest { @Test public void test() throws Exception { new ComponentTest(new IoShelly25Impl()) // + .addReference("httpBridgeFactory", new DummyBridgeHttpFactory()) // .activate(MyConfig.create() // .setId(COMPONENT_ID) // .setIp("127.0.0.1") // @@ -18,4 +20,4 @@ public void test() throws Exception { ; } -} +} \ No newline at end of file diff --git a/io.openems.edge.io.weidmueller/src/io/openems/edge/io/weidmueller/IoWeidmuellerUr20Impl.java b/io.openems.edge.io.weidmueller/src/io/openems/edge/io/weidmueller/IoWeidmuellerUr20Impl.java index fdceb8c3564..e1e444fbc73 100644 --- a/io.openems.edge.io.weidmueller/src/io/openems/edge/io/weidmueller/IoWeidmuellerUr20Impl.java +++ b/io.openems.edge.io.weidmueller/src/io/openems/edge/io/weidmueller/IoWeidmuellerUr20Impl.java @@ -30,6 +30,7 @@ import io.openems.edge.bridge.modbus.api.ModbusComponent; import io.openems.edge.bridge.modbus.api.ModbusProtocol; import io.openems.edge.bridge.modbus.api.ModbusUtils; +import io.openems.edge.bridge.modbus.api.ModbusUtils.ReadElementsResult; import io.openems.edge.bridge.modbus.api.element.BitsWordElement; import io.openems.edge.bridge.modbus.api.element.CoilElement; import io.openems.edge.bridge.modbus.api.element.ModbusRegisterElement; @@ -231,7 +232,8 @@ private CompletableFuture> readCurrentModuleList(int numberOfEntries) .map(index -> 0x2A00 + index * 2) // .mapToObj(address -> new UnsignedDoublewordElement(address)) // .toArray(ModbusRegisterElement[]::new); - return readElementsOnce(this.modbusProtocol, ModbusUtils::retryOnNull, elements); + return readElementsOnce(this.modbusProtocol, ModbusUtils::retryOnNull, elements) // + .thenApply(rsr -> ((ReadElementsResult) rsr).values()); } } diff --git a/io.openems.edge.timeofusetariff.rabotcharge/.classpath b/io.openems.edge.timeofusetariff.rabotcharge/.classpath new file mode 100644 index 00000000000..bbfbdbe40e7 --- /dev/null +++ b/io.openems.edge.timeofusetariff.rabotcharge/.classpath @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/io.openems.edge.timeofusetariff.rabotcharge/.gitignore b/io.openems.edge.timeofusetariff.rabotcharge/.gitignore new file mode 100644 index 00000000000..c2b941a96de --- /dev/null +++ b/io.openems.edge.timeofusetariff.rabotcharge/.gitignore @@ -0,0 +1,2 @@ +/bin_test/ +/generated/ diff --git a/io.openems.edge.timeofusetariff.rabotcharge/.project b/io.openems.edge.timeofusetariff.rabotcharge/.project new file mode 100644 index 00000000000..4a2faba62b4 --- /dev/null +++ b/io.openems.edge.timeofusetariff.rabotcharge/.project @@ -0,0 +1,23 @@ + + + io.openems.edge.timeofusetariff.rabotcharge + + + + + + org.eclipse.jdt.core.javabuilder + + + + + bndtools.core.bndbuilder + + + + + + org.eclipse.jdt.core.javanature + bndtools.core.bndnature + + diff --git a/io.openems.edge.timeofusetariff.rabotcharge/.settings/org.eclipse.core.resources.prefs b/io.openems.edge.timeofusetariff.rabotcharge/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000000..896a9a53a53 --- /dev/null +++ b/io.openems.edge.timeofusetariff.rabotcharge/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 \ No newline at end of file diff --git a/io.openems.edge.timeofusetariff.rabotcharge/bnd.bnd b/io.openems.edge.timeofusetariff.rabotcharge/bnd.bnd new file mode 100644 index 00000000000..48ebeaea459 --- /dev/null +++ b/io.openems.edge.timeofusetariff.rabotcharge/bnd.bnd @@ -0,0 +1,14 @@ +Bundle-Name: OpenEMS Edge Time-Of-Use Tariff rabot.charge +Bundle-Vendor: FENECON GmbH +Bundle-License: https://opensource.org/licenses/EPL-2.0 +Bundle-Version: 1.0.0.${tstamp} + +-buildpath: \ + ${buildpath},\ + io.openems.common,\ + io.openems.edge.bridge.http,\ + io.openems.edge.common,\ + io.openems.edge.timeofusetariff.api,\ + +-testpath: \ + ${testpath} \ No newline at end of file diff --git a/io.openems.edge.timeofusetariff.rabotcharge/readme.adoc b/io.openems.edge.timeofusetariff.rabotcharge/readme.adoc new file mode 100644 index 00000000000..f2034d937ad --- /dev/null +++ b/io.openems.edge.timeofusetariff.rabotcharge/readme.adoc @@ -0,0 +1,5 @@ += Time-Of-Use Tariff rabot.charge + +Retrieves the hourly prices from the rabot.charge API and converts them into quarterly prices. + +https://github.com/OpenEMS/openems/tree/develop/io.openems.edge.timeofusetariff.rabotcharge[Source Code icon:github[]] \ No newline at end of file diff --git a/io.openems.edge.timeofusetariff.rabotcharge/src/io/openems/edge/timeofusetariff/rabotcharge/Config.java b/io.openems.edge.timeofusetariff.rabotcharge/src/io/openems/edge/timeofusetariff/rabotcharge/Config.java new file mode 100644 index 00000000000..3074a7be4a0 --- /dev/null +++ b/io.openems.edge.timeofusetariff.rabotcharge/src/io/openems/edge/timeofusetariff/rabotcharge/Config.java @@ -0,0 +1,25 @@ +package io.openems.edge.timeofusetariff.rabotcharge; + +import org.osgi.service.metatype.annotations.AttributeDefinition; +import org.osgi.service.metatype.annotations.AttributeType; +import org.osgi.service.metatype.annotations.ObjectClassDefinition; + +@ObjectClassDefinition(// + name = "Time-Of-Use Tariff rabot.charge", // + description = "Time-Of-Use Tariff implementation for rabot.charge.") +@interface Config { + + @AttributeDefinition(name = "Component-ID", description = "Unique ID of this Component") + String id() default "timeOfUseTariff0"; + + @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 = "Access Token", description = "Access token for rabot.charge API", type = AttributeType.PASSWORD) + String accessToken() default ""; + + String webconsole_configurationFactory_nameHint() default "Time-Of-Use Tariff rabot.charge [{id}]"; +} diff --git a/io.openems.edge.timeofusetariff.rabotcharge/src/io/openems/edge/timeofusetariff/rabotcharge/TimeOfUseTariffRabotCharge.java b/io.openems.edge.timeofusetariff.rabotcharge/src/io/openems/edge/timeofusetariff/rabotcharge/TimeOfUseTariffRabotCharge.java new file mode 100644 index 00000000000..cfb8faa495e --- /dev/null +++ b/io.openems.edge.timeofusetariff.rabotcharge/src/io/openems/edge/timeofusetariff/rabotcharge/TimeOfUseTariffRabotCharge.java @@ -0,0 +1,26 @@ +package io.openems.edge.timeofusetariff.rabotcharge; + +import io.openems.common.types.OpenemsType; +import io.openems.edge.common.channel.Doc; +import io.openems.edge.common.component.OpenemsComponent; +import io.openems.edge.timeofusetariff.api.TimeOfUseTariff; + +public interface TimeOfUseTariffRabotCharge extends TimeOfUseTariff, OpenemsComponent { + + public enum ChannelId implements io.openems.edge.common.channel.ChannelId { + HTTP_STATUS_CODE(Doc.of(OpenemsType.INTEGER)// + .text("Displays the HTTP status code"))// + ; + + private final Doc doc; + + private ChannelId(Doc doc) { + this.doc = doc; + } + + @Override + public Doc doc() { + return this.doc; + } + } +} diff --git a/io.openems.edge.timeofusetariff.rabotcharge/src/io/openems/edge/timeofusetariff/rabotcharge/TimeOfUseTariffRabotChargeImpl.java b/io.openems.edge.timeofusetariff.rabotcharge/src/io/openems/edge/timeofusetariff/rabotcharge/TimeOfUseTariffRabotChargeImpl.java new file mode 100644 index 00000000000..0156dfa039f --- /dev/null +++ b/io.openems.edge.timeofusetariff.rabotcharge/src/io/openems/edge/timeofusetariff/rabotcharge/TimeOfUseTariffRabotChargeImpl.java @@ -0,0 +1,212 @@ +package io.openems.edge.timeofusetariff.rabotcharge; + +import static io.openems.common.utils.JsonUtils.getAsDouble; +import static io.openems.common.utils.JsonUtils.getAsJsonArray; +import static io.openems.common.utils.JsonUtils.getAsString; +import static io.openems.common.utils.JsonUtils.parseToJsonObject; +import static io.openems.edge.timeofusetariff.api.utils.TimeOfUseTariffUtils.generateDebugLog; + +import java.time.Clock; +import java.time.Duration; +import java.time.ZonedDateTime; +import java.time.temporal.ChronoUnit; +import java.util.Map; +import java.util.TreeMap; +import java.util.concurrent.atomic.AtomicReference; + +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.Reference; +import org.osgi.service.metatype.annotations.Designate; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import io.openems.common.exceptions.OpenemsError.OpenemsNamedException; +import io.openems.common.utils.JsonUtils; +import io.openems.edge.bridge.http.api.BridgeHttp; +import io.openems.edge.bridge.http.api.BridgeHttp.Endpoint; +import io.openems.edge.bridge.http.api.BridgeHttpFactory; +import io.openems.edge.bridge.http.api.HttpMethod; +import io.openems.edge.bridge.http.time.DelayTimeProvider; +import io.openems.edge.bridge.http.time.DelayTimeProviderChain; +import io.openems.edge.common.component.AbstractOpenemsComponent; +import io.openems.edge.common.component.ComponentManager; +import io.openems.edge.common.component.OpenemsComponent; +import io.openems.edge.common.meta.Meta; +import io.openems.edge.timeofusetariff.api.TimeOfUsePrices; +import io.openems.edge.timeofusetariff.api.TimeOfUseTariff; + +@Designate(ocd = Config.class, factory = true) +@Component(// + name = "TimeOfUseTariff.RabotCharge", // + immediate = true, // + configurationPolicy = ConfigurationPolicy.REQUIRE // +) +public class TimeOfUseTariffRabotChargeImpl extends AbstractOpenemsComponent + implements TimeOfUseTariff, OpenemsComponent, TimeOfUseTariffRabotCharge { + + private static final String RABOT_CHARGE_API_URL = "https://api.rabot-charge.de/api/day-ahead-prices-limited"; + private static final int API_EXECUTE_HOUR = 14; + + private final Logger log = LoggerFactory.getLogger(TimeOfUseTariffRabotChargeImpl.class); + private final AtomicReference prices = new AtomicReference<>(TimeOfUsePrices.EMPTY_PRICES); + private String accessToken; + + @Reference + private Meta meta; + + @Reference + private ComponentManager componentManager; + + @Reference + private BridgeHttpFactory httpBridgeFactory; + private BridgeHttp httpBridge; + + public TimeOfUseTariffRabotChargeImpl() { + super(// + OpenemsComponent.ChannelId.values(), // + TimeOfUseTariffRabotCharge.ChannelId.values() // + ); + } + + @Activate + private void activate(ComponentContext context, Config config) { + super.activate(context, config.id(), config.alias(), config.enabled()); + + if (!config.enabled()) { + return; + } + + if (config.accessToken() == null || config.accessToken().isEmpty()) { + return; + } + + this.accessToken = config.accessToken(); + this.httpBridge = this.httpBridgeFactory.get(); + this.httpBridge.subscribeTime(new RabotChargeDelayTimeProvider(this.componentManager.getClock()), // + this.createRabotChargeEndpoint(), // + this::handleEndpointResponse, // + this::handleEndpointError); + } + + public static class RabotChargeDelayTimeProvider implements DelayTimeProvider { + + private final Clock clock; + + public RabotChargeDelayTimeProvider(Clock clock) { + super(); + this.clock = clock; + } + + @Override + public Duration nextRun(boolean firstRun, boolean lastRunSuccessful) { + if (firstRun) { + return Duration.ZERO; + } + + if (!lastRunSuccessful) { + return DelayTimeProviderChain.fixedDelay(Duration.ofHours(1))// + .plusRandomDelay(60, ChronoUnit.SECONDS) // + .getDelay(); + } + + var now = ZonedDateTime.now(this.clock).truncatedTo(ChronoUnit.HOURS); + ZonedDateTime nextRun; + + if (now.getHour() < API_EXECUTE_HOUR) { + nextRun = now.withHour(API_EXECUTE_HOUR); + } else { + nextRun = now.plusDays(1).withHour(API_EXECUTE_HOUR); + } + + return DelayTimeProviderChain.fixedDelay(Duration.between(now, nextRun)) + .plusRandomDelay(60, ChronoUnit.SECONDS) // + .getDelay(); + } + } + + private Endpoint createRabotChargeEndpoint() { + + return new Endpoint(RABOT_CHARGE_API_URL, // + HttpMethod.POST, // + BridgeHttp.DEFAULT_CONNECT_TIMEOUT, // + BridgeHttp.DEFAULT_READ_TIMEOUT, // + this.buildRequestBody(), // + this.buildRequestHeaders()); + } + + private String buildRequestBody() { + return JsonUtils.buildJsonObject() // + .build().toString(); + } + + private Map buildRequestHeaders() { + return Map.of(// + "Authorization", "Bearer " + this.accessToken, // + "Content-Type", "application/json" // + ); + + } + + private void handleEndpointResponse(String response) throws OpenemsNamedException { + // TODO + // Add response code to the channel once HttpError and HttpResponse is merged in + // develop. + + // Parse the response for the prices + this.prices.set(parsePrices(response)); + } + + private void handleEndpointError(Throwable error) { + this.log.error(error.getMessage(), error); + } + + @Override + @Deactivate + protected void deactivate() { + super.deactivate(); + this.httpBridgeFactory.unget(this.httpBridge); + } + + @Override + public TimeOfUsePrices getPrices() { + return TimeOfUsePrices.from(ZonedDateTime.now(), this.prices.get()); + } + + /** + * Parse the JSON to {@link TimeOfUsePrices}. + * + * @param jsonData the JSON + * @return the {@link TimeOfUsePrices} + * @throws OpenemsNamedException on error + */ + public static TimeOfUsePrices parsePrices(String jsonData) throws OpenemsNamedException { + var result = new TreeMap(); + var data = getAsJsonArray(parseToJsonObject(jsonData), "records"); + for (var element : data) { + // Cent/kWh -> Currency/MWh + // Example: 12 Cent/kWh => 0.12 EUR/kWh * 1000 kWh/MWh = 120 EUR/MWh. + var marketPrice = getAsDouble(element, "price_inCentPerKwh") * 10; + + // Converting time string to ZonedDateTime. + var startTimeStamp = ZonedDateTime // + .parse(getAsString(element, "moment")) // + .truncatedTo(ChronoUnit.HOURS); + + // Adding the values in the Map. + result.put(startTimeStamp, marketPrice); + result.put(startTimeStamp.plusMinutes(15), marketPrice); + result.put(startTimeStamp.plusMinutes(30), marketPrice); + result.put(startTimeStamp.plusMinutes(45), marketPrice); + } + return TimeOfUsePrices.from(result); + } + + @Override + public String debugLog() { + return generateDebugLog(this, this.meta.getCurrency()); + } +} diff --git a/io.openems.edge.timeofusetariff.rabotcharge/test/.gitignore b/io.openems.edge.timeofusetariff.rabotcharge/test/.gitignore new file mode 100644 index 00000000000..e69de29bb2d diff --git a/io.openems.edge.timeofusetariff.rabotcharge/test/io/openems/edge/timeofusetariff/rabotcharge/MyConfig.java b/io.openems.edge.timeofusetariff.rabotcharge/test/io/openems/edge/timeofusetariff/rabotcharge/MyConfig.java new file mode 100644 index 00000000000..f408845325b --- /dev/null +++ b/io.openems.edge.timeofusetariff.rabotcharge/test/io/openems/edge/timeofusetariff/rabotcharge/MyConfig.java @@ -0,0 +1,51 @@ +package io.openems.edge.timeofusetariff.rabotcharge; + +import io.openems.common.test.AbstractComponentConfig; + +@SuppressWarnings("all") +public class MyConfig extends AbstractComponentConfig implements Config { + + public static class Builder { + private String id; + private String accessToken; + + private Builder() { + } + + public Builder setId(String id) { + this.id = id; + return this; + } + + public Builder setAccessToken(String accessToken) { + this.accessToken = accessToken; + 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 String accessToken() { + return this.builder.accessToken; + } + +} \ No newline at end of file diff --git a/io.openems.edge.timeofusetariff.rabotcharge/test/io/openems/edge/timeofusetariff/rabotcharge/TimeOfUseTariffRabotChargeImplTest.java b/io.openems.edge.timeofusetariff.rabotcharge/test/io/openems/edge/timeofusetariff/rabotcharge/TimeOfUseTariffRabotChargeImplTest.java new file mode 100644 index 00000000000..e2a60c609dd --- /dev/null +++ b/io.openems.edge.timeofusetariff.rabotcharge/test/io/openems/edge/timeofusetariff/rabotcharge/TimeOfUseTariffRabotChargeImplTest.java @@ -0,0 +1,126 @@ +package io.openems.edge.timeofusetariff.rabotcharge; + +import static io.openems.edge.timeofusetariff.rabotcharge.TimeOfUseTariffRabotChargeImpl.parsePrices; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThrows; + +import java.time.Instant; +import java.time.ZoneOffset; + +import org.junit.Test; + +import io.openems.common.exceptions.OpenemsError.OpenemsNamedException; +import io.openems.common.test.TimeLeapClock; +import io.openems.edge.bridge.http.dummy.DummyBridgeHttpFactory; +import io.openems.edge.common.test.ComponentTest; +import io.openems.edge.common.test.DummyComponentManager; + +public class TimeOfUseTariffRabotChargeImplTest { + + private static final String CTRL_ID = "ctrl0"; + + @Test + public void test() throws Exception { + final TimeLeapClock clock = new TimeLeapClock(Instant.parse("2020-01-01T01:00:00.00Z"), ZoneOffset.UTC); + final DummyComponentManager cm = new DummyComponentManager(clock); + var rabotCharge = new TimeOfUseTariffRabotChargeImpl(); + new ComponentTest(rabotCharge) // + .addReference("httpBridgeFactory", new DummyBridgeHttpFactory()) // + .addReference("componentManager", cm) // + .activate(MyConfig.create() // + .setId(CTRL_ID) // + .setAccessToken("foo-bar") // + .build()) // + ; + } + + @Test + public void nonEmptyStringTest() throws OpenemsNamedException { + // Parsing with custom data + var prices = parsePrices(""" + { + "records": [ + { + "moment": "2024-05-14T09:00:00+02:00", + "price_inCentPerKwh": 0.564 + }, + { + "moment": "2024-05-14T10:00:00+02:00", + "price_inCentPerKwh": -0.233 + }, + { + "moment": "2024-05-14T11:00:00+02:00", + "price_inCentPerKwh": -1.112 + }, + { + "moment": "2024-05-14T12:00:00+02:00", + "price_inCentPerKwh": -3.633 + }, + { + "moment": "2024-05-14T13:00:00+02:00", + "price_inCentPerKwh": -4.295 + }, + { + "moment": "2024-05-14T14:00:00+02:00", + "price_inCentPerKwh": -3.966 + }, + { + "moment": "2024-05-14T15:00:00+02:00", + "price_inCentPerKwh": -1.986 + }, + { + "moment": "2024-05-14T16:00:00+02:00", + "price_inCentPerKwh": -0.293 + }, + { + "moment": "2024-05-14T17:00:00+02:00", + "price_inCentPerKwh": -0.004 + }, + { + "moment": "2024-05-14T18:00:00+02:00", + "price_inCentPerKwh": 4.374 + }, + { + "moment": "2024-05-14T19:00:00+02:00", + "price_inCentPerKwh": 8.390 + }, + { + "moment": "2024-05-14T20:00:00+02:00", + "price_inCentPerKwh": 9.347 + }, + { + "moment": "2024-05-14T21:00:00+02:00", + "price_inCentPerKwh": 7.641 + }, + { + "moment": "2024-05-14T22:00:00+02:00", + "price_inCentPerKwh": 4.535 + }, + { + "moment": "2024-05-14T23:00:00+02:00", + "price_inCentPerKwh": 2.771 + } + ], + "success": true, + "metadata": { + "messages": [], + "maintenanceMode": null + } + + }"""); // + + // To check if the Map is not empty + assertFalse(prices.isEmpty()); + + // To check if a value is present in map. + assertEquals(5.64, prices.getFirst(), 0.001); + } + + @Test + public void emptyStringTest() throws OpenemsNamedException { + assertThrows(OpenemsNamedException.class, () -> { + parsePrices(""); + }); + } +} diff --git a/io.openems.wrapper/influxdb-client-core.bnd b/io.openems.wrapper/influxdb-client-core.bnd index 393a0f73745..7798c9f3287 100644 --- a/io.openems.wrapper/influxdb-client-core.bnd +++ b/io.openems.wrapper/influxdb-client-core.bnd @@ -2,10 +2,10 @@ Bundle-Name: influxdb-client-core Bundle-Description: The Java InfluxDB 2.0 Client Core Bundle-DocURL: https://github.com/influxdata/influxdb-client-java Bundle-License: https://opensource.org/licenses/MIT -Bundle-Version: 7.0.0 +Bundle-Version: 7.1.0 Include-Resource: \ - @influxdb-client-core-7.0.0.jar,\ + @influxdb-client-core-7.1.0.jar,\ Export-Package: \ com.influxdb,\ diff --git a/io.openems.wrapper/influxdb-client-java.bnd b/io.openems.wrapper/influxdb-client-java.bnd index 7c862ce2e4c..d104a2e8891 100644 --- a/io.openems.wrapper/influxdb-client-java.bnd +++ b/io.openems.wrapper/influxdb-client-java.bnd @@ -2,10 +2,10 @@ Bundle-Name: influxdb-client-java Bundle-Description: The Java InfluxDB 2.0 Client Java Bundle-DocURL: https://github.com/influxdata/influxdb-client-java Bundle-License: https://opensource.org/licenses/MIT -Bundle-Version: 7.0.0 +Bundle-Version: 7.1.0 Include-Resource: \ - @influxdb-client-java-7.0.0.jar,\ + @influxdb-client-java-7.1.0.jar,\ Export-Package: \ com.influxdb.client,\ diff --git a/io.openems.wrapper/influxdb-client-utils.bnd b/io.openems.wrapper/influxdb-client-utils.bnd index 3fe9e8fd05e..32ffc20d813 100644 --- a/io.openems.wrapper/influxdb-client-utils.bnd +++ b/io.openems.wrapper/influxdb-client-utils.bnd @@ -2,10 +2,10 @@ Bundle-Name: influxdb-client-utils Bundle-Description: The Java InfluxDB 2.0 Client Utils Bundle-DocURL: https://github.com/influxdata/influxdb-client-java Bundle-License: https://opensource.org/licenses/MIT -Bundle-Version: 7.0.0 +Bundle-Version: 7.1.0 Include-Resource: \ - @influxdb-client-utils-7.0.0.jar,\ + @influxdb-client-utils-7.1.0.jar,\ Export-Package: \ com.influxdb.utils,\ diff --git a/io.openems.wrapper/influxdb-flux-dsl.bnd b/io.openems.wrapper/influxdb-flux-dsl.bnd index f731585750e..d7c95c16634 100644 --- a/io.openems.wrapper/influxdb-flux-dsl.bnd +++ b/io.openems.wrapper/influxdb-flux-dsl.bnd @@ -2,10 +2,10 @@ Bundle-Name: influxdb-flux-dsl Bundle-Description: The Java InfluxDB 2.0 Flux DSL Bundle-DocURL: https://github.com/influxdata/influxdb-client-java Bundle-License: https://opensource.org/licenses/MIT -Bundle-Version: 7.0.0 +Bundle-Version: 7.1.0 Include-Resource: \ - @flux-dsl-7.0.0.jar,\ + @flux-dsl-7.1.0.jar,\ Export-Package: \ com.influxdb.query,\ diff --git a/io.openems.wrapper/kotlinx-coroutines-core-jvm.bnd b/io.openems.wrapper/kotlinx-coroutines-core-jvm.bnd index ad36e0c51f6..eaafb47be8d 100644 --- a/io.openems.wrapper/kotlinx-coroutines-core-jvm.bnd +++ b/io.openems.wrapper/kotlinx-coroutines-core-jvm.bnd @@ -2,10 +2,10 @@ Bundle-Name: kotlinx-coroutines-core-jvm Bundle-Description: The Java InfluxDB 2.0 Client Core Bundle-DocURL: https://github.com/influxdata/influxdb-client-client Bundle-License: https://opensource.org/licenses/MIT -Bundle-Version: 1.8.0 +Bundle-Version: 1.8.1 Include-Resource: \ - @kotlinx-coroutines-core-jvm-1.8.0.jar,\ + @kotlinx-coroutines-core-jvm-1.8.1.jar,\ Export-Package: \ kotlinx.coroutines,\ diff --git a/io.openems.wrapper/retrofit2.bnd b/io.openems.wrapper/retrofit2.bnd index bb1a32d18ad..3eeec546637 100644 --- a/io.openems.wrapper/retrofit2.bnd +++ b/io.openems.wrapper/retrofit2.bnd @@ -33,3 +33,5 @@ Import-Package: \ -metatypeannotations: * -sources: false + +-fixupmessages "Classes found in the wrong directory" diff --git a/tools/common.sh b/tools/common.sh index 598a8341fb5..c5ee2450f1f 100644 --- a/tools/common.sh +++ b/tools/common.sh @@ -62,6 +62,13 @@ common_update_version_in_code() { sed --in-place "s#\(UI_VERSION = \"\).*\(\";\)#\1$VERSION\2#" $SRC_CHANGELOG_CONSTANTS } +# Build OpenEMS Backend +common_build_backend() { + echo "# Build OpenEMS Backend" + ./gradlew $@ --build-cache build buildBackend resolve.BackendApp + git diff --exit-code io.openems.backend.application/BackendApp.bndrun +} + # Build OpenEMS Edge and UI in parallel common_build_edge_and_ui_in_parallel() { # TODO use 'parallel' tool for reliable implementation @@ -76,6 +83,12 @@ common_build_edge() { git diff --exit-code io.openems.edge.application/EdgeApp.bndrun io.openems.backend.application/BackendApp.bndrun } +# Run OpenEMS Checkstyle +common_run_checkstyle() { + echo "# Run Checkstyle" + ./gradlew $@ checkstyleAll +} + # Build OpenEMS UI common_build_ui() { echo "# Build OpenEMS UI" diff --git a/tools/debian/etc/apt/apt.conf.d/99nodoc b/tools/debian/etc/apt/apt.conf.d/99nodoc new file mode 100644 index 00000000000..7b23b8f5a90 --- /dev/null +++ b/tools/debian/etc/apt/apt.conf.d/99nodoc @@ -0,0 +1,8 @@ +APT::Install-Recommends "0"; +APT::Install-Suggests "0"; +Dpkg::Options { + "--path-exclude=/usr/share/locale/*"; + "--path-exclude=/usr/share/man/*"; + "--path-exclude=/usr/share/doc/*"; + "--path-include=/usr/share/doc/*/copyright"; +}; \ No newline at end of file diff --git a/tools/debian/etc/dpkg/dpkg.cfg.d/01nodoc b/tools/debian/etc/dpkg/dpkg.cfg.d/01nodoc new file mode 100644 index 00000000000..0baaae606b8 --- /dev/null +++ b/tools/debian/etc/dpkg/dpkg.cfg.d/01nodoc @@ -0,0 +1,9 @@ +# Delete locales +path-exclude=/usr/share/locale/*; + +# Delete man pages +path-exclude=/usr/share/man/*; + +# Delete docs +path-exclude=/usr/share/doc/*; +path-include=/usr/share/doc/*/copyright; \ No newline at end of file diff --git a/ui/.eslintrc.json b/ui/.eslintrc.json index 6d53fb393b4..477e5e2c8dd 100644 --- a/ui/.eslintrc.json +++ b/ui/.eslintrc.json @@ -51,6 +51,9 @@ } } ], + "@angular-eslint/use-lifecycle-interface": [ + "error" + ], "@angular-eslint/directive-selector": [ "error", { diff --git a/ui/package-lock.json b/ui/package-lock.json index 4b739a860c4..a3bfb8b2253 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -1,12 +1,12 @@ { "name": "openems-ui", - "version": "2024.5.0", + "version": "2024.6.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "openems-ui", - "version": "2024.5.0", + "version": "2024.6.0", "license": "AGPL-3.0", "dependencies": { "@angular/animations": "~16.2.12", @@ -21,7 +21,7 @@ "@ngx-formly/core": "^6.3.0", "@ngx-formly/ionic": "^6.3.0", "@ngx-formly/schematics": "^6.3.0", - "@ngx-translate/core": "^14.0.0", + "@ngx-translate/core": "^15.0.0", "@nodro7/angular-mydatepicker": "^0.14.0", "chart.js": "^4.4.2", "chartjs-adapter-date-fns": "^3.0.0", @@ -42,7 +42,7 @@ "zone.js": "~0.13.3" }, "devDependencies": { - "@angular-devkit/build-angular": "^16.2.13", + "@angular-devkit/build-angular": "^16.2.14", "@angular-eslint/builder": "^16.3.1", "@angular-eslint/eslint-plugin": "^16.3.1", "@angular-eslint/eslint-plugin-template": "^16.3.1", @@ -62,7 +62,7 @@ "eslint-plugin-import": "2.29.1", "eslint-plugin-jsdoc": "48.2.3", "eslint-plugin-prefer-arrow": "1.2.3", - "eslint-plugin-unused-imports": "^3.1.0", + "eslint-plugin-unused-imports": "^3.2.0", "jasmine-core": "~4.5.0", "jasmine-spec-reporter": "~7.0.0", "karma": "~6.4.2", @@ -74,7 +74,7 @@ "protractor": "~7.0.0", "ts-node": "^10.9.2", "typescript": "~4.9.5", - "typescript-strict-plugin": "^2.4.1" + "typescript-strict-plugin": "^2.4.3" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -120,14 +120,15 @@ } }, "node_modules/@angular-devkit/build-angular": { - "version": "16.2.13", + "version": "16.2.14", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-16.2.14.tgz", + "integrity": "sha512-bXQ6i7QPhwmYHuh+DSNkBhjTIHQF0C6fqZEg2ApJA3NmnzE98oQnmJ9AnGnAkdf1Mjn3xi2gxoZWPDDxGEINMw==", "dev": true, - "license": "MIT", "dependencies": { "@ampproject/remapping": "2.2.1", - "@angular-devkit/architect": "0.1602.13", - "@angular-devkit/build-webpack": "0.1602.13", - "@angular-devkit/core": "16.2.13", + "@angular-devkit/architect": "0.1602.14", + "@angular-devkit/build-webpack": "0.1602.14", + "@angular-devkit/core": "16.2.14", "@babel/core": "7.22.9", "@babel/generator": "7.22.9", "@babel/helper-annotate-as-pure": "7.22.5", @@ -139,7 +140,7 @@ "@babel/runtime": "7.22.6", "@babel/template": "7.22.5", "@discoveryjs/json-ext": "0.5.7", - "@ngtools/webpack": "16.2.13", + "@ngtools/webpack": "16.2.14", "@vitejs/plugin-basic-ssl": "1.0.1", "ansi-colors": "4.1.3", "autoprefixer": "10.4.14", @@ -182,7 +183,7 @@ "text-table": "0.2.0", "tree-kill": "1.2.2", "tslib": "2.6.1", - "vite": "4.5.2", + "vite": "4.5.3", "webpack": "5.88.2", "webpack-dev-middleware": "6.1.2", "webpack-dev-server": "4.15.1", @@ -252,6 +253,79 @@ "node": ">=6.0.0" } }, + "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/architect": { + "version": "0.1602.14", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.14.tgz", + "integrity": "sha512-eSdONEV5dbtLNiOMBy9Ue9DdJ1ct6dH9RdZfYiedq6VZn0lejePAjY36MYVXgq2jTE+v/uIiaNy7caea5pt55A==", + "dev": true, + "dependencies": { + "@angular-devkit/core": "16.2.14", + "rxjs": "7.8.1" + }, + "engines": { + "node": "^16.14.0 || >=18.10.0", + "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", + "yarn": ">= 1.13.0" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core": { + "version": "16.2.14", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.14.tgz", + "integrity": "sha512-Ui14/d2+p7lnmXlK/AX2ieQEGInBV75lonNtPQgwrYgskF8ufCuN0DyVZQUy9fJDkC+xQxbJyYrby/BS0R0e7w==", + "dev": true, + "dependencies": { + "ajv": "8.12.0", + "ajv-formats": "2.1.1", + "jsonc-parser": "3.2.0", + "picomatch": "2.3.1", + "rxjs": "7.8.1", + "source-map": "0.7.4" + }, + "engines": { + "node": "^16.14.0 || >=18.10.0", + "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", + "yarn": ">= 1.13.0" + }, + "peerDependencies": { + "chokidar": "^3.5.2" + }, + "peerDependenciesMeta": { + "chokidar": { + "optional": true + } + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core/node_modules/ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + }, + "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core/node_modules/source-map": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", + "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, "node_modules/@angular-devkit/build-angular/node_modules/@babel/core": { "version": "7.22.9", "dev": true, @@ -556,11 +630,12 @@ "license": "ISC" }, "node_modules/@angular-devkit/build-webpack": { - "version": "0.1602.13", + "version": "0.1602.14", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1602.14.tgz", + "integrity": "sha512-f+ZTCjOoA1SCQEaX3L/63ubqr/vlHkwDXAtKjBsQgyz6srnETcjy96Us5k/LoK7/hPc85zFneqLinfqOMVWHJQ==", "dev": true, - "license": "MIT", "dependencies": { - "@angular-devkit/architect": "0.1602.13", + "@angular-devkit/architect": "0.1602.14", "rxjs": "7.8.1" }, "engines": { @@ -573,10 +648,59 @@ "webpack-dev-server": "^4.0.0" } }, + "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/architect": { + "version": "0.1602.14", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.14.tgz", + "integrity": "sha512-eSdONEV5dbtLNiOMBy9Ue9DdJ1ct6dH9RdZfYiedq6VZn0lejePAjY36MYVXgq2jTE+v/uIiaNy7caea5pt55A==", + "dev": true, + "dependencies": { + "@angular-devkit/core": "16.2.14", + "rxjs": "7.8.1" + }, + "engines": { + "node": "^16.14.0 || >=18.10.0", + "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", + "yarn": ">= 1.13.0" + } + }, + "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/core": { + "version": "16.2.14", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.14.tgz", + "integrity": "sha512-Ui14/d2+p7lnmXlK/AX2ieQEGInBV75lonNtPQgwrYgskF8ufCuN0DyVZQUy9fJDkC+xQxbJyYrby/BS0R0e7w==", + "dev": true, + "dependencies": { + "ajv": "8.12.0", + "ajv-formats": "2.1.1", + "jsonc-parser": "3.2.0", + "picomatch": "2.3.1", + "rxjs": "7.8.1", + "source-map": "0.7.4" + }, + "engines": { + "node": "^16.14.0 || >=18.10.0", + "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", + "yarn": ">= 1.13.0" + }, + "peerDependencies": { + "chokidar": "^3.5.2" + }, + "peerDependenciesMeta": { + "chokidar": { + "optional": true + } + } + }, + "node_modules/@angular-devkit/build-webpack/node_modules/jsonc-parser": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", + "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", + "dev": true + }, "node_modules/@angular-devkit/build-webpack/node_modules/rxjs": { "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dev": true, - "license": "Apache-2.0", "dependencies": { "tslib": "^2.1.0" } @@ -3214,13 +3338,15 @@ }, "node_modules/@leichtgewicht/ip-codec": { "version": "2.0.5", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz", + "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==", + "dev": true }, "node_modules/@ngtools/webpack": { - "version": "16.2.13", + "version": "16.2.14", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.2.14.tgz", + "integrity": "sha512-3+zPP3Wir46qrZ3FEiTz5/emSoVHYUCH+WgBmJ57mZCx1qBOYh2VgllnPr/Yusl1sc/jUZjdwq/es/9ZNw+zDQ==", "dev": true, - "license": "MIT", "engines": { "node": "^16.14.0 || >=18.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", @@ -3351,14 +3477,16 @@ } }, "node_modules/@ngx-translate/core": { - "version": "14.0.0", - "license": "MIT", - "dependencies": { - "tslib": "^2.3.0" + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-15.0.0.tgz", + "integrity": "sha512-Am5uiuR0bOOxyoercDnAA3rJVizo4RRqJHo8N3RqJ+XfzVP/I845yEnMADykOHvM6HkVm4SZSnJBOiz0Anx5BA==", + "engines": { + "node": "^16.13.0 || >=18.10.0" }, "peerDependencies": { - "@angular/core": ">=13.0.0", - "rxjs": "^6.5.3 || ^7.4.0" + "@angular/common": ">=16.0.0", + "@angular/core": ">=16.0.0", + "rxjs": "^6.5.5 || ^7.4.0" } }, "node_modules/@nodelib/fs.scandir": { @@ -3899,8 +4027,9 @@ }, "node_modules/@types/body-parser": { "version": "1.19.5", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", + "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", "dev": true, - "license": "MIT", "dependencies": { "@types/connect": "*", "@types/node": "*" @@ -3908,24 +4037,27 @@ }, "node_modules/@types/bonjour": { "version": "3.5.13", + "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz", + "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==", "dev": true, - "license": "MIT", "dependencies": { "@types/node": "*" } }, "node_modules/@types/connect": { "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", + "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", "dev": true, - "license": "MIT", "dependencies": { "@types/node": "*" } }, "node_modules/@types/connect-history-api-fallback": { "version": "1.5.4", + "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz", + "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==", "dev": true, - "license": "MIT", "dependencies": { "@types/express-serve-static-core": "*", "@types/node": "*" @@ -3969,8 +4101,9 @@ }, "node_modules/@types/express": { "version": "4.17.21", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", + "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", "dev": true, - "license": "MIT", "dependencies": { "@types/body-parser": "*", "@types/express-serve-static-core": "^4.17.33", @@ -3980,8 +4113,9 @@ }, "node_modules/@types/express-serve-static-core": { "version": "4.19.0", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.0.tgz", + "integrity": "sha512-bGyep3JqPCRry1wq+O5n7oiBgGWmeIJXPjXXCo8EK0u8duZGSYar7cGqd3ML2JUsLGeB7fmc06KYo9fLGWqPvQ==", "dev": true, - "license": "MIT", "dependencies": { "@types/node": "*", "@types/qs": "*", @@ -3991,13 +4125,15 @@ }, "node_modules/@types/http-errors": { "version": "2.0.4", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", + "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==", + "dev": true }, "node_modules/@types/http-proxy": { "version": "1.17.14", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz", + "integrity": "sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==", "dev": true, - "license": "MIT", "dependencies": { "@types/node": "*" } @@ -4027,8 +4163,9 @@ }, "node_modules/@types/mime": { "version": "1.3.5", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", + "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", + "dev": true }, "node_modules/@types/node": { "version": "20.12.7", @@ -4040,8 +4177,9 @@ }, "node_modules/@types/node-forge": { "version": "1.3.11", + "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz", + "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==", "dev": true, - "license": "MIT", "dependencies": { "@types/node": "*" } @@ -4052,19 +4190,22 @@ "license": "MIT" }, "node_modules/@types/qs": { - "version": "6.9.14", - "dev": true, - "license": "MIT" + "version": "6.9.15", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz", + "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==", + "dev": true }, "node_modules/@types/range-parser": { "version": "1.2.7", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", + "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", + "dev": true }, "node_modules/@types/retry": { "version": "0.12.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==", + "dev": true }, "node_modules/@types/selenium-webdriver": { "version": "3.0.26", @@ -4078,8 +4219,9 @@ }, "node_modules/@types/send": { "version": "0.17.4", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", + "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", "dev": true, - "license": "MIT", "dependencies": { "@types/mime": "^1", "@types/node": "*" @@ -4087,16 +4229,18 @@ }, "node_modules/@types/serve-index": { "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz", + "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==", "dev": true, - "license": "MIT", "dependencies": { "@types/express": "*" } }, "node_modules/@types/serve-static": { "version": "1.15.7", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz", + "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==", "dev": true, - "license": "MIT", "dependencies": { "@types/http-errors": "*", "@types/node": "*", @@ -4105,8 +4249,9 @@ }, "node_modules/@types/sockjs": { "version": "0.3.36", + "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz", + "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==", "dev": true, - "license": "MIT", "dependencies": { "@types/node": "*" } @@ -4118,8 +4263,9 @@ }, "node_modules/@types/ws": { "version": "8.5.10", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz", + "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==", "dev": true, - "license": "MIT", "dependencies": { "@types/node": "*" } @@ -5070,11 +5216,12 @@ }, "node_modules/ansi-html-community": { "version": "0.0.8", + "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz", + "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==", "dev": true, "engines": [ "node >= 0.8.0" ], - "license": "Apache-2.0", "bin": { "ansi-html": "bin/ansi-html" } @@ -5172,8 +5319,9 @@ }, "node_modules/array-flatten": { "version": "1.1.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", + "dev": true }, "node_modules/array-includes": { "version": "3.1.7", @@ -5545,8 +5693,9 @@ }, "node_modules/batch": { "version": "0.6.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", + "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", + "dev": true }, "node_modules/bcrypt-pbkdf": { "version": "1.0.2", @@ -5652,8 +5801,9 @@ }, "node_modules/bonjour-service": { "version": "1.2.1", + "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz", + "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==", "dev": true, - "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3", "multicast-dns": "^7.2.5" @@ -5807,8 +5957,9 @@ }, "node_modules/bytes": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", + "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.8" } @@ -6145,8 +6296,9 @@ }, "node_modules/compressible": { "version": "2.0.18", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", + "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", "dev": true, - "license": "MIT", "dependencies": { "mime-db": ">= 1.43.0 < 2" }, @@ -6156,8 +6308,9 @@ }, "node_modules/compression": { "version": "1.7.4", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", + "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", "dev": true, - "license": "MIT", "dependencies": { "accepts": "~1.3.5", "bytes": "3.0.0", @@ -6173,21 +6326,24 @@ }, "node_modules/compression/node_modules/debug": { "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, - "license": "MIT", "dependencies": { "ms": "2.0.0" } }, "node_modules/compression/node_modules/ms": { "version": "2.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true }, "node_modules/compression/node_modules/safe-buffer": { "version": "5.1.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true }, "node_modules/concat-map": { "version": "0.0.1", @@ -6210,8 +6366,9 @@ }, "node_modules/connect-history-api-fallback": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz", + "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.8" } @@ -6272,8 +6429,9 @@ }, "node_modules/content-disposition": { "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", "dev": true, - "license": "MIT", "dependencies": { "safe-buffer": "5.2.1" }, @@ -6296,16 +6454,18 @@ }, "node_modules/cookie": { "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/cookie-signature": { "version": "1.0.6", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", + "dev": true }, "node_modules/copy-anything": { "version": "2.0.6", @@ -7070,8 +7230,9 @@ }, "node_modules/default-gateway": { "version": "6.0.3", + "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz", + "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "execa": "^5.0.0" }, @@ -7258,8 +7419,9 @@ }, "node_modules/detect-node": { "version": "2.1.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", + "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", + "dev": true }, "node_modules/di": { "version": "0.0.1", @@ -7287,8 +7449,9 @@ }, "node_modules/dns-packet": { "version": "5.6.1", + "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz", + "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==", "dev": true, - "license": "MIT", "dependencies": { "@leichtgewicht/ip-codec": "^2.0.1" }, @@ -7421,9 +7584,10 @@ "license": "MIT" }, "node_modules/ejs": { - "version": "3.1.9", + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", + "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", "dev": true, - "license": "Apache-2.0", "dependencies": { "jake": "^10.8.5" }, @@ -8058,9 +8222,10 @@ } }, "node_modules/eslint-plugin-unused-imports": { - "version": "3.1.0", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-3.2.0.tgz", + "integrity": "sha512-6uXyn6xdINEpxE1MtDjxQsyXB37lfyO2yKGVVgtD7WEWQGORSOZjgrD6hBhvGv4/SO+TOlS+UnC6JppRqbuwGQ==", "dev": true, - "license": "MIT", "dependencies": { "eslint-rule-composer": "^0.3.0" }, @@ -8414,8 +8579,9 @@ }, "node_modules/etag": { "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -8440,8 +8606,9 @@ }, "node_modules/execa": { "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "dev": true, - "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", @@ -8474,8 +8641,9 @@ }, "node_modules/express": { "version": "4.19.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", + "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", "dev": true, - "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", @@ -8515,16 +8683,18 @@ }, "node_modules/express/node_modules/debug": { "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, - "license": "MIT", "dependencies": { "ms": "2.0.0" } }, "node_modules/express/node_modules/ms": { "version": "2.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true }, "node_modules/extend": { "version": "3.0.2", @@ -8601,8 +8771,9 @@ }, "node_modules/faye-websocket": { "version": "0.11.4", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", + "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", "dev": true, - "license": "Apache-2.0", "dependencies": { "websocket-driver": ">=0.5.1" }, @@ -8679,8 +8850,9 @@ }, "node_modules/finalhandler": { "version": "1.2.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", + "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", "dev": true, - "license": "MIT", "dependencies": { "debug": "2.6.9", "encodeurl": "~1.0.2", @@ -8696,16 +8868,18 @@ }, "node_modules/finalhandler/node_modules/debug": { "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, - "license": "MIT", "dependencies": { "ms": "2.0.0" } }, "node_modules/finalhandler/node_modules/ms": { "version": "2.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true }, "node_modules/find-cache-dir": { "version": "4.0.0", @@ -8836,8 +9010,9 @@ }, "node_modules/forwarded": { "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -8856,8 +9031,9 @@ }, "node_modules/fresh": { "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -8909,6 +9085,20 @@ "dev": true, "license": "ISC" }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/function-bind": { "version": "1.1.2", "dev": true, @@ -9004,8 +9194,9 @@ }, "node_modules/get-stream": { "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -9185,8 +9376,9 @@ }, "node_modules/handle-thing": { "version": "2.0.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", + "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==", + "dev": true }, "node_modules/har-schema": { "version": "2.0.0", @@ -9362,8 +9554,9 @@ }, "node_modules/hpack.js": { "version": "2.1.6", + "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", + "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==", "dev": true, - "license": "MIT", "dependencies": { "inherits": "^2.0.1", "obuf": "^1.0.0", @@ -9373,8 +9566,9 @@ }, "node_modules/hpack.js/node_modules/readable-stream": { "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, - "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -9387,13 +9581,15 @@ }, "node_modules/hpack.js/node_modules/safe-buffer": { "version": "5.1.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true }, "node_modules/hpack.js/node_modules/string_decoder": { "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, - "license": "MIT", "dependencies": { "safe-buffer": "~5.1.0" } @@ -9411,6 +9607,8 @@ }, "node_modules/html-entities": { "version": "2.5.2", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.5.2.tgz", + "integrity": "sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==", "dev": true, "funding": [ { @@ -9421,8 +9619,7 @@ "type": "patreon", "url": "https://patreon.com/mdevils" } - ], - "license": "MIT" + ] }, "node_modules/html-escaper": { "version": "2.0.2", @@ -9454,8 +9651,9 @@ }, "node_modules/http-deceiver": { "version": "1.2.7", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", + "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==", + "dev": true }, "node_modules/http-errors": { "version": "2.0.0", @@ -9474,8 +9672,9 @@ }, "node_modules/http-parser-js": { "version": "0.5.8", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz", + "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==", + "dev": true }, "node_modules/http-proxy": { "version": "1.18.1", @@ -9505,8 +9704,9 @@ }, "node_modules/http-proxy-middleware": { "version": "2.0.6", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz", + "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==", "dev": true, - "license": "MIT", "dependencies": { "@types/http-proxy": "^1.17.8", "http-proxy": "^1.18.1", @@ -9554,8 +9754,9 @@ }, "node_modules/human-signals": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", "dev": true, - "license": "Apache-2.0", "engines": { "node": ">=10.17.0" } @@ -9877,9 +10078,10 @@ "license": "BSD-3-Clause" }, "node_modules/ipaddr.js": { - "version": "2.1.0", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz", + "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==", "dev": true, - "license": "MIT", "engines": { "node": ">= 10" } @@ -10131,8 +10333,9 @@ }, "node_modules/is-plain-obj": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", + "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -11117,8 +11320,9 @@ }, "node_modules/launch-editor": { "version": "2.6.1", + "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz", + "integrity": "sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==", "dev": true, - "license": "MIT", "dependencies": { "picocolors": "^1.0.0", "shell-quote": "^1.8.1" @@ -11606,8 +11810,9 @@ }, "node_modules/merge-descriptors": { "version": "1.0.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", + "dev": true }, "node_modules/merge-stream": { "version": "2.0.0", @@ -11624,8 +11829,9 @@ }, "node_modules/methods": { "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -11699,8 +11905,9 @@ }, "node_modules/minimalistic-assert": { "version": "1.0.1", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", + "dev": true }, "node_modules/minimatch": { "version": "3.1.2", @@ -11948,8 +12155,9 @@ }, "node_modules/multicast-dns": { "version": "7.2.5", + "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz", + "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==", "dev": true, - "license": "MIT", "dependencies": { "dns-packet": "^5.2.2", "thunky": "^1.0.2" @@ -12073,8 +12281,9 @@ }, "node_modules/node-forge": { "version": "1.3.1", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", + "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==", "dev": true, - "license": "(BSD-3-Clause OR GPL-2.0)", "engines": { "node": ">= 6.13.0" } @@ -12794,8 +13003,9 @@ }, "node_modules/obuf": { "version": "1.1.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", + "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==", + "dev": true }, "node_modules/on-finished": { "version": "2.4.1", @@ -12810,8 +13020,9 @@ }, "node_modules/on-headers": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.8" } @@ -12993,8 +13204,9 @@ }, "node_modules/p-retry": { "version": "4.6.2", + "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz", + "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==", "dev": true, - "license": "MIT", "dependencies": { "@types/retry": "0.12.0", "retry": "^0.13.1" @@ -13005,8 +13217,9 @@ }, "node_modules/p-retry/node_modules/retry": { "version": "0.13.1", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", + "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 4" } @@ -13209,8 +13422,9 @@ }, "node_modules/path-to-regexp": { "version": "0.1.7", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", + "dev": true }, "node_modules/path-type": { "version": "4.0.0", @@ -13788,8 +14002,9 @@ }, "node_modules/proxy-addr": { "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", "dev": true, - "license": "MIT", "dependencies": { "forwarded": "0.2.0", "ipaddr.js": "1.9.1" @@ -13800,8 +14015,9 @@ }, "node_modules/proxy-addr/node_modules/ipaddr.js": { "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.10" } @@ -14578,8 +14794,9 @@ }, "node_modules/select-hose": { "version": "2.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", + "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==", + "dev": true }, "node_modules/selenium-webdriver": { "version": "3.6.0", @@ -14638,8 +14855,9 @@ }, "node_modules/selfsigned": { "version": "2.4.1", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz", + "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==", "dev": true, - "license": "MIT", "dependencies": { "@types/node-forge": "^1.3.0", "node-forge": "^1" @@ -14680,8 +14898,9 @@ }, "node_modules/send": { "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", "dev": true, - "license": "MIT", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -14703,21 +14922,24 @@ }, "node_modules/send/node_modules/debug": { "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, - "license": "MIT", "dependencies": { "ms": "2.0.0" } }, "node_modules/send/node_modules/debug/node_modules/ms": { "version": "2.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true }, "node_modules/send/node_modules/ms": { "version": "2.1.3", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true }, "node_modules/serialize-javascript": { "version": "6.0.2", @@ -14729,8 +14951,9 @@ }, "node_modules/serve-index": { "version": "1.9.1", + "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", + "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==", "dev": true, - "license": "MIT", "dependencies": { "accepts": "~1.3.4", "batch": "0.6.1", @@ -14746,24 +14969,27 @@ }, "node_modules/serve-index/node_modules/debug": { "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, - "license": "MIT", "dependencies": { "ms": "2.0.0" } }, "node_modules/serve-index/node_modules/depd": { "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/serve-index/node_modules/http-errors": { "version": "1.6.3", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", + "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==", "dev": true, - "license": "MIT", "dependencies": { "depd": "~1.1.2", "inherits": "2.0.3", @@ -14776,31 +15002,36 @@ }, "node_modules/serve-index/node_modules/inherits": { "version": "2.0.3", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", + "dev": true }, "node_modules/serve-index/node_modules/ms": { "version": "2.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true }, "node_modules/serve-index/node_modules/setprototypeof": { "version": "1.1.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", + "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", + "dev": true }, "node_modules/serve-index/node_modules/statuses": { "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/serve-static": { "version": "1.15.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", + "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", "dev": true, - "license": "MIT", "dependencies": { "encodeurl": "~1.0.2", "escape-html": "~1.0.3", @@ -14888,8 +15119,9 @@ }, "node_modules/shell-quote": { "version": "1.8.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", + "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", "dev": true, - "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -15086,8 +15318,9 @@ }, "node_modules/sockjs": { "version": "0.3.24", + "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz", + "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==", "dev": true, - "license": "MIT", "dependencies": { "faye-websocket": "^0.11.3", "uuid": "^8.3.2", @@ -15096,8 +15329,9 @@ }, "node_modules/sockjs/node_modules/uuid": { "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", "dev": true, - "license": "MIT", "bin": { "uuid": "dist/bin/uuid" } @@ -15215,8 +15449,9 @@ }, "node_modules/spdy": { "version": "4.0.2", + "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz", + "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", "dev": true, - "license": "MIT", "dependencies": { "debug": "^4.1.0", "handle-thing": "^2.0.0", @@ -15230,8 +15465,9 @@ }, "node_modules/spdy-transport": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", + "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", "dev": true, - "license": "MIT", "dependencies": { "debug": "^4.1.0", "detect-node": "^2.0.4", @@ -15717,8 +15953,9 @@ }, "node_modules/thunky": { "version": "1.1.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", + "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", + "dev": true }, "node_modules/tmp": { "version": "0.0.33", @@ -16125,9 +16362,10 @@ } }, "node_modules/typescript-strict-plugin": { - "version": "2.4.1", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/typescript-strict-plugin/-/typescript-strict-plugin-2.4.3.tgz", + "integrity": "sha512-xKdyZGKg3Sy4tPU+b0U1DuxsDoCpMbu41iQvibTPiVjdZJvtG7Ou04a9NpEWuV/Dho8Xo3c34WmROtkHZe0pkg==", "dev": true, - "license": "MIT", "dependencies": { "chalk": "^3.0.0", "execa": "^4.0.0", @@ -16532,9 +16770,10 @@ } }, "node_modules/vite": { - "version": "4.5.2", + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz", + "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==", "dev": true, - "license": "MIT", "dependencies": { "esbuild": "^0.18.10", "postcss": "^8.4.27", @@ -16626,8 +16865,9 @@ }, "node_modules/wbuf": { "version": "1.7.3", + "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", + "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", "dev": true, - "license": "MIT", "dependencies": { "minimalistic-assert": "^1.0.0" } @@ -16852,8 +17092,9 @@ }, "node_modules/webpack-dev-server": { "version": "4.15.1", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz", + "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==", "dev": true, - "license": "MIT", "dependencies": { "@types/bonjour": "^3.5.9", "@types/connect-history-api-fallback": "^1.3.5", @@ -16910,8 +17151,9 @@ }, "node_modules/webpack-dev-server/node_modules/webpack-dev-middleware": { "version": "5.3.4", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz", + "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==", "dev": true, - "license": "MIT", "dependencies": { "colorette": "^2.0.10", "memfs": "^3.4.3", @@ -16931,9 +17173,10 @@ } }, "node_modules/webpack-dev-server/node_modules/ws": { - "version": "8.16.0", + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz", + "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==", "dev": true, - "license": "MIT", "engines": { "node": ">=10.0.0" }, @@ -17041,8 +17284,9 @@ }, "node_modules/websocket-driver": { "version": "0.7.4", + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", + "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", "dev": true, - "license": "Apache-2.0", "dependencies": { "http-parser-js": ">=0.5.1", "safe-buffer": ">=5.1.0", @@ -17054,8 +17298,9 @@ }, "node_modules/websocket-extensions": { "version": "0.1.4", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", + "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", "dev": true, - "license": "Apache-2.0", "engines": { "node": ">=0.8.0" } diff --git a/ui/package.json b/ui/package.json index 6d98a3e50e9..470640ec874 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "openems-ui", - "version": "2024.5.0", + "version": "2024.6.0", "license": "AGPL-3.0", "private": true, "dependencies": { @@ -16,7 +16,7 @@ "@ngx-formly/core": "^6.3.0", "@ngx-formly/ionic": "^6.3.0", "@ngx-formly/schematics": "^6.3.0", - "@ngx-translate/core": "^14.0.0", + "@ngx-translate/core": "^15.0.0", "@nodro7/angular-mydatepicker": "^0.14.0", "chart.js": "^4.4.2", "chartjs-adapter-date-fns": "^3.0.0", @@ -37,7 +37,7 @@ "zone.js": "~0.13.3" }, "devDependencies": { - "@angular-devkit/build-angular": "^16.2.13", + "@angular-devkit/build-angular": "^16.2.14", "@angular-eslint/builder": "^16.3.1", "@angular-eslint/eslint-plugin": "^16.3.1", "@angular-eslint/eslint-plugin-template": "^16.3.1", @@ -57,7 +57,7 @@ "eslint-plugin-import": "2.29.1", "eslint-plugin-jsdoc": "48.2.3", "eslint-plugin-prefer-arrow": "1.2.3", - "eslint-plugin-unused-imports": "^3.1.0", + "eslint-plugin-unused-imports": "^3.2.0", "jasmine-core": "~4.5.0", "jasmine-spec-reporter": "~7.0.0", "karma": "~6.4.2", @@ -69,7 +69,7 @@ "protractor": "~7.0.0", "ts-node": "^10.9.2", "typescript": "~4.9.5", - "typescript-strict-plugin": "^2.4.1" + "typescript-strict-plugin": "^2.4.3" }, "scripts": { "lint": "ng lint", diff --git a/ui/src/app/app-routing.module.ts b/ui/src/app/app-routing.module.ts index e1f9f03e9b3..4fb3687de15 100644 --- a/ui/src/app/app-routing.module.ts +++ b/ui/src/app/app-routing.module.ts @@ -110,7 +110,7 @@ const routes: Routes = [ { path: 'settings/profile', component: EdgeSettingsProfileComponent }, { path: 'settings/profile/:componentId', component: AliasUpdateComponent }, { path: 'settings/systemexecute', component: EdgeSettingsSystemExecuteComponent }, - { path: 'settings/systemlog', component: EdgeSettingsSystemLogComponent }, + { path: 'settings/systemlog', component: EdgeSettingsSystemLogComponent, data: { navbarTitleToBeTranslated: 'Edge.Config.Index.liveLog' } }, { path: 'settings/system', component: EdgeSettingsSystemComponent, data: { navbarTitleToBeTranslated: 'Edge.Config.Index.SYSTEM' } }, { path: 'settings/app', data: { navbarTitle: environment.edgeShortName + ' Apps' }, component: EdgeSettingsAppIndex }, { path: 'settings/app/install/:appId', component: EdgeSettingsAppInstall }, diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts index 97e37811918..f76d84f27e3 100644 --- a/ui/src/app/app.module.ts +++ b/ui/src/app/app.module.ts @@ -10,6 +10,7 @@ import { FORMLY_CONFIG } from '@ngx-formly/core'; import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'; import { CookieService } from 'ngx-cookie-service'; +import { AngularMyDatePickerModule } from '@nodro7/angular-mydatepicker'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CheckForUpdateService } from './appupdateservice'; @@ -28,7 +29,6 @@ import { StatusSingleComponent } from './shared/status/single/status.component'; import { registerTranslateExtension } from './shared/translate.extension'; import { Language, MyTranslateLoader } from './shared/type/language'; import { UserModule } from './user/user.module'; -import { AngularMyDatePickerModule } from '@nodro7/angular-mydatepicker'; @NgModule({ declarations: [ @@ -47,7 +47,7 @@ import { AngularMyDatePickerModule } from '@nodro7/angular-mydatepicker'; EdgeModule, EdgeSettingsModule, IndexModule, - IonicModule.forRoot(), + IonicModule.forRoot({ innerHTMLTemplatesEnabled: true }), HttpClientModule, SharedModule, TranslateModule.forRoot({ loader: { provide: TranslateLoader, useClass: MyTranslateLoader } }), diff --git a/ui/src/app/changelog/view/component/changelog.constants.ts b/ui/src/app/changelog/view/component/changelog.constants.ts index fd9fa77b986..3c15c2b279c 100644 --- a/ui/src/app/changelog/view/component/changelog.constants.ts +++ b/ui/src/app/changelog/view/component/changelog.constants.ts @@ -2,7 +2,7 @@ import { Role } from "src/app/shared/type/role"; export class Changelog { - public static readonly UI_VERSION = "2024.5.0"; + public static readonly UI_VERSION = "2024.6.0"; public static product(...products: Product[]) { return products.map(product => Changelog.link(product.name, product.url)).join(", ") + '. '; diff --git a/ui/src/app/edge/edge.component.ts b/ui/src/app/edge/edge.component.ts index 9e4d158846c..f732a106824 100644 --- a/ui/src/app/edge/edge.component.ts +++ b/ui/src/app/edge/edge.component.ts @@ -4,17 +4,21 @@ import { ActivatedRoute, Router } from "@angular/router"; import { SubscribeEdgesRequest } from "src/app/shared/jsonrpc/request/subscribeEdgesRequest"; import { ChannelAddress, Edge, Service, Websocket } from "src/app/shared/shared"; + /*** This component is needed as a routing parent and acts as a transit station without being displayed.*/ @Component({ selector: "edge", template: ` + `, }) export class EdgeComponent implements OnInit, OnDestroy { private edge: Edge | null = null; + protected latestIncident: { message: string | null, id: string } | null = null; constructor( private router: Router, @@ -30,6 +34,8 @@ export class EdgeComponent implements OnInit, OnDestroy { const edgeId = params['edgeId']; this.service.updateCurrentEdge(edgeId).then((edge) => { this.edge = edge; + + this.checkMessages(); this.service.websocket.sendRequest(new SubscribeEdgesRequest({ edges: [edgeId] })) .then(() => { @@ -44,6 +50,9 @@ export class EdgeComponent implements OnInit, OnDestroy { }); } + public checkMessages(): void { + } + public ngOnDestroy(): void { if (!this.edge) { return; diff --git a/ui/src/app/edge/settings/system/maintenance/maintenance.ts b/ui/src/app/edge/settings/system/maintenance/maintenance.ts index 34e27d47c15..05ffad598c8 100644 --- a/ui/src/app/edge/settings/system/maintenance/maintenance.ts +++ b/ui/src/app/edge/settings/system/maintenance/maintenance.ts @@ -9,7 +9,7 @@ import { ExecuteSystemRestartRequest, Type } from 'src/app/shared/jsonrpc/reques import { Role } from 'src/app/shared/type/role'; import { environment } from 'src/environments'; -import { Edge, Service, Utils, Websocket } from '../../../../shared/shared'; +import { Edge, presentAlert, Service, Utils, Websocket } from '../../../../shared/shared'; enum SystemRestartState { INITIAL, // No restart @@ -31,15 +31,13 @@ enum SystemRestartState { }) export class MaintenanceComponent implements OnInit { - private static readonly SELECTOR: string = 'oe-maintenance'; - private static readonly TIMEOUT: number = 3000; protected readonly environment = environment; protected edge: Edge | null = null; protected options: { key: string, message: string, color: 'success' | 'warning' | null, info: string, roleIsAtLeast: Role, button: { disabled: boolean, label: string, callback: () => void } }[] = [ { key: Type.HARD, message: null, color: null, info: this.translate.instant('SETTINGS.SYSTEM_UPDATE.RESTART_WARNING', { system: environment.edgeShortName }), roleIsAtLeast: Role.OWNER, button: { - callback: () => this.presentAlert(Type.HARD), disabled: false, label: this.translate.instant('SETTINGS.SYSTEM_UPDATE.EMS_RESTARTING', { edgeShortName: environment.edgeShortName }), + callback: () => this.confirmationAlert(Type.HARD), disabled: false, label: this.translate.instant('SETTINGS.SYSTEM_UPDATE.EMS_RESTARTING', { edgeShortName: environment.edgeShortName }), }, }, ]; @@ -47,6 +45,17 @@ export class MaintenanceComponent implements OnInit { protected systemRestartState: BehaviorSubject<{ key: Type, state: SystemRestartState }> = new BehaviorSubject({ key: null, state: SystemRestartState.INITIAL }); protected spinnerId: string = MaintenanceComponent.SELECTOR; protected readonly SystemRestartState = SystemRestartState; + protected confirmationAlert: Function = (type: Type) => presentAlert(this.alertCtrl, this.translate, { + message: this.translate.instant('SETTINGS.SYSTEM_UPDATE.RESTART_WARNING', { system: environment.edgeShortName }), + subHeader: this.translate.instant('SETTINGS.SYSTEM_UPDATE.RESTART_CONFIRMATION', { system: environment.edgeShortName }), + buttons: [{ + text: this.translate.instant('General.RESTART'), + handler: () => this.execRestart(type), + }], + }); + + private static readonly SELECTOR: string = 'oe-maintenance'; + private static readonly TIMEOUT: number = 3000; constructor( protected utils: Utils, diff --git a/ui/src/app/edge/settings/system/oe-system-update.component.html b/ui/src/app/edge/settings/system/oe-system-update.component.html index 8d72981632f..a4d54cc1894 100644 --- a/ui/src/app/edge/settings/system/oe-system-update.component.html +++ b/ui/src/app/edge/settings/system/oe-system-update.component.html @@ -146,7 +146,7 @@ - {{ + {{ 'SETTINGS.SYSTEM_UPDATE.NEW_VERSION_INSTALLING'| translate }} diff --git a/ui/src/app/edge/settings/system/oe-system-update.component.ts b/ui/src/app/edge/settings/system/oe-system-update.component.ts index fe7847136fc..f76d9d9725f 100644 --- a/ui/src/app/edge/settings/system/oe-system-update.component.ts +++ b/ui/src/app/edge/settings/system/oe-system-update.component.ts @@ -1,6 +1,8 @@ // @ts-strict-ignore import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; -import { Edge, Service, Websocket } from 'src/app/shared/shared'; +import { AlertController } from '@ionic/angular'; +import { TranslateService } from '@ngx-translate/core'; +import { Edge, presentAlert, Service, Websocket } from 'src/app/shared/shared'; import { environment } from 'src/environments'; import { ExecuteSystemUpdate } from './executeSystemUpdate'; import { SystemUpdateState } from './getSystemUpdateStateResponse'; @@ -11,21 +13,31 @@ import { SystemUpdateState } from './getSystemUpdateStateResponse'; }) export class OeSystemUpdateComponent implements OnInit, OnDestroy { - private static readonly SELECTOR = "oe-system-update"; - public readonly spinnerId: string = OeSystemUpdateComponent.SELECTOR; - + @Output() public stateChanged: EventEmitter = new EventEmitter(); @Input() public executeUpdateInstantly: boolean = false; @Input() public edge: Edge; public readonly environment = environment; - protected executeUpdate: ExecuteSystemUpdate = null; + public readonly spinnerId: string = OeSystemUpdateComponent.SELECTOR; + protected executeUpdate: ExecuteSystemUpdate = null; protected isWaiting: boolean; + protected confirmationAlert: Function = () => presentAlert(this.alertCtrl, this.translate, { + message: this.translate.instant('SETTINGS.SYSTEM_UPDATE.WARNING', { system: environment.edgeShortName }), + subHeader: this.translate.instant('SETTINGS.SYSTEM_UPDATE.SUB_HEADER'), + buttons: [{ + text: this.translate.instant('SETTINGS.SYSTEM_UPDATE.UPDATE_EXECUTE'), + handler: () => this.executeSystemUpdate(), + }], + }); - @Output() public stateChanged: EventEmitter = new EventEmitter(); + private static readonly SELECTOR = "oe-system-update"; constructor( private websocket: Websocket, - private service: Service) { } + private service: Service, + private alertCtrl: AlertController, + private translate: TranslateService, + ) { } ngOnInit() { this.executeUpdate = new ExecuteSystemUpdate(this.edge, this.websocket); diff --git a/ui/src/app/edge/settings/systemlog/systemlog.component.html b/ui/src/app/edge/settings/systemlog/systemlog.component.html index 301bd7f72df..37919bc7547 100644 --- a/ui/src/app/edge/settings/systemlog/systemlog.component.html +++ b/ui/src/app/edge/settings/systemlog/systemlog.component.html @@ -10,15 +10,52 @@ - - - - Edge.Config.Log.automaticUpdating - + + + + + + + Edge.Config.Log.automaticUpdating + + + + + + + Edge.Config.Log.CONDENSED_OUTPUT + + + + + {{filters.placeholder}} + + + {{filter.name}} + + + + + + + + + + + + + + + - - + + + {{ line.time }} @@ -32,7 +69,7 @@ - {{ line.message }} + @@ -42,4 +79,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/settings/systemlog/systemlog.component.ts b/ui/src/app/edge/settings/systemlog/systemlog.component.ts index 2785a1df4b7..b062294443c 100644 --- a/ui/src/app/edge/settings/systemlog/systemlog.component.ts +++ b/ui/src/app/edge/settings/systemlog/systemlog.component.ts @@ -1,11 +1,36 @@ -// @ts-strict-ignore -import { ActivatedRoute } from '@angular/router'; import { Component, OnDestroy, OnInit } from '@angular/core'; +import { SelectCustomEvent } from '@ionic/angular'; +import { TranslateService } from '@ngx-translate/core'; import { parse } from 'date-fns'; -import { Service, Utils, Websocket } from '../../../shared/shared'; import { Subject } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; -import { TranslateService } from '@ngx-translate/core'; +import { filter, take, takeUntil } from 'rxjs/operators'; +import { Filter } from 'src/app/index/filter/filter.component'; + +import { Service, Utils, Websocket } from '../../../shared/shared'; +import { Role } from 'src/app/shared/type/role'; + +export const LOG_LEVEL_FILTER = (translate: TranslateService): Filter => ({ + placeholder: translate.instant("Edge.Config.Log.level"), + category: "level", + options: [ + { + name: 'Debug', + value: "DEBUG", + }, + { + name: translate.instant('General.info'), + value: "INFO", + }, + { + name: translate.instant('General.warning'), + value: "WARN", + }, + { + name: translate.instant("General.fault"), + value: "ERROR", + }, + ], +}); @Component({ selector: SystemLogComponent.SELECTOR, @@ -13,21 +38,31 @@ import { TranslateService } from '@ngx-translate/core'; }) export class SystemLogComponent implements OnInit, OnDestroy { + public isSubscribed: boolean = false; + + /** Displayed loglines */ + protected logLines: typeof this._logLines = []; + protected query: string | null = null; + protected filters: Filter = LOG_LEVEL_FILTER(this.translate); + protected isCondensedOutput: boolean | null = null; + protected isAtLeastGuest: boolean = false; + private static readonly SELECTOR = "systemLog"; + private ngUnsubscribe = new Subject(); + private searchParams: string[] | null = null; + private MAX_LOG_ENTRIES = 200; + private static readonly DEBUG_LOG_CONTROLLER_ID = 'ctrlDebugLog0'; - public lines: { + /** Original loglines */ + private _logLines: { time: string, level: string, color: string, message: string, source: string }[] = []; - public isSubscribed: boolean = false; - private MAX_LOG_ENTRIES = 200; - private ngUnsubscribe = new Subject(); constructor( - private route: ActivatedRoute, protected utils: Utils, private websocket: Websocket, private service: Service, @@ -36,8 +71,23 @@ export class SystemLogComponent implements OnInit, OnDestroy { } ngOnInit() { - this.service.setCurrentComponent({ languageKey: 'Edge.Config.Index.liveLog' }, this.route); this.subscribe(); + + this.service.getCurrentEdge().then(edge => { + this.isAtLeastGuest = !edge.roleIsAtLeast(Role.OWNER); + edge.getConfig(this.websocket).pipe(filter(config => !!config), take(1)) + .subscribe(config => { + const component = config.getComponent(SystemLogComponent.DEBUG_LOG_CONTROLLER_ID); + + if (!component) { + this.isCondensedOutput = null; + } + + if (component.properties?.condensedOutput != null) { + this.isCondensedOutput = component.properties?.condensedOutput; + } + }); + }); } ngOnDestroy() { @@ -52,10 +102,22 @@ export class SystemLogComponent implements OnInit, OnDestroy { } } + protected toggleCondensedOutput(event: CustomEvent) { + this.service.currentEdge.pipe(filter(edge => !!edge), take(1)) + .subscribe(edge => + edge.updateComponentConfig(this.websocket, SystemLogComponent.DEBUG_LOG_CONTROLLER_ID, [{ + name: 'condensedOutput', value: event.detail['checked'], + }]).then(() => { + this.service.toast(this.translate.instant('General.changeAccepted'), 'success'); + }).catch((reason) => { + this.service.toast(this.translate.instant('General.changeFailed') + '\n' + reason.error.message, 'danger'); + })); + } + public subscribe() { // put placeholder - if (this.lines.length > 0) { - this.lines.unshift({ + if (this.logLines.length > 0) { + this.logLines.unshift({ time: "-------------------", level: "----", color: "black", @@ -77,25 +139,27 @@ export class SystemLogComponent implements OnInit, OnDestroy { edge.systemLog.pipe( takeUntil(this.ngUnsubscribe), ).subscribe(line => { + // add line - this.lines.unshift({ + this._logLines.unshift({ time: parse(line.time, "yyyy-MM-dd'T'HH:mm:ss.SSSxxx", new Date()).toLocaleString(), color: this.getColor(line.level), level: line.level, source: line.source, - message: line.message, + message: line.message.replace(/\n/g, "
"), }); + this.filterLogs(); // remove old lines - if (this.lines.length > this.MAX_LOG_ENTRIES) { - this.lines.length = this.MAX_LOG_ENTRIES; + if (this._logLines.length > this.MAX_LOG_ENTRIES) { + this._logLines.length = this.MAX_LOG_ENTRIES; } }); }); this.isSubscribed = true; } - private getColor(level): string { + private getColor(level: 'INFO' | 'WARN' | 'DEBUG' | 'ERROR'): string { switch (level) { case 'INFO': return 'green'; @@ -105,8 +169,9 @@ export class SystemLogComponent implements OnInit, OnDestroy { return 'gray'; case 'ERROR': return 'red'; + default: + return 'black'; } - return 'black'; } public unsubscribe() { @@ -117,4 +182,49 @@ export class SystemLogComponent implements OnInit, OnDestroy { this.ngUnsubscribe.complete(); this.ngUnsubscribe = new Subject(); } + + /** + * Search on change, triggered by searchbar input-event. + * + * @param event from template passed event + */ + protected searchOnChange(searchParams?: SelectCustomEvent): void { + + if (searchParams) { + this.searchParams = searchParams?.target?.value ?? null; + } + + this.filterLogs(); + } + + /** + * Filters the logs + */ + private filterLogs(): void { + + if (this.query === null && this.searchParams === null) { + this.logLines = this._logLines; + return; + } + + this.logLines = this._logLines + .filter(line => (this.searchParams != null && this.searchParams?.length > 0) + ? this.searchParams?.includes(line.level) + : true) + .reduce((arr: typeof this.logLines, el) => { + + if (this.query == null || !this.query.length) { + return this._logLines; + } + + const message = el.message.split('
').filter(el => el.toLowerCase().includes(this.query!.toLowerCase())).join('
'); + + if (message?.length > 0) { + el.message = message; + arr.push(el); + } + + return arr; + }, []); + } } diff --git a/ui/src/app/shared/genericComponents/chart/abstracthistorychart.ts b/ui/src/app/shared/genericComponents/chart/abstracthistorychart.ts index c64b512460b..6cfedde7115 100644 --- a/ui/src/app/shared/genericComponents/chart/abstracthistorychart.ts +++ b/ui/src/app/shared/genericComponents/chart/abstracthistorychart.ts @@ -610,17 +610,15 @@ export abstract class AbstractHistoryChart implements OnInit { const isHidden = legendItem?.strokeThroughHidingStyle ?? null; - displayValues.filter(element => element.name == dataset.label?.split(":")[0]).forEach(() => { - chartLegendLabelItems.push({ - text: dataset.label, - datasetIndex: index, - fontColor: getComputedStyle(document.documentElement).getPropertyValue('--ion-color-text'), - fillStyle: dataset.backgroundColor?.toString(), - hidden: isHidden != null ? isHidden : !chart.isDatasetVisible(index), - lineWidth: 2, - strokeStyle: dataset.borderColor.toString(), - ...(dataset['borderDash'] != null && { lineDash: dataset['borderDash'] }), - }); + chartLegendLabelItems.push({ + text: dataset.label, + datasetIndex: index, + fontColor: getComputedStyle(document.documentElement).getPropertyValue('--ion-color-text'), + fillStyle: dataset.backgroundColor?.toString(), + hidden: isHidden != null ? isHidden : !chart.isDatasetVisible(index), + lineWidth: 2, + strokeStyle: dataset.borderColor.toString(), + ...(dataset['borderDash'] != null && { lineDash: dataset['borderDash'] }), }); }); diff --git a/ui/src/app/shared/genericComponents/shared/notification/notification.ts b/ui/src/app/shared/genericComponents/shared/notification/notification.ts index 67e08daab21..29c40f467ae 100644 --- a/ui/src/app/shared/genericComponents/shared/notification/notification.ts +++ b/ui/src/app/shared/genericComponents/shared/notification/notification.ts @@ -47,7 +47,6 @@ export class NotificationComponent implements OnInit, OnChanges { translucent: false, message: this.text, position: 'bottom', - cssClass: 'text-overflow-break', buttons: [ { icon: 'close-outline', role: 'cancel' }, ], diff --git a/ui/src/app/shared/header/header.component.ts b/ui/src/app/shared/header/header.component.ts index a1b4d2b76a7..c2d29797747 100644 --- a/ui/src/app/shared/header/header.component.ts +++ b/ui/src/app/shared/header/header.component.ts @@ -63,7 +63,7 @@ export class HeaderComponent implements OnInit, OnDestroy, AfterViewChecked { const urlArray = url.split('/'); const file = urlArray.pop(); - if (file == 'user' || file == 'settings' || file == 'changelog' || urlArray.length > 3) { + if (file == 'user' || file == 'settings' || file == 'changelog' || file == 'login' || urlArray.length > 3) { // disable side-menu; show back-button instead this.enableSideMenu = false; } else { diff --git a/ui/src/app/shared/shared.ts b/ui/src/app/shared/shared.ts index 90b7b4ca963..3d6b661fa1f 100644 --- a/ui/src/app/shared/shared.ts +++ b/ui/src/app/shared/shared.ts @@ -11,6 +11,8 @@ export { GridMode } from "./type/general"; export { SystemLog } from "./type/systemlog"; export { Widget, WidgetFactory, WidgetNature, Widgets } from "./type/widget"; +import { AlertController, AlertOptions } from "@ionic/angular"; +import { TranslateService } from "@ngx-translate/core"; import { addIcons } from 'ionicons'; import { Edge } from "./edge/edge"; import { User } from "./jsonrpc/shared"; @@ -124,3 +126,36 @@ export namespace Currency { CENT_PER_KWH = "Cent/kWh" } } + +export enum EssStateMachine { + UNDEFINED = -1, // + START_BATTERY = 10, // + START_BATTERY_INVERTER = 11, // + STARTED = 12, // + STOP_BATTERY_INVERTER = 20, // + STOP_BATTERY = 21, // + STOPPED = 22, // + ERROR = 30, +} + +/** +* Presents a simple +*/ +export async function presentAlert(alertController: AlertController, translate: TranslateService, alertOptions: AlertOptions) { + + if (!alertOptions?.buttons) { + throw new Error("Confirmation button is missing"); + } + + const alert = alertController.create({ + ...alertOptions, + buttons: [{ + text: translate.instant('General.cancel'), + role: 'cancel', + }, + ...(alertOptions?.buttons ?? []), + ], + cssClass: 'alertController', + }); + (await alert).present(); +} diff --git a/ui/src/app/shared/utils/date/dateutils.spec.ts b/ui/src/app/shared/utils/date/dateutils.spec.ts index 91af5e6dfb2..74726142dcd 100644 --- a/ui/src/app/shared/utils/date/dateutils.spec.ts +++ b/ui/src/app/shared/utils/date/dateutils.spec.ts @@ -35,4 +35,13 @@ describe('DateUtils', () => { expect(DateUtils.stringToDate('2023-01-02')).toEqual(new Date(Date.parse('2023-01-02'))); expect(DateUtils.stringToDate('wrong format')).toEqual(null); }); + + it('#isDateBefore - checks if given date is before date to be compared to', () => { + const date: Date = DateUtils.stringToDate('2023-01-01'); + expect(DateUtils.isDateBefore(date, DateUtils.stringToDate("2023-01-31"))).toEqual(true); + expect(DateUtils.isDateBefore(date, DateUtils.stringToDate("2022-12-31"))).toEqual(false); + expect(DateUtils.isDateBefore(date, DateUtils.stringToDate("2023-01-01"))).toEqual(false); + expect(DateUtils.isDateBefore(date, null)).toEqual(false); + expect(DateUtils.isDateBefore(null, DateUtils.stringToDate("2023-01-01"))).toEqual(false); + }); }); diff --git a/ui/src/app/shared/utils/date/dateutils.ts b/ui/src/app/shared/utils/date/dateutils.ts index 9ec1355b01f..ff97467488a 100644 --- a/ui/src/app/shared/utils/date/dateutils.ts +++ b/ui/src/app/shared/utils/date/dateutils.ts @@ -1,3 +1,4 @@ +import { isBefore } from "date-fns"; export namespace DateUtils { @@ -76,4 +77,18 @@ export namespace DateUtils { export function isFullHour(date: Date) { return date.getMinutes() != 0 ? null : date; } + + /** + * Checks if passed date is before a certain date + * + * @param date the date + * @param compareDate the date to compare it to + * @returns true, if the passed date is before compareDate + */ + export function isDateBefore(date: Date, compareDate: Date): boolean { + if (date != null && compareDate != null) { + return isBefore(date, compareDate); + } + return false; + } } diff --git a/ui/src/assets/i18n/de.json b/ui/src/assets/i18n/de.json index e1fd38cc65a..3051c67304f 100644 --- a/ui/src/assets/i18n/de.json +++ b/ui/src/assets/i18n/de.json @@ -350,7 +350,8 @@ "level": "Level", "message": "Nachricht", "source": "Quelle", - "timestamp": "Zeitpunkt" + "timestamp": "Zeitpunkt", + "CONDENSED_OUTPUT": "Komprimierte Ausgabe" }, "Controller": { "app": "Anwendung:", @@ -935,7 +936,11 @@ "RESTARTED": "{{system}} neu starten war erfolgreich.", "RESTART_FAILED": "{{system}}-Neustart fehlgeschlagen.", "RESTART_CONFIRMATION": "Möchten Sie {{system}} neu starten?", - "RESTART_WARNING": "Während {{system}} neu startet ist die Kommunikation unterbrochen. In dieser Zeit werden keine Daten aufgezeichnet oder Komponenten angesteuert. Bitte stellen Sie sicher, dass sich das Gesamtsystem in einem sicheren Zustand befindet." + "RESTART_WARNING": "Während {{system}} neu startet ist die Kommunikation unterbrochen. In dieser Zeit werden keine Daten aufgezeichnet oder Komponenten angesteuert. Bitte stellen Sie sicher, dass sich das Gesamtsystem in einem sicheren Zustand befindet.", + "CONFIRMATION_INFO": "Möchten Sie ihr {{edgeShortName}} aktualisieren?", + "WARNING": "Im Rahmen des Systemupdates wird {{system}} neu gestartet und dabei die Kommunikation unterbrochen. In dieser Zeit werden keine Daten aufgezeichnet oder Komponenten angesteuert. Bitte stellen Sie sicher, dass sich das Gesamtsystem in einem sicheren Zustand befindet.", + "UPDATE_EXECUTE": "Systemupdate durchführen", + "SUB_HEADER": "Möchten Sie ein Systemupdate durchführen?" } }, "CHANNELS": { diff --git a/ui/src/assets/i18n/en.json b/ui/src/assets/i18n/en.json index 96a04d721fd..ad2e259af25 100644 --- a/ui/src/assets/i18n/en.json +++ b/ui/src/assets/i18n/en.json @@ -351,7 +351,8 @@ "level": "Level", "message": "Message", "source": "Source", - "timestamp": "Timestamp" + "timestamp": "Timestamp", + "CONDENSED_OUTPUT": "Condensed Output" }, "Controller": { "app": "App:", @@ -938,7 +939,11 @@ "RESTARTING": "Restarting {{system}}. (This can take up to {{minutes}} minutes)", "RESTARTED": "{{system}} restarting successful.", "RESTART_CONFIRMATION": "Would you like to restart {{system}}?", - "RESTART_WARNING": "Communication is interrupted while {{system}} is restarting. No data is recorded or components controlled during this time. Please ensure that the entire system is in a safe state." + "RESTART_WARNING": "Communication is interrupted while {{system}} is restarting. No data is recorded or components controlled during this time. Please ensure that the entire system is in a safe state.", + "CONFIRMATION_INFO": "Would you like to update your {{edgeShortName}}?", + "WARNING": "The software will restart after the system update. No data is recorded or components controlled during this time. Please ensure that the entire system is in a safe state.", + "UPDATE_EXECUTE": "Execute system update", + "SUB_HEADER": "Would you like to execute a system update?" } }, "CHANNELS": { diff --git a/ui/src/global.scss b/ui/src/global.scss index fa6bb9d10a4..f29dac900c2 100644 --- a/ui/src/global.scss +++ b/ui/src/global.scss @@ -313,11 +313,6 @@ formly-input-section { width: 50%; color: var(--ion-color-primary); } - - // Used for notification component - .text-overflow-break { - line-break: anywhere; - } } // auto height for modals