diff --git a/Common_ONE-PF.NUM.mlpe b/Common_ONE-PF.NUM.mlpe index 47ad680..c8f15a7 100644 --- a/Common_ONE-PF.NUM.mlpe +++ b/Common_ONE-PF.NUM.mlpe @@ -848,7 +848,7 @@ function OnRapid() local dTRad, dTLen = GetToolRadLen() -- se fresa o lama if not HeadIsChainSaw( EMT.HEAD) then - EmitMoveDataHead( 1, { X=ParkX1, Z=MyMaxZ1, B=ParkB1, C=ParkC1, TRad=dTRad, TLen=dTLen, S=Speed}) + EmitMoveDataHead( 1, { X=-ParkX1, Z=MyMaxZ1, B=ParkB1, C=ParkC1, TRad=dTRad, TLen=dTLen, S=Speed}) EmitMoveStartHead( 1) EmitMoveWaitHead( 1) EmitMoveWaitChars( EgtIf( bOnlyCharY, 1, 3)) @@ -864,13 +864,13 @@ function OnRapid() end local dXref = EMT.L2 - if EMT.HEAD == 'H12' and EMT.L2 < -LimX1RotSaw then - dXref = -LimX1RotSaw + if EMT.HEAD == 'H12' and EMT.L2 < -LimX1PlRotSaw then + dXref = -LimX1PlRotSaw EmitMoveDataHead( 1, { X=dXref, Z=MyMaxZ1, B=ParkB1, C=ParkC1, S=Speed}) elseif not bMoveZbeforeX then EmitMoveDataHead( 1, { X=dXref, Z=MyMaxZ1, B=ParkB1, C=ParkC1, S=Speed}) else - EmitMoveDataHead( 1, { X=ParkX1, Z=MyMaxZ1, B=HomeB1, C=HomeC1, S=Speed}) + EmitMoveDataHead( 1, { X=-ParkX1, Z=MyMaxZ1, B=ParkB1, C=ParkC1, S=Speed}) end -- caso speciale per trave alta con rotazione lama pericolosa (tolto "and EMT.SB > 379") @@ -935,7 +935,7 @@ function OnRapid() local dTRad, dTLen = GetToolRadLen() -- se fresa o lama if not HeadIsChainSaw( EMT.HEAD) then - EmitMoveDataHead( 1, { X=ParkX2, Z=MyMaxZ1, B=HomeB1, C=HomeC1, TRad=dTRad, TLen=dTLen, S=Speed}) + EmitMoveDataHead( 1, { X=-ParkX2, Z=MyMaxZ1, B=HomeB1, C=HomeC1, TRad=dTRad, TLen=dTLen, S=Speed}) EmitMoveStartHead( 1) EmitMoveWaitHead( 1) EmitMoveWaitChars( EgtIf( bOnlyCharY, 1, 3)) @@ -952,7 +952,7 @@ function OnRapid() if not bMoveZbeforeX then EmitMoveDataHead( 1, { X=EMT.L2, Z=MyMaxZ1, B=HomeB1, C=HomeC1, S=Speed}) else - EmitMoveDataHead( 1, { X=ParkX2, Z=MyMaxZ1, B=HomeB1, C=HomeC1, S=Speed}) + EmitMoveDataHead( 1, { X=-ParkX2, Z=MyMaxZ1, B=HomeB1, C=HomeC1, S=Speed}) end -- caso speciale per trave alta con rotazione lama pericolosa (tolto "and EMT.SB > 379") if EMT.HEAD == 'H12' and abs( PrevR1 - EMT.R1) > 1 and ( abs( HomeC1 - EMT.R1) > 30.1 or abs( HomeB1 - EMT.R2) > 30.1) then @@ -1003,7 +1003,7 @@ function OnRapid() local dTRad, dTLen = GetToolRadLen() -- se fresa o lama if not HeadIsChainSaw( EMT.HEAD) then - EmitMoveDataHead( 2, { X=ParkX2, Z=MyMaxZ2, B=HomeB2, C=HomeC2, TRad=dTRad, TLen=dTLen, S=Speed}) + EmitMoveDataHead( 2, { X=-ParkX2, Z=MyMaxZ2, B=HomeB2, C=HomeC2, TRad=dTRad, TLen=dTLen, S=Speed}) EmitMoveStartHead( 2) EmitMoveWaitHead( 2) EmitMoveWaitChars( EgtIf( bOnlyCharY, 1, 3)) @@ -1020,7 +1020,7 @@ function OnRapid() if not bMoveZbeforeX then EmitMoveDataHead( 2, { X=EMT.L2, Z=MyMaxZ2, B=HomeB2, C=HomeC2, S=Speed}) else - EmitMoveDataHead( 2, { X=ParkX2, Z=MyMaxZ2, B=HomeB2, C=HomeC2, S=Speed}) + EmitMoveDataHead( 2, { X=-ParkX2, Z=MyMaxZ2, B=HomeB2, C=HomeC2, S=Speed}) end -- caso speciale per trave alta con rotazione lama pericolosa (tolto "and EMT.SB > 379") @@ -1230,8 +1230,8 @@ function OnRapid() end local dXref = EMT.L2 - if EMT.HEAD == 'H12' and EMT.L2 < -LimX1RotSaw then - dXref = -LimX1RotSaw + if EMT.HEAD == 'H12' and EMT.L2 < -LimX1PlRotSaw then + dXref = -LimX1PlRotSaw EmitMoveDataHead( 1, { X=dXref, Z=CurrZ1, B=CurrB1, C=CurrC1, TRad=dTRad, TLen=dTLen, S=Speed}) elseif not bMoveZbeforeX then EmitMoveDataHead( 1, { X=dXref, Z=CurrZ1, B=CurrB1, C=CurrC1, TRad=dTRad, TLen=dTLen, S=Speed}) @@ -2919,10 +2919,14 @@ function EmitParkRoller( dPosT, bSplitCut, bUsePrevDelta) if bSplitCut then if DiffY1 > 0.1 then MDChar.Y1 = dPosY1 + DiffY1 + else + MDChar.Y1 = dPosY1 end if DiffY2 < -0.1 then MDChar.Y2 = dPosY2 + DiffY2 dPosT = dPosT + DiffY2 + else + MDChar.Y2 = dPosY2 end elseif DiffY1 > 0.1 and DiffY2 < -0.1 then EmtSetLastError( 1201, 'Error Collision in ParkRoller')