1 revise platingcell ui bug

2 revise TC config releated

Framework/Common/Device/TemperatureController/TemperatureSerialDevice.cs

@@ -863,7 +863,7 @@ namespace MECF.Framework.Common.Device.ResistivityProbe
             }
         }
         /// <summary>
-        /// 根据十单位数据
+        /// 读取十单位数据
         /// </summary>
         /// <param name="id"></param>
         /// <param name="command"></param>
@@ -902,7 +902,7 @@ namespace MECF.Framework.Common.Device.ResistivityProbe
             }
         }
         /// <summary>
-        /// 根据有符号十单位数据
+        /// 读取有符号十单位数据
         /// </summary>
         /// <param name="id"></param>
         /// <param name="command"></param>
@@ -955,7 +955,7 @@ namespace MECF.Framework.Common.Device.ResistivityProbe
             }
         }
         /// <summary>
-        /// 根据数组数据
+        /// 读取数组数据
         /// </summary>
         /// <param name="id"></param>
         /// <param name="command"></param>

Framework/SimulatorCore/Commons/TemperatureControllerSerialPortDevice.cs

@@ -127,9 +127,6 @@ namespace MECF.Framework.Simulator.Core.Commons
                     case 3:
                         _timers[3].Elapsed += Timer_Elapsed3;
                         break;
-                    case 4:
-                        _timers[4].Elapsed += Timer_Elapsed4;
-                        break;
                     default:
                         break;
                 }               
@@ -267,39 +264,6 @@ namespace MECF.Framework.Simulator.Core.Commons
                 _timers[3].Stop();
             }
         }
-        /// <summary>
-        /// TC1-5的调温
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Timer_Elapsed4(object sender, System.Timers.ElapsedEventArgs e)
-        {
-            if (Math.Abs(_heatValues[4] - _targetValues[4]) >= 0.2)
-            {
-                //内部调温
-                if (_heatValues[4] < _targetValues[4])
-                {
-                    _heatValues[4] += 0.1;
-                }
-                else
-                {
-                    _heatValues[4] -= 0.1;
-                }
-                //外部调温
-                if (_reserviorValues[4] < _targetValues[4])
-                {
-                    _reserviorValues[4] += 0.1;
-                }
-                else
-                {
-                    _reserviorValues[4] -= 0.1;
-                }
-            }
-            else
-            {
-                _timers[4].Stop();
-            }
-        }
         protected override string MessageConvert(byte[] byt)
         {
             string str = "";

PunkHPX8_RT/Config/Devices/Beckhoffcfg - plctask.xml

@@ -156,7 +156,7 @@
 		<Input Name="r_PlatingCell1_HEAD_VERTICAL"  Address="MAIN.PlatingCell1_2_DI_16CHANNEL_EL1819_N400_5" Invert="false" Type="Digital" DataType="bool"/>
 		<Input Name="r_CELL1_CLAMSHELL_DISTANCE"  Address="MAIN.PlatingCell1_2_AI_8CHANNEL_0_10V_EL3068_N402_1" Scaling="0=0,100=32767" Type="Analog" DataType="int"/>
 		<Input Name="r_CLAMSHELL_CYLINDER_PRESSURE"  Address="MAIN.PlatingCell1_2_AI_8CHANNEL_0_10V_EL3068_N402_3" Scaling="0=0,20=32767" Type="Analog" DataType="int"/>
-		<Input Name="r_CELL1_OVERFLOW_LEVEL"  Address="MAIN.PlatingCell1_2_AI_8CHANNEL_4_20MA_EL3058_N403_1" Scaling="4=0,20=32767" Type="Analog" DataType="int"/>
+		<Input Name="r_CELL1_OVERFLOW_LEVEL"  Address="MAIN.PlatingCell1_2_AI_8CHANNEL_4_20MA_EL3058_N403_1" Scaling="0=0,100=32767" Type="Analog" DataType="int"/>
 		<!--PlatingCell1 inputs End-->
 		
 		
@@ -164,7 +164,7 @@
 		<Input Name="r_PlatingCell2_HEAD_TILTED"  Address="MAIN.PlatingCell1_2_DI_16CHANNEL_EL1819_N400_4" Invert="false" Type="Digital" DataType="bool"/>
 		<Input Name="r_PlatingCell2_HEAD_VERTICAL"  Address="MAIN.PlatingCell1_2_DI_16CHANNEL_EL1819_N400_5" Invert="false" Type="Digital" DataType="bool"/>
 		<Input Name="r_CELL2_CLAMSHELL_DISTANCE"  Address="MAIN.PlatingCell1_2_AI_8CHANNEL_0_10V_EL3068_N402_2" Scaling="0=0,100=32767" Type="Analog" DataType="int"/>
-		<Input Name="r_CELL2_OVERFLOW_LEVEL"  Address="MAIN.PlatingCell1_2_AI_8CHANNEL_4_20MA_EL3058_N403_2" Scaling="4=0,20=32767" Type="Analog" DataType="int"/>
+		<Input Name="r_CELL2_OVERFLOW_LEVEL"  Address="MAIN.PlatingCell1_2_AI_8CHANNEL_4_20MA_EL3058_N403_2" Scaling="0=0,100=32767" Type="Analog" DataType="int"/>
 		<!--PlatingCell2 inputs End-->
 		
 		
@@ -173,7 +173,7 @@
 		<Input Name="r_PlatingCell3_HEAD_VERTICAL"  Address="MAIN.PlatingCell3_4_DI_16CHANNEL_EL1819_N430_5" Invert="false" Type="Digital" DataType="bool"/>
 		
 		<Input Name="r_CELL3_CLAMSHELL_DISTANCE"  Address="MAIN.PlatingCell3_4_AI_8CHANNEL_0_10V_EL3068_N432_1" Scaling="0=0,100=32767" Type="Analog" DataType="int"/>
-		<Input Name="r_CELL3_OVERFLOW_LEVEL"  Address="MAIN.PlatingCell3_4_AI_8CHANNEL_4_20MA_EL3058_N433_1" Scaling="4=0,20=32767" Type="Analog" DataType="int"/>
+		<Input Name="r_CELL3_OVERFLOW_LEVEL"  Address="MAIN.PlatingCell3_4_AI_8CHANNEL_4_20MA_EL3058_N433_1" Scaling="0=0,100=32767" Type="Analog" DataType="int"/>
 		<!--PlatingCell3 inputs End-->
 		
 		
@@ -181,7 +181,7 @@
 		<Input Name="r_PlatingCell4_HEAD_TILTED"  Address="MAIN.PlatingCell3_4_DI_16CHANNEL_EL1819_N430_4" Invert="false" Type="Digital" DataType="bool"/>
 		<Input Name="r_PlatingCell4_HEAD_VERTICAL"  Address="MAIN.PlatingCell3_4_DI_16CHANNEL_EL1819_N430_5" Invert="false" Type="Digital" DataType="bool"/>
 		<Input Name="r_CELL4_CLAMSHELL_DISTANCE"  Address="MAIN.PlatingCell3_4_AI_8CHANNEL_0_10V_EL3068_N432_2" Scaling="0=0,100=32767" Type="Analog" DataType="int"/>
-		<Input Name="r_CELL4_OVERFLOW_LEVEL"  Address="MAIN.PlatingCell3_4_AI_8CHANNEL_4_20MA_EL3058_N433_2" Scaling="4=0,20=32767" Type="Analog" DataType="int"/>
+		<Input Name="r_CELL4_OVERFLOW_LEVEL"  Address="MAIN.PlatingCell3_4_AI_8CHANNEL_4_20MA_EL3058_N433_2" Scaling="0=0,100=32767" Type="Analog" DataType="int"/>
 		<!--PlatingCell4 inputs End-->
 
 

PunkHPX8_RT/Config/Devices/SMCCfg.xml

@@ -3,13 +3,14 @@
   <!-- <SMCDeviceConfig Name ="SMC1" Port="com111" BaudRate="1200" Parity="N" Data="8" StopBit="1"> -->
   <SMCDeviceConfig Name ="TC1" Port="com11" BaudRate="2400" Parity="N" Data="8" StopBit="1">
     <Device Name="TC1-1" Address="1"/>
-    <Device Name="TC1-2" Address="2"/>
-    <Device Name="TC1-3" Address="3"/>
-    <Device Name="TC1-4" Address="4"/>
   </SMCDeviceConfig>
   <SMCDeviceConfig Name ="TC2" Port="com13" BaudRate="2400" Parity="N" Data="8" StopBit="1">
     <Device Name="TC2-1" Address="1"/>
-    <Device Name="TC2-2" Address="2"/>
-    <Device Name="TC2-3" Address="3"/>
+  </SMCDeviceConfig>
+    <SMCDeviceConfig Name ="TC3" Port="com15" BaudRate="2400" Parity="N" Data="8" StopBit="1">
+    <Device Name="TC3-1" Address="1"/>
+  </SMCDeviceConfig>
+  <SMCDeviceConfig Name ="TC4" Port="com17" BaudRate="2400" Parity="N" Data="8" StopBit="1">
+    <Device Name="TC4-1" Address="1"/>
   </SMCDeviceConfig>
 </SMCConfig>

PunkHPX8_RT/Config/Devices/ThorntonCfg.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ThorntonConfig>
-  <ThorntonDeviceConfig Name="RP1" Port="com18" BaudRate="19200" Parity="N" Data="8" StopBit="1">
+  <ThorntonDeviceConfig Name="RP1" Port="com28" BaudRate="19200" Parity="N" Data="8" StopBit="1">
     <Device Name="RP1-1" Address="1"/>
     <Device Name="RP1-2" Address="3"/>
     <Device Name="RP1-3" Address="5"/>
     <Device Name="RP1-4" Address="7"/>
   </ThorntonDeviceConfig>
-   <ThorntonDeviceConfig Name="RP2" Port="com20" BaudRate="19200" Parity="N" Data="8" StopBit="1">
+   <ThorntonDeviceConfig Name="RP2" Port="com30" BaudRate="19200" Parity="N" Data="8" StopBit="1">
     <Device Name="RP2-1" Address="1"/>
   </ThorntonDeviceConfig>
 </ThorntonConfig>

PunkHPX8_RT/Config/Layout/ToolLayoutConfiguration.xml

@@ -115,7 +115,7 @@
 
 		<!-- RESISTIVITY PROBES -->
 		<Item i:type="ResistivityProbe">
-			<Installed>true</Installed>
+			<Installed>false</Installed>
 			<Count>2</Count>
 			<ResistivityProbeID>1</ResistivityProbeID>
 			<SubType>STDThornton</SubType>
@@ -159,10 +159,28 @@
 
 		<Item i:type="TempControl">
 			<Installed>true</Installed>
-			<Count>4</Count>
+			<Count>1</Count>
 			<TCID>1</TCID>
 			<SubType>SMC</SubType>
 		</Item>
+		<Item i:type="TempControl">
+			<Installed>true</Installed>
+			<Count>1</Count>
+			<TCID>2</TCID>
+			<SubType>SMC</SubType>
+		</Item>
+		<Item i:type="TempControl">
+			<Installed>true</Installed>
+			<Count>1</Count>
+			<TCID>3</TCID>
+			<SubType>SMC</SubType>
+		</Item>
+		<Item i:type="TempControl">
+			<Installed>true</Installed>
+			<Count>1</Count>
+			<TCID>4</TCID>
+			<SubType>SMC</SubType>
+		</Item>
 
 
 		<Item i:type="Reservoir">
@@ -205,7 +223,7 @@
 			<Installed>true</Installed>
 			<ReservoirID>2</ReservoirID>
 			<Size>2</Size>
-			<TCID>TC1-2</TCID>
+			<TCID>TC2-1</TCID>
 			<SubType>DegasMembrance</SubType>
 			<PHProbeChannelNumber>1</PHProbeChannelNumber>
 			<PlannedInitialChemistry>Cu</PlannedInitialChemistry>
@@ -241,7 +259,7 @@
 			<Installed>true</Installed>
 			<ReservoirID>3</ReservoirID>
 			<Size>2</Size>
-			<TCID>TC1-3</TCID>
+			<TCID>TC3-1</TCID>
 			<SubType>DegasMembrance</SubType>
 			<PHProbeChannelNumber>1</PHProbeChannelNumber>
 			<PlannedInitialChemistry>Cu</PlannedInitialChemistry>
@@ -277,7 +295,7 @@
 			<Installed>true</Installed>
 			<ReservoirID>4</ReservoirID>
 			<Size>2</Size>
-			<TCID>TC1-4</TCID>
+			<TCID>TC4-1</TCID>
 			<SubType>DegasMembrance</SubType>
 			<PHProbeChannelNumber>1</PHProbeChannelNumber>
 			<PlannedInitialChemistry>Cu</PlannedInitialChemistry>

PunkHPX8_RT/Modules/PlatingCell/PlatingCellInitializeRoutine.cs

@@ -167,7 +167,7 @@ namespace PunkHPX8_RT.Modules.PlatingCell
         /// <returns></returns>
         private bool OpenReservoirIsolationValve()
         {
-            return _reservoirDevice.ANIsolationOn() && _reservoirDevice.ANIsolationOn();
+            return _reservoirDevice.ANIsolationOn() && _reservoirDevice.CAIsolationOn();
         }
         /// <summary>
         /// 打开CCR/Rinse valve

PunkHPX8_Simulator/Config/UILayout.xml

@@ -39,10 +39,8 @@
 	<Navigation Id="Temperature" Name="Temperature" >
 		<SubView Id="TemperatureController1" Name="TC1" ViewClass="PunkHPX8_Simulator.Views.SimuTemperatureControllerView" Assembly="PunkHPX8_Simulator" Port="Com12"/>
 		<SubView Id="TemperatureController2" Name="TC2" ViewClass="PunkHPX8_Simulator.Views.SimuTemperatureControllerView" Assembly="PunkHPX8_Simulator" Port="Com14"/>
-	</Navigation>
-	<Navigation Id="Thornton" Name="Thornton" >
-		<SubView Id="Thornton1" Name="Thornton View1" ViewClass="PunkHPX8_Simulator.Views.ThorntonView" Assembly="PunkHPX8_Simulator" Port="Com17"/>
-		<SubView Id="Thornton2" Name="Thornton View2" ViewClass="PunkHPX8_Simulator.Views.ThorntonView" Assembly="PunkHPX8_Simulator" Port="Com19"/>
+		<SubView Id="TemperatureController3" Name="TC3" ViewClass="PunkHPX8_Simulator.Views.SimuTemperatureControllerView" Assembly="PunkHPX8_Simulator" Port="Com16"/>
+		<SubView Id="TemperatureController4" Name="TC4" ViewClass="PunkHPX8_Simulator.Views.SimuTemperatureControllerView" Assembly="PunkHPX8_Simulator" Port="Com18"/>
 	</Navigation>
 
 	<Navigation Id="Linmot" Name="Linmot" >

PunkHPX8_Themes/UserControls/PlatingCellUIControl.xaml

@@ -82,9 +82,9 @@
             <userControls:FlowPipe IsReverse="True" IsFlowing="True" Height="8"  Width="60"  Canvas.Left="161"  Canvas.Top="313" RotateTransformValue="0" HorizontalAlignment="Left" VerticalAlignment="Top" Panel.ZIndex="-1"/>
             <userControls:FlowPipe IsReverse="True" IsFlowing="{Binding ElementName=self,Path=CAIsolationValve}" Height="8"  Width="110"  Canvas.Left="160"  Canvas.Top="339" RotateTransformValue="0" HorizontalAlignment="Left" VerticalAlignment="Top" Panel.ZIndex="-1"/>
             <userControls:FlowPipe IsReverse="True" IsFlowing="{Binding ElementName=self,Path=ANIsolationValve}" Height="8"  Width="80"  Canvas.Left="236"  Canvas.Top="367" RotateTransformValue="0" HorizontalAlignment="Left" VerticalAlignment="Top" Panel.ZIndex="-1"/>
-            <userControls:FlowPipe IsReverse="False" IsFlowing="True" Height="8"  Width="50"  Canvas.Left="273"  Canvas.Top="296" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top" Panel.ZIndex="-1"/>
+            <userControls:FlowPipe IsReverse="False" IsFlowing="{Binding ElementName=self,Path=CAIsolationValve}" Height="8"  Width="50"  Canvas.Left="273"  Canvas.Top="296" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top" Panel.ZIndex="-1"/>
             <userControls:FlowPipe IsReverse="False" IsFlowing="True" Height="8"  Width="20"  Canvas.Left="225"  Canvas.Top="301" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top" Panel.ZIndex="-1"/>
-            <userControls:FlowPipe IsReverse="False" IsFlowing="True" Height="8"  Width="75"  Canvas.Left="316"  Canvas.Top="299" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top" Panel.ZIndex="-1"/>
+            <userControls:FlowPipe IsReverse="False" IsFlowing="{Binding ElementName=self,Path=ANIsolationValve}" Height="8"  Width="75"  Canvas.Left="316"  Canvas.Top="299" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top" Panel.ZIndex="-1"/>
 
             <Grid Height="50" Width="100" Canvas.Left="99" Canvas.Top="188" HorizontalAlignment="Left" VerticalAlignment="Top"  >
                 <Grid.RowDefinitions>
@@ -202,9 +202,9 @@
             <userControls:FlowPipe  IsEnabled="{Binding ElementName=self,Path=IsLeftEnable,Converter={StaticResource BoolToBool}}" IsReverse="False" IsFlowing="True" Height="8"  Width="60"  Canvas.Left="518"  Canvas.Top="318" RotateTransformValue="0" HorizontalAlignment="Left" VerticalAlignment="Top" Panel.ZIndex="-1"/>
             <userControls:FlowPipe  IsEnabled="{Binding ElementName=self,Path=IsLeftEnable,Converter={StaticResource BoolToBool}}" IsReverse="True" IsFlowing="{Binding ElementName=self,Path=CAIsolationValve}" Height="8"  Width="110"  Canvas.Left="470"  Canvas.Top="343" RotateTransformValue="0" HorizontalAlignment="Left" VerticalAlignment="Top" Panel.ZIndex="-1"/>
             <userControls:FlowPipe  IsEnabled="{Binding ElementName=self,Path=IsLeftEnable,Converter={StaticResource BoolToBool}}" IsReverse="True" IsFlowing="{Binding ElementName=self,Path=ANIsolationValve}" Height="8"  Width="80"  Canvas.Left="432"  Canvas.Top="368" RotateTransformValue="0" HorizontalAlignment="Center" VerticalAlignment="Top" Panel.ZIndex="-1"/>
-            <userControls:FlowPipe  IsEnabled="{Binding ElementName=self,Path=IsLeftEnable,Converter={StaticResource BoolToBool}}" IsReverse="False" IsFlowing="True" Height="8"  Width="50"  Canvas.Left="476"  Canvas.Top="301" RotateTransformValue="90" HorizontalAlignment="Left" VerticalAlignment="Top" Panel.ZIndex="-1"/>
+            <userControls:FlowPipe  IsEnabled="{Binding ElementName=self,Path=IsLeftEnable,Converter={StaticResource BoolToBool}}" IsReverse="False" IsFlowing="{Binding ElementName=self,Path=CAIsolationValve}" Height="8"  Width="50"  Canvas.Left="476"  Canvas.Top="301" RotateTransformValue="90" HorizontalAlignment="Left" VerticalAlignment="Top" Panel.ZIndex="-1"/>
             <userControls:FlowPipe  IsEnabled="{Binding ElementName=self,Path=IsLeftEnable,Converter={StaticResource BoolToBool}}" IsReverse="False" IsFlowing="True" Height="8"  Width="20"  Canvas.Left="525"  Canvas.Top="301" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top" Panel.ZIndex="-1"/>
-            <userControls:FlowPipe  IsEnabled="{Binding ElementName=self,Path=IsLeftEnable,Converter={StaticResource BoolToBool}}" IsReverse="False" IsFlowing="True" Height="8"  Width="75"  Canvas.Left="440"  Canvas.Top="298" RotateTransformValue="90" HorizontalAlignment="Left" VerticalAlignment="Top" Panel.ZIndex="-1"/>
+            <userControls:FlowPipe  IsEnabled="{Binding ElementName=self,Path=IsLeftEnable,Converter={StaticResource BoolToBool}}" IsReverse="False" IsFlowing="{Binding ElementName=self,Path=ANIsolationValve}" Height="8"  Width="75"  Canvas.Left="440"  Canvas.Top="298" RotateTransformValue="90" HorizontalAlignment="Left" VerticalAlignment="Top" Panel.ZIndex="-1"/>
 
             <Grid Height="50" Width="100" Canvas.Left="538" Canvas.Top="188" HorizontalAlignment="Left" VerticalAlignment="Top"  >
                 <Grid.RowDefinitions>

PunkHPX8_UI/Config/UIMenu.json

@@ -172,6 +172,30 @@
 						"IsInit": "true",
 						"IsShow": "true",
 						"View": "TemperatureControllerView"
+					},
+					{
+						"Id": "TC2",
+						"ModuleName": "TC2",
+						"Name": "TC2",
+						"IsInit": "true",
+						"IsShow": "true",
+						"View": "TemperatureControllerView"
+					},
+					{
+						"Id": "TC3",
+						"ModuleName": "TC3",
+						"Name": "TC3",
+						"IsInit": "true",
+						"IsShow": "true",
+						"View": "TemperatureControllerView"
+					},
+					{
+						"Id": "TC4",
+						"ModuleName": "TC4",
+						"Name": "TC4",
+						"IsInit": "true",
+						"IsShow": "true",
+						"View": "TemperatureControllerView"
 					}
 				]
 			},

PunkHPX8_UI/Config/UIMenu_permission.json

@@ -106,6 +106,18 @@
 							{
 								"MenuName": "TC1",
 								"Permission": 2
+							},
+							{
+								"MenuName": "TC2",
+								"Permission": 2
+							},
+							{
+								"MenuName": "TC3",
+								"Permission": 2
+							},
+							{
+								"MenuName": "TC4",
+								"Permission": 2
 							}
 						]
 					},
@@ -413,6 +425,18 @@
 							{
 								"MenuName": "TC1",
 								"Permission": 2
+							},
+							{
+								"MenuName": "TC2",
+								"Permission": 2
+							},
+							{
+								"MenuName": "TC3",
+								"Permission": 2
+							},
+							{
+								"MenuName": "TC4",
+								"Permission": 2
 							}
 						]
 					},
@@ -716,6 +740,18 @@
 							{
 								"MenuName": "TC1",
 								"Permission": 2
+							},
+							{
+								"MenuName": "TC2",
+								"Permission": 2
+							},
+							{
+								"MenuName": "TC3",
+								"Permission": 2
+							},
+							{
+								"MenuName": "TC4",
+								"Permission": 2
 							}
 						]
 					},
@@ -1019,6 +1055,18 @@
 							{
 								"MenuName": "TC1",
 								"Permission": 2
+							},
+							{
+								"MenuName": "TC2",
+								"Permission": 2
+							},
+							{
+								"MenuName": "TC3",
+								"Permission": 2
+							},
+							{
+								"MenuName": "TC4",
+								"Permission": 2
 							}
 						]
 					},