Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907

Controls/Mesnac.Controls.ChemicalWeighing/ControlCabinet.cs

@@ -113,8 +113,8 @@ namespace Mesnac.Controls.ChemicalWeighing
             {
                 Image img = Image.FromStream(_imageStream);
                 Size size = new Size();
-                size.Width = 29;
+                size.Width = 11;
-                size.Height = 24;
+                size.Height = 14;
                 this.Size = size;
                 if (bNewPic == true)
                 {

Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj

@@ -593,7 +593,9 @@
     <EmbeddedResource Include="Resources\UCConveyorMoveR.gif" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources\AlarmLightNewGray.png" />
+    <EmbeddedResource Include="Resources\AlarmLightNewGray.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
     <EmbeddedResource Include="Resources\AlarmLightNewGreen.gif" />
     <EmbeddedResource Include="Resources\AlarmLightNewRed.gif" />
   </ItemGroup>
@@ -628,6 +630,12 @@
     <EmbeddedResource Include="Resources\controlCabinet.png" />
     <EmbeddedResource Include="Resources\controlCabinet0.png" />
     <EmbeddedResource Include="Resources\controlCabinet1.png" />
+    <EmbeddedResource Include="Resources\AlarmLightNewGreen.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\AlarmLightNewRed.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
     <Content Include="Resources\prepareHopperRight.png" />
     <Content Include="Resources\prepareHopperLeft.png" />
     <Content Include="Resources\fay.png" />
@@ -673,6 +681,10 @@
       <Name>Mesnac.Controls.Default</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\AlarmLightNewGreen.psd" />
+    <None Include="Resources\AlarmLightNewRed.psd" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Controls/Mesnac.Controls.ChemicalWeighing/PControl.cs

@@ -42,7 +42,7 @@ namespace Mesnac.Controls.ChemicalWeighing
             sImages = new string[2];
             sImages[0] = "Mesnac.Controls.ChemicalWeighing.Resources.p0.png";//zsTurnOff
             sImages[1] = "Mesnac.Controls.ChemicalWeighing.Resources.p1.png";//zsTurnOn
-            _status = Statuses.TurnOff;
+            _status = Statuses.TurnOn;
         }
 
         private void ReloadStream()
@@ -113,8 +113,8 @@ namespace Mesnac.Controls.ChemicalWeighing
             {
                 Image img = Image.FromStream(_imageStream);
                 Size size = new Size();
-                size.Width = 29;
+                size.Width = 10;
-                size.Height = 24;
+                size.Height = 15;
                 this.Size = size;
                 if (bNewPic == true)
                 {

Main/MCEdit/Data/MCProject/nodeDevice.xml

@@ -4,7 +4,7 @@
     <Main>
       <Brand value="Siemens" />
       <Model value="S7" />
-      <ReadHz value="5000" />
+      <ReadHz value="2000" />
       <UnitLen value="8" />
       <Connection mode="Net">
         <IP value="192.168.1.50" />