Browse Source

add CheckLoad in HongHuVR && fix the bug in seRobot

zhouhr 1 year ago
parent
commit
9094188c54

+ 1 - 1
Venus/Venus_RT/Devices/TM/HongHuVR.cs

@@ -206,7 +206,7 @@ namespace Venus_RT.Devices.VCE
 
             _currentStep = hand == Hand.Blade2 ? VRStep.CheckLoad_ArmB : VRStep.CheckLoad_ArmA;
             _status = RState.Running;
-            return _SendCommand($"CHECK LOAD ARM {Hand2Arm(hand)}");
+            return _SendCommand($"CHECK LOAD {Hand2Arm(hand)}");
         }
 
 

+ 1 - 1
Venus/Venus_Simulator/Devices/SETMSimulatorServer.cs

@@ -13,7 +13,7 @@ namespace Venus_Simulator.Devices
     public class SETMSimulatorServer : SocketDeviceSimulator
     {
 
-        private readonly Regex _check_load = new Regex(@"CHECK LOAD\s+(\d+)\s+ARM\s+(A|B)\s*");
+        private readonly Regex _check_load = new Regex(@"CHECK LOAD\s+(A|B)\s*");
         private readonly Regex _move_arm = new Regex(@"(PLACE|PICK)\s+(\d+)\s+ARM\s+(A|B)\s+(\w{4})\s*");
         private readonly Regex _move_wafer = new Regex(@"(PLACE|PICK)\s+(\d+)\s+ARM\s+(A|B)\s*");
 

+ 5 - 5
Venus/Venus_Themes/Venus_Themes.csproj

@@ -503,11 +503,11 @@
     <Content Include="Themes\Images\parts\efemtrack.png" />
     <Content Include="Themes\Images\parts\loadlock.png" />
     <Content Include="Themes\Images\parts\loadport.png" />
-    <Content Include="Themes\Images\parts\serobot\SERobot1.png" />
-    <Content Include="Themes\Images\parts\serobot\SERobot11.png" />
-    <Content Include="Themes\Images\parts\serobot\SERobot2.png" />
-    <Content Include="Themes\Images\parts\serobot\SERobot3.png" />
-    <Content Include="Themes\Images\parts\serobot\SERobot4.png" />
+    <Resource Include="Themes\Images\parts\serobot\SERobot1.png" />
+    <Resource Include="Themes\Images\parts\serobot\SERobot11.png" />
+    <Resource Include="Themes\Images\parts\serobot\SERobot2.png" />
+    <Resource Include="Themes\Images\parts\serobot\SERobot3.png" />
+    <Resource Include="Themes\Images\parts\serobot\SERobot4.png" />
     <Content Include="Themes\Images\parts\tm.png" />
     <Content Include="Themes\Images\parts\tmdock.png" />
     <Content Include="Themes\Images\parts\vce\ButtomSupport1.png" />