Fix: huawei grid charger efficiency value

closes #1549.
hoylabs · Jan 18, 2025 · ea7ab87 · ea7ab87
1 parent 92aed53
commit ea7ab87
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/include/gridcharger/huawei/DataPoints.h b/include/gridcharger/huawei/DataPoints.h
@@ -31,7 +31,7 @@ LABEL_TRAIT(InputPower,         "W");
 LABEL_TRAIT(InputFrequency,     "Hz");
 LABEL_TRAIT(InputCurrent,       "A");
 LABEL_TRAIT(OutputPower,        "W");
-LABEL_TRAIT(Efficiency,         "%");
+LABEL_TRAIT(Efficiency,         ""); // no unit as value is in decimals, e.g., 0.88 for 88%
 LABEL_TRAIT(OutputVoltage,      "V");
 LABEL_TRAIT(OutputCurrentMax,   "A");
 LABEL_TRAIT(InputVoltage,       "V");

diff --git a/src/gridcharger/huawei/Controller.cpp b/src/gridcharger/huawei/Controller.cpp
@@ -377,8 +377,15 @@ void Controller::getJsonData(JsonVariant& root) const
     VAL(OutputPower, "output_power");
     VAL(InputTemperature, "input_temp");
     VAL(OutputTemperature, "output_temp");
-    VAL(Efficiency, "efficiency");
 #undef VAL
+
+    // special handling for efficiency, as we need to multiply it
+    // to get the percentage (rather than the decimal notation).
+    auto oEfficiency = _dataPoints.getDataPointFor<Label::Efficiency>();
+    if (oEfficiency) {
+        root["efficiency"]["v"] = *_dataPoints.get<Label::Efficiency>() * 100;
+        root["efficiency"]["u"] = oEfficiency->getUnitText();
+    }
 }
 
 } // namespace GridCharger::Huawei