Skip to content

Commit ecb30b0

Browse files
Updated MTConnect Versions to include v2.4
1 parent e6992c4 commit ecb30b0

3 files changed

Lines changed: 20 additions & 1 deletion

File tree

libraries/MTConnect.NET-Common/MTConnectVersions.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace MTConnect
77
{
88
public static class MTConnectVersions
99
{
10-
public static Version Max => Version23;
10+
public static Version Max => Version24;
1111

1212
public static readonly Version Version10 = new Version(1, 0);
1313
public static readonly Version Version11 = new Version(1, 1);
@@ -22,5 +22,6 @@ public static class MTConnectVersions
2222
public static readonly Version Version21 = new Version(2, 1);
2323
public static readonly Version Version22 = new Version(2, 2);
2424
public static readonly Version Version23 = new Version(2, 3);
25+
public static readonly Version Version24 = new Version(2, 4);
2526
}
2627
}

libraries/MTConnect.NET-XML/MTConnectVersion.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public static Version GetByNamespace(string ns)
2323
{
2424
if (ns != null)
2525
{
26+
if (Namespaces.Version23.Match(ns)) return MTConnectVersions.Version24;
2627
if (Namespaces.Version23.Match(ns)) return MTConnectVersions.Version23;
2728
if (Namespaces.Version22.Match(ns)) return MTConnectVersions.Version22;
2829
if (Namespaces.Version21.Match(ns)) return MTConnectVersions.Version21;

libraries/MTConnect.NET-XML/Namespaces.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ public static string GetDevices(int majorVerion, int minorVersion)
8181
case 1: return Version21.Devices;
8282
case 2: return Version22.Devices;
8383
case 3: return Version23.Devices;
84+
case 4: return Version24.Devices;
8485
}
8586

8687
break;
@@ -119,6 +120,7 @@ public static string GetStreams(int majorVerion, int minorVersion)
119120
case 1: return Version21.Streams;
120121
case 2: return Version22.Streams;
121122
case 3: return Version23.Streams;
123+
case 4: return Version24.Streams;
122124
}
123125

124126
break;
@@ -207,6 +209,7 @@ public static string GetAssets(int majorVerion, int minorVersion)
207209
case 1: return Version21.Assets;
208210
case 2: return Version22.Assets;
209211
case 3: return Version23.Assets;
212+
case 4: return Version24.Assets;
210213
}
211214

212215
break;
@@ -244,6 +247,7 @@ public static string GetError(int majorVerion, int minorVersion)
244247
case 1: return Version21.Error;
245248
case 2: return Version22.Error;
246249
case 3: return Version23.Error;
250+
case 4: return Version24.Error;
247251
}
248252

249253
break;
@@ -267,6 +271,19 @@ public static string Clear(string xml)
267271
}
268272

269273

274+
internal static class Version24
275+
{
276+
public const string Assets = "urn:mtconnect.org:MTConnectAssets:2.4";
277+
public const string Devices = "urn:mtconnect.org:MTConnectDevices:2.4";
278+
public const string Error = "urn:mtconnect.org:MTConnectError:2.4";
279+
public const string Streams = "urn:mtconnect.org:MTConnectStreams:2.4";
280+
281+
public static bool Match(string ns)
282+
{
283+
return ns == Assets || ns == Devices || ns == Error || ns == Streams;
284+
}
285+
}
286+
270287
internal static class Version23
271288
{
272289
public const string Assets = "urn:mtconnect.org:MTConnectAssets:2.3";

0 commit comments

Comments
 (0)