OmagCUT :

- gestione tolleranza spessore pezzi da TRF per inserimento in lastra
- gestione tastatura seconda lama per linea di produzione.

CurrentMachine.vb

@@ -35,10 +35,13 @@ Public Class CurrentMachine
    Private m_bSpecialUnload As Boolean = False
    Private m_nSaveProduced As Integer = 0
    Private m_sVarProgTwins As String = "E80027"
-   Private m_bProdLiSawProbe As Boolean = False
+   Private m_nProdLiSawProbe As Integer = 0
    Private m_sProdLiProbingStateVar As String = ""
    Private m_sProdLiProbingTcPosVar As String = ""
    Private m_sProdLiSawDiameterVar As String = ""
+   Private m_sProdLiProbingState2Var As String = ""
+   Private m_sProdLiProbingTcPos2Var As String = ""
+   Private m_sProdLiSawDiameter2Var As String = ""
 
    ' Numero e tipo di utensili correntemente disponibili sulla macchina
    Private m_MountedToolConfig As MountedToolConfigs = MountedToolConfigs.SAW
@@ -254,27 +257,45 @@ Public Class CurrentMachine
       End Get
    End Property
 
-   Friend ReadOnly Property bProdLiSawProbe As Boolean
+   Friend ReadOnly Property nProdLiSawProbe As Integer
       Get
-         Return m_bProdLiSawProbe
+         Return m_nProdLiSawProbe
       End Get
    End Property
 
-   Friend ReadOnly Property sProdLiProbingStateVar As String
+   Friend Function sProdLiProbingStateVar(nI As Integer) As String
+      If nI = 1 Then Return m_sProdLiProbingStateVar
+      If nI = 2 Then Return m_sProdLiProbingState2Var
+      Return Nothing
+   End Function
+
+   Friend Function sProdLiProbingTcPosVar(nI As Integer) As String
+      If nI = 1 Then Return m_sProdLiProbingTcPosVar
+      If nI = 2 Then Return m_sProdLiProbingTcPos2Var
+      Return Nothing
+   End Function
+
+   Friend Function sProdLiSawDiameterVar(nI As Integer) As String
+      If nI = 1 Then Return m_sProdLiSawDiameterVar
+      If nI = 2 Then Return m_sProdLiSawDiameter2Var
+      Return Nothing
+   End Function
+
+   Friend ReadOnly Property sProdLiProbingState2Var As String
       Get
-         Return m_sProdLiProbingStateVar
+         Return m_sProdLiProbingState2Var
       End Get
    End Property
 
-   Friend ReadOnly Property sProdLiProbingTcPosVar As String
+   Friend ReadOnly Property sProdLiProbingTcPos2Var As String
       Get
-         Return m_sProdLiProbingTcPosVar
+         Return m_sProdLiProbingTcPos2Var
       End Get
    End Property
 
-   Friend ReadOnly Property sProdLiSawDiameterVar As String
+   Friend ReadOnly Property sProdLiSawDiameter2Var As String
       Get
-         Return m_sProdLiSawDiameterVar
+         Return m_sProdLiSawDiameter2Var
       End Get
    End Property
 
@@ -857,10 +878,13 @@ Public Class CurrentMachine
       m_bSpecialUnload = (GetPrivateProfileInt(S_PRODUCTIONLINE, K_SPECIALUNLOAD, 0, sMachIniFile) <> 0)
       m_nSaveProduced = GetPrivateProfileInt(S_PRODUCTIONLINE, K_SAVEPRODUCED, 0, sMachIniFile)
       GetPrivateProfileString(S_PRODUCTIONLINE, K_VARPROGTWINS, "", m_sVarProgTwins, sMachIniFile)
-      m_bProdLiSawProbe = (GetPrivateProfileInt(S_PRODUCTIONLINE, K_PRODLIENABLESAWPROBE, 0, sMachIniFile) <> 0)
+      m_nProdLiSawProbe = GetPrivateProfileInt(S_PRODUCTIONLINE, K_PRODLIENABLESAWPROBE, 0, sMachIniFile)
       GetPrivateProfileString(S_PRODUCTIONLINE, K_PRODLIPROBINGSTATEVAR, "", m_sProdLiProbingStateVar, sMachIniFile)
-      GetPrivateProfileString(S_PRODUCTIONLINE, K_PRODLIPROBINGTCPOSVAR, "", m_sProdLiProbingTcPosVar, sMachIniFile)
+      GetPrivateProfileString(S_PRODUCTIONLINE, K_PRODLIPROBINGTCPOSVAR, "0", m_sProdLiProbingTcPosVar, sMachIniFile)
       GetPrivateProfileString(S_PRODUCTIONLINE, K_PRODLISAWDIAMETERVAR, "", m_sProdLiSawDiameterVar, sMachIniFile)
+      GetPrivateProfileString(S_PRODUCTIONLINE, K_PRODLIPROBINGSTATE2VAR, "", m_sProdLiProbingState2Var, sMachIniFile)
+      GetPrivateProfileString(S_PRODUCTIONLINE, K_PRODLIPROBINGTCPOS2VAR, "0", m_sProdLiProbingTcPos2Var, sMachIniFile)
+      GetPrivateProfileString(S_PRODUCTIONLINE, K_PRODLISAWDIAMETER2VAR, "", m_sProdLiSawDiameter2Var, sMachIniFile)
 
       ' Leggo configurazione degli utensili in macchina
       m_MountedToolConfig = GetPrivateProfileInt(S_TOOLS, K_MOUNTEDTOOLCONFIG, 0, sMachIniFile)