Merge pull request #41 from RapidScada/develop

Merge Develop to Master v.5.4.1
RapidScada · Oct 18, 2017 · b99fec3 · b99fec3
2 parents b6f16a4 + ada2cb0
commit b99fec3
Show file tree

Hide file tree

Showing 61 changed files with 6,249 additions and 3,333 deletions.
diff --git a/ScadaComm/OpenKPs/KpModbus/FrmDevTemplate.Designer.cs b/ScadaComm/OpenKPs/KpModbus/FrmDevTemplate.Designer.cs
diff --git a/ScadaComm/OpenKPs/KpModbus/KpModbus.csproj b/ScadaComm/OpenKPs/KpModbus/KpModbus.csproj
@@ -49,22 +49,59 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="FrmDevProps.cs">
+    <Compile Include="Modbus\Protocol\ModbusCmd.cs" />
+    <Compile Include="Modbus\Protocol\DataUnit.cs" />
+    <Compile Include="Modbus\Protocol\DeviceTemplate.cs" />
+    <Compile Include="Modbus\Protocol\Elem.cs" />
+    <Compile Include="Modbus\Protocol\ElemGroup.cs" />
+    <Compile Include="Modbus\Protocol\ElemTypes.cs" />
+    <Compile Include="Modbus\Protocol\FuncCodes.cs" />
+    <Compile Include="Modbus\Protocol\ModbusPhrases.cs" />
+    <Compile Include="Modbus\Protocol\ModbusUtils.cs" />
+    <Compile Include="Modbus\Protocol\TableTypes.cs" />
+    <Compile Include="Modbus\Protocol\TransModes.cs" />
+    <Compile Include="Modbus\UI\CtrlCmd.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Modbus\UI\CtrlCmd.Designer.cs">
+      <DependentUpon>CtrlCmd.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Modbus\UI\CtrlElem.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Modbus\UI\CtrlElem.Designer.cs">
+      <DependentUpon>CtrlElem.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Modbus\UI\CtrlElemGroup.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Modbus\UI\CtrlElemGroup.Designer.cs">
+      <DependentUpon>CtrlElemGroup.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Modbus\UI\ElemInfo.cs" />
+    <Compile Include="Modbus\UI\FrmDevProps.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FrmDevProps.Designer.cs">
+    <Compile Include="Modbus\UI\FrmDevProps.Designer.cs">
       <DependentUpon>FrmDevProps.cs</DependentUpon>
     </Compile>
-    <Compile Include="FrmDevTemplate.cs">
+    <Compile Include="Modbus\UI\FrmDevTemplate.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FrmDevTemplate.Designer.cs">
+    <Compile Include="Modbus\UI\FrmDevTemplate.Designer.cs">
       <DependentUpon>FrmDevTemplate.cs</DependentUpon>
     </Compile>
     <Compile Include="KpModbusLogic.cs" />
-    <Compile Include="Modbus.cs" />
+    <Compile Include="Modbus\Protocol\ModbusPoll.cs" />
     <Compile Include="KpModbusView.cs" />
-    <Compile Include="KpPhrases.cs" />
+    <Compile Include="Modbus\UI\KpPhrases.cs" />
+    <Compile Include="Modbus\UI\FrmTemplateSettings.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Modbus\UI\FrmTemplateSettings.Designer.cs">
+      <DependentUpon>FrmTemplateSettings.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Modbus\UI\TreeUpdateTypes.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -73,18 +110,34 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="FrmDevProps.resx">
+    <EmbeddedResource Include="Modbus\UI\CtrlCmd.resx">
+      <DependentUpon>CtrlCmd.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Modbus\UI\CtrlElem.resx">
+      <DependentUpon>CtrlElem.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Modbus\UI\CtrlElemGroup.resx">
+      <DependentUpon>CtrlElemGroup.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Modbus\UI\FrmDevProps.resx">
       <DependentUpon>FrmDevProps.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FrmDevTemplate.resx">
+    <EmbeddedResource Include="Modbus\UI\FrmDevTemplate.resx">
       <DependentUpon>FrmDevTemplate.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Modbus\UI\FrmTemplateSettings.resx">
+      <DependentUpon>FrmTemplateSettings.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Lang\KpModbus.ru-RU.xml">
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Lang\KpModbus.en-GB.xml">
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -98,15 +151,23 @@
     <Content Include="Res\edit.png" />
     <Content Include="Res\elem.png" />
     <Content Include="Res\group.png" />
+    <Content Include="Res\group_inactive.png" />
     <Content Include="Res\open.png" />
     <Content Include="Res\open_shift.png" />
     <Content Include="Res\save.png" />
     <Content Include="Res\save_as.png" />
+    <Content Include="Res\settings.png" />
     <Content Include="Res\up.png" />
+    <Content Include="Templates\KpModbus_Adam6015.xml" />
+    <Content Include="Templates\KpModbus_Bolid_S2000-T.xml" />
+    <Content Include="Templates\KpModbus_OWEN_MDDV.xml" />
+    <Content Include="Templates\KpModbus_OWEN_MU110-16R.xml" />
+    <Content Include="Templates\KpModbus_OWEN_MV110-16D.xml" />
+    <Content Include="Templates\KpModbus_OWEN_MV110-16D_DI.xml" />
+    <Content Include="Templates\KpModbus_OWEN_MV110-8A.xml" />
+    <Content Include="Templates\KpModbus_OWEN_MV110-8AS.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Templates\" />
-  </ItemGroup>
+  <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.