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

Revert "erge"

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