diff --git a/CNCommunication.vb b/CNCommunication.vb index 3fa16f4..61993a1 100644 --- a/CNCommunication.vb +++ b/CNCommunication.vb @@ -249,7 +249,7 @@ Public Class CNCommunication m_CN.SetCnDataVar(CN_generico.CnData.InternalCoolant, sVal) GetPrivateProfileString(S_NCDATA, K_EXTERNCOOLANT, "", sVal, m_MainWindow.GetMachIniFile()) m_CN.SetCnDataVar(CN_generico.CnData.ExternCoolant, sVal) - GetPrivateProfileString(S_NCDATA, K_CBAXES, "", sVal, m_MainWindow.GetMachIniFile()) + GetPrivateProfileString(S_NCDATA, K_CAXES, "", sVal, m_MainWindow.GetMachIniFile()) m_CN.SetCnDataVar(CN_generico.CnData.CBAxes, sVal) GetPrivateProfileString(S_NCDATA, K_AIRBLOW, "", sVal, m_MainWindow.GetMachIniFile()) m_CN.SetCnDataVar(CN_generico.CnData.AirBlow, sVal) @@ -265,10 +265,14 @@ Public Class CNCommunication m_CN.SetCnDataVar(CN_generico.CnData.LimitZ, sVal) GetPrivateProfileString(S_NCDATA, K_POWEROVR, "", sVal, m_MainWindow.GetMachIniFile()) m_CN.SetCnDataVar(CN_generico.CnData.PowerOvr, sVal) - GetPrivateProfileString(S_NCDATA, K_VACUUMPOSITION, "", sVal, m_MainWindow.GetMachIniFile()) - m_CN.SetCnDataVar(CN_generico.CnData.VacuumPosition, sVal) - GetPrivateProfileString(S_NCDATA, K_VACUUMROT, "", sVal, m_MainWindow.GetMachIniFile()) - m_CN.SetCnDataVar(CN_generico.CnData.VacuumRot, sVal) + GetPrivateProfileString(S_NCDATA, K_VACUUMUP, "", sVal, m_MainWindow.GetMachIniFile()) + m_CN.SetCnDataVar(CN_generico.CnData.VacuumUp, sVal) + GetPrivateProfileString(S_NCDATA, K_VACUUMDOWN, "", sVal, m_MainWindow.GetMachIniFile()) + m_CN.SetCnDataVar(CN_generico.CnData.VacuumDown, sVal) + GetPrivateProfileString(S_NCDATA, K_VACUUM0, "", sVal, m_MainWindow.GetMachIniFile()) + m_CN.SetCnDataVar(CN_generico.CnData.Vacuum0, sVal) + GetPrivateProfileString(S_NCDATA, K_VACUUM90, "", sVal, m_MainWindow.GetMachIniFile()) + m_CN.SetCnDataVar(CN_generico.CnData.Vacuum90, sVal) GetPrivateProfileString(S_NCDATA, K_VACUU3STATE, "", sVal, m_MainWindow.GetMachIniFile()) m_CN.SetCnDataVar(CN_generico.CnData.Vacuum3State, sVal) GetPrivateProfileString(S_NCDATA, K_VACUU4STATE, "", sVal, m_MainWindow.GetMachIniFile()) @@ -283,8 +287,10 @@ Public Class CNCommunication m_CN.SetCnDataVar(CN_generico.CnData.CloseAllState, sVal) GetPrivateProfileString(S_NCDATA, K_BLOWSTATE, "", sVal, m_MainWindow.GetMachIniFile()) m_CN.SetCnDataVar(CN_generico.CnData.BlowState, sVal) - GetPrivateProfileString(S_NCDATA, K_VACUUMSTATE, "", sVal, m_MainWindow.GetMachIniFile()) - m_CN.SetCnDataVar(CN_generico.CnData.VacuumState, sVal) + GetPrivateProfileString(S_NCDATA, K_VACUUMON, "", sVal, m_MainWindow.GetMachIniFile()) + m_CN.SetCnDataVar(CN_generico.CnData.VacuumOn, sVal) + GetPrivateProfileString(S_NCDATA, K_VACUUMOFF, "", sVal, m_MainWindow.GetMachIniFile()) + m_CN.SetCnDataVar(CN_generico.CnData.VacuumOff, sVal) GetPrivateProfileString(S_NCDATA, K_BYPASSTATE, "", sVal, m_MainWindow.GetMachIniFile()) m_CN.SetCnDataVar(CN_generico.CnData.BypassState, sVal) @@ -458,8 +464,11 @@ Public Class CNCommunication m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.TableDownChanged(m_CN.bTableDownState) m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.DoorClosedChanged(m_CN.nDoorClosedState) m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.LimitZChanged(m_CN.bLimitZState) - m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.VacuumPositionChanged(m_CN.bVacuumPosition) - m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.VacuumRotChanged(m_CN.bVacuumRot) + m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.FiveAxisStateChanged(m_CN.Is_G24_active()) + m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.VacuumUpChanged(m_CN.bVacuumUp) + m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.VacuumDownChanged(m_CN.bVacuumDown) + m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum0Changed(m_CN.bVacuum0) + m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum90Changed(m_CN.bVacuum90) m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum3Changed(m_CN.bVacuum3State) m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum4Changed(m_CN.bVacuum4State) m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum135Changed(m_CN.bVacuum135State) @@ -467,19 +476,20 @@ Public Class CNCommunication m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.OpenAllChanged(m_CN.bOpenAllState) m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.CloseAllChanged(m_CN.bCloseAllState) m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.BlowChanged(m_CN.bBlowState) - m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.VacuumChanged(m_CN.bVacuumState) + m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.VacuumOnChanged(m_CN.bVacuumOn) + m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.VacuumOffChanged(m_CN.bVacuumOff) m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.BypassChanged(m_CN.bBypassState) Else m_MainWindow.m_DirectCutPageUC.m_MachineButtons.SpindleStateChanged(m_CN.bSpindleState) m_MainWindow.m_DirectCutPageUC.m_MachineButtons.CoolantStateChanged(m_CN.bCoolantState) m_MainWindow.m_DirectCutPageUC.m_MachineButtons.LaserStateChanged(m_CN.bLaserState) - End If - If m_CN.Is_G24_active() Then - m_MainWindow.m_DirectCutPageUC.m_MachineButtons.ThreeAxisStateChanged(False) - m_MainWindow.m_DirectCutPageUC.m_MachineButtons.FiveAxisStateChanged(True) - Else - m_MainWindow.m_DirectCutPageUC.m_MachineButtons.ThreeAxisStateChanged(True) - m_MainWindow.m_DirectCutPageUC.m_MachineButtons.FiveAxisStateChanged(False) + If m_CN.Is_G24_active() Then + m_MainWindow.m_DirectCutPageUC.m_MachineButtons.ThreeAxisStateChanged(False) + m_MainWindow.m_DirectCutPageUC.m_MachineButtons.FiveAxisStateChanged(True) + Else + m_MainWindow.m_DirectCutPageUC.m_MachineButtons.ThreeAxisStateChanged(True) + m_MainWindow.m_DirectCutPageUC.m_MachineButtons.FiveAxisStateChanged(False) + End If End If End If diff --git a/CN_generico.vb b/CN_generico.vb index 3a22da7..0836038 100644 --- a/CN_generico.vb +++ b/CN_generico.vb @@ -8,7 +8,7 @@ Public MustInherit Class CN_generico Public Const MAX_VAR As Short = 100 Public Const MAX_VALUES As Short = 9 ' Max. index to read the data from the FXServer array Public Const MAX_TOOLS As Short = 100 - Public Const NUM_DATA = 33 ' Numero di dati del CN (Speed,Feed,...) + Public Const NUM_DATA = 36 ' Numero di dati del CN (Speed,Feed,...) Public Enum CnData Mode = 0 JogIncr = 1 @@ -32,8 +32,8 @@ Public MustInherit Class CN_generico TableDown = 19 DoorClosed = 20 LimitZ = 21 - VacuumPosition = 22 - VacuumRot = 23 + VacuumUp = 22 + VacuumDown = 23 Vacuum3State = 24 Vacuum4State = 25 Vacuum135State = 26 @@ -41,8 +41,11 @@ Public MustInherit Class CN_generico OpenAllState = 28 CloseAllState = 29 BlowState = 30 - VacuumState = 31 + VacuumOn = 31 BypassState = 32 + Vacuum0 = 33 + Vacuum90 = 34 + VacuumOff = 35 End Enum #End Region @@ -130,8 +133,10 @@ Public MustInherit Class CN_generico Public nDoorClosedState As Integer Public bLimitZState As Boolean Public bPowerOvr As Double - Public bVacuumPosition As Boolean - Public bVacuumRot As Boolean + Public bVacuumUp As Boolean + Public bVacuumDown As Boolean + Public bVacuum0 As Boolean + Public bVacuum90 As Boolean Public bVacuum3State As Boolean Public bVacuum4State As Boolean Public bVacuum135State As Boolean @@ -139,7 +144,8 @@ Public MustInherit Class CN_generico Public bOpenAllState As Boolean Public bCloseAllState As Boolean Public bBlowState As Boolean - Public bVacuumState As Boolean + Public bVacuumOn As Boolean + Public bVacuumOff As Boolean Public bBypassState As Boolean Public nMachineMode As Integer diff --git a/ConstMachIni.vb b/ConstMachIni.vb index f7ca6d6..da97e0c 100644 --- a/ConstMachIni.vb +++ b/ConstMachIni.vb @@ -54,24 +54,32 @@ Public Const K_COOLANT As String = "Coolant" Public Const K_INTERNALCOOLANT As String = "InternalCoolant" Public Const K_EXTERNCOOLANT As String = "ExternCoolant" - Public Const K_CBAXES As String = "CBAxes" + Public Const K_CAXES As String = "CAxes" + Public Const K_BAXES As String = "BAxes" + Public Const K_THREEAXES As String = "ThreeAxes" + Public Const K_FIVEAXES As String = "FiveAxes" Public Const K_AIRBLOW As String = "AirBlow" Public Const K_HOME As String = "Home" Public Const K_TABLEUP As String = "TableUp" Public Const K_TABLEDOWN As String = "TableDown" + Public Const K_MANUAL As String = "Manual" Public Const K_DOORCLOSED As String = "DoorClosed" Public Const K_LIMITZ As String = "LimitZ" Public Const K_POWEROVR As String = "PowerOvr" - Public Const K_VACUUMPOSITION As String = "VacuumPosition" - Public Const K_VACUUMROT As String = "VacuumRot" + Public Const K_VACUUMUP As String = "VacuumUp" + Public Const K_VACUUMDOWN As String = "VacuumDown" + Public Const K_VACUUM0 As String = "Vacuum0" + Public Const K_VACUUM90 As String = "Vacuum90" Public Const K_VACUU3STATE As String = "Vacuum3State" Public Const K_VACUU4STATE As String = "Vacuum4State" Public Const K_VACUU135STATE As String = "Vacuum135State" Public Const K_VACUU246STATE As String = "Vacuum246State" Public Const K_OPENALLSTATE As String = "OpenAllState" - Public Const K_CLOSEALLSTATE As String = "CoseAllState" + Public Const K_CLOSEALLSTATE As String = "CloseAllState" Public Const K_BLOWSTATE As String = "BlowState" Public Const K_VACUUMSTATE As String = "VacuumState" + Public Const K_VACUUMON As String = "VacuumOn" + Public Const K_VACUUMOFF As String = "VacuumOff" Public Const K_BYPASSTATE As String = "BypassState" Public Const S_PRODUCTIONLINE As String = "ProductionLine" diff --git a/ControlsMachineButtonUC.xaml b/ControlsMachineButtonUC.xaml index 244a7a3..db06440 100644 --- a/ControlsMachineButtonUC.xaml +++ b/ControlsMachineButtonUC.xaml @@ -14,11 +14,17 @@ - + + +