Added: Restore magazine table lock on startup
Added tool table import status
This commit is contained in:
@@ -960,11 +960,11 @@ public static class ThreadsFunctions
|
||||
NcHandler ncHandler = new NcHandler();
|
||||
CmsError cmsError = NO_ERROR;
|
||||
// Run loop until NC is connected
|
||||
while (!ncHandler.numericalControl.NC_IsConnected())
|
||||
while (!ncHandler.numericalControl.NC_IsConnected())
|
||||
{
|
||||
// Try reconnection
|
||||
cmsError = ncHandler.Connect();
|
||||
if (cmsError.errorCode == CMS_ERROR_CODES.SIEMENS_ENVIRONMENT_NOT_FOUND || cmsError.errorCode == CMS_ERROR_CODES.SIEMENS_HMI_NOT_RUNNING)
|
||||
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();
|
||||
@@ -974,13 +974,22 @@ public static class ThreadsFunctions
|
||||
|
||||
Thread.Sleep(1000);
|
||||
}
|
||||
if (ServerConfig.ServerStartupConfig.AutoOpenCmsClient)
|
||||
if (ServerStartupConfig.AutoOpenCmsClient)
|
||||
StartCMSClient(null);
|
||||
|
||||
NcToolTableHandler toolTable = new NcToolTableHandler();
|
||||
|
||||
if(NcConfig.NcVendor == NC_VENDOR.FANUC || NcConfig.NcVendor == NC_VENDOR.DEMO)
|
||||
{
|
||||
using (NcToolTableHandler toolTable = new NcToolTableHandler())
|
||||
{
|
||||
toolTable.Connect();
|
||||
// After reconecction write option
|
||||
cmsError = toolTable.WriteOption();
|
||||
// Check if there are blocked magazines
|
||||
cmsError = toolTable.RestoreTableLock();
|
||||
}
|
||||
}
|
||||
|
||||
// After reconecction write option
|
||||
toolTable.WriteOption();
|
||||
// Start/Restart NC threads
|
||||
ThreadsHandler.StartWorkers();
|
||||
|
||||
@@ -1031,6 +1040,7 @@ public static class ThreadsFunctions
|
||||
case CMS_ERROR_CODES.INTERNAL_ERROR:
|
||||
Manage(ERROR_LEVEL.FATAL, cmsError.localizationKey);
|
||||
break;
|
||||
|
||||
case CMS_ERROR_CODES.SELECTED_PROCESS:
|
||||
Manage(ERROR_LEVEL.WARNING, cmsError.localizationKey);
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user