diff --git a/TBF/BenchControl/Elde/Common.cs b/TBF/BenchControl/Elde/Common.cs index bd6455bd6..0273626ba 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 || GELSENWASSER || 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 || HONGKONG_50 +#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 || 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 public enum StatusP : ulong { RefFlowMeterMask = 0x7, /// bits 0,1,2 @@ -46,7 +46,7 @@ namespace TBF.BenchControl.Elde ErrorPressMeter4 = 0x8000000000000, /// bit 51 EndurCycleRunning = 0x200000000000000, /// bit 57 } -#else // DN100 || MUNICH || FUZHOU_150 || TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 +#else // all other benches public enum StatusP : ulong { RefFlowMeterMask = 0x7, diff --git a/TBF/BenchControl/Elde/ControlBoardDev.cs b/TBF/BenchControl/Elde/ControlBoardDev.cs index ead90496a..2c3e09494 100644 --- a/TBF/BenchControl/Elde/ControlBoardDev.cs +++ b/TBF/BenchControl/Elde/ControlBoardDev.cs @@ -110,11 +110,11 @@ namespace TBF.BenchControl.Elde public byte MeretProtocol = 0; // Array length is the reference flowmeters count plus one -#if DN100 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || SENTEC || CEVAK_200 +#if CEVAK_200 || DN100 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || SENTEC 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[6] { 1, 1, 1, 1, 1, 1 }; -#elif PUCHONG_200 || GENESIS || BERLIN || GELSENWASSER || PETERSBURG_200 || RUM_MOB || SLM_150 +#elif BERLIN || GELSENWASSER || GENESIS || PETERSBURG_200 || PUCHONG_200 || RUM_MOB || SLM_150 public uint[,] RegValveCalib = new uint[16, 2] { {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500} }; public byte[] MeretRS485Address = new byte[4]; @@ -129,13 +129,13 @@ 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 || ALZIR_25 || HONGKONG_50 +#elif 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 || MUNICH || MURES_40 || PETERSBURG_50 || SLM_50 || TORINO_50 || TORUN_50 || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || 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 + #if IZRAEL_50 public byte[] MeretRS485Address = new byte[6]; -#else + #else public byte[] MeretRS485Address = new byte[4]; -#endif + #endif public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 }; #elif IZRAEL_50 || SLM_END public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}}; @@ -198,7 +198,7 @@ namespace TBF.BenchControl.Elde { bool pumpPowerChanged = false; -#if DN100 || MUNICH || FUZHOU_150 +#if DN100 || FUZHOU_150 || MUNICH if ((FMFreq == null) || (FMFreq.Length != 2)) { FMFreq = new float[2]; @@ -286,7 +286,7 @@ namespace TBF.BenchControl.Elde cbCommandQueue = new Queue(); lastSentFilters = new uint[FiltersCount]; -#if DN100 || MUNICH || FUZHOU_150 +#if DN100 || FUZHOU_150 || MUNICH FMFreq = new float[2] { 0, 0 }; /// Nr. of pumps: Fuzhou150=2, Fuzhou300=6, newer=6 #elif SLM_END || WARSAW_END FMFreq = new float[4] { 0, 0, 0, 0 }; @@ -314,15 +314,15 @@ namespace TBF.BenchControl.Elde /// public void InitializeComponent( #if DN100 - ControlCom2VB.ControlCom2panel ctrlBrdComponent, -#elif MUNICH || FUZHOU_150 - ControlComponent3Munich.UserControl1 ctrlBrdComponent, + ControlCom2VB.ControlCom2panel ctrlBrdComponent, +#elif FUZHOU_150 || MUNICH + ControlComponent3Munich.UserControl1 ctrlBrdComponent, #elif FUZHOU_300 ControlComponent3F300.UserControl1 ctrlBrdComponent, -#elif IZRAEL_200 || PUCHONG_200 || GENESIS || BERLIN || GELSENWASSER || SLM_150 || PETERSBURG_200 +#elif BERLIN || GELSENWASSER || GENESIS || IZRAEL_200 || PETERSBURG_200 || PUCHONG_200 || SLM_150 ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent, #else /// all newer benches - ControlComponent_Torino2015.UserControl1 ctrlBrdComponent, + ControlComponent_Torino2015.UserControl1 ctrlBrdComponent, #endif UInt128 valvesToInvert, double[] tankCapacities) diff --git a/TBF/BenchControl/Elde/ControlComWrap.cs b/TBF/BenchControl/Elde/ControlComWrap.cs index 1c2a5474e..787c0e40e 100644 --- a/TBF/BenchControl/Elde/ControlComWrap.cs +++ b/TBF/BenchControl/Elde/ControlComWrap.cs @@ -19,7 +19,7 @@ namespace TBF.BenchControl.Elde /// public StatusP StatusP { get { return (StatusP)ctrlBrdComponent.StatusP; } } -#if DN100 || MUNICH || FUZHOU_150 +#if DN100 || FUZHOU_150 || MUNICH public double ReferenceFreq { get { return 1000.0f * ctrlBrdComponent.referenceFreq; } } /// Returns in [Hz] 0..2500, nom.=2000 public double ReferenceFreqs(int i) { return 0; } #else @@ -43,7 +43,7 @@ namespace TBF.BenchControl.Elde public int EtPulses(int wmNr1) { return (int)ctrlBrdComponent.etPulses[wmNr1]; } -#if DN100 || MUNICH || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40 || IZRAEL_200 || MALTA_WSD25 +#if BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || CEVAK_40 || DN100 || IZRAEL_200 || MALTA_WSD25 || MUNICH || MURES_40 || TORINO_50 || TORUN_50 public int EtPulsesK { get { return 1; } } #else /// all new benches public int EtPulsesK { get { return (int)ctrlBrdComponent.etPulsesK; } } @@ -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 GENESIS || BERLIN || GELSENWASSER || PETERSBURG_200 || DEWA_300 || ROMA_200 +#if BERLIN || DEWA_300 || GELSENWASSER || GENESIS || 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 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 || GELSENWASSER || HONGKONG_50 +#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 || PUCHONG_200 || ROMA_200 || SENTEC || TURA_IPERL_NEW || ZAMBIA || ZODINO public uint DivTime(int id) { return ctrlBrdComponent.divTime[id]; } public void SetDivLimit(int divNo, uint limLoPct, uint limHiPct) { @@ -99,7 +99,7 @@ namespace TBF.BenchControl.Elde public float ImpulseTime(int wmNr1) { return ctrlBrdComponent.ImpulseTime[wmNr1]; } #endif -#if DN100 || MUNICH || FUZHOU_150 +#if DN100 || FUZHOU_150 || MUNICH public uint FmState { get { return ctrlBrdComponent.fMState; } } #else //if everything newer public uint FmState { get { return ctrlBrdComponent.fMState[0]; } } /// TODO: index @@ -113,7 +113,7 @@ namespace TBF.BenchControl.Elde } public float DivSamples(int time, int divIx0) { -#if MUNICH || IZRAEL_200 +#if IZRAEL_200 || MUNICH return ctrlBrdComponent.DIVSamples[time, 0]; #else return ctrlBrdComponent.DIVSamples[time, divIx0]; @@ -124,7 +124,7 @@ namespace TBF.BenchControl.Elde public float AnalogInput(int adcNr0) { return ctrlBrdComponent.Analogy[adcNr0]; } public uint AnalogInputRaw(int adcNr0, int bank) { return ctrlBrdComponent.AnalogyRaw[adcNr0, bank]; } /// bank0=RV, bank1=Temp -#if DN100 || MUNICH || BADGER_MALA_TRAT || BADGER_VELKA_TRAT || FUZHOU_50 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40 +#if BADGER_MALA_TRAT || BADGER_VELKA_TRAT || CEVAK_40 || DN100 || FUZHOU_50 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || MUNICH || MURES_40 || TORINO_50 || TORUN_50 public float TotalRefVolume { get { return ctrlBrdComponent.ReferenceVolume; } } public float MassRefVolume { get { return ctrlBrdComponent.ReferenceVolume; } } #else /// all new test benches @@ -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 || ALZIR_25 +#if ALZIR_25 || CEVAK_200 || FEWA_50 || FILIPINY_50 || FUZHOU_100 || IZRAEL_25 || IZRAEL_50 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || ZAMBIA || ZODINO public float ValveOpenCloseTime { get { return ctrlBrdComponent.ValveMoveTime[0]; } } #else public float ValveOpenCloseTime { get { return 0.001f; } } @@ -172,11 +172,11 @@ namespace TBF.BenchControl.Elde /// #if DN100 private ControlCom2VB.ControlCom2panel ctrlBrdComponent; -#elif MUNICH || FUZHOU_150 +#elif FUZHOU_150 || MUNICH private ControlComponent3Munich.UserControl1 ctrlBrdComponent; #elif FUZHOU_300 private ControlComponent3F300.UserControl1 ctrlBrdComponent; -#elif IZRAEL_200 || PUCHONG_200 || GENESIS || BERLIN || GELSENWASSER || SLM_150 || PETERSBURG_200 +#elif BERLIN || GELSENWASSER || GENESIS || IZRAEL_200 || PETERSBURG_200 || PUCHONG_200 || SLM_150 private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent; #else /// newer benches private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; @@ -188,11 +188,11 @@ namespace TBF.BenchControl.Elde /// #if DN100 public ControlComWrap(ControlCom2VB.ControlCom2panel ctrlBrdComponent) -#elif MUNICH || FUZHOU_150 +#elif FUZHOU_150 || MUNICH public ControlComWrap(ControlComponent3Munich.UserControl1 ctrlBrdComponent) #elif FUZHOU_300 public ControlComWrap(ControlComponent3F300.UserControl1 ctrlBrdComponent) -#elif IZRAEL_200 || PUCHONG_200 || GENESIS || BERLIN || GELSENWASSER || SLM_150 || PETERSBURG_200 +#elif BERLIN || GELSENWASSER || GENESIS || IZRAEL_200 || PETERSBURG_200 || PUCHONG_200 || SLM_150 public ControlComWrap(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent) #else /// all newer benches public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent) @@ -239,14 +239,14 @@ namespace TBF.BenchControl.Elde // rvCalib[0,0], rvCalib[0,1], rvCalib[1,0], rvCalib[1,1])); #if DN100 log.FatalFormat("Component: {0}", ControlCom2VB.ControlCom2panel.ProgVersion); -#elif MUNICH || FUZHOU_150 +#elif FUZHOU_150 || MUNICH log.FatalFormat("Component: {0}", ControlComponent3Munich.UserControl1.ProgVersion); #elif FUZHOU_300 log.FatalFormat("Component: {0}", ControlComponent3F300.UserControl1.ProgVersion); -#elif IZRAEL_200 || PUCHONG_200 || GENESIS || BERLIN || GELSENWASSER || SLM_150 || PETERSBURG_200 +#elif BERLIN || GELSENWASSER || GENESIS || IZRAEL_200 || PETERSBURG_200 || PUCHONG_200 || SLM_150 log.FatalFormat("Component: {0}", ControlComponent_Izrael2014.UserControl1.ProgVersion); #else /// newer benches - log.FatalFormat("Component: {0}", ControlComponent_Torino2015.UserControl1.ProgVersion); + log.FatalFormat("Component: {0}", ControlComponent_Torino2015.UserControl1.ProgVersion); #endif log.Fatal("SendCalibData(...)"); for (int i = 0; i < rvCalib.GetLength(0); i++) @@ -263,7 +263,7 @@ namespace TBF.BenchControl.Elde ctrlBrdComponent.ExternalCom = true; -#if SENTEC || CEVAK_200 || FUZHOU_100 || IZRAEL_25 || ALZIR_25 +#if ALZIR_25 || CEVAK_200 || FUZHOU_100 || IZRAEL_25 || SENTEC ctrlBrdComponent.SendCalibData(rvCalib, meretA, (byte)usedCom, tempCalib, etCalib, divEdge, balanceRange, meretProtocol); #else ctrlBrdComponent.SendCalibData(rvCalib, meretA, (byte)usedCom, tempCalib, etCalib, divEdge, balanceRange); @@ -296,8 +296,8 @@ namespace TBF.BenchControl.Elde delegate void ValveMoveDlgt(int valveNo, RegulValveMode valveMode, float[] valveValue, int stableTime); /// private void DoValveMove(int valveNo, RegulValveMode valveMode, float[] valveValue, int stableTime) - { -#if DN100 || MUNICH || FUZHOU_150 + { +#if DN100 || FUZHOU_150 || MUNICH log.InfoFormat("ValveMove(#={0}, md={1}, [{2}, {3}])", valveNo, valveMode, valveValue[0], valveValue[1]); ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue); #else /// all newer benches @@ -387,7 +387,7 @@ namespace TBF.BenchControl.Elde (uint)regConst, (uint)shortImp, (uint)sendCommandArgs.StopDevs); -#elif BADGER_MALA_TRAT || BADGER_VELKA_TRAT || FUZHOU_50 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40 +#elif BADGER_MALA_TRAT || BADGER_VELKA_TRAT || CEVAK_40 || FUZHOU_50 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || MURES_40 || TORINO_50 || TORUN_50 /// /// 64-bit route, single filter conts. (no array) /// @@ -401,7 +401,7 @@ namespace TBF.BenchControl.Elde (uint)regConst, (uint)shortImp, (uint)sendCommandArgs.StopDevs); -#elif BERLIN || SLM_150 || PETERSBURG_200 +#elif BERLIN || PETERSBURG_200 || SLM_150 /// /// 128-bit route, prolonged method support, single filter conts. (no array) /// @@ -416,7 +416,7 @@ namespace TBF.BenchControl.Elde (uint)regConst, (uint)shortImp, (uint)sendCommandArgs.StopDevs); -#elif GENESIS || DEWA_300 || ROMA_200 || GELSENWASSER +#elif DEWA_300 || GELSENWASSER || GENESIS || ROMA_200 /// /// 128-bit route, prolonged method support /// @@ -431,7 +431,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 || ALZIR_25 || HONGKONG_50 +#elif ALZIR_25 || CEVAK_200 || FEWA_50 || FILIPINY_50 || FUZHOU_100 || HONGKONG_50 || IZRAEL_25 || IZRAEL_50 || JUZNA_AFRIKA_50 || SENTEC || ZAMBIA || ZODINO /// /// 64-bit route, prolonged method support /// @@ -445,7 +445,7 @@ namespace TBF.BenchControl.Elde (uint)regConst, (uint)shortImp, (uint)sendCommandArgs.StopDevs); -#else /// if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || MALTA_WSD25 || SLM_50 || SLM_END || WARSAW_END || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || BADGER_STREDNA_TRAT || PUCHONG_200 +#else /// all other benches /// /// 64-bit route, prolonged method support, single filter conts. (no array) /// diff --git a/TBF/BenchControl/Elde/Diverter/Diverter.cs b/TBF/BenchControl/Elde/Diverter/Diverter.cs index d2e35cb24..683328aff 100644 --- a/TBF/BenchControl/Elde/Diverter/Diverter.cs +++ b/TBF/BenchControl/Elde/Diverter/Diverter.cs @@ -115,22 +115,20 @@ namespace TBF.BenchControl.Elde.Diverter { divNrFromName = nextIdx; } -#if GENESIS || PETERSBURG_50 || PETERSBURG_200 || FUZHOU_50 || FUZHOU_150 || FUZHOU_300 || ROMA_200 || SLM_150 +#if FUZHOU_50 || FUZHOU_150 || FUZHOU_300 || GENESIS || PETERSBURG_50 || PETERSBURG_200 || ROMA_200 || SLM_150 flowMtrNr4Cmd = divNrFromName + 1; #elif BADGER_STREDNA_TRAT flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : ((divNrFromName == 2) ? 9 : 20); #elif BADGER_VELKA_TRAT flowMtrNr4Cmd = ((divNrFromName % 10) == 1) ? 0x11 : (((divNrFromName % 10) == 2) ? 0x22 : 0x33); -#elif FUZHOU_100 - flowMtrNr4Cmd = divNrFromName; #elif CEVAK_200 flowMtrNr4Cmd = (divNrFromName == 4) ? 5 : divNrFromName; #elif DEWA_300 || PUCHONG_200 flowMtrNr4Cmd = divNrFromName + 2; /// Div1: 1,2,3, Div2: 4, Div3: 5, Div4: 6, Div5: 7 -#elif TURA_IPERL || TURA_IPERL_NEW - flowMtrNr4Cmd = divNrFromName + 16 * divNrFromName; #elif FILIPINY_50 flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : 7; +#elif FUZHOU_100 + flowMtrNr4Cmd = divNrFromName; #elif GELSENWASSER switch (divNrFromName) { @@ -140,8 +138,10 @@ namespace TBF.BenchControl.Elde.Diverter case 3: flowMtrNr4Cmd = 3; break; case 4: flowMtrNr4Cmd = 5; break; } -#else - flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : 3; +#elif TURA_IPERL || TURA_IPERL_NEW + flowMtrNr4Cmd = divNrFromName + 16 * divNrFromName; +#else /// all other benches + flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : 3; #endif diverterToTankOp = new SwitchDiverterOp(controlBoard, true, flowMtrNr4Cmd); diverterToSinkOp = new SwitchDiverterOp(controlBoard, false, flowMtrNr4Cmd); diff --git a/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/CycleBeginningForm.cs b/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/CycleBeginningForm.cs index 09218415a..8e0e03330 100644 --- a/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/CycleBeginningForm.cs +++ b/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/CycleBeginningForm.cs @@ -163,13 +163,7 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio private void okButton_Click(object sender, EventArgs e) { PurchaseOrder = orderComboBox.Text; - Program.LocalSettings.UpdateHistory(orderComboBox.Text, - ref Program.LocalSettings.PurchaseOrderHistory -#if FUZHOU_150 || FUZHOU_300 - , 20 -#endif - ); - + Program.LocalSettings.UpdateHistory(orderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory); Program.LocalSettings.LastSNTexts = SNText; for (int i = 0; i < Math.Min(WaterMetersCount, textBoxesCount); i++) diff --git a/TBF/BenchControl/StateMachine.cs b/TBF/BenchControl/StateMachine.cs index 8c8b9a750..3241b1ea4 100644 --- a/TBF/BenchControl/StateMachine.cs +++ b/TBF/BenchControl/StateMachine.cs @@ -200,11 +200,11 @@ namespace TBF.BenchControl /// Identifies the initial state #if DN100 public static void InitializeBoardEtc(ControlCom2VB.ControlCom2panel ctrlBrdComponent) -#elif MUNICH || FUZHOU_150 +#elif FUZHOU_150 || MUNICH public static void InitializeBoardEtc(ControlComponent3Munich.UserControl1 ctrlBrdComponent) #elif FUZHOU_300 public static void InitializeBoardEtc(ControlComponent3F300.UserControl1 ctrlBrdComponent) -#elif IZRAEL_200 || PUCHONG_200 || GENESIS || BERLIN || GELSENWASSER || SLM_150 || PETERSBURG_200 +#elif BERLIN || GELSENWASSER || GENESIS || IZRAEL_200 || PETERSBURG_200 || PUCHONG_200 || SLM_150 public static void InitializeBoardEtc(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent) #else /// all newer benches public static void InitializeBoardEtc(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent) diff --git a/TBF/UI/MainWnd.Designer.cs b/TBF/UI/MainWnd.Designer.cs index 5637e9f72..364346d50 100644 --- a/TBF/UI/MainWnd.Designer.cs +++ b/TBF/UI/MainWnd.Designer.cs @@ -731,25 +731,25 @@ namespace TBF.UI #if DN100 private ControlCom2VB.ControlCom2panel ctrlBrdComponent; private TBF.UI.ProcessTabPageCtrl6 processTabPageCtrl; -#elif MUNICH || FUZHOU_150 +#elif FUZHOU_150 || MUNICH private ControlComponent3Munich.UserControl1 ctrlBrdComponent; private TBF.UI.Process.ProcessTabPageCtrl6 processTabPageCtrl; #elif FUZHOU_300 private ControlComponent3F300.UserControl1 ctrlBrdComponent; private TBF.UI.Process.ProcessTabPageCtrl6 processTabPageCtrl; -#elif IZRAEL_200 || PUCHONG_200 || GENESIS || BERLIN || GELSENWASSER || SLM_150 || PETERSBURG_200 +#elif BERLIN || GELSENWASSER || GENESIS || IZRAEL_200 || PETERSBURG_200 || PUCHONG_200 || SLM_150 private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent; private TBF.UI.Process.ProcessTabPageCtrl6 processTabPageCtrl; -#elif BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || SLM_END || WARSAW_END || RUM_MOB || SENTEC || CEVAK_200 +#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 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 || HONGKONG_50 +#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 || MALTA_WSD25 || MURES_40 || PETERSBURG_50 || ROMA_200 || TORINO_50 || TORUN_50 || ZAMBIA || ZODINO private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private TBF.UI.Process.ProcessTabPageCtrl24 processTabPageCtrl; -#elif TURA_SPECIAL || SLM_50 +#elif SLM_50 || TURA_SPECIAL private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private TBF.UI.Process.ProcessTabPageExCtrl processTabPageCtrl; -#elif TURA_IPERL || TURA_IPERL_NEW || IZRAEL_50 +#elif IZRAEL_50 || TURA_IPERL || TURA_IPERL_NEW private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private TBF.UI.Process.ProcessTabPageCtrl48 processTabPageCtrl; #endif