Merge remote-tracking branch 'gogs.steamware.net/develop' into develop

This commit is contained in:
Samuele E. Locatelli
2019-09-13 17:02:49 +02:00
+2 -10
View File
@@ -2594,11 +2594,6 @@ namespace SCMA
{
string tipoAsse = "";
string direzione = "";
#if false
// controllo se tipo MTC/SOUR
if (currGateway.protocollo != gwProtocol.SOURS)
{
#endif
try
{
tipoAsse = currGateway.getItemNode(vettAxis[i].typeKey).ToString();
@@ -2610,10 +2605,7 @@ namespace SCMA
}
catch
{ }
#if false
}
#endif
if (tipoAsse == "")
if (tipoAsse == "" || tipoAsse == "OPC_UA_REDIS.DataItemRed")
{
// recupero info TIPO ASSE
List<DataRefItem<string, string>> drl = vettAxis[i].dataRefList;
@@ -2638,7 +2630,7 @@ namespace SCMA
direzione = (newDir > 0) ? "POSITIVE" : "NEGATIVE";
}
}
else
else if (tipoAsse == "ROTATIONAL")
{
if (currGateway.protocollo == gwProtocol.SOURS)
{