diff --git a/TestBenchFramework/BenchControl/Elde/Common.cs b/TestBenchFramework/BenchControl/Elde/Common.cs index d8fa70c90..c3a2506eb 100644 --- a/TestBenchFramework/BenchControl/Elde/Common.cs +++ b/TestBenchFramework/BenchControl/Elde/Common.cs @@ -41,7 +41,7 @@ namespace TBF.BenchControl.Elde ErrorPressMeter3 = 0x4000000000000, ErrorPressMeter4 = 0x8000000000000, } -#else // DN100, MUNICH, FUZHOU150, TORUN_PT50_2015 +#else // DN100 || MUNICH || FUZHOU150 || TORUN_PT50_2015 || CEVAK_PT40_272 public enum StatusP : ulong { RefFlowMeterMask = 0x7, diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs index f40f361cb..e2c9cb622 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs @@ -119,7 +119,7 @@ namespace TBF.BenchControl.Elde // Array length is the reference flowmeters count plus one #if DN100 public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 }; -#elif MUNICH || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015 +#elif MUNICH || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 }; #elif FUZHOU150 || FUZHOU300 || PT200IL public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 }; @@ -216,7 +216,7 @@ namespace TBF.BenchControl.Elde ControlComponent_Torino2015.UserControl1 ctrlBrdComponent, #elif BADGER_MALA_TRAT ControlComponent_Torino2015.UserControl1 ctrlBrdComponent, -#elif TORUN_PT50_2015 +#elif TORUN_PT50_2015 || CEVAK_PT40_272 ControlComponent_Torino2015.UserControl1 ctrlBrdComponent, #endif ulong valvesToInvert, diff --git a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs index 166b0bcce..b24c92d32 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs @@ -14,7 +14,7 @@ namespace TBF.BenchControl.Elde /// Properties /// public StatusP StatusP { get { return (StatusP)ctrlBrdComponent.StatusP; } } -#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015 +#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 /// /// In case of I11, I12 /// referenceFreq[0] = I11 + I12 @@ -43,7 +43,7 @@ namespace TBF.BenchControl.Elde public ulong RRoute { get { return ctrlBrdComponent.rRoute; } } public uint DivTime { get { return ctrlBrdComponent.divTime; } } public float TTime { get { return ctrlBrdComponent.Ttime; } } -#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015 +#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 public uint FmState { get { return ctrlBrdComponent.fMState[0]; } } /// TODO: index #else public uint FmState { get { return ctrlBrdComponent.fMState; } } @@ -86,7 +86,7 @@ namespace TBF.BenchControl.Elde private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; #elif BADGER_MALA_TRAT private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; -#elif TORUN_PT50_2015 +#elif TORUN_PT50_2015 || CEVAK_PT40_272 private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; #endif @@ -108,7 +108,7 @@ namespace TBF.BenchControl.Elde public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent) #elif BADGER_MALA_TRAT public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent) -#elif TORUN_PT50_2015 +#elif TORUN_PT50_2015 || CEVAK_PT40_272 public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent) #endif { @@ -204,7 +204,7 @@ namespace TBF.BenchControl.Elde // valveValue[0], // valveValue[1])); log.InfoFormat("ValveMove(#={0}, md={1}, [{2}, {3}])", valveNo, valveMode, valveValue[0], valveValue[1]); -#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015 +#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue, stableTime); #else ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue); diff --git a/TestBenchFramework/BenchControl/StateMachine.cs b/TestBenchFramework/BenchControl/StateMachine.cs index 4cffcddaf..0fc7d2193 100644 --- a/TestBenchFramework/BenchControl/StateMachine.cs +++ b/TestBenchFramework/BenchControl/StateMachine.cs @@ -194,7 +194,7 @@ namespace TBF.BenchControl public static void InitializeBoardEtc(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent) #elif BADGER_MALA_TRAT public static void InitializeBoardEtc(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent) -#elif TORUN_PT50_2015 +#elif TORUN_PT50_2015 || CEVAK_PT40_272 public static void InitializeBoardEtc(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent) #endif { diff --git a/TestBenchFramework/MainWnd.Designer.cs b/TestBenchFramework/MainWnd.Designer.cs index 27cffc53b..946f38bd3 100644 --- a/TestBenchFramework/MainWnd.Designer.cs +++ b/TestBenchFramework/MainWnd.Designer.cs @@ -589,6 +589,8 @@ namespace TBF private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; #elif TORUN_PT50_2015 private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; +#elif CEVAK_PT40_272 + private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; #endif private System.Windows.Forms.ToolStripMenuItem benchTSMenuItem; diff --git a/TestBenchFramework/Program.cs b/TestBenchFramework/Program.cs index a4f0dbb49..6dd936507 100644 --- a/TestBenchFramework/Program.cs +++ b/TestBenchFramework/Program.cs @@ -42,7 +42,7 @@ namespace TBF #elif FUZHOU300 || FUZHOU150 || PT200IL || TORINO50 || BADGER_MALA_TRAT public const int WMsCount = 6; public const int LineSize = 6; -#elif TORUN_PT50_2015 +#elif TORUN_PT50_2015 || CEVAK_PT40_272 public const int WMsCount = 20; public const int LineSize = 10; #endif diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 57b6a1596..d2c6429a6 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1.5.57.1")] -[assembly: AssemblyFileVersion("1.5.57.1")] +[assembly: AssemblyVersion("1.5.58.1")] +[assembly: AssemblyFileVersion("1.5.58.1")] diff --git a/packages/ControlBoard/CEVAK-PT40-272/ControlComponent3U.dll b/packages/ControlBoard/CEVAK-PT40-272/ControlComponent3U.dll new file mode 100644 index 000000000..bbd37db15 Binary files /dev/null and b/packages/ControlBoard/CEVAK-PT40-272/ControlComponent3U.dll differ