Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SAIM

Browse Source 
- Aggiunta gestione EnableTest
- step testing lettura memBlock all'avvio
This commit is contained in:
Samuele Locatelli
2022-11-21 19:59:35 +01:00
parent a552e77aa9
commit 2bc5177a40
7 changed files with 199 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-UT-NEXT/Enums.cs
+14 -2
View File
@@ -174,12 +174,25 @@ namespace IOB_UT_NEXT
public enum MachineSetupMode
{
ND = 0,
/// <summary>
/// Modalità Mecolpress (3 parametri IN, se variati --> porto a 1 la variabile di controllo)
/// Modalità Mecolpress (3 parametri IN, se variati --&gt; porto a 1 la variabile di controllo)
/// </summary>
MECOLPRESS = 1
}
/// <summary>
/// Tipo di memoria Modbus
/// </summary>
public enum modbusMemType
{
Coil = 0,
DiscreteInput = 1,
NotDefined = 2,
InputRegister = 3,
HoldingRegister = 4
}
/// <summary>
/// StFlag32: set di 32 bit (4 word) contente semaforo di variabili
/// </summary>
@@ -544,5 +557,4 @@ namespace IOB_UT_NEXT
/// </summary>
ULog
}
}
IOB-UT-NEXT/baseUtils.cs
+21
View File
@@ -66,6 +66,27 @@ namespace IOB_UT_NEXT
#region Public Methods
/// <summary>
/// Restituisce la prima cifra (a sx) da un numero (es x decodere quale memoria modbus sia)
/// </summary>
/// <param name="num">Numero di cui trovare la priam cifra</param>
/// <returns></returns>
public static int getFirstInt(int num)
{
if (num >= 100000000) num /= 100000000;
if (num >= 10000) num /= 10000;
if (num >= 100) num /= 100;
if (num >= 10) num /= 10;
#if false
// formulazione alternativa con ciclo...
while (num >= 10)
num /= 10;
#endif
return num;
}
/// <summary>
/// formatta un numero in forma binaria 0/1
/// </summary>
IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003.ini
+6 -2
View File
@@ -24,11 +24,15 @@ CMDADV1=?valore=
CMDREBO=/sendReboot.aspx?idxMacchina=
[MEMORY]
ADDR_READ=40001
ADDR_WRITE=40001
ADDR_READ=40000
ADDR_WRITE=40000
SIZE_READ=200
SIZE_WRITE=0
HR_BASE_ADDR=40000
;DELTA_BASE=0
DELTA_BASE=1
;0=false,1=true
MODBUS_EXT_REG=1
[BLINK]
IOB-WIN-NEXT/DATA/CONF/GIACO_SAIM_003_MBlock.json
+2
View File
@@ -1,5 +1,7 @@
{
"ReadBlocks": {
"10000": 10,
"10100": 10,
"40010": 10,
"40100": 40,
"40140": 30
IOB-WIN-NEXT/IobGeneric.cs
+10
View File
@@ -340,6 +340,16 @@ namespace IOB_WIN_NEXT
return baseUtils.CRB("DemoInSample");
}
}
/// <summary>
/// Verifica se sia abilitato test lettura blocchi memoria all'avvio
/// </summary>
public static bool EnableTest
{
get
{
return baseUtils.CRB("enableTest");
}
}
/// <summary>
/// Verifica se sia in modalità DEMO x dati OUTPUT
IOB-WIN-NEXT/IobModbusTCP.cs
+141 -3
View File
@@ -194,6 +194,7 @@ namespace IOB_WIN_NEXT
{
foreach (var item in memSetR)
{
// verifico il tipo di dati da leggere e salvare... FIXME TODO FARE !!!
readBlockHoldingReg(item.Key, item.Value, parametri.holdRegBaseAddr);
int waitTime = rnd.Next(minWait, maxWait);
Thread.Sleep(waitTime);
@@ -575,14 +576,33 @@ namespace IOB_WIN_NEXT
#region Protected Fields
/// <summary>
/// Copia locale dei valori in COIL (OUT) | 0.000/09.999, oppure 0.000/65.536 = 0xFFFF, come
/// array chiave (int) valori int[] letti tramite ModBus, da convertire secondo tipo
/// </summary>
protected Dictionary<int, bool> CoilsLUT = new Dictionary<int, bool>();
protected ModbusClient currPLC;
/// <summary>
/// Copia locale dei valori in Holding Registry, come array chiave (int) valori int[] letti
/// tramite ModBus, da convertire secondo tipo
/// Copia locale dei valori in Discrete Inputs (IN) | 10.000/19.999, oppure 100.000/165.536
/// = 1xFFFF, come array chiave (int) valori int[] letti tramite ModBus, da convertire
/// secondo tipo
/// </summary>
protected Dictionary<int, bool> DiscreteInputLUT = new Dictionary<int, bool>();
/// <summary>
/// Copia locale dei valori in Holding Registers | 40.000/49.999, oppure 400.000/465.536 =
/// 4xFFFF, come array chiave (int) valori int[] letti tramite ModBus, da convertire secondo tipo
/// </summary>
protected Dictionary<int, int[]> HoldingRegisterLUT = new Dictionary<int, int[]>();
/// <summary>
/// Copia locale dei valori in Input Registers | 30.000/39.999, oppure 300.000/365.536 =
/// 3xFFFF, come array chiave (int) valori int[] letti tramite ModBus, da convertire secondo tipo
/// </summary>
protected Dictionary<int, int[]> InputRegisterLUT = new Dictionary<int, int[]>();
/// <summary>
/// Ultimo controllo ping x evitare ping flood...
/// </summary>
@@ -853,6 +873,8 @@ namespace IOB_WIN_NEXT
parametri.holdRegBaseAddr = fIni.ReadInteger("MEMORY", "HR_BASE_ADDR", 40001);
// valore delta base e shift
deltaBase = fIni.ReadInteger("MEMORY", "DELTA_BASE", 0);
// verifico eventuale parametro memoria estesa (non 0...10'000 ma 0...xFFFF=65536)
modbusExtReg = fIni.ReadBoolean("MEMORY", "MODBUS_EXT_REG");
// salvo vettori memoria...
lgInfoStartup("Set RawInput dimensions...");
RawInput = new byte[parametri.memSizeRead];
@@ -1022,6 +1044,104 @@ namespace IOB_WIN_NEXT
return answ;
}
/// <summary>
/// Effettua ciclo letture di ogni area configurata
/// </summary>
/// <param name="baseAddr">indirizzo di partenza</param>
/// <param name="numVals">num valori da leggere</param>
protected void testBlockReadExt(int baseAddr, int numVals)
{
int baseHold = deltaBase;
modbusMemType currMemType = modbusMemType.NotDefined;
int maxVal = 10000;
int baseMult = 10000;
int[] readTestInt = new int[2];
bool[] readTestBool = new bool[2];
lgTrace($"-------------------- Inizio test lettura EXT {baseAddr} --------------------");
try
{
stopwatch.Restart();
// memoria estesa... 0 ... xFFFF per ogni set da 100'000...
if (modbusExtReg)
{
maxVal = 65536;
baseMult = 100000;
}
// determino tipo di memoria
if (baseAddr <= maxVal)
{
currMemType = modbusMemType.Coil;
}
else if (baseAddr <= baseMult + maxVal)
{
currMemType = modbusMemType.DiscreteInput;
}
else if (baseAddr <= 3 * baseMult + maxVal)
{
currMemType = modbusMemType.InputRegister;
}
else
{
currMemType = modbusMemType.HoldingRegister;
}
switch (currMemType)
{
case modbusMemType.Coil:
readTestBool = currPLC.ReadCoils(baseAddr - baseHold, numVals);
break;
case modbusMemType.DiscreteInput:
readTestBool = currPLC.ReadDiscreteInputs(baseAddr - (1 * baseMult + baseHold), numVals);
break;
case modbusMemType.InputRegister:
readTestInt = currPLC.ReadInputRegisters(baseAddr - (3 * baseMult + baseHold), numVals);
break;
case modbusMemType.HoldingRegister:
readTestInt = currPLC.ReadHoldingRegisters(baseAddr - (4 * baseMult + baseHold), numVals);
break;
case modbusMemType.NotDefined:
default:
break;
}
stopwatch.Stop();
lgTrace($"Stats lettura | {readTestInt.Length} val | {stopwatch.ElapsedMilliseconds}ms");
}
catch
{ }
switch (currMemType)
{
case modbusMemType.Coil:
case modbusMemType.DiscreteInput:
for (int i = 0; i < readTestBool.Length; i++)
{
lgTrace($"{currMemType} | {baseAddr + i:000} | Val: {readTestBool[i]}");
}
break;
case modbusMemType.InputRegister:
case modbusMemType.HoldingRegister:
for (int i = 0; i < readTestInt.Length / 2; i++)
{
int[] thisSet = new int[2];
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}");
}
break;
case modbusMemType.NotDefined:
default:
lgTrace($"Errore: tipo memoria non definitito per {baseAddr} / {numVals}");
break;
}
lgTrace($"-------------------- Completato test lettura {baseAddr} --------------------");
}
/// <summary>
/// Test connessione CNC
/// </summary>
@@ -1112,7 +1232,7 @@ namespace IOB_WIN_NEXT
//answ = (currStatus == OptCheckCondInt[cKey].ValOk);
// controllo se il valore sia in elenco di quelli validi...
answ = OptCheckCondInt[cKey].ValOk.Contains(currStatus);
lgTrace($"testIntCondition for {cKey} | BaseAddr: {OptCheckCondInt[cKey].BaseAddr} | currStatus: {currStatus} | ValOk: {string.Join(",",OptCheckCondInt[cKey].ValOk)}");
lgTrace($"testIntCondition for {cKey} | BaseAddr: {OptCheckCondInt[cKey].BaseAddr} | currStatus: {currStatus} | ValOk: {string.Join(",", OptCheckCondInt[cKey].ValOk)}");
}
else
{
@@ -1121,6 +1241,18 @@ namespace IOB_WIN_NEXT
return answ;
}
/// <summary>
/// Test di lettura dei blocchi di memoria ESTESO (considerato memorie xFFFF e tutti e 4 i
/// tipi di dati modbus)
/// </summary>
protected void testReadExt()
{
foreach (var item in memSetR)
{
testBlockReadExt(item.Key, item.Value);
}
}
#endregion Protected Methods
#region Private Fields
@@ -1139,6 +1271,12 @@ namespace IOB_WIN_NEXT
/// </summary>
private int deltaBase { get; set; } = 0;
/// <summary>
/// Indica se usare gli indirizzi estesi per ogni blocco: false = 0...10'000 true =
/// 0...65'536 (= xFFFF)
/// </summary>
private bool modbusExtReg { get; set; } = false;
#endregion Private Properties
#region Private Methods
IOB-WIN-NEXT/IobModbusTCPSaim.cs
+5 -34
View File
@@ -33,12 +33,17 @@ namespace IOB_WIN_NEXT
try
{
processDynData();
if (EnableTest)
{
testReadExt();
}
}
catch (Exception exc)
{
lgError($"Eccezione in processDynData iniziale x ModBus TCP SAIM:{Environment.NewLine}{exc}");
}
}
}
#endregion Public Constructors
@@ -168,40 +173,6 @@ namespace IOB_WIN_NEXT
#region Private Methods
private void testBlockRead(int baseAddr, int numByte)
{
int baseHold = 40001;
int[] readTestFull = new int[2];
lgTrace($"-------------------- Inizio test lettura {baseAddr} --------------------");
try
{
stopwatch.Restart();
readTestFull = currPLC.ReadHoldingRegisters(baseAddr - baseHold, numByte);
stopwatch.Stop();
lgTrace($"Stats lettura | {readTestFull.Length} val | {stopwatch.ElapsedMilliseconds}ms");
}
catch
{ }
for (int i = 0; i < readTestFull.Length / 2; i++)
{
int[] thisSet = new int[2];
Array.Copy(readTestFull, i * 2, thisSet, 0, 2);
lgTrace($"{baseAddr + i * 2:000} | HoldingRegisters: {thisSet[0]} / {thisSet[1]} | Val Real: {ModbusClient.ConvertRegistersToFloat(thisSet):N6}");
}
lgTrace("-------------------- Completato test lettura {baseAddr} --------------------");
}
private void testRead()
{
foreach (var item in memSetR)
{
testBlockRead(item.Key, item.Value);
}
}
#endregion Private Methods
}
}