diff --git a/IOB-WIN/App.config b/IOB-WIN/App.config
index a81a3aea..6f4897a5 100644
--- a/IOB-WIN/App.config
+++ b/IOB-WIN/App.config
@@ -12,7 +12,7 @@
-
+
diff --git a/IOB-WIN/IobFanuc.cs b/IOB-WIN/IobFanuc.cs
index bd6b6bc0..79aa626a 100644
--- a/IOB-WIN/IobFanuc.cs
+++ b/IOB-WIN/IobFanuc.cs
@@ -382,6 +382,13 @@ namespace IOB_WIN
int memIndex = 1;
FanucMemRW(R, FANUC.MemType.G, memIndex, ref MemBlockG);
if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-G-AREA", MemBlockG.Length), DateTime.Now.Subtract(inizio).Ticks);
+ // loggo...
+ string allG = "processMode: ";
+ for (int i = 0; i < MemBlockG.Length; i++)
+ {
+ allG += string.Format("{0}:{1} | ", i, MemBlockG[i]);
+ }
+ lg.Info(allG);
// verifico modo con valore corrente, se cambia aggiorno...
CNC_MODE newMode = decodeG43(MemBlockG[43]);
if (newMode != currMode)
@@ -525,6 +532,13 @@ namespace IOB_WIN
#endif
outVal.Add("FEED_OVER", MemBlockG[30].ToString());
outVal.Add("RAPID_OVER", MemBlockG[12].ToString());
+ // loggo...
+ string allG = "getOverrides: ";
+ for (int i = 0; i < MemBlockG.Length; i++)
+ {
+ allG += string.Format("{0}:{1} | ", i, MemBlockG[i]);
+ }
+ lg.Info(allG);
return outVal;
}
diff --git a/Jenkinsfile b/Jenkinsfile
index 11c97708..46c96fb9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=182']) {
+ withEnv(['NEXT_BUILD_NUMBER=183']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.15.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.15.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'