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

Changes for MILWAUKEE, component dated 16.12.2020, ver. 2.26.1561

Browse Source
This commit is contained in:
Milan Hanajik 2020-12-16 13:34:04 +01:00
parent de0b84076f
commit 99cd84fb2a
8 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Config/Data.cs
View File

@ -68,7 +68,7 @@ namespace Config
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 6;
public const int MaxPartNr = WMsCount / LineSize;
#elif ALZIR_25 || BAHRAIN_50 || CEVAK_40 || FEWA_50 || FILIPINY_50 || FUZHOU_50 || HONGKONG_50 || IZRAEL_25 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || MURES_40 || PETERSBURG_50 || TORUN_50 || WARSAW_50 || ZAMBIA || ZODINO
#elif ALZIR_25 || BAHRAIN_50 || CEVAK_40 || FEWA_50 || FILIPINY_50 || FUZHOU_50 || HONGKONG_50 || IZRAEL_25 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || MILWAUKEE || MURES_40 || PETERSBURG_50 || TORUN_50 || WARSAW_50 || ZAMBIA || ZODINO
public const int WMsCount = 20;
public const int LineSize = 10;
public const int CompoundWMsCount = 1;

2
TBF/BenchControl/Elde/Common.cs
View File

@ -19,7 +19,7 @@ namespace TBF.BenchControl.Elde
EnduranceCycleStop = 13,
}
#if ALZIR_25 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || BAHRAIN_50 || BERLIN || CEVAK_200 || DEWA_300 || FEWA_50 || FILIPINY_50 || FUZHOU_100 || FUZHOU_300 || GELSENWASSER || GENESIS || HONGKONG_50 || IZRAEL_25 || IZRAEL_50 || IZRAEL_200 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || LUXEMBURG_40 || MALTA_WSD25 || PETERSBURG_50 || PETERSBURG_200 || PUCHONG_200 || ROMA_200 || RUM_MOB || SENTEC || SLM_50 || SLM_150 || SLM_END || TORINO_50 || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || WARSAW_50 || WARSAW_END || ZAMBIA || ZODINO
#if ALZIR_25 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || BAHRAIN_50 || BERLIN || CEVAK_200 || DEWA_300 || FEWA_50 || FILIPINY_50 || FUZHOU_100 || FUZHOU_300 || GELSENWASSER || GENESIS || HONGKONG_50 || IZRAEL_25 || IZRAEL_50 || IZRAEL_200 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || LUXEMBURG_40 || MALTA_WSD25 || MILWAUKEE || PETERSBURG_50 || PETERSBURG_200 || PUCHONG_200 || ROMA_200 || RUM_MOB || SENTEC || SLM_50 || SLM_150 || SLM_END || TORINO_50 || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || WARSAW_50 || WARSAW_END || ZAMBIA || ZODINO
public enum StatusP : ulong
{
RefFlowMeterMask = 0x7, /// bits 0,1,2

2
TBF/BenchControl/Elde/ControlBoardDev.cs
View File

@ -110,7 +110,7 @@ namespace TBF.BenchControl.Elde
public byte MeretProtocol = 0;
// Array length is the reference flowmeters count plus one
#if ALZIR_25 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BAHRAIN_50 || CEVAK_40 || FEWA_50 || FILIPINY_50 || FUZHOU_50 || FUZHOU_100 || HONGKONG_50 || IZRAEL_25 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || LUXEMBURG_40 || MUNICH || MURES_40 || PETERSBURG_50 || SLM_50 || TORINO_50 || TORUN_50 || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || WARSAW_50 || ZAMBIA || ZODINO
#if ALZIR_25 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BAHRAIN_50 || CEVAK_40 || FEWA_50 || FILIPINY_50 || FUZHOU_50 || FUZHOU_100 || HONGKONG_50 || IZRAEL_25 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || LUXEMBURG_40 || MILWAUKEE || MUNICH || MURES_40 || PETERSBURG_50 || SLM_50 || TORINO_50 || TORUN_50 || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || WARSAW_50 || ZAMBIA || ZODINO
public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}};
#if IZRAEL_50
public byte[] MeretRS485Address = new byte[6];

8
TBF/BenchControl/Elde/ControlComWrap.cs
View File

@ -52,7 +52,7 @@ namespace TBF.BenchControl.Elde
#if DEWA_300
public int EtPulses2 { get { return (int)ctrlBrdComponent.EtPulses2; } }
public int EtPulses3 { get { return (int)ctrlBrdComponent.EtPulses3; } }
#elif ROMA_200
#elif MILWAUKEE || ROMA_200
public int EtPulses2 { get { return (int)ctrlBrdComponent.EtPulses2; } }
public int EtPulses3 { get { return 0; } }
#else
@ -74,13 +74,13 @@ namespace TBF.BenchControl.Elde
public float Pressure(int prsNr0) { return ctrlBrdComponent.pressure[prsNr0]; }
public float Temperature(int tmpNr0) { return (tmpNr0 >= 0 && tmpNr0 < ctrlBrdComponent.temperature.Length) ? ctrlBrdComponent.temperature[tmpNr0] : 0; }
public RegulValveState RegulValveState(int rvNr1) { return (RegulValveState)ctrlBrdComponent.rValveStatus[rvNr1 - 1]; }
#if BERLIN || DEWA_300 || GELSENWASSER || GENESIS || PETERSBURG_200 || ROMA_200
#if BERLIN || DEWA_300 || GELSENWASSER || GENESIS || MILWAUKEE || PETERSBURG_200 || ROMA_200
public UInt128 RRoute { get { return ((UInt128)ctrlBrdComponent.rRouteH << 64) | (UInt128)ctrlBrdComponent.rRoute; } }
#else
public UInt128 RRoute { get { return ctrlBrdComponent.rRoute; } }
#endif
#if ALZIR_25 || BADGER_STREDNA_TRAT || BAHRAIN_50 || CEVAK_200 || DEWA_300 || FEWA_50 || FUZHOU_100 || FILIPINY_50 || GELSENWASSER || GENESIS || HONGKONG_50 || IZRAEL_25 || IZRAEL_50 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || LUXEMBURG_40 || PUCHONG_200 || ROMA_200 || SENTEC || TURA_IPERL_NEW || WARSAW_50 || ZAMBIA || ZODINO
#if ALZIR_25 || BADGER_STREDNA_TRAT || BAHRAIN_50 || CEVAK_200 || DEWA_300 || FEWA_50 || FUZHOU_100 || FILIPINY_50 || GELSENWASSER || GENESIS || HONGKONG_50 || IZRAEL_25 || IZRAEL_50 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || LUXEMBURG_40 || MILWAUKEE || PUCHONG_200 || ROMA_200 || SENTEC || TURA_IPERL_NEW || WARSAW_50 || ZAMBIA || ZODINO
public uint DivTime(int id) { return ctrlBrdComponent.divTime[id]; }
public void SetDivLimit(int divNo, uint limLoPct, uint limHiPct)
{
@ -413,7 +413,7 @@ namespace TBF.BenchControl.Elde
(uint)regConst,
(uint)shortImp,
(uint)sendCommandArgs.StopDevs);
#elif DEWA_300 || GELSENWASSER || GENESIS || ROMA_200
#elif DEWA_300 || GELSENWASSER || GENESIS || MILWAUKEE || ROMA_200
///
/// 128-bit route, prolonged method support
///

2
TBF/BenchControl/Elde/Diverter/Diverter.cs
View File

@ -140,6 +140,8 @@ namespace TBF.BenchControl.Elde.Diverter
}
#elif TURA_IPERL || TURA_IPERL_NEW
flowMtrNr4Cmd = divNrFromName + 16 * divNrFromName;
#elif MILWAUKEE
flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : 4;
#else /// all other benches
flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : 3;
#endif

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.26.1555.0")]
[assembly: AssemblyFileVersion("2.26.1555.0")]
[assembly: AssemblyVersion("2.26.1561.0")]
[assembly: AssemblyFileVersion("2.26.1561.0")]

2
TBF/UI/MainWnd.Designer.cs generated
View File

@ -743,7 +743,7 @@ namespace TBF.UI
#elif BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || CEVAK_200 || RUM_MOB || SENTEC || SLM_END || WARSAW_END
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
private TBF.UI.Process.ProcessTabPageCtrl6 processTabPageCtrl;
#elif ALZIR_25 || BAHRAIN_50 || CEVAK_40 || DEWA_300 || FEWA_50 || FILIPINY_50 || FUZHOU_50 || FUZHOU_100 || HONGKONG_50 || IZRAEL_25 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || LUXEMBURG_40 || MALTA_WSD25 || MURES_40 || PETERSBURG_50 || ROMA_200 || TORINO_50 || TORUN_50 || WARSAW_50 || ZAMBIA || ZODINO
#elif ALZIR_25 || BAHRAIN_50 || CEVAK_40 || DEWA_300 || FEWA_50 || FILIPINY_50 || FUZHOU_50 || FUZHOU_100 || HONGKONG_50 || IZRAEL_25 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || LUXEMBURG_40 || MALTA_WSD25 || MILWAUKEE || MURES_40 || PETERSBURG_50 || ROMA_200 || TORINO_50 || TORUN_50 || WARSAW_50 || ZAMBIA || ZODINO
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
private TBF.UI.Process.ProcessTabPageCtrl24 processTabPageCtrl;
#elif IZRAEL_50 || TURA_IPERL || TURA_IPERL_NEW

BIN
packages/ControlBoard/Milwaukee/ControlComponent3U.dll Normal file
View File

Binary file not shown.