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

LP modifiche per modifiche parametro Ravvivatura Fanuc

Browse Source
This commit is contained in:
ext_luca.pansa@cms.it
2021-01-15 16:52:42 +01:00
parent 2a037c10b1
commit 7a6a5436f0
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS_CORE_Library/Siemens/Nc_Siemens.cs
+11 -10
View File
@@ -220,7 +220,7 @@ namespace CMS_CORE_Library.Siemens
if (this.EnableAlarms)
{
if(SiemensAlmSvc == null)
if (SiemensAlmSvc == null)
{
SiemensAlarms = new Alarm[] { };
SiemensAlmSvc = new AlarmSvc(ConvertToSTEPLanguage(SiemensLanguage).ThreeLetterISOLanguageName);
@@ -1164,7 +1164,7 @@ namespace CMS_CORE_Library.Siemens
dataSvc.Read(activeEdgeId);
}
if ( activeEdgeId != null && Convert.ToInt32(activeEdgeId.Value) != 0)
if (activeEdgeId != null && Convert.ToInt32(activeEdgeId.Value) != 0)
{
// Find edge
var edge = tool.EdgesData
@@ -2383,7 +2383,7 @@ namespace CMS_CORE_Library.Siemens
return INCORRECT_PARAMETERS_ERROR;
// Write process number
cmsError = MEM_RWByte(W, 0, SELECT_PROCESS.MemType, SELECT_PROCESS.Address, SELECT_PROCESS.SubAddress + 1, 0, ref processNum);
cmsError = MEM_RWByte(W, 0, SELECT_PROCESS.MemType, SELECT_PROCESS.Address, SELECT_PROCESS.SubAddress + 1, 0, ref processNum);
if (cmsError.IsError())
return cmsError;
@@ -4798,6 +4798,7 @@ namespace CMS_CORE_Library.Siemens
new Item(){ Path = string.Format("DB{0}.DBD54", BALLUF_EMPTY_TABLE.Address), Value = tool.MaxLoadPctAutoload },
new Item(){ Path = string.Format("DB{0}.DBD58", BALLUF_EMPTY_TABLE.Address), Value = tool.MinLoadPctAutoload },
new Item(){ Path = string.Format("DB{0}.DBD62", BALLUF_EMPTY_TABLE.Address), Value = tool.ToolTypeCode },
//new Item(){ Path = string.Format("DB{0}.DBD138", BALLUF_EMPTY_TABLE.Address), Value = tool. },
//new Item(){ Path = string.Format("DB{0}.DBD58", BALLUF_EMPTY_TABLE.Address), Value = tool.Cooling1 },
//new Item(){ Path = string.Format("DB{0}.DBD62", BALLUF_EMPTY_TABLE.Address), Value = tool.Cooling2 },
//new Item(){ Path = string.Format("DB{0}.DBB64:STRING", BALLUF_EMPTY_TABLE.Address), Value = tool.FamilyName },
@@ -4820,9 +4821,9 @@ namespace CMS_CORE_Library.Siemens
{
if (edge.EdgeAdditionalParams.ContainsKey(conf.Name) && toolEdgesConfig.TDIEdgeFields.ContainsKey(conf.Path))
{
if(conf.Name == "teeth")
if (conf.Name == "teeth" || conf.Name == "wearRadius")
{
UInt16 formattedValue =Convert.ToUInt16(edge.EdgeAdditionalParams[conf.Name]);
UInt16 formattedValue = Convert.ToUInt16(edge.EdgeAdditionalParams[conf.Name]);
items.Add(new Item()
{
Path = string.Format(toolEdgesConfig.TDIEdgeFields[conf.Path], BALLUF_EMPTY_TABLE.Address),
@@ -4833,11 +4834,11 @@ namespace CMS_CORE_Library.Siemens
else
{
var formattedValue = GetSiemensFormattedDouble(edge.EdgeAdditionalParams[conf.Name]);
items.Add(new Item()
{
Path = string.Format(toolEdgesConfig.TDIEdgeFields[conf.Path], BALLUF_EMPTY_TABLE.Address),
Value = formattedValue
});
items.Add(new Item()
{
Path = string.Format(toolEdgesConfig.TDIEdgeFields[conf.Path], BALLUF_EMPTY_TABLE.Address),
Value = formattedValue
});
}
}
}
CMS_CORE_Library/ToolConfigurations.cs
+4
View File
@@ -280,6 +280,8 @@ namespace CMS_CORE_Library
new FieldsConfiguration{ Name = "measured", Type = "boolean", SelectValues = null, Category = "status", ReadOnly = false, MinValue = 0, MaxValue = int.MaxValue},
new FieldsConfiguration{ Name = "integrityCheck", Type = "boolean", SelectValues = null, Category = "status", SubCategory = "integrityCheck", ReadOnly = false, MinValue = 0, MaxValue = int.MaxValue},
new FieldsConfiguration{ Name = "residualLife", Type = "int", SelectValues = null, Category = "life", ReadOnly = false, MinValue = 0, MaxValue = int.MaxValue},
new FieldsConfiguration{ Name = "residualDress", Type = "int", SelectValues = null, Category = "life", ReadOnly = false, MinValue = 0, MaxValue = int.MaxValue},
new FieldsConfiguration{ Name = "residualPreset", Type = "int", SelectValues = null, Category = "life", ReadOnly = false, MinValue = 0, MaxValue = int.MaxValue},
new FieldsConfiguration{ Name = "offsetId1", Type = "int", SelectValues = null, Category = "offset", ReadOnly = false, MinValue = 0, MaxValue = ushort.MaxValue},
new FieldsConfiguration{ Name = "offsetId2", Type = "int", SelectValues = null, Category = "offset", ReadOnly = false, MinValue = 0, MaxValue = ushort.MaxValue},
new FieldsConfiguration{ Name = "offsetId3", Type = "int", SelectValues = null, Category = "offset", ReadOnly = false, MinValue = 0, MaxValue = ushort.MaxValue},
@@ -317,6 +319,7 @@ namespace CMS_CORE_Library
new FieldsConfiguration{ Name = "lifeType", Type = "select", SelectValues = cmsToolLifeList, Category = "life", ReadOnly = false, MinValue = 0, MaxValue = byte.MaxValue},
new FieldsConfiguration{ Name = "nominalLife", Type = "int", SelectValues = null, Category = "life", ReadOnly = false, MinValue = 0, MaxValue = ushort.MaxValue},
new FieldsConfiguration{ Name = "reviveDelta", Type = "int", SelectValues = null, Category = "revive", ReadOnly = false, MinValue = 0, MaxValue = ushort.MaxValue},
new FieldsConfiguration{ Name = "presettingDelta", Type = "int", SelectValues = null, Category = "revive", ReadOnly = false, MinValue = 0, MaxValue = ushort.MaxValue},
},
FamilyReadOnlyConfiguration = new List<FieldsConfiguration>()
{
@@ -347,6 +350,7 @@ namespace CMS_CORE_Library
new FieldsConfiguration{ Name = "lifeType", Type = "int", SelectValues = null, Category = "family", SubCategory = "life", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue},
new FieldsConfiguration{ Name = "nominalLife", Type = "int", SelectValues = null, Category = "family", SubCategory = "life", ReadOnly = true, MinValue = 0, MaxValue = ushort.MaxValue},
new FieldsConfiguration{ Name = "reviveDelta", Type = "int", SelectValues = null, Category = "family", SubCategory = "revive", ReadOnly = true, MinValue = 0, MaxValue = ushort.MaxValue},
new FieldsConfiguration{ Name = "presettingDelta", Type = "int", SelectValues = null, Category = "family", SubCategory = "revive", ReadOnly = true, MinValue = 0, MaxValue = ushort.MaxValue},
},
ToolsConfiguration = new List<FieldsConfiguration>()
{