diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs index 0d37157..1eb7da3 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs @@ -89,7 +89,7 @@ try { _portOperatorBaseGpib.WriteLine(content); - + result = 0; } catch (Exception ex) diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs index 0d37157..1eb7da3 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs @@ -89,7 +89,7 @@ try { _portOperatorBaseGpib.WriteLine(content); - + result = 0; } 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 693541b..82c4d28 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs @@ -42,19 +42,18 @@ { try { - if (freqRequest == 0) - { - tcpService.write("INIT"); + //tcpService.write("INIT"); - tcpService.write("*WAI"); + //tcpService.write("*WAI"); - freqRequest++; - } - tcpService.write("MEAS:FREQ?"); + //freqRequest++; + + //tcpService.write("MEAS:FREQ?"); + tcpService.write("READ?"); return tcpService.read(); } - catch(Exception ex) + catch (Exception ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "getFreq:" + ex.Message); return null; diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs index 0d37157..1eb7da3 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs @@ -89,7 +89,7 @@ try { _portOperatorBaseGpib.WriteLine(content); - + result = 0; } 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 693541b..82c4d28 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs @@ -42,19 +42,18 @@ { try { - if (freqRequest == 0) - { - tcpService.write("INIT"); + //tcpService.write("INIT"); - tcpService.write("*WAI"); + //tcpService.write("*WAI"); - freqRequest++; - } - tcpService.write("MEAS:FREQ?"); + //freqRequest++; + + //tcpService.write("MEAS:FREQ?"); + tcpService.write("READ?"); return tcpService.read(); } - catch(Exception ex) + catch (Exception ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "getFreq:" + ex.Message); return null; diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs index b18389a..647ce40 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs @@ -50,7 +50,7 @@ currentValue_E = GPIB_TCPIP_OPERATIO.getFreq(tcpService);//Hz else if (type == "period") currentValue_E = GPIB_TCPIP_OPERATIO.getPeriod(tcpService);//s - + if (currentValue_E == "") continue; currentValue = UnitConvertHelper.convertDt(currentValue_E); //检测数据是否在容差范围内 bool errorCheckResult = satisfyCheck(counterCheckParam, sensitivityContentParam, currentValue, type); diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs index 0d37157..1eb7da3 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs @@ -89,7 +89,7 @@ try { _portOperatorBaseGpib.WriteLine(content); - + result = 0; } 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 693541b..82c4d28 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs @@ -42,19 +42,18 @@ { try { - if (freqRequest == 0) - { - tcpService.write("INIT"); + //tcpService.write("INIT"); - tcpService.write("*WAI"); + //tcpService.write("*WAI"); - freqRequest++; - } - tcpService.write("MEAS:FREQ?"); + //freqRequest++; + + //tcpService.write("MEAS:FREQ?"); + tcpService.write("READ?"); return tcpService.read(); } - catch(Exception ex) + catch (Exception ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "getFreq:" + ex.Message); return null; diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs index b18389a..647ce40 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs @@ -50,7 +50,7 @@ currentValue_E = GPIB_TCPIP_OPERATIO.getFreq(tcpService);//Hz else if (type == "period") currentValue_E = GPIB_TCPIP_OPERATIO.getPeriod(tcpService);//s - + if (currentValue_E == "") continue; currentValue = UnitConvertHelper.convertDt(currentValue_E); //检测数据是否在容差范围内 bool errorCheckResult = satisfyCheck(counterCheckParam, sensitivityContentParam, currentValue, type); diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs index b347641..4f0bb8a 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs @@ -92,6 +92,7 @@ { _portOperatorBaseTcp.WriteLine(content); + result = 0; } catch (Exception ex) diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs index 0d37157..1eb7da3 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs @@ -89,7 +89,7 @@ try { _portOperatorBaseGpib.WriteLine(content); - + result = 0; } 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 693541b..82c4d28 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs @@ -42,19 +42,18 @@ { try { - if (freqRequest == 0) - { - tcpService.write("INIT"); + //tcpService.write("INIT"); - tcpService.write("*WAI"); + //tcpService.write("*WAI"); - freqRequest++; - } - tcpService.write("MEAS:FREQ?"); + //freqRequest++; + + //tcpService.write("MEAS:FREQ?"); + tcpService.write("READ?"); return tcpService.read(); } - catch(Exception ex) + catch (Exception ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "getFreq:" + ex.Message); return null; diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs index b18389a..647ce40 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs @@ -50,7 +50,7 @@ currentValue_E = GPIB_TCPIP_OPERATIO.getFreq(tcpService);//Hz else if (type == "period") currentValue_E = GPIB_TCPIP_OPERATIO.getPeriod(tcpService);//s - + if (currentValue_E == "") continue; currentValue = UnitConvertHelper.convertDt(currentValue_E); //检测数据是否在容差范围内 bool errorCheckResult = satisfyCheck(counterCheckParam, sensitivityContentParam, currentValue, type); diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs index b347641..4f0bb8a 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs @@ -92,6 +92,7 @@ { _portOperatorBaseTcp.WriteLine(content); + result = 0; } catch (Exception ex) diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index c03e715..e2c02e6 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs index 0d37157..1eb7da3 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIBServiceImpl.cs @@ -89,7 +89,7 @@ try { _portOperatorBaseGpib.WriteLine(content); - + result = 0; } 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 693541b..82c4d28 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/GPIB_TCPIP_OPERATIO.cs @@ -42,19 +42,18 @@ { try { - if (freqRequest == 0) - { - tcpService.write("INIT"); + //tcpService.write("INIT"); - tcpService.write("*WAI"); + //tcpService.write("*WAI"); - freqRequest++; - } - tcpService.write("MEAS:FREQ?"); + //freqRequest++; + + //tcpService.write("MEAS:FREQ?"); + tcpService.write("READ?"); return tcpService.read(); } - catch(Exception ex) + catch (Exception ex) { LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "getFreq:" + ex.Message); return null; diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs index b18389a..647ce40 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs @@ -50,7 +50,7 @@ currentValue_E = GPIB_TCPIP_OPERATIO.getFreq(tcpService);//Hz else if (type == "period") currentValue_E = GPIB_TCPIP_OPERATIO.getPeriod(tcpService);//s - + if (currentValue_E == "") continue; currentValue = UnitConvertHelper.convertDt(currentValue_E); //检测数据是否在容差范围内 bool errorCheckResult = satisfyCheck(counterCheckParam, sensitivityContentParam, currentValue, type); diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs index b347641..4f0bb8a 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/TCPServiceImpl.cs @@ -92,6 +92,7 @@ { _portOperatorBaseTcp.WriteLine(content); + result = 0; } catch (Exception ex) diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index c03e715..e2c02e6 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/counter/CounterCtrlForm.cs b/RbFreqStandMeasure/counter/CounterCtrlForm.cs index f3b87bb..9a02e3a 100644 --- a/RbFreqStandMeasure/counter/CounterCtrlForm.cs +++ b/RbFreqStandMeasure/counter/CounterCtrlForm.cs @@ -641,7 +641,7 @@ CounterCheckParam counterCheckParam = dictService.getCounterCheckParam(); gPIBService.open(gPIBService.getId()[0]); - tcpService.open("TCPIP0::"+text_counterIp.Text+"::inst0::INST"); + tcpService.open("TCPIP0::"+text_counterIp.Text+"::INSTR"); //tcpService.open(text_counterIp.Text); int index = 0;