diff --git a/Config/Data.cs b/Config/Data.cs index a91fb5540..997d474e5 100644 --- a/Config/Data.cs +++ b/Config/Data.cs @@ -14,7 +14,7 @@ namespace Config public const int CompoundWMsCount = 1; public const int HeatMetersCount = 0; public const int MaxPartNr = 3; -#elif DN100 || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT +#elif DN100 || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || CEVAK_200 public const int WMsCount = 3; public const int LineSize = 3; public const int CompoundWMsCount = 1; @@ -26,6 +26,12 @@ namespace Config public const int CompoundWMsCount = 3; public const int HeatMetersCount = 0; public const int MaxPartNr = 3; +#elif DUBAJ_50 + public const int WMsCount = 10; + public const int LineSize = 5; + public const int CompoundWMsCount = 0; + public const int HeatMetersCount = 0; + public const int MaxPartNr = WMsCount / LineSize; #elif FUZHOU100 public const int WMsCount = 10; public const int LineSize = 10; diff --git a/Results/Utils.cs b/Results/Utils.cs index 35855a215..8550046ea 100644 --- a/Results/Utils.cs +++ b/Results/Utils.cs @@ -56,7 +56,7 @@ namespace Results { #if PUCHONG_PT200 return (useRedGreenColor) ? (passed ? "OK|Green" : "NG|Red") : (passed ? "OK|White" : "NG|White"); -#elif BAHRAIN_50 +#elif BAHRAIN_50 || DUBAJ_50 return (useRedGreenColor) ? (passed ? "PASSED|Green" : "FAILED|Red") : (passed ? "PASSED|White" : "FAILED|White"); #elif LANG_PL return (useRedGreenColor) ? (passed ? "+|Green" : "-|Red") : (passed ? "+|White" : "-|White"); diff --git a/TBF/BenchControl/Elde/Common.cs b/TBF/BenchControl/Elde/Common.cs index fd8b563c0..9e7fac6c9 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 +#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 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 e52a7b6f3..d9cde5dab 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 +#if DN100 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || 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 +#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 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 }; @@ -280,7 +280,7 @@ namespace TBF.BenchControl.Elde ControlComponent3Munich.UserControl1 ctrlBrdComponent, #elif FUZHOU300 ControlComponent3F300.UserControl1 ctrlBrdComponent, -#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 +#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 || CEVAK_200 ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent, #else /// all newer benches ControlComponent_Torino2015.UserControl1 ctrlBrdComponent, diff --git a/TBF/BenchControl/Elde/ControlComWrap.cs b/TBF/BenchControl/Elde/ControlComWrap.cs index dda8a650d..a6b5fb36e 100644 --- a/TBF/BenchControl/Elde/ControlComWrap.cs +++ b/TBF/BenchControl/Elde/ControlComWrap.cs @@ -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 +#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 public int EtPulsesK { get { return (int)ctrlBrdComponent.etPulsesK; } } #else public int EtPulsesK { get { return 1; } } @@ -53,7 +53,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 +#if GENESIS || KEMPNO_50 || KRAKOW_50 || BAHRAIN_50 || BADGER_STREDNA_TRAT || JUZNA_AFRIKA_50 || ZAMBIA || SENTEC || FUZHOU100 || DUBAJ_50 public uint DivTime(int id) { return ctrlBrdComponent.divTime[id]; } public void SetDivLimit(int divNo, uint limLoPct, uint limHiPct) { @@ -149,7 +149,7 @@ namespace TBF.BenchControl.Elde private ControlComponent3Munich.UserControl1 ctrlBrdComponent; #elif FUZHOU300 private ControlComponent3F300.UserControl1 ctrlBrdComponent; -#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 +#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 || CEVAK_200 private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent; #else /// newer benches private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; @@ -165,7 +165,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 || PETERSBURG_200 +#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 || CEVAK_200 public ControlComWrap(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent) #else /// all newer benches public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent) @@ -216,12 +216,12 @@ 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 || PETERSBURG_200 +#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 || CEVAK_200 log.FatalFormat("Component: {0}", ControlComponent_Izrael2014.UserControl1.ProgVersion); #else /// newer benches log.FatalFormat("Component: {0}", ControlComponent_Torino2015.UserControl1.ProgVersion); #endif - log.Fatal("SendCalibData(...)"); + log.Fatal("SendCalibData(...)"); for (int i = 0; i < rvCalib.GetLength(0); i++) for (int j = 0; j < rvCalib.GetLength(1); j++) log.FatalFormat(" rvCalib[{0},{1}] = {2}", i, j, rvCalib[i,j]); @@ -375,7 +375,7 @@ namespace TBF.BenchControl.Elde #elif BADGER_MALA_TRAT || BADGER_VELKA_TRAT || FUZHOU_40 || 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, Convert.ToSingle(filterConstants[0]), fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); -#elif GENESIS || BERLIN || SLM_150 || PETERSBURG_200 +#elif GENESIS || BERLIN || SLM_150 || PETERSBURG_200 || CEVAK_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, Convert.ToSingle(filterConstants[0]), fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); @@ -383,7 +383,7 @@ namespace TBF.BenchControl.Elde 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); -#else /// if TURA_IPERL || TURA_SPECIAL || MALTA_WSD25 || SLM_50 || SLM_END || WARSAW_END || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || BADGER_STREDNA_TRAT +#else /// if TURA_IPERL || TURA_SPECIAL || MALTA_WSD25 || SLM_50 || SLM_END || WARSAW_END || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || BADGER_STREDNA_TRAT || DUBAJ_50 uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses }; ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, pulsesArr, (uint)testMethods, Convert.ToSingle(filterConstants[0]), fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); diff --git a/TBF/BenchControl/StateMachine.cs b/TBF/BenchControl/StateMachine.cs index b804119e3..9e1c21e78 100644 --- a/TBF/BenchControl/StateMachine.cs +++ b/TBF/BenchControl/StateMachine.cs @@ -194,7 +194,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 || PETERSBURG_200 +#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 || CEVAK_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/MainWnd.Designer.cs b/TBF/MainWnd.Designer.cs index eb32e1b2c..986ada4a9 100644 --- a/TBF/MainWnd.Designer.cs +++ b/TBF/MainWnd.Designer.cs @@ -672,13 +672,13 @@ namespace TBF #elif FUZHOU300 private ControlComponent3F300.UserControl1 ctrlBrdComponent; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; -#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 +#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 || CEVAK_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 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 +#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 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 48f5661a1..a66475de2 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.969.0")] -[assembly: AssemblyFileVersion("2.18.969.0")] +[assembly: AssemblyVersion("2.18.970.0")] +[assembly: AssemblyFileVersion("2.18.970.0")] diff --git a/packages/ControlBoard/CEVAK-200/ControlComponent3U.dll b/packages/ControlBoard/CEVAK-200/ControlComponent3U.dll new file mode 100644 index 000000000..bd8ff455b Binary files /dev/null and b/packages/ControlBoard/CEVAK-200/ControlComponent3U.dll differ diff --git a/packages/ControlBoard/Dubaj50/ControlComponent3U.dll b/packages/ControlBoard/Dubaj50/ControlComponent3U.dll new file mode 100644 index 000000000..e879936be Binary files /dev/null and b/packages/ControlBoard/Dubaj50/ControlComponent3U.dll differ