diff --git a/MachNotes.ini b/MachNotes.ini index 8b2d740..3cbd961 100644 --- a/MachNotes.ini +++ b/MachNotes.ini @@ -16,13 +16,13 @@ [Pocketing] 0=l,MaxElev,0 -1=b,Open,0 -2=d,OpenMinSafe,0 +1=l,Open,0 +2=l,OpenMinSafe,0 3=d,OpenOutRaw,0 4=l,MaxOptSize,0 [Mortising] -0=d,MaxElev,0 +0=l,MaxElev,0 [Chiseling] diff --git a/Saomad-KAIROS.mlde b/Saomad-KAIROS.mlde index 15bfd70..133c0f3 100644 --- a/Saomad-KAIROS.mlde +++ b/Saomad-KAIROS.mlde @@ -9,7 +9,7 @@ require( 'EmtGenerator') EgtEnableDebug( false) -PP_VER = '2.7e2' +PP_VER = '2.7e3' MIN_MACH_VER = '2.5j1' EgtOutLog ( '** Saomad-KAIROS '..PP_VER..' (MinMach '.. MIN_MACH_VER ..') **', 1) @@ -27,6 +27,8 @@ ParkZ = 900 FmaxZ = 45000 MinA = -120 MaxA = 120 +MinSawA = -101 +MaxSawA = 101 ParkA = 0 FmaxA = 10440 MinC = -240 @@ -422,7 +424,7 @@ function OnSetHead() EmtModifyAxisHome( 'C', ParkC) -- se lama if EMC.TCPOS == 'T201' then - EmtModifyAxisStroke( 'A', { -100, 100}) + EmtModifyAxisStroke( 'A', { MinSawA, MaxSawA}) -- altrimenti else EmtModifyAxisStroke( 'A', { MinA, MaxA}) diff --git a/Saomad-KAIROS.mlpe b/Saomad-KAIROS.mlpe index 7abd93e..f337581 100644 --- a/Saomad-KAIROS.mlpe +++ b/Saomad-KAIROS.mlpe @@ -156,20 +156,26 @@ function OnSimulDispositionStart() end end -- determino la risoluzione dello Zmap - local dArea = b3Raw:getDimX() * b3Raw:getDimY() + b3Raw:getDimX() * b3Raw:getDimZ() + b3Raw:getDimY() * b3Raw:getDimZ() - local dTol = 4.71 - if dArea < CoeffVM * 0.15e6 then - dTol = 0.71 - elseif dArea < CoeffVM * 0.3e6 then - dTol = 1.01 - elseif dArea < CoeffVM * 0.6e6 then - dTol = 1.51 - elseif dArea < CoeffVM * 1.2e6 then - dTol = 1.97 - elseif dArea < CoeffVM * 2.4e6 then - dTol = 2.81 - elseif dArea < CoeffVM * 4.8e6 then - dTol = 3.77 + local dTol + if EmtGetVMillStep then + dTol = EmtGetVMillStep( b3Raw:getDimX(), b3Raw:getDimY(), b3Raw:getDimZ(), 4.71) + else + local dArea = b3Raw:getDimX() * b3Raw:getDimY() + b3Raw:getDimX() * b3Raw:getDimZ() + b3Raw:getDimY() * b3Raw:getDimZ() + if dArea < CoeffVM * 0.15e6 then + dTol = 0.71 + elseif dArea < CoeffVM * 0.3e6 then + dTol = 1.01 + elseif dArea < CoeffVM * 0.6e6 then + dTol = 1.51 + elseif dArea < CoeffVM * 1.2e6 then + dTol = 1.97 + elseif dArea < CoeffVM * 2.4e6 then + dTol = 2.81 + elseif dArea < CoeffVM * 4.8e6 then + dTol = 3.77 + else + dTol = 4.71 + end end -- creo lo Zmap local VMillId = EgtVolZmapBox( nPartRawId, b3Raw:getMin(), b3Raw:getDimX(), b3Raw:getDimY(), b3Raw:getDimZ(), dTol, true, GDB_RT.GLOB) diff --git a/THolders/MillNoTip.nge b/THolders/MillNoTip.nge index 414ea8e..5307a8c 100644 Binary files a/THolders/MillNoTip.nge and b/THolders/MillNoTip.nge differ