Fix Siemens lang

Added start&stop queue
This commit is contained in:
Lucio Maranta
2018-09-12 07:12:27 +00:00
parent 63936daaeb
commit 7a8ded5118
5 changed files with 61 additions and 5 deletions
+24
View File
@@ -1828,6 +1828,30 @@ namespace CMS_CORE.Demo
return NO_ERROR;
}
public override CmsError FILES_WStartQueue()
{
// Check if the NC Demo is Connected
CmsError cmsError = CheckConnection();
if (cmsError.IsError())
return cmsError;
// Write start
byte startValue = 1;
return MEM_RWByte(W, 0, QUEUE_CMD.MemType, QUEUE_CMD.Address, 0, ref startValue);
}
public override CmsError FILES_WStopQueue()
{
// Check if the NC Demo is Connected
CmsError cmsError = CheckConnection();
if (cmsError.IsError())
return cmsError;
// Write stop
byte startValue = 2;
return MEM_RWByte(W, 0, QUEUE_CMD.MemType, QUEUE_CMD.Address, 0, ref startValue);
}
#endregion File Management
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+10
View File
@@ -1710,6 +1710,16 @@ namespace CMS_CORE.Fanuc
return NO_ERROR;
}
public override CmsError FILES_WStartQueue()
{
return NO_ERROR;
}
public override CmsError FILES_WStopQueue()
{
return NO_ERROR;
}
#endregion File Management
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+4
View File
@@ -1351,6 +1351,10 @@ namespace CMS_CORE
public abstract CmsError FILES_DeleteProgram(string partProgramPath, string partProgramName);
public abstract CmsError FILES_RQueueData(ref QueueStatusModel status);
public abstract CmsError FILES_WStartQueue();
public abstract CmsError FILES_WStopQueue();
#endregion File Management (To override)
+10
View File
@@ -2311,6 +2311,16 @@ namespace CMS_CORE.Osai
return NO_ERROR;
}
public override CmsError FILES_WStartQueue()
{
return NO_ERROR;
}
public override CmsError FILES_WStopQueue()
{
return NO_ERROR;
}
#endregion File Management
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+13 -5
View File
@@ -151,7 +151,7 @@ namespace CMS_CORE.Siemens
//Setup the alarms (Only managed in this way (Siemens Thread)
SiemensAlarms = new Alarm[] { };
SiemensAlmSvc = new AlarmSvc(ConvertToSTEPLanguage(SiemensLanguage).ThreeLetterISOLanguageName);
SiemensAlmSvc = new AlarmSvc(ConvertToSTEPLanguage(SiemensLanguage).ThreeLetterWindowsLanguageName);
SiemensAlmSvc.Subscribe(AlarmsChanged);
Infrastructure.SubscribeLanguageChanged(NcLanguageChanged);
@@ -312,7 +312,7 @@ namespace CMS_CORE.Siemens
CultureInfo cultureInfo = CultureInfo.CreateSpecificCulture(language);
//Setup the path of NC alarms translations file
filePath = PlcMessagesFilePath + "cmsalarm_" + cultureInfo.ThreeLetterISOLanguageName.ToUpper() + ".ts";
filePath = PlcMessagesFilePath + "cmsalarm_" + cultureInfo.ThreeLetterWindowsLanguageName.ToUpper() + ".ts";
if (!File.Exists(filePath))
return INCORRECT_LANGUAGE_ERROR;
@@ -2131,6 +2131,16 @@ namespace CMS_CORE.Siemens
return NO_ERROR;
}
public override CmsError FILES_WStartQueue()
{
return NO_ERROR;
}
public override CmsError FILES_WStopQueue()
{
return NO_ERROR;
}
private IEnumerable<string> GetLinesFromString(string text)
{
string line;
@@ -3520,11 +3530,9 @@ namespace CMS_CORE.Siemens
//Convert to Step Language
private String ConvertToNCLanguage(CultureInfo language)
{
return language.ThreeLetterISOLanguageName;
return language.ThreeLetterWindowsLanguageName;
}
private int SwapIntEndianFormat(int value)
{
var b1 = (value >> 0) & 0xff;