Quellcode durchsuchen

Merge branch 'PVT' of http://134.175.252.201:3000/luo/HydraulicControlSystem into PVT

# Conflicts:
#	RT/Config/RT_WriteDropTable.vi
#	RT/Config/RT_WriteRiseTable.vi
#	RT/Config/RT_WriteSignalGenStart.vi
#	RT/Config/RT_WriteSignalGenStop.vi
#	RT/Config/RT_WriteTroubleshooting.vi
#	RT/Config/RT_WriteValveBlocking.vi
#	RT/Config/RT_WriteValvePower.vi
#	RT/Config/RT_WriteZeroChange.vi
#	RT/RT_DisplacementFinetuning.vi
#	RT/RT_GetData.vi
#	RT/RT_Init.vi
#	RT/RT_Main.vi
#	RT/RT_ReadConfig.vi
#	RT/RT_WaitTrigger.vi
#	RT/RT_WriteConfig.vi
#	SubVIs/文件路径初始化.vi
#	液压台控制.aliases
#	液压台控制.lvproj
#	液压台控制.vi
#	液压台控制/SubVIs/液压台控制_Initialize Data.vi
#	液压台控制/SubVIs/液压台控制_信号发生_保存参数.vi
#	液压台控制/SubVIs/液压台控制_信号校准_保存参数.vi
#	液压台控制/SubVIs/液压台控制_停止激振.vi
#	液压台控制/SubVIs/液压台控制_参数设置_保存参数.vi
#	液压台控制/SubVIs/液压台控制_台面上升.vi
#	液压台控制/SubVIs/液压台控制_台面下降.vi
#	液压台控制/SubVIs/液压台控制_台面微调.vi
#	液压台控制/SubVIs/液压台控制_复位_阀上电.vi
#	液压台控制/SubVIs/液压台控制_开始激振.vi
#	液压台控制/SubVIs/液压台控制_故障_阀上电.vi
#	液压台控制/SubVIs/液压台控制_更新运行时间.vi
#	液压台控制/SubVIs/液压台控制_检查信号发生停止状态.vi
#	液压台控制/SubVIs/液压台控制_检查台面上升状态.vi
#	液压台控制/SubVIs/液压台控制_检查台面下降状态.vi
#	液压台控制/SubVIs/液压台控制_检查零位改状态.vi
#	液压台控制/SubVIs/液压台控制_系统调试.vi
#	液压台控制/SubVIs/液压台控制_自闭环.vi
#	液压台控制/SubVIs/液压台控制_获取数据_获取RT中数据.vi
#	液压台控制/SubVIs/液压台控制_获取警告状态.vi
#	液压台控制/SubVIs/液压台控制_获取运行状态.vi
#	液压台控制/SubVIs/液压台控制_获取错误状态.vi
#	液压台控制/SubVIs/液压台控制_计算THD.vi
#	液压台控制/SubVIs/液压台控制_阀上电.vi
luo vor 5 Monaten
Ursprung
Commit
83675f7073
83 geänderte Dateien mit 404 neuen und 462 gelöschten Zeilen
  1. 194 353
      FPGA/FPGA Bitfiles/液压台.lvbitx
  2. BIN
      FPGA/FPGA_Main.vi
  3. BIN
      FPGA/FPGA_Test.vi
  4. BIN
      FPGA/FPGA_位移积分.vi
  5. BIN
      FPGA/FPGA_停止窗.vi
  6. BIN
      FPGA/FPGA_幅值识别.vi
  7. BIN
      FPGA/FPGA_急停窗.vi
  8. BIN
      FPGA/FPGA_等待信号发生.vi
  9. BIN
      RT/Config/RT_WriteDropTable.vi
  10. BIN
      RT/Config/RT_WriteRiseTable.vi
  11. BIN
      RT/Config/RT_WriteSignalGenStart.vi
  12. BIN
      RT/Config/RT_WriteSignalGenStop.vi
  13. BIN
      RT/Config/RT_WriteTroubleshooting.vi
  14. BIN
      RT/Config/RT_WriteValveBlocking.vi
  15. BIN
      RT/Config/RT_WriteValvePower.vi
  16. BIN
      RT/Config/RT_WriteZeroChange.vi
  17. BIN
      RT/Controls/RT UIData.ctl
  18. BIN
      RT/RT_Close.vi
  19. BIN
      RT/RT_GetData.vi
  20. BIN
      RT/RT_Global.vi
  21. BIN
      RT/RT_Init.vi
  22. BIN
      RT/RT_Main.vi
  23. BIN
      RT/RT_ReadConfig.vi
  24. BIN
      RT/RT_ReadConfigFile.vi
  25. BIN
      RT/RT_WaitTrigger.vi
  26. BIN
      RT/RT_WriteConfig.vi
  27. 142 55
      RT/Var.lvlib
  28. BIN
      S7/Connect.vi
  29. BIN
      controls/UI Data.ctl
  30. BIN
      全局变量/配置参数.vi
  31. 3 6
      液压台控制.aliases
  32. 1 1
      液压台控制.lvlps
  33. 64 47
      液压台控制.lvproj
  34. BIN
      液压台控制.vi
  35. BIN
      液压台控制/Controls/液压控制台_信号发生参数.ctl
  36. BIN
      液压台控制/Controls/液压控制台_信号发生控件引用.ctl
  37. BIN
      液压台控制/Controls/液压控制台_信号类型.ctl
  38. BIN
      液压台控制/Controls/液压控制台_控制参数.ctl
  39. BIN
      液压台控制/Controls/液压控制台_校准信号.ctl
  40. BIN
      液压台控制/Controls/液压控制台_系统调试_控件引用.ctl
  41. BIN
      液压台控制/Controls/液压控制台_配置参数.ctl
  42. BIN
      液压台控制/SubVIs/液压台控制_Initialize Data.vi
  43. BIN
      液压台控制/SubVIs/液压台控制_Initialize UI.vi
  44. BIN
      液压台控制/SubVIs/液压台控制_信号发生.vi
  45. BIN
      液压台控制/SubVIs/液压台控制_信号发生_保存参数.vi
  46. BIN
      液压台控制/SubVIs/液压台控制_信号发生_初始化.vi
  47. BIN
      液压台控制/SubVIs/液压台控制_信号校准_保存参数.vi
  48. BIN
      液压台控制/SubVIs/液压台控制_信号校准_初始化.vi
  49. BIN
      液压台控制/SubVIs/液压台控制_停止激振.vi
  50. BIN
      液压台控制/SubVIs/液压台控制_判断控制器状态.vi
  51. BIN
      液压台控制/SubVIs/液压台控制_参数设置.vi
  52. BIN
      液压台控制/SubVIs/液压台控制_参数设置_保存参数.vi
  53. BIN
      液压台控制/SubVIs/液压台控制_参数设置_初始化.vi
  54. BIN
      液压台控制/SubVIs/液压台控制_另存参数.vi
  55. BIN
      液压台控制/SubVIs/液压台控制_台面上升.vi
  56. BIN
      液压台控制/SubVIs/液压台控制_台面下降.vi
  57. BIN
      液压台控制/SubVIs/液压台控制_台面微调.vi
  58. BIN
      液压台控制/SubVIs/液压台控制_复位_阀上电.vi
  59. BIN
      液压台控制/SubVIs/液压台控制_开始激振.vi
  60. BIN
      液压台控制/SubVIs/液压台控制_控件状态设置(all).vi
  61. BIN
      液压台控制/SubVIs/液压台控制_故障_阀上电.vi
  62. BIN
      液压台控制/SubVIs/液压台控制_更新油源信息.vi
  63. BIN
      液压台控制/SubVIs/液压台控制_更新试验信息.vi
  64. BIN
      液压台控制/SubVIs/液压台控制_更新输出波形.vi
  65. BIN
      液压台控制/SubVIs/液压台控制_更新运行时间.vi
  66. BIN
      液压台控制/SubVIs/液压台控制_更新运行状态.vi
  67. BIN
      液压台控制/SubVIs/液压台控制_检查信号发生停止状态.vi
  68. BIN
      液压台控制/SubVIs/液压台控制_检查信号发生状态.vi
  69. BIN
      液压台控制/SubVIs/液压台控制_检查台面上升状态.vi
  70. BIN
      液压台控制/SubVIs/液压台控制_检查台面下降状态.vi
  71. BIN
      液压台控制/SubVIs/液压台控制_检查零位改状态.vi
  72. BIN
      液压台控制/SubVIs/液压台控制_状态检查.vi
  73. BIN
      液压台控制/SubVIs/液压台控制_系统调试.vi
  74. BIN
      液压台控制/SubVIs/液压台控制_系统调试_初始化.vi
  75. BIN
      液压台控制/SubVIs/液压台控制_自闭环.vi
  76. BIN
      液压台控制/SubVIs/液压台控制_获取数据.vi
  77. BIN
      液压台控制/SubVIs/液压台控制_获取数据_获取RT中数据.vi
  78. BIN
      液压台控制/SubVIs/液压台控制_获取警告状态.vi
  79. BIN
      液压台控制/SubVIs/液压台控制_获取运行状态.vi
  80. BIN
      液压台控制/SubVIs/液压台控制_获取错误状态.vi
  81. BIN
      液压台控制/SubVIs/液压台控制_计算THD.vi
  82. BIN
      液压台控制/SubVIs/液压台控制_读取加载参数.vi
  83. BIN
      液压台控制/SubVIs/液压台控制_阀上电.vi

Datei-Diff unterdrückt, da er zu groß ist
+ 194 - 353
FPGA/FPGA Bitfiles/液压台.lvbitx


BIN
FPGA/FPGA_Main.vi


BIN
FPGA/FPGA_Test.vi


BIN
FPGA/FPGA_位移积分.vi


BIN
FPGA/FPGA_停止窗.vi


BIN
FPGA/FPGA_幅值识别.vi


BIN
FPGA/FPGA_急停窗.vi


BIN
FPGA/FPGA_等待信号发生.vi


BIN
RT/Config/RT_WriteDropTable.vi


BIN
RT/Config/RT_WriteRiseTable.vi


BIN
RT/Config/RT_WriteSignalGenStart.vi


BIN
RT/Config/RT_WriteSignalGenStop.vi


BIN
RT/Config/RT_WriteTroubleshooting.vi


BIN
RT/Config/RT_WriteValveBlocking.vi


BIN
RT/Config/RT_WriteValvePower.vi


BIN
RT/Config/RT_WriteZeroChange.vi


BIN
RT/Controls/RT UIData.ctl


BIN
RT/RT_Close.vi


BIN
RT/RT_GetData.vi


BIN
RT/RT_Global.vi


BIN
RT/RT_Init.vi


BIN
RT/RT_Main.vi


BIN
RT/RT_ReadConfig.vi


BIN
RT/RT_ReadConfigFile.vi


BIN
RT/RT_WaitTrigger.vi


BIN
RT/RT_WriteConfig.vi


+ 142 - 55
RT/Var.lvlib

@@ -19,6 +19,24 @@
 		<Property Name="type" Type="Str">Network</Property>
 		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!F)1!!!#!!A!!!!!!"!!V!#1!'5WFO:WRF!!!"!!!!!!!!!!!!!!!!!!!</Property>
 	</Item>
+	<Item Name="AccelerationOffset" Type="Variable">
+		<Property Name="featurePacks" Type="Str">Network</Property>
+		<Property Name="Network:BuffSize" Type="Str">50</Property>
+		<Property Name="Network:UseBinding" Type="Str">False</Property>
+		<Property Name="Network:UseBuffering" Type="Str">True</Property>
+		<Property Name="numTypedefs" Type="UInt">0</Property>
+		<Property Name="type" Type="Str">Network</Property>
+		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!""01!!!#!!A!!!!!!#!!V!#A!(4H6N:8*J9Q!=1%!!!@````]!!!^"=H*B?3"P:C"%&lt;X6C&lt;'5!!1!"!!!!!!!!!!!!!!!!</Property>
+	</Item>
+	<Item Name="AccelerationSlope" Type="Variable">
+		<Property Name="featurePacks" Type="Str">Network</Property>
+		<Property Name="Network:BuffSize" Type="Str">50</Property>
+		<Property Name="Network:UseBinding" Type="Str">False</Property>
+		<Property Name="Network:UseBuffering" Type="Str">True</Property>
+		<Property Name="numTypedefs" Type="UInt">0</Property>
+		<Property Name="type" Type="Str">Network</Property>
+		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!""01!!!#!!A!!!!!!#!!V!#A!(4H6N:8*J9Q!=1%!!!@````]!!!^"=H*B?3"P:C"%&lt;X6C&lt;'5!!1!"!!!!!!!!!!!!!!!!</Property>
+	</Item>
 	<Item Name="ClosedValve" Type="Variable">
 		<Property Name="Description:Description" Type="Str">故障后关闭阀</Property>
 		<Property Name="featurePacks" Type="Str">Description,Network</Property>
@@ -32,6 +50,15 @@
 		<Property Name="type" Type="Str">Network</Property>
 		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!B(1!!!#!!A!!!!!!"!!R!)1&gt;#&lt;W^M:7&amp;O!!%!!!!!!!!!!!!!!!</Property>
 	</Item>
+	<Item Name="CurrentDirection" Type="Variable">
+		<Property Name="featurePacks" Type="Str">Network</Property>
+		<Property Name="Network:BuffSize" Type="Str">50</Property>
+		<Property Name="Network:UseBinding" Type="Str">False</Property>
+		<Property Name="Network:UseBuffering" Type="Str">True</Property>
+		<Property Name="numTypedefs" Type="UInt">0</Property>
+		<Property Name="type" Type="Str">Network</Property>
+		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!B(1!!!#!!A!!!!!!"!!R!)1&gt;#&lt;W^M:7&amp;O!!%!!!!!!!!!!!!!!!</Property>
+	</Item>
 	<Item Name="CurrentZero" Type="Variable">
 		<Property Name="Description:Description" Type="Str">当前给定零位</Property>
 		<Property Name="featurePacks" Type="Str">Description,Network</Property>
@@ -93,6 +120,18 @@
 		<Property Name="type" Type="Str">Network</Property>
 		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!B(1!!!#!!A!!!!!!"!!R!)1&gt;#&lt;W^M:7&amp;O!!%!!!!!!!!!!!!!!!</Property>
 	</Item>
+	<Item Name="Driver" Type="Variable">
+		<Property Name="featurePacks" Type="Str">Network</Property>
+		<Property Name="Network:BuffSize" Type="Str">50</Property>
+		<Property Name="Network:ElemSize" Type="Str">1</Property>
+		<Property Name="Network:PointsPerWaveform" Type="Str">1</Property>
+		<Property Name="Network:SingleWriter" Type="Str">False</Property>
+		<Property Name="Network:UseBinding" Type="Str">False</Property>
+		<Property Name="Network:UseBuffering" Type="Str">True</Property>
+		<Property Name="numTypedefs" Type="UInt">0</Property>
+		<Property Name="type" Type="Str">Network</Property>
+		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!J*1!!!#!!A!!!!!!"!!V!#A!'2'^V9GRF!!!"!!!!!!!!!!!!!!!!!!!!!!!!</Property>
+	</Item>
 	<Item Name="DropCount" Type="Variable">
 		<Property Name="Description:Description" Type="Str">升降窗计数</Property>
 		<Property Name="featurePacks" Type="Str">Description,Network</Property>
@@ -191,35 +230,14 @@
 		<Property Name="type" Type="Str">Network</Property>
 		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!B(1!!!#!!A!!!!!!"!!R!)1&gt;#&lt;W^M:7&amp;O!!%!!!!!!!!!!!!!!!</Property>
 	</Item>
-	<Item Name="FxpRead" Type="Variable">
-		<Property Name="featurePacks" Type="Str">Network</Property>
-		<Property Name="Network:BuffSize" Type="Str">1</Property>
-		<Property Name="Network:ElemSize" Type="Str">1</Property>
-		<Property Name="Network:PointsPerWaveform" Type="Str">1</Property>
-		<Property Name="Network:SingleWriter" Type="Str">False</Property>
-		<Property Name="Network:UseBinding" Type="Str">False</Property>
-		<Property Name="Network:UseBuffering" Type="Str">False</Property>
-		<Property Name="numTypedefs" Type="UInt">0</Property>
-		<Property Name="Real-Time Features:ApplyNetworkConfig" Type="Str">False</Property>
-		<Property Name="Real-Time Features:BufferLength" Type="Str">1</Property>
-		<Property Name="Real-Time Features:UseBuffering" Type="Str">False</Property>
-		<Property Name="type" Type="Str">Network</Property>
-		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!F)1!!!#!!A!!!!!!"!!V!#1!'5WFO:WRF!!!"!!!!!!!!!!!!!!!!!!!</Property>
-	</Item>
-	<Item Name="FxpWrite" Type="Variable">
+	<Item Name="FrequencyControl" Type="Variable">
 		<Property Name="featurePacks" Type="Str">Network</Property>
-		<Property Name="Network:BuffSize" Type="Str">1</Property>
-		<Property Name="Network:ElemSize" Type="Str">1</Property>
-		<Property Name="Network:PointsPerWaveform" Type="Str">1</Property>
-		<Property Name="Network:SingleWriter" Type="Str">False</Property>
+		<Property Name="Network:BuffSize" Type="Str">50</Property>
 		<Property Name="Network:UseBinding" Type="Str">False</Property>
-		<Property Name="Network:UseBuffering" Type="Str">False</Property>
+		<Property Name="Network:UseBuffering" Type="Str">True</Property>
 		<Property Name="numTypedefs" Type="UInt">0</Property>
-		<Property Name="Real-Time Features:ApplyNetworkConfig" Type="Str">False</Property>
-		<Property Name="Real-Time Features:BufferLength" Type="Str">1</Property>
-		<Property Name="Real-Time Features:UseBuffering" Type="Str">False</Property>
 		<Property Name="type" Type="Str">Network</Property>
-		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!F)1!!!#!!A!!!!!!"!!V!#1!'5WFO:WRF!!!"!!!!!!!!!!!!!!!!!!!</Property>
+		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!""01!!!#!!A!!!!!!#!!V!#A!(4H6N:8*J9Q!=1%!!!@````]!!!^"=H*B?3"P:C"%&lt;X6C&lt;'5!!1!"!!!!!!!!!!!!!!!!</Property>
 	</Item>
 	<Item Name="IsFaultRelease" Type="Variable">
 		<Property Name="Description:Description" Type="Str">是否故障解除</Property>
@@ -285,6 +303,30 @@
 		<Property Name="type" Type="Str">Network</Property>
 		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!B(1!!!#!!A!!!!!!"!!R!)1&gt;#&lt;W^M:7&amp;O!!%!!!!!!!!!!!!!!!</Property>
 	</Item>
+	<Item Name="MaxDownOffset" Type="Variable">
+		<Property Name="featurePacks" Type="Str">Network</Property>
+		<Property Name="Network:BuffSize" Type="Str">50</Property>
+		<Property Name="Network:ElemSize" Type="Str">1</Property>
+		<Property Name="Network:PointsPerWaveform" Type="Str">1</Property>
+		<Property Name="Network:SingleWriter" Type="Str">False</Property>
+		<Property Name="Network:UseBinding" Type="Str">False</Property>
+		<Property Name="Network:UseBuffering" Type="Str">True</Property>
+		<Property Name="numTypedefs" Type="UInt">0</Property>
+		<Property Name="type" Type="Str">Network</Property>
+		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!""01!!!#!!A!!!!!!#!!V!#A!(4H6N:8*J9Q!=1%!!!@````]!!!^"=H*B?3"P:C"%&lt;X6C&lt;'5!!1!"!!!!!!!!!!!!!!!!</Property>
+	</Item>
+	<Item Name="MaxDownSlope" Type="Variable">
+		<Property Name="featurePacks" Type="Str">Network</Property>
+		<Property Name="Network:BuffSize" Type="Str">50</Property>
+		<Property Name="Network:ElemSize" Type="Str">1</Property>
+		<Property Name="Network:PointsPerWaveform" Type="Str">1</Property>
+		<Property Name="Network:SingleWriter" Type="Str">False</Property>
+		<Property Name="Network:UseBinding" Type="Str">False</Property>
+		<Property Name="Network:UseBuffering" Type="Str">True</Property>
+		<Property Name="numTypedefs" Type="UInt">0</Property>
+		<Property Name="type" Type="Str">Network</Property>
+		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!""01!!!#!!A!!!!!!#!!V!#A!(4H6N:8*J9Q!=1%!!!@````]!!!^"=H*B?3"P:C"%&lt;X6C&lt;'5!!1!"!!!!!!!!!!!!!!!!</Property>
+	</Item>
 	<Item Name="MaxDropCount" Type="Variable">
 		<Property Name="Description:Description" Type="Str">最大降振动台计数</Property>
 		<Property Name="featurePacks" Type="Str">Description,Network</Property>
@@ -365,6 +407,24 @@
 		<Property Name="type" Type="Str">Network</Property>
 		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!F)1!!!#!!A!!!!!!"!!V!"Q!'65FO&gt;$-S!!!"!!!!!!!!!!!!!!!!!!!</Property>
 	</Item>
+	<Item Name="MaxWarnOffset" Type="Variable">
+		<Property Name="featurePacks" Type="Str">Network</Property>
+		<Property Name="Network:BuffSize" Type="Str">50</Property>
+		<Property Name="Network:UseBinding" Type="Str">False</Property>
+		<Property Name="Network:UseBuffering" Type="Str">True</Property>
+		<Property Name="numTypedefs" Type="UInt">0</Property>
+		<Property Name="type" Type="Str">Network</Property>
+		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!""01!!!#!!A!!!!!!#!!V!#A!(4H6N:8*J9Q!=1%!!!@````]!!!^"=H*B?3"P:C"%&lt;X6C&lt;'5!!1!"!!!!!!!!!!!!!!!!</Property>
+	</Item>
+	<Item Name="MaxWarnSlope" Type="Variable">
+		<Property Name="featurePacks" Type="Str">Network</Property>
+		<Property Name="Network:BuffSize" Type="Str">50</Property>
+		<Property Name="Network:UseBinding" Type="Str">False</Property>
+		<Property Name="Network:UseBuffering" Type="Str">True</Property>
+		<Property Name="numTypedefs" Type="UInt">0</Property>
+		<Property Name="type" Type="Str">Network</Property>
+		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!""01!!!#!!A!!!!!!#!!V!#A!(4H6N:8*J9Q!=1%!!!@````]!!!^"=H*B?3"P:C"%&lt;X6C&lt;'5!!1!"!!!!!!!!!!!!!!!!</Property>
+	</Item>
 	<Item Name="MaxZeroChangeCount" Type="Variable">
 		<Property Name="Description:Description" Type="Str">零位改最大计数</Property>
 		<Property Name="featurePacks" Type="Str">Description,Network</Property>
@@ -381,6 +441,42 @@
 		<Property Name="type" Type="Str">Network</Property>
 		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!F)1!!!#!!A!!!!!!"!!V!"Q!'65FO&gt;$-S!!!"!!!!!!!!!!!!!!!!!!!</Property>
 	</Item>
+	<Item Name="MiniDownOffset" Type="Variable">
+		<Property Name="featurePacks" Type="Str">Network</Property>
+		<Property Name="Network:BuffSize" Type="Str">50</Property>
+		<Property Name="Network:UseBinding" Type="Str">False</Property>
+		<Property Name="Network:UseBuffering" Type="Str">True</Property>
+		<Property Name="numTypedefs" Type="UInt">0</Property>
+		<Property Name="type" Type="Str">Network</Property>
+		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!""01!!!#!!A!!!!!!#!!V!#A!(4H6N:8*J9Q!=1%!!!@````]!!!^"=H*B?3"P:C"%&lt;X6C&lt;'5!!1!"!!!!!!!!!!!!!!!!</Property>
+	</Item>
+	<Item Name="MiniDownSlope" Type="Variable">
+		<Property Name="featurePacks" Type="Str">Network</Property>
+		<Property Name="Network:BuffSize" Type="Str">50</Property>
+		<Property Name="Network:UseBinding" Type="Str">False</Property>
+		<Property Name="Network:UseBuffering" Type="Str">True</Property>
+		<Property Name="numTypedefs" Type="UInt">0</Property>
+		<Property Name="type" Type="Str">Network</Property>
+		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!""01!!!#!!A!!!!!!#!!V!#A!(4H6N:8*J9Q!=1%!!!@````]!!!^"=H*B?3"P:C"%&lt;X6C&lt;'5!!1!"!!!!!!!!!!!!!!!!</Property>
+	</Item>
+	<Item Name="MiniWarnOffset" Type="Variable">
+		<Property Name="featurePacks" Type="Str">Network</Property>
+		<Property Name="Network:BuffSize" Type="Str">50</Property>
+		<Property Name="Network:UseBinding" Type="Str">False</Property>
+		<Property Name="Network:UseBuffering" Type="Str">True</Property>
+		<Property Name="numTypedefs" Type="UInt">0</Property>
+		<Property Name="type" Type="Str">Network</Property>
+		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!""01!!!#!!A!!!!!!#!!V!#A!(4H6N:8*J9Q!=1%!!!@````]!!!^"=H*B?3"P:C"%&lt;X6C&lt;'5!!1!"!!!!!!!!!!!!!!!!</Property>
+	</Item>
+	<Item Name="MiniWarnSlope" Type="Variable">
+		<Property Name="featurePacks" Type="Str">Network</Property>
+		<Property Name="Network:BuffSize" Type="Str">50</Property>
+		<Property Name="Network:UseBinding" Type="Str">False</Property>
+		<Property Name="Network:UseBuffering" Type="Str">True</Property>
+		<Property Name="numTypedefs" Type="UInt">0</Property>
+		<Property Name="type" Type="Str">Network</Property>
+		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!""01!!!#!!A!!!!!!#!!V!#A!(4H6N:8*J9Q!=1%!!!@````]!!!^"=H*B?3"P:C"%&lt;X6C&lt;'5!!1!"!!!!!!!!!!!!!!!!</Property>
+	</Item>
 	<Item Name="OilSourceStopped" Type="Variable">
 		<Property Name="Description:Description" Type="Str">油源急停</Property>
 		<Property Name="featurePacks" Type="Str">Description,Network</Property>
@@ -492,22 +588,6 @@
 		<Property Name="type" Type="Str">Network</Property>
 		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!B(1!!!#!!A!!!!!!"!!R!)1&gt;#&lt;W^M:7&amp;O!!%!!!!!!!!!!!!!!!</Property>
 	</Item>
-	<Item Name="SignalGenCount" Type="Variable">
-		<Property Name="Description:Description" Type="Str">信号发生计数</Property>
-		<Property Name="featurePacks" Type="Str">Description,Network</Property>
-		<Property Name="Network:BuffSize" Type="Str">1</Property>
-		<Property Name="Network:ElemSize" Type="Str">1</Property>
-		<Property Name="Network:PointsPerWaveform" Type="Str">1</Property>
-		<Property Name="Network:SingleWriter" Type="Str">False</Property>
-		<Property Name="Network:UseBinding" Type="Str">False</Property>
-		<Property Name="Network:UseBuffering" Type="Str">False</Property>
-		<Property Name="numTypedefs" Type="UInt">0</Property>
-		<Property Name="Real-Time Features:ApplyNetworkConfig" Type="Str">False</Property>
-		<Property Name="Real-Time Features:BufferLength" Type="Str">1</Property>
-		<Property Name="Real-Time Features:UseBuffering" Type="Str">False</Property>
-		<Property Name="type" Type="Str">Network</Property>
-		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!J*1!!!#!!A!!!!!!"!!V!#!!'65FO&gt;$9U!!!"!!!!!!!!!!!!!!!!!!!!!!!!</Property>
-	</Item>
 	<Item Name="SignalGenStart" Type="Variable">
 		<Property Name="Description:Description" Type="Str">信号发生开始</Property>
 		<Property Name="featurePacks" Type="Str">Description,Network</Property>
@@ -556,44 +636,49 @@
 		<Property Name="type" Type="Str">Network</Property>
 		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!F)1!!!#!!A!!!!!!"!!V!"Q!'65FO&gt;$-S!!!"!!!!!!!!!!!!!!!!!!!</Property>
 	</Item>
+	<Item Name="SignalTime" Type="Variable">
+		<Property Name="featurePacks" Type="Str">Network</Property>
+		<Property Name="Network:BuffSize" Type="Str">50</Property>
+		<Property Name="Network:UseBinding" Type="Str">False</Property>
+		<Property Name="Network:UseBuffering" Type="Str">True</Property>
+		<Property Name="numTypedefs" Type="UInt">0</Property>
+		<Property Name="type" Type="Str">Network</Property>
+		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!F)1!!!#!!A!!!!!!"!!V!"Q!'65FO&gt;$-S!!!"!!!!!!!!!!!!!!!!!!!</Property>
+	</Item>
 	<Item Name="Start" Type="Variable">
-		<Property Name="Description:Description" Type="Str">开始激振</Property>
-		<Property Name="featurePacks" Type="Str">Description,Network</Property>
+		<Property Name="featurePacks" Type="Str">Network</Property>
 		<Property Name="Network:BuffSize" Type="Str">1</Property>
 		<Property Name="Network:ElemSize" Type="Str">1</Property>
 		<Property Name="Network:PointsPerWaveform" Type="Str">1</Property>
 		<Property Name="Network:SingleWriter" Type="Str">False</Property>
 		<Property Name="Network:UseBinding" Type="Str">False</Property>
-		<Property Name="Network:UseBuffering" Type="Str">False</Property>
+		<Property Name="Network:UseBuffering" Type="Str">True</Property>
 		<Property Name="numTypedefs" Type="UInt">0</Property>
-		<Property Name="Real-Time Features:ApplyNetworkConfig" Type="Str">False</Property>
-		<Property Name="Real-Time Features:BufferLength" Type="Str">1</Property>
-		<Property Name="Real-Time Features:UseBuffering" Type="Str">False</Property>
 		<Property Name="type" Type="Str">Network</Property>
 		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!B(1!!!#!!A!!!!!!"!!R!)1&gt;#&lt;W^M:7&amp;O!!%!!!!!!!!!!!!!!!</Property>
 	</Item>
 	<Item Name="SweepCurrentFrequency" Type="Variable">
 		<Property Name="featurePacks" Type="Str">Network</Property>
 		<Property Name="Network:BuffSize" Type="Str">50</Property>
+		<Property Name="Network:ElemSize" Type="Str">1</Property>
+		<Property Name="Network:PointsPerWaveform" Type="Str">1</Property>
+		<Property Name="Network:SingleWriter" Type="Str">False</Property>
 		<Property Name="Network:UseBinding" Type="Str">False</Property>
 		<Property Name="Network:UseBuffering" Type="Str">True</Property>
 		<Property Name="numTypedefs" Type="UInt">0</Property>
 		<Property Name="type" Type="Str">Network</Property>
 		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!J*1!!!#!!A!!!!!!"!!V!#A!'2'^V9GRF!!!"!!!!!!!!!!!!!!!!!!!!!!!!</Property>
 	</Item>
-	<Item Name="SweepData" Type="Variable">
+	<Item Name="SweepIndex" Type="Variable">
 		<Property Name="featurePacks" Type="Str">Network</Property>
 		<Property Name="Network:BuffSize" Type="Str">50</Property>
-		<Property Name="Network:ElemSize" Type="Str">1</Property>
-		<Property Name="Network:PointsPerWaveform" Type="Str">1</Property>
-		<Property Name="Network:SingleWriter" Type="Str">False</Property>
 		<Property Name="Network:UseBinding" Type="Str">False</Property>
 		<Property Name="Network:UseBuffering" Type="Str">True</Property>
 		<Property Name="numTypedefs" Type="UInt">0</Property>
 		<Property Name="type" Type="Str">Network</Property>
-		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!""01!!!#!!A!!!!!!#!!V!#A!(4H6N:8*J9Q!=1%!!!@````]!!!^"=H*B?3"P:C"%&lt;X6C&lt;'5!!1!"!!!!!!!!!!!!!!!!</Property>
+		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!F)1!!!#!!A!!!!!!"!!V!"Q!'65FO&gt;$-S!!!"!!!!!!!!!!!!!!!!!!!</Property>
 	</Item>
-	<Item Name="SweepIndex" Type="Variable">
+	<Item Name="SweepStep" Type="Variable">
 		<Property Name="featurePacks" Type="Str">Network</Property>
 		<Property Name="Network:BuffSize" Type="Str">50</Property>
 		<Property Name="Network:ElemSize" Type="Str">1</Property>
@@ -601,9 +686,11 @@
 		<Property Name="Network:SingleWriter" Type="Str">False</Property>
 		<Property Name="Network:UseBinding" Type="Str">False</Property>
 		<Property Name="Network:UseBuffering" Type="Str">True</Property>
-		<Property Name="numTypedefs" Type="UInt">0</Property>
+		<Property Name="numTypedefs" Type="UInt">1</Property>
 		<Property Name="type" Type="Str">Network</Property>
-		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!F)1!!!#!!A!!!!!!"!!V!"Q!'65FO&gt;$-S!!!"!!!!!!!!!!!!!!!!!!!</Property>
+		<Property Name="typedefName1" Type="Str">扫频阶段.ctl</Property>
+		<Property Name="typedefPath1" Type="PathRel">../../FPGA/扫频阶段.ctl</Property>
+		<Property Name="typeDesc" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!"H9Q!!!#!!A!!!!!!"!&amp;)!]?-0&amp;OE!!!!"$-GIRL7^V\&lt;/,G.U&lt;!!^1"5!"!D'^,;PP&gt;?WTAT"P\SWN@@6_\X8NMY)S;D'N&lt;X8NMY)T;07O&lt;X8NMY!#-GIRL7^V\&lt;/!!!"!!!!!!!!!!!!!!!</Property>
 	</Item>
 	<Item Name="Troubleshooting" Type="Variable">
 		<Property Name="Description:Description" Type="Str">故障解除</Property>

BIN
S7/Connect.vi


BIN
controls/UI Data.ctl


BIN
全局变量/配置参数.vi


+ 3 - 6
液压台控制.aliases

@@ -1,8 +1,5 @@
-[My Computer]
-My Computer = "169.254.156.216"
-
-[NI-sbRIO-9638-02176AD5]
-NI-sbRIO-9638-02176AD5 = "192.168.1.30"
+[NI-sbRIO-9638-02176AD8]
+NI-sbRIO-9638-02176AD8 = "192.168.10.249"
 
 [我的电脑]
-我的电脑 = "169.254.156.216"
+我的电脑 = "127.0.0.1"

+ 1 - 1
液压台控制.lvlps

@@ -1,5 +1,5 @@
 [ÏîÄ¿´°¿ÚÊý¾Ý(_D)]
-ProjectExplorer.ClassicPosition[String] = "376,627,910,1107"
+ProjectExplorer.ClassicPosition[String] = "135,1221,919,1700"
 
 [AB_Cache_{A02F3055-4D03-447D-A8A3-7DB6F53AD307}]
 Cache_Path[Path] Line0001 = "/C/Users/admin/AppData/Local/Temp/AB_Cache_{A02F30"

Datei-Diff unterdrückt, da er zu groß ist
+ 64 - 47
液压台控制.lvproj


BIN
液压台控制.vi


BIN
液压台控制/Controls/液压控制台_信号发生参数.ctl


BIN
液压台控制/Controls/液压控制台_信号发生控件引用.ctl


BIN
液压台控制/Controls/液压控制台_信号类型.ctl


BIN
液压台控制/Controls/液压控制台_控制参数.ctl


BIN
液压台控制/Controls/液压控制台_校准信号.ctl


BIN
液压台控制/Controls/液压控制台_系统调试_控件引用.ctl


BIN
液压台控制/Controls/液压控制台_配置参数.ctl


BIN
液压台控制/SubVIs/液压台控制_Initialize Data.vi


BIN
液压台控制/SubVIs/液压台控制_Initialize UI.vi


BIN
液压台控制/SubVIs/液压台控制_信号发生.vi


BIN
液压台控制/SubVIs/液压台控制_信号发生_保存参数.vi


BIN
液压台控制/SubVIs/液压台控制_信号发生_初始化.vi


BIN
液压台控制/SubVIs/液压台控制_信号校准_保存参数.vi


BIN
液压台控制/SubVIs/液压台控制_信号校准_初始化.vi


BIN
液压台控制/SubVIs/液压台控制_停止激振.vi


BIN
液压台控制/SubVIs/液压台控制_判断控制器状态.vi


BIN
液压台控制/SubVIs/液压台控制_参数设置.vi


BIN
液压台控制/SubVIs/液压台控制_参数设置_保存参数.vi


BIN
液压台控制/SubVIs/液压台控制_参数设置_初始化.vi


BIN
液压台控制/SubVIs/液压台控制_另存参数.vi


BIN
液压台控制/SubVIs/液压台控制_台面上升.vi


BIN
液压台控制/SubVIs/液压台控制_台面下降.vi


BIN
液压台控制/SubVIs/液压台控制_台面微调.vi


BIN
液压台控制/SubVIs/液压台控制_复位_阀上电.vi


BIN
液压台控制/SubVIs/液压台控制_开始激振.vi


BIN
液压台控制/SubVIs/液压台控制_控件状态设置(all).vi


BIN
液压台控制/SubVIs/液压台控制_故障_阀上电.vi


BIN
液压台控制/SubVIs/液压台控制_更新油源信息.vi


BIN
液压台控制/SubVIs/液压台控制_更新试验信息.vi


BIN
液压台控制/SubVIs/液压台控制_更新输出波形.vi


BIN
液压台控制/SubVIs/液压台控制_更新运行时间.vi


BIN
液压台控制/SubVIs/液压台控制_更新运行状态.vi


BIN
液压台控制/SubVIs/液压台控制_检查信号发生停止状态.vi


BIN
液压台控制/SubVIs/液压台控制_检查信号发生状态.vi


BIN
液压台控制/SubVIs/液压台控制_检查台面上升状态.vi


BIN
液压台控制/SubVIs/液压台控制_检查台面下降状态.vi


BIN
液压台控制/SubVIs/液压台控制_检查零位改状态.vi


BIN
液压台控制/SubVIs/液压台控制_状态检查.vi


BIN
液压台控制/SubVIs/液压台控制_系统调试.vi


BIN
液压台控制/SubVIs/液压台控制_系统调试_初始化.vi


BIN
液压台控制/SubVIs/液压台控制_自闭环.vi


BIN
液压台控制/SubVIs/液压台控制_获取数据.vi


BIN
液压台控制/SubVIs/液压台控制_获取数据_获取RT中数据.vi


BIN
液压台控制/SubVIs/液压台控制_获取警告状态.vi


BIN
液压台控制/SubVIs/液压台控制_获取运行状态.vi


BIN
液压台控制/SubVIs/液压台控制_获取错误状态.vi


BIN
液压台控制/SubVIs/液压台控制_计算THD.vi


BIN
液压台控制/SubVIs/液压台控制_读取加载参数.vi


BIN
液压台控制/SubVIs/液压台控制_阀上电.vi


Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.