Compare commits

..
3 Commits
Author SHA1 Message Date
luca.mazzoleni 2add45fe3a Merge branch 'develop' 2024-02-09 14:54:57 +01:00
luca.mazzoleni caab876f4e 2.6b1
- Corretto errore in definizione testa H22
- In BeamData migliorata funzione GetBlockedAxis
2024-02-09 14:54:35 +01:00
luca.mazzoleni 1113c02971 Merge remote-tracking branch 'origin/main' into develop 2024-01-30 12:32:07 +01:00
2 changed files with 11 additions and 4 deletions
+7 -2
View File
@@ -202,8 +202,13 @@ 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
BeamData.GetBlockedAxis = GetBlockedAxis
+4 -2
View File
@@ -17,6 +17,8 @@
-- Allineamento con Common-PF1250 v.2.6a3
-- In BeamData aggiunta la funzione GetBlockedAxis che sostituisce le altre (GetChainSawBlockedAxis e GetSawBlockedAxis)
-- 2024/01/25 ver 2.6a4 Allineamento con Common 2.6a4
-- 2024/02/09 ver 2.6b1 Corretto errore in definizione testa H22
-- In BeamData migliorata funzione GetBlockedAxis
-- Intestazioni
require( 'EmtGenerator')
@@ -479,8 +481,8 @@ if TcAggreBladeUnder then
Rot2Stroke = { MinB2b, MaxB2b},
OthColl = {'B2/SOLID', 'C2/SOLID'},
Geo = 'H22_HEAD/GEO'}
EgtSetInfo( H21Id, 'ABOVE', '0')
EgtSetInfo( H21Id, 'ZHOMEDOWN', '1')
EgtSetInfo( H22Id, 'ABOVE', '0')
EgtSetInfo( H22Id, 'ZHOMEDOWN', '1')
end
-- *** Carrelli ***
-- Morse