From d5cb54009bd4cb0de030c9318a8545c0ef4103ce Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 14 Dec 2019 15:26:17 +0100 Subject: [PATCH] Fix typo x SiemensTorri --- CVCncLib/testSam.dll | Bin 967680 -> 967680 bytes IOB-UT/IOB-UT.csproj | 4 ++-- IOB-UT/packages.config | 2 +- IOB-WIN/DATA/CONF/MAIN.ini | 4 ++-- IOB-WIN/IOB-WIN.csproj | 4 ++-- IOB-WIN/IobSiemensTorri.cs | 2 +- IOB-WIN/packages.config | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CVCncLib/testSam.dll b/CVCncLib/testSam.dll index 57e1aecc90259dc22f3580977affb1462291e6b7..532646bec4e74e449a5860398ffed16d35c4b5ee 100644 GIT binary patch delta 150 zcmZqZux{wEp3uQO^~0CO?$&O`)^4WOZsyi*mey|8)^4`eZuZu0j@E9@)^4uWZtkt! zJcbJejE~AlTu-ucShfDdtD9zR&h2Lw@&GaK_A?9l{_uf}ntpl%pQMVc#m9na&&%9q zzY%er%(Akdk%581*(xTqIJKxarZ_RTG&Lu6I{!vKImY7Yx*PeawKJD5|=crACj>{L9!DEBsHOZ%CHJV4C5{meqXKYSpgrk~!xC#l_&!0fSNQK!=` zCd+NC8{D5VGB7YWTg8MHrxq2*6es4ErskyT6_=zY=9W+A*vKb0U40|p`R#u;^05d3 E0J+LNjsO4v diff --git a/IOB-UT/IOB-UT.csproj b/IOB-UT/IOB-UT.csproj index 923e4ca5..bca7eb00 100644 --- a/IOB-UT/IOB-UT.csproj +++ b/IOB-UT/IOB-UT.csproj @@ -54,8 +54,8 @@ ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - ..\packages\MapoSDK.6.9.1912.1264\lib\net40\MapoSDK.dll + + ..\packages\MapoSDK.6.9.1912.1265\lib\net40\MapoSDK.dll ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll diff --git a/IOB-UT/packages.config b/IOB-UT/packages.config index 42cf0c15..aea12e93 100644 --- a/IOB-UT/packages.config +++ b/IOB-UT/packages.config @@ -1,6 +1,6 @@  - + diff --git a/IOB-WIN/DATA/CONF/MAIN.ini b/IOB-WIN/DATA/CONF/MAIN.ini index 5fd133fb..99c0490f 100644 --- a/IOB-WIN/DATA/CONF/MAIN.ini +++ b/IOB-WIN/DATA/CONF/MAIN.ini @@ -45,14 +45,14 @@ CMDIOB2CALL=/IOB/getIob2call?GWIP= ;STARTLIST=INTERCL_01 ; INTERCLAYS MISCELA -STARTLIST=INTERCL_02 +;STARTLIST=INTERCL_02 ; IMI REMOSA ;STARTLIST=IMI_50 ; SIMULAZIONE verso server ufficio ;STARTLIST=SIMUL_01,SIMUL_02,SIMUL_03,SIMUL_04 -;STARTLIST=SIMUL_01 +STARTLIST=SIMUL_01 ;STARTLIST=TEST MAXCNC=10 \ No newline at end of file diff --git a/IOB-WIN/IOB-WIN.csproj b/IOB-WIN/IOB-WIN.csproj index 22cf0398..c3f14fc4 100644 --- a/IOB-WIN/IOB-WIN.csproj +++ b/IOB-WIN/IOB-WIN.csproj @@ -83,8 +83,8 @@ False ExtLib\krcc.dll - - ..\packages\MapoSDK.6.9.1912.1264\lib\net40\MapoSDK.dll + + ..\packages\MapoSDK.6.9.1912.1265\lib\net40\MapoSDK.dll ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll diff --git a/IOB-WIN/IobSiemensTorri.cs b/IOB-WIN/IobSiemensTorri.cs index 3f71f011..adc44bde 100644 --- a/IOB-WIN/IobSiemensTorri.cs +++ b/IOB-WIN/IobSiemensTorri.cs @@ -145,7 +145,7 @@ namespace IOB_WIN byteSem &= ~(1 << 7); // leggo bit DB700.B1.4 e lo porto al bit 5 --> ciclo test/accensione/spegnimento if ((RawInput[1] & (1 << 4)) != 0) //se RawInput[1] & 16-- > 5° bit-- > TEST - {> + { byteSem += (1 << 5); } // salvo infine variabile bit x invio diff --git a/IOB-WIN/packages.config b/IOB-WIN/packages.config index 484ecd2f..baa43bd0 100644 --- a/IOB-WIN/packages.config +++ b/IOB-WIN/packages.config @@ -1,7 +1,7 @@  - +