Updated datapoint 1690 (ElectricalEnergySystemPhotovoltaicStatus), re…

…fering to MyHomeMyData/E3onCAN#6
open3e · Apr 20, 2024 · 2bc8d49 · 2bc8d49
1 parent ccc4b82
commit 2bc8d49
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/open3e/Open3Edatapoints.json b/src/open3e/Open3Edatapoints.json
@@ -21438,7 +21438,7 @@
         {
           "codec": "O3EInt16",
           "len": 2,
-          "id": "ActivePower String 1",
+          "id": "ActivePower cumulated",
           "args": {
             "scale": 1.0,
             "signed": true,
@@ -21448,7 +21448,7 @@
         {
           "codec": "O3EInt16",
           "len": 2,
-          "id": "RectivePower String 1",
+          "id": "RectivePower cumulated",
           "args": {
             "scale": 1.0,
             "signed": true,
@@ -21458,7 +21458,7 @@
         {
           "codec": "O3EInt16",
           "len": 2,
-          "id": "ActivePower String 2",
+          "id": "ActivePower String C",
           "args": {
             "scale": 1.0,
             "signed": true,
@@ -21468,7 +21468,7 @@
         {
           "codec": "O3EInt16",
           "len": 2,
-          "id": "RectivePower String 2",
+          "id": "RectivePower String C",
           "args": {
             "scale": 1.0,
             "signed": true,
@@ -21478,7 +21478,7 @@
         {
           "codec": "O3EInt16",
           "len": 2,
-          "id": "ActivePower String 3",
+          "id": "ActivePower String B",
           "args": {
             "scale": 1.0,
             "signed": true,
@@ -21488,7 +21488,7 @@
         {
           "codec": "O3EInt16",
           "len": 2,
-          "id": "RectivePower String 3",
+          "id": "RectivePower String B",
           "args": {
             "scale": 1.0,
             "signed": true,
@@ -21498,7 +21498,7 @@
         {
           "codec": "O3EInt16",
           "len": 2,
-          "id": "ActivePower cumulated",
+          "id": "ActivePower String A",
           "args": {
             "scale": 1.0,
             "signed": true,
@@ -21508,7 +21508,7 @@
         {
           "codec": "O3EInt16",
           "len": 2,
-          "id": "RectivePower cumulated",
+          "id": "RectivePower String A",
           "args": {
             "scale": 1.0,
             "signed": true,
@@ -32984,5 +32984,5 @@
     "id": "ExtendedEventLoggingHistory",
     "args": {}
   },
-  "Version": "20240314"
+  "Version": "20240420"
 }
diff --git a/src/open3e/Open3Edatapoints.py b/src/open3e/Open3Edatapoints.py
@@ -670,10 +670,10 @@
         1686 : RawCodec(3, "ElectricalEnergySystemPhotovoltaicLimitation"),
         1687 : O3EInt16(2, "ElectricalEnergySystemPhotovoltaicConfiguration", scale=10),
         1690 : O3EComplexType(17, "ElectricalEnergySystemPhotovoltaicStatus", 
-                                  [O3EInt16(2, "ActivePower String 1", scale=1.0, signed=True), O3EInt16(2, "RectivePower String 1", scale=1.0, signed=True),
-                                   O3EInt16(2, "ActivePower String 2", scale=1.0, signed=True), O3EInt16(2, "RectivePower String 2", scale=1.0, signed=True),
-                                   O3EInt16(2, "ActivePower String 3", scale=1.0, signed=True), O3EInt16(2, "RectivePower String 3", scale=1.0, signed=True),
-                                   O3EInt16(2, "ActivePower cumulated", scale=1.0, signed=True), O3EInt16(2, "RectivePower cumulated", scale=1.0, signed=True),
+                                  [O3EInt16(2, "ActivePower cumulated", scale=1.0, signed=True), O3EInt16(2, "RectivePower cumulated", scale=1.0, signed=True),
+                                   O3EInt16(2, "ActivePower String C", scale=1.0, signed=True), O3EInt16(2, "RectivePower String C", scale=1.0, signed=True),
+                                   O3EInt16(2, "ActivePower String B", scale=1.0, signed=True), O3EInt16(2, "RectivePower String B", scale=1.0, signed=True),
+                                   O3EInt16(2, "ActivePower String A", scale=1.0, signed=True), O3EInt16(2, "RectivePower String A", scale=1.0, signed=True),
                                    O3EInt8(1, "OpMode", scale=1.0, signed=False)]),
         1691 : O3EByteVal(1, "BusTopologyScanStatus"),
         1692 : RawCodec(1, "PowerGridCodeConfiguration"),