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

Compare commits

base: Egalware/Common-FAST:2.6j2
Branches Tags
Egalware/Common-FAST:main Egalware/Common-FAST:develop Egalware/Common-FAST:Test/ChainSawHomeMove Egalware/Common-FAST:origin/VMill_Tol Egalware/Common-FAST:hotfix/NewReposClampAfterTurn Egalware/Common-FAST:hotfix/BugFixRepositioningTolerance Egalware/Common-FAST:hotfix/NewRepositioningTolerance Egalware/Common-FAST:hotfix/NewRepositioning Egalware/Common-FAST:NewClampRepos
Egalware/Common-FAST:3.1d2 Egalware/Common-FAST:3.1d1 Egalware/Common-FAST:3.1c2 Egalware/Common-FAST:3.1c1 Egalware/Common-FAST:3.1a2 Egalware/Common-FAST:3.1a1 Egalware/Common-FAST:2.7l3 Egalware/Common-FAST:2.7l2 Egalware/Common-FAST:2.7l1 Egalware/Common-FAST:2.7k1 Egalware/Common-FAST:2.7j2 Egalware/Common-FAST:2.7j1 Egalware/Common-FAST:2.7i3 Egalware/Common-FAST:2.7i2 Egalware/Common-FAST:2.7i1 Egalware/Common-FAST:2.7g1 Egalware/Common-FAST:2.7f3 Egalware/Common-FAST:2.7f2 Egalware/Common-FAST:2.7f1 Egalware/Common-FAST:2.7e1 Egalware/Common-FAST:2.7d1 Egalware/Common-FAST:2.7c1 Egalware/Common-FAST:2.7b1 Egalware/Common-FAST:2.7a3 Egalware/Common-FAST:2.7a2 Egalware/Common-FAST:2.7a1 Egalware/Common-FAST:2.6l1 Egalware/Common-FAST:2.6k1 Egalware/Common-FAST:2.6j10 Egalware/Common-FAST:2.6j9 Egalware/Common-FAST:2.6j8 Egalware/Common-FAST:2.6j7 Egalware/Common-FAST:2.6j6 Egalware/Common-FAST:2.6j5 Egalware/Common-FAST:2.6j4 Egalware/Common-FAST:2.6j3 Egalware/Common-FAST:2.6j2 Egalware/Common-FAST:2.6j1 Egalware/Common-FAST:AutoSave_2024/10/01 Egalware/Common-FAST:2.6i6 Egalware/Common-FAST:2.6i5 Egalware/Common-FAST:2.6i4 Egalware/Common-FAST:2.6i3 Egalware/Common-FAST:2.6i2 Egalware/Common-FAST:2.6i1 Egalware/Common-FAST:2.6g1 Egalware/Common-FAST:2.6e3 Egalware/Common-FAST:2.6e2 Egalware/Common-FAST:2.6e1 Egalware/Common-FAST:2.6d2 Egalware/Common-FAST:2.6c8 Egalware/Common-FAST:2.6c7 Egalware/Common-FAST:2.6c6 Egalware/Common-FAST:2.6c5 Egalware/Common-FAST:2.6c4 Egalware/Common-FAST:2.6c3
...
compare: Egalware/Common-FAST:2.6j3
Branches Tags
Egalware/Common-FAST:main Egalware/Common-FAST:develop Egalware/Common-FAST:Test/ChainSawHomeMove Egalware/Common-FAST:origin/VMill_Tol Egalware/Common-FAST:hotfix/NewReposClampAfterTurn Egalware/Common-FAST:hotfix/BugFixRepositioningTolerance Egalware/Common-FAST:hotfix/NewRepositioningTolerance Egalware/Common-FAST:hotfix/NewRepositioning Egalware/Common-FAST:NewClampRepos
Egalware/Common-FAST:3.1d2 Egalware/Common-FAST:3.1d1 Egalware/Common-FAST:3.1c2 Egalware/Common-FAST:3.1c1 Egalware/Common-FAST:3.1a2 Egalware/Common-FAST:3.1a1 Egalware/Common-FAST:2.7l3 Egalware/Common-FAST:2.7l2 Egalware/Common-FAST:2.7l1 Egalware/Common-FAST:2.7k1 Egalware/Common-FAST:2.7j2 Egalware/Common-FAST:2.7j1 Egalware/Common-FAST:2.7i3 Egalware/Common-FAST:2.7i2 Egalware/Common-FAST:2.7i1 Egalware/Common-FAST:2.7g1 Egalware/Common-FAST:2.7f3 Egalware/Common-FAST:2.7f2 Egalware/Common-FAST:2.7f1 Egalware/Common-FAST:2.7e1 Egalware/Common-FAST:2.7d1 Egalware/Common-FAST:2.7c1 Egalware/Common-FAST:2.7b1 Egalware/Common-FAST:2.7a3 Egalware/Common-FAST:2.7a2 Egalware/Common-FAST:2.7a1 Egalware/Common-FAST:2.6l1 Egalware/Common-FAST:2.6k1 Egalware/Common-FAST:2.6j10 Egalware/Common-FAST:2.6j9 Egalware/Common-FAST:2.6j8 Egalware/Common-FAST:2.6j7 Egalware/Common-FAST:2.6j6 Egalware/Common-FAST:2.6j5 Egalware/Common-FAST:2.6j4 Egalware/Common-FAST:2.6j3 Egalware/Common-FAST:2.6j2 Egalware/Common-FAST:2.6j1 Egalware/Common-FAST:AutoSave_2024/10/01 Egalware/Common-FAST:2.6i6 Egalware/Common-FAST:2.6i5 Egalware/Common-FAST:2.6i4 Egalware/Common-FAST:2.6i3 Egalware/Common-FAST:2.6i2 Egalware/Common-FAST:2.6i1 Egalware/Common-FAST:2.6g1 Egalware/Common-FAST:2.6e3 Egalware/Common-FAST:2.6e2 Egalware/Common-FAST:2.6e1 Egalware/Common-FAST:2.6d2 Egalware/Common-FAST:2.6c8 Egalware/Common-FAST:2.6c7 Egalware/Common-FAST:2.6c6 Egalware/Common-FAST:2.6c5 Egalware/Common-FAST:2.6c4 Egalware/Common-FAST:2.6c3

3 Commits
2.6j2 ... 2.6j3

Author SHA1 Message Date
andrea.villa cfc1fbc6b6 Merge remote-tracking branch 'origin/develop' 2024-10-11 14:49:49 +02:00
andrea.villa 3b91c0c603 Corretta scrittura macro start/attesa movimenti per NUM. Veniva scritto codice per TPA. 2024-10-11 14:49:30 +02:00
andrea.villa a2d0ff4d77 Merge remote-tracking branch 'origin/main' into develop 2024-10-03 10:25:40 +02:00
4 changed files with 15 additions and 12 deletions
Expand all files Collapse all files
Common_FAST.NUM.mlpe
+5 -5
View File
@@ -848,13 +848,13 @@ function OnRapid()
local sOut = 'G101' .. EmtGetAxis( 'L2') .. EmtGetAxis( 'L3') ..' B=' .. EgtNumToString( dBAxis, 3) ..
' C=' .. EgtNumToString( dCAxis, 3) .. sEE .. sEL .. sER .. sET .. sES
EmtOutput( sOut)
EmtOutput( 'M101 P1=2')
EmtOutput( 'M101 P1=3')
EmtOutput( 'G101 ET1001')
EmtOutput( 'G101 ET2001')
sOut = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. EmtGetAxis( 'L3') ..' B=' .. EgtNumToString( dBAxis, 3) ..
' C=' .. EgtNumToString( dCAxis, 3) .. sEE .. sEL .. sER .. sET .. sES
EmtOutput( sOut)
EmtOutput( 'M101 P1=2')
EmtOutput( 'M101 P1=3')
EmtOutput( 'G101 ET1001')
EmtOutput( 'G101 ET2001')
end
-- se altrimenti movimento in Home
elseif EMT.FLAG == 4 then
@@ -876,7 +876,7 @@ function OnRapid()
EmtGetAxis( 'R2') .. EmtGetAxis( 'R1') .. sEE .. sEL .. sER .. sET .. sES
EmtOutput( sOut)
EmtOutput( 'G101 ET1001')
EmtOutput( 'G101 ET2001')
EmtOutput( 'G101 ET2001')
-- altrimenti errore
else
EmtSetLastError( 1212, "Unknown Rapid flag")
Common_FAST.NUM_PLUS.mlpe
+5 -5
View File
@@ -922,14 +922,14 @@ function OnRapid()
local sOut = 'G101' .. EmtGetAxis( 'L2') .. EmtGetAxis( 'L3') ..' B=' .. EgtNumToString( dBAxis, 3) ..
' C=' .. EgtNumToString( dCAxis, 3) .. sEE .. sEL .. sER .. sET .. sES
EmtOutput( sOut)
EmtOutput( 'M101 P1=2')
EmtOutput( 'M101 P1=3')
EmtOutput( 'G101 ET1001')
EmtOutput( 'G101 ET2001')
sOut = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. EmtGetAxis( 'L3') ..' B=' .. EgtNumToString( dBAxis, 3) ..
' C=' .. EgtNumToString( dCAxis, 3) .. sEE .. sEL .. sER .. sET .. sES
EmtOutput( sOut)
EmtOutput( 'M101 P1=2')
EmtOutput( 'M101 P1=3')
end
EmtOutput( 'G101 ET1001')
EmtOutput( 'G101 ET2001')
end
-- se altrimenti movimento in Home
elseif EMT.FLAG == 4 then
-- non previsto
UpdateLog.txt
+4 -1
View File
@@ -1,7 +1,10 @@
==== Common_FAST Update Log ====
Versione 2.6j3 (11/10/2024)
- (GEN) Corretta scrittura macro start/attesa movimenti per NUM. Veniva scritto codice per TPA.
Versione 2.6j2 (03/10/2024)
- (SIM-GEN) Piccola correwzione calcolo posizione carrello durante riposizionamento, nuova gestione
- (SIM-GEN) Piccola correzione calcolo posizione carrello durante riposizionamento, nuova gestione
Versione 2.6j1 (01/10/2024)
- (SIM-GEN) Sistemato calcolo in nuova disposzione carrelli
Version.lua
+1 -1
View File
@@ -3,7 +3,7 @@
local InfoCommon_STD_PP = {
NAME = 'Common_FAST', -- nome script PP standard
VERSION = '2.6j2', -- versione script
VERSION = '2.6j3', -- versione script
MIN_MACH_VER_PP_COMMON = '2.5k1' -- versione minima kernel
}