From 9df274e210877185400554ba11fce12ab1a2058f Mon Sep 17 00:00:00 2001
From: DerWahreKlinki <102486171+DerWahreKlinki@users.noreply.github.com>
Date: Mon, 28 Mar 2022 16:00:31 +0200
Subject: [PATCH] Fix SDM 630 modbus addresses for Reactive Power (#1772)

---
 .../sdm630/MeterMicrocareSdm630Impl.java          | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630Impl.java b/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630Impl.java
index f785179c5f8..1c2cbf74607 100644
--- a/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630Impl.java
+++ b/io.openems.edge.meter.microcare.sdm630/src/io/openems/edge/meter/microcare/sdm630/MeterMicrocareSdm630Impl.java
@@ -123,19 +123,20 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								new FloatDoublewordElement(30017 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
+						new DummyRegisterElement(30019 - offset, 30024 - offset),
 						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1,
-								new FloatDoublewordElement(30019 - offset).wordOrder(WordOrder.MSWLSW)
+								new FloatDoublewordElement(30025 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
 						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2,
-								new FloatDoublewordElement(30021 - offset).wordOrder(WordOrder.MSWLSW)
+								new FloatDoublewordElement(30027 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
 						m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3,
-								new FloatDoublewordElement(30023 - offset).wordOrder(WordOrder.MSWLSW)
+								new FloatDoublewordElement(30029 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
-						new DummyRegisterElement(30025 - offset, 30048 - offset),
+						new DummyRegisterElement(30031 - offset, 30048 - offset),
 						m(SymmetricMeter.ChannelId.CURRENT,
 								new FloatDoublewordElement(30049 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
@@ -145,12 +146,12 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
 								new FloatDoublewordElement(30053 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
-						new DummyRegisterElement(30055 - offset, 30056 - offset),
+						new DummyRegisterElement(30055 - offset, 30060 - offset),
 						m(SymmetricMeter.ChannelId.REACTIVE_POWER,
-								new FloatDoublewordElement(30057 - offset).wordOrder(WordOrder.MSWLSW)
+								new FloatDoublewordElement(30061 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),
 								ElementToChannelConverter.DIRECT_1_TO_1),
-						new DummyRegisterElement(30059 - offset, 30070 - offset),
+						new DummyRegisterElement(30063 - offset, 30070 - offset),
 						m(SymmetricMeter.ChannelId.FREQUENCY,
 								new FloatDoublewordElement(30071 - offset).wordOrder(WordOrder.MSWLSW)
 										.byteOrder(ByteOrder.BIG_ENDIAN),