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

Krakow component added, KRAKOW_50 symbol added, ver. 2.17.742

Browse Source
This commit is contained in:
Milan Hanajik 2017-11-21 15:02:47 +01:00
parent 93c6ba5e74
commit 0f9256325c
8 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Config/Data.cs
View File

@ -32,7 +32,7 @@ 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 = 1; public const int MaxPartNr = 1;
#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 #elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50
public const int WMsCount = 20; public const int WMsCount = 20;
public const int LineSize = 10; public const int LineSize = 10;
public const int CompoundWMsCount = 1; public const int CompoundWMsCount = 1;
@ -76,7 +76,7 @@ namespace Config
public const int MaxPartNr = WMsCount / LineSize; public const int MaxPartNr = WMsCount / LineSize;
#endif #endif
/// ///
/// Database related: This object reference is set after a successful user login /// Database related: This object reference is set after a successful user login
/// ///
public static DatabaseSettings CurrentBench; public static DatabaseSettings CurrentBench;

4
Config/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.17.736.0")] [assembly: AssemblyVersion("2.17.742.0")]
[assembly: AssemblyFileVersion("2.17.736.0")] [assembly: AssemblyFileVersion("2.17.742.0")]

4
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 || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB #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 || RUM_MOB || KRAKOW_50
public enum StatusP : ulong public enum StatusP : ulong
{ {
RefFlowMeterMask = 0x7, RefFlowMeterMask = 0x7,
@ -47,7 +47,7 @@ namespace TBF.BenchControl.Elde
EndurCycleRunning = 0x200000000000000, /// bit 57 EndurCycleRunning = 0x200000000000000, /// bit 57
} }
#else // DN100 || MUNICH || FUZHOU150 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 #else // DN100 || MUNICH || FUZHOU150 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40
public enum StatusP : ulong public enum StatusP : ulong
{ {
RefFlowMeterMask = 0x7, RefFlowMeterMask = 0x7,
TestInProgress = 0x8, TestInProgress = 0x8,

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

@ -135,8 +135,8 @@ namespace TBF.BenchControl.Elde
{100,500}, {100,500}, {100,500}, {100,500} }; {100,500}, {100,500}, {100,500}, {100,500} };
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 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB #elif MUNICH || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 || TURA_IPERL || TURA_SPECIAL || MURES_PT40 || FUZHOU_40 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_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 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 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

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

@ -32,10 +32,10 @@ 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 || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB #if FUZHOU300 || PT200IL || PUCHONG_PT200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50
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; } }
#endif #endif
public UInt16 WMeterPulses(int wmNr0) { return (UInt16)ctrlBrdComponent.wMeterPuls[wmNr0]; } public UInt16 WMeterPulses(int wmNr0) { return (UInt16)ctrlBrdComponent.wMeterPuls[wmNr0]; }
public int WMeterReference(int wmNr0) { return (int)ctrlBrdComponent.wMeterReference[wmNr0]; } public int WMeterReference(int wmNr0) { return (int)ctrlBrdComponent.wMeterReference[wmNr0]; }
@ -49,7 +49,7 @@ namespace TBF.BenchControl.Elde
public UInt128 RRoute { get { return ctrlBrdComponent.rRoute; } } public UInt128 RRoute { get { return ctrlBrdComponent.rRoute; } }
#endif #endif
#if KEMPNO_50 #if KEMPNO_50 || KRAKOW_50
public uint DivTime(int id) { return ctrlBrdComponent.divTime[id]; } public uint DivTime(int id) { return ctrlBrdComponent.divTime[id]; }
public void SetDivLimit(int divNo, uint limLoPct, uint limHiPct) public void SetDivLimit(int divNo, uint limLoPct, uint limHiPct)
{ {
@ -96,8 +96,8 @@ namespace TBF.BenchControl.Elde
public uint[] WMeterCont { get { return new uint[3]; } } /// Dummy public uint[] WMeterCont { get { return new uint[3]; } } /// Dummy
#endif #endif
#if KEMPNO_50 #if KEMPNO_50 || KRAKOW_50
public float ValveOpenCloseTime { get { return ctrlBrdComponent.ValveMoveTime[0]; } } public float ValveOpenCloseTime { get { return ctrlBrdComponent.ValveMoveTime[0]; } }
#else #else
public float ValveOpenCloseTime { get { return 0.001f; } } public float ValveOpenCloseTime { get { return 0.001f; } }
#endif #endif
@ -365,12 +365,12 @@ namespace TBF.BenchControl.Elde
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 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB #else /// if TURA_IPERL || TURA_SPECIAL || MALTA_WSD25 || SLM_50 || SLM_END || WARSAW_END || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_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);
#endif #endif
log.InfoFormat("DoSendCommand() Route = {0}", Utils.RouteToStr(route)); log.InfoFormat("DoSendCommand() Route = {0}", Utils.RouteToStr(route));
if (lastRoute != route) /// This is to update the MainWnd status bar on changes only if (lastRoute != route) /// This is to update the MainWnd status bar on changes only
{ {

4
TestBenchFramework/MainWnd.Designer.cs generated
View File

@ -678,7 +678,7 @@ namespace TBF
#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 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB #elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || MALTA_WSD25 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_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
@ -689,7 +689,7 @@ namespace TBF
private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl;
#endif #endif
private System.Windows.Forms.ToolStripMenuItem benchTSMenuItem; private System.Windows.Forms.ToolStripMenuItem benchTSMenuItem;
private System.Windows.Forms.ToolStripMenuItem homeTSMenuItem; private System.Windows.Forms.ToolStripMenuItem homeTSMenuItem;
private System.Windows.Forms.ToolStripMenuItem resultsTSMenuItem; private System.Windows.Forms.ToolStripMenuItem resultsTSMenuItem;
private System.Windows.Forms.ToolStripMenuItem logsTSMenuItem; private System.Windows.Forms.ToolStripMenuItem logsTSMenuItem;

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

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

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

Binary file not shown.