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.6a6
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.6a7
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

3 Commits
2.6a6 ... 2.6a7

Author SHA1 Message Date
andrea.villa 8fb7138855 Merge branch 'develop' 2024-02-12 11:49:10 +01:00
andrea.villa f7fa43e849 Per movimento con motosega, si ribadiscono tutti gli assi nella prima G141 2024-02-12 11:48:59 +01:00
andrea.villa 728dfa48c6 Merge branch 'main' into develop 2024-02-07 08:15:49 +01:00
3 changed files with 13 additions and 1 deletions
Expand all files Collapse all files
Common_ONE-PF.NUM.mlpe
+9
View File
@@ -2498,6 +2498,9 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
EmitMoveWaitHead( 1)
-- altrimenti sega a catena
else
-- ribadisco movimento perchè in G141 si aspetta sempre tutti i valori
local MovH = { X = -EMT.L2o, Z = EMT.L3o, B = PrevR2, C = PrevR1}
EmitMoveDataHead( 1, MovH)
EmitMoveDataHead( 1, { Z=dSafeZ1, B=dSafeB1})
if EMT.SB > 650 and abs( EMT.R3) < 0.1 then
EmitMoveDataHead( 1, { Z=ParkCSawZ1, B=ParkB1})
@@ -2536,6 +2539,9 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
EmitMoveWaitHead( 1)
-- altrimenti sega a catena
else
-- ribadisco movimento perchè in G141 si aspetta sempre tutti i valori
local MovH = { X = -EMT.L2o, Z = EMT.L3o, B = PrevR2, C = PrevR1}
EmitMoveDataHead( 1, MovH)
EmitMoveDataHead( 1, { Z=dSafeZ1, B=dSafeB1})
if EMT.SB > 650 and abs( EMT.R3) < 0.1 then
EmitMoveDataHead( 1, { Z=ParkCSawZ1, B=ParkB1})
@@ -2586,6 +2592,9 @@ function EmitZmax( bReset, bEnd, bXhome, PrevR1, PrevR2, bSplitCut, bUsePrevDelt
EmitMoveWaitHead( 2)
-- altrimenti sega a catena
else
-- ribadisco movimento perchè in G141 si aspetta sempre tutti i valori
local MovH = { X = -EMT.L2o, Z = EMT.L3o, B = PrevR2, C = PrevR1}
EmitMoveDataHead( 1, MovH)
EmitMoveDataHead( 1, { Z=dSafeZ2, B=dSafeB2})
if EMT.SB > 650 and abs( EMT.R3) < 0.1 then
EmitMoveDataHead( 1, { Z=ParkCSawZ2, B=ParkB2})
UpdateLog.txt
+3
View File
@@ -31,3 +31,6 @@ versione 2.6a6 (02/02/2024)
- (SIM) Se lavorazione è un taglio di separazione, se necessario, ripristino posizione di Y1DELTA prima di aprire i rulli
- (SIM-GEN) Modificata gestione movimenti motosega, in aggiunta con caso particolare di pezzo alto più di 650mm
- (ALL) Caricamento BeamData come local
versione 2.6a7 (12/02/2024)
- (GEN) Per movimento con motosega, si ribadiscono tutti gli assi nella prima G141
Version.lua
+1 -1
View File
@@ -3,7 +3,7 @@
local InfoCommon_STD_PP = {
NAME = 'Common_ONE-PF', -- nome script PP standard
VERSION = '2.6a6', -- versione script
VERSION = '2.6a7', -- versione script
MIN_MACH_VER_PP_COMMON = '2.5k1' -- versione minima kernel
}