Handling of fixed softdatatype ids

Author: thomas-v2

src/S7CommPlusDriver/ClientApi/Browser.cs

@@ -355,8 +355,9 @@ private bool IsSoftdatatypeSupported(uint softdatatype)
                 case Softdatatype.S7COMMP_SOFTDATATYPE_AOMIDENT:
                 case Softdatatype.S7COMMP_SOFTDATATYPE_EVENTANY:
                 case Softdatatype.S7COMMP_SOFTDATATYPE_EVENTATT:
-                case Softdatatype.S7COMMP_SOFTDATATYPE_FOLDER: // Should we support this internal datatype? Only used internally in SFBs
+                case Softdatatype.S7COMMP_SOFTDATATYPE_AOMAID:
                 case Softdatatype.S7COMMP_SOFTDATATYPE_AOMLINK:
+                case Softdatatype.S7COMMP_SOFTDATATYPE_EVENTHWINT:
                 case Softdatatype.S7COMMP_SOFTDATATYPE_HWANY:
                 case Softdatatype.S7COMMP_SOFTDATATYPE_HWIOSYSTEM:
                 case Softdatatype.S7COMMP_SOFTDATATYPE_HWDPMASTER:

src/S7CommPlusDriver/ClientApi/PlcTags.cs

@@ -165,14 +165,12 @@ public static PlcTag TagFactory(string name, ItemAddress address, uint softdatat
                 case Softdatatype.S7COMMP_SOFTDATATYPE_EVENTATT:
                     return new PlcTagDWord(name, address, softdatatype);
 
-                case Softdatatype.S7COMMP_SOFTDATATYPE_FOLDER:
-                    // Softdatatype 132: This type is only used as parameter for internal SFBs (e.g. AID input parameter)
-                    // Length of value (4 byte) calculated from the offsetinfo byte addresses.
+                case Softdatatype.S7COMMP_SOFTDATATYPE_AOMAID:
                     return new PlcTagDWord(name, address, softdatatype);
-
                 case Softdatatype.S7COMMP_SOFTDATATYPE_AOMLINK:
                     return new PlcTagDWord(name, address, softdatatype);
-
+                case Softdatatype.S7COMMP_SOFTDATATYPE_EVENTHWINT:
+                    return new PlcTagDWord(name, address, softdatatype);
                 case Softdatatype.S7COMMP_SOFTDATATYPE_HWANY:
                     return new PlcTagWord(name, address, softdatatype);
 

src/S7CommPlusGUIBrowser/Form1.cs

@@ -260,7 +260,9 @@ private void SetImageKey(ref TreeNode tn, PVartypeListElement vte)
                 case Softdatatype.S7COMMP_SOFTDATATYPE_AOMIDENT:
                 case Softdatatype.S7COMMP_SOFTDATATYPE_EVENTANY:
                 case Softdatatype.S7COMMP_SOFTDATATYPE_EVENTATT:
+                case Softdatatype.S7COMMP_SOFTDATATYPE_AOMAID:
                 case Softdatatype.S7COMMP_SOFTDATATYPE_AOMLINK:
+                case Softdatatype.S7COMMP_SOFTDATATYPE_EVENTHWINT:
                 case Softdatatype.S7COMMP_SOFTDATATYPE_HWANY:
                 case Softdatatype.S7COMMP_SOFTDATATYPE_HWIOSYSTEM:
                 case Softdatatype.S7COMMP_SOFTDATATYPE_HWDPMASTER: