[solax] Add missing channels for X1 Hybrid G4 inverter (#20660)

* [solax] Add missing channels for X1 Hybrid G4 inverter

Signed-off-by: Konstantin Polihronov <polychronov@gmail.com>

Author: theater

bundles/org.openhab.binding.solax/src/main/java/org/openhab/binding/solax/internal/model/local/CommonLocalDeviceData.java

@@ -72,7 +72,7 @@ public long packU16(int indexMajor, int indexMinor) {
         short major = getFromRawData(indexMajor);
         short minor = getFromRawData(indexMinor);
         if (major == 0) {
-            return minor;
+            return Short.toUnsignedLong(minor);
         }
 
         return Integer.toUnsignedLong(major << 16 | minor & 0xFFFF);

bundles/org.openhab.binding.solax/src/main/java/org/openhab/binding/solax/internal/model/local/X1HybridG4Data.java

@@ -112,4 +112,44 @@ public short getBatteryLevel() {
     public short getInverterWorkModeCode() {
         return getFromRawData(10);
     }
+
+    @Override
+    public short getPowerUsage() {
+        return getFromRawData(38);
+    }
+
+    @Override
+    public double getTodayEnergy() {
+        return ((double) getFromRawData(13)) / 10;
+    }
+
+    @Override
+    public double getTotalPVEnergy() {
+        return ((double) packU16(12, 11)) / 10;
+    }
+
+    @Override
+    public double getTotalFeedInEnergy() {
+        return ((double) packU16(35, 34)) / 100;
+    }
+
+    @Override
+    public double getTotalConsumption() {
+        return ((double) packU16(37, 36)) / 100;
+    }
+
+    @Override
+    public double getTodayFeedInEnergy() {
+        return ((double) getFromRawData(39)) / 10;
+    }
+
+    @Override
+    public double getTodayBatteryDischargeEnergy() {
+        return ((double) getFromRawData(87)) / 10;
+    }
+
+    @Override
+    public double getTodayBatteryChargeEnergy() {
+        return ((double) getFromRawData(85)) / 10;
+    }
 }

bundles/org.openhab.binding.solax/src/main/java/org/openhab/binding/solax/internal/model/local/inverters/X1HybridG4DataParser.java

@@ -37,7 +37,10 @@ public class X1HybridG4DataParser implements RawDataParser {
             CHANNEL_INVERTER_PV_TOTAL_CURRENT, CHANNEL_BATTERY_POWER, CHANNEL_BATTERY_VOLTAGE, CHANNEL_BATTERY_CURRENT,
             CHANNEL_BATTERY_TEMPERATURE, CHANNEL_BATTERY_STATE_OF_CHARGE, CHANNEL_FEED_IN_POWER, CHANNEL_TIMESTAMP,
             CHANNEL_RAW_DATA, CHANNEL_INVERTER_OUTPUT_POWER, CHANNEL_INVERTER_OUTPUT_CURRENT,
-            CHANNEL_INVERTER_OUTPUT_VOLTAGE, CHANNEL_INVERTER_OUTPUT_FREQUENCY, CHANNEL_INVERTER_WORKMODE);
+            CHANNEL_INVERTER_OUTPUT_VOLTAGE, CHANNEL_INVERTER_OUTPUT_FREQUENCY, CHANNEL_INVERTER_WORKMODE,
+            CHANNEL_POWER_USAGE, CHANNEL_TODAY_ENERGY, CHANNEL_TOTAL_PV_ENERGY, CHANNEL_TOTAL_FEED_IN_ENERGY,
+            CHANNEL_TOTAL_CONSUMPTION, CHANNEL_TODAY_FEED_IN_ENERGY, CHANNEL_TODAY_BATTERY_DISCHARGE_ENERGY,
+            CHANNEL_TODAY_BATTERY_CHARGE_ENERGY);
 
     @Override
     public LocalData getData(LocalConnectRawDataBean rawData) {

bundles/org.openhab.binding.solax/src/test/java/org/openhab/binding/solax/internal/local/parsers/TestX1HybridG4Parser.java

@@ -73,6 +73,15 @@ protected void assertParserSpecific(LocalData data) {
         assertEquals(99, data.getBatteryLevel()); // [18]
 
         assertEquals(12, data.getFeedInPower()); // [32]
+
+        assertEquals(7.0, data.getTodayEnergy()); // [13]
+        assertEquals(5978.1, data.getTotalPVEnergy()); // packU16(12,11) / 10
+        assertEquals(448, data.getPowerUsage()); // [38]
+        assertEquals(132.4, data.getTotalFeedInEnergy()); // packU16(35,34) / 100
+        assertEquals(1944.2, data.getTotalConsumption()); // packU16(37,36) / 100
+        assertEquals(4.3, data.getTodayFeedInEnergy()); // [39]
+        assertEquals(5.7, data.getTodayBatteryDischargeEnergy()); // [87]
+        assertEquals(11.6, data.getTodayBatteryChargeEnergy()); // [85]
     }
 
     @Override