From bab088e207cc8979a3aa8daa03a7004b2e3d2ae1 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 20 Jul 2016 15:32:26 +0200 Subject: [PATCH] Errore in caso di num allarmi < 256 (32 bit) --> fixed!!! --- MTC_Sim/MTC_Sim/AdapterGeneric.cs | 2 ++ MTC_Sim/VersGen/AdapterVers.cs | 4 ++-- MTC_Sim/VersGen/AdapterVers.tt | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/MTC_Sim/MTC_Sim/AdapterGeneric.cs b/MTC_Sim/MTC_Sim/AdapterGeneric.cs index 5f28c73..7d1ba43 100644 --- a/MTC_Sim/MTC_Sim/AdapterGeneric.cs +++ b/MTC_Sim/MTC_Sim/AdapterGeneric.cs @@ -1131,6 +1131,8 @@ namespace MTC_Adapter // inizializzo a zero il vettore allarmi... int numByte = (int)Math.Ceiling(Convert.ToDecimal(rumRiga) / 8); + // 2016.07.20: dimensione AlarmFlags è la MAX tra quella del numero allarmi ed il numero allarmi standard dalla memoria... + if (numByte < 32) numByte = 32; AlarmFlags = new byte[numByte]; if (utils.CRB("verbose")) lg.Info("Fine caricamento vettore allarmi"); } diff --git a/MTC_Sim/VersGen/AdapterVers.cs b/MTC_Sim/VersGen/AdapterVers.cs index a3bff0d..d984186 100644 --- a/MTC_Sim/VersGen/AdapterVers.cs +++ b/MTC_Sim/VersGen/AdapterVers.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.1.20.94")] -[assembly: AssemblyFileVersion("1.1.20.94")] +[assembly: AssemblyVersion("1.1.21.94")] +[assembly: AssemblyFileVersion("1.1.21.94")] [assembly: AssemblyCopyright("Steamware-SCM-CMS © 2015-2016")] [assembly: AssemblyCompany("Steamware-SCM-CMS")] diff --git a/MTC_Sim/VersGen/AdapterVers.tt b/MTC_Sim/VersGen/AdapterVers.tt index 48a2623..a96fffd 100644 --- a/MTC_Sim/VersGen/AdapterVers.tt +++ b/MTC_Sim/VersGen/AdapterVers.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.1.20.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.1.20.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.1.21.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.1.21.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware-SCM-CMS © 2015-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware-SCM-CMS")] <#+