* Added machine model, and new database relations

* Added first centralized database config and  added machine self-registration into db
* Fix database migration with new database
* Refactor
This commit is contained in:
Lucio Maranta
2018-01-17 10:24:18 +01:00
parent b26ec6cc43
commit fa485d902b
32 changed files with 457 additions and 141 deletions
+12 -12
View File
@@ -16,7 +16,7 @@ public static class ThreadsFunctions
private static long ReadAlarmsTimer = 0, ReadAlarmsTimes = 0;
private static long ReadNcGenericInfoTimer = 0, ReadNcGenericInfoTimes = 0;
private static long ReadAxesTimer = 0, ReadAxesTimes = 0;
public static void Read_Alarms()
{
@@ -148,7 +148,7 @@ public static class ThreadsFunctions
{
ManageLibraryError(cmsError);
}
else if ( cmsError.errorCode != CMS_ERROR_CODES.OK)
else if (cmsError.errorCode != CMS_ERROR_CODES.OK)
ncHandler.Dispose();
Thread.Sleep(1000);
@@ -205,17 +205,17 @@ public static class ThreadsFunctions
case CMS_ERROR_CODES.SIEMENS_HMI_NOT_RUNNING:
Manage(ERROR_LEVEL.FATAL, cmsError.message);
break;
}
}
}
internal static void StatThread()
{
while(true)
while (true)
{
if (ThreadsHandler.RunningThreadStatus.ContainsKey("Read_Alarms") && ReadAlarmsTimes != 0)
{
ThreadsHandler.RunningThreadStatus["Read_Alarms"] = (ReadAlarmsTimer/ReadAlarmsTimes) + " mS";
ThreadsHandler.RunningThreadStatus["Read_Alarms"] = (ReadAlarmsTimer / ReadAlarmsTimes) + " mS";
ReadAlarmsTimer = 0;
ReadAlarmsTimes = 0;
}
@@ -240,15 +240,15 @@ public static class ThreadsFunctions
}
}
private static void StatReset()
{
ReadAlarmsTimer = 0;
ReadAlarmsTimes = 0;
ReadNcGenericInfoTimer = 0;
ReadNcGenericInfoTimes = 0;
ReadAxesTimer = 0;
ReadAxesTimes = 0;
ReadAlarmsTimer = 0;
ReadAlarmsTimes = 0;
ReadNcGenericInfoTimer = 0;
ReadNcGenericInfoTimes = 0;
ReadAxesTimer = 0;
ReadAxesTimes = 0;
}
}