Egalware/Common-ONE-PF
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Egalware/Common-ONE-PF:2.6c3
Branches Tags
Egalware/Common-ONE-PF:main Egalware/Common-ONE-PF:develop Egalware/Common-ONE-PF:V1OpenOnTailCut Egalware/Common-ONE-PF:Probing Egalware/Common-ONE-PF:hotfix/AdjustHomeMovement Egalware/Common-ONE-PF:hotfix/ApproachFirstMove Egalware/Common-ONE-PF:HomeNoPresel Egalware/Common-ONE-PF:AdjustClampAfterRotation Egalware/Common-ONE-PF:SpecialMoveHighPieces Egalware/Common-ONE-PF:GenPlaneOnFirstArc
Egalware/Common-ONE-PF:3.1c2 Egalware/Common-ONE-PF:3.1c1 Egalware/Common-ONE-PF:3.1b1 Egalware/Common-ONE-PF:3.1a1 Egalware/Common-ONE-PF:2.7l1 Egalware/Common-ONE-PF:2.7k3 Egalware/Common-ONE-PF:2.7k2 Egalware/Common-ONE-PF:2.7k1 Egalware/Common-ONE-PF:2.7j3 Egalware/Common-ONE-PF:2.7j2 Egalware/Common-ONE-PF:2.7j1 Egalware/Common-ONE-PF:2.7i1 Egalware/Common-ONE-PF:2.7h2 Egalware/Common-ONE-PF:2.7h1 Egalware/Common-ONE-PF:2.7g4 Egalware/Common-ONE-PF:2.7g3 Egalware/Common-ONE-PF:2.7g2 Egalware/Common-ONE-PF:2.7g1 Egalware/Common-ONE-PF:2.7f1 Egalware/Common-ONE-PF:2.7e1 Egalware/Common-ONE-PF:2.7d1 Egalware/Common-ONE-PF:2.7c3 Egalware/Common-ONE-PF:2.7c2 Egalware/Common-ONE-PF:2.7c1 Egalware/Common-ONE-PF:2.7b1 Egalware/Common-ONE-PF:2.7a2 Egalware/Common-ONE-PF:2.7a1 Egalware/Common-ONE-PF:2.6l2 Egalware/Common-ONE-PF:2.6l1 Egalware/Common-ONE-PF:2.6j3 Egalware/Common-ONE-PF:2.6j2 Egalware/Common-ONE-PF:2.6j1 Egalware/Common-ONE-PF:AutoSave_2024/10/01 Egalware/Common-ONE-PF:2.6i2 Egalware/Common-ONE-PF:2.6i1 Egalware/Common-ONE-PF:2.6h2 Egalware/Common-ONE-PF:2.6h1 Egalware/Common-ONE-PF:2.6g5 Egalware/Common-ONE-PF:2.6g4 Egalware/Common-ONE-PF:2.6g3 Egalware/Common-ONE-PF:2.6g2 Egalware/Common-ONE-PF:2.6g1 Egalware/Common-ONE-PF:2.6f1 Egalware/Common-ONE-PF:2.6e1 Egalware/Common-ONE-PF:2.6d2 Egalware/Common-ONE-PF:2.6d1 Egalware/Common-ONE-PF:2.6c9 Egalware/Common-ONE-PF:2.6c8 Egalware/Common-ONE-PF:2.6c7 Egalware/Common-ONE-PF:2.6c6 Egalware/Common-ONE-PF:2.6c5 Egalware/Common-ONE-PF:2.6c4 Egalware/Common-ONE-PF:2.6c3 Egalware/Common-ONE-PF:2.6c2 Egalware/Common-ONE-PF:2.6c1 Egalware/Common-ONE-PF:2.6b2 Egalware/Common-ONE-PF:2.6b1 Egalware/Common-ONE-PF:2.6a7 Egalware/Common-ONE-PF:2.6a6 Egalware/Common-ONE-PF:2.6a5 Egalware/Common-ONE-PF:2.6a4 Egalware/Common-ONE-PF:2.6a3 Egalware/Common-ONE-PF:2.6a2
..
compare: Egalware/Common-ONE-PF:2.6c4
Branches Tags
Egalware/Common-ONE-PF:main Egalware/Common-ONE-PF:develop Egalware/Common-ONE-PF:V1OpenOnTailCut Egalware/Common-ONE-PF:Probing Egalware/Common-ONE-PF:hotfix/AdjustHomeMovement Egalware/Common-ONE-PF:hotfix/ApproachFirstMove Egalware/Common-ONE-PF:HomeNoPresel Egalware/Common-ONE-PF:AdjustClampAfterRotation Egalware/Common-ONE-PF:SpecialMoveHighPieces Egalware/Common-ONE-PF:GenPlaneOnFirstArc
Egalware/Common-ONE-PF:3.1c2 Egalware/Common-ONE-PF:3.1c1 Egalware/Common-ONE-PF:3.1b1 Egalware/Common-ONE-PF:3.1a1 Egalware/Common-ONE-PF:2.7l1 Egalware/Common-ONE-PF:2.7k3 Egalware/Common-ONE-PF:2.7k2 Egalware/Common-ONE-PF:2.7k1 Egalware/Common-ONE-PF:2.7j3 Egalware/Common-ONE-PF:2.7j2 Egalware/Common-ONE-PF:2.7j1 Egalware/Common-ONE-PF:2.7i1 Egalware/Common-ONE-PF:2.7h2 Egalware/Common-ONE-PF:2.7h1 Egalware/Common-ONE-PF:2.7g4 Egalware/Common-ONE-PF:2.7g3 Egalware/Common-ONE-PF:2.7g2 Egalware/Common-ONE-PF:2.7g1 Egalware/Common-ONE-PF:2.7f1 Egalware/Common-ONE-PF:2.7e1 Egalware/Common-ONE-PF:2.7d1 Egalware/Common-ONE-PF:2.7c3 Egalware/Common-ONE-PF:2.7c2 Egalware/Common-ONE-PF:2.7c1 Egalware/Common-ONE-PF:2.7b1 Egalware/Common-ONE-PF:2.7a2 Egalware/Common-ONE-PF:2.7a1 Egalware/Common-ONE-PF:2.6l2 Egalware/Common-ONE-PF:2.6l1 Egalware/Common-ONE-PF:2.6j3 Egalware/Common-ONE-PF:2.6j2 Egalware/Common-ONE-PF:2.6j1 Egalware/Common-ONE-PF:AutoSave_2024/10/01 Egalware/Common-ONE-PF:2.6i2 Egalware/Common-ONE-PF:2.6i1 Egalware/Common-ONE-PF:2.6h2 Egalware/Common-ONE-PF:2.6h1 Egalware/Common-ONE-PF:2.6g5 Egalware/Common-ONE-PF:2.6g4 Egalware/Common-ONE-PF:2.6g3 Egalware/Common-ONE-PF:2.6g2 Egalware/Common-ONE-PF:2.6g1 Egalware/Common-ONE-PF:2.6f1 Egalware/Common-ONE-PF:2.6e1 Egalware/Common-ONE-PF:2.6d2 Egalware/Common-ONE-PF:2.6d1 Egalware/Common-ONE-PF:2.6c9 Egalware/Common-ONE-PF:2.6c8 Egalware/Common-ONE-PF:2.6c7 Egalware/Common-ONE-PF:2.6c6 Egalware/Common-ONE-PF:2.6c5 Egalware/Common-ONE-PF:2.6c4 Egalware/Common-ONE-PF:2.6c3 Egalware/Common-ONE-PF:2.6c2 Egalware/Common-ONE-PF:2.6c1 Egalware/Common-ONE-PF:2.6b2 Egalware/Common-ONE-PF:2.6b1 Egalware/Common-ONE-PF:2.6a7 Egalware/Common-ONE-PF:2.6a6 Egalware/Common-ONE-PF:2.6a5 Egalware/Common-ONE-PF:2.6a4 Egalware/Common-ONE-PF:2.6a3 Egalware/Common-ONE-PF:2.6a2

4 Commits
2.6c3 .. 2.6c4

Author SHA1 Message Date
andrea.villa 4383459661 Piccola correzione movimento Z-MAX lama (no aggiornamento versione) 2024-03-06 17:28:32 +01:00
andrea.villa 1f5b334bfb Merge branch 'develop' 2024-03-06 16:17:20 +01:00
andrea.villa 600dc8ff8b Modifica movimento a Z-MAX con lama. Home solo se cambia utensile 2024-03-06 10:15:00 +01:00
luca.mazzoleni 332cff04dc Merge branch 'main' into develop 2024-03-05 12:18:38 +01:00
4 changed files with 8 additions and 3 deletions
Expand all files Collapse all files
Common_ONE-PF.NUM.mlpe
+2 -1
View File
@@ -1427,7 +1427,8 @@ function OnRapid()
-- se Split o Presplit lascio agganciata solo la pinza Y2 alla fine dei movimenti
local sNextTool = GetNextTool( EMT.MCHID)
-- vado in home se è ultimo movimento ed è ultima lavorazione, se sono con motosega e devo cambiare utensile, oppure se ho la lama
local bToXhome = ( IsLastPath( EMT.PATHID) and not sNextTool) or ( EMT.HEAD == 'H23' and EMT.TOOL ~= sNextTool) or ( EMT.HEAD == 'H13' and EMT.TOOL ~= sNextTool) or EMT.HEAD == 'H12' or EMT.HEAD == 'H22'
local bToXhome = ( IsLastPath( EMT.PATHID) and not sNextTool) or ( EMT.HEAD == 'H23' and EMT.TOOL ~= sNextTool) or ( EMT.HEAD == 'H13' and EMT.TOOL ~= sNextTool) or
( EMT.HEAD == 'H12' and EMT.TOOL ~= sNextTool ) or ( EMT.HEAD == 'H22' and EMT.TOOL ~= sNextTool) or EMT.MCHSPLIT
local CurrL3o = EMT.L3o
EMT.L3o = EMT.L3op
EmitZmax( true, true, bToXhome, EMT.R1p, EMT.R2p, EMT.MCHSPLIT)
Common_ONE-PF.mlpe
+2 -1
View File
@@ -1221,7 +1221,8 @@ function OnSimulMoveEnd()
-- se Split o Presplit lascio agganciata solo la pinza Y2 alla fine dei movimenti
local sNextTool = GetNextTool( EMT.MCHID)
-- vado in home se è ultimo movimento ed è ultima lavorazione, se sono con motosega e devo cambiare utensile, oppure se ho la lama
local bToXhome = ( IsLastPath( EMT.PATHID) and not sNextTool) or ( EMT.HEAD == 'H23' and EMT.TOOL ~= sNextTool) or ( EMT.HEAD == 'H13' and EMT.TOOL ~= sNextTool) or EMT.HEAD == 'H12' or EMT.HEAD == 'H22'
local bToXhome = ( IsLastPath( EMT.PATHID) and not sNextTool) or ( EMT.HEAD == 'H23' and EMT.TOOL ~= sNextTool) or ( EMT.HEAD == 'H13' and EMT.TOOL ~= sNextTool) or
( EMT.HEAD == 'H12' and EMT.TOOL ~= sNextTool ) or ( EMT.HEAD == 'H22' and EMT.TOOL ~= sNextTool) or EMT.MCHSPLIT
-- eseguo
ExecMoveZmax( EMT.MCHSPLIT, bToXhome)
EMT.TO_ZMAX = nil
UpdateLog.txt
+3
View File
@@ -1,5 +1,8 @@
==== Essetre_StdPF Update Log ====
Versione 2.6c4 (06/03/2024)
- (SIM-GEN) Alla fine del movimento a Z-MAX, in home con lama solo se si cambia utensile. Prima andava sempre in home se era lama, anche se non doveva cambiare utensile
Versione 2.6c3 (05/03/2024)
- (MLDE-SIM) Aggiunta variabile FACOLTATIVA 'EstimationRapidMultiplier' in mlde per regolare il tempo stimato di rapido su macchine vecchie. Se non presente default 1.
Version.lua
+1 -1
View File
@@ -3,7 +3,7 @@
local InfoCommon_STD_PP = {
NAME = 'Common_ONE-PF', -- nome script PP standard
VERSION = '2.6c3', -- versione script
VERSION = '2.6c4', -- versione script
MIN_MACH_VER_PP_COMMON = '2.5k1' -- versione minima kernel
}