Modbus and QuidoRS components added

WaterMeters folder created, WaterMeter component relocated within the project, iPerl component added
WaterMeters.iPerl implements IRegisterReader interface, TODO: Implement WaterMeter.ReadPulses( ) function
iPerlAdjustment test method added
This commit is contained in:
Milan Hanajik
2015-07-31 19:18:56 +02:00
parent 6ecae88518
commit f2da177517
47 changed files with 4819 additions and 27 deletions
+74 -12
View File
@@ -92,7 +92,7 @@
<SignManifests>true</SignManifests>
</PropertyGroup>
<ItemGroup>
<Reference Include="ControlComponent3U">
<Reference Include="ControlComponent3Munich">
<HintPath>..\packages\ControlBoard\Munich\ControlComponent3Munich.dll</HintPath>
</Reference>
<Reference Include="FluentNHibernate">
@@ -219,6 +219,7 @@
<DependentUpon>ValveCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\Elde\ValveEx\ValveFactory.cs" />
<Compile Include="BenchControl\GenericDevices\IModbus.cs" />
<Compile Include="BenchControl\MettlerToledo\KeepReadingMassesOp.cs" />
<Compile Include="BenchControl\MettlerToledo\Multi\BalanceCfg.cs" />
<Compile Include="BenchControl\MettlerToledo\Multi\BalanceCfgCtrl.cs">
@@ -249,6 +250,26 @@
<Compile Include="BenchControl\MettlerToledo\Standard\ReadStableMassOp.cs" />
<Compile Include="BenchControl\MettlerToledo\Standard\SetUnitsOp.cs" />
<Compile Include="BenchControl\MettlerToledo\Standard\TaringOp.cs" />
<Compile Include="BenchControl\Modbus\Enums.cs" />
<Compile Include="BenchControl\Modbus\Common\Modbus.cs" />
<Compile Include="BenchControl\Modbus\Common\ModbusCfg.cs" />
<Compile Include="BenchControl\Modbus\Common\ModbusCfgCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="BenchControl\Modbus\Common\ModbusCfgCtrl.designer.cs">
<DependentUpon>ModbusCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\Modbus\Common\Factory.cs" />
<Compile Include="BenchControl\Modbus\QuidoRS\QuidoRS.cs" />
<Compile Include="BenchControl\Modbus\QuidoRS\QuidoRSCfg.cs" />
<Compile Include="BenchControl\Modbus\QuidoRS\QuidoRSCfgCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="BenchControl\Modbus\QuidoRS\QuidoRSCfgCtrl.designer.cs">
<DependentUpon>QuidoRSCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\Modbus\QuidoRS\Factory.cs" />
<Compile Include="BenchControl\Modbus\QuidoRS\SetOutputsOp.cs" />
<Compile Include="BenchControl\TestMethods\Adjustment\WMErrorsForm24.cs">
<SubType>Form</SubType>
</Compile>
@@ -265,6 +286,42 @@
<DependentUpon>TestMethodCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\TestMethods\FixedStartCombinedMeters\TestMethodFactory.cs" />
<Compile Include="BenchControl\TestMethods\iPerlAdjustment\iPerlAdjustmentSeq.cs" />
<Compile Include="BenchControl\TestMethods\iPerlAdjustment\TestMethod.cs" />
<Compile Include="BenchControl\TestMethods\iPerlAdjustment\TestMethodCfg.cs" />
<Compile Include="BenchControl\TestMethods\iPerlAdjustment\TestMethodCfgCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="BenchControl\TestMethods\iPerlAdjustment\TestMethodCfgCtrl.designer.cs">
<DependentUpon>TestMethodCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\TestMethods\iPerlAdjustment\TestMethodFactory.cs" />
<Compile Include="BenchControl\TestMethods\iPerlAdjustment\iPerlCommunicationForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="BenchControl\TestMethods\iPerlAdjustment\iPerlCommunicationForm.designer.cs">
<DependentUpon>iPerlCommunicationForm.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\WaterMeters\iPerl\ProcParams.cs" />
<Compile Include="BenchControl\WaterMeters\iPerl\WaterMeter.cs" />
<Compile Include="BenchControl\WaterMeters\iPerl\WaterMeterCfg.cs" />
<Compile Include="BenchControl\WaterMeters\iPerl\WaterMeterCfgCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="BenchControl\WaterMeters\iPerl\WaterMeterCfgCtrl.designer.cs">
<DependentUpon>WaterMeterCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\WaterMeters\iPerl\WaterMeterFactory.cs" />
<Compile Include="BenchControl\WaterMeters\WaterMeter\ProcParams.cs" />
<Compile Include="BenchControl\WaterMeters\WaterMeter\WaterMeter.cs" />
<Compile Include="BenchControl\WaterMeters\WaterMeter\WaterMeterCfg.cs" />
<Compile Include="BenchControl\WaterMeters\WaterMeter\WaterMeterCfgCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="BenchControl\WaterMeters\WaterMeter\WaterMeterCfgCtrl.designer.cs">
<DependentUpon>WaterMeterCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\WaterMeters\WaterMeter\WaterMeterFactory.cs" />
<Compile Include="PrintOrderDocument.cs">
<SubType>Component</SubType>
</Compile>
@@ -741,16 +798,6 @@
</Compile>
<Compile Include="BenchControl\TestMethods\ReferenceFlowmeterCalibration\TestMethodFactory.cs" />
<Compile Include="BenchControl\TestParamsBase.cs" />
<Compile Include="BenchControl\WaterMeter\ProcParams.cs" />
<Compile Include="BenchControl\WaterMeter\WaterMeter.cs" />
<Compile Include="BenchControl\WaterMeter\WaterMeterCfg.cs" />
<Compile Include="BenchControl\WaterMeter\WaterMeterCfgCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="BenchControl\WaterMeter\WaterMeterCfgCtrl.designer.cs">
<DependentUpon>WaterMeterCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\WaterMeter\WaterMeterFactory.cs" />
<Compile Include="Boxes\DoubleBox.cs" />
<Compile Include="Boxes\FloatBox.cs" />
<Compile Include="Boxes\IBox.cs" />
@@ -1348,6 +1395,12 @@
<EmbeddedResource Include="BenchControl\MettlerToledo\Standard\BalanceCfgCtrl.resx">
<DependentUpon>BalanceCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\Modbus\Common\ModbusCfgCtrl.resx">
<DependentUpon>ModbusCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\Modbus\QuidoRS\QuidoRSCfgCtrl.resx">
<DependentUpon>QuidoRSCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\Operations\AskYesNoForm.resx">
<DependentUpon>AskYesNoForm.cs</DependentUpon>
</EmbeddedResource>
@@ -1393,6 +1446,12 @@
<EmbeddedResource Include="BenchControl\TestMethods\FlyingStart\TestMethodCfgCtrl.resx">
<DependentUpon>TestMethodCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\TestMethods\iPerlAdjustment\TestMethodCfgCtrl.resx">
<DependentUpon>TestMethodCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\TestMethods\iPerlAdjustment\iPerlCommunicationForm.resx">
<DependentUpon>iPerlCommunicationForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\TestMethods\LeakTest\TestMethodCfgCtrl.resx">
<DependentUpon>TestMethodCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
@@ -1402,7 +1461,10 @@
<EmbeddedResource Include="BenchControl\TestMethods\ReferenceFlowmeterCalibration\TestMethodCfgCtrl.resx">
<DependentUpon>TestMethodCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\WaterMeter\WaterMeterCfgCtrl.resx">
<EmbeddedResource Include="BenchControl\WaterMeters\iPerl\WaterMeterCfgCtrl.resx">
<DependentUpon>WaterMeterCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\WaterMeters\WaterMeter\WaterMeterCfgCtrl.resx">
<DependentUpon>WaterMeterCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\ClosingProgram.resx">