Aggiunto AutoUpdater + PrettyBin...
This commit is contained in:
Samuele E. Locatelli
+45
-38
@@ -1,57 +1,64 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
|
||||
</startup>
|
||||
<appSettings>
|
||||
<add key="appName" value="IOB-WIN"/>
|
||||
<add key="appName" value="IOB-WIN" />
|
||||
<!--gestione TIMERS e periodi multipli x thread lenti-->
|
||||
<add key="startTimerMs" value="250"/>
|
||||
<add key="startTimerMs" value="250" />
|
||||
<!-- ciclo corto x invio a server: ms -->
|
||||
<add key="timerIntMs" value="10"/>
|
||||
<add key="fastCount" value="20"/><!--150ms-->
|
||||
<add key="normCount" value="50"/><!--500ms-->
|
||||
<add key="slowCount" value="500"/><!--5 sec-->
|
||||
<add key="verySlowCount" value="1000"/><!--10sec-->
|
||||
<add key="waitEndCycle" value="0"/><!--5 sec-->
|
||||
|
||||
<add key="timerIntMs" value="10" />
|
||||
<add key="fastCount" value="20" />
|
||||
<!--150ms-->
|
||||
<add key="normCount" value="50" />
|
||||
<!--500ms-->
|
||||
<add key="slowCount" value="500" />
|
||||
<!--5 sec-->
|
||||
<add key="verySlowCount" value="1000" />
|
||||
<!--10sec-->
|
||||
<add key="waitEndCycle" value="0" />
|
||||
<!--5 sec-->
|
||||
<!--Modalità DEMO: DemoOUT indica che NON invia davvero al server e DemoIN che simula e NON legge da PLC-->
|
||||
<add key="DemoIn" value="false"/>
|
||||
<add key="DemoInSample" value="true"/>
|
||||
<add key="DemoOut" value="true"/>
|
||||
|
||||
<add key="DemoIn" value="false" />
|
||||
<add key="DemoInSample" value="true" />
|
||||
<add key="DemoOut" value="true" />
|
||||
<!--Definizione avvio Adapter-->
|
||||
<add key="autoLoadConf" value="true"/>
|
||||
<add key="autoStartOnLoad" value="true"/>
|
||||
<add key="openDumpOnStart" value="false"/>
|
||||
<add key="startMinimized" value="false"/>
|
||||
<add key="windowCanMax" value="true"/>
|
||||
<add key="trayClose" value="true"/>
|
||||
<add key="autoSaveSec" value="60"/>
|
||||
<add key="waitRecMSec" value="5000"/>
|
||||
<add key="testCharSep" value="|"/>
|
||||
<add key="autoLoadConf" value="true" />
|
||||
<add key="autoStartOnLoad" value="true" />
|
||||
<add key="openDumpOnStart" value="false" />
|
||||
<add key="startMinimized" value="false" />
|
||||
<add key="windowCanMax" value="true" />
|
||||
<add key="trayClose" value="true" />
|
||||
<add key="autoSaveSec" value="60" />
|
||||
<add key="waitRecMSec" value="5000" />
|
||||
<add key="testCharSep" value="|" />
|
||||
<!--<add key="fattdecimale" value="1000"/>
|
||||
<add key="fattConvDistAssi" value="1000"/>
|
||||
<add key="fattDecVA" value="1000"/>-->
|
||||
|
||||
<!--conf file-->
|
||||
<add key="dataPath" value="DATA"/>
|
||||
<add key="dataConfPath" value="DATA\CONF"/>
|
||||
<add key="dataDatPath" value="DATA\DAT"/>
|
||||
<add key="resxPath" value="Resources"/>
|
||||
<add key="dataPath" value="DATA" />
|
||||
<add key="dataConfPath" value="DATA\CONF" />
|
||||
<add key="dataDatPath" value="DATA\DAT" />
|
||||
<add key="resxPath" value="Resources" />
|
||||
<!--<add key="AlarmList" value="AlarmList.map"/>
|
||||
<add key="AlarmListCNC" value="AlarmListCNC.map"/>-->
|
||||
<add key="defaultConfFile" value="IOB.ini"/>
|
||||
<add key="defaultPersLayerFile" value="PersistData.dat"/>
|
||||
<add key="simDataFile" value="SimData.dat"/>
|
||||
<add key="numSim" value="1"/>
|
||||
<add key="defaultConfFile" value="IOB.ini" />
|
||||
<add key="defaultPersLayerFile" value="PersistData.dat" />
|
||||
<add key="simDataFile" value="SimData.dat" />
|
||||
<add key="numSim" value="1" />
|
||||
<!--logging-->
|
||||
<add key="recTime" value="true"/>
|
||||
<add key="verbose" value="true"/>
|
||||
<add key="logEvery" value="1"/>
|
||||
<add key="numRowConsole" value="10"/>
|
||||
<add key="verboseLogTOut" value="5"/>
|
||||
<add key="recTime" value="true" />
|
||||
<add key="verbose" value="true" />
|
||||
<add key="logEvery" value="1" />
|
||||
<add key="numRowConsole" value="10" />
|
||||
<add key="verboseLogTOut" value="5" />
|
||||
<!--conf x testing FANUC-->
|
||||
<add key="macOnFromConn" value="true"/>
|
||||
<add key="macOnFromConn" value="true" />
|
||||
</appSettings>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<probing privatePath="lib;libs" />
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
</configuration>
|
||||
@@ -32,6 +32,9 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="AutoUpdater.NET, Version=1.4.3.0, Culture=neutral, PublicKeyToken=942f95247e354701, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Autoupdater.NET.Official.1.4.3\lib\net452\AutoUpdater.NET.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
|
||||
</Reference>
|
||||
@@ -138,4 +141,10 @@
|
||||
<WCFMetadata Include="Connected Services\" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Target Name="AfterBuild">
|
||||
<ItemGroup>
|
||||
<MoveToLibFolder Include="$(OutputPath)*.dll ; $(OutputPath)*.pdb ; $(OutputPath)*.xml" />
|
||||
</ItemGroup>
|
||||
<Move SourceFiles="@(MoveToLibFolder)" DestinationFolder="$(OutputPath)lib" OverwriteReadOnlyFiles="true" />
|
||||
</Target>
|
||||
</Project>
|
||||
@@ -330,7 +330,6 @@ namespace IOB_WIN
|
||||
// controllo connessione/connettività
|
||||
if (connectionOk)
|
||||
{
|
||||
lg.Info("STEP 01.A");
|
||||
// controllo non sia già in esecuzione...
|
||||
if (!adpCommAct)
|
||||
{
|
||||
@@ -354,6 +353,7 @@ namespace IOB_WIN
|
||||
{
|
||||
bool showDebugData = false;
|
||||
|
||||
lg.Info("STEP 01");
|
||||
// processing dati memoria (lettura, filtraggio, enqueque)
|
||||
if (ciclo == gatherCycle.VHF)
|
||||
{
|
||||
@@ -376,7 +376,7 @@ namespace IOB_WIN
|
||||
// eventuale log!
|
||||
if (utils.CRB("recTime")) logTimeResults();
|
||||
}
|
||||
|
||||
lg.Info("STEP 02");
|
||||
// gestione queue (invio, display)
|
||||
svuotaCoda();
|
||||
reportDataProc();
|
||||
@@ -385,6 +385,7 @@ namespace IOB_WIN
|
||||
// verifica se debba salvare e mostrare dati
|
||||
checkSavePersDataLayer();
|
||||
}
|
||||
lg.Info("STEP 03");
|
||||
}
|
||||
catch (Exception exc)
|
||||
{
|
||||
@@ -415,7 +416,6 @@ namespace IOB_WIN
|
||||
}
|
||||
else
|
||||
{
|
||||
lg.Info("STEP 01.B");
|
||||
// log connessione KO
|
||||
lg.Error("getAndSend - Connessione non disponibile, provo a riconnettere");
|
||||
// provo a riconnettere SE abilitato tryRestart...
|
||||
@@ -425,7 +425,6 @@ namespace IOB_WIN
|
||||
tryConnect();
|
||||
}
|
||||
}
|
||||
lg.Info("STEP 02");
|
||||
if (eh_refreshed != null)
|
||||
{
|
||||
eh_refreshed(this, new EventArgs());
|
||||
|
||||
@@ -16,6 +16,8 @@ using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Threading;
|
||||
using IOB_UT;
|
||||
using AutoUpdaterDotNET;
|
||||
using System.Globalization;
|
||||
|
||||
namespace IOB_WIN
|
||||
{
|
||||
@@ -136,6 +138,11 @@ namespace IOB_WIN
|
||||
/// </summary>
|
||||
public MainForm()
|
||||
{
|
||||
// avvio autoupdater...
|
||||
//AutoUpdater.CurrentCulture = CultureInfo.CreateSpecificCulture("it");
|
||||
AutoUpdater.Start("http://seriate.steamware.net:8083/SWS/IOB-WIN/manifest.xml");
|
||||
|
||||
// continuo avvio...
|
||||
InitializeComponent();
|
||||
lblStatus.Text = "Loading";
|
||||
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Autoupdater.NET.Official" version="1.4.3" targetFramework="net461" />
|
||||
<package id="NLog" version="4.4.12" targetFramework="net461" />
|
||||
<package id="NLog.Config" version="4.4.12" targetFramework="net461" />
|
||||
<package id="NLog.Schema" version="4.4.12" targetFramework="net461" />
|
||||
<package id="PrettyBin" version="1.1.0" targetFramework="net461" />
|
||||
</packages>
|
||||
Reference in New Issue
Block a user