diff --git a/MTC_Adapter/MTC_Adapter.sln b/MTC_Adapter/MTC_Adapter.sln index b2850fc..eb90f5a 100644 --- a/MTC_Adapter/MTC_Adapter.sln +++ b/MTC_Adapter/MTC_Adapter.sln @@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26403.7 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetAdapterSDK", "..\..\..\GitHub\MTConnect\dot_net_sdk\DotNetAdapterSDK.csproj", "{D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{695A97F7-B396-4DD3-8596-F043ECA3E2BD}" ProjectSection(SolutionItems) = preProject Y:\30_Clienti\CMS\CMS-MTC\SetupMTC\AGENT\DATA\CONF_DEMO\Agent_ItemList_ESAKVARA.xml = Y:\30_Clienti\CMS\CMS-MTC\SetupMTC\AGENT\DATA\CONF_DEMO\Agent_ItemList_ESAKVARA.xml @@ -26,6 +24,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MTC-ADB", "MTC-ADB\MTC-ADB. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MTC", "MTC\MTC.csproj", "{EC83D80E-9F3B-4DE9-B16A-CA216543B7EC}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetAdapterSDK", "..\..\..\..\GitHub\MTConnect\dot_net_sdk\DotNetAdapterSDK.csproj", "{D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution CMS-FANUC|Any CPU = CMS-FANUC|Any CPU @@ -37,19 +37,6 @@ Global SCM-ESA|Any CPU = SCM-ESA|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.CMS-FANUC|Any CPU.ActiveCfg = Release|Any CPU - {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.CMS-FANUC|Any CPU.Build.0 = Release|Any CPU - {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.CMS-OSAI|Any CPU.ActiveCfg = Release|Any CPU - {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.CMS-OSAI|Any CPU.Build.0 = Release|Any CPU - {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.CMS-SIEMENS|Any CPU.ActiveCfg = Release|Any CPU - {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.MySql|Any CPU.ActiveCfg = Release|Any CPU - {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.MySql|Any CPU.Build.0 = Release|Any CPU - {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.Release|Any CPU.Build.0 = Release|Any CPU - {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.SCM-ESA|Any CPU.ActiveCfg = Release|Any CPU - {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.SCM-ESA|Any CPU.Build.0 = Release|Any CPU {2D769FFD-1122-4276-A115-29246E6D23C5}.CMS-FANUC|Any CPU.ActiveCfg = Release|Any CPU {2D769FFD-1122-4276-A115-29246E6D23C5}.CMS-FANUC|Any CPU.Build.0 = Release|Any CPU {2D769FFD-1122-4276-A115-29246E6D23C5}.CMS-OSAI|Any CPU.ActiveCfg = Release|Any CPU @@ -134,6 +121,20 @@ Global {EC83D80E-9F3B-4DE9-B16A-CA216543B7EC}.Release|Any CPU.Build.0 = Release|Any CPU {EC83D80E-9F3B-4DE9-B16A-CA216543B7EC}.SCM-ESA|Any CPU.ActiveCfg = Release|Any CPU {EC83D80E-9F3B-4DE9-B16A-CA216543B7EC}.SCM-ESA|Any CPU.Build.0 = Release|Any CPU + {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.CMS-FANUC|Any CPU.ActiveCfg = Release|Any CPU + {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.CMS-FANUC|Any CPU.Build.0 = Release|Any CPU + {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.CMS-OSAI|Any CPU.ActiveCfg = Release|Any CPU + {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.CMS-OSAI|Any CPU.Build.0 = Release|Any CPU + {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.CMS-SIEMENS|Any CPU.ActiveCfg = Release|Any CPU + {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.CMS-SIEMENS|Any CPU.Build.0 = Release|Any CPU + {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.MySql|Any CPU.ActiveCfg = Release|Any CPU + {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.MySql|Any CPU.Build.0 = Release|Any CPU + {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.Release|Any CPU.Build.0 = Release|Any CPU + {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.SCM-ESA|Any CPU.ActiveCfg = Release|Any CPU + {D8D08DBE-B511-4DE0-B5A9-563EBFC60C4F}.SCM-ESA|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs index ebff4c7..670cd50 100644 --- a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs +++ b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs @@ -1613,6 +1613,9 @@ namespace MTC_Adapter #region metodi adapter + /// + /// lettura file di persistenza + /// public void loadPersData() { try diff --git a/MTC_Adapter/MTC_Adapter/DATA/CONF/IOT_StringList.map b/MTC_Adapter/MTC_Adapter/DATA/CONF/IOT_StringList.map index 4664554..7e9dfac 100644 --- a/MTC_Adapter/MTC_Adapter/DATA/CONF/IOT_StringList.map +++ b/MTC_Adapter/MTC_Adapter/DATA/CONF/IOT_StringList.map @@ -1,5 +1,5 @@ # Commenti con cancelletto, struttura un variabile per riga, tipo chiave|valore (occhio che il separatore è configurato da .cofig come "testCharSep"); spazi e tabulazioni dovrei trimmarli in acquisizione (qui inseriti per comodità di lettura) -001|IOT_PGMID_A1 |STRING -002|IOT_PGMID_A2 |STRING -003|IOT_PGMID_A3 |STRING -004|IOT_PGMID_A4 |STRING \ No newline at end of file +1 001|IOT_PGMID_A1 |STRING +2 002|IOT_PGMID_A2 |STRING +3 003|IOT_PGMID_A3 |STRING +4 004|IOT_PGMID_A4 |STRING \ No newline at end of file diff --git a/MTC_Adapter/MTC_Adapter/MTC-Adapter.csproj b/MTC_Adapter/MTC_Adapter/MTC-Adapter.csproj index 0f9fdc4..9775d1b 100644 --- a/MTC_Adapter/MTC_Adapter/MTC-Adapter.csproj +++ b/MTC_Adapter/MTC_Adapter/MTC-Adapter.csproj @@ -306,6 +306,7 @@ + @@ -397,4 +398,7 @@ + + "$(ProjectDir)postBuildTgt.bat" "$(ConfigurationName)" "$(TargetDir)" + \ No newline at end of file diff --git a/MTC_Adapter/MTC_Adapter/postBuildTgt.bat b/MTC_Adapter/MTC_Adapter/postBuildTgt.bat new file mode 100644 index 0000000..ad0fea5 --- /dev/null +++ b/MTC_Adapter/MTC_Adapter/postBuildTgt.bat @@ -0,0 +1,58 @@ +@echo off +echo Effettua pulizia post build: configurazione %1. directory %2 + + REM INIZIO eliminando i files che COMUNQUE devo copiare x target... +del /S %2"*.pdb"" + + + if %1 == "Release" goto Release + if %1 == "Debug" goto Debug + if %1 == "CMS-FANUC" goto CMS + if %1 == "CMS-OSAI" goto CMS + if %1 == "CMS-SIEMENS" goto CMS + if %1 == "SCM-ESA" goto SCM + + :Release + echo Release: nulla da eliminare + goto END + + :Debug + echo Debug: nulla da eliminare + goto END + +:CMS +echo CMS: Elimino files IOT di SCM +del %2"DATA\CONF\IOT_ByteList.map" +del %2"DATA\CONF\IOT_WordList.map" +del %2"DATA\CONF\IOT_DWordList.map" +del %2"DATA\CONF\IOT_StringList.map" +del %2"DATA\CONF\EsaKvara.ini" +del /S %2"SCMCncLib.dll" +del /S %2"SCMCncLib.xml" +ora verifico tipo controllo esatto... +if %1 == "CMS-FANUC" goto FANUC +if %1 == "CMS-SIEMENS" goto SIEMENS +if %1 == "CMS-OSAI" goto OSAI + +:SCM +echo SCM: Elimino files IOT di CMS +del %2"DATA\CONF\AnalogData.map" +del %2"DATA\CONF\CounterList.map" +del %2"DATA\CONF\HaltTypeList.map" +del %2"DATA\CONF\StatusList.map" +del %2"DATA\CONF\SubModeList.map" +del /S %2"CMSCncLib.dll" +del /S %2"CMSCncLib.xml" +goto END + +:FANUC +goto END + +:SIEMENS +goto END + +:OSAI +goto END + +:END +echo Fatto! \ No newline at end of file diff --git a/MTC_Adapter/MTC_Adapter/setupTgt.bat b/MTC_Adapter/MTC_Adapter/setupTgt.bat index 82b460d..dfc906a 100644 --- a/MTC_Adapter/MTC_Adapter/setupTgt.bat +++ b/MTC_Adapter/MTC_Adapter/setupTgt.bat @@ -20,10 +20,6 @@ del %2"DATA\CONF\EsaKvara.ini" copy %2"Resources\SCM\EsaKvara_SIM.ini" %2"DATA\CONF\EsaKvara.ini" goto END -:Installer -echo Installer: non devo copiare nulla -goto END - :CMS echo CMS: copio files CMS - Zogno del %2"Resources\MTCA.ico"