Merge branch 'release/TestFluitekFov062_02'
This commit is contained in:
@@ -6,6 +6,7 @@ using System.Collections.Generic;
|
||||
using System.Net;
|
||||
using System.Net.NetworkInformation;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace IOB_WIN_MITSUBISHI.Iob
|
||||
{
|
||||
@@ -638,7 +639,7 @@ namespace IOB_WIN_MITSUBISHI.Iob
|
||||
/// <summary>
|
||||
/// Recupero altri counters se ci sono
|
||||
/// </summary>
|
||||
public override void processOtherCounters()
|
||||
public override async Task processOtherCounters()
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -655,7 +656,7 @@ namespace IOB_WIN_MITSUBISHI.Iob
|
||||
}
|
||||
else
|
||||
{
|
||||
sendOptVal(memNamePzReq, getValByMemAddr(memAddrPzReq));
|
||||
await sendOptVal(memNamePzReq, getValByMemAddr(memAddrPzReq));
|
||||
}
|
||||
if (string.IsNullOrEmpty(memAddrArt))
|
||||
{
|
||||
@@ -663,7 +664,7 @@ namespace IOB_WIN_MITSUBISHI.Iob
|
||||
}
|
||||
else
|
||||
{
|
||||
sendOptVal(memNameArt, getValByMemAddr(memAddrArt));
|
||||
await sendOptVal(memNameArt, getValByMemAddr(memAddrArt));
|
||||
}
|
||||
if (string.IsNullOrEmpty(memAddrCom))
|
||||
{
|
||||
@@ -671,7 +672,7 @@ namespace IOB_WIN_MITSUBISHI.Iob
|
||||
}
|
||||
else
|
||||
{
|
||||
sendOptVal(memNameCom, getValByMemAddr(memAddrCom));
|
||||
await sendOptVal(memNameCom, getValByMemAddr(memAddrCom));
|
||||
}
|
||||
if (string.IsNullOrEmpty(memAddrPzCnt))
|
||||
{
|
||||
@@ -679,7 +680,7 @@ namespace IOB_WIN_MITSUBISHI.Iob
|
||||
}
|
||||
else
|
||||
{
|
||||
sendOptVal(memNamePzCnt, getValByMemAddr(memAddrPzCnt));
|
||||
await sendOptVal(memNamePzCnt, getValByMemAddr(memAddrPzCnt));
|
||||
}
|
||||
if (string.IsNullOrEmpty(memAddrPzCntTot))
|
||||
{
|
||||
@@ -687,7 +688,7 @@ namespace IOB_WIN_MITSUBISHI.Iob
|
||||
}
|
||||
else
|
||||
{
|
||||
sendOptVal(memNamePzCntTot, getValByMemAddr(memAddrPzCntTot));
|
||||
await sendOptVal(memNamePzCntTot, getValByMemAddr(memAddrPzCntTot));
|
||||
}
|
||||
if (string.IsNullOrEmpty(memAddrCaden))
|
||||
{
|
||||
@@ -695,7 +696,7 @@ namespace IOB_WIN_MITSUBISHI.Iob
|
||||
}
|
||||
else
|
||||
{
|
||||
sendOptVal(memNameCaden, getValByMemAddr(memAddrCaden));
|
||||
await sendOptVal(memNameCaden, getValByMemAddr(memAddrCaden));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -222,7 +222,7 @@ namespace IOB_WIN_WS.IobWs
|
||||
}
|
||||
}
|
||||
|
||||
public override void processOtherCounters()
|
||||
public override async Task processOtherCounters()
|
||||
{
|
||||
DateTime adesso = DateTime.Now;
|
||||
// controllo se sia passato il samplePeriod minimo x 3...
|
||||
@@ -243,20 +243,20 @@ namespace IOB_WIN_WS.IobWs
|
||||
string token = ExecuteCallGet(GetUrlResource("GetToken"));
|
||||
token = token.Replace("\"", "");
|
||||
RestLutUpsert("token", token);
|
||||
Task.Delay(samplePeriod / 20);
|
||||
await Task.Delay(samplePeriod / 20);
|
||||
|
||||
// gestione altri contapezzi x
|
||||
string qtyTot = ExecuteCallGet(GetUrlResource("GetQtyTot"));
|
||||
|
||||
//attendo mezzo sample period...
|
||||
Task.Delay(samplePeriod / 5);
|
||||
await Task.Delay(samplePeriod / 5);
|
||||
|
||||
string qtyReq = ExecuteCallGet(GetUrlResource("GetQtyReq"));
|
||||
RestLutUpsert("qtyTot", qtyTot);
|
||||
RestLutUpsert("qtyReq", qtyReq);
|
||||
|
||||
//attendo mezzo sample period...
|
||||
Task.Delay(samplePeriod / 5);
|
||||
await Task.Delay(samplePeriod / 5);
|
||||
|
||||
// gestione tempociclo e nome programma...
|
||||
string pName = ExecuteCallGet(GetUrlResource("GetProgName"));
|
||||
|
||||
Reference in New Issue
Block a user