Merge remote-tracking branch 'origin/develop'

This commit is contained in:
andrea.villa
2026-04-10 09:40:52 +02:00
2 changed files with 5 additions and 3 deletions
+3 -1
View File
@@ -4,7 +4,7 @@
require( 'EmtGenerator')
EgtEnableDebug( false)
PP_VER = '3.1d1'
PP_VER = '3.1d2'
PP_NVER = '2.6.11.1'
-- Parametri macchina
@@ -50,6 +50,7 @@ DeltaTabX = 1019.6
DeltaTabY = -1294.3 - DimTabY
DeltaTabZ = -1090.0
CoeffVM = 0.75
ParkYScrapRemove = nil
-- Aggiornamento con dati da TechnoEssetre7
local sTs3Data = EgtGetStringFromIni( 'Wall', 'DATA_DIR', "C:\\TechnoEssetre7\\EgtData", EgtGetIniFile()).."\\Essetre-90480023_MW.data"
@@ -98,6 +99,7 @@ if EgtExistsFile( sData) then
if MchOffs.ZERO_Y_MILL and MchOffs.ZERO_Y_DRILL then DrillDeltaX = - ( MchOffs.ZERO_Y_MILL - MchOffs.ZERO_Y_DRILL) end
if MchOffs.ZERO_X_MILL and MchOffs.ZERO_X_DRILL then DrillDeltaY = ( MchOffs.ZERO_X_MILL - MchOffs.ZERO_X_DRILL) end
if MchOffs.ZERO_Z_MILL and MchOffs.ZERO_Z_DRILL then DrillDeltaZ = ( MchOffs.ZERO_Z_MILL - MchOffs.ZERO_Z_DRILL) end
if MchOffs.PARK_Y_SCRAP_REMOVE then ParkYScrapRemove = MchOffs.PARK_Y_SCRAP_REMOVE end
end
end
+2 -2
View File
@@ -251,7 +251,7 @@ function OnRapid()
if EMT.SCRAPFIRST then
EMT.SCRAPFIRST = false
local b3Raw = EgtGetRawPartBBox( EMT.RAWID)
local ParkY = min( -( b3Raw:getMin():getX() - 2000), -MinY)
local ParkY = ParkYScrapRemove or min( -( b3Raw:getMin():getX() - 2000), -MinY)
EmtOutput( 'G104 Y' .. EmtLenToString( ParkY, 3) .. ' ET1' .. GetEF())
end
-- pre-posizionamento
@@ -274,7 +274,7 @@ function OnRapid()
EMT.SCRAPFIRST = false
-- pausa per rimozione sfridi
local b3Raw = EgtGetRawPartBBox( EMT.RAWID)
local ParkY = min( -( b3Raw:getMin():getX() - 2000), -MinY)
local ParkY = ParkYScrapRemove or min( -( b3Raw:getMin():getX() - 2000), -MinY)
EmtOutput( 'G104 Y' .. EmtLenToString( ParkY, 3) .. ' ET1' .. GetEF())
end
end