Allineamento con common ver. 2.7c1

Beam/BeamData.lua

@@ -216,48 +216,41 @@ local function GetSetupInfo( sHead)
    local SetupInfo = {}
 
    -- dati comuni
-   SetupInfo.bIsCSymmetric = true
+   SetupInfo.bIsCSymmetrical = true
    SetupInfo.dCAxisEncumbrance = 180
    SetupInfo.bToolOnAggregate = false
+   SetupInfo.Head = {}
 
    -- testa 5 assi da sopra, dietro
    if sHead == 'H11' then
-      SetupInfo.bIsTopHead = true
-      SetupInfo.bIsBottomHead = not SetupInfo.bIsTopHead
-      SetupInfo.bIsFrontHead = false
-      SetupInfo.bIsBackHead = not SetupInfo.bIsFrontHead
-      SetupInfo.dMaxNegativeAngle = sin( -45)
+      SetupInfo.HeadType = { bTop = true, bBottom = false}
+      SetupInfo.PreferredSide = { bFront = false, bBack = true}
+      SetupInfo.dMinNz = sin( -45)
    -- testa 5 assi da sopra, davanti
    elseif sHead == 'H21' then
-      SetupInfo.bIsTopHead = true
-      SetupInfo.bIsBottomHead = not SetupInfo.bIsTopHead
-      SetupInfo.bIsFrontHead = true
-      SetupInfo.bIsBackHead = not SetupInfo.bIsFrontHead
-      SetupInfo.dMaxNegativeAngle = sin( -45)
+      SetupInfo.HeadType = { bTop = true, bBottom = false}
+      SetupInfo.PreferredSide = { bFront = true, bBack = false}
+      SetupInfo.dMinNz = sin( -45)
    -- lama su testa 5 assi da sopra, dietro
    elseif sHead == 'H12' then
-      SetupInfo.bIsTopHead = true
-      SetupInfo.bIsBottomHead = not SetupInfo.bIsTopHead
-      SetupInfo.bIsFrontHead = false
-      SetupInfo.bIsBackHead = not SetupInfo.bIsFrontHead
-      SetupInfo.dMaxNegativeAngle = sin( -45)
+      SetupInfo.HeadType = { bTop = true, bBottom = false}
+      SetupInfo.PreferredSide = { bFront = false, bBack = true}
+      SetupInfo.dMinNz = sin( -45)
    -- lama su testa 5 assi da sopra, davanti
    elseif sHead == 'H22' then
-      SetupInfo.bIsTopHead = true
-      SetupInfo.bIsBottomHead = not SetupInfo.bIsTopHead
-      SetupInfo.bIsFrontHead = true
-      SetupInfo.bIsBackHead = not SetupInfo.bIsFrontHead
-      SetupInfo.dMaxNegativeAngle = sin( -45)
+      SetupInfo.HeadType = { bTop = true, bBottom = false}
+      SetupInfo.PreferredSide = { bFront = true, bBack = false}
+      SetupInfo.dMinNz = sin( -45)
    -- motosega 1
    elseif sHead == 'H13' or sHead == 'H23' then
-      SetupInfo.bIsTopHead = true
-      SetupInfo.bIsBottomHead = not SetupInfo.bIsTopHead
-      SetupInfo.dMaxNegativeAngle = 0
+      SetupInfo.HeadType = { bTop = true, bBottom = false}
+      SetupInfo.PreferredSide = {}
+      SetupInfo.dMinNz = 0
    -- motosega 2
    elseif sHead == 'H15' then
-      SetupInfo.bIsBottomHead = true
-      SetupInfo.bIsTopHead = not SetupInfo.bIsBottomHead
-      SetupInfo.dMaxPositiveAngle = 0
+      SetupInfo.HeadType = { bTop = false, bBottom = true}
+      SetupInfo.PreferredSide = {}
+      SetupInfo.dMaxNz = 0
    end
 
    return SetupInfo

Common_ONE-PF.NUM.mlpe

@@ -614,11 +614,15 @@ function OnMachiningEnd()
       EMT.PREVHEAD_H1 = EMT.HEAD
       EMT.PREVTCPOS_H1 = EMT.TCPOS
       EMT.PREVHOMEX_H1 = EgtGetAxisHomePos( 'X1')
+      EMT.PREVHOMEB_H1 = EgtGetAxisHomePos( 'B1')
+      EMT.PREVHOMEC_H1 = EgtGetAxisHomePos( 'C1')
    elseif nHSet == 2 then
       EMT.PREVTOOL_H2 = EMT.TOOL
       EMT.PREVHEAD_H2 = EMT.HEAD
       EMT.PREVTCPOS_H2 = EMT.TCPOS
       EMT.PREVHOMEX_H2 = EgtGetAxisHomePos( 'X2')
+      EMT.PREVHOMEB_H2 = EgtGetAxisHomePos( 'B2')
+      EMT.PREVHOMEC_H2 = EgtGetAxisHomePos( 'C2')
    end
 
    if EMT.DOU_TYPE and not EMT.ZMAX then EMT.DOU_TO_ZMAX = true end
@@ -1158,12 +1162,12 @@ function OnRapid()
                if not HeadIsChainSaw( EMT.PREVHEAD) then
                   if nPrevHSet == 1 then
                      local HomeX1 = EgtGetAxisHomePos( 'X1')
-                     EmitMoveDataHead( 1, { X=-EMT.PREVHOMEX_H1, Z=MaxZ1, B=ParkB1, C=ParkC1, TPos=AdjustTcPos( false, EMT.PREVTCPOS_H1)})
+                     EmitMoveDataHead( 1, { X=-EMT.PREVHOMEX_H1, Z=MaxZ1, B=EMT.PREVHOMEB_H1, C=EMT.PREVHOMEC_H1, TPos=AdjustTcPos( false, EMT.PREVTCPOS_H1)})
                      EmitMoveStartHead( 1, 'EA1')
                      EmitMoveWaitHead( 1)
                   else
                      local HomeX2 = EgtGetAxisHomePos( 'X2')
-                     EmitMoveDataHead( 2, { X=-EMT.PREVHOMEX_H2, Z=MaxZ2, B=ParkB2, C=ParkC2, TPos=AdjustTcPos( false, EMT.PREVTCPOS_H2)})
+                     EmitMoveDataHead( 2, { X=-EMT.PREVHOMEX_H2, Z=MaxZ2, B=EMT.PREVHOMEB_H2, C=EMT.PREVHOMEC_H2, TPos=AdjustTcPos( false, EMT.PREVTCPOS_H2)})
                      EmitMoveStartHead( 2, 'EA1')
                      EmitMoveWaitHead( 2)
                   end

Essetre-PF.mlde

@@ -32,8 +32,8 @@
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.7b2'
-PP_NVER = '2.7.2.2'
+PP_VER = '2.7c1'
+PP_NVER = '2.7.3.1'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-PF'
 

UpdateLog.txt

@@ -1,5 +1,8 @@
            ==== Common_ONE-PF Update Log ====
 
+Versione 2.7c1 (05/03/2025)
+- (GEN) Corretto movimento in home utensile precedente. Ticket#2324
+
 Versione 2.7b1 (07/02/2025)
 - (SIM-GEN) In caso di Progress, alla deselezione utensile testa 1 su TC2 si fa movimento Z raddrizzando asse B. Ticket#2247
 - (SIM-GEN) Estensione soluzione Ticket#2206. Ora si aprono di 5mm extra anche se solo una morsa resta in posizione. Ticket#2259

Version.lua

@@ -3,7 +3,7 @@
 
 local InfoCommon_STD_PP = {
    NAME = 'Common_ONE-PF',            -- nome script PP standard
-   VERSION = '2.7b1',                 -- versione script
+   VERSION = '2.7c1',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }