Skip to content

Commit 01167f4

Browse files
thomas-v2thomas-v2
committed
Add some new softdatatypes
1 parent d4d2cbd commit 01167f4

File tree

1 file changed

+33
-17
lines changed

1 file changed

+33
-17
lines changed

‎src/S7CommPlusDriver/Core/Softdatatype.cs‎

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@ public static class Softdatatype
8282
public const uint S7COMMP_SOFTDATATYPE_LDT = 66;
8383
public const uint S7COMMP_SOFTDATATYPE_DTL = 67;
8484
public const uint S7COMMP_SOFTDATATYPE_IECLTIMER = 68;
85-
public const uint S7COMMP_SOFTDATATYPE_SCOUNTER = 69;
86-
public const uint S7COMMP_SOFTDATATYPE_DCOUNTER = 70;
87-
public const uint S7COMMP_SOFTDATATYPE_LCOUNTER = 71;
88-
public const uint S7COMMP_SOFTDATATYPE_UCOUNTER = 72;
89-
public const uint S7COMMP_SOFTDATATYPE_USCOUNTER = 73;
90-
public const uint S7COMMP_SOFTDATATYPE_UDCOUNTER = 74;
91-
public const uint S7COMMP_SOFTDATATYPE_ULCOUNTER = 75;
85+
public const uint S7COMMP_SOFTDATATYPE_IECSCOUNTER = 69;
86+
public const uint S7COMMP_SOFTDATATYPE_IECDCOUNTER = 70;
87+
public const uint S7COMMP_SOFTDATATYPE_IECLCOUNTER = 71;
88+
public const uint S7COMMP_SOFTDATATYPE_IECUCOUNTER = 72;
89+
public const uint S7COMMP_SOFTDATATYPE_IECUSCOUNTER = 73;
90+
public const uint S7COMMP_SOFTDATATYPE_IECUDCOUNTER = 74;
91+
public const uint S7COMMP_SOFTDATATYPE_IECULCOUNTER = 75;
9292
public const uint S7COMMP_SOFTDATATYPE_REMOTE = 96;
9393
public const uint S7COMMP_SOFTDATATYPE_ERRORSTRUCT = 97;
9494
public const uint S7COMMP_SOFTDATATYPE_NREF = 98;
@@ -115,6 +115,7 @@ public static class Softdatatype
115115
public const uint S7COMMP_SOFTDATATYPE_HWPWM = 153;
116116
public const uint S7COMMP_SOFTDATATYPE_HWPTO = 154;
117117
public const uint S7COMMP_SOFTDATATYPE_HWINTERFACE = 155;
118+
public const uint S7COMMP_SOFTDATATYPE_HWIEPORT = 156;
118119
public const uint S7COMMP_SOFTDATATYPE_OBANY = 160;
119120
public const uint S7COMMP_SOFTDATATYPE_OBDELAY = 161;
120121
public const uint S7COMMP_SOFTDATATYPE_OBTOD = 162;
@@ -123,9 +124,11 @@ public static class Softdatatype
123124
public const uint S7COMMP_SOFTDATATYPE_CONNANY = 168;
124125
public const uint S7COMMP_SOFTDATATYPE_CONNPRG = 169;
125126
public const uint S7COMMP_SOFTDATATYPE_CONNOUC = 170;
127+
public const uint S7COMMP_SOFTDATATYPE_CONNRID = 171;
126128
public const uint S7COMMP_SOFTDATATYPE_HWNR = 172;
127129
public const uint S7COMMP_SOFTDATATYPE_PORT = 173;
128130
public const uint S7COMMP_SOFTDATATYPE_RTM = 174;
131+
public const uint S7COMMP_SOFTDATATYPE_PIP = 175;
129132
public const uint S7COMMP_SOFTDATATYPE_CALARM = 176;
130133
public const uint S7COMMP_SOFTDATATYPE_CALARMS = 177;
131134
public const uint S7COMMP_SOFTDATATYPE_CALARM8 = 178;
@@ -140,6 +143,11 @@ public static class Softdatatype
140143
public const uint S7COMMP_SOFTDATATYPE_OBDIAG = 195;
141144
public const uint S7COMMP_SOFTDATATYPE_OBTIMEERROR = 196;
142145
public const uint S7COMMP_SOFTDATATYPE_OBSTARTUP = 197;
146+
public const uint S7COMMP_SOFTDATATYPE_OPCUALOCTXTENCM = 200;
147+
public const uint S7COMMP_SOFTDATATYPE_OPCUASTRACTLEN = 201;
148+
public const uint S7COMMP_SOFTDATATYPE_DBANY = 208;
149+
public const uint S7COMMP_SOFTDATATYPE_DBWWW = 209;
150+
public const uint S7COMMP_SOFTDATATYPE_DBDYN = 210;
143151
public const uint S7COMMP_SOFTDATATYPE_PARA = 253;
144152
public const uint S7COMMP_SOFTDATATYPE_LABEL = 254;
145153
public const uint S7COMMP_SOFTDATATYPE_UDEFINED = 255;
@@ -177,8 +185,8 @@ public static class Softdatatype
177185
{ S7COMMP_SOFTDATATYPE_MULTISFB, "Multi_SFB" },
178186
{ S7COMMP_SOFTDATATYPE_COUNTER, "Counter" },
179187
{ S7COMMP_SOFTDATATYPE_TIMER, "Timer" },
180-
{ S7COMMP_SOFTDATATYPE_IECCOUNTER, "IEC_Counter" },
181-
{ S7COMMP_SOFTDATATYPE_IECTIMER, "IEC_Timer" },
188+
{ S7COMMP_SOFTDATATYPE_IECCOUNTER, "IEC_COUNTER" },
189+
{ S7COMMP_SOFTDATATYPE_IECTIMER, "IEC_TIMER" },
182190
{ S7COMMP_SOFTDATATYPE_BLOCKSFB, "Block_SFB" },
183191
{ S7COMMP_SOFTDATATYPE_BLOCKSFC, "Block_SFC" },
184192
{ S7COMMP_SOFTDATATYPE_BLOCKCB, "Block_CB" },
@@ -209,14 +217,14 @@ public static class Softdatatype
209217
{ S7COMMP_SOFTDATATYPE_LTOD, "LTOD" },
210218
{ S7COMMP_SOFTDATATYPE_LDT, "LDT" },
211219
{ S7COMMP_SOFTDATATYPE_DTL, "DTL" },
212-
{ S7COMMP_SOFTDATATYPE_IECLTIMER, "IEC_LTimer" },
213-
{ S7COMMP_SOFTDATATYPE_SCOUNTER, "SCounter" },
214-
{ S7COMMP_SOFTDATATYPE_DCOUNTER, "DCounter" },
215-
{ S7COMMP_SOFTDATATYPE_LCOUNTER, "LCounter" },
216-
{ S7COMMP_SOFTDATATYPE_UCOUNTER, "UCounter" },
217-
{ S7COMMP_SOFTDATATYPE_USCOUNTER, "USCounter" },
218-
{ S7COMMP_SOFTDATATYPE_UDCOUNTER, "UDCounter" },
219-
{ S7COMMP_SOFTDATATYPE_ULCOUNTER, "ULCounter" },
220+
{ S7COMMP_SOFTDATATYPE_IECLTIMER, "IEC_LTIMER" },
221+
{ S7COMMP_SOFTDATATYPE_IECSCOUNTER, "IEC_SCOUNTER" },
222+
{ S7COMMP_SOFTDATATYPE_IECDCOUNTER, "IEC_DCOUNTER" },
223+
{ S7COMMP_SOFTDATATYPE_IECLCOUNTER, "IEC_LCOUNTER" },
224+
{ S7COMMP_SOFTDATATYPE_IECUCOUNTER, "IEC_UCOUNTER" },
225+
{ S7COMMP_SOFTDATATYPE_IECUSCOUNTER, "IEC_USCOUNTER" },
226+
{ S7COMMP_SOFTDATATYPE_IECUDCOUNTER, "IEC_UDCOUNTER" },
227+
{ S7COMMP_SOFTDATATYPE_IECULCOUNTER, "IEC_ULCOUNTER" },
220228
{ S7COMMP_SOFTDATATYPE_REMOTE, "REMOTE" },
221229
{ S7COMMP_SOFTDATATYPE_ERRORSTRUCT, "Error_Struct" },
222230
{ S7COMMP_SOFTDATATYPE_NREF, "NREF" },
@@ -243,6 +251,7 @@ public static class Softdatatype
243251
{ S7COMMP_SOFTDATATYPE_HWPWM, "HW_PWM" },
244252
{ S7COMMP_SOFTDATATYPE_HWPTO, "HW_PTO" },
245253
{ S7COMMP_SOFTDATATYPE_HWINTERFACE, "HW_INTERFACE" },
254+
{ S7COMMP_SOFTDATATYPE_HWIEPORT, "HW_IEPORT" },
246255
{ S7COMMP_SOFTDATATYPE_OBANY, "OB_ANY" },
247256
{ S7COMMP_SOFTDATATYPE_OBDELAY, "OB_DELAY" },
248257
{ S7COMMP_SOFTDATATYPE_OBTOD, "OB_TOD" },
@@ -251,9 +260,11 @@ public static class Softdatatype
251260
{ S7COMMP_SOFTDATATYPE_CONNANY, "CONN_ANY" },
252261
{ S7COMMP_SOFTDATATYPE_CONNPRG, "CONN_PRG" },
253262
{ S7COMMP_SOFTDATATYPE_CONNOUC, "CONN_OUC" },
263+
{ S7COMMP_SOFTDATATYPE_CONNRID, "CONN_R_ID" },
254264
{ S7COMMP_SOFTDATATYPE_HWNR, "HW_NR" },
255265
{ S7COMMP_SOFTDATATYPE_PORT, "PORT" },
256266
{ S7COMMP_SOFTDATATYPE_RTM, "RTM" },
267+
{ S7COMMP_SOFTDATATYPE_PIP, "PIP" },
257268
{ S7COMMP_SOFTDATATYPE_CALARM, "C_ALARM" },
258269
{ S7COMMP_SOFTDATATYPE_CALARMS, "C_ALARM_S" },
259270
{ S7COMMP_SOFTDATATYPE_CALARM8, "C_ALARM_8" },
@@ -268,6 +279,11 @@ public static class Softdatatype
268279
{ S7COMMP_SOFTDATATYPE_OBDIAG, "OB_DIAG" },
269280
{ S7COMMP_SOFTDATATYPE_OBTIMEERROR, "OB_TIMEERROR" },
270281
{ S7COMMP_SOFTDATATYPE_OBSTARTUP, "OB_STARTUP" },
282+
{ S7COMMP_SOFTDATATYPE_OPCUALOCTXTENCM, "OPC_UA_LocalizedTextEncodingMask" },
283+
{ S7COMMP_SOFTDATATYPE_OPCUASTRACTLEN, "OPC_UA_ByteStringActualLength" },
284+
{ S7COMMP_SOFTDATATYPE_DBANY, "DB_ANY" },
285+
{ S7COMMP_SOFTDATATYPE_DBWWW, "DB_WWW" },
286+
{ S7COMMP_SOFTDATATYPE_DBDYN, "DB_DYN" },
271287
{ S7COMMP_SOFTDATATYPE_PARA, "Para" },
272288
{ S7COMMP_SOFTDATATYPE_LABEL, "Label" },
273289
{ S7COMMP_SOFTDATATYPE_UDEFINED, "Undefined" },

0 commit comments

Comments
 (0)