From 218a14acca6fee9abac7f6e8138ed4f2d9bf97fd Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 19 Jul 2017 11:16:47 +0300 Subject: [PATCH] PETERBURG_xy -> PETERSBURG_xy --- Config/Data.cs | 4 ++-- TestBenchFramework/BenchControl/Elde/Common.cs | 2 +- .../BenchControl/Elde/ControlBoardDev.cs | 6 +++--- .../BenchControl/Elde/ControlComWrap.cs | 12 ++++++------ TestBenchFramework/BenchControl/StateMachine.cs | 2 +- TestBenchFramework/MainWnd.Designer.cs | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Config/Data.cs b/Config/Data.cs index 4e9f1981f..259963b36 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 || PETERBURG_200 +#elif FUZHOU300 || FUZHOU150 || PT200IL || PUCHONG_PT200 || GENESIS || SLM_150 || PETERSBURG_200 public const int WMsCount = 6; public const int LineSize = 6; public const int CompoundWMsCount = 3; @@ -32,7 +32,7 @@ namespace Config 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 || PETERBURG_50 || KEMPNO_50 || BAHRAIN_50 +#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 public const int WMsCount = 20; public const int LineSize = 10; public const int CompoundWMsCount = 1; diff --git a/TestBenchFramework/BenchControl/Elde/Common.cs b/TestBenchFramework/BenchControl/Elde/Common.cs index 087a15f01..636d22214 100644 --- a/TestBenchFramework/BenchControl/Elde/Common.cs +++ b/TestBenchFramework/BenchControl/Elde/Common.cs @@ -19,7 +19,7 @@ namespace TBF.BenchControl.Elde EnduranceCycleStop = 13, } -#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || TURA_IPERL || TURA_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_PT200 || SLM_50 || GENESIS || MALTA_WSD25 || SLM_END || WARSAW_END || BERLIN || SLM_150 || PETERBURG_50 || PETERBURG_200 || KEMPNO_50 || BAHRAIN_50 +#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_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 public enum StatusP : ulong { RefFlowMeterMask = 0x7, diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs index dd071e536..6b7da99e9 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs @@ -123,13 +123,13 @@ namespace TBF.BenchControl.Elde public float[,] TempCalibData = new float[8, 5]; // Array length is the reference flowmeters count plus one -#if DN100 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || PETERBURG_200 +#if DN100 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || PETERSBURG_200 public byte[] MeretRS485Address = new byte[4]; public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 }; #elif GENESIS || BERLIN 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 || TORUN_PT50_2015 || CEVAK_PT40_272 || TURA_IPERL || TURA_SPECIAL || MURES_PT40 || FUZHOU_40 || SLM_50 || SLM_150 || PETERBURG_50 || KEMPNO_50 || BAHRAIN_50 +#elif MUNICH || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 || TURA_IPERL || TURA_SPECIAL || MURES_PT40 || FUZHOU_40 || SLM_50 || SLM_150 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 public byte[] MeretRS485Address = new byte[4]; public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 }; #elif SLM_END || WARSAW_END @@ -269,7 +269,7 @@ namespace TBF.BenchControl.Elde ControlComponent3Munich.UserControl1 ctrlBrdComponent, #elif FUZHOU300 ControlComponent3F300.UserControl1 ctrlBrdComponent, -#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERBURG_200 +#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent, #else /// all newer benches ControlComponent_Torino2015.UserControl1 ctrlBrdComponent, diff --git a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs index 27618f26e..52f467a3b 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs @@ -32,7 +32,7 @@ namespace TBF.BenchControl.Elde public float ReferenceFreq { get { return 1000.0f * ctrlBrdComponent.referenceFreq[0]; } } /// In [Hz] 0..2500, nom.=2000 #endif public int EtPulses(int wmNr0) { return (int)ctrlBrdComponent.etPulses[wmNr0]; } -#if FUZHOU300 || PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERBURG_50 || PETERBURG_200 || KEMPNO_50 || BAHRAIN_50 +#if FUZHOU300 || PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || KEMPNO_50 || BAHRAIN_50 public int EtPulses2 { get { return (int)ctrlBrdComponent.EtPulses2; } } #else public int EtPulses2 { get { return 0; } } @@ -113,7 +113,7 @@ namespace TBF.BenchControl.Elde private ControlComponent3Munich.UserControl1 ctrlBrdComponent; #elif FUZHOU300 private ControlComponent3F300.UserControl1 ctrlBrdComponent; -#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERBURG_200 +#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent; #else /// newer benches private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; @@ -129,7 +129,7 @@ namespace TBF.BenchControl.Elde public ControlComWrap(ControlComponent3Munich.UserControl1 ctrlBrdComponent) #elif FUZHOU300 public ControlComWrap(ControlComponent3F300.UserControl1 ctrlBrdComponent) -#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERBURG_200 +#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 public ControlComWrap(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent) #else /// all newer benches public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent) @@ -180,7 +180,7 @@ namespace TBF.BenchControl.Elde log.FatalFormat("Component: {0}", ControlComponent3Munich.UserControl1.ProgVersion); #elif FUZHOU300 log.FatalFormat("Component: {0}", ControlComponent3F300.UserControl1.ProgVersion); -#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERBURG_200 +#elif PT200IL || PUCHONG_PT200 || 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); @@ -334,11 +334,11 @@ namespace TBF.BenchControl.Elde #elif BADGER_MALA_TRAT || BADGER_VELKA_TRAT || FUZHOU40 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || TORINO50 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, (uint)totalRefPulses, (uint)testMethods, filterConstant, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); -#elif GENESIS || BERLIN || SLM_150 || PETERBURG_200 +#elif GENESIS || BERLIN || SLM_150 || PETERSBURG_200 uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses }; ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)(route & (UInt128)0xFFFFFFFFFFFFFFFF), (ulong)(route >> 64), pulsesArr, (uint)testMethods, filterConstant, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); -#else /// if TURA_IPERL || TURA_SPECIAL || MALTA_WSD25 || SLM_50 || SLM_END || WARSAW_END || PETERBURG_50 || KEMPNO_50 || BAHRAIN_50 +#else /// if TURA_IPERL || TURA_SPECIAL || MALTA_WSD25 || SLM_50 || SLM_END || WARSAW_END || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses }; ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, pulsesArr, (uint)testMethods, filterConstant, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); diff --git a/TestBenchFramework/BenchControl/StateMachine.cs b/TestBenchFramework/BenchControl/StateMachine.cs index e3c465322..d33b617d5 100644 --- a/TestBenchFramework/BenchControl/StateMachine.cs +++ b/TestBenchFramework/BenchControl/StateMachine.cs @@ -196,7 +196,7 @@ namespace TBF.BenchControl public static void InitializeBoardEtc(ControlComponent3Munich.UserControl1 ctrlBrdComponent) #elif FUZHOU300 public static void InitializeBoardEtc(ControlComponent3F300.UserControl1 ctrlBrdComponent) -#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERBURG_200 +#elif PT200IL || PUCHONG_PT200 || 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/TestBenchFramework/MainWnd.Designer.cs b/TestBenchFramework/MainWnd.Designer.cs index c58b7f0f3..db99f93ab 100644 --- a/TestBenchFramework/MainWnd.Designer.cs +++ b/TestBenchFramework/MainWnd.Designer.cs @@ -646,13 +646,13 @@ namespace TBF #elif FUZHOU300 private ControlComponent3F300.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; -#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERBURG_200 +#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; #elif TORINO50 || BADGER_MALA_TRAT || BADGER_VELKA_TRAT || SLM_END || WARSAW_END private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; -#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || MALTA_WSD25 || SLM_50 || PETERBURG_50 || KEMPNO_50 || BAHRAIN_50 +#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || MALTA_WSD25 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl24 processTabPageCtrl; #elif TURA_IPERL