diff --git a/MTC_Adapter/MTC_Adapter/AdapterOsai.cs b/MTC_Adapter/MTC_Adapter/AdapterOsai.cs
index 58d316f..25fc69a 100644
--- a/MTC_Adapter/MTC_Adapter/AdapterOsai.cs
+++ b/MTC_Adapter/MTC_Adapter/AdapterOsai.cs
@@ -786,7 +786,6 @@ namespace MTC_Adapter
Buffer.BlockCopy(unOpSpeedMemW, 0, unOpSpeedMem, 0, unOpSpeedMem.Length);
procUnOp(unOpSpeedMem);
}
-
///
/// Procedura di processing lettura memoria x DatiUt - Step 4
///
diff --git a/MTC_Adapter/MTC_Adapter/AdapterSiemens.cs b/MTC_Adapter/MTC_Adapter/AdapterSiemens.cs
index 173509a..67dc04a 100644
--- a/MTC_Adapter/MTC_Adapter/AdapterSiemens.cs
+++ b/MTC_Adapter/MTC_Adapter/AdapterSiemens.cs
@@ -714,6 +714,7 @@ namespace MTC_Adapter
///
public override void getUnOp()
{
+ // DB254.DBI140
// leggo in blocco tutte le speed da memoria...
int memIndex = 140;
// buffer memoria 60 byte... speed (16bit 2 * 20) + load (8bit 1 * 20) visto che sono 20 teste max
@@ -733,12 +734,11 @@ namespace MTC_Adapter
///
public override int getDatiUt_step4(ref byte[] int32Mem, int j)
{
- int memIndex = 13100 + 4 * j;
-#if false
+ // DB253.DBI4300
+ int memIndex = 4300 + 4 * j;
inizio = DateTime.Now;
SIEMENSMemRW_Byte(R, baseMemUT, memIndex, ref int32Mem);
if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-TabUT-VitaRes", int32Mem.Length), DateTime.Now.Subtract(inizio).Ticks);
-#endif
return memIndex;
}
///
@@ -749,12 +749,11 @@ namespace MTC_Adapter
///
public override int getDatiUt_step3b(ref byte int8Mem, int j)
{
- int memIndex = 10700 + 1 * j;
-#if false
+ // DB253.DBI1900
+ int memIndex = 1900 + 1 * j;
inizio = DateTime.Now;
SIEMENSMemRW_Byte(R, baseMemUT, memIndex, ref int8Mem);
- if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-TabUT-FamUT", 8), DateTime.Now.Subtract(inizio).Ticks);
-#endif
+ if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-TabUT-FamUT", 8), DateTime.Now.Subtract(inizio).Ticks);
return memIndex;
}
///
@@ -764,12 +763,11 @@ namespace MTC_Adapter
///
public override int getDatiUt_step3a(ref byte[] tabFam_FamUt)
{
- int memIndex = 8900;
-#if false
+ // DB253.DBI100
+ int memIndex = 100;
inizio = DateTime.Now;
SIEMENSMemRW_Byte(R, baseMemUT, memIndex, ref tabFam_FamUt);
if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-TabFamUT-FamUT", tabFam_FamUt.Length), DateTime.Now.Subtract(inizio).Ticks);
-#endif
return memIndex;
}
///
@@ -780,12 +778,11 @@ namespace MTC_Adapter
///
public override int getDatiUt_step2b(ref byte[] int16Mem, int j)
{
- int memIndex = 11700 + 2 * j;
-#if false
+ // DB253.DBI2900
+ int memIndex = 2900 + 2 * j;
inizio = DateTime.Now;
SIEMENSMemRW_Byte(R, baseMemUT, memIndex, ref int16Mem);
if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-TabUT-FamUT", int16Mem.Length), DateTime.Now.Subtract(inizio).Ticks);
-#endif
return memIndex;
}
///
@@ -795,12 +792,11 @@ namespace MTC_Adapter
///
public override int getDatiUt_step2a(ref byte[] tabUt_UT)
{
- int memIndex = 11300;
-#if false
+ // DB253.DBI2500
+ int memIndex = 2500;
inizio = DateTime.Now;
SIEMENSMemRW_Byte(R, baseMemUT, memIndex, ref tabUt_UT);
if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-TabUT-UT", tabUt_UT.Length), DateTime.Now.Subtract(inizio).Ticks);
-#endif
return memIndex;
}
///
@@ -810,12 +806,11 @@ namespace MTC_Adapter
///
public override int getDatiUt_step1(ref byte[] elencoUtMem)
{
- int memIndex = 2960;
-#if false
+ // DB254.DBI280
+ int memIndex = 280;
inizio = DateTime.Now;
- SIEMENSMemRW_Byte(R, baseMemUT, memIndex, ref elencoUtMem);
+ SIEMENSMemRW_Byte(R, baseMemUO, memIndex, ref elencoUtMem);
if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-NUMUT", elencoUtMem.Length), DateTime.Now.Subtract(inizio).Ticks);
-#endif
return memIndex;
}