diff --git a/MTC_Adapter/MTC_Adapter/AdapterOsai.cs b/MTC_Adapter/MTC_Adapter/AdapterOsai.cs index 93a284b..9553994 100644 --- a/MTC_Adapter/MTC_Adapter/AdapterOsai.cs +++ b/MTC_Adapter/MTC_Adapter/AdapterOsai.cs @@ -334,14 +334,14 @@ namespace MTC_Adapter // processo ora i dati dei path... di sicuro il primo currStrobe = (StFlag8)(Strobes[4]); // 5° byte currAck = (StFlag8)(Acknowl[4]); // 5° byte - procPathStrobes(0, currStrobe, currAck, 19098, 19020, ref UserAction); + procPathStrobes(0, currStrobe, currAck, 19100, 19020, ref UserAction); //...e se c'è pure il secondo... if (currAdpConf.nPath > 1) { currStrobe = (StFlag8)(Strobes[6]); // 7° byte currAck = (StFlag8)(Acknowl[6]); // 7° byte - procPathStrobes(1, currStrobe, currAck, 19121, 19021, ref UserAction); + procPathStrobes(1, currStrobe, currAck, 19126, 19021, ref UserAction); } // 2017.01.16 INVIO vettore azioni (1 o +)... SE CE NE SONO! @@ -386,8 +386,8 @@ namespace MTC_Adapter if (currStrobe.HasFlag(StFlag8.B0) || currStrobe.HasFlag(StFlag8.B1) || currStrobe.HasFlag(StFlag8.B2)) { - // blocco memoria x lettura TUTTI i dati di buffer M/S/T: 23 short(16bit) x (11+6+6) aree - ushort[] MemBlock_W = new ushort[23]; + // blocco memoria x lettura TUTTI i dati di buffer M/S/T: 26 short(16bit) x (12+7+7) aree (attenzione: secondo set di 2 bit è VUOTO...) + ushort[] MemBlock_W = new ushort[26]; // leggo tutto!!! inizio = DateTime.Now; @@ -404,11 +404,11 @@ namespace MTC_Adapter // check COD_S bitNum = 1; - gestStrobeCodMST(currStrobe, bitNum, ref currACK_DW, 11, MemBlock, "S"); + gestStrobeCodMST(currStrobe, bitNum, ref currACK_DW, 12, MemBlock, "S"); // check COD_T bitNum = 2; - gestStrobeCodMST(currStrobe, bitNum, ref currACK_DW, 17, MemBlock, "T"); + gestStrobeCodMST(currStrobe, bitNum, ref currACK_DW, 19, MemBlock, "T"); } @@ -595,7 +595,7 @@ namespace MTC_Adapter for (int i = 0; i < numEv; i++) { // leggo valore Codice - codEv = BitConverter.ToUInt16(MemBlock, 2 * (i + 1 + memShift)); + codEv = BitConverter.ToUInt16(MemBlock, 2 * (i + 2 + memShift)); // accodo evento Codice appendCodeMST(Coda, codEv.ToString()); }