Piccola miglioria modella 3D

- Migliorie alla geometria macchina e suo caricamento

Common-FAST.NUM.mlpe

@@ -6,7 +6,7 @@ local INFO_STD_PP = require( 'Version')
 
 -- Variabili di modulo
 local CSP_INFO =     INFO_STD_PP.NAME..'  ver.'..INFO_STD_PP.VERSION..' by EgalWare s.r.l.'
-local MACHINE_INFO = 'PP_VER       ver.'..PP_VER
+local MACHINE_INFO = MACH_NAME..'  ver.'..PP_VER
 local TEST_USE = false
 
 ---------------------------------------------------------------------
@@ -615,6 +615,7 @@ function OnRapid()
          if not EMT.ZMAX and #EMT.AUXSTR > 0 then
             EmitZmax()
             EMT.ZMAX = true
+            bHeadFirst = false
          end
       end
 

Common-FAST.NUM_PLUS.mlpe

@@ -6,7 +6,7 @@ local INFO_STD_PP = require( 'Version')
 
 -- Variabili di modulo
 local CSP_INFO =     INFO_STD_PP.NAME..'  ver.'..INFO_STD_PP.VERSION..' by EgalWare s.r.l.'
-local MACHINE_INFO = 'PP_VER       ver.'..PP_VER
+local MACHINE_INFO = MACH_NAME..'  ver.'..PP_VER
 local TEST_USE = false
 
 ---------------------------------------------------------------------
@@ -644,6 +644,7 @@ function OnRapid()
             EmitZmax( EMT.TOOL ~= EMT.PREVTOOL)
             EMT.ZMAX = true
             EMT.PREVTOOL = EMT.TOOL
+            bHeadFirst = false
          end
       end
 

Common-FAST.TPA.mlpe

@@ -6,7 +6,7 @@ local INFO_STD_PP = require( 'Version')
 
 -- Variabili di modulo
 local CSP_INFO =     INFO_STD_PP.NAME..'  ver.'..INFO_STD_PP.VERSION..' by EgalWare s.r.l.'
-local MACHINE_INFO = 'PP_VER       ver.'..PP_VER
+local MACHINE_INFO = MACH_NAME..'  ver.'..PP_VER
 local TEST_USE = false
 
 ---------------------------------------------------------------------
@@ -636,6 +636,7 @@ function OnRapid()
       if not ( EMT.LOAD or EMT.RELOAD) then
          if not EMT.ZMAX and #EMT.AUXSTR > 0 then
             EmitZmax()
+            bHeadFirst = false
          end
       end
       -- primo posizionamento

Common-FAST.mlpe

@@ -1,4 +1,4 @@
--- Processore macchina Essetre-FAST by EgalWare s.r.l.   2024/02/23
+-- Processore macchina Essetre-FAST by EgalWare s.r.l.   2024/03/09
 
 -- Intestazioni
 require( 'EmtGenerator')
@@ -923,10 +923,14 @@ function ExecUnloading()
       EgtMove( nLayId, vtMove, GDB_RT.GLOB)
       EgtSetLevel( vMillId, GDB_LV.USER)
       -- aggiungo gli spigoli
-      local nFirstId, nCount = EgtVolZmapGetEdges( vMillId, nLayId)
-      if nFirstId then
-         for nId = nFirstId, nFirstId + nCount - 1 do
-            EgtSetColor( nId, Color3d( 96, 96, 96))
+      if EgtVolZmapSetShowEdges then
+         EgtVolZmapSetShowEdges( vMillId, true)
+      else
+         local nFirstId, nCount = EgtVolZmapGetEdges( vMillId, nLayId)
+         if nFirstId then
+            for nId = nFirstId, nFirstId + nCount - 1 do
+               EgtSetColor( nId, Color3d( 96, 96, 96))
+            end
          end
       end
       -- rilascio Vmill

Compile.bat

@@ -25,11 +25,11 @@ REM copio i sorgenti nel percorso temporaneo per i compilati
 ROBOCOPY . %fullPathSource%\bin\%machineName%\ /E /XF "Compile.bat" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt"
 
 REM copio i file compilati nel percorso temporaneo per i compilati
-\EgtProg\Dll32\luac54 -o %fullPathSource%\bin\%machineName%\Common-FAST.mlpe     		 	          Common-FAST.mlpe
-\EgtProg\Dll32\luac54 -o %fullPathSource%\bin\%machineName%\Common-FAST.mlse                        Common-FAST.mlse
-\EgtProg\Dll32\luac54 -o %fullPathSource%\bin\%machineName%\Common-FAST.NUM.mlpe                    Common-FAST.NUM.mlpe
-\EgtProg\Dll32\luac54 -o %fullPathSource%\bin\%machineName%\Common-FAST.NUM_PLUS.mlpe               Common-FAST.NUM_PLUS.mlpe
-\EgtProg\Dll32\luac54 -o %fullPathSource%\bin\%machineName%\Common-FAST.TPA.mlpe                    Common-FAST.TPA.mlpe
+\EgtProg\Dll32\luac54 -o %fullPathSource%\bin\%machineName%\Common-FAST.mlpe     		 	          -s Common-FAST.mlpe
+\EgtProg\Dll32\luac54 -o %fullPathSource%\bin\%machineName%\Common-FAST.mlse                        -s Common-FAST.mlse
+\EgtProg\Dll32\luac54 -o %fullPathSource%\bin\%machineName%\Common-FAST.NUM.mlpe                    -s Common-FAST.NUM.mlpe
+\EgtProg\Dll32\luac54 -o %fullPathSource%\bin\%machineName%\Common-FAST.NUM_PLUS.mlpe               -s Common-FAST.NUM_PLUS.mlpe
+\EgtProg\Dll32\luac54 -o %fullPathSource%\bin\%machineName%\Common-FAST.TPA.mlpe                    -s Common-FAST.TPA.mlpe
 
 REM comprimo i file compilati in uno zip pronto per essere distribuito
 tar.exe acvf %fullPathZip%\%machineName%.zip -C %fullPathSource%\bin\ %machineName%\*.*

Essetre-FASTrl.mlde

@@ -16,12 +16,17 @@
 -- 2024/02/27 ver 2.6c3 Allineamento con common ver. 2.6c4. Aggiunto parametro 'SafeXRotAxes' per rotazione motosega con pezzi alti
 --                      Parametro 'SecondSupport' gestito come intero
 -- 2024/02/29 ver 2.6c4 Allineamento con common ver. 2.6c4
+-- 2024/03/04 ver 2.6c5 Modificato log con nome macchina
+--                      Allineamento con common ver. 2.6c6
+-- 2024/03/12 ver 2.6c6 Allineamento con common ver. 2.6c7
+--                      Migliorie alla geometria macchina e suo caricamento
 
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.6c4'
+PP_VER = '2.6c6'
 MIN_MACH_VER = '2.5k1'
+MACH_NAME = 'Essetre-FASTrl'
 
 -- Carico i dati globali
 local sMachDir = EgtGetCurrMachineDir()
@@ -32,12 +37,12 @@ EgtAddToPackagePath( sMachDir .. '\\?.lua')
 local BD = require( 'BeamData')
 local INFO_STD_PP = require( 'Version')
 
--- prendo la versione kernel minima necessaria pi� nuova tra macchina e script comuni
+-- prendo la versione kernel minima necessaria piu' nuova tra macchina e script comuni
 if INFO_STD_PP.MIN_MACH_VER_PP_COMMON > MIN_MACH_VER then
    MIN_MACH_VER = INFO_STD_PP.MIN_MACH_VER_PP_COMMON
 end
 
-EgtOutLog ( '**PP_VER ver.'..PP_VER..'**'..INFO_STD_PP.NAME..'  ver.'..INFO_STD_PP.VERSION, 1)
+EgtOutLog ( '** ' .. MACH_NAME..' '..PP_VER..' ** ( '..INFO_STD_PP.NAME..': '..INFO_STD_PP.VERSION..' - MinMach: '.. MIN_MACH_VER ..') **', 1)
 
 -- Parametri macchina
 NumericalControl = 'TPA'                                      -- NUM o TPA
@@ -80,6 +85,7 @@ SpecialBH = false
 MaxUnloadLen = 0
 BeamHeightForFixRot = 9999                     -- per abilitare assegnare 500
 CoeffVM = 0.5
+NewTopC = true
 SafeXRotAxes = -150
 
 -- leggo e aggiorno con parametri da BeamData
@@ -119,14 +125,14 @@ if EgtExistsFile( sData) then
          if Machine.Offsets.YSCARICO then UnloadT = - Machine.Offsets.YSCARICO end
          if Machine.Offsets.PIVOTFRESA then MillOffs = - Machine.Offsets.PIVOTFRESA end
          if Machine.Offsets.PIVOTLAMA then SawOffs = - Machine.Offsets.PIVOTLAMA end
-         if Machine.Offsets.OFFSETBLAMA then SawBOffs= Machine.Offsets.OFFSETBLAMA end
-         if Machine.Offsets.OFFSETCLAMA then SawCOffs= Machine.Offsets.OFFSETCLAMA end
+         if Machine.Offsets.OFFSETBLAMA then SawBOffs = Machine.Offsets.OFFSETBLAMA end
+         if Machine.Offsets.OFFSETCLAMA then SawCOffs = Machine.Offsets.OFFSETCLAMA end
          if Machine.Offsets.OFFSETZ_RINV_1 then AngTr1Offs = Machine.Offsets.OFFSETZ_RINV_1 - EgtIf( NumericalControl == 'TPA', MillOffs, 0) end
          AngTr1Len = Machine.Offsets.OFFSETX_RINV_1 or AngTr1Len
          --if Machine.Offsets.OFFSETZ_RINV_2 then AngTr2Offs = Machine.Offsets.OFFSETZ_RINV_2 - EgtIf( NumericalControl == 'TPA', MillOffs, 0) end
          --AngTr2Len = Machine.Offsets.OFFSETX_RINV_2 or AngTr2Len
          TurnerOffs = Machine.Offsets.OFFSETRIB or TurnerOffs
-         if Machine.Offsets.OFFSETX then DeltaTabY = -Machine.Offsets.OFFSETX end
+         if Machine.Offsets.OFFSETX then DeltaTabY = - Machine.Offsets.OFFSETX end
          if Machine.Offsets.OFFSETZ then DeltaTabZ = Machine.Offsets.OFFSETZ + EgtIf( NumericalControl == 'TPA', MillOffs, 0) end
          if Machine.Offsets.SECSUP then SecondSupport = Machine.Offsets.SECSUP end
          if Machine.Offsets.BLOCKHAUS then SpecialBH = ( Machine.Offsets.BLOCKHAUS == 1) end
@@ -173,7 +179,7 @@ EmtAxis {
       Home = MaxZ,
       Geo = 'Z_AXIS/GEO',
       Aux = {'Z_AXIS/SOLID', 'Z_AXIS/COLLISION'}}
-EmtAxis {
+local CId = EmtAxis {
       Name = 'C',
       Parent = 'Z',
       Type = MCH_AT.ROTARY,
@@ -183,6 +189,20 @@ EmtAxis {
       Home = 0,
       Geo = 'C_AXIS/GEO',
       Aux = {'C_AXIS/SOLID', 'C_AXIS/COLLISION'}}
+if NewTopC then
+   local vtMove = Vector3d( 65,0,0)
+   local SolidArmId = EgtGetFirstNameInGroup( EgtGetFirstNameInGroup( CId, 'SOLID'), 'ARM')
+   EgtSurfTmMoveVertex( SolidArmId, 23, EgtSurfTmGetVertex( SolidArmId, 23, GDB_RT.GLOB) + vtMove, GDB_RT.GLOB)
+   EgtSurfTmMoveVertex( SolidArmId, 25, EgtSurfTmGetVertex( SolidArmId, 25, GDB_RT.GLOB) + vtMove, GDB_RT.GLOB)
+   EgtSurfTmMoveVertex( SolidArmId, 35, EgtSurfTmGetVertex( SolidArmId, 35, GDB_RT.GLOB) + vtMove, GDB_RT.GLOB)
+   EgtSurfTmMoveVertex( SolidArmId, 36, EgtSurfTmGetVertex( SolidArmId, 36, GDB_RT.GLOB) + vtMove, GDB_RT.GLOB)
+   local CollTopId = EgtGetFirstNameInGroup( EgtGetFirstNameInGroup( CId, 'COLLISION'), 'TOP')
+   EgtMove( CollTopId, vtMove, GDB_RT.GLOB)
+   EgtSetName( CollTopId, 'BOX')
+else
+   local CollTopId = EgtGetFirstNameInGroup( EgtGetFirstNameInGroup( CId, 'COLLISION'), 'TOP')
+   EgtSetName( CollTopId, 'BOX')
+end
 EmtAxis {
       Name = 'B',
       Parent = 'C',

UpdateLog.txt

@@ -1,5 +1,12 @@
            ==== Common_FAST Update Log ====
 
+Versione 2.6c7 (12/03/2024)
+- (SIM) A fine simulazione non si creano gli spigoli ma si setta solo flag per visualizzazione tramite "EgtVolZmapSetShowEdges"
+- (GEN) Corretto problema di movimento pinze assieme a discesa asse Z (Ticket #1710)
+
+Versione 2.6c6 (04/03/2024)
+- (MLDE-GEN) Aggiunta variabile 'MACH_NAME' in MLDE con nome macchina
+
 Versione 2.6c5 (29/02/2024)
 - (GEN) Aggiunto comando di wait fine M101/G101 in caso di movimento in zona sicurezza per motosega
 - (GEN) Gestione accelerazioni pinze in M115 ( solo per TPA)

Version.lua

@@ -3,7 +3,7 @@
 
 local InfoCommon_STD_PP = {
    NAME = 'Common-FAST',            -- nome script PP standard
-   VERSION = '2.6c5',                 -- versione script
+   VERSION = '2.6c7',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }