michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SLM_PT150, PETERBURG_50, PETERBURG_200 symbols, components added, ver. 2.13.557

Browse Source
This commit is contained in:
Milan Hanajik 2017-05-11 15:37:48 +02:00
parent 6cace280c9
commit 4c1daf55f2
10 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Config/Data.cs
View File

@ -20,13 +20,13 @@ namespace Config
public const int CompoundWMsCount = 1; public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0; public const int HeatMetersCount = 0;
public const int MaxPartNr = WMsCount / LineSize; public const int MaxPartNr = WMsCount / LineSize;
#elif FUZHOU300 || FUZHOU150 || PT200IL || PUCHONG_PT200 || GENESIS || BERLIN #elif FUZHOU300 || FUZHOU150 || PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERBURG_200
public const int WMsCount = 6; public const int WMsCount = 6;
public const int LineSize = 6; public const int LineSize = 6;
public const int CompoundWMsCount = 3; public const int CompoundWMsCount = 3;
public const int HeatMetersCount = 0; public const int HeatMetersCount = 0;
public const int MaxPartNr = 3; public const int MaxPartNr = 3;
#elif TORINO50 || BADGER_MALA_TRAT #elif TORINO50 || BADGER_MALA_TRAT || PETERBURG_50
public const int WMsCount = 6; public const int WMsCount = 6;
public const int LineSize = 6; public const int LineSize = 6;
public const int CompoundWMsCount = 1; public const int CompoundWMsCount = 1;

2
TestBenchFramework/BenchControl/Elde/Common.cs
View File

@ -19,7 +19,7 @@ namespace TBF.BenchControl.Elde
EnduranceCycleStop = 13, 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 #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
public enum StatusP : ulong public enum StatusP : ulong
{ {
RefFlowMeterMask = 0x7, RefFlowMeterMask = 0x7,

6
TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
View File

@ -129,7 +129,7 @@ namespace TBF.BenchControl.Elde
#elif GENESIS || BERLIN #elif GENESIS || BERLIN
public byte[] MeretRS485Address = new byte[4]; public byte[] MeretRS485Address = new byte[4];
public float[] EtCalib = new float[7] { 1, 1, 1, 1, 1, 1, 1 }; 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 #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 || PETERBURG_200
public byte[] MeretRS485Address = new byte[4]; public byte[] MeretRS485Address = new byte[4];
public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 }; public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 };
#elif SLM_END || WARSAW_END #elif SLM_END || WARSAW_END
@ -265,8 +265,8 @@ namespace TBF.BenchControl.Elde
ControlComponent3Munich.UserControl1 ctrlBrdComponent, ControlComponent3Munich.UserControl1 ctrlBrdComponent,
#elif FUZHOU300 #elif FUZHOU300
ControlComponent3F300.UserControl1 ctrlBrdComponent, ControlComponent3F300.UserControl1 ctrlBrdComponent,
#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN #elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERBURG_200
ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent, ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent,
#else /// all newer benches #else /// all newer benches
ControlComponent_Torino2015.UserControl1 ctrlBrdComponent, ControlComponent_Torino2015.UserControl1 ctrlBrdComponent,
#endif #endif

20
TestBenchFramework/BenchControl/Elde/ControlComWrap.cs
View File

@ -32,7 +32,7 @@ namespace TBF.BenchControl.Elde
public float ReferenceFreq { get { return 1000.0f * ctrlBrdComponent.referenceFreq[0]; } } /// In [Hz] 0..2500, nom.=2000 public float ReferenceFreq { get { return 1000.0f * ctrlBrdComponent.referenceFreq[0]; } } /// In [Hz] 0..2500, nom.=2000
#endif #endif
public int EtPulses(int wmNr0) { return (int)ctrlBrdComponent.etPulses[wmNr0]; } public int EtPulses(int wmNr0) { return (int)ctrlBrdComponent.etPulses[wmNr0]; }
#if FUZHOU300 || PT200IL || PUCHONG_PT200 || GENESIS || BERLIN #if FUZHOU300 || PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERBURG_50 || PETERBURG_200
public int EtPulses2 { get { return (int)ctrlBrdComponent.EtPulses2; } } public int EtPulses2 { get { return (int)ctrlBrdComponent.EtPulses2; } }
#else #else
public int EtPulses2 { get { return 0; } } public int EtPulses2 { get { return 0; } }
@ -71,7 +71,7 @@ namespace TBF.BenchControl.Elde
#if DN100 || MUNICH || BADGER_MALA_TRAT || BADGER_VELKA_TRAT || FUZHOU40 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || TORINO50 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 #if DN100 || MUNICH || BADGER_MALA_TRAT || BADGER_VELKA_TRAT || FUZHOU40 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || TORINO50 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40
public float TotalRefVolume { get { return ctrlBrdComponent.ReferenceVolume; } } public float TotalRefVolume { get { return ctrlBrdComponent.ReferenceVolume; } }
public float MassRefVolume { get { return ctrlBrdComponent.ReferenceVolume; } } public float MassRefVolume { get { return ctrlBrdComponent.ReferenceVolume; } }
#else #else /// all new test benches
public float TotalRefVolume { get { return ctrlBrdComponent.ReferenceVolume[0]; } } public float TotalRefVolume { get { return ctrlBrdComponent.ReferenceVolume[0]; } }
public float MassRefVolume { get { return ctrlBrdComponent.ReferenceVolume[1]; } } public float MassRefVolume { get { return ctrlBrdComponent.ReferenceVolume[1]; } }
#endif #endif
@ -106,8 +106,8 @@ namespace TBF.BenchControl.Elde
private ControlComponent3Munich.UserControl1 ctrlBrdComponent; private ControlComponent3Munich.UserControl1 ctrlBrdComponent;
#elif FUZHOU300 #elif FUZHOU300
private ControlComponent3F300.UserControl1 ctrlBrdComponent; private ControlComponent3F300.UserControl1 ctrlBrdComponent;
#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN #elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERBURG_200
private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent; private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent;
#else /// newer benches #else /// newer benches
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
#endif #endif
@ -122,8 +122,8 @@ namespace TBF.BenchControl.Elde
public ControlComWrap(ControlComponent3Munich.UserControl1 ctrlBrdComponent) public ControlComWrap(ControlComponent3Munich.UserControl1 ctrlBrdComponent)
#elif FUZHOU300 #elif FUZHOU300
public ControlComWrap(ControlComponent3F300.UserControl1 ctrlBrdComponent) public ControlComWrap(ControlComponent3F300.UserControl1 ctrlBrdComponent)
#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN #elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERBURG_200
public ControlComWrap(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent) public ControlComWrap(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent)
#else /// all newer benches #else /// all newer benches
public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent) public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
#endif #endif
@ -173,8 +173,8 @@ namespace TBF.BenchControl.Elde
log.FatalFormat("Component: {0}", ControlComponent3Munich.UserControl1.ProgVersion); log.FatalFormat("Component: {0}", ControlComponent3Munich.UserControl1.ProgVersion);
#elif FUZHOU300 #elif FUZHOU300
log.FatalFormat("Component: {0}", ControlComponent3F300.UserControl1.ProgVersion); log.FatalFormat("Component: {0}", ControlComponent3F300.UserControl1.ProgVersion);
#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN #elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERBURG_200
log.FatalFormat("Component: {0}", ControlComponent_Izrael2014.UserControl1.ProgVersion); log.FatalFormat("Component: {0}", ControlComponent_Izrael2014.UserControl1.ProgVersion);
#else /// newer benches #else /// newer benches
log.FatalFormat("Component: {0}", ControlComponent_Torino2015.UserControl1.ProgVersion); log.FatalFormat("Component: {0}", ControlComponent_Torino2015.UserControl1.ProgVersion);
#endif #endif
@ -327,11 +327,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 #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, ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, (uint)totalRefPulses, (uint)testMethods,
filterConstant, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); filterConstant, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs);
#elif GENESIS || BERLIN #elif GENESIS || BERLIN || SLM_150 || PETERBURG_200
uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses }; uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses };
ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)(route & (UInt128)0xFFFFFFFFFFFFFFFF), (ulong)(route >> 64), pulsesArr, (uint)testMethods, ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)(route & (UInt128)0xFFFFFFFFFFFFFFFF), (ulong)(route >> 64), pulsesArr, (uint)testMethods,
filterConstant, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); filterConstant, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs);
#else /// if TURA_IPERL || TURA_SPECIAL || MALTA_WSD25 || SLM_50 || SLM_END || WARSAW_END #else /// if TURA_IPERL || TURA_SPECIAL || MALTA_WSD25 || SLM_50 || SLM_END || WARSAW_END || PETERBURG_50
uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses }; uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses };
ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, pulsesArr, (uint)testMethods, ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, pulsesArr, (uint)testMethods,
filterConstant, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs); filterConstant, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs);

2
TestBenchFramework/BenchControl/StateMachine.cs
View File

@ -196,7 +196,7 @@ namespace TBF.BenchControl
public static void InitializeBoardEtc(ControlComponent3Munich.UserControl1 ctrlBrdComponent) public static void InitializeBoardEtc(ControlComponent3Munich.UserControl1 ctrlBrdComponent)
#elif FUZHOU300 #elif FUZHOU300
public static void InitializeBoardEtc(ControlComponent3F300.UserControl1 ctrlBrdComponent) public static void InitializeBoardEtc(ControlComponent3F300.UserControl1 ctrlBrdComponent)
#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN #elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERBURG_200
public static void InitializeBoardEtc(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent) public static void InitializeBoardEtc(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent)
#else /// all newer benches #else /// all newer benches
public static void InitializeBoardEtc(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent) public static void InitializeBoardEtc(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)

4
TestBenchFramework/MainWnd.Designer.cs generated
View File

@ -646,13 +646,13 @@ namespace TBF
#elif FUZHOU300 #elif FUZHOU300
private ControlComponent3F300.UserControl1 ctrlBrdComponent; private ControlComponent3F300.UserControl1 ctrlBrdComponent;
private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl;
#elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN #elif PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERBURG_200
private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent; private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent;
private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl;
#elif TORINO50 || BADGER_MALA_TRAT || BADGER_VELKA_TRAT || SLM_END || WARSAW_END #elif TORINO50 || BADGER_MALA_TRAT || BADGER_VELKA_TRAT || SLM_END || WARSAW_END
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl;
#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || MALTA_WSD25 || SLM_50 #elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || MALTA_WSD25 || SLM_50 || PETERBURG_50
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
private TBF.Screens.ProcessTabPageCtrl24 processTabPageCtrl; private TBF.Screens.ProcessTabPageCtrl24 processTabPageCtrl;
#elif TURA_IPERL #elif TURA_IPERL

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.13.555.1")] [assembly: AssemblyVersion("2.13.557.1")]
[assembly: AssemblyFileVersion("2.13.555.1")] [assembly: AssemblyFileVersion("2.13.557.1")]

BIN
packages/ControlBoard/Peterburg200/ControlComponent3U.dll Normal file
View File

Binary file not shown.

BIN
packages/ControlBoard/Peterburg50/ControlComponent3U.dll Normal file
View File

Binary file not shown.

BIN
packages/ControlBoard/SLM-PT150/ControlComponent3U.dll Normal file
View File

Binary file not shown.