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

Merge branch 'release/IobWinPing_03'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-01-08 11:11:19 +01:00
parent 4afafecc14 9f1377bfcf
commit 55d60220fb
6 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-UT-NEXT/utils.cs
+3 -1
View File
@@ -95,6 +95,7 @@ namespace IOB_UT_NEXT
}
}
#if false
/// <summary>
/// File SimData x simulazione deterministica
/// </summary>
@@ -104,7 +105,8 @@ namespace IOB_UT_NEXT
{
return string.Format(@"{0}\{1}", utils.dataDatDir, utils.CRS("simDataFile"));
}
}
}
#endif
#endregion Public Properties
IOB-WIN-FORM/MainForm.cs
+8 -5
View File
@@ -502,14 +502,17 @@ namespace IOB_WIN_FORM
lastComCheck = adesso.AddHours(-1);
lblStatus.Text = "Loading";
// fix versione e nome APP!
string nomeApp = $"{ConfigurationManager.AppSettings.Get("appName")}";
string versione = $" v.{System.Reflection.Assembly.GetExecutingAssembly().GetName().Version}";
// fix icon!
notifyIcon1.Text = string.Format("IOB-WIN | {0}", System.Reflection.Assembly.GetExecutingAssembly().GetName().Version);
notifyIcon1.Text = $"{nomeApp} | {versione}";
Icon = Icon.ExtractAssociatedIcon(utils.defIconFilePath);
notifyIcon1.Icon = Icon.ExtractAssociatedIcon(utils.defIconFilePath);
// fix versione!
string nomeApp = $"{ConfigurationManager.AppSettings.Get("appName")} ({ModoAvvio})";
string versione = $" v.{System.Reflection.Assembly.GetExecutingAssembly().GetName().Version}";
this.Text = nomeApp;
lblApp.Text = nomeApp;
lblVers.Text = versione;
@@ -520,7 +523,7 @@ namespace IOB_WIN_FORM
// salvo versione SW!
lgInfo("------ STARTUP DATA ------");
lgInfo($"App Mode : {nomeApp}");
lgInfo($"App Mode : {nomeApp} ({ModoAvvio})");
lgInfo($"Versione : {versione}");
lgInfo("--------------------------");
IOB-WIN-NEXT/AdapterFormNext.cs
+3 -1
View File
@@ -240,10 +240,12 @@ namespace IOB_WIN_NEXT
btnStart.Enabled = true;
break;
#if false
case tipoAdapter.PingWatchdog:
iobObj = new IOB_WIN_FORM.Iob.PingWatchDog(this, IOBConf);
btnStart.Enabled = true;
break;
break;
#endif
case tipoAdapter.OSAI_OPEN:
case tipoAdapter.OSAI_CNDEX:
IOB-WIN-NEXT/App.config
+2 -2
View File
@@ -88,8 +88,8 @@
<add key="resxPath" value="Resources" />
<add key="mainConfFile" value="MAIN.ini" />
<add key="defaultPersLayerFile" value="PersistData.dat" />
<add key="simDataFile" value="SimData.dat" />
<add key="memDumpFile" value="MemoryDump.dat" />
<!--<add key="simDataFile" value="SimData.dat" />-->
<!--<add key="memDumpFile" value="MemoryDump.dat" />-->
<add key="numSim" value="1" />
<add key="MMapR" value="MMapR.map" />
<add key="MMapW" value="MMapW.map" />
IOB-WIN-PING/App.config
+3 -4
View File
@@ -8,8 +8,7 @@
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
</startup>
<appSettings>
<add key="appName" value="IOB-WIN-NEXT" />
<!--<add key="appVers" value="develop" />-->
<add key="appName" value="IOB-WIN-PING" />
<add key="enableTest" value="false" />
<add key="enableContapezzi" value="true" />
<add key="enableMode" value="true" />
@@ -88,8 +87,8 @@
<add key="resxPath" value="Resources" />
<add key="mainConfFile" value="MAIN.ini" />
<add key="defaultPersLayerFile" value="PersistData.dat" />
<add key="simDataFile" value="SimData.dat" />
<add key="memDumpFile" value="MemoryDump.dat" />
<!--<add key="simDataFile" value="SimData.dat" />-->
<!--<add key="memDumpFile" value="MemoryDump.dat" />-->
<add key="numSim" value="1" />
<add key="AUpdAsAdm" value="true" />
<add key="ConfToCloud" value="false" />
IOB-WIN-WPS/App.config
+3 -4
View File
@@ -8,8 +8,7 @@
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
</startup>
<appSettings>
<add key="appName" value="IOB-WIN-NEXT" />
<!--<add key="appVers" value="develop" />-->
<add key="appName" value="IOB-WIN-WPS" />
<add key="enableTest" value="false" />
<add key="enableContapezzi" value="true" />
<add key="enableMode" value="true" />
@@ -88,8 +87,8 @@
<add key="resxPath" value="Resources" />
<add key="mainConfFile" value="MAIN.ini" />
<add key="defaultPersLayerFile" value="PersistData.dat" />
<add key="simDataFile" value="SimData.dat" />
<add key="memDumpFile" value="MemoryDump.dat" />
<!--<add key="simDataFile" value="SimData.dat" />-->
<!--<add key="memDumpFile" value="MemoryDump.dat" />-->
<add key="numSim" value="1" />
<add key="AUpdAsAdm" value="true" />
<add key="ConfToCloud" value="false" />