diff --git a/IOB-WIN-NEXT.sln b/IOB-WIN-NEXT.sln index 1568a71e..012e126d 100644 --- a/IOB-WIN-NEXT.sln +++ b/IOB-WIN-NEXT.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.29613.14 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersGen", "VersGen\VersGen.csproj", "{58E399F3-9D4E-49D3-AB35-9ED536543D50}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CncLib", "CncLib\CncLib.vbproj", "{2D769FFD-1122-4276-A115-29246E6D23C5}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EgwProxy.MultiCncLib", "EgwProxy.MultiCncLib\EgwProxy.MultiCncLib.vbproj", "{2D769FFD-1122-4276-A115-29246E6D23C5}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EgwProxy.OsaiCncLib", "EgwProxy.OsaiCncLib\EgwProxy.OsaiCncLib.vbproj", "{DC6B309E-F8E9-4BA2-A621-4F617C072533}" EndProject diff --git a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj index d317d19c..0d17b818 100644 --- a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj +++ b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj @@ -81,7 +81,7 @@ ..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll - ..\CncLib\ExtLib\CndexLinkDotNet.dll + ..\EgwProxy.MultiCncLib\ExtLib\CndexLinkDotNet.dll ..\packages\EasyModbusTCP.5.6.0\lib\net40\EasyModbus.dll @@ -842,9 +842,9 @@ - + {2d769ffd-1122-4276-a115-29246e6d23c5} - CncLib + EgwProxy.MultiCncLib {dc6b309e-f8e9-4ba2-a621-4f617c072533} diff --git a/IOB-WIN-NEXT/IobFanuc.cs b/IOB-WIN-NEXT/IobFanuc.cs index 62374e35..8a171a92 100644 --- a/IOB-WIN-NEXT/IobFanuc.cs +++ b/IOB-WIN-NEXT/IobFanuc.cs @@ -1,4 +1,4 @@ -using CncLib.CNC; +using EgwProxy.MultiCncLib.CNC; using IOB_UT_NEXT; using MapoSDK; using System; @@ -169,7 +169,7 @@ namespace IOB_WIN_NEXT FANUC_ref = (FANUC)Runtime.NC; if (isVerboseLog) { - lgInfo("FANUC_ref da CncLib"); + lgInfo("FANUC_ref da EgwProxy.MultiCncLib"); } // disconnetto e connetto... @@ -843,7 +843,7 @@ namespace IOB_WIN_NEXT if (FANUC_ref.Connected) { stopwatch.Restart(); - CncLib.Focas1.ODBDY2_1 answ = FANUC_ref.getAllDynData(); + EgwProxy.MultiCncLib.Focas1.ODBDY2_1 answ = FANUC_ref.getAllDynData(); if (utils.CRB("recTime")) { TimingData.addResult(cIobConf.codIOB, string.Format("PROC-DYN-DATA"), stopwatch.ElapsedTicks); @@ -866,7 +866,7 @@ namespace IOB_WIN_NEXT if (utils.CRB("SendAxPos")) { // salvo le posizioni... - CncLib.Focas1.FAXIS posAx = answ.pos; + EgwProxy.MultiCncLib.Focas1.FAXIS posAx = answ.pos; int[] currPosAbs = posAx.absolute; int i = 0; foreach (var item in currPosAbs) @@ -942,7 +942,7 @@ namespace IOB_WIN_NEXT { Dictionary outVal = new Dictionary(); stopwatch.Restart(); - CncLib.Focas1.ODBSYS answ = FANUC_ref.getSysInfo(); + EgwProxy.MultiCncLib.Focas1.ODBSYS answ = FANUC_ref.getSysInfo(); if (utils.CRB("recTime")) { TimingData.addResult(cIobConf.codIOB, string.Format("SYS-INFO"), stopwatch.ElapsedTicks); diff --git a/IOB-WIN-NEXT/IobFileEurom63.cs b/IOB-WIN-NEXT/IobFileEurom63.cs index 8959ddc4..c6905aa0 100644 --- a/IOB-WIN-NEXT/IobFileEurom63.cs +++ b/IOB-WIN-NEXT/IobFileEurom63.cs @@ -1,4 +1,4 @@ -using CncLib.OPENcontrol; +using EgwProxy.MultiCncLib.OPENcontrol; using IOB_UT_NEXT; using MapoSDK; using Newtonsoft.Json; diff --git a/IOB-WIN-NEXT/IobOSAI.cs b/IOB-WIN-NEXT/IobOSAI.cs index d6e1ec21..23ee4c86 100644 --- a/IOB-WIN-NEXT/IobOSAI.cs +++ b/IOB-WIN-NEXT/IobOSAI.cs @@ -109,7 +109,7 @@ namespace IOB_WIN_NEXT if (isVerboseLog) { - lgInfo(string.Format("INIT OSAI_ref da CncLib come {0}", IOBConf.tipoIob)); + lgInfo(string.Format("INIT OSAI_ref da EgwProxy.MultiCncLib come {0}", IOBConf.tipoIob)); } // disconnetto e connetto... diff --git a/IOB-WIN-NEXT/IobSiemensTorri.cs b/IOB-WIN-NEXT/IobSiemensTorri.cs index 153b4057..e5b1390f 100644 --- a/IOB-WIN-NEXT/IobSiemensTorri.cs +++ b/IOB-WIN-NEXT/IobSiemensTorri.cs @@ -360,7 +360,7 @@ namespace IOB_WIN_NEXT Dictionary outVal = new Dictionary(); #if false inizio = DateTime.Now; - CncLib.Focas1.ODBDY2_1 answ = FANUC_ref.getAllDynData(); + EgwProxy.MultiCncLib.Focas1.ODBDY2_1 answ = FANUC_ref.getAllDynData(); if (utils.CRB("recTime")) TimingData.addResult(string.Format("PROC-DYN-DATA"), DateTime.Now.Subtract(inizio).Ticks); try { @@ -379,7 +379,7 @@ namespace IOB_WIN_NEXT if (utils.CRB("SendAxPos")) { // salvo le posizioni... - CncLib.Focas1.FAXIS posAx = answ.pos; + EgwProxy.MultiCncLib.Focas1.FAXIS posAx = answ.pos; int[] currPosAbs = posAx.absolute; int i = 0; foreach (var item in currPosAbs) diff --git a/IOB-WIN-NEXT/IobSiemensTorri_legacy.cs b/IOB-WIN-NEXT/IobSiemensTorri_legacy.cs index 0ddddeb3..faaf961e 100644 --- a/IOB-WIN-NEXT/IobSiemensTorri_legacy.cs +++ b/IOB-WIN-NEXT/IobSiemensTorri_legacy.cs @@ -788,7 +788,7 @@ namespace IOB_WIN Dictionary outVal = new Dictionary(); #if false inizio = DateTime.Now; - CncLib.Focas1.ODBSYS answ = FANUC_ref.getSysInfo(); + EgwProxy.MultiCncLib.Focas1.ODBSYS answ = FANUC_ref.getSysInfo(); if (utils.CRB("recTime")) TimingData.addResult(string.Format("SYS-INFO"), DateTime.Now.Subtract(inizio).Ticks); try { @@ -904,7 +904,7 @@ namespace IOB_WIN Dictionary outVal = new Dictionary(); #if false inizio = DateTime.Now; - CncLib.Focas1.ODBDY2_1 answ = FANUC_ref.getAllDynData(); + EgwProxy.MultiCncLib.Focas1.ODBDY2_1 answ = FANUC_ref.getAllDynData(); if (utils.CRB("recTime")) TimingData.addResult(string.Format("PROC-DYN-DATA"), DateTime.Now.Subtract(inizio).Ticks); try { @@ -923,7 +923,7 @@ namespace IOB_WIN if (utils.CRB("SendAxPos")) { // salvo le posizioni... - CncLib.Focas1.FAXIS posAx = answ.pos; + EgwProxy.MultiCncLib.Focas1.FAXIS posAx = answ.pos; int[] currPosAbs = posAx.absolute; int i = 0; foreach (var item in currPosAbs) diff --git a/IOB-WIN-NEXT/memAddress.cs b/IOB-WIN-NEXT/memAddress.cs index ebfb9945..307787c0 100644 --- a/IOB-WIN-NEXT/memAddress.cs +++ b/IOB-WIN-NEXT/memAddress.cs @@ -1,4 +1,4 @@ -using CncLib.CNC; +using EgwProxy.MultiCncLib.CNC; using System; using System.Collections.Generic; using System.Linq; diff --git a/IOB-WIN-NEXT/postBuildTgt.bat b/IOB-WIN-NEXT/postBuildTgt.bat index 763b640e..083b35c0 100644 --- a/IOB-WIN-NEXT/postBuildTgt.bat +++ b/IOB-WIN-NEXT/postBuildTgt.bat @@ -57,8 +57,8 @@ REM del %2"DATA\CONF\IOT_WordList.map" REM del %2"DATA\CONF\IOT_DWordList.map" REM del %2"DATA\CONF\IOT_StringList.map" REM del %2"DATA\CONF\EsaKvara.ini" -REM del /S %2"SCMCncLib.dll" -REM del /S %2"SCMCncLib.xml" +REM del /S %2"SCMEgwProxy.MultiCncLib.dll" +REM del /S %2"SCMEgwProxy.MultiCncLib.xml" REM ora verifico tipo controllo esatto... REM if %1 == "CMS-FANUC" goto FANUC REM if %1 == "CMS-SIEMENS" goto SIEMENS diff --git a/IOB-WIN.sln b/IOB-WIN.sln index 793ca0f2..d8f71c25 100644 --- a/IOB-WIN.sln +++ b/IOB-WIN.sln @@ -12,7 +12,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IOB-UT", "IOB-UT\IOB-UT.csp {58E399F3-9D4E-49D3-AB35-9ED536543D50} = {58E399F3-9D4E-49D3-AB35-9ED536543D50} EndProjectSection EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CncLib", "CncLib\CncLib.vbproj", "{2D769FFD-1122-4276-A115-29246E6D23C5}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EgwProxy.MultiCncLib", "EgwProxy.MultiCncLib\EgwProxy.MultiCncLib.vbproj", "{2D769FFD-1122-4276-A115-29246E6D23C5}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EgwProxy.OsaiCncLib", "EgwProxy.OsaiCncLib\EgwProxy.OsaiCncLib.vbproj", "{DC6B309E-F8E9-4BA2-A621-4F617C072533}" EndProject diff --git a/IOB-WIN/IOB-WIN.csproj b/IOB-WIN/IOB-WIN.csproj index 2fa262e2..951e030c 100644 --- a/IOB-WIN/IOB-WIN.csproj +++ b/IOB-WIN/IOB-WIN.csproj @@ -73,7 +73,7 @@ ..\packages\Autoupdater.NET.Official.1.5.1\lib\net40\AutoUpdater.NET.dll - ..\CncLib\ExtLib\CndexLinkDotNet.dll + ..\EgwProxy.MultiCncLib\ExtLib\CndexLinkDotNet.dll False @@ -601,9 +601,9 @@ - + {2d769ffd-1122-4276-a115-29246e6d23c5} - CncLib + EgwProxy.MultiCncLib {dc6b309e-f8e9-4ba2-a621-4f617c072533} diff --git a/IOB-WIN/IobFanuc.cs b/IOB-WIN/IobFanuc.cs index e5e65f4d..5c7de7cd 100644 --- a/IOB-WIN/IobFanuc.cs +++ b/IOB-WIN/IobFanuc.cs @@ -1,4 +1,4 @@ -using CncLib.CNC; +using EgwProxy.MultiCncLib.CNC; using IOB_UT; using MapoSDK; using System; @@ -169,7 +169,7 @@ namespace IOB_WIN FANUC_ref = (FANUC)Runtime.NC; if (isVerboseLog) { - lgInfo("FANUC_ref da CncLib"); + lgInfo("FANUC_ref da EgwProxy.MultiCncLib"); } // disconnetto e connetto... @@ -843,7 +843,7 @@ namespace IOB_WIN if (FANUC_ref.Connected) { stopwatch.Restart(); - CncLib.Focas1.ODBDY2_1 answ = FANUC_ref.getAllDynData(); + EgwProxy.MultiCncLib.Focas1.ODBDY2_1 answ = FANUC_ref.getAllDynData(); if (utils.CRB("recTime")) { TimingData.addResult(cIobConf.codIOB, string.Format("PROC-DYN-DATA"), stopwatch.ElapsedTicks); @@ -866,7 +866,7 @@ namespace IOB_WIN if (utils.CRB("SendAxPos")) { // salvo le posizioni... - CncLib.Focas1.FAXIS posAx = answ.pos; + EgwProxy.MultiCncLib.Focas1.FAXIS posAx = answ.pos; int[] currPosAbs = posAx.absolute; int i = 0; foreach (var item in currPosAbs) @@ -942,7 +942,7 @@ namespace IOB_WIN { Dictionary outVal = new Dictionary(); stopwatch.Restart(); - CncLib.Focas1.ODBSYS answ = FANUC_ref.getSysInfo(); + EgwProxy.MultiCncLib.Focas1.ODBSYS answ = FANUC_ref.getSysInfo(); if (utils.CRB("recTime")) { TimingData.addResult(cIobConf.codIOB, string.Format("SYS-INFO"), stopwatch.ElapsedTicks); diff --git a/IOB-WIN/IobFileEurom63.cs b/IOB-WIN/IobFileEurom63.cs index a05351cc..570e259f 100644 --- a/IOB-WIN/IobFileEurom63.cs +++ b/IOB-WIN/IobFileEurom63.cs @@ -1,4 +1,4 @@ -using CncLib.OPENcontrol; +using EgwProxy.MultiCncLib.OPENcontrol; using IOB_UT; using MapoSDK; using Newtonsoft.Json; diff --git a/IOB-WIN/IobOSAI.cs b/IOB-WIN/IobOSAI.cs index 960c7085..fb7cd067 100644 --- a/IOB-WIN/IobOSAI.cs +++ b/IOB-WIN/IobOSAI.cs @@ -109,7 +109,7 @@ namespace IOB_WIN if (isVerboseLog) { - lgInfo(string.Format("INIT OSAI_ref da CncLib come {0}", IOBConf.tipoIob)); + lgInfo(string.Format("INIT OSAI_ref da EgwProxy.MultiCncLib come {0}", IOBConf.tipoIob)); } // disconnetto e connetto... diff --git a/IOB-WIN/IobSiemensTorri.cs b/IOB-WIN/IobSiemensTorri.cs index fadd5832..a8e9e142 100644 --- a/IOB-WIN/IobSiemensTorri.cs +++ b/IOB-WIN/IobSiemensTorri.cs @@ -298,7 +298,7 @@ namespace IOB_WIN Dictionary outVal = new Dictionary(); #if false inizio = DateTime.Now; - CncLib.Focas1.ODBDY2_1 answ = FANUC_ref.getAllDynData(); + EgwProxy.MultiCncLib.Focas1.ODBDY2_1 answ = FANUC_ref.getAllDynData(); if (utils.CRB("recTime")) TimingData.addResult(string.Format("PROC-DYN-DATA"), DateTime.Now.Subtract(inizio).Ticks); try { @@ -317,7 +317,7 @@ namespace IOB_WIN if (utils.CRB("SendAxPos")) { // salvo le posizioni... - CncLib.Focas1.FAXIS posAx = answ.pos; + EgwProxy.MultiCncLib.Focas1.FAXIS posAx = answ.pos; int[] currPosAbs = posAx.absolute; int i = 0; foreach (var item in currPosAbs) diff --git a/IOB-WIN/IobSiemensTorri_legacy.cs b/IOB-WIN/IobSiemensTorri_legacy.cs index 0ddddeb3..faaf961e 100644 --- a/IOB-WIN/IobSiemensTorri_legacy.cs +++ b/IOB-WIN/IobSiemensTorri_legacy.cs @@ -788,7 +788,7 @@ namespace IOB_WIN Dictionary outVal = new Dictionary(); #if false inizio = DateTime.Now; - CncLib.Focas1.ODBSYS answ = FANUC_ref.getSysInfo(); + EgwProxy.MultiCncLib.Focas1.ODBSYS answ = FANUC_ref.getSysInfo(); if (utils.CRB("recTime")) TimingData.addResult(string.Format("SYS-INFO"), DateTime.Now.Subtract(inizio).Ticks); try { @@ -904,7 +904,7 @@ namespace IOB_WIN Dictionary outVal = new Dictionary(); #if false inizio = DateTime.Now; - CncLib.Focas1.ODBDY2_1 answ = FANUC_ref.getAllDynData(); + EgwProxy.MultiCncLib.Focas1.ODBDY2_1 answ = FANUC_ref.getAllDynData(); if (utils.CRB("recTime")) TimingData.addResult(string.Format("PROC-DYN-DATA"), DateTime.Now.Subtract(inizio).Ticks); try { @@ -923,7 +923,7 @@ namespace IOB_WIN if (utils.CRB("SendAxPos")) { // salvo le posizioni... - CncLib.Focas1.FAXIS posAx = answ.pos; + EgwProxy.MultiCncLib.Focas1.FAXIS posAx = answ.pos; int[] currPosAbs = posAx.absolute; int i = 0; foreach (var item in currPosAbs) diff --git a/IOB-WIN/memAddress.cs b/IOB-WIN/memAddress.cs index 19e0e72d..dc410b2a 100644 --- a/IOB-WIN/memAddress.cs +++ b/IOB-WIN/memAddress.cs @@ -1,4 +1,4 @@ -using CncLib.CNC; +using EgwProxy.MultiCncLib.CNC; using System; using System.Collections.Generic; using System.Linq; diff --git a/IOB-WIN/postBuildTgt.bat b/IOB-WIN/postBuildTgt.bat index d9b7bf82..255a5d11 100644 --- a/IOB-WIN/postBuildTgt.bat +++ b/IOB-WIN/postBuildTgt.bat @@ -57,8 +57,8 @@ REM del %2"DATA\CONF\IOT_WordList.map" REM del %2"DATA\CONF\IOT_DWordList.map" REM del %2"DATA\CONF\IOT_StringList.map" REM del %2"DATA\CONF\EsaKvara.ini" -REM del /S %2"SCMCncLib.dll" -REM del /S %2"SCMCncLib.xml" +REM del /S %2"SCMEgwProxy.MultiCncLib.dll" +REM del /S %2"SCMEgwProxy.MultiCncLib.xml" REM ora verifico tipo controllo esatto... REM if %1 == "CMS-FANUC" goto FANUC REM if %1 == "CMS-SIEMENS" goto SIEMENS