From 34479778b93f7ddc0a83b86d1959e46860cde5d2 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Thu, 13 Sep 2018 13:05:15 +0200 Subject: [PATCH] CEVAK_40, FUZHOU_50/_100/_150/_300, MURES_40, PUCHONG_200, TORINO_50, TORUN_50 introduced, ver. 2.18.995 --- Config/Data.cs | 8 ++-- Results/Utils.cs | 2 +- ResultsBrowser/ResultsBrowserWnd.cs | 2 +- .../DataEntry/Combined/CycleBeginningForm.cs | 2 +- .../HeatMeters12/CycleBeginningForm.cs | 2 +- .../HeatMeters6/CycleBeginningForm.cs | 2 +- .../Standard12/CycleBeginningForm.cs | 2 +- .../Standard24/CycleBeginningForm.cs | 2 +- .../Standard48/CycleBeginningForm.cs | 2 +- .../DataEntry/Standard6/CycleBeginningForm.cs | 2 +- .../StandardCamera/CycleBeginningForm.cs | 2 +- TBF/BenchControl/Elde/Common.cs | 4 +- TBF/BenchControl/Elde/ControlBoardDev.cs | 14 +++---- TBF/BenchControl/Elde/ControlComSim.cs | 4 +- TBF/BenchControl/Elde/ControlComWrap.cs | 40 +++++++++---------- TBF/BenchControl/Elde/Diverter/Diverter.cs | 2 +- TBF/BenchControl/StateMachine.cs | 6 +-- TBF/BenchControl/TestBenchSim.cs | 28 ++++++------- TBF/Forms/PrintOrderForm.cs | 2 +- TBF/MainWnd.Designer.cs | 8 ++-- TBF/Properties/AssemblyInfo.cs | 4 +- 21 files changed, 70 insertions(+), 70 deletions(-) diff --git a/Config/Data.cs b/Config/Data.cs index 997d474e5..e1ee5d2e7 100644 --- a/Config/Data.cs +++ b/Config/Data.cs @@ -20,7 +20,7 @@ namespace Config public const int CompoundWMsCount = 1; public const int HeatMetersCount = 0; public const int MaxPartNr = WMsCount / LineSize; -#elif FUZHOU300 || FUZHOU150 || PT200IL || PUCHONG_PT200 || GENESIS || SLM_150 || PETERSBURG_200 +#elif FUZHOU_300 || FUZHOU_150 || PT200IL || PUCHONG_200 || GENESIS || SLM_150 || PETERSBURG_200 public const int WMsCount = 6; public const int LineSize = 6; public const int CompoundWMsCount = 3; @@ -32,19 +32,19 @@ namespace Config public const int CompoundWMsCount = 0; public const int HeatMetersCount = 0; public const int MaxPartNr = WMsCount / LineSize; -#elif FUZHOU100 +#elif FUZHOU_100 public const int WMsCount = 10; public const int LineSize = 10; public const int CompoundWMsCount = 1; public const int HeatMetersCount = 0; public const int MaxPartNr = WMsCount / LineSize; -#elif TORINO50 || BADGER_MALA_TRAT || BERLIN +#elif TORINO_50 || BADGER_MALA_TRAT || BERLIN public const int WMsCount = 6; public const int LineSize = 6; public const int CompoundWMsCount = 1; public const int HeatMetersCount = 0; public const int MaxPartNr = 1; -#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA +#elif TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA public const int WMsCount = 20; public const int LineSize = 10; public const int CompoundWMsCount = 1; diff --git a/Results/Utils.cs b/Results/Utils.cs index 8550046ea..8bade32cb 100644 --- a/Results/Utils.cs +++ b/Results/Utils.cs @@ -54,7 +54,7 @@ namespace Results public static string PassedColorStr(bool passed, bool useRedGreenColor) { -#if PUCHONG_PT200 +#if PUCHONG_200 return (useRedGreenColor) ? (passed ? "OK|Green" : "NG|Red") : (passed ? "OK|White" : "NG|White"); #elif BAHRAIN_50 || DUBAJ_50 return (useRedGreenColor) ? (passed ? "PASSED|Green" : "FAILED|Red") : (passed ? "PASSED|White" : "FAILED|White"); diff --git a/ResultsBrowser/ResultsBrowserWnd.cs b/ResultsBrowser/ResultsBrowserWnd.cs index c91b27b60..7e7ab28eb 100644 --- a/ResultsBrowser/ResultsBrowserWnd.cs +++ b/ResultsBrowser/ResultsBrowserWnd.cs @@ -398,7 +398,7 @@ namespace ResultsBrowser { new Results.Output.Printers.Munich.MunichPrintDocument(string.Format("4/13 - {0}", BenchName()), wm, Config.Entities.PageOrientation.Portrait).Print(); } -#elif CEVAK_PT40_272 +#elif CEVAK_40 IList batches = new List(); foreach (var wm in waterMeters) { diff --git a/TBF/BenchControl/DataEntry/Combined/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/Combined/CycleBeginningForm.cs index fe6815520..58c2098a3 100644 --- a/TBF/BenchControl/DataEntry/Combined/CycleBeginningForm.cs +++ b/TBF/BenchControl/DataEntry/Combined/CycleBeginningForm.cs @@ -150,7 +150,7 @@ namespace TBF.BenchControl.DataEntry.Combined PurchaseOrder = orderComboBox.Text; Program.LocalSettings.UpdateHistory(orderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory -#if FUZHOU150 || FUZHOU300 +#if FUZHOU_150 || FUZHOU_300 , 20 #endif ); diff --git a/TBF/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.cs index f2296f80c..c87e8d3fb 100644 --- a/TBF/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.cs +++ b/TBF/BenchControl/DataEntry/HeatMeters12/CycleBeginningForm.cs @@ -241,7 +241,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12 PurchaseOrder = orderComboBox.Text; Program.LocalSettings.UpdateHistory(orderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory -#if FUZHOU150 || FUZHOU300 +#if FUZHOU_150 || FUZHOU_300 , 20 #endif ); diff --git a/TBF/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.cs index 00627cce9..e23326036 100644 --- a/TBF/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.cs +++ b/TBF/BenchControl/DataEntry/HeatMeters6/CycleBeginningForm.cs @@ -234,7 +234,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6 PurchaseOrder = orderComboBox.Text; Program.LocalSettings.UpdateHistory(orderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory -#if FUZHOU150 || FUZHOU300 +#if FUZHOU_150 || FUZHOU_300 , 20 #endif ); diff --git a/TBF/BenchControl/DataEntry/Standard12/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/Standard12/CycleBeginningForm.cs index e9ac94a9f..5feeceee8 100644 --- a/TBF/BenchControl/DataEntry/Standard12/CycleBeginningForm.cs +++ b/TBF/BenchControl/DataEntry/Standard12/CycleBeginningForm.cs @@ -241,7 +241,7 @@ namespace TBF.BenchControl.DataEntry.Standard12 PurchaseOrder = orderComboBox.Text; Program.LocalSettings.UpdateHistory(orderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory -#if FUZHOU150 || FUZHOU300 +#if FUZHOU_150 || FUZHOU_300 , 20 #endif ); diff --git a/TBF/BenchControl/DataEntry/Standard24/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/Standard24/CycleBeginningForm.cs index ee5f10674..ee475299e 100644 --- a/TBF/BenchControl/DataEntry/Standard24/CycleBeginningForm.cs +++ b/TBF/BenchControl/DataEntry/Standard24/CycleBeginningForm.cs @@ -161,7 +161,7 @@ namespace TBF.BenchControl.DataEntry.Standard24 PurchaseOrder = orderComboBox.Text; Program.LocalSettings.UpdateHistory(orderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory -#if FUZHOU150 || FUZHOU300 +#if FUZHOU_150 || FUZHOU_300 , 20 #endif ); diff --git a/TBF/BenchControl/DataEntry/Standard48/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/Standard48/CycleBeginningForm.cs index 97630e0bb..6a032c014 100644 --- a/TBF/BenchControl/DataEntry/Standard48/CycleBeginningForm.cs +++ b/TBF/BenchControl/DataEntry/Standard48/CycleBeginningForm.cs @@ -165,7 +165,7 @@ namespace TBF.BenchControl.DataEntry.Standard48 PurchaseOrder = orderComboBox.Text; Program.LocalSettings.UpdateHistory(orderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory -#if FUZHOU150 || FUZHOU300 +#if FUZHOU_150 || FUZHOU_300 , 20 #endif ); diff --git a/TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.cs index 2ca782ecc..cdf78baa7 100644 --- a/TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.cs +++ b/TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.cs @@ -124,7 +124,7 @@ namespace TBF.BenchControl.DataEntry.Standard6 PurchaseOrder = orderComboBox.Text; Program.LocalSettings.UpdateHistory(orderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory -#if FUZHOU150 || FUZHOU300 +#if FUZHOU_150 || FUZHOU_300 , 20 #endif ); diff --git a/TBF/BenchControl/DataEntry/StandardCamera/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/StandardCamera/CycleBeginningForm.cs index 704a15235..beb0a00d5 100644 --- a/TBF/BenchControl/DataEntry/StandardCamera/CycleBeginningForm.cs +++ b/TBF/BenchControl/DataEntry/StandardCamera/CycleBeginningForm.cs @@ -166,7 +166,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera PurchaseOrder = orderComboBox.Text; Program.LocalSettings.UpdateHistory(orderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory -#if FUZHOU150 || FUZHOU300 +#if FUZHOU_150 || FUZHOU_300 , 20 #endif ); diff --git a/TBF/BenchControl/Elde/Common.cs b/TBF/BenchControl/Elde/Common.cs index 9e7fac6c9..70fcfdb41 100644 --- a/TBF/BenchControl/Elde/Common.cs +++ b/TBF/BenchControl/Elde/Common.cs @@ -19,7 +19,7 @@ namespace TBF.BenchControl.Elde EnduranceCycleStop = 13, } -#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TURA_IPERL || TURA_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_PT200 || SLM_50 || GENESIS || MALTA_WSD25 || SLM_END || WARSAW_END || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA || SENTEC || FUZHOU100 || CEVAK_200 || DUBAJ_50 +#if FUZHOU_300 || PT200IL || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TURA_IPERL || TURA_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_200 || SLM_50 || GENESIS || MALTA_WSD25 || SLM_END || WARSAW_END || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA || SENTEC || FUZHOU_100 || CEVAK_200 || DUBAJ_50 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 || FUZHOU150 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 +#else // DN100 || MUNICH || FUZHOU_150 || TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 public enum StatusP : ulong { RefFlowMeterMask = 0x7, diff --git a/TBF/BenchControl/Elde/ControlBoardDev.cs b/TBF/BenchControl/Elde/ControlBoardDev.cs index 1e029ab24..b5bd80f8f 100644 --- a/TBF/BenchControl/Elde/ControlBoardDev.cs +++ b/TBF/BenchControl/Elde/ControlBoardDev.cs @@ -126,7 +126,7 @@ namespace TBF.BenchControl.Elde public uint[] DiverterEdge; /// Created and initialized in this.Initialize() // Array length is the reference flowmeters count plus one -#if DN100 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || SLM_150 || SENTEC || CEVAK_200 +#if DN100 || FUZHOU_150 || FUZHOU_300 || PT200IL || PUCHONG_200 || SLM_150 || SENTEC || CEVAK_200 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 }; @@ -137,7 +137,7 @@ namespace TBF.BenchControl.Elde {100,500}, {100,500}, {100,500}, {100,500} }; public byte[] MeretRS485Address = new byte[4]; public float[] EtCalib = new float[7] { 1, 1, 1, 1, 1, 1, 1 }; -#elif MUNICH || TORINO50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 || TURA_IPERL || TURA_SPECIAL || MURES_PT40 || FUZHOU_40 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA || FUZHOU100 || DUBAJ_50 +#elif MUNICH || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TORUN_50 || CEVAK_40 || TURA_IPERL || TURA_SPECIAL || MURES_40 || FUZHOU_50 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA || FUZHOU_100 || DUBAJ_50 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 }; @@ -181,7 +181,7 @@ namespace TBF.BenchControl.Elde /// Power (0.0f .. 100.0f) public void SetFMFreq(int index, float power) { -#if DN100 || MUNICH || FUZHOU150 +#if DN100 || MUNICH || FUZHOU_150 if ((FMFreq == null) || (FMFreq.Length != 2)) { FMFreq = new float[2]; @@ -247,7 +247,7 @@ namespace TBF.BenchControl.Elde { controlBoardCfg = cfg as ControlBoardCfg; -#if DN100 || MUNICH || FUZHOU150 +#if DN100 || MUNICH || FUZHOU_150 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 }; @@ -276,11 +276,11 @@ namespace TBF.BenchControl.Elde public void InitializeComponent( #if DN100 ControlCom2VB.ControlCom2panel ctrlBrdComponent, -#elif MUNICH || FUZHOU150 +#elif MUNICH || FUZHOU_150 ControlComponent3Munich.UserControl1 ctrlBrdComponent, -#elif FUZHOU300 +#elif FUZHOU_300 ControlComponent3F300.UserControl1 ctrlBrdComponent, -#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 +#elif PT200IL || PUCHONG_200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent, #else /// all newer benches ControlComponent_Torino2015.UserControl1 ctrlBrdComponent, diff --git a/TBF/BenchControl/Elde/ControlComSim.cs b/TBF/BenchControl/Elde/ControlComSim.cs index 4f496a496..06ddfed18 100644 --- a/TBF/BenchControl/Elde/ControlComSim.cs +++ b/TBF/BenchControl/Elde/ControlComSim.cs @@ -197,11 +197,11 @@ namespace TBF.BenchControl.Elde this.cmd = cmd; this.refFlowmtrNr = refFlowmtrNr; -#if FUZHOU300 +#if FUZHOU_300 /// /// The following code deals with the situation that all FM controlled pums share bit #39. /// In settings the bits of pumps should be sent as follows: P1=50, P2=51, P3=52, P4=53, P5=54 and P7=55 - /// (in FUZHOU300 the FM pump bit should be set set to value FMIndex+50). + /// (in FUZHOU_300 the FM pump bit should be set set to value FMIndex+50). /// bool bit39 = (route & 0x00FC000000000000) != 0; /// true if any of bits 50 through 55 is set route = route & 0xFF03FFFFFFFFFFFF; diff --git a/TBF/BenchControl/Elde/ControlComWrap.cs b/TBF/BenchControl/Elde/ControlComWrap.cs index cd6296306..a044c2bd3 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 || FUZHOU150 +#if DN100 || MUNICH || FUZHOU_150 public float ReferenceFreq { get { return 1000.0f * ctrlBrdComponent.referenceFreq; } } /// In [Hz] 0..2500, nom.=2000 #else /// all newer benches /// @@ -35,7 +35,7 @@ namespace TBF.BenchControl.Elde public int EtPulses(int wmNr1) { return (int)ctrlBrdComponent.etPulses[wmNr1]; } -#if GENESIS || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA || SENTEC || FUZHOU100 || CEVAK_200 || DUBAJ_50 +#if GENESIS || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA || SENTEC || FUZHOU_100 || CEVAK_200 || DUBAJ_50 public int EtPulsesK { get { return (int)ctrlBrdComponent.etPulsesK; } } #else public int EtPulsesK { get { return 1; } } @@ -62,7 +62,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 || ZAMBIA || SENTEC || FUZHOU100 || DUBAJ_50 || CEVAK_200 +#if GENESIS || KEMPNO_50 || KRAKOW_50 || BAHRAIN_50 || BADGER_STREDNA_TRAT || JUZNA_AFRIKA_50 || ZAMBIA || SENTEC || FUZHOU_100 || DUBAJ_50 || CEVAK_200 public uint DivTime(int id) { return ctrlBrdComponent.divTime[id]; } public void SetDivLimit(int divNo, uint limLoPct, uint limHiPct) { @@ -81,7 +81,7 @@ namespace TBF.BenchControl.Elde public float ImpulseTime(int wmNr1) { return ctrlBrdComponent.ImpulseTime[wmNr1]; } #endif -#if DN100 || MUNICH || FUZHOU150 +#if DN100 || MUNICH || FUZHOU_150 public uint FmState { get { return ctrlBrdComponent.fMState; } } #else //if everything newer public uint FmState { get { return ctrlBrdComponent.fMState[0]; } } /// TODO: index @@ -106,7 +106,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_40 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || TORINO50 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 +#if DN100 || MUNICH || BADGER_MALA_TRAT || BADGER_VELKA_TRAT || FUZHOU_50 || FUZHOU_150 || FUZHOU_300 || PT200IL || PUCHONG_200 || TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40 public float TotalRefVolume { get { return ctrlBrdComponent.ReferenceVolume; } } public float MassRefVolume { get { return ctrlBrdComponent.ReferenceVolume; } } #else /// all new test benches @@ -122,7 +122,7 @@ namespace TBF.BenchControl.Elde public uint[] WMeterCont { get { return new uint[3]; } } /// Dummy #endif -#if KEMPNO_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA || FUZHOU100 +#if KEMPNO_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA || FUZHOU_100 public float ValveOpenCloseTime { get { return ctrlBrdComponent.ValveMoveTime[0]; } } #else public float ValveOpenCloseTime { get { return 0.001f; } } @@ -154,11 +154,11 @@ namespace TBF.BenchControl.Elde /// #if DN100 private ControlCom2VB.ControlCom2panel ctrlBrdComponent; -#elif MUNICH || FUZHOU150 +#elif MUNICH || FUZHOU_150 private ControlComponent3Munich.UserControl1 ctrlBrdComponent; -#elif FUZHOU300 +#elif FUZHOU_300 private ControlComponent3F300.UserControl1 ctrlBrdComponent; -#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 +#elif PT200IL || PUCHONG_200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent; #else /// newer benches private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; @@ -170,11 +170,11 @@ namespace TBF.BenchControl.Elde /// #if DN100 public ControlComWrap(ControlCom2VB.ControlCom2panel ctrlBrdComponent) -#elif MUNICH || FUZHOU150 +#elif MUNICH || FUZHOU_150 public ControlComWrap(ControlComponent3Munich.UserControl1 ctrlBrdComponent) -#elif FUZHOU300 +#elif FUZHOU_300 public ControlComWrap(ControlComponent3F300.UserControl1 ctrlBrdComponent) -#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 +#elif PT200IL || PUCHONG_200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 public ControlComWrap(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent) #else /// all newer benches public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent) @@ -221,11 +221,11 @@ 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 || FUZHOU150 +#elif MUNICH || FUZHOU_150 log.FatalFormat("Component: {0}", ControlComponent3Munich.UserControl1.ProgVersion); -#elif FUZHOU300 +#elif FUZHOU_300 log.FatalFormat("Component: {0}", ControlComponent3F300.UserControl1.ProgVersion); -#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 +#elif PT200IL || PUCHONG_200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 log.FatalFormat("Component: {0}", ControlComponent_Izrael2014.UserControl1.ProgVersion); #else /// newer benches log.FatalFormat("Component: {0}", ControlComponent_Torino2015.UserControl1.ProgVersion); @@ -279,7 +279,7 @@ namespace TBF.BenchControl.Elde /// private void DoValveMove(int valveNo, RegulValveMode valveMode, float[] valveValue, int stableTime) { -#if DN100 || MUNICH || FUZHOU150 +#if DN100 || MUNICH || FUZHOU_150 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 @@ -344,11 +344,11 @@ namespace TBF.BenchControl.Elde // stopDevs)); -#if FUZHOU300 +#if FUZHOU_300 /// /// The following code deals with the situation that all FM controlled pumps share bit #39. /// In settings the bits of pumps should be sent as follows: P1=50, P2=51, P3=52, P4=53, P5=54 and P7=55 - /// (in FUZHOU300 the FM pump bit should be set set to value FMIndex+50). + /// (in FUZHOU_300 the FM pump bit should be set set to value FMIndex+50). /// bool bit39 = (route & 0x00FC000000000000) != 0; /// true if any of bits 50 through 55 is set route = route & 0xFF03FFFFFFFFFFFF; @@ -381,7 +381,7 @@ namespace TBF.BenchControl.Elde #if DN100 || MUNICH ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, (uint)totalRefPulses, (uint)testMethods, Convert.ToSingle(filterConstants[0]), fmFreq[0], (uint)regConst, (uint)shortImp, (uint)stopDevs); -#elif BADGER_MALA_TRAT || BADGER_VELKA_TRAT || FUZHOU_40 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || TORINO50 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 +#elif BADGER_MALA_TRAT || BADGER_VELKA_TRAT || FUZHOU_50 || FUZHOU_150 || FUZHOU_300 || PT200IL || PUCHONG_200 || TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40 ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, (uint)totalRefPulses, (uint)testMethods, Convert.ToSingle(filterConstants[0]), fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); #elif BERLIN || SLM_150 || PETERSBURG_200 @@ -392,7 +392,7 @@ namespace TBF.BenchControl.Elde uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses }; ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)(route & (UInt128)0xFFFFFFFFFFFFFFFF), (ulong)(route >> 64), pulsesArr, (uint)testMethods, filterConstants, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); -#elif JUZNA_AFRIKA_50 || ZAMBIA || SENTEC || FUZHOU100 || CEVAK_200 +#elif JUZNA_AFRIKA_50 || ZAMBIA || SENTEC || FUZHOU_100 || CEVAK_200 uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses }; ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, pulsesArr, (uint)testMethods, filterConstants, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); diff --git a/TBF/BenchControl/Elde/Diverter/Diverter.cs b/TBF/BenchControl/Elde/Diverter/Diverter.cs index 47a1ec102..2d35dca00 100644 --- a/TBF/BenchControl/Elde/Diverter/Diverter.cs +++ b/TBF/BenchControl/Elde/Diverter/Diverter.cs @@ -97,7 +97,7 @@ namespace TBF.BenchControl.Elde.Diverter { divNrFromName = nextIdx; } -#if GENESIS || PETERSBURG_50 || PETERSBURG_200 || FUZHOU_40 || FUZHOU150 || FUZHOU300 +#if GENESIS || PETERSBURG_50 || PETERSBURG_200 || FUZHOU_50 || FUZHOU_150 || FUZHOU_300 flowMtrNr4Cmd = divNrFromName + 1; #elif BADGER_STREDNA_TRAT flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : ((divNrFromName == 2) ? 9 : 20); diff --git a/TBF/BenchControl/StateMachine.cs b/TBF/BenchControl/StateMachine.cs index 1d85713a8..83501f9e7 100644 --- a/TBF/BenchControl/StateMachine.cs +++ b/TBF/BenchControl/StateMachine.cs @@ -190,11 +190,11 @@ namespace TBF.BenchControl /// Identifies the initial state #if DN100 public static void InitializeBoardEtc(ControlCom2VB.ControlCom2panel ctrlBrdComponent) -#elif MUNICH || FUZHOU150 +#elif MUNICH || FUZHOU_150 public static void InitializeBoardEtc(ControlComponent3Munich.UserControl1 ctrlBrdComponent) -#elif FUZHOU300 +#elif FUZHOU_300 public static void InitializeBoardEtc(ControlComponent3F300.UserControl1 ctrlBrdComponent) -#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 +#elif PT200IL || PUCHONG_200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 public static void InitializeBoardEtc(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent) #else /// all newer benches public static void InitializeBoardEtc(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent) diff --git a/TBF/BenchControl/TestBenchSim.cs b/TBF/BenchControl/TestBenchSim.cs index 9789b594f..688743a51 100644 --- a/TBF/BenchControl/TestBenchSim.cs +++ b/TBF/BenchControl/TestBenchSim.cs @@ -123,7 +123,7 @@ namespace TBF.BenchControl const ulong Path3 = VZ1 | VL11 | VL12 | VI31 | VI32; const ulong Path4 = VZ1 | VL11 | VL12 | VI41 | VI42; const ulong Path5 = VZ1 | VL11 | VL12 | VI41 | VI43; -#elif FUZHOU150 +#elif FUZHOU_150 const ulong VL11 = (1L << 2); const ulong VL13 = (1L << 3); const ulong VL4 = (1L << 4); @@ -171,7 +171,7 @@ namespace TBF.BenchControl const ulong Path3 = VL12 | VI31 | VI32; const ulong Path4 = VL12 | VI41 | VI42; const ulong Path5 = VL12 | VI41 | VI43; -#elif FUZHOU300 +#elif FUZHOU_300 const ulong VL11 = (1L << 2); const ulong VL13 = (1L << 3); const ulong VL4 = (1L << 4); @@ -219,7 +219,7 @@ namespace TBF.BenchControl const ulong Path3 = VL12 | VI31 | VI32; const ulong Path4 = VL12 | VI41 | VI42; const ulong Path5 = VL12 | VI41 | VI43; -#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN +#elif PT200IL || PUCHONG_200 || GENESIS || BERLIN const ulong VM11 = (1L << 4); const ulong VM12 = (1L << 5); const ulong VM21 = (1L << 6); @@ -314,7 +314,7 @@ namespace TBF.BenchControl const ulong Path3 = VI33; const ulong Path4 = VI34; const ulong Path5 = 0; -#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || SLM_50 || MALTA_WSD25 +#elif CEVAK_40 || MURES_40 || FUZHOU_50 || SLM_50 || MALTA_WSD25 const ulong VL11 = (1L << 0); const ulong VL13 = (1L << 1); const ulong VL18 = (1L << 2); @@ -350,7 +350,7 @@ namespace TBF.BenchControl const ulong Path3 = VI3; const ulong Path4 = 0; const ulong Path5 = 0; -#elif TORINO50 +#elif TORINO_50 const ulong nic1 = (1L << 0); const ulong nic2 = (1L << 1); const ulong VL11 = (1L << 2); @@ -388,7 +388,7 @@ namespace TBF.BenchControl const ulong Path3 = VI3; const ulong Path4 = VI4; const ulong Path5 = 0; -#elif TORUN_PT50_2015 || TURA_IPERL +#elif TORUN_50 || TURA_IPERL const ulong VL11 = (1L << 0); const ulong VL13 = (1L << 1); const ulong VL15 = (1L << 2); @@ -505,7 +505,7 @@ namespace TBF.BenchControl if (Div2sim && (SimRoute & Path3) == Path3) Mass2sim += DiffKg(Flow3sim, time); if (Div2sim && (SimRoute & Path4) == Path4) Mass2sim += DiffKg(Flow4sim, time); if (Div1sim && (SimRoute & Path5) == Path5) Mass1sim += DiffKg(Flow5sim, time); -#elif MUNICH || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || GENESIS || BERLIN +#elif MUNICH || FUZHOU_150 || FUZHOU_300 || PT200IL || PUCHONG_200 || GENESIS || BERLIN if (Div1sim && (SimRoute & Path1) == Path1) { float diff = DiffKg(Flow1sim, time); @@ -536,16 +536,16 @@ namespace TBF.BenchControl Mass2sim += diff; log.WarnFormat("Path5: Div3, Mass2 += {0}kg, flow={1}m3/h, Mass2={2}kg", diff, Flow1sim, Mass2sim); } -#elif BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || TORINO50 /// Path1,2 do WT1, Path3,4 do WT2 +#elif BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || TORINO_50 /// Path1,2 do WT1, Path3,4 do WT2 if (Div1sim && (SimRoute & Path1) == Path1) Mass1sim += DiffKg(Flow1sim, time); if (Div1sim && (SimRoute & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time); if (Div2sim && (SimRoute & Path3) == Path3) Mass2sim += DiffKg(Flow3sim, time); if (Div2sim && (SimRoute & Path4) == Path4) Mass2sim += DiffKg(Flow4sim, time); -#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || SLM_50 || MALTA_WSD25 /// Path1,2,3 do WT1 +#elif CEVAK_40 || MURES_40 || FUZHOU_50 || SLM_50 || MALTA_WSD25 /// Path1,2,3 do WT1 if (Div1sim && (SimRoute & Path1) == Path1) Mass1sim += DiffKg(Flow1sim, time); if (Div1sim && (SimRoute & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time); if (Div1sim && (SimRoute & Path3) == Path3) Mass1sim += DiffKg(Flow3sim, time); -#elif TORUN_PT50_2015 || TURA_IPERL /// Path1,2,3,4,5 do WT1, Path6 do WT2 +#elif TORUN_50 || TURA_IPERL /// Path1,2,3,4,5 do WT1, Path6 do WT2 if (Div1sim && (SimRoute & Path1) == Path1) Mass1sim += DiffKg(Flow1sim, time); if (Div1sim && (SimRoute & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time); if (Div1sim && (SimRoute & Path3) == Path3) Mass1sim += DiffKg(Flow3sim, time); @@ -636,7 +636,7 @@ namespace TBF.BenchControl if (toTank) { throw (new Exception()); } break; } -#elif MUNICH || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || GENESIS || BERLIN +#elif MUNICH || FUZHOU_150 || FUZHOU_300 || PT200IL || PUCHONG_200 || GENESIS || BERLIN switch (regulValveNo) { case 1: @@ -654,7 +654,7 @@ namespace TBF.BenchControl //if (toTank) { throw (new Exception()); } break; } -#elif BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TORINO50 +#elif BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TORINO_50 switch (regulValveNo) { case 1: @@ -683,7 +683,7 @@ namespace TBF.BenchControl if (toTank) { throw (new Exception()); } break; } -#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || SLM_50 || MALTA_WSD25 +#elif CEVAK_40 || MURES_40 || FUZHOU_50 || SLM_50 || MALTA_WSD25 switch (regulValveNo) { case 1: @@ -695,7 +695,7 @@ namespace TBF.BenchControl if (toTank) { /* throw (new Exception()); */ } break; } -#elif TORUN_PT50_2015 || TURA_IPERL +#elif TORUN_50 || TURA_IPERL switch (regulValveNo) { case 1: diff --git a/TBF/Forms/PrintOrderForm.cs b/TBF/Forms/PrintOrderForm.cs index 61c90fae0..b42d406db 100644 --- a/TBF/Forms/PrintOrderForm.cs +++ b/TBF/Forms/PrintOrderForm.cs @@ -97,7 +97,7 @@ namespace TBF.Forms ref Program.LocalSettings.TesterHistory); bool b2 = Program.LocalSettings.UpdateHistory(purchaseOrderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory -#if FUZHOU150 || FUZHOU300 +#if FUZHOU_150 || FUZHOU_300 , 20 #endif ); diff --git a/TBF/MainWnd.Designer.cs b/TBF/MainWnd.Designer.cs index d5163fd13..8be5ddb52 100644 --- a/TBF/MainWnd.Designer.cs +++ b/TBF/MainWnd.Designer.cs @@ -667,19 +667,19 @@ namespace TBF #if DN100 private ControlCom2VB.ControlCom2panel ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; -#elif MUNICH || FUZHOU150 +#elif MUNICH || FUZHOU_150 private ControlComponent3Munich.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; -#elif FUZHOU300 +#elif FUZHOU_300 private ControlComponent3F300.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; -#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 +#elif PT200IL || PUCHONG_200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; #elif TURA_SPECIAL || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || SLM_END || WARSAW_END || RUM_MOB || SENTEC || CEVAK_200 private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; -#elif TORINO50 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || MALTA_WSD25 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA || FUZHOU100 || DUBAJ_50 +#elif TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || MALTA_WSD25 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA || FUZHOU_100 || DUBAJ_50 private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl24 processTabPageCtrl; #elif TURA_IPERL diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 84ef4aa19..ddf35e05b 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.18.994.0")] -[assembly: AssemblyFileVersion("2.18.994.0")] +[assembly: AssemblyVersion("2.18.995.0")] +[assembly: AssemblyFileVersion("2.18.995.0")]