Aggiunta lettura alcune variabili impostabili da TS3

- Aggiunta lettura parametro ROT90 da TS3 in BeamData

.gitignore

@@ -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

.gitlab-ci.yml

@@ -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

Beam/BeamData.lua

@@ -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,25 @@ 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 == 1) end
-        if Machine.Offsets.FASTCLAMPING ~= nil then BeamData.FASTCLAMPING = ( Machine.Offsets.FASTCLAMPING == 1) 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
+         BeamData.LONGCUT_ENDLEN = Machine.Offsets.LONGCUT_ENDLEN or BeamData.LONGCUT_ENDLEN
+         BeamData.LONGCUT_MAXLEN = Machine.Offsets.LONGCUT_MAXLEN or BeamData.LONGCUT_MAXLEN
+         BeamData.ADVANCE_TAIL_OFFS = Machine.Offsets.ADVANCE_TAIL_OFFS or BeamData.ADVANCE_TAIL_OFFS
+         BeamData.LEN_VERY_SHORT_PART = Machine.Offsets.LEN_VERY_SHORT_PART or BeamData.LEN_VERY_SHORT_PART
+         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 +172,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 +217,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

Common_FAST.NUM.mlpe

@@ -848,13 +848,13 @@ function OnRapid()
          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')
+         EmtOutput( 'G101 ET1001')
+         EmtOutput( 'G101 ET2001')
          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')
+         EmtOutput( 'G101 ET1001')
+         EmtOutput( 'G101 ET2001')
       end
    -- se altrimenti movimento in Home
    elseif EMT.FLAG == 4 then
@@ -876,7 +876,7 @@ function OnRapid()
                              EmtGetAxis( 'R2') .. EmtGetAxis( 'R1') .. sEE .. sEL .. sER .. sET .. sES
       EmtOutput( sOut)
       EmtOutput( 'G101 ET1001')
-      EmtOutput( 'G101 ET2001')            
+      EmtOutput( 'G101 ET2001')
    -- altrimenti errore
    else
       EmtSetLastError( 1212, "Unknown Rapid flag")

Common_FAST.NUM_PLUS.mlpe

@@ -922,14 +922,14 @@ function OnRapid()
          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')
+         EmtOutput( 'G101 ET1001')
+         EmtOutput( 'G101 ET2001')
          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
+         EmtOutput( 'G101 ET1001')
+         EmtOutput( 'G101 ET2001')
+         end
    -- se altrimenti movimento in Home
    elseif EMT.FLAG == 4 then
       -- non previsto

Common_FAST.mlse

@@ -1214,6 +1214,9 @@ function SpecCalcCarriages( dDistFront, dDistBack, bFixedDelta, bFixedPos)
    end
    local dDistBackEff = min( dDistBack, EMC.LB - MyMinOther - EMC.HCING - EMC.HOVM)
 
+   -- se primo scambio
+   local MyMinY = EgtIf( EMC.CNT == 1, MinY + AGG_LOAD, MinY)
+
    EgtOutLog( '  Dist/Min : Back=' .. EgtNumToString( dDistBackEff, 1) .. '/' .. EgtNumToString( MinBackJoin, 1) ..
               ' Front=' .. EgtNumToString( dDistFrontEff, 1) .. '/' .. EgtNumToString( MinFrontJoin, 1) ..
               '  Fixed : Delta=' .. EgtIf( bFixedDelta, 'T', 'F') .. ' Pos=' .. EgtIf( bFixedPos, 'T', 'F'), 3)
@@ -1233,7 +1236,7 @@ function SpecCalcCarriages( dDistFront, dDistBack, bFixedDelta, bFixedPos)
    if dDistFrontEff < MinFrontJoin  and  dDistBackEff > MinBackJoin - GEO.EPS_SMALL then
       -- se Y non era in presa, mi ricalcolo la posizione
       if not dYDelta then
-         dYDelta = dVDelta + ( MinY - MaxV)
+         dYDelta = dVDelta + ( MyMinY - MaxV)
       end
       dNewYDelta = EMC.LB - dDistBackEff
       -- verifico se posso lasciare la morsa in posizione
@@ -1250,11 +1253,11 @@ function SpecCalcCarriages( dDistFront, dDistBack, bFixedDelta, bFixedPos)
    elseif dDistBackEff > MinBackJoin - GEO.EPS_SMALL  and dDistFrontEff > MinFrontJoin - GEO.EPS_SMALL then
       -- se Y non era in presa, mi ricalcolo la posizione
       if not dYDelta then
-         dYDelta = dVDelta + ( MinY - MaxV)
+         dYDelta = dVDelta + ( MyMinY - MaxV)
       end
       -- se V non era in presa, mi ricalcolo la posizione
       if not dVDelta then
-         dVDelta = dYDelta - ( MinY - MaxV)
+         dVDelta = dYDelta - ( MyMinY - MaxV)
       end
       
       dNewYDelta = EMC.LB - dDistBackEff
@@ -1284,7 +1287,7 @@ function SpecCalcCarriages( dDistFront, dDistBack, bFixedDelta, bFixedPos)
    elseif dDistBackEff < MinBackJoin  and  dDistFrontEff > MinFrontJoin - GEO.EPS_SMALL then
       -- se V non era in presa, mi ricalcolo la posizione
       if not dVDelta then
-         dVDelta = dYDelta - ( MinY - MaxV)
+         dVDelta = dYDelta - ( MyMinY - MaxV)
       end
       dNewVDelta = dDistFrontEff
       -- verifico se posso lasciare la morsa in posizione
@@ -1489,6 +1492,17 @@ function SpecCalcPreRot()
    return vCmd
 end
 
+---------------------------------------------------------------------
+local function CalcCharStatus( sType, dDelta)
+   -- se per carrello Y
+   if sType == 'Y' then
+      return EgtIf( EMC.LB - dDelta < LenToPress, 1, 2)
+   -- altrimenti per carrello V
+   else
+      return EgtIf( dDelta < LenToPress, 1, 2)
+   end
+end
+
 ---------------------------------------------------------------------
 function SpecAdjustCarriages( vCmd, dTPosI, dYDeltaI, dVDeltaI, dTPosF, dYDeltaF, dVDeltaF, bFixedDelta, bFixedPos)
    local dYPosA, dVPosA, dTPosA
@@ -1615,7 +1629,7 @@ function SpecAdjustCarriages( vCmd, dTPosI, dYDeltaI, dVDeltaI, dTPosF, dYDeltaF
          dTPosI = dTPosA
 
         -- blocco la morsa
-         table.insert( vCmd, { 12, 1})
+         table.insert( vCmd, { 12, CalcCharStatus( 'V', dVDeltaF)})
 
          -- imposto i nuovi parametri di aggancio
          if EMC.YDELTANEXT and EMC.VDELTANEXT  then
@@ -1626,7 +1640,7 @@ function SpecAdjustCarriages( vCmd, dTPosI, dYDeltaI, dVDeltaI, dTPosF, dYDeltaF
                dYPosA = dTPosF + dYDeltaF
                dVPosA = dTPosF + dVDeltaF
                table.insert( vCmd, { 3, 'Y', dYPosA , 'T', dTPosA, 'V', dVPosA})
-               table.insert( vCmd, { 11, 1})
+               table.insert( vCmd, { 11, CalcCharStatus( 'Y', dYDeltaF)})
                -- la morsa al carico è adesso in posizione
                dYDeltaI = dYDeltaF
             end
@@ -1638,7 +1652,7 @@ function SpecAdjustCarriages( vCmd, dTPosI, dYDeltaI, dVDeltaI, dTPosF, dYDeltaF
                dTPosA = -( dYPosA + dVDeltaF)
                dVPosA = dTPosA + dVDeltaF
                table.insert( vCmd, { 3, 'Y', dYPosA , 'T', dTPosA, 'V', dVPosA})
-               table.insert( vCmd, { 11, 1})
+               table.insert( vCmd, { 11, CalcCharStatus( 'Y', dYDeltaF)})
                -- la morsa al carico è adesso in posizione
                dYDeltaI = dYDeltaF
             end
@@ -1687,7 +1701,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
@@ -1723,7 +1737,7 @@ function SpecAdjustCarriages( vCmd, dTPosI, dYDeltaI, dVDeltaI, dTPosF, dYDeltaF
          dTPosI = dTPosA
 
         -- blocco la morsa
-         table.insert( vCmd, { 11, 1})
+         table.insert( vCmd, { 11, CalcCharStatus( 'Y', dYDeltaF)})
 
          -- imposto i nuovi parametri di aggancio
          if EMC.YDELTANEXT and EMC.VDELTANEXT  then
@@ -1733,7 +1747,7 @@ function SpecAdjustCarriages( vCmd, dTPosI, dYDeltaI, dVDeltaI, dTPosF, dYDeltaF
                dYPosA = dTPosF + dYDeltaF
                dVPosA = dTPosF + dVDeltaF
                table.insert( vCmd, { 3, 'Y', dYPosA , 'T', dTPosA, 'V', dVPosA})
-               table.insert( vCmd, { 12, 1})
+               table.insert( vCmd, { 12, CalcCharStatus( 'V', dVDeltaF)})
                -- la morsa al carico è adesso in posizione
                dVDeltaI = dVDeltaF
             end
@@ -1745,7 +1759,7 @@ function SpecAdjustCarriages( vCmd, dTPosI, dYDeltaI, dVDeltaI, dTPosF, dYDeltaF
                dTPosA = dVPosA - dVDeltaF
                dYPosA = dTPosA + dYDeltaF
                table.insert( vCmd, { 3, 'Y', dYPosA , 'T', dTPosA, 'V', dVPosA})
-               table.insert( vCmd, { 12, 1})
+               table.insert( vCmd, { 12, CalcCharStatus( 'V', dVDeltaF)})
                -- la morsa al carico è adesso in posizione
                dVDeltaI = dVDeltaF
             end
@@ -1855,10 +1869,10 @@ 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})
+               table.insert( vCmd, { 11, CalcCharStatus( 'Y', dYDeltaF)})
                table.insert( vCmd, { 12, 0})
                dTPosI = dTPosA
                EMC.YDELTA = dYDeltaF
@@ -1875,7 +1889,7 @@ function SpecAdjustCarriages( vCmd, dTPosI, dYDeltaI, dVDeltaI, dTPosF, dYDeltaF
                   dVPosA = dTPosI + dVDeltaI - dTotMove
                   dTPosA = dTPosI - dTotMove
                   table.insert( vCmd, { 3, 'Y', dYPosA , 'T', dTPosA, 'V', dVPosA})
-                  table.insert( vCmd, { 11, 1})
+                  table.insert( vCmd, { 11, CalcCharStatus( 'Y', dYDeltaF)})
                   table.insert( vCmd, { 12, 0})
 
                   -- aggiorno nuova posizione della morsa al carico dopo riposizionamento
@@ -1903,12 +1917,12 @@ function SpecAdjustCarriages( vCmd, dTPosI, dYDeltaI, dVDeltaI, dTPosF, dYDeltaF
 
                -- imposto i nuovi parametri di aggancio
                if EMC.YDELTANEXT and EMC.VDELTANEXT  then
-                  table.insert( vCmd, { 12, 1})
+                  table.insert( vCmd, { 12, CalcCharStatus( 'V', dVDeltaF)})
                   table.insert( vCmd, { 21, dYDeltaF, dVDeltaF})
                elseif EMC.YDELTANEXT then
                   table.insert( vCmd, { 21, dYDeltaF, 0})
                else
-                  table.insert( vCmd, { 12, 1})
+                  table.insert( vCmd, { 12, CalcCharStatus( 'V', dVDeltaF)})
                   table.insert( vCmd, { 11, 0})
                   -- sposto il carrello Y in parcheggio
                   table.insert( vCmd, { 1, 'Y', ParkY})
@@ -1959,13 +1973,12 @@ 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})
+               table.insert( vCmd, { 12, CalcCharStatus( 'V', dVDeltaF)})
                table.insert( vCmd, { 11, 0})
                dTPosI = dTPosA
                EMC.YDELTA = dYDeltaI
@@ -1982,7 +1995,7 @@ function SpecAdjustCarriages( vCmd, dTPosI, dYDeltaI, dVDeltaI, dTPosF, dYDeltaF
                   dVPosA = dTPosI + dVDeltaI - dTotMove
                   dTPosA = dTPosI + dTotMove
                   table.insert( vCmd, { 3, 'Y', dYPosA , 'T', dTPosA, 'V', dVPosA})
-                  table.insert( vCmd, { 12, 1})
+                  table.insert( vCmd, { 12, CalcCharStatus( 'V', dVDeltaF)})
                   table.insert( vCmd, { 11, 0})
 
                   -- aggiorno nuova posizione della morsa allo scarico dopo riposizionamento
@@ -2008,22 +2021,12 @@ function SpecAdjustCarriages( vCmd, dTPosI, dYDeltaI, dVDeltaI, dTPosF, dYDeltaF
                   dYDeltaI = dYDeltaF
                end
 
-              -- sistemo apertura morse
-               if EMC.YDELTANEXT then
-                  table.insert( vCmd, { 11, 1})
-               end
-               if not EMC.VDELTANEXT then
-                  table.insert( vCmd, { 12, 0})
-                  -- sposto il carrello Y in parcheggio
-                  table.insert( vCmd, { 1, 'V', ParkV})
-               end
-
                -- imposto i nuovi parametri di aggancio
                if EMC.YDELTANEXT and EMC.VDELTANEXT  then
-                  table.insert( vCmd, { 11, 1})
+                  table.insert( vCmd, { 11, CalcCharStatus( 'Y', dYDeltaF)})
                   table.insert( vCmd, { 21, dYDeltaF, dVDeltaF})
                elseif EMC.YDELTANEXT then
-                  table.insert( vCmd, { 11, 1})
+                  table.insert( vCmd, { 11, CalcCharStatus( 'Y', dYDeltaF)})
                   -- sposto il carrello Y in parcheggio
                   table.insert( vCmd, { 12, 0})
                   table.insert( vCmd, { 1, 'V', ParkV})
@@ -2278,17 +2281,6 @@ function SpecAdjustCarriagesOLD( dTPosI, dYDeltaI, dVDeltaI, dTPosF, dYDeltaF, d
    end
 end
 
----------------------------------------------------------------------
-local function CalcCharStatus( sType, dDelta)
-   -- se per carrello Y
-   if sType == 'Y' then
-      return EgtIf( EMC.LB - dDelta < LenToPress, 1, 2)
-   -- altrimenti per carrello V
-   else
-      return EgtIf( dDelta < LenToPress, 1, 2)
-   end
-end
-
 ---------------------------------------------------------------------
 local function GetCorseDisp( dCorsaYfc, dCorsaVfc, dDistN, sSide)
    local dRecTotn = min( dDistN, dCorsaYfc+ dCorsaVfc) -- recupero possibile al netto di dCorsa..TrA)

Essetre-FAST.mlde

@@ -68,12 +68,19 @@
 -- 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
+-- 2024/10/10 AV ver 2.6j4 Allineamento con common ver. 2.6j3
+-- 2024/10/15 AV ver 2.6j5 Allineamento con common ver. 2.6j4
 
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.6i9_DEV'
-PP_NVER = '2.6.9.9'
+PP_VER = '2.6j5'
+PP_NVER = '2.6.10.5'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-FAST'
 

UpdateLog.txt

@@ -1,5 +1,21 @@
            ==== Common_FAST Update Log ====
 
+Versione 2.6j4 (15/10/2024)
+- (SIM-GEN) Piccola correzione nuovo riposizionamento. Non considerava i 50mm di tolleranza su primo pinzaggio dopo ribaltamento
+- (SIM-GEN) Gestione attivazione pressore verticale in nuovo riposizionamento
+
+Versione 2.6j3 (11/10/2024)
+- (GEN) Corretta scrittura macro start/attesa movimenti per NUM. Veniva scritto codice per TPA.
+
+Versione 2.6j2 (03/10/2024)
+- (SIM-GEN) Piccola correzione 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

Version.lua

@@ -3,7 +3,7 @@
 
 local InfoCommon_STD_PP = {
    NAME = 'Common_FAST',            -- nome script PP standard
-   VERSION = '2.6i5',                 -- versione script
+   VERSION = '2.6j4',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }