Rename FLD_PRA to FLD_Q

tbnobody · Apr 24, 2023 · 98da2b6 · 98da2b6
1 parent 270a7f4
commit 98da2b6
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/include/MqttHandleHass.h b/include/MqttHandleHass.h
@@ -44,7 +44,7 @@ const byteAssign_fieldDeviceClass_t deviceFieldAssignment[] = {
     { FLD_PF, DEVICE_CLS_POWER_FACTOR, STATE_CLS_MEASUREMENT },
     { FLD_EFF, DEVICE_CLS_NONE, STATE_CLS_NONE },
     { FLD_IRR, DEVICE_CLS_NONE, STATE_CLS_NONE },
-    { FLD_PRA, DEVICE_CLS_REACTIVE_POWER, STATE_CLS_MEASUREMENT }
+    { FLD_Q, DEVICE_CLS_REACTIVE_POWER, STATE_CLS_MEASUREMENT }
 };
 #define DEVICE_CLS_ASSIGN_LIST_LEN (sizeof(deviceFieldAssignment) / sizeof(byteAssign_fieldDeviceClass_t))
 

diff --git a/include/MqttHandleInverter.h b/include/MqttHandleInverter.h
@@ -33,7 +33,7 @@ class MqttHandleInverterClass {
         FLD_PF,
         FLD_EFF,
         FLD_IRR,
-        FLD_PRA
+        FLD_Q
     };
 };
 

diff --git a/include/WebApi_prometheus.h b/include/WebApi_prometheus.h
@@ -40,6 +40,6 @@ class WebApiPrometheusClass {
         { FLD_PF, METRIC_TYPE_GAUGE },
         { FLD_EFF, METRIC_TYPE_GAUGE },
         { FLD_IRR, METRIC_TYPE_GAUGE },
-        { FLD_PRA, METRIC_TYPE_GAUGE }
+        { FLD_Q, METRIC_TYPE_GAUGE }
     };
 };
diff --git a/lib/Hoymiles/src/inverters/HMS_1CH.cpp b/lib/Hoymiles/src/inverters/HMS_1CH.cpp
@@ -15,7 +15,7 @@ static const byteAssign_t byteAssignment[] = {
     { TYPE_AC, CH0, FLD_UAC, UNIT_V, 14, 2, 10, false, 1 },
     { TYPE_AC, CH0, FLD_IAC, UNIT_A, 22, 2, 100, false, 2 },
     { TYPE_AC, CH0, FLD_PAC, UNIT_W, 18, 2, 10, false, 1 },
-    { TYPE_AC, CH0, FLD_PRA, UNIT_VAR, 20, 2, 10, false, 1 },
+    { TYPE_AC, CH0, FLD_Q, UNIT_VAR, 20, 2, 10, false, 1 },
     { TYPE_AC, CH0, FLD_F, UNIT_HZ, 16, 2, 100, false, 2 },
     { TYPE_AC, CH0, FLD_PF, UNIT_NONE, 24, 2, 1000, false, 3 },
 

diff --git a/lib/Hoymiles/src/inverters/HMS_2CH.cpp b/lib/Hoymiles/src/inverters/HMS_2CH.cpp
@@ -22,7 +22,7 @@ static const byteAssign_t byteAssignment[] = {
     { TYPE_AC, CH0, FLD_UAC, UNIT_V, 26, 2, 10, false, 1 },
     { TYPE_AC, CH0, FLD_IAC, UNIT_A, 34, 2, 100, false, 2 },
     { TYPE_AC, CH0, FLD_PAC, UNIT_W, 30, 2, 10, false, 1 },
-    { TYPE_AC, CH0, FLD_PRA, UNIT_VAR, 32, 2, 10, false, 1 },
+    { TYPE_AC, CH0, FLD_Q, UNIT_VAR, 32, 2, 10, false, 1 },
     { TYPE_AC, CH0, FLD_F, UNIT_HZ, 28, 2, 100, false, 2 },
     { TYPE_AC, CH0, FLD_PF, UNIT_NONE, 36, 2, 1000, false, 3 },
 

diff --git a/lib/Hoymiles/src/inverters/HMS_4CH.cpp b/lib/Hoymiles/src/inverters/HMS_4CH.cpp
@@ -36,7 +36,7 @@ static const byteAssign_t byteAssignment[] = {
     { TYPE_AC, CH0, FLD_UAC, UNIT_V, 50, 2, 10, false, 1 },
     { TYPE_AC, CH0, FLD_IAC, UNIT_A, 58, 2, 100, false, 2 },
     { TYPE_AC, CH0, FLD_PAC, UNIT_W, 54, 2, 10, false, 1 },
-    { TYPE_AC, CH0, FLD_PRA, UNIT_VAR, 56, 2, 10, false, 1 },
+    { TYPE_AC, CH0, FLD_Q, UNIT_VAR, 56, 2, 10, false, 1 },
     { TYPE_AC, CH0, FLD_F, UNIT_HZ, 52, 2, 100, false, 2 },
     { TYPE_AC, CH0, FLD_PF, UNIT_NONE, 60, 2, 1000, false, 3 },
 

diff --git a/lib/Hoymiles/src/inverters/HMT_6CH.cpp b/lib/Hoymiles/src/inverters/HMT_6CH.cpp
@@ -56,7 +56,7 @@ static const byteAssign_t byteAssignment[] = {
     { TYPE_AC, CH0, FLD_UAC_31, UNIT_V, 78, 2, 10, false, 1 },
     { TYPE_AC, CH0, FLD_F, UNIT_HZ, 80, 2, 100, false, 2 },
     { TYPE_AC, CH0, FLD_PAC, UNIT_W, 82, 2, 10, false, 1 },
-    { TYPE_AC, CH0, FLD_PRA, UNIT_VAR, 84, 2, 10, true, 1 },
+    { TYPE_AC, CH0, FLD_Q, UNIT_VAR, 84, 2, 10, true, 1 },
     { TYPE_AC, CH0, FLD_IAC, UNIT_A, 86, 2, 100, false, 2 }, // dummy
     { TYPE_AC, CH0, FLD_IAC_1, UNIT_A, 86, 2, 100, false, 2 },
     { TYPE_AC, CH0, FLD_IAC_2, UNIT_A, 88, 2, 100, false, 2 },

diff --git a/lib/Hoymiles/src/inverters/HM_1CH.cpp b/lib/Hoymiles/src/inverters/HM_1CH.cpp
@@ -15,7 +15,7 @@ static const byteAssign_t byteAssignment[] = {
     { TYPE_AC, CH0, FLD_UAC, UNIT_V, 14, 2, 10, false, 1 },
     { TYPE_AC, CH0, FLD_IAC, UNIT_A, 22, 2, 100, false, 2 },
     { TYPE_AC, CH0, FLD_PAC, UNIT_W, 18, 2, 10, false, 1 },
-    { TYPE_AC, CH0, FLD_PRA, UNIT_VAR, 20, 2, 10, false, 1 },
+    { TYPE_AC, CH0, FLD_Q, UNIT_VAR, 20, 2, 10, false, 1 },
     { TYPE_AC, CH0, FLD_F, UNIT_HZ, 16, 2, 100, false, 2 },
     { TYPE_AC, CH0, FLD_PF, UNIT_NONE, 24, 2, 1000, false, 3 },
 

diff --git a/lib/Hoymiles/src/inverters/HM_2CH.cpp b/lib/Hoymiles/src/inverters/HM_2CH.cpp
@@ -23,7 +23,7 @@ static const byteAssign_t byteAssignment[] = {
     { TYPE_AC, CH0, FLD_UAC, UNIT_V, 26, 2, 10, false, 1 },
     { TYPE_AC, CH0, FLD_IAC, UNIT_A, 34, 2, 100, false, 2 },
     { TYPE_AC, CH0, FLD_PAC, UNIT_W, 30, 2, 10, false, 1 },
-    { TYPE_AC, CH0, FLD_PRA, UNIT_VAR, 32, 2, 10, false, 1 },
+    { TYPE_AC, CH0, FLD_Q, UNIT_VAR, 32, 2, 10, false, 1 },
     { TYPE_AC, CH0, FLD_F, UNIT_HZ, 28, 2, 100, false, 2 },
     { TYPE_AC, CH0, FLD_PF, UNIT_NONE, 36, 2, 1000, false, 3 },
 

diff --git a/lib/Hoymiles/src/inverters/HM_4CH.cpp b/lib/Hoymiles/src/inverters/HM_4CH.cpp
@@ -36,7 +36,7 @@ static const byteAssign_t byteAssignment[] = {
     { TYPE_AC, CH0, FLD_UAC, UNIT_V, 46, 2, 10, false, 1 },
     { TYPE_AC, CH0, FLD_IAC, UNIT_A, 54, 2, 100, false, 2 },
     { TYPE_AC, CH0, FLD_PAC, UNIT_W, 50, 2, 10, false, 1 },
-    { TYPE_AC, CH0, FLD_PRA, UNIT_VAR, 52, 2, 10, false, 1 },
+    { TYPE_AC, CH0, FLD_Q, UNIT_VAR, 52, 2, 10, false, 1 },
     { TYPE_AC, CH0, FLD_F, UNIT_HZ, 48, 2, 100, false, 2 },
     { TYPE_AC, CH0, FLD_PF, UNIT_NONE, 56, 2, 1000, false, 3 },
 

diff --git a/lib/Hoymiles/src/parser/StatisticsParser.h b/lib/Hoymiles/src/parser/StatisticsParser.h
@@ -37,7 +37,7 @@ enum FieldId_t {
     FLD_PF,
     FLD_EFF,
     FLD_IRR,
-    FLD_PRA,
+    FLD_Q,
     FLD_EVT_LOG,
     // HMT only
     FLD_UAC_1N,

diff --git a/src/WebApi_prometheus.cpp b/src/WebApi_prometheus.cpp
@@ -85,7 +85,7 @@ void WebApiPrometheusClass::onPrometheusMetricsGet(AsyncWebServerRequest* reques
                         addField(stream, serial, i, inv, t, c, FLD_F);
                         addField(stream, serial, i, inv, t, c, FLD_T);
                         addField(stream, serial, i, inv, t, c, FLD_PF);
-                        addField(stream, serial, i, inv, t, c, FLD_PRA);
+                        addField(stream, serial, i, inv, t, c, FLD_Q);
                         addField(stream, serial, i, inv, t, c, FLD_EFF);
                         addField(stream, serial, i, inv, t, c, FLD_IRR);
                     }

diff --git a/src/WebApi_ws_live.cpp b/src/WebApi_ws_live.cpp
@@ -141,7 +141,7 @@ void WebApiWsLiveClass::generateJsonResponse(JsonVariant& root)
                 addField(chanTypeObj, i, inv, t, c, FLD_F);
                 addField(chanTypeObj, i, inv, t, c, FLD_T);
                 addField(chanTypeObj, i, inv, t, c, FLD_PF);
-                addField(chanTypeObj, i, inv, t, c, FLD_PRA);
+                addField(chanTypeObj, i, inv, t, c, FLD_Q);
                 addField(chanTypeObj, i, inv, t, c, FLD_EFF);
                 if (t == TYPE_DC && inv->Statistics()->getStringMaxPower(c) > 0) {
                     addField(chanTypeObj, i, inv, t, c, FLD_IRR);