Merge branch 'Features/CN_Fanuc' into develop

2023-04-07 09:55:49 +02:00
parent 997e8c380d aba1572f95
commit d8ba23894e
14 changed files with 14308 additions and 38 deletions
@@ -140,8 +140,11 @@ Public Class ControlsDirectCutUC
         Return
      End If

-      ' Caso standard
-      m_ActiveDirectCutPage = DirectCutPages.DirectCut
+      If m_MainWindow.m_DirectCutPageUC.m_ActiveControl <> DirectCutPageUC.Controls.MachineButtonUC Or
+         m_MainWindow.m_DirectCutPageUC.m_ActiveControl <> DirectCutPageUC.Controls.VacuumButtonUC Then
+         ' Caso standard
+         m_ActiveDirectCutPage = DirectCutPages.DirectCut
+      End If

      ' Attivo le lavorazioni solo se esiste il grezzo e se presente testa H1
      Dim bRawOk As Boolean = (GetRawHeight() > EPS_SMALL)
@@ -76,6 +76,11 @@ Public Class ControlsMachineButtonUC
      End If
   End Sub

+#Region "STATE CHANGED"
+   ' ------------------------------------------------------------------------------
+   ' i segeunti metodi notificano il cambiamento di stato di specifici bottoni
+   '-------------------------------------------------------------------------------
+
   Friend Sub SpindleStateChanged(SpindleState As Boolean)
      Dim SpindleButton As TwoStateButton = Nothing
      For Each MachineButton As MachineButton In m_ButtonList
@@ -372,6 +377,7 @@ Public Class ControlsMachineButtonUC
      'End If
   End Sub

+#End Region    ' State Range

   Public Function GetPrivateProfileMachineButtons(
                         ByVal lpAppName As String,
@@ -569,13 +575,52 @@ Public MustInherit Class MachineButton
                  EgtOutLog("dopo scrittura seconda variabile")
               End If
               Return
+            Case 4
+               ' ------------------------------------ FANUC ------------------------------------
+               m_CN.DGeneralFunctions_WriteCncMode(7)
+               If String.IsNullOrEmpty(EValue) Then
+                  ' EActive: impulsivo "D#####"
+                  m_CN.NC_pulse_bit(ENumber)
+                  EgtOutLog("Fanuc_DNumber= " & ENumber)
+               Else
+                  ' EActive + EValue: scrittura comando invariabile Short oppure Bit
+                  If ENumber.Contains(".") Then
+                     ' D#####.#
+                     Dim bEValue As Boolean
+                     If EValue.Trim = "1" Then bEValue = True
+                     m_CN.NC_write_var_bit(ENumber, CBool(EValue))
+                  Else
+                     ' D#####
+                     m_CN.NC_write_var_short(ENumber, CShort(EValue))
+                  End If
+                  EgtOutLog("Fanuc_DNumber= " & ENumber & " DValue= " & EValue)
+               End If
+               ' eventale caricamento seconda variabile
+               If String.IsNullOrEmpty(EValue2) Then
+                  ' EActive: impulsivo "D#####"
+                  m_CN.NC_pulse_bit(ENumber2)
+                  EgtOutLog("Fanuc_DNumber= " & ENumber2)
+               Else
+                  ' EActive + EValue: scrittura comando invariabile Short oppure Bit
+                  If ENumber2.Contains(".") Then
+                     ' D#####.#
+                     Dim bEValue2 As Boolean
+                     If EValue2.Trim = "1" Then bEValue2 = True
+                     m_CN.NC_write_var_bit(ENumber2, CBool(EValue2))
+                  Else
+                     ' D#####
+                     m_CN.NC_write_var_short(ENumber2, CShort(EValue2))
+                  End If
+                  EgtOutLog("Fanuc_DNumber2= " & ENumber2 & " DValue2= " & EValue2)
+               End If
+               Return
         End Select
      End If
      '--------------------------------------------------------- MDI ---------------------------------------------------------
      Dim nResult As Short
      ' assegno la modalità di funzionamento
      Select Case m_MainWindow.m_CNCommunication.m_nNCType
-         Case 1, 2
+         Case 1, 2, 4
            nResult = m_CN.DGeneralFunctions_WriteCncMode(2)     ' Modalità MDI per controlli num
         Case 3
            'Per il siemens non devo fare nulla
@@ -599,7 +644,7 @@ Public MustInherit Class MachineButton
         m_CN.DGeneralFunctions_CycleStart()
      End If
      System.Threading.Thread.Sleep(300)
-      ' riprostino la modalità manuale
+      ' ripristino la modalità manuale..?? siucuri ??
      nResult = m_CN.DGeneralFunctions_WriteCncMode(7)     ' Modalità manuale
   End Sub

@@ -620,6 +665,7 @@ Public MustInherit Class MachineButton
         EgtTdbGetCurrToolParam(MCH_TP.FEED, dFeed)
      End If
      EgtLuaSetGlobNumVar("CMD.F", dFeed)
+
      Dim dSpeed As Double = 0
      If Not String.IsNullOrWhiteSpace(m_DirectCutPage.m_ManualAxesMove.SpeedTxBx.Text) Then
         StringToDouble(m_DirectCutPage.m_ManualAxesMove.SpeedTxBx.Text, dSpeed)
@@ -628,6 +674,7 @@ Public MustInherit Class MachineButton
         EgtTdbGetCurrToolParam(MCH_TP.SPEED, dSpeed)
      End If
      EgtLuaSetGlobNumVar("CMD.S", dSpeed)
+
      Dim dL1, dL2, dL3, dR1, dR2 As Double
      m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2)
      EgtLuaSetGlobNumVar("CMD.L1", dL1)
@@ -789,6 +836,7 @@ Public Class NoStateButton
            ExecuteMDICommand(TLuaScriptName)
         End If
      Else
+         ' FANUC, SIEMENS
         ExecuteMDICommand(TLuaScriptName)
      End If
   End Sub
@@ -215,6 +215,7 @@ Public Class DirectCutPageUC
         m_ControlsMachineButton.SetValue(Grid.RowProperty, 1)
         m_NewMachineButtonsType = m_ControlsMachineButton.GetPrivateProfileMachineButtons(S_CONTROLMACHBUTTONS, "Button1", Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, m_MainWindow.GetMachIniFile())
         MachineButtonGrid.Children.Add(m_ControlsMachineButton)
+         'm_ActiveControl = Controls.MachineButtonUC
         If VacuumMachineBtn.IsChecked Then
            MachineButtonGrid.Children.Remove(m_VacuumMachineButton)
            VacuumMachineBtn.IsChecked = False
@@ -227,6 +228,7 @@ Public Class DirectCutPageUC
   Private Sub VacuumMachineBtn_Click(sender As Object, e As RoutedEventArgs) Handles VacuumMachineBtn.Click
      If VacuumMachineBtn.IsChecked Then
         MachineButtonGrid.Children.Add(m_VacuumMachineButton)
+         'm_ActiveControl = Controls.VacuumButtonUC
         If ControlsMachineBtn.IsChecked Then
            MachineButtonGrid.Children.Remove(m_ControlsMachineButton)
            ControlsMachineBtn.IsChecked = False
@@ -272,9 +272,32 @@ Public Class MachineButtonsUC
                  End If
                  Return
               End If
+               ' CONTROLLO FANUC
+            Case 4
+               ' ------------------------------------ FANUC ------------------------------------
+               If String.IsNullOrEmpty(EValue) Then
+                  ' EActive: impulsivo "D#####"
+                  m_CN.NC_pulse_bit(ENumber)
+                  EgtOutLog("Fanuc_DNumber= " & ENumber)
+               Else
+                  ' EActive + EValue: scrittura comando invariabile Short oppure Bit
+                  If EValue.Contains(".") Then
+                     ' D#####.#
+                     Dim bEValue As Boolean
+                     If EValue.Trim = "1" Then bEValue = True
+                     m_CN.NC_write_var_bit(ENumber, CBool(EValue))
+                  Else
+                     ' D#####
+                     m_CN.NC_write_var_short(ENumber, CShort(EValue))
+                  End If
+                  EgtOutLog("Fanuc_DNumber= " & ENumber & " DValue= " & EValue)
+               End If
+
+               Return
         End Select
      End If

+
      Dim nResult As Short
      ' Imposto modalità MDI per controlli num
      Select Case m_MainWindow.m_CNCommunication.m_nNCType
@@ -291,6 +314,8 @@ Public Class MachineButtonsUC
            m_CN.DGeneralFunctions_CycleStart()
         Case 3
            'Per il siemens non devo fare nulla
+         Case 4
+            ' Nicola: 27/03/2023 attivazione della funzione M# indicata?
      End Select

      If b2Start Then
@@ -209,7 +209,7 @@ Public Class ManualAxesMoveUC
      System.Threading.Thread.Sleep(150)
      m_CN.DGeneralFunctions_CycleStart()
      System.Threading.Thread.Sleep(m_MainWindow.m_CurrentMachine.nThreadSleep)
-      m_CN.DGeneralFunctions_WriteCncMode(7)     ' Modalità manuale
+      ' m_CN.DGeneralFunctions_WriteCncMode(7)     ' Modalità manuale
      m_MoveClicked = False
   End Sub

@@ -1163,6 +1163,10 @@ Public Class AlarmsPageUC
         Case 3
            Dim nResult As Short = m_CN.DGeneralFunctions_WriteCncMode(0)
            EgtOutLog("Impostata modalità automatica: esito " & nResult.ToString)
+         Case 4
+            ' FANUC - Manual:7, Edit:1
+            Dim nResult As Short = m_CN.DGeneralFunctions_WriteCncMode(7)
+            EgtOutLog("Impostata modalità manuale: esito " & nResult.ToString)
      End Select
      ' Recupero file LUA
      EgtLuaExecFile(m_CurrentMachine.sMachDir() & "\DirectCmd\SawProbing.lua")
@@ -1228,6 +1232,11 @@ Public Class AlarmsPageUC
         Return
      End If
      m_MainWindow.m_CurrentProjectPageUC.ClearMessage()
+      ' Se fanuc passo in modalità AUTO e attivo
+      If m_MainWindow.m_CNCommunication.m_nNCType = 4 Then
+         Dim nResult As Short = m_MainWindow.m_CNCommunication.m_CN.DGeneralFunctions_WriteCncMode(0)
+         EgtOutLog("Impostata modalità automatica: esito " & nResult.ToString)
+      End If
      ' Aspetto e lo avvio
      System.Threading.Thread.Sleep(300)
      m_MainWindow.m_CNCommunication.m_CN.DGeneralFunctions_CycleStart()
@@ -1285,7 +1294,10 @@ Public Class AlarmsPageUC
            If m_MainWindow.m_CNCommunication.m_CN.n_DReadELS_handle = 3 Then
               bRead = True
               Dim dVal As Double = m_MainWindow.m_CNCommunication.m_CN.d_DReadELS_value
-               dVal = dVal / 1000
+               ' Se fanuc il dato è in mm (NON MICRON)
+               If m_MainWindow.m_CNCommunication.m_nNCType <> 4 Then
+                  dVal = dVal / 1000
+               End If
               MsgBoxStateInfo.LoadingPrBr_Value = 100
               ' Tastatura conclusa con successo
               Dim sOut As String = EgtMsg(MSG_DIRECTCUTPAGEUC + 43) & " : " & DoubleToString(dVal, 1)
@@ -304,6 +304,8 @@ Public Class MachineStatusUC
      If m_MainWindow.m_CNCommunication.m_nNCType = 3 AndAlso m_MainWindow.m_CNCommunication.m_CN.m_IsSiemensOne Then
         dSpindlePower = m_CN.d_data(0)
         dSpindleOvr = m_CN.d_data(1)
+      ElseIf m_MainWindow.m_CNCommunication.m_nNCType = 4 Then
+         dSpindlePower = m_CN.d_spindle_power / 1000
      Else
         dSpindlePower = m_CN.d_spindle_power
         dSpindleOvr = If(m_CN.bPowerOvr > 0, m_CN.d_spindle_power / m_CN.bPowerOvr * 100, 0)
@@ -3,6 +3,8 @@ Imports System.Globalization
 Imports System.Collections.ObjectModel
 Imports EgtUILib
 Imports OmagCUT.Num
+Imports System.IO
+Imports System.Text

 Public Class CNCommunication

@@ -32,6 +34,7 @@ Public Class CNCommunication
   Private m_bNewDeltaData As Boolean = True
   Private m_bNewVarData As Boolean = False
   Private m_bTimerBusy As Boolean = False
+   Private m_bTimerAxesBusy As Boolean = False

   Private m_IsNewConsole As Boolean = False

@@ -40,6 +43,7 @@ Public Class CNCommunication

   ' Timer
   Private m_RefreshTimer As New DispatcherTimer
+   Private m_RefreshAxesFanuc As New DispatcherTimer

   ' Nomi e indici degli assi macchina
   Private m_bAxesOk As Boolean = False
@@ -102,6 +106,12 @@ Public Class CNCommunication
         m_RefreshTimer.Interval = TimeSpan.FromMilliseconds(100)
         m_RefreshTimer.Start()
      End If
+      ' solo per controllo FANUC creo un timer apposito solo per la lettura degli assi
+      If m_nNCType = 4 Then
+         AddHandler m_RefreshAxesFanuc.Tick, AddressOf RefreshAxesFanucTimer_tick
+         m_RefreshAxesFanuc.Interval = TimeSpan.FromMilliseconds(50)
+         m_RefreshAxesFanuc.Start()
+      End If

      ' Leggo dati sugli assi della macchina
      ReadAxesData()
@@ -118,6 +128,8 @@ Public Class CNCommunication

         If m_nNCType = 3 Then
            RefreshNoEvents()
+         ElseIf m_nNCType = 4 Then
+            RefreshFANUC()
         Else
            Refresh()
         End If
@@ -130,8 +142,22 @@ Public Class CNCommunication

   End Sub

+   Private Sub RefreshAxesFanucTimer_tick()
+      If Not m_bTimerAxesBusy Then
+         m_bTimerAxesBusy = True
+         m_RefreshAxesFanuc.Stop()
+
+         RefreshAxesFANUC()
+
+         m_bTimerAxesBusy = False
+         m_RefreshAxesFanuc.Start()
+      Else
+         Dim nDummy As Integer = 10
+      End If
+   End Sub
+
   Private Sub ReadAxesData()
-      ' Nomi e indici degli assi macchina
+      ' Nomi e indici degli assi macchina: definisco il nome degli assi da satampare nella pagina MachineStatusUC
      m_bAxesOk = True
      GetPrivateProfileString(S_AXES, K_L1NAME, "X", m_sA1, m_MainWindow.GetMachIniFile())
      m_nA1 = GetPrivateProfileInt(S_AXES, K_L1ID, 0, m_MainWindow.GetMachIniFile())
@@ -223,6 +249,9 @@ Public Class CNCommunication
               m_CN = New Num.NumNC
            Case 3
               m_CN = New CN_Siemens
+            Case 4
+               ' Fanuc
+               m_CN = New Fanuc.Fanuc
         End Select
         ' Recupero la stringa di inizializzazione della comunicazione

@@ -419,6 +448,17 @@ Public Class CNCommunication
                  m_MachineStatus.MachineStatusGrid.Background = Application.Current.FindResource("OmagCut_Red")
               End Try
            End If
+         Case 4
+            If IsNothing(m_CN) OrElse m_CN.n_state < 2 Then
+               ' Per evitare crash con azioni verso il controllo, avvio quello di debug
+               m_nNCType = 0
+               Me.m_CN = New CN_Debug
+               m_MachineStatus.MachineStatusGrid.Background = Application.Current.FindResource("OmagCut_Red")
+            Else
+               ' ATTENZIONE: durante l'inizializzazione della classe il vettore che contiene tutti gli indirizzi di memoria non è caricato
+               m_CN.b_axis_events_enable = True
+               m_MachineStatus.MachineStatusGrid.Background = Application.Current.FindResource("OmagCut_DarkGray")
+            End If
      End Select

      ' Assegno riferimento al CN alle diverse pagine
@@ -465,6 +505,7 @@ Public Class CNCommunication
         m_MachineStatus.DisplayPositionDelta()
      End If

+      ' ----- INIZIO: lettura diretta di specifiche vaiabili -----
      If m_CN.b_feed_changed Then
         m_CN.b_feed_changed = False
         m_MachineStatus.DisplayFeed()
@@ -491,6 +532,7 @@ Public Class CNCommunication
         'FrmMain.LblToolRad.Text = cn.Tools(0).radius.ToString
         'FrmMain.LblToolComp.Text = cn.Tools(0).comp_num.ToString
      End If
+      ' ----- FINE : lettura diretta di specifiche vaiabili -----

      Select Case m_nNCType
         Case 1
@@ -532,6 +574,7 @@ Public Class CNCommunication
         'End If
      End If

+      ' QUESTE VARIABILI NON SONO LETTE IN QUANTO NON SONO STATE CARICATE → vedere come esempio il NUM che assegna queste variabili
      ' Flag e variabili per bottoni macchina, che verifico solo nelle pagine in cui ci sono
      If m_MainWindow.m_ActivePage = MainWindow.Pages.DirectCut Then
         If m_MainWindow.m_DirectCutPageUC.m_NewMachineButtonsType Then
@@ -570,8 +613,186 @@ Public Class CNCommunication
            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.CloseAllChanged(m_CN.bCloseAllState)
            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Open123Changed(m_CN.bOpen123State)
            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Open456Changed(m_CN.bOpen456State)
-            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Close123Changed(m_CN.bClose123State)
-            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Close456Changed(m_CN.bClose456State)
+            ' in assenza della configurazione delle variabili Close123 e Close456
+            If Not String.IsNullOrEmpty(m_CN.m_szCnDataVar(CN_generico.CnData.Close123State)) Then
+               m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Close123Changed(m_CN.bClose123State)
+               m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Close456Changed(m_CN.bClose456State)
+            Else
+               m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Close123Changed(Not m_CN.bOpen123State)
+               m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Close456Changed(Not m_CN.bOpen456State)
+            End If
+            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.BlowChanged(m_CN.bBlowState)
+            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)
+
+            ' Nuovi bottoni (uso joystick)
+            If m_IsNewConsole Then
+               m_MainWindow.m_DirectCutPageUC.XYJogChanged(m_CN.bXYJog)
+               m_MainWindow.m_DirectCutPageUC.ZCJogChanged(m_CN.bZCJog)
+               m_MainWindow.m_DirectCutPageUC.ZBJogChanged(m_CN.bZBCJog)
+               m_MainWindow.m_DirectCutPageUC.RemoteChanged(m_CN.bRemote)
+               m_MainWindow.m_DirectCutPageUC.ParkingStateChanged(m_CN.bParkingState)
+            End If
+         Else
+            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.SpindleStateChanged(m_CN.bSpindleState)
+            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.CoolantStateChanged(m_CN.bCoolantState OrElse m_CN.bInternalCoolantState OrElse m_CN.bExternCoolantState)
+            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.LaserStateChanged(m_CN.bLaserState)
+            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.LaserTracStateChanged(m_CN.bLaserTracState)
+            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
+            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.DoorStateChanged(m_CN.nDoorClosedState)
+            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.ParkingStateChanged(m_CN.bParkingState)
+            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.EnableZoneStateChanged(m_CN.nEnableZone)
+            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.EnablePcStateChanged(m_CN.nEnablePc)
+            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.TableUpChanged(m_CN.bTableUpState)
+            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.TableDownChanged(m_CN.bTableDownState)
+
+            ' Nuovi bottoni (uso joystick) per Area4
+            If m_IsNewConsole Then
+               m_MainWindow.m_DirectCutPageUC.m_MachineButtons.XYJogChanged(m_CN.bXYJog)
+               m_MainWindow.m_DirectCutPageUC.m_MachineButtons.ZJogChanged(m_CN.bZCJog)
+               m_MainWindow.m_DirectCutPageUC.m_MachineButtons.BCJogChanged(m_CN.bZBCJog)
+               m_MainWindow.m_DirectCutPageUC.m_MachineButtons.RemoteChanged(m_CN.bRemote)
+               m_MainWindow.m_DirectCutPageUC.ParkingStateChanged(m_CN.bParkingState)
+            End If
+
+         End If
+      End If
+
+      If m_MainWindow.m_ActivePage = MainWindow.Pages.RawPart Then
+         m_MainWindow.m_RawPartPage.m_MachineButtons.LaserStateChanged(m_CN.bLaserState)
+      End If
+
+      ' Nuove bottoni (Power Macchina)
+      If m_MainWindow.m_ActivePage = MainWindow.Pages.Machine Then
+         If m_IsNewConsole Then
+            m_MainWindow.m_MachinePageUC.m_MachineCNPageUC.PowerONChanged(m_CN.bPowerON)
+            m_MainWindow.m_MachinePageUC.m_MachineCNPageUC.PowerOFFChanged(Not m_CN.bPowerON)
+            m_MainWindow.m_MachinePageUC.m_MachineCNPageUC.CncModeChange(m_CN.nMachineMode)
+         End If
+         m_MainWindow.m_MachinePageUC.m_MachineCNPageUC.CncModeChange(m_CN.nMachineMode)
+      End If
+
+
+
+      If m_MainWindow.m_ActivePage = MainWindow.Pages.WorkInProgress Then
+         m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.SpindleStateChanged(m_CN.bSpindleState)
+         m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.CoolantStateChanged(m_CN.bCoolantState OrElse m_CN.bInternalCoolantState OrElse m_CN.bExternCoolantState)
+         m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.LaserStateChanged(m_CN.bLaserState)
+         m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.LaserTracStateChanged(m_CN.bLaserTracState)
+         If m_CN.Is_G24_active() Then
+            m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.ThreeAxisStateChanged(False)
+            m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.FiveAxisStateChanged(True)
+         Else
+            m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.ThreeAxisStateChanged(True)
+            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)
+         m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.EnableZoneStateChanged(m_CN.nEnableZone)
+         m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.EnablePcStateChanged(m_CN.nEnablePc)
+         m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.TableUpChanged(m_CN.bTableUpState)
+         m_MainWindow.m_WorkInProgressPageUC.m_MachineButtons.TableDownChanged(m_CN.bTableDownState)
+      End If
+
+   End Sub
+
+   Private Sub RefreshAxesFANUC()
+      ' ----- INIZIO: lettura diretta di specifiche vaiabili -----
+      ' avvio lettura variabili da CN
+      m_CN.Geppo()
+      ' notifico valori all'interfaccia
+      m_MachineStatus.DisplayPosition()
+      m_MachineStatus.DisplayPositionDelta()
+      m_MachineStatus.DisplayFeed()
+      m_MachineStatus.DisplaySpeed()
+      m_MachineStatus.DisplayPower()
+   End Sub
+
+   Private Sub RefreshFANUC()
+      ' Copia della funzione Refresh
+
+      ' ----- INIZIO: lettura diretta di specifiche vaiabili -----
+      '' avvio lettura variabili da CN
+      'm_CN.Geppo()
+      '' notifico valori all'interfaccia
+      'm_MachineStatus.DisplayPosition()
+      'm_MachineStatus.DisplayPositionDelta()
+      'm_MachineStatus.DisplayFeed()
+      'm_MachineStatus.DisplaySpeed()
+      'm_MachineStatus.DisplayPower()
+      ' eventualmente carico messaggi di errore
+      ErrorList.Clear()
+      If m_CN.b_NC_error Then
+         ErrorList.Clear()
+         SyncLock m_CN
+            For Each Item As String In m_CN.sz_NC_error_messages
+               ErrorList.Add(Item)
+            Next
+         End SyncLock
+      End If
+      m_AlarmsPage.NcError()
+      ' ----- FINE  : lettura diretta di specifiche vaiabili -----
+
+      If m_CN.read_active_mode() <> CShort(m_nCurrMode) Then
+         m_nCurrMode = CInt(m_CN.read_active_mode())
+         m_MachineStatus.DisplayActiveMode(m_nCurrMode)
+         m_CN.nMachineMode = m_nCurrMode
+      End If
+
+      ' QUESTE VARIABILI NON SONO LETTE IN QUANTO NON SONO STATE CARICATE → vedere come esempio il NUM che assegna queste variabili
+      ' Flag e variabili per bottoni macchina, che verifico solo nelle pagine in cui ci sono
+      If m_MainWindow.m_ActivePage = MainWindow.Pages.DirectCut Then
+         If m_MainWindow.m_DirectCutPageUC.m_NewMachineButtonsType Then
+            m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.SpindleStateChanged(m_CN.bSpindleState)
+            m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.LaserStateChanged(m_CN.bLaserState)
+            m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.LaserTracStateChanged(m_CN.bLaserTracState)
+            m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.CoolantStateChanged(m_CN.bCoolantState)
+            m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.InternalCoolantStateChanged(m_CN.bInternalCoolantState)
+            m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.ExternCoolantStateChanged(m_CN.bExternCoolantState)
+            m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.CBAxesStateChanged(m_CN.bCBAxesState)
+            m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.AirBlowStateChanged(m_CN.bAirBlowState)
+            m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.HomeStateChanged(m_CN.bHomeState)
+            m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.TableUpChanged(m_CN.bTableUpState)
+            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_ControlsMachineButton.FiveAxisStateChanged(m_CN.Is_G24_active())
+            m_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.ParkingStateChanged(m_CN.bParkingState)
+            'm_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.ZoneStateChanged(m_CN.nEnableZone)
+            'm_MainWindow.m_DirectCutPageUC.m_ControlsMachineButton.PcStateChanged(m_CN.nEnablePc)
+            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)
+            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum2DownChanged(m_CN.bVacuum2Down)
+            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.Vacuum1Changed(m_CN.bVacuum1State)
+            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum2Changed(m_CN.bVacuum2State)
+            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.Vacuum5Changed(m_CN.bVacuum5State)
+            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum6Changed(m_CN.bVacuum6State)
+            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum135Changed(m_CN.bVacuum135State)
+            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Vacuum246Changed(m_CN.bVacuum246State)
+            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.Open123Changed(m_CN.bOpen123State)
+            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Open456Changed(m_CN.bOpen456State)
+            ' in assenza della configurazione delle variabili Close123 e Close456
+            If Not String.IsNullOrEmpty(m_CN.m_szCnDataVar(CN_generico.CnData.Close123State)) Then
+               m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Close123Changed(m_CN.bClose123State)
+               m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Close456Changed(m_CN.bClose456State)
+            Else
+               m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Close123Changed(Not m_CN.bOpen123State)
+               m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.Close456Changed(Not m_CN.bOpen456State)
+            End If
            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.BlowChanged(m_CN.bBlowState)
            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.VacuumOnChanged(m_CN.bVacuumOn)
            m_MainWindow.m_DirectCutPageUC.m_VacuumMachineButton.VacuumOffChanged(m_CN.bVacuumOff)
@@ -933,8 +1154,33 @@ Public Class CNCommunication
         EgtOutLog("Download_NC_prog(sCncPath, sNumProg)")
         TimeSpanInit()
         bOk = bOk AndAlso (m_CN.Download_NC_prog(sCncPath, sNumProg) = 0)
+         ' provo a generare un file 901 vuoto da aspedire, attivare e quindi riprovare a spedire il file 900
+         If m_nNCType = 4 And Not bOk Then
+            bOk = True
+            Dim sCncPath1 As String = m_MainWindow.GetCncDir() & "\PlaceHolder" & m_MainWindow.m_CurrentMachine.sIsoFileExt
+            Dim fs As FileStream = File.Create(sCncPath1)
+            ' Add text to the file.
+            Dim info As Byte() = New UTF8Encoding(True).GetBytes(vbLf & "(PlaceHolder)")
+            fs.Write(info, 0, info.Length)
+            fs.Close()
+            bOk = bOk AndAlso (m_CN.Download_NC_prog(sCncPath1, "901") = 0)
+            ' Attesa opportuna
+            System.Threading.Thread.Sleep(100)
+            If bActivate Then
+               ' Imposto modalità EDIT
+               bOk = bOk AndAlso (m_CN.DGeneralFunctions_WriteCncMode(1) = 0)
+               ' Attesa opportuna
+               System.Threading.Thread.Sleep(100)
+               ' Attivazione programma 901
+               bOk = bOk AndAlso (m_CN.ActivateProgram("901") = 0)
+            End If
+            ' riprovo ad eseguire il programma 900
+            bOk = True
+            bOk = bOk AndAlso (m_CN.Download_NC_prog(sCncPath, sNumProg) = 0)
+         End If
+
         EgtOutLog("Nc Type : " & m_nNCType.ToString)
-         EgtOutLog("IsDripFeed : " & DirectCast(m_CN, NumNCOld).bIsDripFeed)
+         'EgtOutLog("IsDripFeed : " & DirectCast(m_CN, NumNCOld).bIsDripFeed)
         If m_nNCType = 1 AndAlso TypeOf m_CN Is NumNCOld AndAlso DirectCast(m_CN, NumNCOld).bIsDripFeed Then
            ' eventauli cambi di stato sono trattati all'interno della funzione
            Return True
@@ -948,14 +1194,29 @@ Public Class CNCommunication
            ' Attivazione programma
            EgtOutLog("ActivateProgram(nNumProg)")
            TimeSpanInit()
+            ' Se controllo FANUC attivo la modalità EDIT prima di attivare il programma
+            If m_nNCType = 4 Then
+               bOk = bOk AndAlso (m_CN.DGeneralFunctions_WriteCncMode(1) = 0)
+               ' Attesa opportuna
+               System.Threading.Thread.Sleep(100)
+            End If
            bOk = bOk AndAlso (m_CN.ActivateProgram(nNumProg) = 0)
            EgtOutLog(TimeSpanEnd())
            ' Attesa opportuna
            System.Threading.Thread.Sleep(100)
+            ' Se controllo FANUC attivo la modalità AUTO prima per preparar il cyclo start
+            If m_nNCType = 4 Then
+               bOk = bOk AndAlso (m_CN.DGeneralFunctions_WriteCncMode(0) = 0)
+               ' Attesa opportuna
+               System.Threading.Thread.Sleep(100)
+            End If
            ' Modalità automatica
            EgtOutLog("DGeneralFunctions_WriteCncMode(0)")
            TimeSpanInit()
-            bOk = bOk AndAlso (m_CN.DGeneralFunctions_WriteCncMode(0) = 0)
+            ' Se controllo di verso da FANUC provvedo a mandare in modo AUTO il controllo
+            If m_nNCType <> 4 Then
+               bOk = bOk AndAlso (m_CN.DGeneralFunctions_WriteCncMode(0) = 0)
+            End If
            EgtOutLog(TimeSpanEnd())
         End If

@@ -72,6 +72,14 @@ Public MustInherit Class CN_generico
      EnablePC = 54
   End Enum

+    Public Enum Type As Short
+        TBoolean = 0
+        TInteger = 1
+        TLong = 2
+        TDouble = 3
+        TString = 4
+
+    End Enum
 #End Region

 #Region " Struct"
@@ -209,38 +217,47 @@ Public MustInherit Class CN_generico
   Public bFeedHold As Boolean
   Public bSpeedHold As Boolean

-   ' Nuovi di bottoni -------------------------------------------
-   Public bXYJog As Boolean
-   Public bZCJog As Boolean
-   Public bZBCJog As Boolean
+    ' Nuovi di bottoni -------------------------------------------
+    Public bXYJog As Boolean
+    Public bZCJog As Boolean
+    Public bZBCJog As Boolean

-   Public bPowerON As Boolean
-   Public bRemote As Boolean
-   ' Nuovi di bottoni -------------------------------------------
+    Public bPowerON As Boolean
+    Public bRemote As Boolean
+    ' Nuovi di bottoni -------------------------------------------

-   Public nMachineMode As Integer
+    Public nMachineMode As Integer

-   Public m_szCnDataVar(NUM_DATA - 1) As String
+    Public m_szCnDataVar(NUM_DATA - 1) As String
+    '
+    ' nuovi dal 29-III-2023 per Fanuc
+    '
+    Public n_Base_addr_int_vars As Integer
+    Public n_Base_addr_byte_for_bits_vars As Integer
+    Public n_num_var_int_to_read As Short
+    Public n_num_var_byte_for_bits_to_read As Short
+    '
+    ' Eventi
+    '
+    Public Event NewPositionData(ByVal sender As Object)
+    Public Event NewPosDeltaData(ByVal sender As Object)
+    Public Event NewVarChanged(ByVal sender As Object)

-   Public Event NewPositionData(ByVal sender As Object)
-   Public Event NewPosDeltaData(ByVal sender As Object)
-   Public Event NewVarChanged(ByVal sender As Object)
-
-   Protected Overridable Sub OnNewPositionData()
-      RaiseEvent NewPositionData(0)
-   End Sub
-   Protected Overridable Sub OnNewPosDeltaData()
-      RaiseEvent NewPosDeltaData(0)
-   End Sub
-   Protected Overridable Sub OnNewVarChanged()
-      RaiseEvent NewVarChanged(0)
-   End Sub
+    Protected Overridable Sub OnNewPositionData()
+        RaiseEvent NewPositionData(0)
+    End Sub
+    Protected Overridable Sub OnNewPosDeltaData()
+        RaiseEvent NewPosDeltaData(0)
+    End Sub
+    Protected Overridable Sub OnNewVarChanged()
+        RaiseEvent NewVarChanged(0)
+    End Sub

 #End Region

 #Region " Metodi pubblici"

-   Public MustOverride Function Init() As Boolean
+    Public MustOverride Function Init() As Boolean

   Public MustOverride Function Stop_Connection() As Boolean

@@ -341,4 +358,36 @@ Public MustInherit Class CN_generico

 #End Region

+#Region " Nuovi metodi pubblici"
+
+    Public Overridable Function NC_read_var_short(VarAddr As String, ByRef value As Short) As Boolean
+        Return False
+    End Function
+
+    Public Overridable Function NC_read_var_short_range(VarStartAddr As String, VarEndAddr As String, ByRef values() As Short) As Boolean
+        Return False
+    End Function
+
+    Public Overridable Function NC_write_var_short(VarAddr As String, ByRef value As Short) As Boolean
+        Return False
+    End Function
+
+    Public Overridable Function NC_read_var_bit(VarAddr As String, ByRef value As Boolean) As Boolean
+        Return False
+    End Function
+
+    Public Overridable Function NC_write_var_bit(VarAddr As String, ByRef value As Boolean) As Boolean
+        Return False
+    End Function
+
+    Public Overridable Function NC_pulse_bit(VarAddr As String) As Boolean
+        Return False
+    End Function
+    Public Overridable Function Geppo() As Boolean
+        Return False
+    End Function
+
+#End Region
+
+
 End Class
@@ -122,11 +122,13 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\EgtProg\DllD32\EgtUILib.dll</HintPath>
    </Reference>
-    <Reference Include="EgtWPFLib">
-      <HintPath>..\..\EgtProg\DllD32\EgtWPFLib.dll</HintPath>
+    <Reference Include="EgtWPFLib, Version=2.5.2.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\EgtProg\Dll32\EgtWPFLib.dll</HintPath>
    </Reference>
-    <Reference Include="EgtWPFLib5">
-      <HintPath>..\..\EgtProg\OmagCUT\EgtWPFLib5.dll</HintPath>
+    <Reference Include="EgtWPFLib5, Version=2.5.2.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\EgtProg\Dll32\EgtWPFLib5.dll</HintPath>
    </Reference>
    <Reference Include="Interop.FXLib">
      <HintPath>..\..\EgtProg\OmagCUT\Interop.FXLib.dll</HintPath>
@@ -225,6 +227,9 @@
    <Compile Include="Machine\WaterJetPageUC.xaml.vb">
      <DependentUpon>WaterJetPageUC.xaml</DependentUpon>
    </Compile>
+    <Compile Include="NcComm\fwlib32.vb" />
+    <Compile Include="NcComm\M_Fanuc.vb" />
+    <Compile Include="NcComm\M_Fanuc_hi.vb" />
    <Compile Include="Project\AddToDataBaseUC.xaml.vb">
      <DependentUpon>AddToDataBaseUC.xaml</DependentUpon>
    </Compile>
@@ -2052,6 +2052,18 @@ Public Class RawPartPageUC
      ' Recupero origine tavola rispetto allo 0 macchina
      Dim TableRef As Point3d
      EgtGetTableRef(1, TableRef)
+      ' imposto modo automatico
+      Select Case m_MainWindow.m_CNCommunication.m_nNCType
+         Case 1, 2
+            ' in attesa di verifica 
+         Case 3
+            Dim nResult As Short = m_MainWindow.m_CNCommunication.m_CN.DGeneralFunctions_WriteCncMode(0)
+            EgtOutLog("Impostata modalità automatica: esito " & nResult.ToString)
+         Case 4
+            ' FANUC - Manual:7, Edit:1
+            Dim nResult As Short = m_MainWindow.m_CNCommunication.m_CN.DGeneralFunctions_WriteCncMode(7)
+            EgtOutLog("Impostata modalità manuale: esito " & nResult.ToString)
+      End Select
      ' Recupero file LUA
      EgtLuaExecFile(m_CurrentMachine.sMachDir() & "\DirectCmd\RawProbing.lua")
      ' Imposto parametri
@@ -2089,6 +2101,11 @@ Public Class RawPartPageUC
      End If
      m_MainWindow.m_CurrentProjectPageUC.ClearMessage()
      EgtOutLog("RawProbing : sent NC program")
+      ' Se fanuc passo in modalità AUTO e attivo
+      If m_MainWindow.m_CNCommunication.m_nNCType = 4 Then
+         Dim nResult As Short = m_MainWindow.m_CNCommunication.m_CN.DGeneralFunctions_WriteCncMode(0)
+         EgtOutLog("Impostata modalità automatica: esito " & nResult.ToString)
+      End If
      ' Aspetto e lo avvio
      System.Threading.Thread.Sleep(300)
      m_MainWindow.m_CNCommunication.m_CN.DGeneralFunctions_CycleStart()
@@ -2154,6 +2171,10 @@ Public Class RawPartPageUC
               Else
                  RawThickness *= ONEMM / 1000
               End If
+               ' Se fanuc il dato è in mm (NON MICRON)
+               If m_MainWindow.m_CNCommunication.m_nNCType = 4 Then
+                  RawThickness *= 1000
+               End If
               ' Sottraggo eventuale spessore sovratavola
               RawThickness -= m_CurrentMachine.dAdditionalTable
               ' Imposto spessore misurato come altezza grezzo