Merge branch 'develop' into release/FixSemModbusTcp

This commit is contained in:
Samuele Locatelli
2023-03-06 15:43:12 +01:00
2 changed files with 8 additions and 2 deletions
+5
View File
@@ -3274,6 +3274,11 @@ namespace IOB_WIN_NEXT
{
readSemafori(ref currDispData);
}
else
{
// forzo lettura OK
currDispData.semIn = Semaforo.SV;
}
}
else
{
+3 -2
View File
@@ -123,7 +123,7 @@ namespace IOB_WIN_NEXT
objItem newParam = new objItem()
{
uid = item.Key,
name=item.Key,
name = item.Key,
value = item.Value,
reqValue = "",
writable = true,
@@ -1170,8 +1170,9 @@ namespace IOB_WIN_NEXT
Array.Copy(readTestInt, i * 2, thisSet, 0, 2);
lgTrace($"{currMemType} | {baseAddr + i * 2:000} | Valori: {thisSet[0]} / {thisSet[1]} | Val Int: {ModbusClient.ConvertRegistersToInt(thisSet)} | Val Real: {ModbusClient.ConvertRegistersToFloat(thisSet):N6}");
}
// provo anche come stringa intera
lgTrace($"{currMemType} | {baseAddr:000} | Val string: {ModbusClient.ConvertRegistersToString(readTestInt, 0, readTestInt.Length)}");
break;
case modbusMemType.NotDefined:
default:
lgTrace($"Errore: tipo memoria non definitito per {baseAddr} / {numVals}");