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

Merge branch 'release/AddTraceLogFanuc02'

Browse Source
This commit is contained in:
Samuele Locatelli
2024-05-15 17:00:52 +02:00
parent 5da45f091f a20a679d50
commit 2cfbd5ac5e
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-UT-NEXT/baseUtils.cs
+1
View File
@@ -761,6 +761,7 @@ namespace IOB_UT_NEXT
// verifico directory
checkDir(dirPath);
string[] lines = dictionary.OrderBy(i => i.Key).Select(kvp => kvp.Key + ":" + kvp.Value).ToArray();
//string[] lines = dictionary.OrderBy(i => i.Key).Select(kvp => kvp.Key + ":" + kvp.Value).ToArray();
try
{
File.WriteAllLines(file, lines);
IOB-WIN-NEXT/DATA/CONF/3028.ini
+2 -2
View File
@@ -42,10 +42,10 @@ BIT5=!X8.4
;BIT6=X33.4
AREAD_START=128
AREAD_SIZE=12
AREAG_SIZE=8
AREAG_SIZE=48
;AREAG_SIZE=48
AREAR_START=15000
AREAR_SIZE=2
AREAR_SIZE=4
AREAX_START=0
AREAX_SIZE=40
AREAY_START=0
IOB-WIN-NEXT/Iob/Fanuc.cs
+5 -5
View File
@@ -94,7 +94,7 @@ namespace IOB_WIN_NEXT.Iob
}
// leggo conf x ricerca valori memoria da tracciare in log di continuo...
mem2trace = fIni.ReadString("MEMORY", "MEM_2_TRACE", "");
mem2trace = fIni.ReadString("OPTPAR", "MEM_2_TRACE", "");
// è little endian (NON serve conversione)
hasBigEndian = false;
@@ -1337,7 +1337,7 @@ namespace IOB_WIN_NEXT.Iob
// se è da tracciare...
if (mem2trace.Contains($"|{bKey}|"))
{
lgTrace($"Valore | bKey: {bKey} | bVal: {bVal} | byte2check: {byte2check} | bitNum: {bitNum} | i: {i} | B_input: {B_input}");
lgTrace($"Valore | bKey: {bKey} | bVal: {bVal} | byte: {byte2check} | tgt: {(1 << bitNum)} | B_input: {B_input}");
}
}
}
@@ -1407,7 +1407,7 @@ namespace IOB_WIN_NEXT.Iob
mappaValori = new Dictionary<string, string>();
for (int i = 0; i < MemBlockCurr.Length; i++)
{
mappaValori.Add(i.ToString("0000"), MemBlockCurr[i].ToString());
mappaValori.Add($"[{i:0000}]", $"{MemBlockCurr[i]:B}={MemBlockCurr[i]}");
}
utils.WritePlain(mappaValori, nomeFileB);
@@ -1415,7 +1415,7 @@ namespace IOB_WIN_NEXT.Iob
mappaValori = new Dictionary<string, string>();
for (int i = 0; i < MemBlockCurr.Length / 2; i++)
{
mappaValori.Add(i.ToString("0000"), BitConverter.ToUInt16(MemBlockCurr, i * 2).ToString());
mappaValori.Add($"[{i:0000}]", BitConverter.ToUInt16(MemBlockCurr, i * 2).ToString());
}
utils.WritePlain(mappaValori, nomeFileW);
@@ -1423,7 +1423,7 @@ namespace IOB_WIN_NEXT.Iob
mappaValori = new Dictionary<string, string>();
for (int i = 0; i < MemBlockCurr.Length / 4; i++)
{
mappaValori.Add(i.ToString("0000"), BitConverter.ToUInt32(MemBlockCurr, i * 4).ToString());
mappaValori.Add($"[{i:0000}]", BitConverter.ToUInt32(MemBlockCurr, i * 4).ToString());
}
utils.WritePlain(mappaValori, nomeFileDW);
}