#critical# in BeamData corretta lettura ROT90 da TS3

- Allineamento con common ver. 2.6j2
- Aggiunta lettura parametro ROT90 da TS3 in BeamData
2024-10-04 09:24:24 +02:00 · 2024-10-03 10:32:37 +02:00 · 2024-10-01 08:16:51 +02:00 · 2024-10-01 08:14:41 +02:00 · 2024-10-01 08:14:27 +02:00 · 2024-09-26 18:07:03 +02:00
10 changed files with 223 additions and 36 deletions
@@ -15,12 +15,3 @@
 /Wall/PocketingData.lua
 /Wall/SawingData.lua
 /Wall/Ts3Data.lua
-/.vscode
-/MachNotes.ini
-/ToolNotes.ini
-
-# ignoro file bak nella cartella principale e nelle sottocartelle al primo livello
-*.bak
-/*/*.bak
-
-Wall/SurfacingData.lua
@@ -48,7 +48,7 @@ variables:
      echo "-----------------------"
      $customerPathR = $env:MACHINES_PATH_R + "\" + $env:MANUFACTURER
      ROBOCOPY /MIR "$env:SRC_PATH" "$customerPathR\$env:MACH_NAME\" /XD "bin"
-      ROBOCOPY "$env:TEST_PATH" "$customerPathR\_TestMachines\$env:MACH_NAME\$env:MACH_NAME_TEST\" /E /XD "bin"
+      ROBOCOPY "$env:TEST_PATH" "$customerPathR\_TestMachines\$env:MACH_NAME_TEST\" /E /XD "bin"
      ROBOCOPY /MIR "$env:BASE_PATH" "$customerPathR\_Deploy\$env:MACH_NAME\$env:MACH_VERS\" /XD "bin" /XD "$env:MACH_NAME_TEST"
      SLEEP 2
      net use R: /delete
@@ -9,7 +9,7 @@ local BeamData = {
   RIGHT_LOAD = false,                      -- flag carico da destra
   ROT90 = false,                           -- flag abilitazione rotazione 90 gradi
   NEWCLAMPING = false,                     -- flag abilitazione nuovo metodo riposizionamento carrelli
-   FASTCLAMPING= true,                     -- flag abilitazione riduzione numero riposizionamenti al carico e durante grande trascinamento
+   FASTCLAMPING= true,                      -- flag abilitazione riduzione numero riposizionamenti al carico e durante grande trascinamento
   MIN_WIDTH = 40,                          -- larghezza minima del grezzo
   MIN_HEIGHT = 40,                         -- altezza minima del grezzo
   MAX_WIDTH = 240,                         -- larghezza massima del grezzo
@@ -90,20 +90,21 @@ if EgtExistsFile( sData) then
   local Machine = dofile( sData)
   if Machine then
      if Machine.Offsets then
-        BeamData.ANG_TRASM = ( Machine.Offsets.SECSUP and Machine.Offsets.SECSUP >= 3)
-        BeamData.BH_MACHINE = ( Machine.Offsets.BLOCKHAUS == 1)
-        BeamData.MINRAW_S = max( BeamData.MINRAW_S, Machine.Offsets.MINRAW_S or BeamData.MINRAW_S)
-        BeamData.MINRAW_L = max( BeamData.MINRAW_L, Machine.Offsets.MINRAW_L or BeamData.MINRAW_L)
-        BeamData.CUT_EXTRA = Machine.Offsets.CUT_EXTRA or BeamData.CUT_EXTRA
-        BeamData.CUT_EXTRA_MIN = Machine.Offsets.CUT_EXTRA_MIN or BeamData.CUT_EXTRA_MIN
-        BeamData.DIM_STRIP_SMALL = Machine.Offsets.DIM_STRIP_SMALL or BeamData.DIM_STRIP_SMALL
-        BeamData.DIM_TO_CENTER_STRIP = Machine.Offsets.DIM_TO_CENTER_STRIP or BeamData.DIM_TO_CENTER_STRIP
-        BeamData.MAXDIAM_POCK_CORNER = Machine.Offsets.MAXDIAM_POCK_CORNER or BeamData.MAXDIAM_POCK_CORNER
-        if Machine.Offsets.PRECUT_HEAD_DISABLE then BeamData.PRECUT_HEAD = ( Machine.Offsets.PRECUT_HEAD_DISABLE == 0) end
-        if Machine.Offsets.PRECUT_TAIL_DISABLE then BeamData.PRECUT_TAIL = ( Machine.Offsets.PRECUT_TAIL_DISABLE == 0) end
-        if Machine.Offsets.MIN_HEIGHT_ADDED_CUTS then BeamData.MIN_HEIGHT_ADDED_CUTS = min( Machine.Offsets.MIN_HEIGHT_ADDED_CUTS, BeamData.MIN_HEIGHT_ADDED_CUTS) end
-        if Machine.Offsets.NEWCLAMPING ~= nil then BeamData.NEWCLAMPING = Machine.Offsets.NEWCLAMPING end
-        if Machine.Offsets.FASTCLAMPING ~= nil then BeamData.FASTCLAMPING = Machine.Offsets.FASTCLAMPING end
+         BeamData.ANG_TRASM = ( Machine.Offsets.SECSUP and Machine.Offsets.SECSUP >= 3)
+         BeamData.BH_MACHINE = ( Machine.Offsets.BLOCKHAUS == 1)
+         BeamData.MINRAW_S = max( BeamData.MINRAW_S, Machine.Offsets.MINRAW_S or BeamData.MINRAW_S)
+         BeamData.MINRAW_L = max( BeamData.MINRAW_L, Machine.Offsets.MINRAW_L or BeamData.MINRAW_L)
+         BeamData.CUT_EXTRA = Machine.Offsets.CUT_EXTRA or BeamData.CUT_EXTRA
+         BeamData.CUT_EXTRA_MIN = Machine.Offsets.CUT_EXTRA_MIN or BeamData.CUT_EXTRA_MIN
+         BeamData.DIM_STRIP_SMALL = Machine.Offsets.DIM_STRIP_SMALL or BeamData.DIM_STRIP_SMALL
+         BeamData.DIM_TO_CENTER_STRIP = Machine.Offsets.DIM_TO_CENTER_STRIP or BeamData.DIM_TO_CENTER_STRIP
+         BeamData.MAXDIAM_POCK_CORNER = Machine.Offsets.MAXDIAM_POCK_CORNER or BeamData.MAXDIAM_POCK_CORNER
+         if Machine.Offsets.PRECUT_HEAD_DISABLE then BeamData.PRECUT_HEAD = ( Machine.Offsets.PRECUT_HEAD_DISABLE == 0) end
+         if Machine.Offsets.PRECUT_TAIL_DISABLE then BeamData.PRECUT_TAIL = ( Machine.Offsets.PRECUT_TAIL_DISABLE == 0) end
+         if Machine.Offsets.MIN_HEIGHT_ADDED_CUTS then BeamData.MIN_HEIGHT_ADDED_CUTS = min( Machine.Offsets.MIN_HEIGHT_ADDED_CUTS, BeamData.MIN_HEIGHT_ADDED_CUTS) end
+         if Machine.Offsets.NEWCLAMPING ~= nil then BeamData.NEWCLAMPING = ( Machine.Offsets.NEWCLAMPING == 1) end
+         if Machine.Offsets.FASTCLAMPING ~= nil then BeamData.FASTCLAMPING = ( Machine.Offsets.FASTCLAMPING == 1) end
+         if Machine.Offsets.ROT90 ~= nil then BeamData.ROT90 = ( Machine.Offsets.ROT90 == 1) end
      end
      if Machine.Trave then
         BeamData.MIN_WIDTH = Machine.Trave.XMIN or BeamData.MIN_WIDTH
@@ -167,11 +168,11 @@ end
 BeamData.GetBlockedAxis = GetBlockedAxis

 ---------------------------------------------------------------------
-local function GetChainSawInitAngs( vtN, vtO)
-   if vtN:getY() > 0 and vtO:getX() > 0 then
-      return 'C=0'
-   else
+local function GetChainSawInitAngs( vtN, vtO, nInd)
+   if nInd == 1 then
      return ''
+   else
+      return EgtIf( vtN:getY() > 0, 'C=180', 'C=-180')
   end
 end
 BeamData.GetChainSawInitAngs = GetChainSawInitAngs
@@ -212,5 +213,32 @@ local function GetSetupInfo( sHead)
 end
 BeamData.GetSetupInfo = GetSetupInfo

+---------------------------------------------------------------------
+local function GetMaxMatReductionBladeCut( sHead, vtDir)
+   local MaxMatReductionBladeCut = 0
+   -- la lama è montata solo su H2, non si controllano altre teste
+   if sHead == 'H2' then
+      if BeamData.NEWTOPC == nil or BeamData.NEWTOPC then
+         MaxMatReductionBladeCut = -65
+      end
+      if AreSameVectorApprox( vtDir, X_AX()) then
+         MaxMatReductionBladeCut = MaxMatReductionBladeCut + 175
+      elseif AreSameVectorApprox( vtDir, -X_AX()) then
+         MaxMatReductionBladeCut = MaxMatReductionBladeCut + 175
+      elseif AreSameVectorApprox( vtDir, Y_AX()) then
+         MaxMatReductionBladeCut = MaxMatReductionBladeCut + 175
+      elseif AreSameVectorApprox( vtDir, -Y_AX()) then
+         MaxMatReductionBladeCut = MaxMatReductionBladeCut + 175
+      elseif AreSameVectorApprox( vtDir, Z_AX()) then
+         MaxMatReductionBladeCut = 80
+      elseif AreSameVectorApprox( vtDir, -Z_AX()) then
+         MaxMatReductionBladeCut = 80
+      end
+      MaxMatReductionBladeCut = MaxMatReductionBladeCut + BeamData.COLL_SIC
+   end
+   return MaxMatReductionBladeCut + BeamData.COLL_SIC
+end
+BeamData.GetMaxMatReductionBladeCut = GetMaxMatReductionBladeCut
+
 ---------------------------------------------------------------------
 return BeamData
@@ -3,6 +3,7 @@

 -- carico librerie
 local INFO_STD_PP = require( 'Version')
+local BD = require( 'BeamData')

 -- Variabili di modulo
 local CSP_INFO =     INFO_STD_PP.NAME..'  ver.'..INFO_STD_PP.VERSION..' by EgalWare s.r.l.'
@@ -602,6 +603,8 @@ end

 ---------------------------------------------------------------------
 function OnRapid()
+   -- recupero prossimo utensile
+   EMT.NEXTTOOL, EMT.NEXTHEAD, EMT.NEXTTCPOS = FindNextTool()
   MyBackupAxes()
   -- se primo movimento della lavorazione, gestione speciale
   if EMT.MCHFIRST and not EMT.OPEISDISP then
@@ -833,6 +836,26 @@ function OnRapid()
      EmtAdjustRotaryAxes()
      EmitZmax()
      EMT.ZMAX = true
+      -- se pezzi alti e devo cambiare utensile su testa con CU, porto la testa vicino al cambio utensile
+      if EMT.ST > BeamHeightForFixRot  and  EMT.HEAD == 'H1' and  EMT.TOOL ~= EMT.NEXTTOOL  and  EMT.NEXTHEAD ~= 'H2' then
+         local dBAxis = 90
+         local dCAxis = EgtIf( BD.RIGHT_LOAD, 90, -90)         
+         local sEE = ' EE3'
+         local sEL = ' EL' .. EmtLenToString( EgtIf( EMT.HEAD ~= 'H3', EMT.TLEN, ( EMT.TDIST or ChSawLen)), 3)
+         local sER = ' ER' .. EmtLenToString( EgtIf( EMT.HEAD ~= 'H3', EMT.TDIAM / 2, EMT.TLEN), 3)
+         local sET = GetET( EMT.HEAD, EMT.TCPOS, EMT.R3)
+         local sES = ' ES'..EgtNumToString( EMT.S, 0)
+         local sOut = 'G101' .. EmtGetAxis( 'L2') .. EmtGetAxis( 'L3') ..' B=' .. EgtNumToString( dBAxis, 3) ..
+                      ' C=' .. EgtNumToString( dCAxis, 3) .. sEE .. sEL .. sER .. sET .. sES
+         EmtOutput( sOut)
+         EmtOutput( 'M101 P1=2')
+         EmtOutput( 'M101 P1=3')
+         sOut = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. EmtGetAxis( 'L3') ..' B=' .. EgtNumToString( dBAxis, 3) ..
+                ' C=' .. EgtNumToString( dCAxis, 3) .. sEE .. sEL .. sER .. sET .. sES
+         EmtOutput( sOut)
+         EmtOutput( 'M101 P1=2')
+         EmtOutput( 'M101 P1=3')
+      end
   -- se altrimenti movimento in Home
   elseif EMT.FLAG == 4 then
      -- non previsto
@@ -956,6 +979,35 @@ function OnArc()
   EmtUpdatePrev()
 end

+---------------------------------------------------------------------
+function FindNextTool()
+   -- salvo stato iniziale
+   local CurrMachId = EgtGetCurrMachining()
+   local CurrTool = EgtTdbGetCurrToolParam( MCH_TP.NAME)
+   -- cerco lavorazione con utensile su gruppo testa indicato
+   local sTool, sHead, sTcPos
+   local OpId = EgtGetNextActiveOperation( CurrMachId or EMT.MCHID)
+   while OpId do
+      local nType = EgtGetOperationType( OpId)
+      if nType ~= MCH_OY.NONE  and  nType ~= MCH_OY.DISP then
+         if EgtSetCurrMachining( OpId) then
+            sTool = EgtGetMachiningParam( MCH_MP.TOOL)
+            if EgtTdbSetCurrTool( sTool) then
+               sHead = EgtTdbGetCurrToolParam( MCH_TP.HEAD)
+               sTcPos = EgtTdbGetCurrToolParam( MCH_TP.TCPOS)
+               break
+            end
+         end
+      end
+      OpId = EgtGetNextActiveOperation( OpId)
+   end
+   -- ripristino stato iniziale
+   EgtSetCurrMachining( CurrMachId or GDB_ID.NULL)
+   EgtTdbSetCurrTool( CurrTool or '')
+   -- restituisco risultato
+   return sTool, sHead, sTcPos
+end
+
 ---------------------------------------------------------------------
 function CalcCharStatus( sCmd, bSkipPress)
   -- aperto
@@ -3,6 +3,7 @@

 -- carico librerie
 local INFO_STD_PP = require( 'Version')
+local BD = require( 'BeamData')

 -- Variabili di modulo
 local CSP_INFO =     INFO_STD_PP.NAME..'  ver.'..INFO_STD_PP.VERSION..' by EgalWare s.r.l.'
@@ -642,6 +643,8 @@ end

 ---------------------------------------------------------------------
 function OnRapid()
+   -- recupero prossimo utensile
+   EMT.NEXTTOOL, EMT.NEXTHEAD, EMT.NEXTTCPOS = FindNextTool()
   MyBackupAxes()
   -- se primo movimento della lavorazione, gestione speciale
   if EMT.MCHFIRST and not EMT.OPEISDISP then
@@ -907,6 +910,26 @@ function OnRapid()
      EmtAdjustRotaryAxes()
      EmitZmax( false)
      EMT.ZMAX = true
+      -- se pezzi alti e devo cambiare utensile su testa con CU, porto la testa vicino al cambio utensile
+      if EMT.ST > BeamHeightForFixRot  and  EMT.HEAD == 'H1' and  EMT.TOOL ~= EMT.NEXTTOOL  and  EMT.NEXTHEAD ~= 'H2' then
+         local dBAxis = 90
+         local dCAxis = EgtIf( BD.RIGHT_LOAD, 90, -90)         
+         local sEE = ' EE3'
+         local sEL = ' EL' .. EmtLenToString( EgtIf( EMT.HEAD ~= 'H3', EMT.TLEN, ( EMT.TDIST or ChSawLen)), 3)
+         local sER = ' ER' .. EmtLenToString( EgtIf( EMT.HEAD ~= 'H3', EMT.TDIAM / 2, EMT.TLEN), 3)
+         local sET = GetET( EMT.HEAD, EMT.TCPOS, EMT.R3)
+         local sES = ' ES'..EgtNumToString( EMT.S, 0)
+         local sOut = 'G101' .. EmtGetAxis( 'L2') .. EmtGetAxis( 'L3') ..' B=' .. EgtNumToString( dBAxis, 3) ..
+                      ' C=' .. EgtNumToString( dCAxis, 3) .. sEE .. sEL .. sER .. sET .. sES
+         EmtOutput( sOut)
+         EmtOutput( 'M101 P1=2')
+         EmtOutput( 'M101 P1=3')
+         sOut = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. EmtGetAxis( 'L3') ..' B=' .. EgtNumToString( dBAxis, 3) ..
+                ' C=' .. EgtNumToString( dCAxis, 3) .. sEE .. sEL .. sER .. sET .. sES
+         EmtOutput( sOut)
+         EmtOutput( 'M101 P1=2')
+         EmtOutput( 'M101 P1=3')
+      end
   -- se altrimenti movimento in Home
   elseif EMT.FLAG == 4 then
      -- non previsto
@@ -1035,6 +1058,35 @@ function OnArc()
   EmtUpdatePrev()
 end

+---------------------------------------------------------------------
+function FindNextTool()
+   -- salvo stato iniziale
+   local CurrMachId = EgtGetCurrMachining()
+   local CurrTool = EgtTdbGetCurrToolParam( MCH_TP.NAME)
+   -- cerco lavorazione con utensile su gruppo testa indicato
+   local sTool, sHead, sTcPos
+   local OpId = EgtGetNextActiveOperation( CurrMachId or EMT.MCHID)
+   while OpId do
+      local nType = EgtGetOperationType( OpId)
+      if nType ~= MCH_OY.NONE  and  nType ~= MCH_OY.DISP then
+         if EgtSetCurrMachining( OpId) then
+            sTool = EgtGetMachiningParam( MCH_MP.TOOL)
+            if EgtTdbSetCurrTool( sTool) then
+               sHead = EgtTdbGetCurrToolParam( MCH_TP.HEAD)
+               sTcPos = EgtTdbGetCurrToolParam( MCH_TP.TCPOS)
+               break
+            end
+         end
+      end
+      OpId = EgtGetNextActiveOperation( OpId)
+   end
+   -- ripristino stato iniziale
+   EgtSetCurrMachining( CurrMachId or GDB_ID.NULL)
+   EgtTdbSetCurrTool( CurrTool or '')
+   -- restituisco risultato
+   return sTool, sHead, sTcPos
+end
+
 ---------------------------------------------------------------------
 function CalcDinamicaPinze( dH, dS, dL)
   local MinTempoAcc = 0.3                         -- [s]
@@ -3,6 +3,7 @@

 -- carico librerie
 local INFO_STD_PP = require( 'Version')
+local BD = require( 'BeamData')

 -- Variabili di modulo
 local CSP_INFO =     INFO_STD_PP.NAME..'  ver.'..INFO_STD_PP.VERSION..' by EgalWare s.r.l.'
@@ -625,6 +626,8 @@ end

 ---------------------------------------------------------------------
 function OnRapid()
+   -- recupero prossimo utensile
+   EMT.NEXTTOOL, EMT.NEXTHEAD, EMT.NEXTTCPOS = FindNextTool()
   MyBackupAxes()
   -- se primo movimento della lavorazione, gestione speciale
   if EMT.MCHFIRST and not EMT.OPEISDISP then
@@ -849,6 +852,25 @@ function OnRapid()
      EmtAdjustRotaryAxes()
      EmitZmax( true)
      EMT.ZMAX = true
+      -- se pezzi alti e devo cambiare utensile su testa con CU, porto la testa vicino al cambio utensile
+      if EMT.ST > BeamHeightForFixRot  and  EMT.HEAD == 'H1' and  EMT.TOOL ~= EMT.NEXTTOOL  and  EMT.NEXTHEAD ~= 'H2' then
+         local dBAxis = 90
+         local dCAxis = EgtIf( BD.RIGHT_LOAD, 90, -90)
+         local sOut = 'M101 P1=1' .. ' P2=' .. EmtLenToString( EMT.L2, 3) .. ' P3=' .. EmtLenToString( EMT.L3, 3) ..
+                      ' P4=' .. EgtNumToString( dBAxis, 3) .. ' P5=' .. EgtNumToString( dCAxis, 3) .. 
+                      ' P6=' .. AdjustTcPos( false) .. ' P7=' .. EgtNumToString( EMT.S, 0) ..
+                      ' P8=0' .. ' P9=0' .. ' P10=3'
+         EmtOutput( sOut)
+         EmtOutput( 'M101 P1=2')
+         EmtOutput( 'M101 P1=3')
+         sOut = 'M101 P1=1' .. ' P2=' .. EmtLenToString( -SafeXRotAxes, 3) .. ' P3=' .. EmtLenToString( EMT.L3, 3) ..
+                      ' P4=' .. EgtNumToString( dBAxis, 3) .. ' P5=' .. EgtNumToString( dCAxis, 3) .. 
+                      ' P6=' .. AdjustTcPos( false) .. ' P7=' .. EgtNumToString( EMT.S, 0) ..
+                      ' P8=0' .. ' P9=0' .. ' P10=3'
+         EmtOutput( sOut)
+         EmtOutput( 'M101 P1=2')
+         EmtOutput( 'M101 P1=3')
+      end
   -- se altrimenti movimento in Home
   elseif EMT.FLAG == 4 then
      -- non previsto
@@ -992,6 +1014,35 @@ function OnArc()
   EmtUpdatePrev()
 end

+---------------------------------------------------------------------
+function FindNextTool()
+   -- salvo stato iniziale
+   local CurrMachId = EgtGetCurrMachining()
+   local CurrTool = EgtTdbGetCurrToolParam( MCH_TP.NAME)
+   -- cerco lavorazione con utensile su gruppo testa indicato
+   local sTool, sHead, sTcPos
+   local OpId = EgtGetNextActiveOperation( CurrMachId or EMT.MCHID)
+   while OpId do
+      local nType = EgtGetOperationType( OpId)
+      if nType ~= MCH_OY.NONE  and  nType ~= MCH_OY.DISP then
+         if EgtSetCurrMachining( OpId) then
+            sTool = EgtGetMachiningParam( MCH_MP.TOOL)
+            if EgtTdbSetCurrTool( sTool) then
+               sHead = EgtTdbGetCurrToolParam( MCH_TP.HEAD)
+               sTcPos = EgtTdbGetCurrToolParam( MCH_TP.TCPOS)
+               break
+            end
+         end
+      end
+      OpId = EgtGetNextActiveOperation( OpId)
+   end
+   -- ripristino stato iniziale
+   EgtSetCurrMachining( CurrMachId or GDB_ID.NULL)
+   EgtTdbSetCurrTool( CurrTool or '')
+   -- restituisco risultato
+   return sTool, sHead, sTcPos
+end
+
 ---------------------------------------------------------------------
 function CalcDinamicaPinze( dH, dS, dL)
   local MinTempoAcc = 0.3                         -- [s]
@@ -1687,7 +1687,7 @@ function SpecAdjustCarriages( vCmd, dTPosI, dYDeltaI, dVDeltaI, dTPosF, dYDeltaF
            dBeamMove = -( dYPosI + ( dYDeltaF - dYDeltaI) - MyMinY)
         -- se spostamento verso il carico
         elseif ( dYPosI + ( dYDeltaF - dYDeltaI)) > MaxY then
-            dBeamMove =  dYPosI + ( dYDeltaF - dYDeltaI) - MaxY
+            dBeamMove =  -( dYPosI + ( dYDeltaF - dYDeltaI) - MaxY)
         end

         -- se serve un grande spostamento e si sta pinzando poco. V trascinatore pinza poco e Y si sposta per prima per recuperare
@@ -1855,7 +1855,7 @@ function SpecAdjustCarriages( vCmd, dTPosI, dYDeltaI, dVDeltaI, dTPosF, dYDeltaF
               -- morsa Y arriva in posizione finale
               dYDeltaI = dYDeltaF
               dVPosA = MinV
-               dTPosA = dTPosI - MaxV + MinV
+               dTPosA = dTPosI - dVPosI + MinV
               dYPosA = dYDeltaF + dTPosA
               table.insert( vCmd, { 3, 'Y', dYPosA , 'T', dTPosA, 'V', dVPosA})
               table.insert( vCmd, { 11, 1})
@@ -1959,10 +1959,9 @@ function SpecAdjustCarriages( vCmd, dTPosI, dYDeltaI, dVDeltaI, dTPosF, dYDeltaF
            -- recupero una corsa massima e l'altra solo di quello che serve
            elseif abs( dVDeltaI - dVDeltaF) > dMaxMovePilgrimStepSingleClampV then
               -- aggiorno nuova posizione della morsa al carico dopo riposizionamento
-               local dTotMove = MaxY - dTPosI - dYDeltaI
               dVDeltaI = dVDeltaF
               dYPosA = MaxY
-               dTPosA = dTPosI + dTotMove
+               dTPosA = dTPosI + ( MaxY - dYPosI)
               dVPosA = dVDeltaF + dTPosA
               table.insert( vCmd, { 3, 'Y', dYPosA , 'T', dTPosA, 'V', dVPosA})
               table.insert( vCmd, { 12, 1})
@@ -68,12 +68,17 @@
 -- 2024/09/23 AV ver 2.6i7 Allineamento con common ver. 2.6i3
 -- 2024/09/24 AV ver 2.6i8 Allineamento con common ver. 2.6i4
 -- 2024/09/24 AV ver 2.6i9 Allineamento con common ver. 2.6i5
+-- 2024/09/25 AV ver 2.6i10 Allineamento con common ver. 2.6i6
+-- 2024/10/01 AV ver 2.6j1 Allineamento con common ver. 2.6j1
+-- 2024/10/03 AV ver 2.6j2 Allineamento con common ver. 2.6j2
+--                         Aggiunta lettura parametro ROT90 da TS3 in BeamData
+-- 2024/10/04 LM ver 2.6j3 in BeamData corretta lettura ROT90 da TS3

 require( 'EmtGenerator')
 EgtEnableDebug( false)

-PP_VER = '2.6i9'
-PP_NVER = '2.6.9.9'
+PP_VER = '2.6j3'
+PP_NVER = '2.6.10.3'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-FAST'

@@ -1,5 +1,14 @@
           ==== Common_FAST Update Log ====

+Versione 2.6j2 (03/10/2024)
+- (SIM-GEN) Piccola correwzione calcolo posizione carrello durante riposizionamento, nuova gestione
+
+Versione 2.6j1 (01/10/2024)
+- (SIM-GEN) Sistemato calcolo in nuova disposzione carrelli
+
+Versione 2.6i6 (25/09/2024)
+- (GEN) Migliorata gestione movimenti per portare testa vicino a cambio utensile se trave alta. Ticket#2066
+
 Versione 2.6i5 (24/09/2024)
 - (SIM-GEN) Tolto controllo su lunghezza maggiore di 200mm introdotto con 2.6i2 perchè non completamente funzionante
 - (GEN) Gestione in OnRapid() di EMT.FLAG=5 (rotazione a Z max per lavorazione successiva). Ora allineata alla simulazione
@@ -3,7 +3,7 @@

 local InfoCommon_STD_PP = {
   NAME = 'Common_FAST',            -- nome script PP standard
-   VERSION = '2.6i5',                 -- versione script
+   VERSION = '2.6j2',                 -- versione script
   MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }
Author	SHA1	Message	Date
luca.mazzoleni	3b7ac164a1	#critical# in BeamData corretta lettura ROT90 da TS3	2024-10-04 09:24:24 +02:00
andrea.villa	daf84e06b3	- Allineamento con common ver. 2.6j2 - Aggiunta lettura parametro ROT90 da TS3 in BeamData	2024-10-03 10:32:37 +02:00
andrea.villa	ff1c51f68b	Aggiornamento versione	2024-10-01 08:16:51 +02:00
andrea.villa	f164c8a046	Merge remote-tracking branch 'origin/develop'	2024-10-01 08:14:41 +02:00
andrea.villa	d1f5219be9	Aggiornamento con common ver. 2.6j1	2024-10-01 08:14:27 +02:00
andrea.villa	e08a18811f	Piccola modifica nuovo pinzaggio	2024-09-26 18:07:03 +02:00
andrea.villa	758082ad22	Merge branch 'master' into develop	2024-09-25 13:24:50 +02:00
andrea.villa	745e6092b7	Merge remote-tracking branch 'origin/develop'	2024-09-25 13:24:44 +02:00
andrea.villa	10db138855	- Allineamento con common ver. 2.6i6	2024-09-25 13:24:28 +02:00
andrea.villa	c2177f36bf	Merge remote-tracking branch 'origin/master' into develop	2024-09-25 13:23:03 +02:00
luca.mazzoleni	76f6ed3346	update gitignore e YAML	2024-09-25 13:10:51 +02:00
andrea.villa	a89bf46837	Cambio versione	2024-09-25 11:22:49 +02:00
andrea.villa	688ec6e221	Test miglioramento movimenti in sicurezza pezzi alti	2024-09-25 11:22:18 +02:00
andrea.villa	13a69fea58	Merge remote-tracking branch 'origin/master' into develop	2024-09-25 11:19:35 +02:00