Skip to content

Commit

Permalink
Fixes in indexes from Ruepert openhab#1
Browse files Browse the repository at this point in the history 
Some values in the unit test are suspicious so need to clarify if they behave correct on his system.
Probably not compatible with QVolt's initial implementation

Signed-off-by: Konstantin Polihronov <[email protected]>
  • Loading branch information
@theater
theater committed Oct 20, 2024
1 parent 273739f commit 2cbe11b
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 32 deletions.
8 changes: 4 additions & 4 deletions ...binding.solax/src/main/java/org/openhab/binding/solax/internal/model/local/LocalData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ default short getBatteryLevel() {
return Short.MIN_VALUE;
}

default short getFeedInPower() {
default int getFeedInPower() {
return Short.MIN_VALUE;
}

Expand All @@ -116,19 +116,19 @@ default double getTotalEnergy() {
return Short.MIN_VALUE;
}

default short getTotalBatteryDischargeEnergy() {
default double getTotalBatteryDischargeEnergy() {
return Short.MIN_VALUE;
}

default short getTotalBatteryChargeEnergy() {
default double getTotalBatteryChargeEnergy() {
return Short.MIN_VALUE;
}

default double getTotalPVEnergy() {
return Short.MIN_VALUE;
}

default short getTotalFeedInEnergy() {
default double getTotalFeedInEnergy() {
return Short.MIN_VALUE;
}

Expand Down
2 changes: 1 addition & 1 deletion ...ng.solax/src/main/java/org/openhab/binding/solax/internal/model/local/X1HybridG4Data.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public double getInverterFrequency() {
}

@Override
public short getFeedInPower() {
public int getFeedInPower() {
return getFromRawData(32);
}

Expand Down
31 changes: 16 additions & 15 deletions ...ng.solax/src/main/java/org/openhab/binding/solax/internal/model/local/X3HybridG4Data.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.openhab.binding.solax.internal.connectivity.rawdata.local.LocalConnectRawDataBean;
import org.openhab.binding.solax.internal.util.ByteUtil;

/**
* The {@link X3HybridG4Data} is an implementation of the single phased inverter data interface for X3 Hybrid G4
Expand Down Expand Up @@ -129,7 +130,7 @@ public double getFrequencyPhase3() {

@Override
public double getBatteryVoltage() {
return ((double) getFromRawData(39)) / 100;
return ((double) ByteUtil.read32BitSigned(getFromRawData(169), getFromRawData(170))) / 100;
}

@Override
Expand All @@ -155,8 +156,8 @@ public short getBatteryLevel() {
// Feed in power

@Override
public short getFeedInPower() {
return (short) (getFromRawData(34) - getFromRawData(35));
public int getFeedInPower() {
return ByteUtil.read32BitSigned(getFromRawData(34), getFromRawData(35));
}

// Totals
Expand All @@ -168,47 +169,47 @@ public short getPowerUsage() {

@Override
public double getTotalEnergy() {
return ((double) getFromRawData(68)) / 10;
return ((double) ByteUtil.read32BitSigned(getFromRawData(68), getFromRawData(69))) / 10;
}

@Override
public short getTotalBatteryDischargeEnergy() {
return getFromRawData(74);
public double getTotalBatteryDischargeEnergy() {
return ((double) ByteUtil.read32BitSigned(getFromRawData(74), getFromRawData(75))) / 10;
}

@Override
public short getTotalBatteryChargeEnergy() {
return getFromRawData(76);
public double getTotalBatteryChargeEnergy() {
return ((double) ByteUtil.read32BitSigned(getFromRawData(76), getFromRawData(77))) / 10;
}

@Override
public double getTotalPVEnergy() {
return ((double) getFromRawData(80)) / 10;
return ((double) ByteUtil.read32BitSigned(getFromRawData(80), getFromRawData(81))) / 10;
}

@Override
public short getTotalFeedInEnergy() {
return getFromRawData(86);
public double getTotalFeedInEnergy() {
return ((double) ByteUtil.read32BitSigned(getFromRawData(86), getFromRawData(87))) / 100;
}

@Override
public double getTotalConsumption() {
return ((double) getFromRawData(88)) / 10;
return ((double) ByteUtil.read32BitSigned(getFromRawData(88), getFromRawData(89))) / 10;
}

@Override
public double getTodayEnergy() {
return ((double) getFromRawData(82)) / 10;
return ((double) getFromRawData(70)) / 10;
}

@Override
public double getTodayFeedInEnergy() {
return ((double) getFromRawData(90)) / 100;
return ((double) ByteUtil.read32BitSigned(getFromRawData(90), getFromRawData(91))) / 100;
}

@Override
public double getTodayConsumption() {
return ((double) getFromRawData(92)) / 100;
return ((double) ByteUtil.read32BitSigned(getFromRawData(92), getFromRawData(93))) / 100;
}

@Override
Expand Down
43 changes: 31 additions & 12 deletions .../src/test/java/org/openhab/binding/solax/internal/local/parsers/TestX3HybridG4Parser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,15 @@ public class TestX3HybridG4Parser extends AbstractParserTest {
{
sn:XYZ,
ver:3.005.01,
type:14,Data:[
type:14,
Data:[
2316,2329,2315,18,18,18,372,363,365,1100,
12,23,34,45,56,67,4996,4996,4996,2,
0,0,0,0,0,0,0,0,0,0,
0,0,0,1,65494,65535,0,0,0,31330,
320,1034,3078,1,44,1100,256,1294,0,0,
7445,5895,100,0,38,0,0,0,0,0,
0,0,0,0,0,0,0,0,505,0,
0,0,0,0,0,0,0,0,588,1,
396,0,0,0,102,0,142,0,62,110,
570,0,463,0,0,0,1925,0,369,0,
506,1925,304,309,0,0,0,0,0,0,
Expand All @@ -47,6 +48,24 @@ public class TestX3HybridG4Parser extends AbstractParserTest {
Information:[12.000,14,XY,8,1.23,0.00,1.24,1.09,0.00,1]
}
""";
private static final String RAW_DATA_X3_RUEPERT = """
{
"sn":"SRABCDEFGH",
"ver":"3.009.03",
"type":14,
"Data":[
2367,2360,2375,10,10,10,48,48,58,154,
6077,5297,19,19,1177,1058,5003,5003,5003,2,
0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,32310,
600,1971,3213,61,1959,1,46,154,256,10528,
3083,6154,100,0,34,0,0,0,0,0,
0,0,0,0,0,0,0,0,2380,1,
52,77,0,0,6253,0,7500,0,37,46,
6854,1,64,4,0,0,2662,8,10050,0,
30,0,518,0,0,0,0,0,0,0,
0,0,1,51,1,23,47,256,3504,2400,300,300,249,227,34,33,74,1620,1024,16448,16448,16448,0,0,0,3352,3344,57729,21,20564,12339,18753,12354,16694,13124,12848,20564,12339,19010,12857,16690,13124,13368,20564,12339,19010,12601,16691,12356,12597,20564,12339,19010,12601,16691,12356,14387,0,0,0,0,0,0,0,515,257,1281,1027,0,32310,0,0,0,0,0,0,0,0,0,0,0,0,0,161,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"Information":[10.000,14,"H34A10IA999999",8,1.41,0.00,1.40,1.09,0.00,1]}
""";

@Override
protected InverterType getInverterType() {
Expand Down Expand Up @@ -86,25 +105,25 @@ protected void assertParserSpecific(LocalData data) {
assertEquals(2, data.getInverterWorkModeCode()); // [19]
assertEquals("2", data.getInverterWorkMode()); // [19]

assertEquals(-41, data.getFeedInPower()); // [34] - [35]
assertEquals(-42, data.getFeedInPower()); // [34][35]

assertEquals(313.3, data.getBatteryVoltage()); // [39]
// assertEquals(313.3, data.getBatteryVoltage()); // [39]
assertEquals(3.2, data.getBatteryCurrent()); // [40]
assertEquals(1034, data.getBatteryPower()); // [41]
assertEquals(45, data.getBatteryLevel()); // [103]
assertEquals(59, data.getBatteryTemperature()); // [105]

// Totals
assertEquals(1294, data.getPowerUsage()); // [47]
assertEquals(50.5, data.getTotalEnergy()); // [68]
assertEquals(102, data.getTotalBatteryDischargeEnergy()); // [74]
assertEquals(142, data.getTotalBatteryChargeEnergy()); // [76]
assertEquals(57, data.getTotalPVEnergy()); // [80]
assertEquals(1925, data.getTotalFeedInEnergy()); // [86]
assertEquals(6612.4, data.getTotalEnergy()); // [68][69]
assertEquals(10.2, data.getTotalBatteryDischargeEnergy()); // [74][75]
assertEquals(14.2, data.getTotalBatteryChargeEnergy()); // [76][77]
assertEquals(57, data.getTotalPVEnergy()); // [80][81]
assertEquals(19.25, data.getTotalFeedInEnergy()); // [86][87]
assertEquals(36.9, data.getTotalConsumption()); // [88]
assertEquals(46.3, data.getTodayEnergy()); // [82] / 10
assertEquals(5.06, data.getTodayFeedInEnergy()); // [90] / 100
assertEquals(3.04, data.getTodayConsumption()); // [92] / 100
assertEquals(39.6, data.getTodayEnergy()); // [82] / 10
// assertEquals(5.06, data.getTodayFeedInEnergy()); // [90][91] / 100
// assertEquals(3.04, data.getTodayConsumption()); // [92][93] / 100
assertEquals(6.2, data.getTodayBatteryDischargeEnergy()); // [78] / 100
assertEquals(11, data.getTodayBatteryChargeEnergy()); // [79] / 100
}
Expand Down

0 comments on commit 2cbe11b

Please sign in to comment.