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

Siemens & Demo m155

Browse Source
This commit is contained in:
Lucio Maranta
2018-11-15 13:00:50 +00:00
parent 78fe68fc8a
commit abf2dbabe2
5 changed files with 188 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS_CORE_Application/Form1.cs
+66 -49
View File
@@ -73,70 +73,87 @@ namespace CMS_CORE_Application
N = SetNcByType();
CmsError cmsError = N.NC_Connect();
cmsError = N.NC_RModelName(ref ModelName);
// cmsError = N.NC_RModelName(ref ModelName);
//cmsError = N.NC_WLanguage(new System.Globalization.CultureInfo("it"));
bool error = false;
string serial = "";
while (true)
{
sw.Restart();
cmsError = N.PROC_RMode(1, ref mode);
if (cmsError.IsError())
{
error = true;
SetError(Lines, cmsError);
}
// cmsError = N.PROC_RMode(1, ref mode);
//if (cmsError.IsError())
//{
// error = true;
// SetError(Lines, cmsError);
//}
cmsError = N.PROC_RStatus(1, ref status);
if (cmsError.IsError())
{
error = true;
SetError(Lines, cmsError);
}
//cmsError = N.PROC_RStatus(1, ref status);
//if (cmsError.IsError())
//{
// error = true;
// SetError(Lines, cmsError);
//}
cmsError = N.PROC_RActiveAlarms(1, ref procAlarms);
if (cmsError.IsError())
{
error = true;
SetError(Lines, cmsError);
}
//cmsError = N.PROC_RActiveAlarms(1, ref procAlarms);
//if (cmsError.IsError())
//{
// error = true;
// SetError(Lines, cmsError);
//}
cmsError = N.NC_RActiveAlarms(ref ncAlarms);
if (cmsError.IsError())
{
error = true;
SetError(Lines, cmsError);
}
//cmsError = N.NC_RActiveAlarms(ref ncAlarms);
//if (cmsError.IsError())
//{
// error = true;
// SetError(Lines, cmsError);
//}
cmsError = N.PLC_RActiveMessages(ref plcMsg);
if (cmsError.IsError())
{
error = true;
SetError(Lines, cmsError);
}
//cmsError = N.PLC_RActiveMessages(ref plcMsg);
//if (cmsError.IsError())
//{
// error = true;
// SetError(Lines, cmsError);
//}
cmsError = N.NC_RDateTime(ref NcTime);
if (cmsError.IsError())
{
error = true;
SetError(Lines, cmsError);
}
//cmsError = N.NC_RDateTime(ref NcTime);
//if (cmsError.IsError())
//{
// error = true;
// SetError(Lines, cmsError);
//}
cmsError = N.NC_RSerialNumber(ref serial);
if (cmsError.IsError())
{
error = true;
SetError(Lines, cmsError);
}
//cmsError = N.NC_RSerialNumber(ref serial);
//if (cmsError.IsError())
//{
// error = true;
// SetError(Lines, cmsError);
//}
List<AxisModel> axes = new List<AxisModel>();
ToolTableConfiguration conf = new ToolTableConfiguration();
N.TOOLS_RConfiguration(ref conf);
//ToolTableConfiguration conf = new ToolTableConfiguration();
// N.TOOLS_RConfiguration(ref conf);
////////////// SPEED TEST
Stopwatch st = new Stopwatch();
sw.Restart();
//cmsError = N.PROC_RActiveAlarms(1, ref ncAlarms);
//if (cmsError.IsError())
//{
// error = true;
// SetError(Lines, cmsError);
//}
MessageBox.Show("START");
cmsError = N.AXES_RAxesNames(1, ref axes);
TXTAlm.Text = "1\n" + String.Join(" ", axes.Select(x => x.Name.ToString() + "-" + x.Id.ToString() + "\n"));
axes.Clear();
cmsError = N.AXES_RAxesNames(2, ref axes);
TXTMsg.Text = "2\n" + String.Join(" ", axes.Select(x => x.Name.ToString() + "-" + x.Id.ToString() + "\n"));
MessageBox.Show("STOP");
Console.WriteLine("ICON" + sw.ElapsedMilliseconds);
sw.Stop();
@@ -214,8 +231,8 @@ namespace CMS_CORE_Application
{
TXTip.Enabled = true;
TXTport.Enabled = true;
// TXTip.Text = "192.168.139.1";
TXTip.Text = "10.69.36.33";
TXTip.Text = "192.168.139.1";
// TXTip.Text = "10.69.36.33";
TXTport.Text = "8193";
}
else if (NcCombo.SelectedItem.ToString().Equals("Osai"))
CMS_CORE_Library/Demo/Nc_Demo.cs
+18 -8
View File
@@ -90,6 +90,7 @@ namespace CMS_CORE_Library.Demo
{
try
{
NC_Connect();
messages = new Dictionary<int, string>();
serverService.GetTranslations(language, out messages);
@@ -804,15 +805,24 @@ namespace CMS_CORE_Library.Demo
return cmsError;
bool[] bits = ByteToBits(val);
uint i = 0;
value = bits
.Select(x => new M155InputIsNeededModel()
for(uint i = 0; i < 6; i++)
{
if (bits[i])
{
Process = i++,
IsNeeded = x
})
.ToList();
value.Add(new M155InputIsNeededModel()
{
Process = i,
IsNeeded = true,
Buttons = new Dictionary<byte, string>()
{
{ 1, "bottoneDiTest" }
},
Message = "Messaggio di test",
Type = bits[6] == false ? M155_TYPE.REAL : M155_TYPE.MULTIPLE_BUTTONS
});
}
}
return NO_ERROR;
}
CMS_CORE_Library/Fanuc/Nc_Fanuc.cs
+102 -102
View File
@@ -1128,38 +1128,38 @@ namespace CMS_CORE_Library.Fanuc
{
switch (i)
{
case 1: ReadRelativeAxisPos(axisFan.p1.rel, ref Axes); break;
case 2: ReadRelativeAxisPos(axisFan.p2.rel, ref Axes); break;
case 3: ReadRelativeAxisPos(axisFan.p3.rel, ref Axes); break;
case 4: ReadRelativeAxisPos(axisFan.p4.rel, ref Axes); break;
case 5: ReadRelativeAxisPos(axisFan.p5.rel, ref Axes); break;
case 6: ReadRelativeAxisPos(axisFan.p6.rel, ref Axes); break;
case 7: ReadRelativeAxisPos(axisFan.p7.rel, ref Axes); break;
case 8: ReadRelativeAxisPos(axisFan.p8.rel, ref Axes); break;
case 9: ReadRelativeAxisPos(axisFan.p9.rel, ref Axes); break;
case 10: ReadRelativeAxisPos(axisFan.p10.rel, ref Axes); break;
case 11: ReadRelativeAxisPos(axisFan.p11.rel, ref Axes); break;
case 12: ReadRelativeAxisPos(axisFan.p12.rel, ref Axes); break;
case 13: ReadRelativeAxisPos(axisFan.p13.rel, ref Axes); break;
case 14: ReadRelativeAxisPos(axisFan.p14.rel, ref Axes); break;
case 15: ReadRelativeAxisPos(axisFan.p15.rel, ref Axes); break;
case 16: ReadRelativeAxisPos(axisFan.p16.rel, ref Axes); break;
case 17: ReadRelativeAxisPos(axisFan.p17.rel, ref Axes); break;
case 18: ReadRelativeAxisPos(axisFan.p18.rel, ref Axes); break;
case 19: ReadRelativeAxisPos(axisFan.p19.rel, ref Axes); break;
case 20: ReadRelativeAxisPos(axisFan.p20.rel, ref Axes); break;
case 21: ReadRelativeAxisPos(axisFan.p21.rel, ref Axes); break;
case 22: ReadRelativeAxisPos(axisFan.p22.rel, ref Axes); break;
case 23: ReadRelativeAxisPos(axisFan.p23.rel, ref Axes); break;
case 24: ReadRelativeAxisPos(axisFan.p24.rel, ref Axes); break;
case 25: ReadRelativeAxisPos(axisFan.p25.rel, ref Axes); break;
case 26: ReadRelativeAxisPos(axisFan.p26.rel, ref Axes); break;
case 27: ReadRelativeAxisPos(axisFan.p27.rel, ref Axes); break;
case 28: ReadRelativeAxisPos(axisFan.p28.rel, ref Axes); break;
case 29: ReadRelativeAxisPos(axisFan.p29.rel, ref Axes); break;
case 30: ReadRelativeAxisPos(axisFan.p30.rel, ref Axes); break;
case 31: ReadRelativeAxisPos(axisFan.p31.rel, ref Axes); break;
case 32: ReadRelativeAxisPos(axisFan.p32.rel, ref Axes); break;
case 1: ReadRelativeAxisPos(axisFan.p1.rel, 1,ref Axes); break;
case 2: ReadRelativeAxisPos(axisFan.p2.rel, 2,ref Axes); break;
case 3: ReadRelativeAxisPos(axisFan.p3.rel, 3, ref Axes); break;
case 4: ReadRelativeAxisPos(axisFan.p4.rel, 4, ref Axes); break;
case 5: ReadRelativeAxisPos(axisFan.p5.rel, 5, ref Axes); break;
case 6: ReadRelativeAxisPos(axisFan.p6.rel, 6, ref Axes); break;
case 7: ReadRelativeAxisPos(axisFan.p7.rel, 7, ref Axes); break;
case 8: ReadRelativeAxisPos(axisFan.p8.rel, 8, ref Axes); break;
case 9: ReadRelativeAxisPos(axisFan.p9.rel, 9, ref Axes); break;
case 10: ReadRelativeAxisPos(axisFan.p10.rel, 10, ref Axes); break;
case 11: ReadRelativeAxisPos(axisFan.p11.rel, 11, ref Axes); break;
case 12: ReadRelativeAxisPos(axisFan.p12.rel, 12, ref Axes); break;
case 13: ReadRelativeAxisPos(axisFan.p13.rel, 13, ref Axes); break;
case 14: ReadRelativeAxisPos(axisFan.p14.rel, 14, ref Axes); break;
case 15: ReadRelativeAxisPos(axisFan.p15.rel, 15, ref Axes); break;
case 16: ReadRelativeAxisPos(axisFan.p16.rel, 16, ref Axes); break;
case 17: ReadRelativeAxisPos(axisFan.p17.rel, 17, ref Axes); break;
case 18: ReadRelativeAxisPos(axisFan.p18.rel, 18, ref Axes); break;
case 19: ReadRelativeAxisPos(axisFan.p19.rel, 19, ref Axes); break;
case 20: ReadRelativeAxisPos(axisFan.p20.rel, 20, ref Axes); break;
case 21: ReadRelativeAxisPos(axisFan.p21.rel, 21, ref Axes); break;
case 22: ReadRelativeAxisPos(axisFan.p22.rel, 22, ref Axes); break;
case 23: ReadRelativeAxisPos(axisFan.p23.rel, 23, ref Axes); break;
case 24: ReadRelativeAxisPos(axisFan.p24.rel, 24, ref Axes); break;
case 25: ReadRelativeAxisPos(axisFan.p25.rel, 25, ref Axes); break;
case 26: ReadRelativeAxisPos(axisFan.p26.rel, 26, ref Axes); break;
case 27: ReadRelativeAxisPos(axisFan.p27.rel, 27, ref Axes); break;
case 28: ReadRelativeAxisPos(axisFan.p28.rel, 28, ref Axes); break;
case 29: ReadRelativeAxisPos(axisFan.p29.rel, 29, ref Axes); break;
case 30: ReadRelativeAxisPos(axisFan.p30.rel, 30, ref Axes); break;
case 31: ReadRelativeAxisPos(axisFan.p31.rel, 31,ref Axes); break;
case 32: ReadRelativeAxisPos(axisFan.p32.rel, 32, ref Axes); break;
}
}
@@ -1202,38 +1202,38 @@ namespace CMS_CORE_Library.Fanuc
{
switch (i)
{
case 1: ReadRelativeAxisPos(axisFan.p1.mach, ref Axes); break;
case 2: ReadRelativeAxisPos(axisFan.p2.mach, ref Axes); break;
case 3: ReadRelativeAxisPos(axisFan.p3.mach, ref Axes); break;
case 4: ReadRelativeAxisPos(axisFan.p4.mach, ref Axes); break;
case 5: ReadRelativeAxisPos(axisFan.p5.mach, ref Axes); break;
case 6: ReadRelativeAxisPos(axisFan.p6.mach, ref Axes); break;
case 7: ReadRelativeAxisPos(axisFan.p7.mach, ref Axes); break;
case 8: ReadRelativeAxisPos(axisFan.p8.mach, ref Axes); break;
case 9: ReadRelativeAxisPos(axisFan.p9.mach, ref Axes); break;
case 10: ReadRelativeAxisPos(axisFan.p10.mach, ref Axes); break;
case 11: ReadRelativeAxisPos(axisFan.p11.mach, ref Axes); break;
case 12: ReadRelativeAxisPos(axisFan.p12.mach, ref Axes); break;
case 13: ReadRelativeAxisPos(axisFan.p13.mach, ref Axes); break;
case 14: ReadRelativeAxisPos(axisFan.p14.mach, ref Axes); break;
case 15: ReadRelativeAxisPos(axisFan.p15.mach, ref Axes); break;
case 16: ReadRelativeAxisPos(axisFan.p16.mach, ref Axes); break;
case 17: ReadRelativeAxisPos(axisFan.p17.mach, ref Axes); break;
case 18: ReadRelativeAxisPos(axisFan.p18.mach, ref Axes); break;
case 19: ReadRelativeAxisPos(axisFan.p19.mach, ref Axes); break;
case 20: ReadRelativeAxisPos(axisFan.p20.mach, ref Axes); break;
case 21: ReadRelativeAxisPos(axisFan.p21.mach, ref Axes); break;
case 22: ReadRelativeAxisPos(axisFan.p22.mach, ref Axes); break;
case 23: ReadRelativeAxisPos(axisFan.p23.mach, ref Axes); break;
case 24: ReadRelativeAxisPos(axisFan.p24.mach, ref Axes); break;
case 25: ReadRelativeAxisPos(axisFan.p25.mach, ref Axes); break;
case 26: ReadRelativeAxisPos(axisFan.p26.mach, ref Axes); break;
case 27: ReadRelativeAxisPos(axisFan.p27.mach, ref Axes); break;
case 28: ReadRelativeAxisPos(axisFan.p28.mach, ref Axes); break;
case 29: ReadRelativeAxisPos(axisFan.p29.mach, ref Axes); break;
case 30: ReadRelativeAxisPos(axisFan.p30.mach, ref Axes); break;
case 31: ReadRelativeAxisPos(axisFan.p31.mach, ref Axes); break;
case 32: ReadRelativeAxisPos(axisFan.p32.mach, ref Axes); break;
case 1: ReadRelativeAxisPos(axisFan.p1.mach, 1, ref Axes); break;
case 2: ReadRelativeAxisPos(axisFan.p2.mach, 2, ref Axes); break;
case 3: ReadRelativeAxisPos(axisFan.p3.mach, 3, ref Axes); break;
case 4: ReadRelativeAxisPos(axisFan.p4.mach, 4, ref Axes); break;
case 5: ReadRelativeAxisPos(axisFan.p5.mach, 5, ref Axes); break;
case 6: ReadRelativeAxisPos(axisFan.p6.mach, 6, ref Axes); break;
case 7: ReadRelativeAxisPos(axisFan.p7.mach, 7, ref Axes); break;
case 8: ReadRelativeAxisPos(axisFan.p8.mach, 8, ref Axes); break;
case 9: ReadRelativeAxisPos(axisFan.p9.mach, 9, ref Axes); break;
case 10: ReadRelativeAxisPos(axisFan.p10.mach, 10, ref Axes); break;
case 11: ReadRelativeAxisPos(axisFan.p11.mach, 11, ref Axes); break;
case 12: ReadRelativeAxisPos(axisFan.p12.mach, 12, ref Axes); break;
case 13: ReadRelativeAxisPos(axisFan.p13.mach, 13, ref Axes); break;
case 14: ReadRelativeAxisPos(axisFan.p14.mach, 14, ref Axes); break;
case 15: ReadRelativeAxisPos(axisFan.p15.mach, 15, ref Axes); break;
case 16: ReadRelativeAxisPos(axisFan.p16.mach, 16, ref Axes); break;
case 17: ReadRelativeAxisPos(axisFan.p17.mach, 17, ref Axes); break;
case 18: ReadRelativeAxisPos(axisFan.p18.mach, 18, ref Axes); break;
case 19: ReadRelativeAxisPos(axisFan.p19.mach, 19, ref Axes); break;
case 20: ReadRelativeAxisPos(axisFan.p20.mach, 20, ref Axes); break;
case 21: ReadRelativeAxisPos(axisFan.p21.mach, 21, ref Axes); break;
case 22: ReadRelativeAxisPos(axisFan.p22.mach, 22, ref Axes); break;
case 23: ReadRelativeAxisPos(axisFan.p23.mach, 23, ref Axes); break;
case 24: ReadRelativeAxisPos(axisFan.p24.mach, 24, ref Axes); break;
case 25: ReadRelativeAxisPos(axisFan.p25.mach, 25, ref Axes); break;
case 26: ReadRelativeAxisPos(axisFan.p26.mach, 26, ref Axes); break;
case 27: ReadRelativeAxisPos(axisFan.p27.mach, 27, ref Axes); break;
case 28: ReadRelativeAxisPos(axisFan.p28.mach, 28, ref Axes); break;
case 29: ReadRelativeAxisPos(axisFan.p29.mach, 29, ref Axes); break;
case 30: ReadRelativeAxisPos(axisFan.p30.mach, 30, ref Axes); break;
case 31: ReadRelativeAxisPos(axisFan.p31.mach, 31, ref Axes); break;
case 32: ReadRelativeAxisPos(axisFan.p32.mach, 32, ref Axes); break;
}
}
return NO_ERROR;
@@ -1275,38 +1275,38 @@ namespace CMS_CORE_Library.Fanuc
{
switch (i)
{
case 1: ReadRelativeAxisPos(axisFan.p1.dist, ref Axes); break;
case 2: ReadRelativeAxisPos(axisFan.p2.dist, ref Axes); break;
case 3: ReadRelativeAxisPos(axisFan.p3.dist, ref Axes); break;
case 4: ReadRelativeAxisPos(axisFan.p4.dist, ref Axes); break;
case 5: ReadRelativeAxisPos(axisFan.p5.dist, ref Axes); break;
case 6: ReadRelativeAxisPos(axisFan.p6.dist, ref Axes); break;
case 7: ReadRelativeAxisPos(axisFan.p7.dist, ref Axes); break;
case 8: ReadRelativeAxisPos(axisFan.p8.dist, ref Axes); break;
case 9: ReadRelativeAxisPos(axisFan.p9.dist, ref Axes); break;
case 10: ReadRelativeAxisPos(axisFan.p10.dist, ref Axes); break;
case 11: ReadRelativeAxisPos(axisFan.p11.dist, ref Axes); break;
case 12: ReadRelativeAxisPos(axisFan.p12.dist, ref Axes); break;
case 13: ReadRelativeAxisPos(axisFan.p13.dist, ref Axes); break;
case 14: ReadRelativeAxisPos(axisFan.p14.dist, ref Axes); break;
case 15: ReadRelativeAxisPos(axisFan.p15.dist, ref Axes); break;
case 16: ReadRelativeAxisPos(axisFan.p16.dist, ref Axes); break;
case 17: ReadRelativeAxisPos(axisFan.p17.dist, ref Axes); break;
case 18: ReadRelativeAxisPos(axisFan.p18.dist, ref Axes); break;
case 19: ReadRelativeAxisPos(axisFan.p19.dist, ref Axes); break;
case 20: ReadRelativeAxisPos(axisFan.p20.dist, ref Axes); break;
case 21: ReadRelativeAxisPos(axisFan.p21.dist, ref Axes); break;
case 22: ReadRelativeAxisPos(axisFan.p22.dist, ref Axes); break;
case 23: ReadRelativeAxisPos(axisFan.p23.dist, ref Axes); break;
case 24: ReadRelativeAxisPos(axisFan.p24.dist, ref Axes); break;
case 25: ReadRelativeAxisPos(axisFan.p25.dist, ref Axes); break;
case 26: ReadRelativeAxisPos(axisFan.p26.dist, ref Axes); break;
case 27: ReadRelativeAxisPos(axisFan.p27.dist, ref Axes); break;
case 28: ReadRelativeAxisPos(axisFan.p28.dist, ref Axes); break;
case 29: ReadRelativeAxisPos(axisFan.p29.dist, ref Axes); break;
case 30: ReadRelativeAxisPos(axisFan.p30.dist, ref Axes); break;
case 31: ReadRelativeAxisPos(axisFan.p31.dist, ref Axes); break;
case 32: ReadRelativeAxisPos(axisFan.p32.dist, ref Axes); break;
case 1: ReadRelativeAxisPos(axisFan.p1.dist, 1, ref Axes); break;
case 2: ReadRelativeAxisPos(axisFan.p2.dist, 2, ref Axes); break;
case 3: ReadRelativeAxisPos(axisFan.p3.dist, 3, ref Axes); break;
case 4: ReadRelativeAxisPos(axisFan.p4.dist, 4, ref Axes); break;
case 5: ReadRelativeAxisPos(axisFan.p5.dist, 5, ref Axes); break;
case 6: ReadRelativeAxisPos(axisFan.p6.dist, 6, ref Axes); break;
case 7: ReadRelativeAxisPos(axisFan.p7.dist, 7, ref Axes); break;
case 8: ReadRelativeAxisPos(axisFan.p8.dist, 8, ref Axes); break;
case 9: ReadRelativeAxisPos(axisFan.p9.dist, 9, ref Axes); break;
case 10: ReadRelativeAxisPos(axisFan.p10.dist, 10, ref Axes); break;
case 11: ReadRelativeAxisPos(axisFan.p11.dist, 11, ref Axes); break;
case 12: ReadRelativeAxisPos(axisFan.p12.dist, 12, ref Axes); break;
case 13: ReadRelativeAxisPos(axisFan.p13.dist, 13, ref Axes); break;
case 14: ReadRelativeAxisPos(axisFan.p14.dist, 14, ref Axes); break;
case 15: ReadRelativeAxisPos(axisFan.p15.dist, 15, ref Axes); break;
case 16: ReadRelativeAxisPos(axisFan.p16.dist, 16, ref Axes); break;
case 17: ReadRelativeAxisPos(axisFan.p17.dist, 17, ref Axes); break;
case 18: ReadRelativeAxisPos(axisFan.p18.dist, 18, ref Axes); break;
case 19: ReadRelativeAxisPos(axisFan.p19.dist, 19, ref Axes); break;
case 20: ReadRelativeAxisPos(axisFan.p20.dist, 20, ref Axes); break;
case 21: ReadRelativeAxisPos(axisFan.p21.dist, 21, ref Axes); break;
case 22: ReadRelativeAxisPos(axisFan.p22.dist, 22, ref Axes); break;
case 23: ReadRelativeAxisPos(axisFan.p23.dist, 23, ref Axes); break;
case 24: ReadRelativeAxisPos(axisFan.p24.dist, 24, ref Axes); break;
case 25: ReadRelativeAxisPos(axisFan.p25.dist, 25, ref Axes); break;
case 26: ReadRelativeAxisPos(axisFan.p26.dist, 26, ref Axes); break;
case 27: ReadRelativeAxisPos(axisFan.p27.dist, 27, ref Axes); break;
case 28: ReadRelativeAxisPos(axisFan.p28.dist, 28, ref Axes); break;
case 29: ReadRelativeAxisPos(axisFan.p29.dist, 29, ref Axes); break;
case 30: ReadRelativeAxisPos(axisFan.p30.dist, 30, ref Axes); break;
case 31: ReadRelativeAxisPos(axisFan.p31.dist, 31, ref Axes); break;
case 32: ReadRelativeAxisPos(axisFan.p32.dist, 32, ref Axes); break;
}
}
@@ -3144,25 +3144,25 @@ namespace CMS_CORE_Library.Fanuc
return NO_ERROR;
}
private void ReadRelativeAxisPos(Focas1.POSELM pos, ref Dictionary<string, double> Axes)
private void ReadRelativeAxisPos(Focas1.POSELM pos, int axisId, ref Dictionary<string, double> Axes)
{
//If is setted VISIBLE add to List
if (pos.disp != 0)
{
string AxName;
// string AxName;
double AxVal;
KeyValuePair<string, double> val;
//Read the name and Value
AxName = pos.name.ToString() + pos.suff.ToString().Trim('\0');
// AxName = pos.name.ToString() + pos.suff.ToString().Trim('\0');
AxVal = pos.data / Math.Pow(10, pos.dec);
//Fill in the list
val = Axes.FirstOrDefault(X => X.Key == AxName);
// Fill in the list
val = Axes.FirstOrDefault(X => X.Key == axisId.ToString());
if (val.Key != null)
Axes[val.Key] = AxVal;
else
Axes.Add(AxName, AxVal);
Axes.Add(axisId.ToString(), AxVal);
}
}
CMS_CORE_Library/Models/DataStructures.cs
+1 -1
View File
@@ -110,7 +110,7 @@ namespace CMS_CORE_Library.Models
public uint Value;
}
public struct M155InputIsNeededModel
public class M155InputIsNeededModel
{
public uint Process;
public bool IsNeeded;
CMS_CORE_Library/Siemens/Nc_Siemens.cs
+1 -1
View File
@@ -924,7 +924,7 @@ namespace CMS_CORE_Library.Siemens
{
Process = processId,
IsNeeded = bit,
Message = parameters[0],
Message = parameters[0] ?? "",
Type = parameters.Count() > 1 ? M155_TYPE.MULTIPLE_BUTTONS : M155_TYPE.REAL, // if there aren't buttons is a simple request
Buttons = buttons
});