Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor riferimenti progetti tra CncLib --> EgwProxy.MultiCncLib

Browse Source
This commit is contained in:
Samuele Locatelli
2022-05-19 11:33:42 +02:00
parent eeb5c41cae
commit 92ce0eaa41
18 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-NEXT.sln
+1 -1
View File
@@ -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
IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
+3 -3
View File
@@ -81,7 +81,7 @@
<HintPath>..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll</HintPath>
</Reference>
<Reference Include="CndexLinkDotNet">
<HintPath>..\CncLib\ExtLib\CndexLinkDotNet.dll</HintPath>
<HintPath>..\EgwProxy.MultiCncLib\ExtLib\CndexLinkDotNet.dll</HintPath>
</Reference>
<Reference Include="EasyModbus, Version=5.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\EasyModbusTCP.5.6.0\lib\net40\EasyModbus.dll</HintPath>
@@ -842,9 +842,9 @@
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CncLib\CncLib.vbproj">
<ProjectReference Include="..\EgwProxy.MultiCncLib\EgwProxy.MultiCncLib.vbproj">
<Project>{2d769ffd-1122-4276-a115-29246e6d23c5}</Project>
<Name>CncLib</Name>
<Name>EgwProxy.MultiCncLib</Name>
</ProjectReference>
<ProjectReference Include="..\EgwProxy.OsaiCncLib\EgwProxy.OsaiCncLib.vbproj">
<Project>{dc6b309e-f8e9-4ba2-a621-4f617c072533}</Project>
IOB-WIN-NEXT/IobFanuc.cs
+5 -5
View File
@@ -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<string, string> outVal = new Dictionary<string, string>();
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);
IOB-WIN-NEXT/IobFileEurom63.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using CncLib.OPENcontrol;
using EgwProxy.MultiCncLib.OPENcontrol;
using IOB_UT_NEXT;
using MapoSDK;
using Newtonsoft.Json;
IOB-WIN-NEXT/IobOSAI.cs
+1 -1
View File
@@ -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...
IOB-WIN-NEXT/IobSiemensTorri.cs
+2 -2
View File
@@ -360,7 +360,7 @@ namespace IOB_WIN_NEXT
Dictionary<string, string> outVal = new Dictionary<string, string>();
#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)
IOB-WIN-NEXT/IobSiemensTorri_legacy.cs
+3 -3
View File
@@ -788,7 +788,7 @@ namespace IOB_WIN
Dictionary<string, string> outVal = new Dictionary<string, string>();
#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<string, string> outVal = new Dictionary<string, string>();
#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)
IOB-WIN-NEXT/memAddress.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using CncLib.CNC;
using EgwProxy.MultiCncLib.CNC;
using System;
using System.Collections.Generic;
using System.Linq;
IOB-WIN-NEXT/postBuildTgt.bat
+2 -2
View File
@@ -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
IOB-WIN.sln
+1 -1
View File
@@ -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
IOB-WIN/IOB-WIN.csproj
+3 -3
View File
@@ -73,7 +73,7 @@
<HintPath>..\packages\Autoupdater.NET.Official.1.5.1\lib\net40\AutoUpdater.NET.dll</HintPath>
</Reference>
<Reference Include="CndexLinkDotNet">
<HintPath>..\CncLib\ExtLib\CndexLinkDotNet.dll</HintPath>
<HintPath>..\EgwProxy.MultiCncLib\ExtLib\CndexLinkDotNet.dll</HintPath>
</Reference>
<Reference Include="krcc, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
@@ -601,9 +601,9 @@
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CncLib\CncLib.vbproj">
<ProjectReference Include="..\EgwProxy.MultiCncLib\EgwProxy.MultiCncLib.vbproj">
<Project>{2d769ffd-1122-4276-a115-29246e6d23c5}</Project>
<Name>CncLib</Name>
<Name>EgwProxy.MultiCncLib</Name>
</ProjectReference>
<ProjectReference Include="..\EgwProxy.OsaiCncLib\EgwProxy.OsaiCncLib.vbproj">
<Project>{dc6b309e-f8e9-4ba2-a621-4f617c072533}</Project>
IOB-WIN/IobFanuc.cs
+5 -5
View File
@@ -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<string, string> outVal = new Dictionary<string, string>();
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);
IOB-WIN/IobFileEurom63.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using CncLib.OPENcontrol;
using EgwProxy.MultiCncLib.OPENcontrol;
using IOB_UT;
using MapoSDK;
using Newtonsoft.Json;
IOB-WIN/IobOSAI.cs
+1 -1
View File
@@ -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...
IOB-WIN/IobSiemensTorri.cs
+2 -2
View File
@@ -298,7 +298,7 @@ namespace IOB_WIN
Dictionary<string, string> outVal = new Dictionary<string, string>();
#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)
IOB-WIN/IobSiemensTorri_legacy.cs
+3 -3
View File
@@ -788,7 +788,7 @@ namespace IOB_WIN
Dictionary<string, string> outVal = new Dictionary<string, string>();
#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<string, string> outVal = new Dictionary<string, string>();
#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)
IOB-WIN/memAddress.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using CncLib.CNC;
using EgwProxy.MultiCncLib.CNC;
using System;
using System.Collections.Generic;
using System.Linq;
IOB-WIN/postBuildTgt.bat
+2 -2
View File
@@ -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