[growatt] Binding for Growatt solar inverters

bundles/org.openhab.binding.growatt/src/main/java/org/openhab/binding/growatt/internal/cloud/GrowattCloud.java

@@ -189,6 +189,10 @@ private Map<String, JsonElement> doHttpRequestInner(HttpMethod method, String en
             request.content(new FormContentProvider(fields), FORM_CONTENT);
         }
 
+        if (logger.isTraceEnabled()) {
+            logger.trace("{} {} {} params={} fields={}", method, endPoint, request.getVersion(), params, fields);
+        }
+
         ContentResponse response;
         try {
             response = request.send();
@@ -197,16 +201,20 @@ private Map<String, JsonElement> doHttpRequestInner(HttpMethod method, String en
         }
 
         int status = response.getStatus();
+        String content = response.getContentAsString();
+
+        if (logger.isTraceEnabled()) {
+            logger.trace("HTTP {} {} content:{}", status, HttpStatus.getMessage(status), content);
+        }
+
         if (status != HttpStatus.OK_200) {
             throw new GrowattApiException(String.format("HTTP %d %s", status, HttpStatus.getMessage(status)));
         }
 
-        String content = response.getContentAsString();
         if (content == null || content.isBlank()) {
             throw new GrowattApiException("HTTP response content is " + (content == null ? "null" : "blank"));
         }
 
-        logger.trace("doHttpRequestInner() response:{}", content);
         try {
             JsonElement jsonObject = JsonParser.parseString(content).getAsJsonObject();
             if (jsonObject instanceof JsonObject jsonElement) {

bundles/org.openhab.binding.growatt/src/main/java/org/openhab/binding/growatt/internal/dto/GrottValues.java

@@ -84,8 +84,8 @@ public static String getFieldName(String channelId) {
     public @Nullable @SerializedName(value = "op_va", alternate = { "AC_InVA" }) Integer inverter_va;
 
     // battery discharge / charge power
-    public @Nullable @SerializedName(value = "p1charge1", alternate = { "acchr_watt", "BatWatt" }) Integer charge_power;
-    public @Nullable @SerializedName(value = "pdischarge1", alternate = { "ACDischarWatt", "BatDischarWatt" }) Integer discharge_power;
+    public @Nullable @SerializedName(value = "p1charge1", alternate = { "acchr_watt", "BatWatt", "bdc1_pchr" }) Integer charge_power;
+    public @Nullable @SerializedName(value = "pdischarge1", alternate = { "ACDischarWatt", "BatDischarWatt", "bdc1_pdischr" }) Integer discharge_power;
 
     // miscellaneous battery
     public @Nullable @SerializedName(value = "ACCharCurr") Integer charge_current;
@@ -109,7 +109,7 @@ public static String getFieldName(String channelId) {
     public @Nullable @SerializedName(value = "plocaloads") Integer load_power_s;
     public @Nullable @SerializedName(value = "plocaloadt") Integer load_power_t;
 
-    // solar AC grid energy
+    // inverter AC energy
     public @Nullable @SerializedName(value = "eactoday", alternate = { "pvenergytoday" }) Integer inverter_energy_today;
     public @Nullable @SerializedName(value = "eactotal", alternate = { "pvenergytotal" }) Integer inverter_energy_total;
 
@@ -163,9 +163,9 @@ public static String getFieldName(String channelId) {
 
     // battery data
     public @Nullable @SerializedName(value = "batterytype") Integer battery_type;
-    public @Nullable @SerializedName(value = "batttemp", alternate = { "bms_batterytemp" }) Integer battery_temperature;
+    public @Nullable @SerializedName(value = "batttemp", alternate = { "bdc1_tempa" }) Integer battery_temperature;
     public @Nullable @SerializedName(value = "vbat", alternate = { "uwBatVolt_DSP", "bat_Volt", "bms_batteryvolt" }) Integer battery_voltage;
-    public @Nullable @SerializedName(value = "bat_dsp", alternate = { "bms_status" }) Integer battery_display;
+    public @Nullable @SerializedName(value = "bat_dsp") Integer battery_display;
     public @Nullable @SerializedName(value = "SOC", alternate = { "batterySOC", "bms_soc" }) Integer battery_soc;
 
     // fault codes

bundles/org.openhab.binding.growatt/src/test/java/org/openhab/binding/growatt/test/GrowattTest.java

@@ -351,7 +351,7 @@ void testThreePhaseGrottValuesContents() throws FileNotFoundException, IOExcepti
 
         Map<String, QuantityType<?>> channelStates = grottValues.getChannelStates();
         assertNotNull(channelStates);
-        assertEquals(63, channelStates.size());
+        assertEquals(64, channelStates.size());
 
         assertEquals(QuantityType.valueOf(-36.5, Units.WATT), channelStates.get("inverter-power"));
         assertEquals(QuantityType.valueOf(11, Units.PERCENT), channelStates.get("battery-soc"));