Fix last commit

Step.Config/Config/serverConfig.xml

@@ -12,6 +12,7 @@
   <serverConfig>
     <serverPort>9000</serverPort>
     <serverAddress>*</serverAddress>
+    <networkCardId>1</networkCardId>
     <language>en</language>
     <enableDirectoryBrowsing>true</enableDirectoryBrowsing>
     <databaseAddress>localhost</databaseAddress>

Step.Config/Config/serverConfigValidator.xsd

@@ -9,7 +9,7 @@
               <xs:element name="ncVendor" type="ncType" minOccurs='1' maxOccurs='1'/>
               <xs:element name="showNcHMI" type="xs:boolean" minOccurs="1" maxOccurs="1"/>
               <xs:element name="ncIpAddress" minOccurs='1' maxOccurs='1'/>
-              <xs:element name="ncPort" type="xs:int"  minOccurs='1' maxOccurs='1'/>
+              <xs:element name="ncPort" type="xs:int"  minOccurs='1' maxOccurs='1'/>         
               <xs:element name="machineModel" type="xs:string" minOccurs='1' maxOccurs='1'/>
               <xs:element name="sharedPath" type="xs:string" minOccurs='1' maxOccurs='1'/>
               <xs:element name="sharedName" type="xs:string" minOccurs='1' maxOccurs='1'/>
@@ -22,6 +22,7 @@
             <xs:all>
               <xs:element name="serverAddress" type="xs:string" minOccurs="1" maxOccurs="1"/>
               <xs:element name="serverPort" type="xs:int" minOccurs='1' maxOccurs='1'/>
+              <xs:element name="networkCardId" type="xs:int"  minOccurs='1' maxOccurs='1'/>
               <xs:element name="language" type="xs:language" minOccurs='1' maxOccurs='1' default="en"/>
               <xs:element name="enableDirectoryBrowsing" type="xs:boolean" default="false"/>
               <xs:element name="databaseAddress" type="xs:string" minOccurs="1" maxOccurs="1"/>

Step.Config/ServerConfigController.cs

@@ -200,6 +200,7 @@ namespace Step.Config
                     Language = CultureInfo.CreateSpecificCulture(x.Element("language").Value),
                     ServerAddress = x.Element("serverAddress").Value,
                     ServerPort = Convert.ToInt32(x.Element("serverPort").Value),
+                    NetworkCardId = Convert.ToInt32(x.Element("networkCardId").Value),
                     EnableDirectoryBrowsing = Convert.ToBoolean(x.Element("enableDirectoryBrowsing").Value),
                     DatabaseAddress = x.Element("databaseAddress").Value,
                     AutoOpenCmsClient = Convert.ToBoolean(x.Element("autoOpenCmsClient").Value)

Step.Core/ThreadsFunctions.cs

@@ -1,4 +1,5 @@
 using CMS_CORE_Library.Models;
+using Step.Config;
 using Step.Core;
 using Step.Model.DTOModels;
 using Step.Model.DTOModels.AlarmModels;
@@ -722,9 +723,19 @@ public static class ThreadsFunctions
         float SumRec, SumSen;
         Stopwatch sw = new Stopwatch();
         DTONetworkMonitor Monitor = new DTONetworkMonitor();
+        int CardId = ServerConfig.ServerStartupConfig.NetworkCardId - 1;
 
         PerformanceCounterCategory performanceCounterCategory = new PerformanceCounterCategory("Network Interface");
-        Monitor.Name = performanceCounterCategory.GetInstanceNames()[0]; // 1st NIC !
+
+        if(CardId<0 || CardId > performanceCounterCategory.GetInstanceNames().Length )
+        {
+            Monitor.Name = "No card to monitor";
+            MessageServices.Current.Publish(NETWORK_USAGE, null, Monitor);
+            return;
+        }
+
+        Monitor.Name = performanceCounterCategory.GetInstanceNames()[0];
+        
 
         PerformanceCounter PC_Bandwith = new PerformanceCounter("Network Interface", "Current Bandwidth", Monitor.Name);
         PerformanceCounter PC_RecievedBytes = new PerformanceCounter("Network Interface", "Bytes Received/sec", Monitor.Name);

Step.Core/ThreadsHandler.cs

@@ -34,6 +34,8 @@ namespace Step.Core
         public static void Start()
         {
             ThreadsFunctions.RestoreConnection();
+
+            //Start THread Network monitor
             Action Monitor = new Action(ThreadsFunctions.MonitorPanelPCResources);
             Thread t = new Thread(() => Monitor());
             t.Start();

Step.Model/ConfigModels/ServerConfigModel.cs

@@ -12,6 +12,7 @@ namespace Step.Model.ConfigModels
         public CultureInfo Language { get; set; }
         public int ServerPort { get; set; }
         public string ServerAddress { get; set; }
+        public int NetworkCardId { get; set; }
         public bool EnableDirectoryBrowsing { get; set; }
         public string DatabaseAddress { get; set; }
         public bool AutoOpenCmsClient { get; set; }