diff --git a/Common-FAST.mlpe b/Common-FAST.mlpe index 5709f9c..cafaef1 100644 --- a/Common-FAST.mlpe +++ b/Common-FAST.mlpe @@ -503,7 +503,7 @@ function OnSimulToolSelect( dPosA) -- imposto il valore di A EgtSetAxisPos( 'A', dPosA) if abs( dPosA) < 0.1 then - EgtSetAxisPos( 'C', 0) + EgtSetAxisPos( 'C', EgtIf( BD.RIGHT_LOAD, 180, 0)) end EgtSetAxisPos( 'B', 0) end @@ -540,9 +540,9 @@ function OnSimulToolDeselect() if EMT.HEAD == 'H3' then local dPosA = EgtGetAxisPos( 'A') if abs( dPosA) < 0.1 then - SimulMoveAxes( 'B', 0, CollSimRotStep, 'C', EgtIf( RIGHT_LOAD, 180, 0), CollSimRotStep) + SimulMoveAxes( 'B', 0, CollSimRotStep, 'C', EgtIf( BD.RIGHT_LOAD, 180, 0), CollSimRotStep) else - SimulMoveAxes( 'B', 0, CollSimRotStep, 'C', EgtIf( RIGHT_LOAD, 90, -90), CollSimRotStep) + SimulMoveAxes( 'B', 0, CollSimRotStep, 'C', EgtIf( BD.RIGHT_LOAD, 90, -90), CollSimRotStep) end SimulMoveAxis( 'X', 0, RapSimStep) -- movimento scarico rinvio @@ -564,7 +564,7 @@ function OnSimulToolDeselect() else local dPosB = EgtGetAxisPos( 'B') local dNewB = EgtIf( dPosB < 0, -90, 90) - SimulMoveAxes( 'B', dNewB, CollSimRotStep, 'C', EgtIf( RIGHT_LOAD, 180, 0), CollSimRotStep) + SimulMoveAxes( 'B', dNewB, CollSimRotStep, 'C', EgtIf( BD.RIGHT_LOAD, 180, 0), CollSimRotStep) SimulMoveAxis( 'X', 0, RapSimStep) end -- breve pausa @@ -574,9 +574,9 @@ function OnSimulToolDeselect() ShowToolInTcPos( EMT.TCPOS_1, true) -- movimento per carico utensile if EMT.NEXTHEAD ~= 'H3' and EMT.NEXTHEAD ~= 'H5' then - SimulMoveAxes( 'B', 90, RapSimRotStep, 'C', EgtIf( RIGHT_LOAD, 90, -90), RapSimRotStep) + SimulMoveAxes( 'B', 90, RapSimRotStep, 'C', EgtIf( BD.RIGHT_LOAD, 90, -90), RapSimRotStep) else - SimulMoveAxes( 'B', 0, RapSimRotStep, 'C', EgtIf( RIGHT_LOAD, 90, -90), RapSimRotStep) + SimulMoveAxes( 'B', 0, RapSimRotStep, 'C', EgtIf( BD.RIGHT_LOAD, 90, -90), RapSimRotStep) end -- se segue lama, carico utensile di default if EMT.NEXTHEAD == 'H2' then @@ -596,7 +596,7 @@ function OnSimulToolDeselect() local RapSimRotStep = RapSimStep / 10 local CollSimRotStep = min( RapSimRotStep, 10) -- simulo movimento - SimulMoveAxes( 'B', 90, CollSimRotStep, 'C', EgtIf( RIGHT_LOAD, 90, -90), CollSimRotStep) + SimulMoveAxes( 'B', 90, CollSimRotStep, 'C', EgtIf( BD.RIGHT_LOAD, 90, -90), CollSimRotStep) SimulMoveAxis( 'X', 0, RapSimStep) -- breve pausa EgtPause( 100) @@ -608,7 +608,7 @@ function OnSimulToolDeselect() EgtSetStatus( EgtGetHeadId( EMT.HEAD), GDB_ST.OFF) end -- eseguo movimento opportuno - SimulMoveAxes( 'B', 0, RapSimRotStep, 'C', EgtIf( RIGHT_LOAD, 90, -90), RapSimRotStep) + SimulMoveAxes( 'B', 0, RapSimRotStep, 'C', EgtIf( BD.RIGHT_LOAD, 90, -90), RapSimRotStep) -- se altrimenti lama su cambio utensile elseif EMT.NEXTHEAD == 'H1' and SpecialBH and EMT.NEXTTCPOS == 'T111' then -- se non lama, nascondo l'utensile corrente @@ -903,14 +903,14 @@ function ExecUnloading() -- li sposto per lasciare spazio al nuovo pezzo local nId = EgtGetFirstInGroup( nVmGrpId) while nId do - EgtMove( nId, Vector3d( 0, EgtIf( RIGHT_LOAD, ( EMT.SB + 50.0), -( EMT.SB + 50.0)), 0), GDB_RT.GLOB) + EgtMove( nId, Vector3d( 0, EgtIf( BD.RIGHT_LOAD, ( EMT.SB + 50.0), -( EMT.SB + 50.0)), 0), GDB_RT.GLOB) nId = EgtGetNext( nId) end -- creo un nuovo layer e vi inserisco il nuovo pezzo local nLayId = EgtGroup( nVmGrpId, EgtGetGlobFrame( vMillId)) EgtRelocate( vMillId, nLayId) - local vtMove = Vector3d( 0, EgtIf( RIGHT_LOAD, 450, -450), 0) - if EMT.FALL then vtMove = Vector3d( -500, 0, EgtIf( RIGHT_LOAD, 750, -750)) end + local vtMove = Vector3d( 0, EgtIf( BD.RIGHT_LOAD, 450, -450), 0) + if EMT.FALL then vtMove = Vector3d( -500, 0, EgtIf( BD.RIGHT_LOAD, 750, -750)) end EgtMove( nLayId, vtMove, GDB_RT.GLOB) EgtSetLevel( vMillId, GDB_LV.USER) -- aggiungo gli spigoli diff --git a/Essetre-FAST.mlde b/Essetre-FAST.mlde index 64fdf24..7328ed3 100644 --- a/Essetre-FAST.mlde +++ b/Essetre-FAST.mlde @@ -38,11 +38,13 @@ -- Allineamento con common ver. 2.6c1 -- 2024/02/23 AV ver 2.6c2 Rimossa chiamata funzione EgtGetSourceDir -- Allineamento con common ver. 2.6c2 +-- 2024/02/23 AV ver 2.6c3 Allineamento con common ver. 2.6c3 + require( 'EmtGenerator') EgtEnableDebug( false) -PP_VER = '2.6c2' +PP_VER = '2.6c3' MIN_MACH_VER = '2.5k1' diff --git a/UpdateLog.txt b/UpdateLog.txt index 3249b3c..ddd7108 100644 --- a/UpdateLog.txt +++ b/UpdateLog.txt @@ -8,4 +8,8 @@ Versione 2.6c1 (23/02/2024) - (ALL) Aggiornamento 'Compile.bat' con nuovi nomi file Versione 2.6c2 (23/02/2024) -- (ALL) Rimossa chiamata funzione EgtGetSourceDir \ No newline at end of file +- (ALL) Rimossa chiamata funzione EgtGetSourceDir + +Versione 2.6c3 (23/02/2024) +- (SIM) Corretta lettura parametro RIGHT_LOAD +- (ALL) Rimossa chiamata funzione EgtGetSourceDir rimasta in MLPE \ No newline at end of file diff --git a/Version.lua b/Version.lua index 7782daf..e4bca02 100644 --- a/Version.lua +++ b/Version.lua @@ -3,7 +3,7 @@ local InfoCommon_STD_PP = { NAME = 'Common-FAST', -- nome script PP standard - VERSION = '2.6c1', -- versione script + VERSION = '2.6c3', -- versione script MIN_MACH_VER_PP_COMMON = '2.5k1' -- versione minima kernel }