diff --git a/IOB-WIN-NEXT/DATA/CONF/3023.ini b/IOB-WIN-NEXT/DATA/CONF/3023.ini index 9ba3cf1a..c33a9a6a 100644 --- a/IOB-WIN-NEXT/DATA/CONF/3023.ini +++ b/IOB-WIN-NEXT/DATA/CONF/3023.ini @@ -64,11 +64,11 @@ BLINK_FILT=0 ;ENABLE_PZ_RESET=TRUE ;ENABLE_PZ_RESET_stopSetup=TRUE ;gestione invio pezzi in blocco -STATE_VAR=VarADS.StatoMacchina +;STATE_VAR=VarADS.StatoMacchina ENABLE_SEND_PZC_BLOCK=TRUE -MIN_SEND_PZC_BLOCK=5 +MIN_SEND_PZC_BLOCK=2 MAX_SEND_PZC_BLOCK=100 -EARLY_CONNECT=FALSE + PARAM_CONF=3023.json [BRANCH] diff --git a/IOB-WIN-NEXT/IobBeckhoff.cs b/IOB-WIN-NEXT/IobBeckhoff.cs index a97bebdc..58d68f0f 100644 --- a/IOB-WIN-NEXT/IobBeckhoff.cs +++ b/IOB-WIN-NEXT/IobBeckhoff.cs @@ -58,7 +58,7 @@ namespace IOB_WIN_NEXT private void AdsCli_ValueChanged(TcAdsClient sender, string key, string value) { - lg.Info($"Status changed | sender: {sender} | key: {key} | value: {value}"); + lg.Info($"Monitored Value changed | sender: {sender} | key: {key} | value: {value}"); } #endregion Private Methods @@ -96,7 +96,7 @@ namespace IOB_WIN_NEXT } catch (Exception exc) { - lgError(exc, "Errore in getDynData x Siemens PLC"); + lgError(exc, "Errore in getDynData x BeckHoff PLC"); } } else @@ -138,7 +138,7 @@ namespace IOB_WIN_NEXT // predispongo dataVal foreach (var item in memMap.mMapRead) { - dataVal.Add(item.Key); + dataVal.Add(item.Value.memAddr); } // vera connessione! diff --git a/IOB-WIN-NEXT/IobBeckhoffCpa.cs b/IOB-WIN-NEXT/IobBeckhoffCpa.cs index b73c50dc..cf6fde46 100644 --- a/IOB-WIN-NEXT/IobBeckhoffCpa.cs +++ b/IOB-WIN-NEXT/IobBeckhoffCpa.cs @@ -52,15 +52,6 @@ namespace IOB_WIN_NEXT { tryConnect(); } -#if false - // FIXME leggere conf da file parametri - int port = 851; - int.TryParse(IOBConf.cncPort, out port); - string addr = !string.IsNullOrEmpty(IOBConf.cncIpAddr) ? IOBConf.cncIpAddr : "local"; - lgInfo($"Parametri TC client | addr: {addr} | port: {port}"); - AdsCli = new TcAdsClient(dataVal, addr, port); - //AdsCli = new TcAdsClient(dataVal, "5.97.72.66.1.1", 851); -#endif if (AdsCli != null) { readCurrVal(); @@ -254,6 +245,9 @@ namespace IOB_WIN_NEXT B_input = 0; currDispData.semIn = Semaforo.SR; } + // indico emergenza ARMATA + B_input += (1 << 7); + // in base all'enum di status compilo valori... switch (currStatus) { @@ -270,7 +264,8 @@ namespace IOB_WIN_NEXT break; case 3: - B_input += (1 << 7); + // tolgo emergenza SE fosse premuta (force zero) + B_input &= ~(1 << 7); break; case 1: