diff --git a/IOB-WIN-FANUC/DATA/CONF/MAIN.ini b/IOB-WIN-FANUC/DATA/CONF/MAIN.ini index 866f3a85..a8da23f6 100644 --- a/IOB-WIN-FANUC/DATA/CONF/MAIN.ini +++ b/IOB-WIN-FANUC/DATA/CONF/MAIN.ini @@ -19,8 +19,8 @@ CLI_INST=SteamWareSim ;STARTLIST=SIMUL_01,SIMUL_02,SIMUL_03,SIMUL_04 ;STARTLIST=SIMUL_01 ;STARTLIST=3025,3027,3028 -;STARTLIST=VL27 -STARTLIST=3025 +;STARTLIST=3025 +STARTLIST=VL27 MAXCNC=10 \ No newline at end of file diff --git a/IOB-WIN-FANUC/ILLink/ILLink.Descriptors.LibraryBuild.xml b/IOB-WIN-FANUC/ILLink/ILLink.Descriptors.LibraryBuild.xml deleted file mode 100644 index a42d7f0e..00000000 --- a/IOB-WIN-FANUC/ILLink/ILLink.Descriptors.LibraryBuild.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/IOB-WIN-FANUC/IOB-WIN-FANUC.csproj b/IOB-WIN-FANUC/IOB-WIN-FANUC.csproj index 48490dce..5c4c460d 100644 --- a/IOB-WIN-FANUC/IOB-WIN-FANUC.csproj +++ b/IOB-WIN-FANUC/IOB-WIN-FANUC.csproj @@ -125,7 +125,6 @@ - Always @@ -160,18 +159,10 @@ - - Always - - - Always - - - Always - - - Always - + + + + @@ -204,9 +195,7 @@ - - Always - + Always diff --git a/IOB-WIN-FORM/AdapterForm.cs b/IOB-WIN-FORM/AdapterForm.cs index ac39c568..69b917d2 100644 --- a/IOB-WIN-FORM/AdapterForm.cs +++ b/IOB-WIN-FORM/AdapterForm.cs @@ -138,7 +138,7 @@ namespace IOB_WIN_FORM { needSend = true; // attendo meno di 1 min x il prox... - int ttlSec = rndGen.Next(30, 45); + int ttlSec = rndGen.Next(20, 30); redisMan.setRSV(redKey, $"{DateTime.Now}", ttlSec); } try diff --git a/IOB-WIN-MITSUBISHI/DATA/CONF/MAIN.ini b/IOB-WIN-MITSUBISHI/DATA/CONF/MAIN.ini index a7598cea..9a092dfe 100644 --- a/IOB-WIN-MITSUBISHI/DATA/CONF/MAIN.ini +++ b/IOB-WIN-MITSUBISHI/DATA/CONF/MAIN.ini @@ -17,6 +17,7 @@ CLI_INST=SteamWareSim ;--- TEST sul campo ; SIMULAZIONE verso server ufficio ;STARTLIST=SIMUL_01,SIMUL_02,SIMUL_03,SIMUL_04 +;STARTLIST=VL28 STARTLIST=VL28 diff --git a/IOB-WIN-MITSUBISHI/Iob/Mitsubishi.cs b/IOB-WIN-MITSUBISHI/Iob/Mitsubishi.cs index 9c1f2bdc..c370dec7 100644 --- a/IOB-WIN-MITSUBISHI/Iob/Mitsubishi.cs +++ b/IOB-WIN-MITSUBISHI/Iob/Mitsubishi.cs @@ -472,6 +472,7 @@ namespace IOB_WIN_MITSUBISHI.Iob outVal.Add(item.Key, $"{DictVar[iVar]}"); } //upsertKey(item.Key, $"{DictVar[iVar]}"); + upsertKeyLP(item.Key, $"{DictVar[iVar]}"); } } } @@ -1965,95 +1966,6 @@ namespace IOB_WIN_MITSUBISHI.Iob } } -#if false - /// - /// Scrive valore richiesto nella memoria richiesta - /// - /// - /// - /// - /// - private bool writeMitsubMem(string memName, string memAddr, int valReq) - { - bool answ = false; - lgTrace($"INIT {memName} | memAddr: {memAddr}"); - // contapezzi ATTUALE - if (!string.IsNullOrEmpty(memAddr)) - { - if (memAddr.StartsWith("STD")) - { - // inizio verifica area memoria/parametro levando prima parte codice - memAddr = memAddr.Replace("STD.", ""); - } - // var di appoggio - int cntAddr = 0; - // verifico se si tratta di tipo VAR... formato tipo VAR.501 - if (memAddr.StartsWith("VAR.")) - { - // recupero parametro... - int.TryParse(memAddr.Replace("VAR.", ""), out cntAddr); - lgTrace($"VAR | {memName} Write 01 | memAddr: {memAddr} | idx: {cntAddr}"); - // processo SET valore - sw.Restart(); - if (cntAddr > 0) - { - double vTransf = (double)valReq; - // scrivo valore - int iRet = oEZNcAutCom.CommonVariable_Write2(cntAddr, vTransf, 1); - // trimmo se necessario memName... - if (memName.Length > maxVarStrLen) - { - memName = memName.Substring(0, maxVarStrLen); - } - // scrivo label - iRet = oEZNcAutCom.CommonVariable_SetName(cntAddr, memName); - lgTrace($"VAR | {memName} Write 02 | memAddr: {memAddr} | valReq: {valReq} | vTransf: {vTransf}"); - if (utils.CRB("recTime")) - { - TimingData.addResult(cIobConf.codIOB, "VAR-W", sw.ElapsedTicks); - } - answ = iRet == 0; - // se successo --> rileggo! - if (answ) - { - ReadMitsubVars(); - } - } - sw.Stop(); - } - else if (memAddr.StartsWith("PAR.")) - { - // recupero parametro... - int.TryParse(memAddr.Replace("PAR.", ""), out cntAddr); - lgTrace($"PAR | {memName} Write 01 | memAddr: {memAddr} | idx: {cntAddr}"); - // processo SET valore - sw.Restart(); - if (cntAddr > 0) - { - // scrivo pz req come PAR... - int lAxis = 0; - string[] sValue = new string[1]; - sValue[0] = $"{valReq}"; - int iRet = oEZNcAutCom.Parameter_SetData3(0, cntAddr, lAxis, (object)sValue); - lgTrace($"PAR | {memName} Write 02 | memAddr: {memAddr} | valReq: {valReq}"); - if (utils.CRB("recTime")) - { - TimingData.addResult(cIobConf.codIOB, "PAR-W", sw.ElapsedTicks); - } - answ = iRet == 0; - // se successo --> rileggo! - if (answ) - { - ReadMitsubParams(); - } - } - sw.Stop(); - } - } - return answ; - } -#endif - /// /// Scrive valore richiesto nella memoria richiesta ///