Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pa<rametrico update come admin...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-04-09 15:45:10 +02:00
parent 40f5ac93bd
commit 55e4c4cebc
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/App.config
+1
View File
@@ -58,6 +58,7 @@
<add key="numSim" value="1" />
<add key="MMapR" value="MMapR.map"/>
<add key="MMapW" value="MMapW.map"/>
<add key="AUpdAsAdm" value="false"/>
<!--logging-->
<add key="recTime" value="true" />
<add key="verbose" value="false" />
IOB-WIN/IobFanuc.cs
+4 -4
View File
@@ -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();
IOB-WIN/MainForm.cs
+3 -2
View File
@@ -149,9 +149,10 @@ namespace IOB_WIN
/// <param name="e"></param>
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
}
Jenkinsfile
Vendored
+1 -1
View File
@@ -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'