diff --git a/Common_ONE-PF.NUM.mlpe b/Common_ONE-PF.NUM.mlpe index add3f5f..92ed4b8 100644 --- a/Common_ONE-PF.NUM.mlpe +++ b/Common_ONE-PF.NUM.mlpe @@ -2101,11 +2101,11 @@ function MyAdjustLinearAxes() local Len = EMT.TLEN + dAddLen + Mill2Offs local LenRef = Mill2Offs vtE = Vector3d( EMT.TDIR) * Len - Z_AX() * LenRef - elseif EMT.HEAD == 'H13' then + elseif EMT.HEAD == 'H13' or EMT.HEAD == 'H15' then local Len = ( EMT.TDIST or ChSawLen) + MillOffs local LenRef = MillOffs vtE = Vector3d( EMT.ADIR) * Len - Z_AX() * LenRef - elseif EMT.HEAD == 'H15' or EMT.HEAD == 'H23' then + elseif EMT.HEAD == 'H23' then local Len = ( EMT.TDIST or ChSawLen) + Mill2Offs local LenRef = Mill2Offs vtE = Vector3d( EMT.ADIR) * Len - Z_AX() * LenRef diff --git a/Common_ONE-PF.mlse b/Common_ONE-PF.mlse index 256a612..a785a63 100644 --- a/Common_ONE-PF.mlse +++ b/Common_ONE-PF.mlse @@ -477,7 +477,7 @@ function OnSpecialLink() EmtAddClimb( EMC.NEXTMCHID, EMC.NEXTMAIN, { EMC.L1, EMC.L2p, EMC.L3p, EMC.R1p, EMC.R2p, EMC.R3}, 30, 2, 2, 'FirstClimb=1;') EmtAddClimb( EMC.NEXTMCHID, EMC.NEXTMAIN, { EMC.L1, EMC.L2, EMC.L3p, EMC.R1, EMC.R2p, EMC.R3}, 30, 2, 2) if abs( EMC.R3) < 0.1 then - EmtAddClimb( EMC.NEXTMCHID, EMC.NEXTMAIN, { EMC.L1, EMC.L2, ParkCSaw0Z1, EMC.R1, EMC.R2, EMC.R3}, 30, 2, 2) + EmtAddClimb( EMC.NEXTMCHID, EMC.NEXTMAIN, { EMC.L1, EMC.L2, ParkCSaw0Z2, EMC.R1, EMC.R2, EMC.R3}, 30, 2, 2) else EmtAddClimb( EMC.NEXTMCHID, EMC.NEXTMAIN, { EMC.L1, EMC.L2, EMC.L3p, EMC.R1, EMC.R2, EMC.R3}, 30, 2, 2) end diff --git a/Essetre-PF.mlde b/Essetre-PF.mlde index 52eafc8..316225d 100644 --- a/Essetre-PF.mlde +++ b/Essetre-PF.mlde @@ -32,9 +32,9 @@ require( 'EmtGenerator') EgtEnableDebug( false) -PP_VER = '3.1f1_RC7' +PP_VER = '3.1f1_RC8' PP_NVER = '3.1.6.1' -MIN_MACH_VER = '2.5k1' +MIN_MACH_VER = '2.7a1' MACH_NAME = EgtGetCurrMachineName() @@ -938,9 +938,6 @@ function OnSetHead() -- aggiustamenti per distanza local dDist = EgtIf( EMC.DIST and abs( EMC.DIST) > 1, EMC.DIST, ChSawLen) EmtModifyExitPosition( EMC.HEAD, EMC.EXIT, Point3d( 0, 0, Head2Z - dDist)) - local vtMove = Point3d( 0, 0, Head2Z - dDist) - Point3d( EMC.EXITPOS) - local ExitId = EgtGetFirstNameInGroup( EgtGetHeadId( EMC.HEAD), 'T'..tostring( EMC.EXIT)) - EgtMove( ExitId, vtMove) -- recupero valore asse A bloccato local sVal = EgtGetMachiningParam( MCH_MP.BLOCKEDAXIS) local CSawPosA = tonumber( sVal:sub( 3) or '') @@ -983,7 +980,7 @@ function GetHeadTCSet( sHead, sTcPos) -- testa 2 su CU prossimo a testa 2 elseif sHead == 'H21' or sHead == 'H22' or sHead == 'H23' then return 'Head2_TC2' - -- testa 2 su CU prossimo a testa 1 (non esiste una condfigurazione fatta in questo modo) + -- testa 2 su CU prossimo a testa 1 (non esiste una configurazione fatta in questo modo) elseif nPos < 10 then return 'Head2_TC1' else