michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modbus: Data receive improved, Meret.TempMeter, Meret.PressureMeter, Danfoss.VLT added, QuidoRS modified.

Browse Source
This commit is contained in:
Milan Hanajik
2020-05-21 18:32:21 +02:00
parent 767796662e
commit c007bca797
34 changed files with 1686 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/UI/Bench/Metrology/MetrologyDlg.cs
+5 -3
View File
@@ -130,8 +130,8 @@ namespace TBF.UI.Bench.Metrology
/// Tab-pages for pressure meters
if (factory is BenchControl.Elde.PressureMeter.PressureMeterFactory ||
factory is BenchControl.Elde.PressureMeterInternal.PressureMeterFactory ||
factory is BenchControl.Modbus.PressureMeter.Meret.Factory)
{
factory is BenchControl.Modbus.Meret.PressureMeter.Factory)
{
pressMetersCount++;
TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
MetrologyDlgPressMeterTab uiControl = new MetrologyDlgPressMeterTab();
@@ -145,7 +145,9 @@ namespace TBF.UI.Bench.Metrology
/// Tab-pages for temperature meters
if (factory is BenchControl.Elde.TempMeter.TempMeterFactory ||
factory is BenchControl.Elde.TempMeterInternal.TempMeterFactory)
factory is BenchControl.Elde.TempMeterInternal.TempMeterFactory ||
factory is BenchControl.Keithley.TempMeter.Factory ||
factory is BenchControl.Modbus.Meret.TempMeter.Factory)
{
tempMetersCount++;
TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs
+3 -2
View File
@@ -119,7 +119,7 @@ namespace TBF.UI.Bench.Uncertainties
/// Tab-pages for pressure meters
if (factory is BenchControl.Elde.PressureMeter.PressureMeterFactory ||
factory is BenchControl.Elde.PressureMeterInternal.PressureMeterFactory ||
factory is BenchControl.Modbus.PressureMeter.Meret.Factory)
factory is BenchControl.Modbus.Meret.PressureMeter.Factory)
{
pressMetersCount++;
TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
@@ -134,7 +134,8 @@ namespace TBF.UI.Bench.Uncertainties
/// Tab-pages for temperature meters (incl. platinum temp. meter with Keithley)
if (factory is BenchControl.Elde.TempMeter.TempMeterFactory ||
factory is BenchControl.Elde.TempMeterInternal.TempMeterFactory ||
factory is BenchControl.Keithley.TempMeter.Factory)
factory is BenchControl.Keithley.TempMeter.Factory ||
factory is BenchControl.Modbus.Meret.TempMeter.Factory)
{
tempMetersCount++;
TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");