Compare commits

...

6 Commits

Author SHA1 Message Date
andrea.villa c6b492986f Corretto parametro cinematica macchina 2024-12-12 17:26:20 +01:00
andrea.villa b574dae2dd Piccola correzione in visualizzazione utensile su aggregato BH 2024-12-12 16:58:31 +01:00
andrea.villa c578e17bbb Merge branch 'NewAggregateBlockHaus' into develop 2024-12-12 14:53:47 +01:00
andrea.villa 7da8dffdae Cambio versione develop 2024-12-12 09:20:15 +01:00
andrea.villa 1bb7bb1ce2 In SetUp, la posizione 11 si chiama sempre con T11, anche se è montato aggregato BlockHaus 2024-12-12 09:19:26 +01:00
andrea.villa 06f0b344dd Merge remote-tracking branch 'origin/master' into develop 2024-12-12 08:32:58 +01:00
3 changed files with 24 additions and 23 deletions
+1 -3
View File
@@ -1685,7 +1685,7 @@ end
---------------------------------------------------------------------
function AdjustToolKinematic()
if EMT.HEAD == 'H1' or EMT.HEAD == 'H3' then
if EMT.HEAD == 'H1' or EMT.HEAD == 'H3' or EMT.HEAD == 'H7' then
return '01'
elseif EMT.HEAD == 'H2' then
return '02'
@@ -1693,8 +1693,6 @@ function AdjustToolKinematic()
return EgtIf( EMT.EXIT == 1, '11', '12')
elseif EMT.HEAD == 'H6' then
return EgtIf( EMT.EXIT == 1, '21', '22')
elseif EMT.HEAD == 'H7' then
return '31'
else
EmtSetLastError( 1211, 'Head not allowed ' .. EMT.HEAD)
end
+22 -19
View File
@@ -10,7 +10,7 @@
require( 'EmtGenerator')
EgtEnableDebug( false)
PP_VER = '2.6l2_DEV2'
PP_VER = '2.6l2_DEV5'
PP_NVER = '2.6.12.2'
MIN_MACH_VER = '2.5k1'
MACH_NAME = 'Essetre-FASTrl'
@@ -447,13 +447,27 @@ EmtTcPos {
TDir = X_AX(),
ADir = Y_AX(),
Geo = 'BASE/T10'}
EmtTcPos {
Name = 'T11',
Parent = 'Base',
Pos = Point3d( -523.8, -88.0, -877.5),
TDir = X_AX(),
ADir = Y_AX(),
Geo = 'BASE/T11'}
if AggreBlockHaus then
EmtTcPos {
Name = 'T11',
Parent = 'Base',
Pos = Point3d( -678.3, 1.963, -877.5),
TDir = -Y_AX(),
ADir = X_AX(),
Geo = 'BASE/T121',
Aux = 'BASE/T121_HS'}
else
EmtTcPos {
Name = 'T11',
Parent = 'Base',
Pos = Point3d( -523.8, -88.0, -877.5),
TDir = X_AX(),
ADir = Y_AX(),
Geo = 'BASE/T11'}
end
if not SpecialBH then
EmtTcPos {
Name = 'T101',
@@ -514,17 +528,6 @@ if SpecialBH then
Geo = 'BASE/T111S'}
end
if AggreBlockHaus then
EmtTcPos {
Name = 'T121',
Parent = 'Base',
Pos = Point3d( -678.3, 1.963, -877.5),
TDir = -Y_AX(),
ADir = X_AX(),
Geo = 'BASE/T121',
Aux = 'BASE/T121_HS'}
end
-- Aggiusto posizioni geometriche
local vtMove = Vector3d( 0, ( DeltaTabY + 913.16), ( DeltaTabZ + 830.037))
local vtMoveX = Vector3d( 0, 0, ( DeltaTabZ + 830.037))
+1 -1
View File
@@ -39,7 +39,7 @@ local PositionTable={{Pos = "Pos1", TcPos = "T1", Head = "H1", Group = "G1"},
{Pos = "Pos8", TcPos = "T8", Head = "H1", Group = "G1"},
{Pos = "Pos9", TcPos = "T9", Head = "H1", Group = "G1"},
{Pos = "Pos10", TcPos = "T10", Head = "H1", Group = "G1"},
{Pos = "Pos11", TcPos = EgtIf( bAggreBlockHaus, "T121", "T11"), Head = EgtIf( bAggreBlockHaus, "H7", "H1"), Group = "G1"},
{Pos = "Pos11", TcPos = "T11", Head = EgtIf( bAggreBlockHaus, "H7", "H1"), Group = "G1"},
{Pos = "Pos12", TcPos = "T42", Head = "H2", Group = "G1"},
{Pos = "Pos13", TcPos = "T101", Head = "H3", Group = "G2"}}
local SecSuppId = EgtGetTcPosId( 'T111')