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

Configurazione pulsante Parking per NUM

Browse Source
This commit is contained in:
NicolaP
2022-02-03 17:07:14 +01:00
parent ef5c98020e
commit 6b89e4067c
6 changed files with 70 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Constants/ConstMachIni.vb
+1
View File
@@ -76,6 +76,7 @@
Public Const K_DOORCLOSED As String = "DoorClosed"
Public Const K_LIMITZ As String = "LimitZ"
Public Const K_POWEROVR As String = "PowerOvr"
Public Const K_PARKING As String = "Parking"
Public Const K_HSM As String = "Hsm"
Public Const K_VACUUMUP As String = "VacuumUp"
Public Const K_VACUUMDOWN As String = "VacuumDown"
DirectCuts/ControlsMachineButtonUC.xaml.vb
+13
View File
@@ -330,6 +330,18 @@ Public Class ControlsMachineButtonUC
End If
End Sub
Friend Sub ParkingStateChanged(ParkingState As Boolean)
Dim ParkingButton As TwoStateButton = Nothing
For Each MachineButton As MachineButton In m_ButtonList
If MachineButton.StateFlag = K_PARKING Then
ParkingButton = MachineButton
End If
Next
If Not IsNothing(ParkingButton) Then
ParkingButton.SetIsChecked(ParkingState)
End If
End Sub
Public Function GetPrivateProfileMachineButtons(
ByVal lpAppName As String,
ByVal lpKeyName As String,
@@ -647,6 +659,7 @@ Public Class TwoStateButton
Return m_IsChecked
End Get
Set(value As Boolean)
' accendo il comando, anche se dovrei aspettare di leggere lo stato da PLC
m_IsChecked = value
If value Then
ExecuteMDICommand(TLuaScriptName)
DirectCuts/MachineButtonsUC.xaml.vb
+38
View File
@@ -31,6 +31,7 @@ Public Class MachineButtonsUC
Private Const BTN_STATE_NOTHING As String = "Nothing"
Private Const BTN_STATE_DOOR_OPENED As String = "DoorOpened"
Private Const BTN_STATE_DOOR_CLOSED As String = "DoorClosed"
Private Const BTN_STATE_PARKING As String = "Parking"
Public Sub New(Optional bOnlyLaser As Boolean = False)
' This call is required by the designer.
@@ -344,6 +345,7 @@ Public Class MachineButtonsUC
" EType2=" & If(Not String.IsNullOrEmpty(EType2), CInt(EType2).ToString, ""))
End Sub
#Region "STATE CHANGED"
Friend Sub SpindleStateChanged(SpindleState As Boolean)
Dim nIndex As Integer = Array.IndexOf(StateFlagArray, BTN_STATE_SPINDLE)
@@ -584,6 +586,40 @@ Public Class MachineButtonsUC
End If
End Sub
Friend Sub ParkingStateChanged(ParkingState As Boolean)
Dim nIndex As Integer = Array.IndexOf(StateFlagArray, BTN_STATE_PARKING)
If nIndex = -1 Then Return
If ParkingState Then
GetToggleButton(nIndex + 1).IsChecked = True
Try
Dim s As String
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Else
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
End If
Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
GetImage(nIndex + 1).Source = sButtonImageSource
Catch ex As Exception
EgtOutLog("Error loading image " & ImageArrayY(nIndex + 1))
End Try
Else
GetToggleButton(nIndex + 1).IsChecked = False
Try
Dim s As String
If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
Else
s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
End If
Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
GetImage(nIndex + 1).Source = sButtonImageSource
Catch ex As Exception
EgtOutLog("Error loading image " & ImageArrayN(nIndex + 1))
End Try
End If
End Sub
'----------------- Queste funzioni determina lo stato del bottone direttamente dalla lettura delle variabili CN
Friend Sub XYJogChanged(ByVal bXYAxes As Boolean)
' recupero le asscociazioni con i bottoni
@@ -619,6 +655,8 @@ Public Class MachineButtonsUC
'-----------------------------------------------------------------------------------------------------------------
#End Region ' State changed
Private Function GetToggleButton(ByVal nIndex As Integer) As Primitives.ToggleButton
Select Case nIndex
Case 1
NcComm/CNCommunication.vb
+7
View File
@@ -281,6 +281,10 @@ 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_PARKING, "", sVal, m_MainWindow.GetMachIniFile())
m_CN.SetCnDataVar(CN_generico.CnData.Parking, 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())
@@ -539,6 +543,7 @@ Public Class CNCommunication
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_ControlsMachineButton.FiveAxisStateChanged(m_CN.Is_G24_active())
m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.ParkingStateChanged(m_CN.bParkingState)
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.Vacuum2UpChanged(m_CN.bVacuum2Up)
@@ -584,6 +589,7 @@ Public Class CNCommunication
m_MainWindow.m_DirectCutPageUC.m_MachineButtons.FiveAxisStateChanged(False)
End If
m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.DoorStateChanged(m_CN.nDoorClosedState)
m_MainWindow.m_DirectCutPageUC.m_MachineButtons.ParkingStateChanged(m_CN.bParkingState)
' Nuovi bottoni (uso joystick) per Area4
If m_IsNewConsole Then
@@ -619,6 +625,7 @@ Public Class CNCommunication
m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.FiveAxisStateChanged(False)
End If
m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.DoorStateChanged(m_CN.nDoorClosedState)
m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.ParkingStateChanged(m_CN.bParkingState)
End If
End Sub
NcComm/CN_generico.vb
+3
View File
@@ -66,6 +66,8 @@ Public MustInherit Class CN_generico
ZBJog = 49
PowerON = 50
Remote = 51
Parking = 52
End Enum
#End Region
@@ -173,6 +175,7 @@ Public MustInherit Class CN_generico
Public nDoorClosedState As Integer
Public bLimitZState As Boolean
Public bPowerOvr As Double
Public bParkingState As Boolean
Public bHsm As Double
Public bVacuumUp As Boolean
Public bVacuumDown As Boolean
NcComm/M_Num.vb
+8 -5
View File
@@ -1077,17 +1077,20 @@ Namespace Num
Case CnData.VacuumOff ' (45) Stato aspirazione ventose spento
bVacuumOff = CBool(values(n))
Case CnData.XYJog ' (46)
Case CnData.XYJog ' (47)
bXYJog = CBool(values(n))
Case CnData.ZCJog ' (47)
Case CnData.ZCJog ' (48)
bZCJog = CBool(values(n))
Case CnData.ZBJog ' (48)
Case CnData.ZBJog ' (49)
bZBCJog = CBool(values(n))
Case CnData.PowerON ' (49)
Case CnData.PowerON ' (50)
bPowerON = CBool(values(n))
Case CnData.Remote ' (50)
Case CnData.Remote ' (51)
bRemote = CBool(values(n))
Case CnData.Parking ' (52)
bParkingState = CBool(values(n))
End Select
Next