Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/new/ThermoCamManager' into develop

Browse Source
This commit is contained in:
Thermo_SIM
2021-03-09 12:07:10 +01:00
parent 45e62c635f 6919827661
commit 71667b87a9
6 changed files with 102 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active.NC/NcAdapter.cs
+53 -7
View File
@@ -582,31 +582,31 @@ namespace Thermo.Active.NC
break;
case AxisCommand.MoveAbsolute:
doWrite = true;
biteCommand = 0;
biteCommand = 1;
break;
case AxisCommand.JogIncPlus:
doWrite = true;
biteCommand = 1;
biteCommand = 2;
break;
case AxisCommand.JogIncMinus:
doWrite = true;
biteCommand = 2;
biteCommand = 3;
break;
case AxisCommand.Align:
doWrite = true;
biteCommand = 3;
biteCommand = 4;
break;
case AxisCommand.Probe:
doWrite = true;
biteCommand = 4;
biteCommand = 5;
break;
case AxisCommand.SetSlavePosition:
doWrite = true;
biteCommand = 5;
biteCommand = 6;
break;
case AxisCommand.Reset:
doWrite = true;
biteCommand = 6;
biteCommand = 7;
break;
case AxisCommand.Num07:
break;
@@ -3480,6 +3480,52 @@ namespace Thermo.Active.NC
return NO_ERROR;
}
/// <summary>
/// Set AdvMode for AXES
/// </summary>
/// <param name="advMode">Boolean for advmode true/false</param>
/// <returns></returns>
public CmsError SetAxesAdvMode(bool advMode)
{
// solo x S7...
if (NcConfig.NcVendor == NC_VENDOR.S7NET)
{
// scrivo!
CmsError libraryError = numericalControl.PLC_WAxisGeneralControl(advMode);
if (libraryError.IsError())
return libraryError;
}
else
{
return FUNCTION_NOT_ALLOWED_ERROR;
}
return NO_ERROR;
}
/// <summary>
/// Get AdvMode for AXES
/// </summary>
/// <param name="advMode">Boolean for advmode true/false</param>
/// <returns></returns>
public CmsError GetAxesAdvMode(out bool advMode)
{
advMode = false;
// solo x S7...
if (NcConfig.NcVendor == NC_VENDOR.S7NET)
{
// scrivo!
CmsError libraryError = numericalControl.PLC_RAxisGeneralStatus(ref advMode);
if (libraryError.IsError())
return libraryError;
}
else
{
return FUNCTION_NOT_ALLOWED_ERROR;
}
return NO_ERROR;
}
public void WriteCandy(DateTime value, int machNumber)
{
long nDays;