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

ROMA_200 : Component added, symbol processing added, ver. 2.24.1359

Browse Source
This commit is contained in:
Milan Hanajik
2019-11-07 14:45:09 +01:00
parent b3fdb11b81
commit 708610b8ab
11 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Config/Data.cs
+1 -1
View File
@@ -32,7 +32,7 @@ namespace Config
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 DEWA_300 #elif DEWA_300 || ROMA_200
public const int WMsCount = 10; public const int WMsCount = 10;
public const int LineSize = 10; public const int LineSize = 10;
public const int CompoundWMsCount = 3; public const int CompoundWMsCount = 3;
Config/Properties/AssemblyInfo.cs
+2 -2
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.24.1315.0")] [assembly: AssemblyVersion("2.24.1359.0")]
[assembly: AssemblyFileVersion("2.24.1315.0")] [assembly: AssemblyFileVersion("2.24.1359.0")]
Results/Properties/AssemblyInfo.cs
+2 -2
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.24.1315.0")] [assembly: AssemblyVersion("2.24.1359.0")]
[assembly: AssemblyFileVersion("2.24.1315.0")] [assembly: AssemblyFileVersion("2.24.1359.0")]
TBF/BenchControl/Elde/Common.cs
+1 -1
View File
@@ -19,7 +19,7 @@ namespace TBF.BenchControl.Elde
EnduranceCycleStop = 13, EnduranceCycleStop = 13,
} }
#if FUZHOU_300 || IZRAEL_200 || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_200 || SLM_50 || GENESIS || MALTA_WSD25 || SLM_END || WARSAW_END || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || DEWA_300 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 #if FUZHOU_300 || IZRAEL_200 || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_200 || SLM_50 || GENESIS || MALTA_WSD25 || SLM_END || WARSAW_END || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || DEWA_300 || ROMA_200 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50
public enum StatusP : ulong public enum StatusP : ulong
{ {
RefFlowMeterMask = 0x7, /// bits 0,1,2 RefFlowMeterMask = 0x7, /// bits 0,1,2
TBF/BenchControl/Elde/ControlBoardDev.cs
+2 -2
View File
@@ -101,7 +101,7 @@ namespace TBF.BenchControl.Elde
/// Initialization data updated by constructors of children components /// Initialization data updated by constructors of children components
/// and sent to 'controlCom2panel' by SendCalibData() method. /// and sent to 'controlCom2panel' by SendCalibData() method.
/// ///
#if DEWA_300 #if DEWA_300 || ROMA_200
public float[,] TempCalibData = new float[16, 5]; public float[,] TempCalibData = new float[16, 5];
#else #else
public float[,] TempCalibData = new float[8, 5]; public float[,] TempCalibData = new float[8, 5];
@@ -121,7 +121,7 @@ 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 DEWA_300 #elif DEWA_300 || ROMA_200
public uint[,] RegValveCalib = new uint[16, 2] { {100,500}, {100,500}, {100,500}, {100,500}, public uint[,] RegValveCalib = new uint[16, 2] { {100,500}, {100,500}, {100,500}, {100,500},
{100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500},
{100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500},
TBF/BenchControl/Elde/ControlComWrap.cs
+7 -4
View File
@@ -52,6 +52,9 @@ namespace TBF.BenchControl.Elde
#if DEWA_300 #if DEWA_300
public int EtPulses2 { get { return (int)ctrlBrdComponent.EtPulses2; } } public int EtPulses2 { get { return (int)ctrlBrdComponent.EtPulses2; } }
public int EtPulses3 { get { return (int)ctrlBrdComponent.EtPulses3; } } public int EtPulses3 { get { return (int)ctrlBrdComponent.EtPulses3; } }
#elif ROMA_200
public int EtPulses2 { get { return (int)ctrlBrdComponent.EtPulses2; } }
public int EtPulses3 { get { return 0; } }
#else #else
public int EtPulses2 { get { return 0; } } public int EtPulses2 { get { return 0; } }
public int EtPulses3 { get { return 0; } } public int EtPulses3 { get { return 0; } }
@@ -71,13 +74,13 @@ namespace TBF.BenchControl.Elde
public float Pressure(int prsNr0) { return ctrlBrdComponent.pressure[prsNr0]; } public float Pressure(int prsNr0) { return ctrlBrdComponent.pressure[prsNr0]; }
public float Temperature(int tmpNr0) { return ctrlBrdComponent.temperature[tmpNr0]; } public float Temperature(int tmpNr0) { return ctrlBrdComponent.temperature[tmpNr0]; }
public RegulValveState RegulValveState(int rvNr1) { return (RegulValveState)ctrlBrdComponent.rValveStatus[rvNr1 - 1]; } public RegulValveState RegulValveState(int rvNr1) { return (RegulValveState)ctrlBrdComponent.rValveStatus[rvNr1 - 1]; }
#if GENESIS || BERLIN || PETERSBURG_200 || DEWA_300 #if GENESIS || BERLIN || PETERSBURG_200 || DEWA_300 || ROMA_200
public UInt128 RRoute { get { return ((UInt128)ctrlBrdComponent.rRouteH << 64) | (UInt128)ctrlBrdComponent.rRoute; } } public UInt128 RRoute { get { return ((UInt128)ctrlBrdComponent.rRouteH << 64) | (UInt128)ctrlBrdComponent.rRoute; } }
#else #else
public UInt128 RRoute { get { return ctrlBrdComponent.rRoute; } } public UInt128 RRoute { get { return ctrlBrdComponent.rRoute; } }
#endif #endif
#if GENESIS || KEMPNO_50 || KRAKOW_50 || BAHRAIN_50 || BADGER_STREDNA_TRAT || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 || DEWA_300 || PUCHONG_200 || TURA_IPERL_NEW #if GENESIS || KEMPNO_50 || KRAKOW_50 || BAHRAIN_50 || BADGER_STREDNA_TRAT || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 || DEWA_300 || ROMA_200 || PUCHONG_200 || TURA_IPERL_NEW
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)
{ {
@@ -340,7 +343,7 @@ namespace TBF.BenchControl.Elde
bool bit39 = (route & 0x00FC000000000000) != 0; /// true if any of bits 50 through 55 is set bool bit39 = (route & 0x00FC000000000000) != 0; /// true if any of bits 50 through 55 is set
route = route & 0xFF03FFFFFFFFFFFF; route = route & 0xFF03FFFFFFFFFFFF;
if (bit39) route = route | 0x0000008000000000; if (bit39) route = route | 0x0000008000000000;
#elif PETERSBURG_200 || DEWA_300 #elif PETERSBURG_200 || DEWA_300 || ROMA_200
/// ///
/// The following code deals with the situation that all pumps share bit #80. /// The following code deals with the situation that all pumps share bit #80.
/// In settings the bits of pumps should be sent as follows: P1=64, P2=65, P3=66, P4=67 and P5=68 /// In settings the bits of pumps should be sent as follows: P1=64, P2=65, P3=66, P4=67 and P5=68
@@ -404,7 +407,7 @@ namespace TBF.BenchControl.Elde
(uint)regConst, (uint)regConst,
(uint)shortImp, (uint)shortImp,
(uint)sendCommandArgs.StopDevs); (uint)sendCommandArgs.StopDevs);
#elif GENESIS || DEWA_300 #elif GENESIS || DEWA_300 || ROMA_200
ctrlBrdComponent.SendCommand((uint)sendCommandArgs.Cmd, ctrlBrdComponent.SendCommand((uint)sendCommandArgs.Cmd,
(byte)sendCommandArgs.RefFlowmtrNr, (byte)sendCommandArgs.RefFlowmtrNr,
(ulong)(route & (UInt128)0xFFFFFFFFFFFFFFFF), (ulong)(route & (UInt128)0xFFFFFFFFFFFFFFFF),
TBF/BenchControl/Elde/Diverter/Diverter.cs
+1 -1
View File
@@ -113,7 +113,7 @@ namespace TBF.BenchControl.Elde.Diverter
{ {
divNrFromName = nextIdx; divNrFromName = nextIdx;
} }
#if GENESIS || PETERSBURG_50 || PETERSBURG_200 || FUZHOU_50 || FUZHOU_150 || FUZHOU_300 #if GENESIS || PETERSBURG_50 || PETERSBURG_200 || FUZHOU_50 || FUZHOU_150 || FUZHOU_300 || ROMA_200
flowMtrNr4Cmd = divNrFromName + 1; flowMtrNr4Cmd = divNrFromName + 1;
#elif BADGER_STREDNA_TRAT #elif BADGER_STREDNA_TRAT
flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : ((divNrFromName == 2) ? 9 : 20); flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : ((divNrFromName == 2) ? 9 : 20);
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.24.1320.0")] [assembly: AssemblyVersion("2.24.1359.0")]
[assembly: AssemblyFileVersion("2.24.1320.0")] [assembly: AssemblyFileVersion("2.24.1359.0")]
TBF/UI/MainWnd.Designer.cs
Generated
+2 -2
View File
@@ -713,10 +713,10 @@ namespace TBF.UI
#elif IZRAEL_200 || PUCHONG_200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 #elif IZRAEL_200 || PUCHONG_200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200
private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent; private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent;
private Process.ProcessTabPageCtrl6 processTabPageCtrl; private Process.ProcessTabPageCtrl6 processTabPageCtrl;
#elif BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || SLM_END || WARSAW_END || RUM_MOB || SENTEC || CEVAK_200 || DEWA_300 #elif BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || SLM_END || WARSAW_END || RUM_MOB || SENTEC || CEVAK_200
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
private Process.ProcessTabPageCtrl6 processTabPageCtrl; private Process.ProcessTabPageCtrl6 processTabPageCtrl;
#elif TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || MALTA_WSD25 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100 #elif TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || MALTA_WSD25 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100 || DEWA_300 || ROMA_200
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
private Process.ProcessTabPageCtrl24 processTabPageCtrl; private Process.ProcessTabPageCtrl24 processTabPageCtrl;
#elif TURA_SPECIAL || SLM_50 #elif TURA_SPECIAL || SLM_50
Users/Grp.cs
+1 -1
View File
@@ -34,7 +34,7 @@ namespace Users
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL #if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
TraceabilityManagement, TraceabilityManagement,
#endif #endif
#if KEMPNO_50 #if TEST_PROFILES
MetrologicalAuthority, MetrologicalAuthority,
WaterMeterAuthority, WaterMeterAuthority,
#endif #endif
packages/ControlBoard/Roma200/ControlComponent3U.dll
BIN
View File
Binary file not shown.