diff --git a/ProductionSystem/Forms/HomeFormInfo.cs b/ProductionSystem/Forms/HomeFormInfo.cs index 0e8e4f2..b32780e 100644 --- a/ProductionSystem/Forms/HomeFormInfo.cs +++ b/ProductionSystem/Forms/HomeFormInfo.cs @@ -1079,7 +1079,11 @@ namespace ProductionSystem.Forms private void Step8() { - + //采集数据 + for (int i = 1; i < 8; i++) + { + CollectData("BZ"+i); + } //sitongfa 2 3 //膨胀阀0 @@ -1106,11 +1110,7 @@ namespace ProductionSystem.Forms } - //采集数据 - for (int i = 1; i < 8; i++) - { - CollectData("BZ"+i); - } + } /// diff --git a/ProductionSystem/Untils/Tool/CurveTool.cs b/ProductionSystem/Untils/Tool/CurveTool.cs index 9a4abf8..d708a1c 100644 --- a/ProductionSystem/Untils/Tool/CurveTool.cs +++ b/ProductionSystem/Untils/Tool/CurveTool.cs @@ -28,8 +28,11 @@ namespace ProductionSystem.Untils.Tool public void Stop() { - _timer.Dispose(); - _timer = null; + if (null != _timer) + { + _timer.Dispose(); + _timer = null; + } } TCurveService tc = new TCurveService(); //D1252 电压 D1250 电流 diff --git a/文档/PWM/WFSG-06M信号发生器上位机软件及协议说明V28/MSCOMM32.OCX b/文档/PWM/WFSG-06M信号发生器上位机软件及协议说明V28/MSCOMM32.OCX new file mode 100644 index 0000000..1fc5fb4 Binary files /dev/null and b/文档/PWM/WFSG-06M信号发生器上位机软件及协议说明V28/MSCOMM32.OCX differ diff --git a/文档/PWM/WFSG-06M信号发生器上位机软件及协议说明V28/com.txt b/文档/PWM/WFSG-06M信号发生器上位机软件及协议说明V28/com.txt new file mode 100644 index 0000000..dca9c35 --- /dev/null +++ b/文档/PWM/WFSG-06M信号发生器上位机软件及协议说明V28/com.txt @@ -0,0 +1,2 @@ +3 +115200 diff --git a/文档/PWM/WFSG-06M信号发生器上位机软件及协议说明V28/信号发生器上位机软件V28.exe b/文档/PWM/WFSG-06M信号发生器上位机软件及协议说明V28/信号发生器上位机软件V28.exe new file mode 100644 index 0000000..7cd879b Binary files /dev/null and b/文档/PWM/WFSG-06M信号发生器上位机软件及协议说明V28/信号发生器上位机软件V28.exe differ diff --git a/文档/PWM/WFSG-06M信号发生器上位机软件及协议说明V28/信号发生器产品说明.pdf b/文档/PWM/WFSG-06M信号发生器上位机软件及协议说明V28/信号发生器产品说明.pdf new file mode 100644 index 0000000..8225023 Binary files /dev/null and b/文档/PWM/WFSG-06M信号发生器上位机软件及协议说明V28/信号发生器产品说明.pdf differ diff --git a/文档/PWM/WFSG-06M信号发生器上位机软件及协议说明V28/信号发生器通讯说明.doc b/文档/PWM/WFSG-06M信号发生器上位机软件及协议说明V28/信号发生器通讯说明.doc new file mode 100644 index 0000000..03e0077 Binary files /dev/null and b/文档/PWM/WFSG-06M信号发生器上位机软件及协议说明V28/信号发生器通讯说明.doc differ diff --git a/文档/PWM/WFSG-06M信号发生器上位机软件及协议说明V28/软件故障及解决.txt b/文档/PWM/WFSG-06M信号发生器上位机软件及协议说明V28/软件故障及解决.txt new file mode 100644 index 0000000..fe98950 --- /dev/null +++ b/文档/PWM/WFSG-06M信号发生器上位机软件及协议说明V28/软件故障及解决.txt @@ -0,0 +1,22 @@ +1: +ģ"mscomm32.ocx"еWindows汾ݡģǷregsvr32.exex86x64 + +: +ļmscomm32.ocxƵC:\Windows\SysWOW64 + - - ʾڡʾϵҼѡԹԱСʱ򽫴DosڣھͰдC:\Windows\SysWOW64\regsvr32.exe mscomm32.ocx + + + +2: +"DllRegisterServerĵʧ" + +: + - - ʾڡʾϵҼѡԹԱСʱ򽫴DosڣھͰдregsvr32.exe mscomm32.ocx + + + +3: +ĵַʱ,"ͨѶݴ!" + +: +ʧ,ఴ"ȷ" \ No newline at end of file diff --git a/文档/PWM/WFSG-PWM-51信号发生器5+1路上位机软件及协议说明V2/MSCOMM32.OCX b/文档/PWM/WFSG-PWM-51信号发生器5+1路上位机软件及协议说明V2/MSCOMM32.OCX new file mode 100644 index 0000000..1fc5fb4 Binary files /dev/null and b/文档/PWM/WFSG-PWM-51信号发生器5+1路上位机软件及协议说明V2/MSCOMM32.OCX differ diff --git a/文档/PWM/WFSG-PWM-51信号发生器5+1路上位机软件及协议说明V2/com.txt b/文档/PWM/WFSG-PWM-51信号发生器5+1路上位机软件及协议说明V2/com.txt new file mode 100644 index 0000000..1f143c9 --- /dev/null +++ b/文档/PWM/WFSG-PWM-51信号发生器5+1路上位机软件及协议说明V2/com.txt @@ -0,0 +1,2 @@ +9 +9600 diff --git a/文档/PWM/WFSG-PWM-51信号发生器5+1路上位机软件及协议说明V2/多路(5+1)路PWM信号发生器上位机软件_V2 - 副本.exe b/文档/PWM/WFSG-PWM-51信号发生器5+1路上位机软件及协议说明V2/多路(5+1)路PWM信号发生器上位机软件_V2 - 副本.exe new file mode 100644 index 0000000..87430ef Binary files /dev/null and b/文档/PWM/WFSG-PWM-51信号发生器5+1路上位机软件及协议说明V2/多路(5+1)路PWM信号发生器上位机软件_V2 - 副本.exe differ diff --git a/文档/PWM/WFSG-PWM-51信号发生器5+1路上位机软件及协议说明V2/多路(5+1)路PWM信号发生器上位机软件_V2.exe b/文档/PWM/WFSG-PWM-51信号发生器5+1路上位机软件及协议说明V2/多路(5+1)路PWM信号发生器上位机软件_V2.exe new file mode 100644 index 0000000..87430ef Binary files /dev/null and b/文档/PWM/WFSG-PWM-51信号发生器5+1路上位机软件及协议说明V2/多路(5+1)路PWM信号发生器上位机软件_V2.exe differ diff --git a/文档/PWM/WFSG-PWM-51信号发生器5+1路上位机软件及协议说明V2/多路(5+1)路PWM信号发生器通讯协议说明.doc b/文档/PWM/WFSG-PWM-51信号发生器5+1路上位机软件及协议说明V2/多路(5+1)路PWM信号发生器通讯协议说明.doc new file mode 100644 index 0000000..f3980fd Binary files /dev/null and b/文档/PWM/WFSG-PWM-51信号发生器5+1路上位机软件及协议说明V2/多路(5+1)路PWM信号发生器通讯协议说明.doc differ diff --git a/文档/PWM/WFSG-PWM-51信号发生器5+1路上位机软件及协议说明V2/多路(5+1)路PWM可调信号发生器说明.pdf b/文档/PWM/WFSG-PWM-51信号发生器5+1路上位机软件及协议说明V2/多路(5+1)路PWM可调信号发生器说明.pdf new file mode 100644 index 0000000..c9b9fe2 Binary files /dev/null and b/文档/PWM/WFSG-PWM-51信号发生器5+1路上位机软件及协议说明V2/多路(5+1)路PWM可调信号发生器说明.pdf differ diff --git a/文档/PWM/WFSG-PWM-51信号发生器5+1路上位机软件及协议说明V2/软件故障及解决.txt b/文档/PWM/WFSG-PWM-51信号发生器5+1路上位机软件及协议说明V2/软件故障及解决.txt new file mode 100644 index 0000000..fe98950 --- /dev/null +++ b/文档/PWM/WFSG-PWM-51信号发生器5+1路上位机软件及协议说明V2/软件故障及解决.txt @@ -0,0 +1,22 @@ +1: +ģ"mscomm32.ocx"еWindows汾ݡģǷregsvr32.exex86x64 + +: +ļmscomm32.ocxƵC:\Windows\SysWOW64 + - - ʾڡʾϵҼѡԹԱСʱ򽫴DosڣھͰдC:\Windows\SysWOW64\regsvr32.exe mscomm32.ocx + + + +2: +"DllRegisterServerĵʧ" + +: + - - ʾڡʾϵҼѡԹԱСʱ򽫴DosڣھͰдregsvr32.exe mscomm32.ocx + + + +3: +ĵַʱ,"ͨѶݴ!" + +: +ʧ,ఴ"ȷ" \ No newline at end of file diff --git a/文档/PWM/pwm调速.xlsx b/文档/PWM/pwm调速.xlsx new file mode 100644 index 0000000..0e35141 Binary files /dev/null and b/文档/PWM/pwm调速.xlsx differ diff --git a/文档/PWM/串口调试工具SIMCOM_WIRELESS_KIT33.exe b/文档/PWM/串口调试工具SIMCOM_WIRELESS_KIT33.exe new file mode 100644 index 0000000..ebb6a44 Binary files /dev/null and b/文档/PWM/串口调试工具SIMCOM_WIRELESS_KIT33.exe differ diff --git a/文档/PWM/信号发生器介绍及说明.pdf b/文档/PWM/信号发生器介绍及说明.pdf new file mode 100644 index 0000000..fd1c7ef Binary files /dev/null and b/文档/PWM/信号发生器介绍及说明.pdf differ diff --git a/文档/PWM/信号发生器通讯说明.doc b/文档/PWM/信号发生器通讯说明.doc new file mode 100644 index 0000000..5321877 Binary files /dev/null and b/文档/PWM/信号发生器通讯说明.doc differ diff --git a/文档/PWM/测试图片.png b/文档/PWM/测试图片.png new file mode 100644 index 0000000..16d58c0 Binary files /dev/null and b/文档/PWM/测试图片.png differ diff --git a/文档/性能测试(7).xlsx b/文档/性能测试(7).xlsx new file mode 100644 index 0000000..25e198b Binary files /dev/null and b/文档/性能测试(7).xlsx differ