解决ValueTuple版本冲突

Venus/Venus_Core/Venus_Core.csproj

@@ -21,7 +21,8 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>CS0168</NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

Venus/Venus_MainPages/Venus_MainPages.csproj

@@ -22,7 +22,8 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>CS0168,CS0219,CS0649,CS0169,CS0414</NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

Venus/Venus_MainPages/ViewModels/TopViewModel.cs

@@ -45,7 +45,7 @@ namespace Venus_MainPages.ViewModels
         private string m_HostCommunicationStatus;
         private string m_TimeTick;
 
-        private JetChamber m_SelectedJetChamber = JetChamber.None;
+        //private JetChamber m_SelectedJetChamber = JetChamber.None;
 
         private bool m_PMAIsInstalled;
         private bool m_PMBIsInstalled;

Venus/Venus_MainPages/Views/OperationOverView.xaml

@@ -38,11 +38,13 @@
         <Border BorderThickness="0,0,0,1" BorderBrush="Black" Canvas.Top="20" Canvas.Left="40">
             <StackPanel Orientation="Horizontal" Margin="0,0,0,5">
                 <customControls:PathButton PathData="{StaticResource Icon_Init}"  DefaultFillBrush="White"  Command="{Binding HomeAllCommand}"  Width="120" Height="30" Content="Initialize"    Margin="10,0,0,0" IsEnabled="{Binding RtDataValues[System.IsAutoMode],Converter={StaticResource BoolToBool}}"/>
+                <customControls:PathButton PathData="{StaticResource Icon_Return}"  DefaultFillBrush="White" Width="146" Height="30" Content="Return Wafer"    Command="{Binding ReturnAllWaferCommand}"         IsEnabled="{Binding RtDataValues[System.IsAutoMode],Converter={StaticResource BoolToBool}}" Margin="50,0,0,0"/>
+
                 <RadioButton Content="Manual"   FontSize="15"   Width="120" Height="28" Margin="50 0 5 0" Style="{StaticResource Button_RadioButton}"  Command="{Binding EnableManualCommand}" IsChecked="{Binding RtDataValues[System.IsAutoMode],Converter={StaticResource BoolToBool}}"/>
+                
                 <RadioButton Content="Auto"     FontSize="15"   Width="120" Height="28" Margin="0 0 0 0" Style="{StaticResource Button_RadioButton}"     Command="{Binding EnableAutoCommand}"  IsChecked="{Binding RtDataValues[System.IsAutoMode]}"/>
                 <customControls:PathButton PathData="{StaticResource Icon_Abort}"   DefaultFillBrush="White" Width="130" Height="30" Content="Abort"           Command="{Binding AbortAllCommand}"               IsEnabled="{Binding RtDataValues[System.IsAutoMode]}" Margin="50 0 0 0" />
                 <customControls:PathButton PathData="{Binding RtDataValues[EquipmentStatus],Converter={StaticResource IntToPathDataConverter}}"   DefaultFillBrush="White" Width="130" Height="30" Content="{Binding RouteState}"           Command="{Binding ResumeAllJobCommand}"            IsEnabled="{Binding RtDataValues[System.IsAutoMode]}" Margin="50 0 0 0" />
-                <customControls:PathButton PathData="{StaticResource Icon_Return}"  DefaultFillBrush="White" Width="146" Height="30" Content="Return Wafer"    Command="{Binding ReturnAllWaferCommand}"         IsEnabled="{Binding RtDataValues[System.IsAutoMode]}" Margin="50,0,0,0"/>
                 
                
             </StackPanel>

Venus/Venus_RT/Devices/EFEM/JetEfem.cs

@@ -78,7 +78,8 @@ namespace Venus_RT.Devices.EFEM
             CarrierManager.Instance.SubscribeLocation(ModuleName.LP3.ToString(), 1);
 
 
-            Action<ModuleName, int> _subscribeLoc = (ModuleName module, int waferCount) => {
+            Action<ModuleName, int> _subscribeLoc = (ModuleName module, int waferCount) =>
+            {
                 if (ModuleHelper.IsInstalled(module))
                 {
                     WaferManager.Instance.SubscribeLocation(module, waferCount);
@@ -152,7 +153,6 @@ namespace Venus_RT.Devices.EFEM
         }
         public override bool Home(ModuleName mod)
         {
-            SetRobotMovingInfo(RobotAction.Homing, Hand.Both, ModuleName.EFEM);
 
             if (ModuleHelper.IsLoadPort(mod))
             {
@@ -183,7 +183,7 @@ namespace Venus_RT.Devices.EFEM
                 _status = RState.Running;
                 return _socket.Write(_currentMsg.ToString());
             }
-            
+
         }
 
         public override bool OriginalSearch(ModuleName mod)
@@ -198,7 +198,7 @@ namespace Venus_RT.Devices.EFEM
                 Head = EfemMessage.MsgHead.MOV,
                 Parameters = new List<string>
                 {
-                    Constant.ModuleString[mod] 
+                    Constant.ModuleString[mod]
                 }
             };
 
@@ -247,7 +247,7 @@ namespace Venus_RT.Devices.EFEM
 
         public override bool ClearError()
         {
-            if(_status == RState.Running)
+            if (_status == RState.Running)
             {
                 LOG.Write(eEvent.ERR_EFEM_ROBOT, ModuleName.EFEM, "EFEM is busy, please wait a minute");
                 return false;
@@ -358,7 +358,7 @@ namespace Venus_RT.Devices.EFEM
             if (!CheckEfemStatus())
                 return false;
 
-            Position SrcPos = new Position {  Module= station,Slot= (byte)slot };
+            Position SrcPos = new Position { Module = station, Slot = (byte)slot };
             _currentMsg = new EfemMessage
             {
                 Operation = EfemOperation.Pick,
@@ -496,7 +496,7 @@ namespace Venus_RT.Devices.EFEM
 
             _currentMsg = new EfemMessage
             {
-                Operation =  EfemOperation.Align,
+                Operation = EfemOperation.Align,
                 Head = EfemMessage.MsgHead.MOV,
                 Parameters = new List<string> { $"A{angle.ToString("000.00")}" }
             };
@@ -504,7 +504,7 @@ namespace Venus_RT.Devices.EFEM
             _backround = false;
             _status = RState.Running;
             return _socket.Write(_currentMsg.ToString());
-        } 
+        }
         public override bool SetLamp(LightType light, LightStatus status)
         {
             _backroundMsg = new EfemMessage
@@ -610,7 +610,7 @@ namespace Venus_RT.Devices.EFEM
                 Port = mod,
                 Operation = EfemOperation.Dock,
                 Head = EfemMessage.MsgHead.MOV,
-                Parameters = new List<string> { Constant.ModuleString[mod]}
+                Parameters = new List<string> { Constant.ModuleString[mod] }
             };
 
             _backround = true;
@@ -624,7 +624,7 @@ namespace Venus_RT.Devices.EFEM
                 Port = mod,
                 Operation = EfemOperation.Undock,
                 Head = EfemMessage.MsgHead.MOV,
-                Parameters = new List<string> { Constant.ModuleString[mod]}
+                Parameters = new List<string> { Constant.ModuleString[mod] }
             };
 
             _backround = true;
@@ -700,7 +700,7 @@ namespace Venus_RT.Devices.EFEM
                         {
                             _revMsg = rec_msg;
                         }
-                        
+
                         break;
 
                     case EfemMessage.MsgHead.INF:
@@ -726,6 +726,10 @@ namespace Venus_RT.Devices.EFEM
                             CommandType = rec_msg.Operation,
                             DataList = rec_msg.Data
                         });
+                        if (rec_msg.Operation == EfemOperation.Home)
+                        {
+                            SetRobotMovingInfo(RobotAction.Homing, Hand.Both, ModuleName.EFEM);
+                        }
                         break;
 
                     case EfemMessage.MsgHead.NAK:
@@ -746,7 +750,7 @@ namespace Venus_RT.Devices.EFEM
         private void OnErrorOccurred(EfemMessage message)
         {
             string description = string.Empty;
-            switch(message.Head)
+            switch (message.Head)
             {
                 case EfemMessage.MsgHead.NAK:
                     description = Constant.FactorString[message.Factor];
@@ -864,9 +868,9 @@ namespace Venus_RT.Devices.EFEM
 
         private void OnCommandUpdated(EfemMessage message)
         {
-            if(message.Operation != EfemOperation.Ready)
+            if (message.Operation != EfemOperation.Ready)
             {
-                if (!SearchForDeleteBackMsg(message) && _currentMsg.Operation != message.Operation )
+                if (!SearchForDeleteBackMsg(message) && _currentMsg.Operation != message.Operation)
                 {
                     LOG.Write(eEvent.ERR_EFEM_COMMON_FAILED, ModuleName.EfemRobot, $"OnCommandUpdated() unexpected return: {message.Operation}, expect: {_currentMsg.Operation}");
                     return;
@@ -879,7 +883,7 @@ namespace Venus_RT.Devices.EFEM
                 //}
             }
 
-            switch(message.Operation)
+            switch (message.Operation)
             {
                 case EfemOperation.ClearError:
                 case EfemOperation.Align:
@@ -901,14 +905,14 @@ namespace Venus_RT.Devices.EFEM
                     break;
                 case EfemOperation.Home:
                     {
-                        if(_currentMsg.Port == ModuleName.EFEM)
+                        if (_currentMsg.Port == ModuleName.EFEM)
                         {
                             _LPMs[0].OnHomed();
                             _LPMs[1].OnHomed();
                             _LPMs[2].OnHomed();
                             _backroundlist = new List<EfemMessage>() { };
                         }
-                        else if(ModuleHelper.IsLoadPort(_currentMsg.Port))
+                        else if (ModuleHelper.IsLoadPort(_currentMsg.Port))
                         {
                             _LPMs[_currentMsg.Port - ModuleName.LP1].OnHomed();
                         }
@@ -928,7 +932,7 @@ namespace Venus_RT.Devices.EFEM
                     break;
                 case EfemOperation.CarrierId:
                     {
-                        if(message.Head == EfemMessage.MsgHead.GET)
+                        if (message.Head == EfemMessage.MsgHead.GET)
                         {
                             _LPMs[message.Port - ModuleName.LP1].OnCarrierIDRead(message.Data.First());
                         }
@@ -989,7 +993,7 @@ namespace Venus_RT.Devices.EFEM
         private bool SearchForDeleteBackMsg(EfemMessage message)
         {
             //searchForDelete
-            for (int i = 0;i< _backroundlist.Count;i++)
+            for (int i = 0; i < _backroundlist.Count; i++)
             {
                 if (_backroundlist[i].Operation == message.Operation && _backroundlist[i].Port == message.Port)
                 {
@@ -1002,7 +1006,7 @@ namespace Venus_RT.Devices.EFEM
 
         async void SendBack(string data)
         {
-            await Task.Run(()=> _socket.Write(data + '\r'));
+            await Task.Run(() => _socket.Write(data + '\r'));
         }
     }
 }

Venus/Venus_RT/Devices/TM/SIASUNRobot.cs

@@ -104,7 +104,7 @@ namespace Venus_RT.Devices
         {
             _status = RState.Running;
             _currentOP = OPStep.Home;
-            SetRobotMovingInfo(RobotAction.Homing, Hand.Both, ModuleName.SETM);
+            
             return _SendCommand("HOME ALL");
         }
         public bool Halt()
@@ -297,6 +297,7 @@ namespace Venus_RT.Devices
                             _currentOP = OPStep.Idle;
                             _status = RState.End;
                             _IsHomed = true;
+                            SetRobotMovingInfo(RobotAction.Homing, Hand.Both, ModuleName.SETM);
                         }
                         else
                             ReportWrongMsg(RevMsg);

Venus/Venus_RT/Venus_RT.csproj

@@ -42,7 +42,8 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>CS0168,CS0219</NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

Venus/Venus_Simulator/Devices/RevtechMatchMockPMA.cs

@@ -47,11 +47,7 @@ namespace Venus_Simulator.Devices
 
             string[] msgs = message.Split('\n');
             foreach(string msg in msgs)
-            {
-                switch (msg)
-                {
-                   
-                }
+            {              
 
                 Thread.Sleep(200);
 

Venus/Venus_Simulator/Devices/RevtechMatchMockPMB.cs

@@ -48,10 +48,6 @@ namespace Venus_Simulator.Devices
             string[] msgs = message.Split('\n');
             foreach(string msg in msgs)
             {
-                switch (msg)
-                {
-                   
-                }
 
                 Thread.Sleep(200);
 

Venus/Venus_Simulator/Devices/RevtechMatchMockPMC.cs

@@ -48,10 +48,6 @@ namespace Venus_Simulator.Devices
             string[] msgs = message.Split('\n');
             foreach(string msg in msgs)
             {
-                switch (msg)
-                {
-                   
-                }
 
                 Thread.Sleep(200);
 

Venus/Venus_Simulator/Venus_Simulator.csproj

@@ -24,7 +24,8 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>CS0168</NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

Venus/Venus_UI/Venus_UI.csproj

@@ -40,7 +40,8 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>CS0168</NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -93,7 +94,9 @@
       <HintPath>..\ThirdParty\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ValueTuple" />
+    <Reference Include="System.ValueTuple">
+      <HintPath>..\ThirdParty\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Interactivity">
       <HintPath>..\ThirdParty\System.Windows.Interactivity.dll</HintPath>
     </Reference>