diff --git a/Config/Data.cs b/Config/Data.cs index 2015ff4bb..cf73ca712 100644 --- a/Config/Data.cs +++ b/Config/Data.cs @@ -62,7 +62,7 @@ namespace Config public const int CompoundWMsCount = 1; public const int HeatMetersCount = 0; public const int MaxPartNr = 1; -#elif TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 +#elif TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || ALZIR_25 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 223d89495..7f2c2d1fe 100644 --- a/TBF/BenchControl/Elde/Common.cs +++ b/TBF/BenchControl/Elde/Common.cs @@ -19,7 +19,7 @@ namespace TBF.BenchControl.Elde EnduranceCycleStop = 13, } -#if FUZHOU_300 || IZRAEL_200 || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_200 || SLM_50 || GENESIS || MALTA_WSD25 || SLM_END || WARSAW_END || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || DEWA_300 || ROMA_200 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 +#if FUZHOU_300 || IZRAEL_200 || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_200 || SLM_50 || GENESIS || MALTA_WSD25 || SLM_END || WARSAW_END || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || DEWA_300 || ROMA_200 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 || ALZIR_25 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 66828d343..391fc7fdc 100644 --- a/TBF/BenchControl/Elde/ControlBoardDev.cs +++ b/TBF/BenchControl/Elde/ControlBoardDev.cs @@ -129,7 +129,7 @@ namespace TBF.BenchControl.Elde {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500} }; public byte[] MeretRS485Address = new byte[5]; public float[] EtCalib = new float[8] { 1, 1, 1, 1, 1, 1, 1, 1 }; -#elif MUNICH || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TORUN_50 || CEVAK_40 || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || MURES_40 || FUZHOU_50 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100 +#elif MUNICH || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TORUN_50 || CEVAK_40 || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || MURES_40 || FUZHOU_50 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100 || ALZIR_25 public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}}; public byte[] MeretRS485Address = new byte[4]; public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 }; diff --git a/TBF/BenchControl/Elde/ControlComWrap.cs b/TBF/BenchControl/Elde/ControlComWrap.cs index d70203b2f..81a6c59c7 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 GENESIS || KEMPNO_50 || KRAKOW_50 || BAHRAIN_50 || BADGER_STREDNA_TRAT || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 || DEWA_300 || ROMA_200 || PUCHONG_200 || TURA_IPERL_NEW +#if GENESIS || KEMPNO_50 || KRAKOW_50 || BAHRAIN_50 || BADGER_STREDNA_TRAT || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 || DEWA_300 || ROMA_200 || PUCHONG_200 || TURA_IPERL_NEW || ALZIR_25 public uint DivTime(int id) { return ctrlBrdComponent.divTime[id]; } public void SetDivLimit(int divNo, uint limLoPct, uint limHiPct) { @@ -140,7 +140,7 @@ namespace TBF.BenchControl.Elde public uint[] WMeterCont { get { return new uint[3]; } } /// Dummy #endif -#if KEMPNO_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100 || CEVAK_200 || IZRAEL_50 +#if KEMPNO_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100 || CEVAK_200 || IZRAEL_50 || ALZIR_25 public float ValveOpenCloseTime { get { return ctrlBrdComponent.ValveMoveTime[0]; } } #else public float ValveOpenCloseTime { get { return 0.001f; } } @@ -263,7 +263,7 @@ namespace TBF.BenchControl.Elde ctrlBrdComponent.ExternalCom = true; -#if SENTEC || CEVAK_200 || FUZHOU_100 || IZRAEL_25 +#if SENTEC || CEVAK_200 || FUZHOU_100 || IZRAEL_25 || ALZIR_25 ctrlBrdComponent.SendCalibData(rvCalib, meretA, (byte)usedCom, tempCalib, etCalib, divEdge, balanceRange, meretProtocol); #else ctrlBrdComponent.SendCalibData(rvCalib, meretA, (byte)usedCom, tempCalib, etCalib, divEdge, balanceRange); @@ -419,7 +419,7 @@ namespace TBF.BenchControl.Elde (uint)regConst, (uint)shortImp, (uint)sendCommandArgs.StopDevs); -#elif JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 +#elif JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 || ALZIR_25 ctrlBrdComponent.SendCommand((uint)sendCommandArgs.Cmd, (byte)sendCommandArgs.RefFlowmtrNr, (ulong)route, diff --git a/TBF/BenchControl/Elde/RegulValve/RegulValve.cs b/TBF/BenchControl/Elde/RegulValve/RegulValve.cs index 679b94307..26443488f 100644 --- a/TBF/BenchControl/Elde/RegulValve/RegulValve.cs +++ b/TBF/BenchControl/Elde/RegulValve/RegulValve.cs @@ -108,14 +108,9 @@ namespace TBF.BenchControl.Elde.RegulValve #endif if (Idx1 < ControlBoard.RegValveCalib.GetLength(0)) - { -#if IZRAEL_25 + { this.ControlBoard.RegValveCalib[adcChannel, 0] = (uint)DacValueClosed; this.ControlBoard.RegValveCalib[adcChannel, 1] = (uint)DacValueOpen; -#else - this.ControlBoard.RegValveCalib[Idx1 - 1, 0] = (uint)DacValueClosed; - this.ControlBoard.RegValveCalib[Idx1 - 1, 1] = (uint)DacValueOpen; -#endif } else { diff --git a/TBF/UI/MainWnd.Designer.cs b/TBF/UI/MainWnd.Designer.cs index 9678190e2..b535da7b2 100644 --- a/TBF/UI/MainWnd.Designer.cs +++ b/TBF/UI/MainWnd.Designer.cs @@ -716,7 +716,7 @@ namespace TBF.UI #elif BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || SLM_END || WARSAW_END || RUM_MOB || SENTEC || CEVAK_200 private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private Process.ProcessTabPageCtrl6 processTabPageCtrl; -#elif TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || MALTA_WSD25 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100 || DEWA_300 || ROMA_200 +#elif TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || MALTA_WSD25 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100 || DEWA_300 || ROMA_200 || ALZIR_25 private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private Process.ProcessTabPageCtrl24 processTabPageCtrl; #elif TURA_SPECIAL || SLM_50 diff --git a/packages/ControlBoard/Alzir-25/ControlComponent3U.dll b/packages/ControlBoard/Alzir-25/ControlComponent3U.dll new file mode 100644 index 000000000..f87fa6891 Binary files /dev/null and b/packages/ControlBoard/Alzir-25/ControlComponent3U.dll differ