Browse Source

update boat home判断dimoving

jiangjy 1 month ago
parent
commit
94b9e52351

+ 3 - 3
Furnace/FurnaceRT/Config/System.sccfg

@@ -4670,7 +4670,7 @@
 			</configs>
 
 			<configs name="Manual_phase1" visible="false">
-				<config  type="Double"   default="500"  name="MFC51"								   />
+				<config  type="Double"   default="800" max="1000" min="0"  name="MFC51"								   />
 				<config  type="Bool"   default="true"  name="ValveAV56"								   />
 				<config  type="Bool"   default="true"  name="ValveAV57"								   />
 				<config  type="Bool"   default="false" name="ValveAV65"								   />
@@ -4684,7 +4684,7 @@
 				<config  type="Bool"   default="false" name="TrigMS522"						   />
 			</configs>
 			<configs name="Manual_phase2" visible="false">
-				<config  type="Double"   default="500"  name="MFC51"								   />
+				<config  type="Double"   default="400"  max="1000" min="0"   name="MFC51"								   />
 				<config  type="Bool"   default="true"  name="ValveAV56"								   />
 				<config  type="Bool"   default="false"  name="ValveAV57"								   />
 				<config  type="Bool"   default="false" name="ValveAV65"								   />
@@ -4698,7 +4698,7 @@
 				<config  type="Bool"   default="false"  name="TrigMS522"								   />
 			</configs>
 			<configs name="Manual_phase3" visible="false">
-				<config  type="Double"   default="500"  name="MFC51"								   />
+				<config  type="Double"   default="200"  max="1000" min="0"  name="MFC51"								   />
 				<config  type="Bool"   default="false"  name="ValveAV56"								   />
 				<config  type="Bool"   default="false"  name="ValveAV57"								   />
 				<config  type="Bool"   default="true" name="ValveAV65"								   />

+ 1 - 1
Furnace/FurnaceRT/Equipments/Boats/BoatHome.cs

@@ -144,7 +144,7 @@ namespace FurnaceRT.Equipments.Boats
             {
                 if (_boatModule.RAxisDevice.IsError)
                     return null;
-                return _boatModule.RAxisDevice.IsHomeDone && _boatModule.RAxisDevice.IsReady;
+                return _boatModule.RAxisDevice.IsHomeDone&& _boatModule.RAxisDevice.IsMoving && _boatModule.RAxisDevice.IsReady;
 
             }, timeout * 1000);