Egalware/cms-core-active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SIEMENS alarms multithreads, changed alarms svc to static object

Browse Source
This commit is contained in:
luciomaranta
2020-07-08 15:16:37 +02:00
parent 237cf7912a
commit ae35453fa7
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS_CORE_Library/Siemens/Nc_Siemens.cs
+11 -9
View File
@@ -73,8 +73,8 @@ namespace CMS_CORE_Library.Siemens
private static string UnitOfMeasure;
// Alarms data
private AlarmSvc SiemensAlmSvc = null;
private Alarm[] SiemensAlarms;
private static AlarmSvc SiemensAlmSvc = null;
private static Alarm[] SiemensAlarms = new Alarm[] { };
// Tool table listeners
private static ToolMngmntSvc SiemensToolSvc = null;
@@ -154,7 +154,6 @@ namespace CMS_CORE_Library.Siemens
//Setup timeout
TimeoutConn = ConnectionTimeOut;
SiemensAlarms = new Alarm[] { };
}
/**
@@ -176,7 +175,6 @@ namespace CMS_CORE_Library.Siemens
//Setup timeout
TimeoutConn = ConnectionTimeOut;
SiemensAlarms = new Alarm[] { };
}
public override CmsError NC_Connect()
@@ -222,10 +220,13 @@ namespace CMS_CORE_Library.Siemens
if (this.EnableAlarms)
{
SiemensAlarms = new Alarm[] { };
SiemensAlmSvc = new AlarmSvc(ConvertToSTEPLanguage(SiemensLanguage).ThreeLetterISOLanguageName);
SiemensAlmSvc.Subscribe(AlarmsChanged);
Infrastructure.SubscribeLanguageChanged(NcLanguageChanged);
if(SiemensAlmSvc == null)
{
SiemensAlarms = new Alarm[] { };
SiemensAlmSvc = new AlarmSvc(ConvertToSTEPLanguage(SiemensLanguage).ThreeLetterISOLanguageName);
SiemensAlmSvc.Subscribe(AlarmsChanged);
Infrastructure.SubscribeLanguageChanged(NcLanguageChanged);
}
}
if (this.EnableTools)
@@ -346,7 +347,8 @@ namespace CMS_CORE_Library.Siemens
if (SiemensToolSvc != null)
{
SiemensToolSvc.UnSubscribe(ToolMngmtSvcHandler);
// SiemensToolSvc.Dispose();
SiemensToolSvc.Dispose();
SiemensToolSvc = null;
}
if (MagazinePositionSvc != null)
{