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

Update FANUC con test Jetco 3027 OK

Browse Source
This commit is contained in:
Samuele Locatelli
2025-01-21 17:22:57 +01:00
parent 063bf2c93b
commit 5c751bd5ce
6 changed files with 50 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-FANUC/DATA/CONF/MAIN.ini
+1 -1
View File
@@ -19,7 +19,7 @@ CLI_INST=SteamWareSim
;STARTLIST=SIMUL_01,SIMUL_02,SIMUL_03,SIMUL_04
;STARTLIST=SIMUL_01
;STARTLIST=3025,3027,3028
STARTLIST=3028
STARTLIST=3027
MAXCNC=10
IOB-WIN-FANUC/IOB-WIN-FANUC.csproj
+3
View File
@@ -62,6 +62,9 @@
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Pipelines.Sockets.Unofficial, Version=1.0.0.0, Culture=neutral, PublicKeyToken=42ea0a778e13fbe2, processorArchitecture=MSIL">
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.2.8\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.8.24\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
IOB-WIN-FANUC/postBuildTgt.bat
+43 -43
View File
@@ -1,49 +1,49 @@
@echo off
echo Inizio processing After Build: configurazione %1 , directory %2
RD /S /Q %2"\lib\ar"
RD /S /Q %2"\lib\cs"
RD /S /Q %2"\lib\da"
RD /S /Q %2"\lib\de"
RD /S /Q %2"\lib\es"
RD /S /Q %2"\lib\fr"
RD /S /Q %2"\lib\it"
RD /S /Q %2"\lib\ja-JP"
RD /S /Q %2"\lib\ko"
RD /S /Q %2"\lib\lv"
RD /S /Q %2"\lib\nl"
RD /S /Q %2"\lib\pl"
RD /S /Q %2"\lib\pt"
RD /S /Q %2"\lib\pt-BR"
RD /S /Q %2"\lib\ru"
RD /S /Q %2"\lib\sk"
RD /S /Q %2"\lib\sv"
RD /S /Q %2"\lib\th"
RD /S /Q %2"\lib\tr"
RD /S /Q %2"\lib\zh"
RD /S /Q %2"\lib\zh-TW"
MOVE /Y %2"ar" %2"lib\"
MOVE /Y %2"cs" %2"lib\"
MOVE /Y %2"da" %2"lib\"
MOVE /Y %2"de" %2"lib\"
MOVE /Y %2"es" %2"lib\"
MOVE /Y %2"fr" %2"lib\"
MOVE /Y %2"it" %2"lib\"
MOVE /Y %2"ja-JP" %2"lib\"
MOVE /Y %2"ko" %2"lib\"
MOVE /Y %2"lv" %2"lib\"
MOVE /Y %2"nl" %2"lib\"
MOVE /Y %2"pl" %2"lib\"
MOVE /Y %2"pt" %2"lib\"
MOVE /Y %2"pt-BR" %2"lib\"
MOVE /Y %2"ru" %2"lib\"
MOVE /Y %2"sk" %2"lib\"
MOVE /Y %2"sv" %2"lib\"
MOVE /Y %2"th" %2"lib\"
MOVE /Y %2"tr" %2"lib\"
MOVE /Y %2"zh" %2"lib\"
MOVE /Y %2"zh-TW" %2"lib\"
REM RD /S /Q %2"\lib\ar"
REM RD /S /Q %2"\lib\cs"
REM RD /S /Q %2"\lib\da"
REM RD /S /Q %2"\lib\de"
REM RD /S /Q %2"\lib\es"
REM RD /S /Q %2"\lib\fr"
REM RD /S /Q %2"\lib\it"
REM RD /S /Q %2"\lib\ja-JP"
REM RD /S /Q %2"\lib\ko"
REM RD /S /Q %2"\lib\lv"
REM RD /S /Q %2"\lib\nl"
REM RD /S /Q %2"\lib\pl"
REM RD /S /Q %2"\lib\pt"
REM RD /S /Q %2"\lib\pt-BR"
REM RD /S /Q %2"\lib\ru"
REM RD /S /Q %2"\lib\sk"
REM RD /S /Q %2"\lib\sv"
REM RD /S /Q %2"\lib\th"
REM RD /S /Q %2"\lib\tr"
REM RD /S /Q %2"\lib\zh"
REM RD /S /Q %2"\lib\zh-TW"
REM
REM MOVE /Y %2"ar" %2"lib\"
REM MOVE /Y %2"cs" %2"lib\"
REM MOVE /Y %2"da" %2"lib\"
REM MOVE /Y %2"de" %2"lib\"
REM MOVE /Y %2"es" %2"lib\"
REM MOVE /Y %2"fr" %2"lib\"
REM MOVE /Y %2"it" %2"lib\"
REM MOVE /Y %2"ja-JP" %2"lib\"
REM MOVE /Y %2"ko" %2"lib\"
REM MOVE /Y %2"lv" %2"lib\"
REM MOVE /Y %2"nl" %2"lib\"
REM MOVE /Y %2"pl" %2"lib\"
REM MOVE /Y %2"pt" %2"lib\"
REM MOVE /Y %2"pt-BR" %2"lib\"
REM MOVE /Y %2"ru" %2"lib\"
REM MOVE /Y %2"sk" %2"lib\"
REM MOVE /Y %2"sv" %2"lib\"
REM MOVE /Y %2"th" %2"lib\"
REM MOVE /Y %2"tr" %2"lib\"
REM MOVE /Y %2"zh" %2"lib\"
REM MOVE /Y %2"zh-TW" %2"lib\"
if %1 == "Release" goto ReleaseExec
IOB-WIN-FORM/IOB-WIN-FORM.csproj
-16
View File
@@ -38,15 +38,6 @@
<Reference Include="MathNet.Numerics, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MathNet.Numerics.5.0.0\lib\net461\MathNet.Numerics.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.WebView2.Core, Version=1.0.2903.40, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.2903.40\lib\net462\Microsoft.Web.WebView2.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.WebView2.WinForms, Version=1.0.2903.40, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.2903.40\lib\net462\Microsoft.Web.WebView2.WinForms.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.WebView2.Wpf, Version=1.0.2903.40, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.2903.40\lib\net462\Microsoft.Web.WebView2.Wpf.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
@@ -123,11 +114,4 @@
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\Microsoft.Web.WebView2.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\Microsoft.Web.WebView2.targets'))" />
</Target>
</Project>
IOB-WIN-FORM/MainForm.cs
+3 -1
View File
@@ -706,6 +706,7 @@ namespace IOB_WIN_FORM
this.LayoutMdi(MdiLayout.TileHorizontal);
}
#if false
private void AutoUpdater_ApplicationExitEvent()
{
displayTaskAndLog("Chiusura Adapters");
@@ -717,7 +718,8 @@ namespace IOB_WIN_FORM
Thread.Sleep(1000);
// ESCO!
Application.Exit();
}
}
#endif
/// <summary>
/// Effettua verifiche varie comunicazione verso PLC e verso server
IOB-WIN-FORM/packages.config
-1
View File
@@ -2,7 +2,6 @@
<packages>
<package id="MapoSDK" version="6.14.2411.518" targetFramework="net462" />
<package id="MathNet.Numerics" version="5.0.0" targetFramework="net462" />
<package id="Microsoft.Web.WebView2" version="1.0.2903.40" targetFramework="net462" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
<package id="NLog" version="5.3.4" targetFramework="net462" />
<package id="System.IO" version="4.3.0" targetFramework="net462" />