diff --git a/Config/Data.cs b/Config/Data.cs index 0ee988496..7f79cddc3 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 || 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 || 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 7d9e0a507..4063e67ce 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_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 || 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 dcebca259..02c03bad0 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 || 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 || 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 ab717c3a9..52852a5c6 100644 --- a/TBF/BenchControl/Elde/ControlComWrap.cs +++ b/TBF/BenchControl/Elde/ControlComWrap.cs @@ -80,7 +80,7 @@ namespace TBF.BenchControl.Elde 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 || 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 || 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) { @@ -428,7 +428,7 @@ namespace TBF.BenchControl.Elde (uint)regConst, (uint)shortImp, (uint)sendCommandArgs.StopDevs); -#elif ALZIR_25 || CEVAK_200 || FEWA_50 || FILIPINY_50 || FUZHOU_100 || HONGKONG_50 || IZRAEL_25 || IZRAEL_50 || JUZNA_AFRIKA_50 || LUXEMBURG_40 ||SENTEC || ZAMBIA || ZODINO +#elif ALZIR_25 || CEVAK_200 || FEWA_50 || FILIPINY_50 || FUZHOU_100 || HONGKONG_50 || IZRAEL_25 || IZRAEL_50 || JUZNA_AFRIKA_50 || LUXEMBURG_40 ||SENTEC || WARSAW_50 || ZAMBIA || ZODINO /// /// 64-bit route, prolonged method support /// diff --git a/TBF/UI/MainWnd.Designer.cs b/TBF/UI/MainWnd.Designer.cs index b133856cc..b7724d315 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 || 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 || 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/Warsaw-50/ControlComponent3U.dll b/packages/ControlBoard/Warsaw-50/ControlComponent3U.dll new file mode 100644 index 000000000..604828bdf Binary files /dev/null and b/packages/ControlBoard/Warsaw-50/ControlComponent3U.dll differ