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

Browse Source
This commit is contained in:
Lucio Maranta
2018-11-30 12:59:47 +00:00
parent 7dbf5f8432
commit 75d51a2a0f
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS_CORE_Library/Fanuc/Nc_Fanuc.cs
+2 -2
View File
@@ -3072,7 +3072,7 @@ namespace CMS_CORE_Library.Fanuc
int status = 0;
cmsError = MEM_RWInteger(R, 0, MAGAZINES_ENABLED_CMD.MemType, MAGAZINES_ENABLED_CMD.Address, ref status);
if (cmsError.IsError())
return cmsError;
return cmsError;
bool[] bits = IntToBits(status);
@@ -3521,7 +3521,7 @@ namespace CMS_CORE_Library.Fanuc
}
}
//Convert to Step Language
// Convert to Step Language
private CultureInfo ConvertToSTEPLanguage(byte language)
{
switch (language)
CMS_CORE_Library/ToolConfigurations.cs
+5 -3
View File
@@ -274,10 +274,12 @@ namespace CMS_CORE_Library
ShankConfiguration = new List<FieldsConfiguration>()
{
new FieldsConfiguration{ Name = "id", Type = "int", SelectValues = null, Category = "general", ReadOnly = true, MinValue = 0, MaxValue = 0 },
new FieldsConfiguration{ Name = "balluf", Type = "int", SelectValues = null, Category = "balluf", ReadOnly = false, MinValue = 0, MaxValue = (uint)short.MaxValue },
new FieldsConfiguration{ Name = "magazinePositionType", Type = "int", SelectValues = null, Category = "magPosType", ReadOnly = false, MinValue = 0, MaxValue = byte.MaxValue },
new FieldsConfiguration{ Name = "balluf", Type = "int", SelectValues = null, Category = "balluf", ReadOnly = false, MinValue = 0, MaxValue = (uint)short.MaxValue },
new FieldsConfiguration{ Name = "magazinePositionType", Type = "int", SelectValues = null, Category = "magPosType", ReadOnly = false, MinValue = 0, MaxValue = byte.MaxValue },
new FieldsConfiguration{ Name = "magazineId", Type = "int", SelectValues = null, Category = "position", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue },
new FieldsConfiguration{ Name = "positionId", Type = "int", SelectValues = null, Category = "position", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue }
new FieldsConfiguration{ Name = "positionId", Type = "int", SelectValues = null, Category = "position", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue },
new FieldsConfiguration{ Name = "originMagazineId", Type = "int", SelectValues = null, Category = "position", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue },
new FieldsConfiguration{ Name = "originPositionId", Type = "int", SelectValues = null, Category = "position", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue }
},
ToolsConfiguration = new List<FieldsConfiguration>()
{