Merge pull request #1567 from OSGP/feature/simulator_data_not_valid

Only set DATA_NOT_VALID for first value in profile

Author: stefanermens

osgp/protocol-adapter-dlms/osgp-protocol-simulator-dlms/simulator/dlms-device-simulator/src/main/java/org/opensmartgridplatform/simulator/protocol/dlms/cosem/LoadProfileWithPeriod1.java

@@ -137,11 +137,16 @@ private void initBufferData() {
 
     this.bufferData = new CircularFifoQueue<>(PROFILE_ENTRIES);
 
-    final short amrProfileStatusCode = 4;
+    short amrProfileStatusCode = 0;
     long importValue = 0;
     long exportValue = 0;
 
     for (int i = 0; i < PROFILE_ENTRIES; i++) {
+      if (i == 0) {
+        amrProfileStatusCode = 4; // DATA_NOT_VALID
+      } else {
+        amrProfileStatusCode = 0;
+      }
       final Calendar cal = this.getNextDateTime();
       importValue += 1;
       exportValue += 2;

osgp/protocol-adapter-dlms/osgp-protocol-simulator-dlms/simulator/dlms-device-simulator/src/main/java/org/opensmartgridplatform/simulator/protocol/dlms/cosem/LoadProfileWithPeriod2.java

@@ -178,7 +178,7 @@ private void initBufferData() {
 
     this.bufferData = new CircularFifoQueue<>(PROFILE_ENTRIES);
 
-    final short amrProfileStatusCode = 4;
+    short amrProfileStatusCode = 0;
     long importRate1 = 0;
     long importRate2 = 0;
     long exportRate1 = 0;
@@ -189,6 +189,11 @@ private void initBufferData() {
     long mBusValue4 = 0;
 
     for (int i = 0; i < PROFILE_ENTRIES; i++) {
+      if (i == 0) {
+        amrProfileStatusCode = 4; // DATA_NOT_VALID
+      } else {
+        amrProfileStatusCode = 0;
+      }
       importRate1 += 1;
       importRate2 += 2;
       exportRate1 += 3;