Mising tsmode -> tsquality.

dnp3 · Jun 20, 2019 · 2cc5d98 · 2cc5d98
1 parent bc56488
commit 2cc5d98
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/cpp/lib/include/opendnp3/master/HeaderInfo.h b/cpp/lib/include/opendnp3/master/HeaderInfo.h
@@ -38,17 +38,17 @@ class HeaderInfo
     HeaderInfo()
         : gv(GroupVariation::UNKNOWN),
           qualifier(QualifierCode::UNDEFINED),
-          tsmode(TimestampQuality::INVALID),
+          tsquality(TimestampQuality::INVALID),
           isEventVariation(false),
           flagsValid(false),
           headerIndex(0)
     {
     }
 
-    HeaderInfo(GroupVariation gv_, QualifierCode qualifier_, TimestampQuality tsmode_, uint32_t headerIndex_)
+    HeaderInfo(GroupVariation gv_, QualifierCode qualifier_, TimestampQuality tsquality_, uint32_t headerIndex_)
         : gv(gv_),
           qualifier(qualifier_),
-          tsmode(tsmode_),
+          tsquality(tsquality_),
           isEventVariation(IsEvent(gv_)),
           flagsValid(HasFlags(gv_)),
           headerIndex(headerIndex_)
@@ -60,7 +60,7 @@ class HeaderInfo
     /// The qualifier code enumeration for the header
     QualifierCode qualifier;
     /// Enumeration that provides information about the validity of timestamps on the associated objects
-    TimestampQuality tsmode;
+    TimestampQuality tsquality;
     /// True if the specfied variation is an event variation
     bool isEventVariation;
     /// True if the flags on the value were present on underlying type, false if online is just assumed

diff --git a/cpp/lib/include/opendnp3/master/PrintingSOEHandler.h b/cpp/lib/include/opendnp3/master/PrintingSOEHandler.h
@@ -80,10 +80,10 @@ class PrintingSOEHandler final : public ISOEHandler
         return oss.str();
     }
 
-    static std::string GetTimeString(TimestampQuality tsmode)
+    static std::string GetTimeString(TimestampQuality tsquality)
     {
         std::ostringstream oss;
-        switch (tsmode)
+        switch (tsquality)
         {
         case (TimestampQuality::SYNCHRONIZED):
             return "synchronized";

diff --git a/cpp/lib/src/master/MeasurementHandler.h b/cpp/lib/src/master/MeasurementHandler.h
@@ -111,10 +111,10 @@ class MeasurementHandler final : public IAPDUHandler
     }
 
     template<class T>
-    IINField LoadValues(const HeaderRecord& record, TimestampQuality tsmode, const ICollection<Indexed<T>>& values)
+    IINField LoadValues(const HeaderRecord& record, TimestampQuality tsquality, const ICollection<Indexed<T>>& values)
     {
         this->CheckForTxStart();
-        HeaderInfo info(record.enumeration, record.GetQualifierCode(), tsmode, record.headerIndex);
+        HeaderInfo info(record.enumeration, record.GetQualifierCode(), tsquality, record.headerIndex);
         this->pSOEHandler->Process(info, values);
         return IINField();
     }

diff --git a/cpp/tests/unit/TestMaster.cpp b/cpp/tests/unit/TestMaster.cpp
@@ -578,7 +578,7 @@ TEST_CASE(SUITE("ReceiveCTOSynchronized"))
     auto record = t.meas->binarySOE[7];
     bool equal = record.meas == Binary(true, Flags(0x01), DNPTime(0x04, TimestampQuality::SYNCHRONIZED)); // timestamp is 4
     REQUIRE(equal);
-    REQUIRE(record.info.tsmode == TimestampQuality::SYNCHRONIZED);
+    REQUIRE(record.info.tsquality == TimestampQuality::SYNCHRONIZED);
 }
 
 TEST_CASE(SUITE("ReceiveCTOUnsynchronized"))
@@ -594,7 +594,7 @@ TEST_CASE(SUITE("ReceiveCTOUnsynchronized"))
     auto record = t.meas->binarySOE[7];
     bool equal = record.meas == Binary(true, Flags(0x01), DNPTime(0x04, TimestampQuality::UNSYNCHRONIZED)); // timestamp is 4
     REQUIRE(equal);
-    REQUIRE(record.info.tsmode == TimestampQuality::UNSYNCHRONIZED);
+    REQUIRE(record.info.tsquality == TimestampQuality::UNSYNCHRONIZED);
 }
 
 TEST_CASE(SUITE("ReceiveIINinResponses"))

diff --git a/cpp/tests/unit/TestMeasurementHandler.cpp b/cpp/tests/unit/TestMeasurementHandler.cpp
@@ -54,7 +54,7 @@ TEST_CASE(SUITE("parses g121v1 correctly"))
 
         auto& stat = soe.securityStatSOE[2];
 
-        REQUIRE(stat.info.tsmode == TimestampQuality::INVALID);
+        REQUIRE(stat.info.tsquality == TimestampQuality::INVALID);
         REQUIRE(stat.info.gv == GroupVariation::Group121Var1);
         REQUIRE_FALSE(stat.info.isEventVariation);
         REQUIRE(stat.meas.value.count == 8);
@@ -74,7 +74,7 @@ TEST_CASE(SUITE("parses g122v1 correctly"))
 
         auto& stat = soe.securityStatSOE[3];
 
-        REQUIRE(stat.info.tsmode == TimestampQuality::INVALID);
+        REQUIRE(stat.info.tsquality == TimestampQuality::INVALID);
         REQUIRE(stat.info.gv == GroupVariation::Group122Var1);
         REQUIRE(stat.meas.value.count == 8);
         REQUIRE(stat.meas.value.assocId == 7);
@@ -93,7 +93,7 @@ TEST_CASE(SUITE("parses g122v2 correctly"))
 
         auto& stat = soe.securityStatSOE[3];
 
-        REQUIRE(stat.info.tsmode == TimestampQuality::SYNCHRONIZED);
+        REQUIRE(stat.info.tsquality == TimestampQuality::SYNCHRONIZED);
         REQUIRE(stat.info.gv == GroupVariation::Group122Var2);
         REQUIRE(stat.info.isEventVariation);
         REQUIRE(stat.meas.value.count == 8);

diff --git a/dotnet/CLRAdapter/src/SOEHandlerAdapter.cpp b/dotnet/CLRAdapter/src/SOEHandlerAdapter.cpp
@@ -31,7 +31,7 @@ namespace Automatak
 			HeaderInfo ^ ConvertHeaderInfo(const opendnp3::HeaderInfo& info)
             {
                 return gcnew HeaderInfo((GroupVariation)info.gv, (QualifierCode)info.qualifier,
-                                        (TimestampQuality)info.tsmode, info.isEventVariation, info.flagsValid,
+                                        (TimestampQuality)info.tsquality, info.isEventVariation, info.flagsValid,
                                         info.headerIndex);
             }
 

diff --git a/java/cpp/adapters/SOEHandlerAdapter.cpp b/java/cpp/adapters/SOEHandlerAdapter.cpp
@@ -169,10 +169,10 @@ LocalRef<jobject> SOEHandlerAdapter::Convert(JNIEnv* env, const opendnp3::Header
 {
     auto gv = jni::JCache::GroupVariation.fromType(env, GroupVariationSpec::to_type(info.gv));
     auto qc = jni::JCache::QualifierCode.fromType(env, QualifierCodeSpec::to_type(info.qualifier));
-    auto tsmode = jni::JCache::TimestampQuality.fromType(env, static_cast<jint>(info.tsmode));
+    auto tsquality = jni::JCache::TimestampQuality.fromType(env, static_cast<jint>(info.tsquality));
     jboolean isEvent = static_cast<jboolean>(info.isEventVariation);
     jboolean flagsValid = static_cast<jboolean>(info.flagsValid);
     jint headerIndex = info.headerIndex;
 
-    return jni::JCache::HeaderInfo.init6(env, gv, qc, tsmode, isEvent, flagsValid, headerIndex);
+    return jni::JCache::HeaderInfo.init6(env, gv, qc, tsquality, isEvent, flagsValid, headerIndex);
 }