diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs index d0f942c..cdf0519 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs @@ -48,10 +48,10 @@ //freqRequest++; //Thread.Sleep(2000); //tcpService.write("*CLS"); - Thread.Sleep(2000); + //Thread.Sleep(1000); //tcpService.write("MEAS:FREQ?"); tcpService.write("READ?"); - //Thread.Sleep(1000); + Thread.Sleep(1000); return tcpService.read(); } @@ -73,11 +73,11 @@ //tcpService.write("*WAI"); //tcpService.write("*CLS"); - Thread.Sleep(2000); + //Thread.Sleep(2000); //tcpService.write("MEAS:PERIOD?"); tcpService.write("READ?"); - + Thread.Sleep(1000); return tcpService.read(); } catch (Exception ex) diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs index d0f942c..cdf0519 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs @@ -48,10 +48,10 @@ //freqRequest++; //Thread.Sleep(2000); //tcpService.write("*CLS"); - Thread.Sleep(2000); + //Thread.Sleep(1000); //tcpService.write("MEAS:FREQ?"); tcpService.write("READ?"); - //Thread.Sleep(1000); + Thread.Sleep(1000); return tcpService.read(); } @@ -73,11 +73,11 @@ //tcpService.write("*WAI"); //tcpService.write("*CLS"); - Thread.Sleep(2000); + //Thread.Sleep(2000); //tcpService.write("MEAS:PERIOD?"); tcpService.write("READ?"); - + Thread.Sleep(1000); return tcpService.read(); } catch (Exception ex) diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs index 9916a9c..cce8dcf 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs @@ -19,7 +19,6 @@ foreach (string counter in counterId) if (!counter.Contains("53230")) strList.Add(counter); - } catch (Exception ex) { diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs index d0f942c..cdf0519 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs @@ -48,10 +48,10 @@ //freqRequest++; //Thread.Sleep(2000); //tcpService.write("*CLS"); - Thread.Sleep(2000); + //Thread.Sleep(1000); //tcpService.write("MEAS:FREQ?"); tcpService.write("READ?"); - //Thread.Sleep(1000); + Thread.Sleep(1000); return tcpService.read(); } @@ -73,11 +73,11 @@ //tcpService.write("*WAI"); //tcpService.write("*CLS"); - Thread.Sleep(2000); + //Thread.Sleep(2000); //tcpService.write("MEAS:PERIOD?"); tcpService.write("READ?"); - + Thread.Sleep(1000); return tcpService.read(); } catch (Exception ex) diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs index 9916a9c..cce8dcf 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs @@ -19,7 +19,6 @@ foreach (string counter in counterId) if (!counter.Contains("53230")) strList.Add(counter); - } catch (Exception ex) { diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 1455bc9..f3ca62b 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -617,5 +617,25 @@ + + + {709F7EC2-AB81-11D4-98E6-00108301CB39} + 7 + 1 + 0 + tlbimp + False + True + + + {DB8CBF00-D6D3-11D4-AA51-00A024EE30BD} + 7 + 1 + 0 + primary + False + True + + \ 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 d0f942c..cdf0519 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs @@ -48,10 +48,10 @@ //freqRequest++; //Thread.Sleep(2000); //tcpService.write("*CLS"); - Thread.Sleep(2000); + //Thread.Sleep(1000); //tcpService.write("MEAS:FREQ?"); tcpService.write("READ?"); - //Thread.Sleep(1000); + Thread.Sleep(1000); return tcpService.read(); } @@ -73,11 +73,11 @@ //tcpService.write("*WAI"); //tcpService.write("*CLS"); - Thread.Sleep(2000); + //Thread.Sleep(2000); //tcpService.write("MEAS:PERIOD?"); tcpService.write("READ?"); - + Thread.Sleep(1000); return tcpService.read(); } catch (Exception ex) diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs index 9916a9c..cce8dcf 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs @@ -19,7 +19,6 @@ foreach (string counter in counterId) if (!counter.Contains("53230")) strList.Add(counter); - } catch (Exception ex) { diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 1455bc9..f3ca62b 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -617,5 +617,25 @@ + + + {709F7EC2-AB81-11D4-98E6-00108301CB39} + 7 + 1 + 0 + tlbimp + False + True + + + {DB8CBF00-D6D3-11D4-AA51-00A024EE30BD} + 7 + 1 + 0 + primary + False + True + + \ No newline at end of file diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 7eaffbc..0815f55 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ