yangw
/
lj_plc
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
master
nodyang 1 year ago
parent aeab567cc7 de62462783
commit 397e90d767
5 changed files with 53 additions and 57 deletions
Show Stats Download Patch File Download Diff File

12
Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj
Unescape Escape View File

@ -642,9 +642,15 @@
<EmbeddedResource Include="Resources\WayValveDefault.png" />
<EmbeddedResource Include="Resources\WayValveError.png" />
<EmbeddedResource Include="Resources\WayValveOpen.png" />
<EmbeddedResource Include="Resources\switch_failure.png" />
<EmbeddedResource Include="Resources\switch_ok.png" />
<EmbeddedResource Include="Resources\swith_default.png" />
<EmbeddedResource Include="Resources\switch_failure.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Resources\switch_ok.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Resources\swith_default.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Resources\p0.png" />
<EmbeddedResource Include="Resources\p1.png" />
<EmbeddedResource Include="Resources\ThreeWayValveHVError.png" />

11
Controls/Mesnac.Controls.Feeding/Mesnac.Controls.Feeding.csproj
Unescape Escape View File

@ -239,9 +239,11 @@
</Compile>
<Compile Include="Jzf.cs">
<SubType>UserControl</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Compile>
<Compile Include="Jzf.Designer.cs">
<DependentUpon>Jzf.cs</DependentUpon>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Compile>
<Compile Include="MaterialStatus.cs">
<SubType>Component</SubType>
@ -524,6 +526,7 @@
<EmbeddedResource Include="ICONS\mixer.bmp" />
<EmbeddedResource Include="Jzf.resx">
<DependentUpon>Jzf.cs</DependentUpon>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Mixer2.resx">
<DependentUpon>Mixer2.cs</DependentUpon>
@ -1315,7 +1318,9 @@
<EmbeddedResource Include="Resources\dj\djRight1.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\jzf\jzf1.png" />
<EmbeddedResource Include="Resources\jzf\jzf1.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\diverter\hxfy0.png" />
@ -1324,7 +1329,9 @@
<EmbeddedResource Include="Resources\diverter\hxfz1.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\jzf\jzf0.png" />
<EmbeddedResource Include="Resources\jzf\jzf0.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\clfbdcf\clfbdcf0.png" />

2
Main/MCEdit/Data/MCProject/nodeDataSource.xml
Unescape Escape View File

@ -1,3 +1,3 @@
<DataSources>
<DataSourceItem Name="DataSource1" Driver="MS SQL Server" Server="127.0.0.1" UserName="sa" Password="123456" DataBase="CWSSHG" ConnectionTimeout="5" DriverAssembly="ICSharpCode.Data.SQLServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" DriverClass="ICSharpCode.Data.Core.DatabaseDrivers.SQLServer.SQLServerDatabaseDriver" DataSourceClass="ICSharpCode.Data.Core.DatabaseObjects.Database" />
<DataSourceItem Name="DataSource1" Driver="MS SQL Server" Server="192.168.1.19" UserName="sa" Password="123456" DataBase="CWSSHG" ConnectionTimeout="5" DriverAssembly="ICSharpCode.Data.SQLServer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" DriverClass="ICSharpCode.Data.Core.DatabaseDrivers.SQLServer.SQLServerDatabaseDriver" DataSourceClass="ICSharpCode.Data.Core.DatabaseObjects.Database" />
</DataSources>

4
Main/MCEdit/Data/MCProject/nodeDevice.xml
Unescape Escape View File

@ -4,7 +4,7 @@
<Main>
<Brand value="Siemens" />
<Model value="S7" />
<ReadHz value="5000" />
<ReadHz value="1000" />
<UnitLen value="8" />
<Connection mode="Net">
<IP value="192.168.1.50" />
@ -720,7 +720,7 @@
<Data name="AS2OIS02" runname="AS2OIS02" start="1025" len="1" method="Default_Bit(13,1)" max="" issave="False" subtractor="" remark="" />
<Data name="AS2OIS03" runname="AS2OIS03" start="1025" len="1" method="Default_Bit(14,1)" max="" issave="False" subtractor="" remark="" />
<Data name="AS3OIS01" runname="AS3OIS01" start="1025" len="1" method="Default_Bit(15,1)" max="" issave="False" subtractor="" remark="" />
<Data name="AS3OIS02" runname="AS3OIS02" start="1026" len="1" method="Default_Bit(0,1)" max="" issave="False" subtractor="" remark="" />
<Data name="AS3OIS02" runname="" start="1026" len="1" method="Default_Bit(0,1)" max="" issave="False" subtractor="" remark="" />
<Data name="AS3OIS03" runname="AS3OIS03" start="1026" len="1" method="Default_Bit(1,1)" max="" issave="False" subtractor="" remark="" />
<Data name="AS4OIS01" runname="AS4OIS01" start="1026" len="1" method="Default_Bit(2,1)" max="" issave="False" subtractor="" remark="" />
<Data name="AS4OIS02" runname="AS4OIS02" start="1026" len="1" method="Default_Bit(3,1)" max="" issave="False" subtractor="" remark="" />

81
Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml
Unescape Escape View File

@ -2,9 +2,8 @@
<Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="FormDeviceDetail2" children="Controls">
<Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel1" children="Controls">
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel18" children="Controls">
<Property name="Format">
</Property>
<Property name="TextName">ParametersWithPc.B1.topPressure_V1_ActualValue</Property>
<Property name="Format" />
<Property name="TextName">ParametersWithPc.B1.topPressure_V2_ActualValue</Property>
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
<Property name="MCKey" />
@ -18,14 +17,13 @@
<Property name="MCEnabled">True</Property>
<Property name="Text">0</Property>
<Property name="ForeColor">ButtonHighlight</Property>
<Property name="Location">272, 145</Property>
<Property name="Location">267, 146</Property>
<Property name="Name">MCLabel18</Property>
<Property name="Size">11, 12</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel17" children="Controls">
<Property name="Format">
</Property>
<Property name="TextName">ParametersWithPc.B1.topPressure_V1_ActualValue</Property>
<Property name="Format" />
<Property name="TextName">ParametersWithPc.B1.topPressure_V3_ActualValue</Property>
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
<Property name="MCKey" />
@ -39,14 +37,13 @@
<Property name="MCEnabled">True</Property>
<Property name="Text">0</Property>
<Property name="ForeColor">ButtonHighlight</Property>
<Property name="Location">388, 145</Property>
<Property name="Location">383, 145</Property>
<Property name="Name">MCLabel17</Property>
<Property name="Size">11, 12</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel16" children="Controls">
<Property name="Format">
</Property>
<Property name="TextName">ParametersWithPc.B1.topPressure_V1_ActualValue</Property>
<Property name="Format" />
<Property name="TextName">ParametersWithPc.B1.topPressure_V4_ActualValue</Property>
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
<Property name="MCKey" />
@ -60,14 +57,13 @@
<Property name="MCEnabled">True</Property>
<Property name="Text">0</Property>
<Property name="ForeColor">ButtonHighlight</Property>
<Property name="Location">500, 145</Property>
<Property name="Location">497, 145</Property>
<Property name="Name">MCLabel16</Property>
<Property name="Size">11, 12</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel15" children="Controls">
<Property name="Format">
</Property>
<Property name="TextName">ParametersWithPc.B1.topPressure_V1_ActualValue</Property>
<Property name="Format" />
<Property name="TextName">ParametersWithPc.B1.topPressure_V5_ActualValue</Property>
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
<Property name="MCKey" />
@ -81,13 +77,12 @@
<Property name="MCEnabled">True</Property>
<Property name="Text">0</Property>
<Property name="ForeColor">ButtonHighlight</Property>
<Property name="Location">667, 169</Property>
<Property name="Location">662, 169</Property>
<Property name="Name">MCLabel15</Property>
<Property name="Size">11, 12</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel14" children="Controls">
<Property name="Format">
</Property>
<Property name="Format" />
<Property name="TextName">ParametersWithPc.B1.topPressure_V1_ActualValue</Property>
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
@ -102,13 +97,12 @@
<Property name="MCEnabled">True</Property>
<Property name="Text">0</Property>
<Property name="ForeColor">ButtonHighlight</Property>
<Property name="Location">157, 144</Property>
<Property name="Location">153, 145</Property>
<Property name="Name">MCLabel14</Property>
<Property name="Size">11, 12</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel13" children="Controls">
<Property name="Format">
</Property>
<Property name="Format" />
<Property name="TextName">ParametersWithPc.B1.mainPress_V2_ActualValue</Property>
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
@ -123,13 +117,12 @@
<Property name="MCEnabled">True</Property>
<Property name="Text">0</Property>
<Property name="ForeColor">ButtonHighlight</Property>
<Property name="Location">202, 338</Property>
<Property name="Location">195, 338</Property>
<Property name="Name">MCLabel13</Property>
<Property name="Size">11, 12</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel12" children="Controls">
<Property name="Format">
</Property>
<Property name="Format" />
<Property name="TextName">ParametersWithPc.B1.mainPress_V3_ActualValue</Property>
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
@ -144,13 +137,12 @@
<Property name="MCEnabled">True</Property>
<Property name="Text">0</Property>
<Property name="ForeColor">ButtonHighlight</Property>
<Property name="Location">317, 338</Property>
<Property name="Location">310, 339</Property>
<Property name="Name">MCLabel12</Property>
<Property name="Size">11, 12</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel11" children="Controls">
<Property name="Format">
</Property>
<Property name="Format" />
<Property name="TextName">ParametersWithPc.B1.mainPress_V5_ActualValue</Property>
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
@ -165,13 +157,12 @@
<Property name="MCEnabled">True</Property>
<Property name="Text">0</Property>
<Property name="ForeColor">ButtonHighlight</Property>
<Property name="Location">563, 309</Property>
<Property name="Location">555, 309</Property>
<Property name="Name">MCLabel11</Property>
<Property name="Size">11, 12</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel10" children="Controls">
<Property name="Format">
</Property>
<Property name="Format" />
<Property name="TextName">ParametersWithPc.B1.mainPress_V1_ActualValue</Property>
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
@ -191,8 +182,7 @@
<Property name="Size">11, 12</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel9" children="Controls">
<Property name="Format">
</Property>
<Property name="Format" />
<Property name="TextName">ParametersWithPc.B1.purgeV2_PV</Property>
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
@ -212,8 +202,7 @@
<Property name="Size">11, 12</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel8" children="Controls">
<Property name="Format">
</Property>
<Property name="Format" />
<Property name="TextName">ParametersWithPc.B1.purgeV3_PV</Property>
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
@ -233,8 +222,7 @@
<Property name="Size">11, 12</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel7" children="Controls">
<Property name="Format">
</Property>
<Property name="Format" />
<Property name="TextName">ParametersWithPc.B1.purgeV5_PV</Property>
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
@ -254,8 +242,7 @@
<Property name="Size">11, 12</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel5" children="Controls">
<Property name="Format">
</Property>
<Property name="Format" />
<Property name="TextName">ParametersWithPc.B1.purgeV1_PV</Property>
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
@ -275,8 +262,7 @@
<Property name="Size">11, 12</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel4" children="Controls">
<Property name="Format">
</Property>
<Property name="Format" />
<Property name="TextName">ParametersWithPc.B1.conveyV5_PV</Property>
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
@ -291,13 +277,12 @@
<Property name="MCEnabled">True</Property>
<Property name="Text">0</Property>
<Property name="ForeColor">ButtonHighlight</Property>
<Property name="Location">587, 308</Property>
<Property name="Location">580, 309</Property>
<Property name="Name">MCLabel4</Property>
<Property name="Size">11, 12</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel3" children="Controls">
<Property name="Format">
</Property>
<Property name="Format" />
<Property name="TextName">ParametersWithPc.B1.conveyV2_PV</Property>
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
@ -312,13 +297,12 @@
<Property name="MCEnabled">True</Property>
<Property name="Text">0</Property>
<Property name="ForeColor">ButtonHighlight</Property>
<Property name="Location">222, 338</Property>
<Property name="Location">218, 338</Property>
<Property name="Name">MCLabel3</Property>
<Property name="Size">11, 12</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel2" children="Controls">
<Property name="Format">
</Property>
<Property name="Format" />
<Property name="TextName">ParametersWithPc.B1.conveyV3_PV</Property>
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>
@ -333,13 +317,12 @@
<Property name="MCEnabled">True</Property>
<Property name="Text">0</Property>
<Property name="ForeColor">ButtonHighlight</Property>
<Property name="Location">336, 338</Property>
<Property name="Location">331, 338</Property>
<Property name="Name">MCLabel2</Property>
<Property name="Size">11, 12</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCLabel, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCLabel1" children="Controls">
<Property name="Format">
</Property>
<Property name="Format" />
<Property name="TextName">ParametersWithPc.B1.conveyV1_PV</Property>
<Property name="NewFillColor">Red</Property>
<Property name="OldFillColor">DarkGray</Property>

Write Preview
Loading…
Cancel
Save