diff --git a/CVCncLib/CVCncLib.XmlSerializers.dll b/CVCncLib/CVCncLib.XmlSerializers.dll index 6e90fca5..6de091b9 100644 Binary files a/CVCncLib/CVCncLib.XmlSerializers.dll and b/CVCncLib/CVCncLib.XmlSerializers.dll differ diff --git a/CVCncLib/CVCncLib.dll b/CVCncLib/CVCncLib.dll index 17d50266..e6e0e132 100644 Binary files a/CVCncLib/CVCncLib.dll and b/CVCncLib/CVCncLib.dll differ diff --git a/IOB-UT-NEXT/IniFile.cs b/IOB-UT-NEXT/IniFile.cs index 18980675..1ea22447 100644 --- a/IOB-UT-NEXT/IniFile.cs +++ b/IOB-UT-NEXT/IniFile.cs @@ -160,10 +160,16 @@ namespace IOB_UT_NEXT try { int bytesReturned = GetPrivateProfileSection(Section, pReturnedString, bufferSize, FileName); - - //bytesReturned -1 to remove trailing \0 - for (int i = 0; i < bytesReturned - 1; i++) - returnedString.Append((char)Marshal.ReadByte(new IntPtr((uint)pReturnedString + (uint)i))); + if (bytesReturned > 0) + { + //bytesReturned -1 to remove trailing \0 + for (int i = 0; i < bytesReturned - 1; i++) + { + var currPointer = IntPtr.Add(pReturnedString, i); + var currChar = (char)Marshal.ReadByte(currPointer); + returnedString.Append(currChar); + } + } } finally { diff --git a/IOB-WIN-NEXT.sln b/IOB-WIN-NEXT.sln index c3ff9a8b..7627d817 100644 --- a/IOB-WIN-NEXT.sln +++ b/IOB-WIN-NEXT.sln @@ -134,68 +134,68 @@ Global {DC6B309E-F8E9-4BA2-A621-4F617C072533}.SIEMENS|Any CPU.Build.0 = Release|Any CPU {DC6B309E-F8E9-4BA2-A621-4F617C072533}.SIEMENS|x86.ActiveCfg = Release|x86 {DC6B309E-F8E9-4BA2-A621-4F617C072533}.SIEMENS|x86.Build.0 = Release|x86 - {90512E12-29FC-460D-94CC-648C2A072DBD}.CMS-FANUC|Any CPU.ActiveCfg = Debug|Any CPU - {90512E12-29FC-460D-94CC-648C2A072DBD}.CMS-FANUC|Any CPU.Build.0 = Debug|Any CPU + {90512E12-29FC-460D-94CC-648C2A072DBD}.CMS-FANUC|Any CPU.ActiveCfg = Release|Any CPU + {90512E12-29FC-460D-94CC-648C2A072DBD}.CMS-FANUC|Any CPU.Build.0 = Release|Any CPU {90512E12-29FC-460D-94CC-648C2A072DBD}.CMS-FANUC|x86.ActiveCfg = Debug|x86 {90512E12-29FC-460D-94CC-648C2A072DBD}.CMS-FANUC|x86.Build.0 = Debug|x86 - {90512E12-29FC-460D-94CC-648C2A072DBD}.CMS-OSAI|Any CPU.ActiveCfg = Debug|Any CPU - {90512E12-29FC-460D-94CC-648C2A072DBD}.CMS-OSAI|Any CPU.Build.0 = Debug|Any CPU + {90512E12-29FC-460D-94CC-648C2A072DBD}.CMS-OSAI|Any CPU.ActiveCfg = Release|Any CPU + {90512E12-29FC-460D-94CC-648C2A072DBD}.CMS-OSAI|Any CPU.Build.0 = Release|Any CPU {90512E12-29FC-460D-94CC-648C2A072DBD}.CMS-OSAI|x86.ActiveCfg = Debug|x86 {90512E12-29FC-460D-94CC-648C2A072DBD}.CMS-OSAI|x86.Build.0 = Debug|x86 - {90512E12-29FC-460D-94CC-648C2A072DBD}.CMS-SIEMENS|Any CPU.ActiveCfg = Debug|Any CPU - {90512E12-29FC-460D-94CC-648C2A072DBD}.CMS-SIEMENS|Any CPU.Build.0 = Debug|Any CPU + {90512E12-29FC-460D-94CC-648C2A072DBD}.CMS-SIEMENS|Any CPU.ActiveCfg = Release|Any CPU + {90512E12-29FC-460D-94CC-648C2A072DBD}.CMS-SIEMENS|Any CPU.Build.0 = Release|Any CPU {90512E12-29FC-460D-94CC-648C2A072DBD}.CMS-SIEMENS|x86.ActiveCfg = Debug|x86 {90512E12-29FC-460D-94CC-648C2A072DBD}.CMS-SIEMENS|x86.Build.0 = Debug|x86 {90512E12-29FC-460D-94CC-648C2A072DBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {90512E12-29FC-460D-94CC-648C2A072DBD}.Debug|Any CPU.Build.0 = Debug|Any CPU {90512E12-29FC-460D-94CC-648C2A072DBD}.Debug|x86.ActiveCfg = Debug|x86 {90512E12-29FC-460D-94CC-648C2A072DBD}.Debug|x86.Build.0 = Debug|x86 - {90512E12-29FC-460D-94CC-648C2A072DBD}.FANUC|Any CPU.ActiveCfg = Debug|Any CPU - {90512E12-29FC-460D-94CC-648C2A072DBD}.FANUC|Any CPU.Build.0 = Debug|Any CPU + {90512E12-29FC-460D-94CC-648C2A072DBD}.FANUC|Any CPU.ActiveCfg = Release|Any CPU + {90512E12-29FC-460D-94CC-648C2A072DBD}.FANUC|Any CPU.Build.0 = Release|Any CPU {90512E12-29FC-460D-94CC-648C2A072DBD}.FANUC|x86.ActiveCfg = Debug|x86 {90512E12-29FC-460D-94CC-648C2A072DBD}.FANUC|x86.Build.0 = Debug|x86 {90512E12-29FC-460D-94CC-648C2A072DBD}.Release|Any CPU.ActiveCfg = Release|Any CPU {90512E12-29FC-460D-94CC-648C2A072DBD}.Release|Any CPU.Build.0 = Release|Any CPU {90512E12-29FC-460D-94CC-648C2A072DBD}.Release|x86.ActiveCfg = Release|x86 {90512E12-29FC-460D-94CC-648C2A072DBD}.Release|x86.Build.0 = Release|x86 - {90512E12-29FC-460D-94CC-648C2A072DBD}.SCM-ESA|Any CPU.ActiveCfg = Debug|Any CPU - {90512E12-29FC-460D-94CC-648C2A072DBD}.SCM-ESA|Any CPU.Build.0 = Debug|Any CPU + {90512E12-29FC-460D-94CC-648C2A072DBD}.SCM-ESA|Any CPU.ActiveCfg = Release|Any CPU + {90512E12-29FC-460D-94CC-648C2A072DBD}.SCM-ESA|Any CPU.Build.0 = Release|Any CPU {90512E12-29FC-460D-94CC-648C2A072DBD}.SCM-ESA|x86.ActiveCfg = Debug|x86 {90512E12-29FC-460D-94CC-648C2A072DBD}.SCM-ESA|x86.Build.0 = Debug|x86 - {90512E12-29FC-460D-94CC-648C2A072DBD}.SIEMENS|Any CPU.ActiveCfg = Debug|Any CPU - {90512E12-29FC-460D-94CC-648C2A072DBD}.SIEMENS|Any CPU.Build.0 = Debug|Any CPU + {90512E12-29FC-460D-94CC-648C2A072DBD}.SIEMENS|Any CPU.ActiveCfg = Release|Any CPU + {90512E12-29FC-460D-94CC-648C2A072DBD}.SIEMENS|Any CPU.Build.0 = Release|Any CPU {90512E12-29FC-460D-94CC-648C2A072DBD}.SIEMENS|x86.ActiveCfg = Debug|x86 {90512E12-29FC-460D-94CC-648C2A072DBD}.SIEMENS|x86.Build.0 = Debug|x86 - {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.CMS-FANUC|Any CPU.ActiveCfg = Debug|Any CPU - {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.CMS-FANUC|Any CPU.Build.0 = Debug|Any CPU + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.CMS-FANUC|Any CPU.ActiveCfg = Release|Any CPU + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.CMS-FANUC|Any CPU.Build.0 = Release|Any CPU {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.CMS-FANUC|x86.ActiveCfg = Debug|x86 {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.CMS-FANUC|x86.Build.0 = Debug|x86 - {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.CMS-OSAI|Any CPU.ActiveCfg = Debug|Any CPU - {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.CMS-OSAI|Any CPU.Build.0 = Debug|Any CPU + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.CMS-OSAI|Any CPU.ActiveCfg = Release|Any CPU + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.CMS-OSAI|Any CPU.Build.0 = Release|Any CPU {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.CMS-OSAI|x86.ActiveCfg = Debug|x86 {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.CMS-OSAI|x86.Build.0 = Debug|x86 - {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.CMS-SIEMENS|Any CPU.ActiveCfg = Debug|Any CPU - {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.CMS-SIEMENS|Any CPU.Build.0 = Debug|Any CPU + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.CMS-SIEMENS|Any CPU.ActiveCfg = Release|Any CPU + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.CMS-SIEMENS|Any CPU.Build.0 = Release|Any CPU {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.CMS-SIEMENS|x86.ActiveCfg = Debug|x86 {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.CMS-SIEMENS|x86.Build.0 = Debug|x86 {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.Debug|Any CPU.Build.0 = Debug|Any CPU {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.Debug|x86.ActiveCfg = Debug|x86 {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.Debug|x86.Build.0 = Debug|x86 - {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.FANUC|Any CPU.ActiveCfg = Debug|Any CPU - {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.FANUC|Any CPU.Build.0 = Debug|Any CPU + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.FANUC|Any CPU.ActiveCfg = Release|Any CPU + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.FANUC|Any CPU.Build.0 = Release|Any CPU {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.FANUC|x86.ActiveCfg = Debug|x86 {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.FANUC|x86.Build.0 = Debug|x86 {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.Release|Any CPU.ActiveCfg = Release|Any CPU {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.Release|Any CPU.Build.0 = Release|Any CPU {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.Release|x86.ActiveCfg = Release|x86 {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.Release|x86.Build.0 = Release|x86 - {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.SCM-ESA|Any CPU.ActiveCfg = Debug|Any CPU - {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.SCM-ESA|Any CPU.Build.0 = Debug|Any CPU + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.SCM-ESA|Any CPU.ActiveCfg = Release|Any CPU + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.SCM-ESA|Any CPU.Build.0 = Release|Any CPU {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.SCM-ESA|x86.ActiveCfg = Debug|x86 {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.SCM-ESA|x86.Build.0 = Debug|x86 - {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.SIEMENS|Any CPU.ActiveCfg = Debug|Any CPU - {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.SIEMENS|Any CPU.Build.0 = Debug|Any CPU + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.SIEMENS|Any CPU.ActiveCfg = Release|Any CPU + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.SIEMENS|Any CPU.Build.0 = Release|Any CPU {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.SIEMENS|x86.ActiveCfg = Debug|x86 {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.SIEMENS|x86.Build.0 = Debug|x86 EndGlobalSection diff --git a/IOB-WIN-NEXT/AdapterForm.cs b/IOB-WIN-NEXT/AdapterForm.cs index 07d1ab9d..11cd04ba 100644 --- a/IOB-WIN-NEXT/AdapterForm.cs +++ b/IOB-WIN-NEXT/AdapterForm.cs @@ -127,30 +127,21 @@ namespace IOB_WIN_NEXT waitRecMSec = utils.CRI("waitRecMSec"); -#if DEBUG - // Setup the logging view for Sentinel - http://sentinel.codeplex.com - var sentinelTarget = new NLogViewerTarget() - { - Name = "sentinel", - Address = "udp://127.0.0.1:9999", - IncludeNLogData = false - }; - var sentinelRule = new LoggingRule("*", LogLevel.Trace, sentinelTarget); - LogManager.Configuration.AddTarget("sentinel", sentinelTarget); - LogManager.Configuration.LoggingRules.Add(sentinelRule); - -#endif - LogManager.ReconfigExistingLoggers(); lg = LogManager.GetCurrentClassLogger(); displayTaskAndLog("MainForm Starting"); // se abilitato autoload conf leggo file corretto... + + var x = utils.CRB("autoLoadConf"); + lgInfo($"pippo 1 | {x}"); if (utils.CRB("autoLoadConf")) { + lgInfo("pippo 2"); try { + lgInfo("pippo 3"); loadIniFile(defConfFilePath); lgInfo("INI LOADED"); } @@ -159,7 +150,8 @@ namespace IOB_WIN_NEXT displayTaskAndLog(string.Format("Eccezione in autoLoadConf: {0}", exc)); } } - else + + if (IOBConf == null || !utils.CRB("autoLoadConf")) { // definisco e avvio tipo adapter generico tipoScelto = tipoAdapter.ND; diff --git a/IOB-WIN-NEXT/App.config b/IOB-WIN-NEXT/App.config index 42dea407..d0640fb1 100644 --- a/IOB-WIN-NEXT/App.config +++ b/IOB-WIN-NEXT/App.config @@ -1,148 +1,148 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/IOB-WIN-NEXT/DATA/CONF/OPC_UA.ini b/IOB-WIN-NEXT/DATA/CONF/OPC_UA.ini index ed81c1a1..f2883b49 100644 --- a/IOB-WIN-NEXT/DATA/CONF/OPC_UA.ini +++ b/IOB-WIN-NEXT/DATA/CONF/OPC_UA.ini @@ -1,4 +1,4 @@ -;Configurazione IOB-WIN +;Configurazione IOB-WIN [IOB] ;Centro di lavoro OpcUa CNCTYPE=OpcUa @@ -52,9 +52,8 @@ BLINK_FILT=0 [OPTPAR] AUTO_CHANGE_ODL=true CHANGE_ODL_HOURS=24 -CHANGE_ODL_IDLE_MIN=0 -PZCOUNT_MODE=MTC - +CHANGE_ODL_IDLE_MIN=1 +PZCOUNT_MODE=OPC DISABLE_PZCOUNT=FALSE ENABLE_SEND_PZC_BLOCK=TRUE MIN_SEND_PZC_BLOCK=0 @@ -63,9 +62,8 @@ ENABLE_DYN_DATA=FALSE FORCE_DYN_DATA=TRUE ENABLE_DATA_FILTER=TRUE ENABLE_CLI_RESTART=TRUE - ; conf parametri memoria READ/WRITE OPC_PARAM_CONF=OPC_UA.json [BRANCH] -NAME=master \ No newline at end of file +NAME=master diff --git a/IOB-WIN-NEXT/MainForm.Designer.cs b/IOB-WIN-NEXT/MainForm.Designer.cs index 5cc9cd87..d33fa58a 100644 --- a/IOB-WIN-NEXT/MainForm.Designer.cs +++ b/IOB-WIN-NEXT/MainForm.Designer.cs @@ -257,7 +257,7 @@ // notifyIcon1 // this.notifyIcon1.ContextMenuStrip = this.trayMenu; - this.notifyIcon1.Text = "IOB-WIN"; + this.notifyIcon1.Text = "IOB-WIN-NEXT"; this.notifyIcon1.Visible = true; this.notifyIcon1.DoubleClick += new System.EventHandler(this.notifyIcon1_DoubleClick); // diff --git a/IOB-WIN-NEXT/MainForm.cs b/IOB-WIN-NEXT/MainForm.cs index 43450396..a6b370ca 100644 --- a/IOB-WIN-NEXT/MainForm.cs +++ b/IOB-WIN-NEXT/MainForm.cs @@ -536,12 +536,12 @@ namespace IOB_WIN_NEXT // SE permessa massimizzazione... if (utils.CRB("windowCanMax")) { - trayMenu.Items.Add("Show IOB-WIN"); + trayMenu.Items.Add("Show IOB-WIN-NEXT"); } // se è permesso tray close... if (utils.CRB("trayClose")) { - trayMenu.Items.Add("Close IOB-WIN"); + trayMenu.Items.Add("Close IOB-WIN-NEXT"); } }