Ok spostamento allarmi e conterList

MTC_Adapter/MTC_Adapter/AdapterESA.cs

@@ -26,7 +26,7 @@ namespace MTC_Adapter
         /// <param name="adpConf"></param>
         public AdapterESA(MainForm caller, AdapterConf adpConf) : base(caller, adpConf)
         {
-            string iniPath = string.Format(@"{0}\{1}\{2}", Application.StartupPath, utils.CRS("adapterConfPath"), utils.CRS("defaultEsaFile"));
+            string iniPath = string.Format(@"{0}\{1}\{2}", Application.StartupPath, utils.CRS("baseConfPath"), utils.CRS("defaultEsaFile"));
 
             if (utils.CRB("verbose")) lg.Info("Start init Adapter ESA dal file {0}", iniPath);
 

MTC_Adapter/MTC_Adapter/AdapterFanuc.cs

@@ -1152,7 +1152,7 @@ namespace MTC_Adapter
             // carico dati x Maintenance
             if (utils.CRB("verbose")) lg.Info("Inizio caricamento vettore variabili manutenzione gestite");
             int totRighe = 0;
-            string fileName = string.Format(@"{0}\{1}", Application.StartupPath, utils.CRS("CmsMaintDataConfFilePath"));
+            string fileName = string.Format(@"{0}\{1}\{2}", Application.StartupPath, utils.CRS("baseConfPath"), utils.CRS("CounterListFilePath"));
             string linea;
             totRighe = File.ReadLines(fileName).Count();
             // creo un vettore della dimensione corretta... conta anche commenti tanto poi riduco...

MTC_Adapter/MTC_Adapter/AdapterGeneric.cs

@@ -1122,7 +1122,7 @@ namespace MTC_Adapter
         {
             if (utils.CRB("verbose")) lg.Info("Inizio caricamento vettore allarmi");
             int totRighe = 0;
-            string fileName = string.Format(@"{0}\{1}", Application.StartupPath, utils.CRS("AlarmList"));
+            string fileName = string.Format(@"{0}\{1}\{2}", Application.StartupPath, utils.CRS("baseConfPath"), utils.CRS("AlarmList"));
             string linea;
             totRighe = File.ReadLines(fileName).Count();
             // creo un vettore della dimensione corretta... conta anche commenti tanto poi riduco...

MTC_Adapter/MTC_Adapter/App.config

@@ -57,9 +57,9 @@
 
     <!--conf file-->
     <add key="genStatConfPath" value="DATA" />
-    <add key="adapterConfPath" value="DATA\CONF" />
+    <add key="baseConfPath" value="DATA\CONF" />
     <add key="persDataPath" value="DATA\DAT" />
-    <add key="AlarmList" value="AlarmList.txt" />
+    <add key="AlarmList" value="AlarmList.map" />
     <add key="SubMode" value="SubMode.txt" />
     <add key="defaultConfFile" value="Adapter_ItemList.xml" />
     <add key="defaultPersLayerFile" value="PersistData.dat" />
@@ -68,7 +68,7 @@
 
     <!--percorso file scambio dati "lenti" e conf MaintData memory area -->
     <add key="GeneralStatusFilePath" value="CmsGeneralStatus.mtc" />
-    <add key="CmsMaintDataConfFilePath" value="CmsMaintDataConf.txt" />
+    <add key="CounterListFilePath" value="CounterList.map" />
     <add key="CmsStatusDataConfFilePath" value="CmsStatusDataConf.txt" />
     <add key="ScmProdFile" value="SCM_prodFile.pro" />
     

MTC_Adapter/MTC_Adapter/MTC-Adapter.csproj

@@ -124,9 +124,9 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="Analisi tempi.txt" />
-    <Content Include="CmsMaintDataConf.txt">
+    <None Include="DATA\CONF\CounterList.map">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+    </None>
     <None Include="App.CMS-FANUC.config">
       <DependentUpon>App.config</DependentUpon>
     </None>
@@ -146,7 +146,7 @@
     <Content Include="Resources\CMS\probe.xml">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Resources\SCM\AlarmListEsaGv.txt" />
+    <None Include="Resources\SCM\AlarmListEsaGv.map" />
     <Content Include="Resources\SCM\Appunti doc CFG.txt" />
     <Content Include="Resources\SCM\Appunti SCM.txt" />
     <Content Include="Resources\SCM\DecodFileProd.txt" />
@@ -237,10 +237,10 @@
     <Content Include="Resources\CMS\FANUC.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="AlarmList.txt">
+    <None Include="DATA\CONF\AlarmList.map">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\CMS\AlarmListFANUC.txt" />
+    </None>
+    <None Include="Resources\CMS\AlarmListFANUC.map" />
     <Content Include="Resources\CMS\Appunti CMS.txt" />
     <Content Include="HaltTypeList.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

MTC_Adapter/MTC_Adapter/MainForm.cs

@@ -285,7 +285,7 @@ namespace MTC_Adapter
         {
             get
             {
-                return string.Format(@"{0}\{1}\{2}", Application.StartupPath, utils.CRS("adapterConfPath"), utils.CRS("defaultConfFile"));
+                return string.Format(@"{0}\{1}\{2}", Application.StartupPath, utils.CRS("baseConfPath"), utils.CRS("defaultConfFile"));
             }
         }
         protected string defPersLayerFile
@@ -1025,7 +1025,7 @@ namespace MTC_Adapter
         /// </summary>
         protected string filePath(string fileName)
         {
-            return string.Format("{0}/{1}", utils.CRS("adapterConfPath"), fileName);
+            return string.Format("{0}/{1}", utils.CRS("baseConfPath"), fileName);
         }
         private void mLoadAdaptConf_Click(object sender, EventArgs e)
         {
@@ -1033,7 +1033,7 @@ namespace MTC_Adapter
             OpenFileDialog openFileDial = new OpenFileDialog();
 
             // directory iniziale
-            openFileDial.InitialDirectory = string.Format(@"{0}\{1}", Application.StartupPath, utils.CRS("adapterConfPath"));
+            openFileDial.InitialDirectory = string.Format(@"{0}\{1}", Application.StartupPath, utils.CRS("baseConfPath"));
             // Set filter options and filter index.
             openFileDial.Filter = "XML Files (.xml)|*.xml|All Files (*.*)|*.*";
             openFileDial.FilterIndex = 1;

MTC_Adapter/MTC_Adapter/SetupAdapter.cs

@@ -33,7 +33,7 @@ namespace MTC_Adapter
         {
             get
             {
-                return string.Format("{0}/{1}", utils.CRS("adapterConfPath"), txtFileName.Text);
+                return string.Format("{0}/{1}", utils.CRS("baseConfPath"), txtFileName.Text);
             }
         }
 

MTC_Adapter/MTC_Adapter/setupTgt.bat

@@ -25,7 +25,7 @@ del %2"MTCA.ico"
 del %2"AlarmList.txt"
 del %2"DATA\CONF\*"
 copy %2"Resources\CMS\CMS.ico" %2"MTCA.ico"
-copy %2"Resources\CMS\AlarmListFANUC.txt" %2"AlarmList.txt"
+copy %2"Resources\CMS\AlarmListFANUC.map" %2"DATA\CONF\AlarmList.map"
 copy %2"Resources\CMS\FANUC.xml" %2"DATA\CONF\Adapter_ItemList.xml"
 goto END
 
@@ -35,7 +35,7 @@ del %2"MTCA.ico"
 del %2"AlarmList.txt"
 del %2"DATA\CONF\*"
 copy %2"Resources\SCM\SCM.ico" %2"MTCA.ico"
-copy %2"Resources\SCM\AlarmListEsaGv.txt" %2"AlarmList.txt"
+copy %2"Resources\SCM\AlarmListEsaGv.map" %2"DATA\CONF\AlarmList.map"
 copy %2"Resources\CMS\SCM_ESA.xml" %2"DATA\CONF\Adapter_ItemList.xml"
 copy %2"Resources\CMS\EsaKvara.ini" %2"DATA\CONF\EsaKvara.ini"
 goto END