diff --git a/IOB-WIN/App.config b/IOB-WIN/App.config
index 842c468c..caf095a0 100644
--- a/IOB-WIN/App.config
+++ b/IOB-WIN/App.config
@@ -58,6 +58,7 @@
+
diff --git a/IOB-WIN/IobFanuc.cs b/IOB-WIN/IobFanuc.cs
index ac303e49..9ca355a1 100644
--- a/IOB-WIN/IobFanuc.cs
+++ b/IOB-WIN/IobFanuc.cs
@@ -509,7 +509,7 @@ namespace IOB_WIN
if (utils.CRB("MemAreaReadAll"))
{
FanucMemRW(R, FANUC.MemType.G, memIndex, ref MemBlockG);
- if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-G-AREA", MemBlockG.Length), (long)stopwatch.Elapsed.TotalMilliseconds);
+ if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-G-AREA", MemBlockG.Length), stopwatch.ElapsedTicks);
//if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-G-AREA", MemBlockG.Length), DateTime.Now.Subtract(inizio).Ticks);
}
else
@@ -522,21 +522,21 @@ namespace IOB_WIN
FanucMemRW(R, FANUC.MemType.G, memIndex, ref MemBlock);
// riporto!
Buffer.BlockCopy(MemBlock, memIndex, MemBlockG, memIndex, 1);
- if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-G-AREA", MemBlock.Length), (long)stopwatch.Elapsed.TotalMilliseconds);
+ if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-G-AREA", MemBlock.Length), stopwatch.ElapsedTicks);
memIndex = 24;
stopwatch.Restart();
FanucMemRW(R, FANUC.MemType.G, memIndex, ref MemBlock);
// riporto!
Buffer.BlockCopy(MemBlock, memIndex, MemBlockG, memIndex, 1);
- if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-G-AREA", MemBlock.Length), (long)stopwatch.Elapsed.TotalMilliseconds);
+ if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-G-AREA", MemBlock.Length), stopwatch.ElapsedTicks);
memIndex = 40;
stopwatch.Restart();
FanucMemRW(R, FANUC.MemType.G, memIndex, ref MemBlock);
// riporto!
Buffer.BlockCopy(MemBlock, memIndex, MemBlockG, memIndex, 1);
- if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-G-AREA", MemBlock.Length), (long)stopwatch.Elapsed.TotalMilliseconds);
+ if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-G-AREA", MemBlock.Length), stopwatch.ElapsedTicks);
//if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-G-AREA", MemBlock.Length), DateTime.Now.Subtract(inizio).Ticks);
}
stopwatch.Stop();
diff --git a/IOB-WIN/MainForm.cs b/IOB-WIN/MainForm.cs
index 9b4b10fa..044cbe34 100644
--- a/IOB-WIN/MainForm.cs
+++ b/IOB-WIN/MainForm.cs
@@ -149,9 +149,10 @@ namespace IOB_WIN
///
private void mCheckUpdates_Click(object sender, EventArgs e)
{
+ // avvio controllo
AutoUpdater.ShowSkipButton = false;
AutoUpdater.ShowRemindLaterButton = false;
- AutoUpdater.RunUpdateAsAdmin = false;
+ AutoUpdater.RunUpdateAsAdmin = utils.CRB("AUpdAsAdm");
AutoUpdater.Start(updateUrl);
}
@@ -279,7 +280,7 @@ namespace IOB_WIN
// se NON sono in DEBUG faccio check update...
#if !(DEBUG)
// avvio autoupdater...
- AutoUpdater.RunUpdateAsAdmin = false;
+ AutoUpdater.RunUpdateAsAdmin = utils.CRB("AUpdAsAdm");
AutoUpdater.Start(updateUrl);
#endif
}
diff --git a/Jenkinsfile b/Jenkinsfile
index c3dc736a..5fa8124c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=215']) {
+ withEnv(['NEXT_BUILD_NUMBER=216']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.17.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.17.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'