Compare commits

...

3 Commits

Author SHA1 Message Date
luca.mazzoleni e255118351 Merge branch 'develop' 2024-02-09 17:47:11 +01:00
luca.mazzoleni 9673b21d05 In BeamData aggiunta funzione GetBlockedAxis che sostituisce la GetChainSawBlockedAxis. 2024-02-09 17:47:00 +01:00
luca.mazzoleni 20274fcfcd Merge branch 'master' into develop 2024-02-07 15:09:05 +01:00
2 changed files with 8 additions and 2 deletions
+6 -1
View File
@@ -194,7 +194,12 @@ local function GetBlockedAxis( sHead, nToolType, sBlockedAxis)
return ''
end
-- fresa
elseif nToolType == MCH_TY.MILL_STD or nToolType == MCH_TY.MILL_NOTIP or nToolType == MCH_TY.MILL_POLISHING then
elseif nToolType == MCH_TY.MILL_STD or nToolType == MCH_TY.MILL_NOTIP then
return ''
-- punta
elseif nToolType == MCH_TY.DRILL_STD or nToolType == MCH_TY.DRILL_LONG then
return ''
else
return ''
end
end
+2 -1
View File
@@ -43,13 +43,14 @@
-- 2024/01/25 ver 2.6a3 Allineamento con common ver. 2.6a4
-- 2024/02/07 ver 2.6b1 Allineamento con common ver. 2.6b1
-- 2024/02/07 ver 2.6b2 Gestione motosega lunga in MLDE e nuova funzione calcolo asse A per nuovi script
-- 2024/02/09 ver 2.6b3 In BeamData aggiunta funzione GetBlockedAxis che sostituisce la GetChainSawBlockedAxis.
-- Intestazioni
require( 'EmtGenerator')
EgtEnableDebug( false)
PP_VER = '2.6b2'
PP_VER = '2.6b3'
MIN_MACH_VER = '2.5k1'
local sBaseDir = EgtGetSourceDir()