Compare commits
2 Commits
2.7f1_DEV6
...
2.7f1_DEV8
| Author | SHA1 | Date | |
|---|---|---|---|
| c0f489b339 | |||
| 7b35cccaf5 |
@@ -1542,11 +1542,11 @@ function OnRapid()
|
||||
if AreSameVectorApprox( vtE, Y_AX()) then
|
||||
ProbePosX = -( EMT.TABORI1[2] + EMT.HB + dSecDistProbe + dLenProbe + MillOffs)
|
||||
ProbePosZ = EMT.TABORI1[3] - MillOffs + ( EMT.SB / 2) + EgtIf( EMT.R2 > 0, dOffHeadProbe, -dOffHeadProbe)
|
||||
sFace = 2
|
||||
sFace = EgtIf( BD.RIGHT_LOAD, 4, 2)
|
||||
elseif AreSameVectorApprox( vtE, -Y_AX()) then
|
||||
ProbePosX = -( EMT.TABORI1[2] - dSecDistProbe - dLenProbe - MillOffs)
|
||||
ProbePosZ = EMT.TABORI1[3] - MillOffs + ( EMT.SB / 2) + EgtIf( EMT.R2 > 0, dOffHeadProbe, -dOffHeadProbe)
|
||||
sFace = 4
|
||||
sFace = EgtIf( BD.RIGHT_LOAD, 2, 4)
|
||||
elseif AreSameVectorApprox( vtE, Z_AX()) then
|
||||
ProbePosX = -( EMT.TABORI1[2] + ( EMT.HB / 2) + dOffHeadProbe)
|
||||
ProbePosZ = EMT.TABORI1[3] + EMT.SB + dSecDistProbe + dLenProbe
|
||||
@@ -1566,7 +1566,7 @@ function OnRapid()
|
||||
elseif AreSameVectorApprox( vtE, Z_AX()) then
|
||||
ProbePosX = EMT.L2
|
||||
end
|
||||
EmitMoveDataHead( GetHeadSet( EMT.HEAD), { X=ProbePosX, Z=ProbePosZ, B=EMT.R2, C=EMT.R1})
|
||||
EmitMoveDataHead( GetHeadSet( EMT.HEAD), { X=ProbePosX, Z=ProbePosZ, B=EMT.R2, C=EMT.R1, S=Speed})
|
||||
EmitMoveStartHead( GetHeadSet( EMT.HEAD))
|
||||
EmitMoveWaitHead( GetHeadSet( EMT.HEAD))
|
||||
end
|
||||
|
||||
+1
-1
@@ -44,7 +44,7 @@
|
||||
require( 'EmtGenerator')
|
||||
EgtEnableDebug( false)
|
||||
|
||||
PP_VER = '2.7f1_DEV6'
|
||||
PP_VER = '2.7f1_DEV8'
|
||||
PP_NVER = '2.7.6.1'
|
||||
MIN_MACH_VER = '2.5k1'
|
||||
MACH_NAME = string.match( EgtGetCurrMachineDir(), "[^\\]+$") -- si ricava il nome della macchina dal direttorio
|
||||
|
||||
Reference in New Issue
Block a user