diff --git a/EgwProxy.Icoel.Test/Program.cs b/EgwProxy.Icoel.Test/Program.cs
index 9f6bd3b5..46b82397 100644
--- a/EgwProxy.Icoel.Test/Program.cs
+++ b/EgwProxy.Icoel.Test/Program.cs
@@ -9,6 +9,19 @@ namespace EgwProxy.Icoel.Test
{
#region Internal Methods
+ ///
+ /// Mostra tutte le metriche di performance ricevute
+ ///
+ ///
+ internal static void DisplayPerfMeter(Dictionary perfMeter)
+ {
+ // mostra tutti i parametri rilevati...
+ foreach (var item in perfMeter)
+ {
+ Console.WriteLine(item.Key, $"{item.Value:N2}");
+ }
+ }
+
///
/// Generazione di una list di info sui dati variety
///
@@ -203,6 +216,17 @@ namespace EgwProxy.Icoel.Test
Console.WriteLine("Premere un tasto x continuare...");
userInput = Console.ReadLine();
+
+ Console.WriteLine("------------ Parametri velocità rilevati ------------");
+ var perfMeter = IcoelSizer.GetPerfMeters();
+ if (perfMeter != null)
+ {
+ DisplayPerfMeter(perfMeter);
+ }
+ Console.WriteLine();
+ Console.WriteLine("Premere un tasto x continuare...");
+ userInput = Console.ReadLine();
+
// solo attive
Console.WriteLine("------------ solo attive ------------");
varList = IcoelSizer.GetVarietyList();
@@ -251,6 +275,7 @@ namespace EgwProxy.Icoel.Test
}
}
+
#endregion Private Methods
}
}
\ No newline at end of file
diff --git a/EgwProxy.Icoel/Appunti.md b/EgwProxy.Icoel/Appunti.md
index d2f134c1..ae375519 100644
--- a/EgwProxy.Icoel/Appunti.md
+++ b/EgwProxy.Icoel/Appunti.md
@@ -6,10 +6,10 @@ Oltre ai metodi legati al batch, ci sono questi metodi x recuperare informazioni
| Metodo | Descrizione |
| ---------- | ---------- |
-| GetMachineRodsPMAsync() | velocità catena (carrellini / minuto) |
-| GetMachineCupfill() | percentuale riempimento carrellini (100% = 1 frutto x ogni carrellino) |
| GetMachineTonnesPH() | valore tonnellate/ora di velocità impianto |
| GetMachineTotalFPM() | valore frutti per minuto |
+| GetMachineRodsPM() | velocità catena (carrellini / minuto) |
+| GetMachineCupfill() | percentuale riempimento carrellini (100% = 1 frutto x ogni carrellino) |
## Icoel DB
diff --git a/EgwProxy.Icoel/Compac/ComClient.cs b/EgwProxy.Icoel/Compac/ComClient.cs
index 646d41af..587f5dd6 100644
--- a/EgwProxy.Icoel/Compac/ComClient.cs
+++ b/EgwProxy.Icoel/Compac/ComClient.cs
@@ -1,5 +1,6 @@
using EgwProxy.Icoel.SizerService;
using System;
+using System.Collections.Generic;
using System.Runtime.Serialization;
using System.ServiceModel;
@@ -174,6 +175,29 @@ namespace EgwProxy.Icoel.Compac
SSClient.AddBatch(batch);
}
+ ///
+ /// Recupera elenco parametri performance impianto
+ ///
+ /// Dizionario delle variabili di performance dell'impianto in formato Dictionary
+ internal Dictionary GetPerfMeters()
+ {
+ Dictionary answ = new Dictionary();
+ // indicata in tonnOra
+ double velTonnOra = SSClient.GetMachineTonnesPH();
+ // velocità espressa in frutti/minuto
+ double velFruttiMinuto = SSClient.GetMachineTotalFPM();
+ // percentuale riempimento carrellini
+ double percRiemp = SSClient.GetMachineCupfill();
+ //// indicata in carrelli/minuto
+ //int[] velCarrMinuto = SSClient.GetMachineRodsPM();
+ // accodo i valori ricavati
+ answ.Add("VelTonnOra", velTonnOra);
+ answ.Add("VelFruttiMinuto", velFruttiMinuto);
+ answ.Add("PercRiemp", percRiemp);
+ return answ;
+ }
+
+
#endregion Internal Methods
#region Private Properties
diff --git a/EgwProxy.Icoel/Connector.cs b/EgwProxy.Icoel/Connector.cs
index 30bb284e..e6776ae2 100644
--- a/EgwProxy.Icoel/Connector.cs
+++ b/EgwProxy.Icoel/Connector.cs
@@ -38,6 +38,21 @@ namespace EgwProxy.Icoel
Client.CheckGrower(GrowerData.GrowerCode, GrowerData.GrowerName);
}
}
+ ///
+ /// Recupera array varie velocità rilevate
+ ///
+ /// Dictionary delle velocità rilevate sul sizer
+ public Dictionary GetPerfMeters()
+ {
+ Dictionary answ = new Dictionary();
+ using (var Client = new ComClient(ipAddress, tcpPort))
+ {
+ answ = Client.GetPerfMeters();
+ }
+ return answ;
+ }
+
+
///
/// Invia un lotto in coda produzione sul sizer
diff --git a/IOB-MAN/App.config b/IOB-MAN/App.config
index 929d1f27..376f58be 100644
--- a/IOB-MAN/App.config
+++ b/IOB-MAN/App.config
@@ -43,7 +43,7 @@
-
+
@@ -51,7 +51,7 @@
-
+
@@ -59,7 +59,7 @@
-
+
@@ -67,7 +67,7 @@
-
+
@@ -95,6 +95,10 @@
+
+
+
+
diff --git a/IOB-MAN/App_Readme/README_SteamWare.txt b/IOB-MAN/App_Readme/README_SteamWare.txt
index bf60ed18..954eff8b 100644
--- a/IOB-MAN/App_Readme/README_SteamWare.txt
+++ b/IOB-MAN/App_Readme/README_SteamWare.txt
@@ -1,5 +1,5 @@
---------------------------------------------------------------
-------- SteamWareLib SDK -------
+------- SteamWare SDK -------
---------------------------------------------------------------
Libreria di utility base di SteamWare.
diff --git a/IOB-MAN/Core/Compression/Snappy/lib/linux/libsnappy64.so b/IOB-MAN/Core/Compression/Snappy/lib/linux/libsnappy64.so
new file mode 100644
index 00000000..584bedfc
Binary files /dev/null and b/IOB-MAN/Core/Compression/Snappy/lib/linux/libsnappy64.so differ
diff --git a/IOB-MAN/Core/Compression/Snappy/lib/osx/libsnappy64.dylib b/IOB-MAN/Core/Compression/Snappy/lib/osx/libsnappy64.dylib
new file mode 100644
index 00000000..bbce3c21
Binary files /dev/null and b/IOB-MAN/Core/Compression/Snappy/lib/osx/libsnappy64.dylib differ
diff --git a/IOB-MAN/Core/Compression/Zstandard/lib/linux/libzstd.so b/IOB-MAN/Core/Compression/Zstandard/lib/linux/libzstd.so
new file mode 100644
index 00000000..8309c49b
Binary files /dev/null and b/IOB-MAN/Core/Compression/Zstandard/lib/linux/libzstd.so differ
diff --git a/IOB-MAN/Core/Compression/Zstandard/lib/osx/libzstd.dylib b/IOB-MAN/Core/Compression/Zstandard/lib/osx/libzstd.dylib
new file mode 100644
index 00000000..5400d760
Binary files /dev/null and b/IOB-MAN/Core/Compression/Zstandard/lib/osx/libzstd.dylib differ
diff --git a/IOB-MAN/IOB-MAN.csproj b/IOB-MAN/IOB-MAN.csproj
index c149f9bd..f4c3cc5e 100644
--- a/IOB-MAN/IOB-MAN.csproj
+++ b/IOB-MAN/IOB-MAN.csproj
@@ -38,42 +38,38 @@
IobManIcon.ico
-
- ..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll
-
-
- ..\packages\DnsClient.1.5.0\lib\net45\DnsClient.dll
+
+ ..\packages\DnsClient.1.6.0\lib\net45\DnsClient.dll
..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll
-
- ..\packages\MapoSDK.6.14.2109.2809\lib\net40\MapoSDK.dll
+
+ ..\packages\MapoSDK.6.14.2204.2616\lib\MapoSDK.dll
-
- ..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll
+
+ ..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll
-
- ..\packages\MongoDB.Bson.2.13.2\lib\net452\MongoDB.Bson.dll
+
+ ..\packages\MongoDB.Bson.2.15.0\lib\netstandard2.0\MongoDB.Bson.dll
-
- ..\packages\MongoDB.Driver.2.13.2\lib\net452\MongoDB.Driver.dll
+
+ ..\packages\MongoDB.Driver.2.15.0\lib\netstandard2.0\MongoDB.Driver.dll
-
- ..\packages\MongoDB.Driver.Core.2.13.2\lib\net452\MongoDB.Driver.Core.dll
+
+ ..\packages\MongoDB.Driver.Core.2.15.0\lib\netstandard2.0\MongoDB.Driver.Core.dll
-
- ..\packages\MongoDB.Libmongocrypt.1.2.3\lib\netstandard2.0\MongoDB.Libmongocrypt.dll
+
+ ..\packages\MongoDB.Libmongocrypt.1.3.0\lib\netstandard2.0\MongoDB.Libmongocrypt.dll
..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
- ..\packages\NLog.4.7.12\lib\net45\NLog.dll
- True
+ ..\packages\NLog.4.7.15\lib\net45\NLog.dll
- ..\packages\Pipelines.Sockets.Unofficial.2.2.0\lib\net461\Pipelines.Sockets.Unofficial.dll
+ ..\packages\Pipelines.Sockets.Unofficial.2.2.2\lib\net461\Pipelines.Sockets.Unofficial.dll
..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll
@@ -81,23 +77,20 @@
..\packages\RestSharp.Serializers.NewtonsoftJson.106.15.0\lib\net452\RestSharp.Serializers.NewtonsoftJson.dll
-
- ..\packages\SharpCompress.0.30.0\lib\net461\SharpCompress.dll
-
-
- ..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll
+
+ ..\packages\SharpCompress.0.31.0\lib\net461\SharpCompress.dll
- ..\packages\StackExchange.Redis.2.2.79\lib\net461\StackExchange.Redis.dll
+ ..\packages\StackExchange.Redis.2.5.61\lib\net461\StackExchange.Redis.dll
-
- ..\packages\SteamWare.IO.5.1.2109.1716\lib\net462\SteamWare.IO.dll
+
+ ..\packages\SteamWare.IO.5.2.2205.1719\lib\net462\SteamWare.IO.dll
-
- ..\packages\SteamWare.Logger.5.1.2109.1716\lib\net462\SteamWare.Logger.dll
+
+ ..\packages\SteamWare.Logger.5.2.2205.1719\lib\net462\SteamWare.Logger.dll
-
- ..\packages\Steamware.Scheduler.5.1.2109.1716\lib\net462\Steamware.Scheduler.dll
+
+ ..\packages\SteamWare.Scheduler.5.2.2205.1719\lib\net462\SteamWare.Scheduler.dll
@@ -105,8 +98,8 @@
-
- ..\packages\System.Diagnostics.PerformanceCounter.5.0.1\lib\net461\System.Diagnostics.PerformanceCounter.dll
+
+ ..\packages\System.Diagnostics.PerformanceCounter.6.0.1\lib\net461\System.Diagnostics.PerformanceCounter.dll
..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll
@@ -114,8 +107,8 @@
True
-
- ..\packages\System.IO.Pipelines.5.0.1\lib\net461\System.IO.Pipelines.dll
+
+ ..\packages\System.IO.Pipelines.6.0.2\lib\net461\System.IO.Pipelines.dll
..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll
@@ -129,8 +122,8 @@
..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll
-
- ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll
+
+ ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
@@ -159,11 +152,11 @@
True
-
- ..\packages\System.Text.Encoding.CodePages.5.0.0\lib\net461\System.Text.Encoding.CodePages.dll
+
+ ..\packages\System.Text.Encoding.CodePages.6.0.0\lib\net461\System.Text.Encoding.CodePages.dll
-
- ..\packages\System.Threading.Channels.5.0.0\lib\net461\System.Threading.Channels.dll
+
+ ..\packages\System.Threading.Channels.6.0.0\lib\net461\System.Threading.Channels.dll
..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll
@@ -236,6 +229,10 @@
+
+
+
+
Always
@@ -276,13 +273,13 @@
-
+
- This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+ Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}.
-
-
+
+
-
+
\ No newline at end of file
diff --git a/IOB-MAN/IOBManPanel.cs b/IOB-MAN/IOBManPanel.cs
index 55028d14..6289073a 100644
--- a/IOB-MAN/IOBManPanel.cs
+++ b/IOB-MAN/IOBManPanel.cs
@@ -2,7 +2,7 @@
using Newtonsoft.Json;
using RestSharp;
using RestSharp.Serializers.NewtonsoftJson;
-using Steamware.Scheduler;
+using SteamWare.Scheduler;
using SteamWare.IO;
using SteamWare.Logger;
using System;
diff --git a/IOB-MAN/packages.config b/IOB-MAN/packages.config
index a762bb63..fc4b5a6f 100644
--- a/IOB-MAN/packages.config
+++ b/IOB-MAN/packages.config
@@ -1,43 +1,41 @@

-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
-
+
+
\ No newline at end of file
diff --git a/IOB-UT-NEXT/Objects.cs b/IOB-UT-NEXT/Objects.cs
index e84e7529..a26c3fa3 100644
--- a/IOB-UT-NEXT/Objects.cs
+++ b/IOB-UT-NEXT/Objects.cs
@@ -133,7 +133,7 @@ namespace IOB_UT_NEXT
///
/// Messaggio in modalità raw/stringa
///
- public object mesContent { get; set; } = null;
+ public object mesContent { get; set; } = "";
///
/// Tipo di messaggio trasmesso
diff --git a/IOB-WIN-NEXT/AdapterForm.cs b/IOB-WIN-NEXT/AdapterForm.cs
index b165d947..6c8fb09d 100644
--- a/IOB-WIN-NEXT/AdapterForm.cs
+++ b/IOB-WIN-NEXT/AdapterForm.cs
@@ -122,7 +122,7 @@ namespace IOB_WIN_NEXT
// inizializzo orologi
firstStart = DateTime.Now;
- lastStartTry = DateTime.Now;
+ lastStartTry = DateTime.Now.AddHours(-1);
initDatamonitor();
@@ -1243,6 +1243,7 @@ namespace IOB_WIN_NEXT
iobObj = new IobIcoelDb(this, IOBConf);
start.Enabled = true;
break;
+
case tipoAdapter.IcoelSoap:
iobObj = new IobIcoelSoap(this, IOBConf);
start.Enabled = true;
diff --git a/IOB-WIN-NEXT/DATA/CONF/FINASSI_HELPI_01.json b/IOB-WIN-NEXT/DATA/CONF/FINASSI_HELPI_01.json
index aa1a3a1c..c0f4eb4f 100644
--- a/IOB-WIN-NEXT/DATA/CONF/FINASSI_HELPI_01.json
+++ b/IOB-WIN-NEXT/DATA/CONF/FINASSI_HELPI_01.json
@@ -151,7 +151,7 @@
},
"PPM": {
"name": "PPM",
- "description": "Velocità espressa come Pacchi Per Minuto",
+ "description": "Velocit� espressa come Pacchi Per Minuto",
"memAddr": "41106",
"tipoMem": "Real",
"index": 1106,
diff --git a/IOB-WIN-NEXT/DATA/CONF/GIACO_ICOEL_002.ini b/IOB-WIN-NEXT/DATA/CONF/GIACO_ICOEL_002.ini
index 6bf152f1..d5ce3b98 100644
--- a/IOB-WIN-NEXT/DATA/CONF/GIACO_ICOEL_002.ini
+++ b/IOB-WIN-NEXT/DATA/CONF/GIACO_ICOEL_002.ini
@@ -61,14 +61,15 @@ DISABLE_PZCOUNT=FALSE
ENABLE_SEND_PZC_BLOCK=TRUE
MIN_SEND_PZC_BLOCK=0
MAX_SEND_PZC_BLOCK=100
-ENABLE_DYN_DATA=FALSE
+ENABLE_DYN_DATA=TRUE
FORCE_DYN_DATA=TRUE
ENABLE_DATA_FILTER=TRUE
ENABLE_CLI_RESTART=TRUE
VETO_SIG_IN=TRUE
+
; conf parametri memoria READ/WRITE
-OPC_PARAM_CONF=GIACO_ICOEL_001.json
+PARAM_CONF=GIACO_ICOEL_002.json
[BRANCH]
NAME=master
\ No newline at end of file
diff --git a/IOB-WIN-NEXT/DATA/CONF/GIACO_ICOEL_002.json b/IOB-WIN-NEXT/DATA/CONF/GIACO_ICOEL_002.json
new file mode 100644
index 00000000..0a64c117
--- /dev/null
+++ b/IOB-WIN-NEXT/DATA/CONF/GIACO_ICOEL_002.json
@@ -0,0 +1,40 @@
+{
+ "mMapWrite": {
+
+ },
+ "mMapRead": {
+ "VelTonnOra": {
+ "name": "VelTonnOra",
+ "description": "Velocità Impianto Tonnellate / Ora",
+ "memAddr": "VelTonnOra",
+ "tipoMem": "Real",
+ "index": 0,
+ "size": 0,
+ "func": "MEDIAN",
+ "period": 60,
+ "factor": 1
+ },
+ "VelFruttiMinuto": {
+ "name": "VelFruttiMinuto",
+ "description": "Velocità Impianto Frutti / Minuto",
+ "memAddr": "VelFruttiMinuto",
+ "tipoMem": "Real",
+ "index": 0,
+ "size": 0,
+ "func": "MEDIAN",
+ "period": 60,
+ "factor": 1
+ },
+ "PercRiemp": {
+ "name": "PercRiemp",
+ "description": "Percentuale riempimento carrelli",
+ "memAddr": "PercRiemp",
+ "tipoMem": "Real",
+ "index": 0,
+ "size": 0,
+ "func": "MEDIAN",
+ "period": 60,
+ "factor": 1
+ }
+ }
+}
diff --git a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
index d3e66756..92634acb 100644
--- a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
+++ b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
@@ -87,7 +87,7 @@
..\packages\EasyModbusTCP.5.6.0\lib\net40\EasyModbus.dll
- ..\packages\EgwProxy.Icoel.3.6.2205.2018\lib\EgwProxy.Icoel.dll
+ ..\packages\EgwProxy.Icoel.3.6.2205.2416\lib\EgwProxy.Icoel.dll
..\packages\EgwProxy.MultiCncLib.3.6.2205.2319\lib\EgwProxy.MultiCncLib.dll
@@ -272,6 +272,9 @@
Always
+
+ PreserveNewest
+
diff --git a/IOB-WIN-NEXT/IobGeneric.cs b/IOB-WIN-NEXT/IobGeneric.cs
index 8a69fcf9..872d6408 100644
--- a/IOB-WIN-NEXT/IobGeneric.cs
+++ b/IOB-WIN-NEXT/IobGeneric.cs
@@ -309,7 +309,7 @@ namespace IOB_WIN_NEXT
///
/// dataOra ultimo PING inviato verso il PLC...
///
- public DateTime lastPING;
+ public DateTime lastPING = DateTime.Now.AddHours(-1);
///
/// DataOra ultima lettura da PLC
@@ -2961,7 +2961,7 @@ namespace IOB_WIN_NEXT
string jsonParams = getOptPar("PARAM_CONF");
if (!string.IsNullOrEmpty(jsonParams))
{
- string jsonFileName = $"{Application.StartupPath}/DATA/CONF/{jsonParams}";
+ string jsonFileName = $"{Application.StartupPath}\\DATA\\CONF\\{jsonParams}";
lgInfoStartup($"Apertura file {jsonFileName}");
StreamReader reader = new StreamReader(jsonFileName);
string jsonData = reader.ReadToEnd();
@@ -4290,12 +4290,20 @@ namespace IOB_WIN_NEXT
case urlType.RawTransf:
BaseRawTransf currRTData = new BaseRawTransf();
+#if false
rawTransfJsonPayload fullRTObj = new rawTransfJsonPayload();
fullRTObj.rawTransfData = new List();
// inizio processando ogni valore
foreach (var item in elencoValori)
{
- currRTData = JsonConvert.DeserializeObject(item);
+ try
+ {
+ currRTData = JsonConvert.DeserializeObject(item);
+ }
+ catch (Exception exc)
+ {
+ lgError($"Eccezione in deserializzazione BaseRawTransf:{Environment.NewLine}{exc}");
+ }
fullRTObj.rawTransfData.Add(currRTData);
}
// conversione finale
@@ -4306,7 +4314,21 @@ namespace IOB_WIN_NEXT
catch (Exception exc)
{
lgError($"RawTransf Errore in costruzione jsonPayload:{Environment.NewLine}{exc}");
+ }
+#endif
+
+ // provo una serializzazione "brutale", ovvero aggiungo alla stringa il valore di testa...
+ string rawResult = "";
+ foreach (var item in elencoValori)
+ {
+ rawResult += $"{item},";
}
+ if (rawResult.Length > 0)
+ {
+ rawResult = rawResult.Substring(0, rawResult.Length - 1);
+ }
+ answ = "{" + $"\"rawTransfData\":[{rawResult}]" + "}";
+
break;
case urlType.ULog:
@@ -5376,16 +5398,18 @@ namespace IOB_WIN_NEXT
/// indica se sia richeisto di SVUOTARE le code delel info
public virtual void startAdapter(bool resetQueue)
{
+ DateTime adesso= DateTime.Now; ;
+ DateTime scaduto = adesso.AddMinutes(-10);
lgInfo("Starting adapter...");
maxJsonData = utils.CRI("maxJsonData");
maxJsonDataEv = utils.CRI("maxJsonDataEv");
parentForm.commPlcActive = false;
adpRunning = true;
- dtAvvioAdp = DateTime.Now;
- lastWatchDog = dtAvvioAdp;
- lastPING = dtAvvioAdp;
- lastReadPLC = dtAvvioAdp.AddMinutes(-1);
- lastDisconnCheck = dtAvvioAdp;
+ dtAvvioAdp = adesso;
+ lastWatchDog = scaduto;
+ lastPING = scaduto;
+ lastReadPLC = scaduto;
+ lastDisconnCheck = scaduto;
TimingData.resetData();
// aggiungo altri defaults
setDefaults(resetQueue);
diff --git a/IOB-WIN-NEXT/IobIcoelSoap.cs b/IOB-WIN-NEXT/IobIcoelSoap.cs
index 68832884..736cc80d 100644
--- a/IOB-WIN-NEXT/IobIcoelSoap.cs
+++ b/IOB-WIN-NEXT/IobIcoelSoap.cs
@@ -5,6 +5,7 @@ using MapoSDK;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
+using System.Linq;
using System.Net.NetworkInformation;
namespace IOB_WIN_NEXT
@@ -40,6 +41,7 @@ namespace IOB_WIN_NEXT
*/
IcoelSizer = new Connector(IOBConf.cncIpAddr, IOBConf.cncPort);
+ lastPING = DateTime.Now.AddHours(-1);
}
///
@@ -52,7 +54,22 @@ namespace IOB_WIN_NEXT
{
B_input = 1;
currDispData.semIn = Semaforo.SV;
- if (currBatchList != null)
+ if (currBatchList == null)
+ {
+ // se nullo --> provo a leggere!
+
+ var currBatch = IcoelSizer.GetCurrentBatch();
+ if (currBatch != null)
+ {
+ currBatchList = currBatch;
+#if false
+ // accodo invio!
+ string rawBatch = JsonConvert.SerializeObject(currBatch);
+#endif
+ accodaRawData(IOB_UT_NEXT.rawTransfType.IcoelBatch, currBatch);
+ }
+ }
+ else
{
// se ho batch NON chiusi (data = minValue) allora lavora
if (currBatchList[1].EndTime == DateTime.MinValue || currBatchList[1].EndTime == DateTime.MinValue)
@@ -68,6 +85,25 @@ namespace IOB_WIN_NEXT
}
}
+ ///
+ /// Recupero dati dinamici...
+ ///
+ public override Dictionary getDynData()
+ {
+ // valore non presente in vers default... se gestito fare override
+ Dictionary outVal = new Dictionary();
+ // recupero da libreria il dizionario dei performance parameters...
+ var perfParamDict = IcoelSizer.GetPerfMeters();
+ foreach (var item in perfParamDict)
+ {
+ saveValue(ref outVal, item.Value, item.Key);
+#if false
+ outVal.Add(item.Key, $"{item.Value:N2}");
+#endif
+ }
+ return outVal;
+ }
+
#endregion Public Constructors
#region Public Methods
@@ -111,13 +147,17 @@ namespace IOB_WIN_NEXT
foreach (var item in currBatch)
{
// se variato ID è cambiato
- doSend = (currBatchList[item.Key].Id != item.Value.Id);
+ doSend = doSend || (currBatchList[item.Key].Id != item.Value.Id);
}
}
// se devo inviare impacchetto dati
if (doSend)
{
+#if false
// accodo per invio...
+ string rawBatch = JsonConvert.SerializeObject(currBatch);
+ accodaRawData(IOB_UT_NEXT.rawTransfType.IcoelBatch, rawBatch);
+#endif
accodaRawData(IOB_UT_NEXT.rawTransfType.IcoelBatch, currBatch);
currBatchList = currBatch;
}
diff --git a/IOB-WIN-NEXT/packages.config b/IOB-WIN-NEXT/packages.config
index 37b775c1..aa00135f 100644
--- a/IOB-WIN-NEXT/packages.config
+++ b/IOB-WIN-NEXT/packages.config
@@ -2,7 +2,7 @@
-
+