diff --git a/Beam/BeamData.lua b/Beam/BeamData.lua index 748468c..f034778 100644 --- a/Beam/BeamData.lua +++ b/Beam/BeamData.lua @@ -167,11 +167,11 @@ end BeamData.GetBlockedAxis = GetBlockedAxis --------------------------------------------------------------------- -local function GetChainSawInitAngs( vtN, vtO) - if vtN:getY() > 0 and vtO:getX() > 0 then - return 'C=0' - else +local function GetChainSawInitAngs( vtN, vtO, nInd) + if nInd == 1 then return '' + else + return EgtIf( vtN:getY() > 0, 'C=180', 'C=-180') end end BeamData.GetChainSawInitAngs = GetChainSawInitAngs @@ -212,5 +212,32 @@ local function GetSetupInfo( sHead) end BeamData.GetSetupInfo = GetSetupInfo +--------------------------------------------------------------------- +local function GetMaxMatReductionBladeCut( sHead, vtDir) + local MaxMatReductionBladeCut = 0 + -- la lama è montata solo su H2, non si controllano altre teste + if sHead == 'H2' then + if BeamData.NEWTOPC == nil or BeamData.NEWTOPC then + MaxMatReductionBladeCut = -65 + end + if AreSameVectorApprox( vtDir, X_AX()) then + MaxMatReductionBladeCut = MaxMatReductionBladeCut + 175 + elseif AreSameVectorApprox( vtDir, -X_AX()) then + MaxMatReductionBladeCut = MaxMatReductionBladeCut + 175 + elseif AreSameVectorApprox( vtDir, Y_AX()) then + MaxMatReductionBladeCut = MaxMatReductionBladeCut + 175 + elseif AreSameVectorApprox( vtDir, -Y_AX()) then + MaxMatReductionBladeCut = MaxMatReductionBladeCut + 175 + elseif AreSameVectorApprox( vtDir, Z_AX()) then + MaxMatReductionBladeCut = 80 + elseif AreSameVectorApprox( vtDir, -Z_AX()) then + MaxMatReductionBladeCut = 80 + end + MaxMatReductionBladeCut = MaxMatReductionBladeCut + BeamData.COLL_SIC + end + return MaxMatReductionBladeCut + BeamData.COLL_SIC +end +BeamData.GetMaxMatReductionBladeCut = GetMaxMatReductionBladeCut + --------------------------------------------------------------------- return BeamData diff --git a/Essetre-FAST.mlde b/Essetre-FAST.mlde index 1e4e9a9..3906a74 100644 --- a/Essetre-FAST.mlde +++ b/Essetre-FAST.mlde @@ -68,12 +68,13 @@ -- 2024/09/23 AV ver 2.6i7 Allineamento con common ver. 2.6i3 -- 2024/09/24 AV ver 2.6i8 Allineamento con common ver. 2.6i4 -- 2024/09/24 AV ver 2.6i9 Allineamento con common ver. 2.6i5 +-- 2024/09/25 AV ver 2.6i10 Allineamento con common ver. 2.6i6 require( 'EmtGenerator') EgtEnableDebug( false) -PP_VER = '2.6i9_DEV' -PP_NVER = '2.6.9.9' +PP_VER = '2.6i10' +PP_NVER = '2.6.9.10' MIN_MACH_VER = '2.5k1' MACH_NAME = 'Essetre-FAST' diff --git a/UpdateLog.txt b/UpdateLog.txt index c167a31..95e6d14 100644 --- a/UpdateLog.txt +++ b/UpdateLog.txt @@ -1,5 +1,8 @@ ==== Common_FAST Update Log ==== +Versione 2.6i6 (25/09/2024) +- (GEN) Migliorata gestione movimenti per portare testa vicino a cambio utensile se trave alta. Ticket#2066 + Versione 2.6i5 (24/09/2024) - (SIM-GEN) Tolto controllo su lunghezza maggiore di 200mm introdotto con 2.6i2 perchè non completamente funzionante - (GEN) Gestione in OnRapid() di EMT.FLAG=5 (rotazione a Z max per lavorazione successiva). Ora allineata alla simulazione diff --git a/Version.lua b/Version.lua index 8ee9825..e629393 100644 --- a/Version.lua +++ b/Version.lua @@ -3,7 +3,7 @@ local InfoCommon_STD_PP = { NAME = 'Common_FAST', -- nome script PP standard - VERSION = '2.6i5', -- versione script + VERSION = '2.6i6', -- versione script MIN_MACH_VER_PP_COMMON = '2.5k1' -- versione minima kernel }