diff --git a/Config/Data.cs b/Config/Data.cs index 7f79cddc3..6e26bbadf 100644 --- a/Config/Data.cs +++ b/Config/Data.cs @@ -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; diff --git a/TBF/BenchControl/Elde/Common.cs b/TBF/BenchControl/Elde/Common.cs index 4063e67ce..4828fc422 100644 --- a/TBF/BenchControl/Elde/Common.cs +++ b/TBF/BenchControl/Elde/Common.cs @@ -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 diff --git a/TBF/BenchControl/Elde/ControlBoardDev.cs b/TBF/BenchControl/Elde/ControlBoardDev.cs index 7279ec5bc..001e88cb2 100644 --- a/TBF/BenchControl/Elde/ControlBoardDev.cs +++ b/TBF/BenchControl/Elde/ControlBoardDev.cs @@ -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]; diff --git a/TBF/BenchControl/Elde/ControlComWrap.cs b/TBF/BenchControl/Elde/ControlComWrap.cs index 52852a5c6..fbeb65ba2 100644 --- a/TBF/BenchControl/Elde/ControlComWrap.cs +++ b/TBF/BenchControl/Elde/ControlComWrap.cs @@ -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 /// diff --git a/TBF/BenchControl/Elde/Diverter/Diverter.cs b/TBF/BenchControl/Elde/Diverter/Diverter.cs index 9fe28ef2f..88d28a70e 100644 --- a/TBF/BenchControl/Elde/Diverter/Diverter.cs +++ b/TBF/BenchControl/Elde/Diverter/Diverter.cs @@ -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 diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index add100822..077522a96 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -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")] diff --git a/TBF/UI/MainWnd.Designer.cs b/TBF/UI/MainWnd.Designer.cs index b7724d315..9dde31116 100644 --- a/TBF/UI/MainWnd.Designer.cs +++ b/TBF/UI/MainWnd.Designer.cs @@ -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 diff --git a/packages/ControlBoard/Milwaukee/ControlComponent3U.dll b/packages/ControlBoard/Milwaukee/ControlComponent3U.dll new file mode 100644 index 000000000..042fb8ea4 Binary files /dev/null and b/packages/ControlBoard/Milwaukee/ControlComponent3U.dll differ