diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs index 4c72443..623d61f 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs @@ -48,8 +48,8 @@ //freqRequest++; - //tcpService.write("MEAS:FREQ?"); - tcpService.write("READ?"); + tcpService.write("MEAS:FREQ?"); + //tcpService.write("READ?"); return tcpService.read(); } @@ -65,13 +65,16 @@ { try { - - //tcpService.write("INIT"); - //tcpService.write("*WAI"); + //tcpService.write("INIT"); + //tcpService.write("*WAI"); - tcpService.write("READ?"); + //tcpService.write("INIT"); + + //tcpService.write("*WAI"); + + 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 4c72443..623d61f 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs @@ -48,8 +48,8 @@ //freqRequest++; - //tcpService.write("MEAS:FREQ?"); - tcpService.write("READ?"); + tcpService.write("MEAS:FREQ?"); + //tcpService.write("READ?"); return tcpService.read(); } @@ -65,13 +65,16 @@ { try { - - //tcpService.write("INIT"); - //tcpService.write("*WAI"); + //tcpService.write("INIT"); + //tcpService.write("*WAI"); - tcpService.write("READ?"); + //tcpService.write("INIT"); + + //tcpService.write("*WAI"); + + tcpService.write("MEAS:PERIOD?"); return tcpService.read(); } diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 6e59072..10ae75c 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ