Merge pull request #211 from ryan2445/master

step7v5: handle interface timestamp conflicts in GetInterface(string blkName, S7ConvertingOptions myConvOpt)

Author: jogibear9988

LibNoDaveConnectionLibrary/DataTypes/Blocks/Step7V5/S7Block.cs

@@ -98,25 +98,6 @@ public class S7Block : Block
         /// </summary>
         public DateTime LastInterfaceChangeHistory { get; set; }
 
-        /// <summary>
-        /// Returns true if the plaintext interface timestamp is different from the MC7 interface timestamp
-        /// The default value of DateTime is DateTime.MinValue, so also check to make sure that both values are set
-        /// </summary>
-        public bool HasInterfaceTimestampConflict
-        {
-            get
-            {
-                if (!LastInterfaceChangeHistory.Equals(DateTime.MinValue) &&
-                    !LastInterfaceChange.Equals(DateTime.MinValue) &&
-                    !LastInterfaceChangeHistory.Equals(LastInterfaceChange))
-                {
-                    return true;
-                }
-
-                return false;
-            }
-        }
-
         /// <summary>
         /// The total size of the Interface table 
         /// </summary>
@@ -236,6 +217,22 @@ public enum S7BlockAtributes: byte
             //ReadOnly
 
         }
+
+        /// <summary>
+        /// Returns true if dt1 and dt2 are not equal
+        /// Also checks that both values are not the default value (DateTime.MinValue)
+        /// </summary>
+        public static bool HasTimestampConflict(DateTime dt1, DateTime dt2)
+        {
+            if (!dt1.Equals(DateTime.MinValue) &&
+                !dt2.Equals(DateTime.MinValue) &&
+                !dt1.Equals(dt2))
+            {
+                return true;
+            }
+
+            return false;
+        }
     }
 }
 

LibNoDaveConnectionLibrary/DataTypes/Blocks/Step7V5/S7DataBlock.cs

@@ -55,7 +55,7 @@ public IDataRow Structure
             {
                 bool checkIFaceConflict = usedS7ConvertingOptions != null && usedS7ConvertingOptions.CheckForInterfaceTimestampConflicts;
 
-                if ((!checkIFaceConflict && StructureFromString != null) || (checkIFaceConflict && !HasInterfaceTimestampConflict))
+                if ((!checkIFaceConflict && StructureFromString != null) || (checkIFaceConflict && !HasTimestampConflict(LastInterfaceChange, LastInterfaceChangeHistory)))
                 {
                     return StructureFromString;
                 }

LibNoDaveConnectionLibrary/DataTypes/Projectfolders/Step7V5/BlocksOfflineFolder.cs

@@ -449,7 +449,14 @@ public S7DataRow GetInterface(string blkName, S7ConvertingOptions myConvOpt)
                 return null;
             TmpBlock myTmpBlk = GetBlockBytes(blkInfo);
             List<string> tmpPar = new List<string>();
-            return Parameter.GetInterfaceOrDBFromStep7ProjectString(myTmpBlk.blkinterface, ref tmpPar, blkInfo.BlockType, false, this, null, myConvOpt);
+            if (myConvOpt.CheckForInterfaceTimestampConflicts && S7Block.HasTimestampConflict(myTmpBlk.LastInterfaceChange, myTmpBlk.LastInterfaceChangeHistory))
+            {
+                return GetInterfaceStructureFromMC7(blkInfo, myTmpBlk, null, ref tmpPar);
+            }
+            else
+            {
+                return Parameter.GetInterfaceOrDBFromStep7ProjectString(myTmpBlk.blkinterface, ref tmpPar, blkInfo.BlockType, false, this, null, myConvOpt);
+            }
         }
 
         /// <summary>
@@ -625,7 +632,7 @@ public Block GetBlock(ProjectBlockInfo blkInfo, S7ConvertingOptions myConvOpt)
                     retVal.Author = myTmpBlk.username;
                     retVal.Version = myTmpBlk.version;
 
-                    if (myConvOpt.CheckForInterfaceTimestampConflicts && retVal.HasInterfaceTimestampConflict)
+                    if (myConvOpt.CheckForInterfaceTimestampConflicts && S7Block.HasTimestampConflict(retVal.LastInterfaceChange, retVal.LastInterfaceChangeHistory))
                     {
                         retVal.Parameter = GetInterfaceStructureFromMC7(blkInfo, myTmpBlk, retVal, ref ParaList);
                     }