diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs index 623d61f..9bfde8e 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs @@ -47,10 +47,13 @@ //tcpService.write("*WAI"); //freqRequest++; - + //Thread.Sleep(2000); + //tcpService.write("*CLS"); + //Thread.Sleep(100); tcpService.write("MEAS:FREQ?"); //tcpService.write("READ?"); - + //Thread.Sleep(1000); + return tcpService.read(); } catch (Exception ex) @@ -73,7 +76,8 @@ //tcpService.write("INIT"); //tcpService.write("*WAI"); - + tcpService.write("*CLS"); + //Thread.Sleep(100); tcpService.write("MEAS:PERIOD?"); return tcpService.read(); diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs index 623d61f..9bfde8e 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs @@ -47,10 +47,13 @@ //tcpService.write("*WAI"); //freqRequest++; - + //Thread.Sleep(2000); + //tcpService.write("*CLS"); + //Thread.Sleep(100); tcpService.write("MEAS:FREQ?"); //tcpService.write("READ?"); - + //Thread.Sleep(1000); + return tcpService.read(); } catch (Exception ex) @@ -73,7 +76,8 @@ //tcpService.write("INIT"); //tcpService.write("*WAI"); - + tcpService.write("*CLS"); + //Thread.Sleep(100); tcpService.write("MEAS:PERIOD?"); return tcpService.read(); diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs index 4f0bb8a..f91f2d2 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs @@ -2,6 +2,7 @@ using Casic.Birmm.RbFreqStandMeasure.VISA.Port; using Casic.Birmm.RbFreqStandMeasure.VISA.Ulitity; using System; +using System.Collections.Generic; using System.Reflection; namespace Casic.Birmm.RbFreqStandMeasure.R_DevService.Service.Impl @@ -11,17 +12,21 @@ public string[] getId() { string[] counterId; + List strList = new List(); try { counterId = PortUltility.FindAddresses(PortType.LAN); - + foreach (string counter in counterId) + if (!counter.Contains("53230")) + strList.Add(counter); + } catch (Exception ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "tcp getId : " + ex.Message); counterId = null; } - return counterId; + return strList.ToArray(); } private PortOperatorBase _portOperatorBaseTcp; diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs index 623d61f..9bfde8e 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs @@ -47,10 +47,13 @@ //tcpService.write("*WAI"); //freqRequest++; - + //Thread.Sleep(2000); + //tcpService.write("*CLS"); + //Thread.Sleep(100); tcpService.write("MEAS:FREQ?"); //tcpService.write("READ?"); - + //Thread.Sleep(1000); + return tcpService.read(); } catch (Exception ex) @@ -73,7 +76,8 @@ //tcpService.write("INIT"); //tcpService.write("*WAI"); - + tcpService.write("*CLS"); + //Thread.Sleep(100); tcpService.write("MEAS:PERIOD?"); return tcpService.read(); diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs index 4f0bb8a..f91f2d2 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs @@ -2,6 +2,7 @@ using Casic.Birmm.RbFreqStandMeasure.VISA.Port; using Casic.Birmm.RbFreqStandMeasure.VISA.Ulitity; using System; +using System.Collections.Generic; using System.Reflection; namespace Casic.Birmm.RbFreqStandMeasure.R_DevService.Service.Impl @@ -11,17 +12,21 @@ public string[] getId() { string[] counterId; + List strList = new List(); try { counterId = PortUltility.FindAddresses(PortType.LAN); - + foreach (string counter in counterId) + if (!counter.Contains("53230")) + strList.Add(counter); + } catch (Exception ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "tcp getId : " + ex.Message); counterId = null; } - return counterId; + return strList.ToArray(); } private PortOperatorBase _portOperatorBaseTcp; diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 69e3834..ba41e66 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs index 623d61f..9bfde8e 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs @@ -47,10 +47,13 @@ //tcpService.write("*WAI"); //freqRequest++; - + //Thread.Sleep(2000); + //tcpService.write("*CLS"); + //Thread.Sleep(100); tcpService.write("MEAS:FREQ?"); //tcpService.write("READ?"); - + //Thread.Sleep(1000); + return tcpService.read(); } catch (Exception ex) @@ -73,7 +76,8 @@ //tcpService.write("INIT"); //tcpService.write("*WAI"); - + tcpService.write("*CLS"); + //Thread.Sleep(100); tcpService.write("MEAS:PERIOD?"); return tcpService.read(); diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs index 4f0bb8a..f91f2d2 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs @@ -2,6 +2,7 @@ using Casic.Birmm.RbFreqStandMeasure.VISA.Port; using Casic.Birmm.RbFreqStandMeasure.VISA.Ulitity; using System; +using System.Collections.Generic; using System.Reflection; namespace Casic.Birmm.RbFreqStandMeasure.R_DevService.Service.Impl @@ -11,17 +12,21 @@ public string[] getId() { string[] counterId; + List strList = new List(); try { counterId = PortUltility.FindAddresses(PortType.LAN); - + foreach (string counter in counterId) + if (!counter.Contains("53230")) + strList.Add(counter); + } catch (Exception ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "tcp getId : " + ex.Message); counterId = null; } - return counterId; + return strList.ToArray(); } private PortOperatorBase _portOperatorBaseTcp; diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 69e3834..ba41e66 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe deleted file mode 100644 index f17856a..0000000 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe +++ /dev/null Binary files differ diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs index 623d61f..9bfde8e 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs @@ -47,10 +47,13 @@ //tcpService.write("*WAI"); //freqRequest++; - + //Thread.Sleep(2000); + //tcpService.write("*CLS"); + //Thread.Sleep(100); tcpService.write("MEAS:FREQ?"); //tcpService.write("READ?"); - + //Thread.Sleep(1000); + return tcpService.read(); } catch (Exception ex) @@ -73,7 +76,8 @@ //tcpService.write("INIT"); //tcpService.write("*WAI"); - + tcpService.write("*CLS"); + //Thread.Sleep(100); tcpService.write("MEAS:PERIOD?"); return tcpService.read(); diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs index 4f0bb8a..f91f2d2 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs @@ -2,6 +2,7 @@ using Casic.Birmm.RbFreqStandMeasure.VISA.Port; using Casic.Birmm.RbFreqStandMeasure.VISA.Ulitity; using System; +using System.Collections.Generic; using System.Reflection; namespace Casic.Birmm.RbFreqStandMeasure.R_DevService.Service.Impl @@ -11,17 +12,21 @@ public string[] getId() { string[] counterId; + List strList = new List(); try { counterId = PortUltility.FindAddresses(PortType.LAN); - + foreach (string counter in counterId) + if (!counter.Contains("53230")) + strList.Add(counter); + } catch (Exception ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "tcp getId : " + ex.Message); counterId = null; } - return counterId; + return strList.ToArray(); } private PortOperatorBase _portOperatorBaseTcp; diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 69e3834..ba41e66 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe deleted file mode 100644 index f17856a..0000000 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe +++ /dev/null Binary files differ diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe.config b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe.config deleted file mode 100644 index 9402b9e..0000000 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe.config +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs index 623d61f..9bfde8e 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs @@ -47,10 +47,13 @@ //tcpService.write("*WAI"); //freqRequest++; - + //Thread.Sleep(2000); + //tcpService.write("*CLS"); + //Thread.Sleep(100); tcpService.write("MEAS:FREQ?"); //tcpService.write("READ?"); - + //Thread.Sleep(1000); + return tcpService.read(); } catch (Exception ex) @@ -73,7 +76,8 @@ //tcpService.write("INIT"); //tcpService.write("*WAI"); - + tcpService.write("*CLS"); + //Thread.Sleep(100); tcpService.write("MEAS:PERIOD?"); return tcpService.read(); diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs index 4f0bb8a..f91f2d2 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs @@ -2,6 +2,7 @@ using Casic.Birmm.RbFreqStandMeasure.VISA.Port; using Casic.Birmm.RbFreqStandMeasure.VISA.Ulitity; using System; +using System.Collections.Generic; using System.Reflection; namespace Casic.Birmm.RbFreqStandMeasure.R_DevService.Service.Impl @@ -11,17 +12,21 @@ public string[] getId() { string[] counterId; + List strList = new List(); try { counterId = PortUltility.FindAddresses(PortType.LAN); - + foreach (string counter in counterId) + if (!counter.Contains("53230")) + strList.Add(counter); + } catch (Exception ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "tcp getId : " + ex.Message); counterId = null; } - return counterId; + return strList.ToArray(); } private PortOperatorBase _portOperatorBaseTcp; diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 69e3834..ba41e66 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe deleted file mode 100644 index f17856a..0000000 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe +++ /dev/null Binary files differ diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe.config b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe.config deleted file mode 100644 index 9402b9e..0000000 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure1.exe.config +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RbFreqStandMeasure/counter/CounterCtrlForm.cs b/RbFreqStandMeasure/counter/CounterCtrlForm.cs index 92c3de1..994fa95 100644 --- a/RbFreqStandMeasure/counter/CounterCtrlForm.cs +++ b/RbFreqStandMeasure/counter/CounterCtrlForm.cs @@ -546,7 +546,7 @@ btn_dropDetecModel.Enabled = false; string[] ids = gPIBService.getId(); //string[] ips = tcpService.getId(); - if (ids != null && ids.Length > 0) + /*if (ids != null && ids.Length > 0) { text_signal.Text = ids[0]; } @@ -566,7 +566,7 @@ return; } else - { + {*/ string[] arr = text_counterIp.Text.Split('.'); if (arr.Length != 4) { @@ -594,7 +594,7 @@ } } } - } + //} //if (ips != null && ips.Length > 0) //{ // text_counterIp.Text = ips[0];