Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

erge

Browse Source
This commit is contained in:
Paolo Possanzini
2018-01-25 12:42:07 +01:00
parent 7e6827e333
commit 79276ad3eb
28 changed files with 173 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Tasks/ThreadsFunctions.cs
+15 -16
View File
@@ -42,9 +42,8 @@ public static class ThreadsFunctions
libraryError = ncHandler.GetNcAlarms(out DTOAlarmsModel alarms);
if (libraryError.errorCode != 0)
ManageLibraryError(libraryError);
else
// Send through signalR
MessageServices.Current.Publish(SEND_ALARMS, null, alarms);
// Send through signalR
MessageServices.Current.Publish(SEND_ALARMS, null, alarms);
}
sw.Stop();
@@ -56,7 +55,7 @@ public static class ThreadsFunctions
Thread.Sleep(200);
}
}
catch (ThreadAbortException)
catch (ThreadAbortException ex)
{
ncHandler.Dispose();
}
@@ -95,7 +94,7 @@ public static class ThreadsFunctions
Thread.Sleep(1000);
}
}
catch (ThreadAbortException)
catch (ThreadAbortException ex)
{
ncHandler.Dispose();
}
@@ -122,9 +121,8 @@ public static class ThreadsFunctions
libraryError = ncHandler.GetAxesPositions(out List<DTOAxesModel> genericData);
if (libraryError.errorCode != 0)
ManageLibraryError(libraryError);
else
// Send through signalR
MessageServices.Current.Publish(SEND_AXES, null, genericData);
// Send through signalR
MessageServices.Current.Publish(SEND_AXES, null, genericData);
}
sw.Stop();
@@ -135,7 +133,7 @@ public static class ThreadsFunctions
Thread.Sleep(200);
}
}
catch (ThreadAbortException)
catch (ThreadAbortException ex)
{
ncHandler.Dispose();
}
@@ -159,12 +157,11 @@ public static class ThreadsFunctions
if (ncHandler.numericalControl.NC_IsConnected())
{
// Get Data from NC
libraryError = ncHandler.GetPowerOnData(out PreAndPostPowerOnModel powerOnData);
libraryError = ncHandler.GetPowerOnData(out DTOPowerOnData powerOnData);
if (libraryError.errorCode != 0)
ManageLibraryError(libraryError);
else
// Send through signalR
MessageServices.Current.Publish(SEND_POWER_ON_DATA, null, powerOnData);
// Send through signalR
MessageServices.Current.Publish(SEND_POWER_ON_DATA, null, powerOnData);
}
sw.Stop();
@@ -176,7 +173,7 @@ public static class ThreadsFunctions
Thread.Sleep(400);
}
}
catch (ThreadAbortException)
catch (ThreadAbortException ex)
{
ncHandler.Dispose();
}
@@ -199,14 +196,16 @@ public static class ThreadsFunctions
// Try reconnection
CmsError cmsError = ncHandler.Connect();
if (cmsError.errorCode == CMS_ERROR_CODES.SIEMENS_ENVIRONMENT_NOT_FOUND || cmsError.errorCode == CMS_ERROR_CODES.SIEMENS_HMI_NOT_RUNNING)
{
ManageLibraryError(cmsError);
}
else if (cmsError.errorCode != CMS_ERROR_CODES.OK)
ncHandler.Dispose();
Thread.Sleep(1000);
// Send status to UI
MessageServices.Current.Publish(SEND_NC_STATUS, null, ncHandler.numericalControl.NC_IsConnected());
MessageServices.Current.Publish(MVVM_NC_STATUS, null, ncHandler.numericalControl.NC_IsConnected());
}
// Start/Restart NC threads
ThreadsHandler.StartWorkers();
@@ -293,7 +292,7 @@ public static class ThreadsFunctions
ReadPowerOnTimes = 0;
}
MessageServices.Current.Publish(SEND_THREADS_STATUS, null, ThreadsHandler.RunningThreadStatus);
MessageServices.Current.Publish(MVVM_NC_THREADS, null, ThreadsHandler.RunningThreadStatus);
Thread.Sleep(2000);
}