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

TURA_IPERL_NEW : (1) Processing symbol implemented, (2) Elde component dated 17.7.2019 added, ver. 2.18.1273

Browse Source
This commit is contained in:
Milan Hanajik 2019-07-24 15:38:49 +02:00
parent 156cec5596
commit 375cea26a6
28 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Config/Data.cs
View File

@ -74,7 +74,7 @@ namespace Config
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0;
public const int MaxPartNr = WMsCount / LineSize;
#elif TURA_IPERL
#elif TURA_IPERL || TURA_IPERL_NEW
public const int WMsCount = 40;
public const int LineSize = 20;
public const int CompoundWMsCount = 1;

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
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.18.1268.0")]
[assembly: AssemblyFileVersion("2.18.1268.0")]
[assembly: AssemblyVersion("2.18.1273.0")]
[assembly: AssemblyFileVersion("2.18.1273.0")]

4
Results/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
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.18.1271.0")]
[assembly: AssemblyFileVersion("2.18.1271.0")]
[assembly: AssemblyVersion("2.18.1273.0")]
[assembly: AssemblyFileVersion("2.18.1273.0")]

2
ResultsBrowser/LocalSettings.cs
View File

@ -109,7 +109,7 @@ namespace ResultsBrowser
public LocalSettings()
{
#if TURA_IPERL || TURA_SPECIAL
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
Bench1 = "WR10";
Bench2 = "WR11";
Bench3 = "WR13";

4
ResultsBrowser/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
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.18.1258.0")]
[assembly: AssemblyFileVersion("2.18.1258.0")]
[assembly: AssemblyVersion("2.18.1273.0")]
[assembly: AssemblyFileVersion("2.18.1273.0")]

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

@ -19,7 +19,7 @@ namespace TBF.BenchControl.Elde
EnduranceCycleStop = 13,
}
#if FUZHOU_300 || IZRAEL_200 || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TURA_IPERL || 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 || 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
{
RefFlowMeterMask = 0x7, /// bits 0,1,2

2
TBF/BenchControl/Elde/ControlBoardDev.cs
View File

@ -150,7 +150,7 @@ namespace TBF.BenchControl.Elde
{100,500}, {100,500}, {100,500}, {100,500} };
public byte[] MeretRS485Address = new byte[4];
public float[] EtCalib = new float[8] { 1, 1, 1, 1, 1, 1, 1, 1 };
#elif MUNICH || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TORUN_50 || CEVAK_40 || TURA_IPERL || TURA_SPECIAL || MURES_40 || FUZHOU_50 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100
#elif MUNICH || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TORUN_50 || CEVAK_40 || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || MURES_40 || FUZHOU_50 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100
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 };

4
TBF/BenchControl/Elde/ControlComWrap.cs
View File

@ -71,7 +71,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 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 || DEWA_300 || PUCHONG_200
#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
public uint DivTime(int id) { return ctrlBrdComponent.divTime[id]; }
public void SetDivLimit(int divNo, uint limLoPct, uint limHiPct)
{
@ -405,7 +405,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 || PUCHONG_200
#else /// if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || MALTA_WSD25 || SLM_50 || SLM_END || WARSAW_END || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || BADGER_STREDNA_TRAT || PUCHONG_200
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);

2
TBF/BenchControl/Elde/Diverter/Diverter.cs
View File

@ -119,7 +119,7 @@ namespace TBF.BenchControl.Elde.Diverter
flowMtrNr4Cmd = (divNrFromName == 4) ? 5 : divNrFromName;
#elif DEWA_300 || PUCHONG_200
flowMtrNr4Cmd = divNrFromName + 2; /// Div1: 1,2,3, Div2: 4, Div3: 5, Div4: 6, Div5: 7
#elif TURA_IPERL
#elif TURA_IPERL || TURA_IPERL_NEW
flowMtrNr4Cmd = divNrFromName + 16 * divNrFromName;
#elif FILIPINY_50
flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : 7;

2
TBF/BenchControl/Elde/StartMeasurementOp.cs
View File

@ -113,7 +113,7 @@ namespace TBF.BenchControl.Elde
void SendStartCommand()
{
controlBoard.SyncRoute();
#if TURA_IPERL || TURA_SPECIAL || BADGER_VELKA_TRAT || SLM_50
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || BADGER_VELKA_TRAT || SLM_50
int flowMeterIdxAndDiv = flowMeterNr + 16 * diverterNr;
#elif BADGER_STREDNA_TRAT
int flowMeterIdxAndDiv = flowMeterNr + 8 * (diverterNr - 1);

2
TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs
View File

@ -173,7 +173,7 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger
public Retv WriteLogsToDisk(TextWriter logger, Results.Entities.Batch batch)
{
#if TURA_IPERL || TURA_SPECIAL
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
/// Obtain one representative water meter data
Results.Entities.WaterMeter wm0 = null;

2
TBF/BenchControl/StateMachine.cs
View File

@ -67,7 +67,7 @@ namespace TBF.BenchControl
/// Time and synchronization
#if TURA_IPERL
#if TURA_IPERL || TURA_IPERL_NEW
public const int Period = 2; /// State machine period in sec.
#else
public const int Period = 1; /// State machine period in sec.

6
TBF/BenchControl/TestBenchSim.cs
View File

@ -388,7 +388,7 @@ namespace TBF.BenchControl
const ulong Path3 = VI3;
const ulong Path4 = VI4;
const ulong Path5 = 0;
#elif TORUN_50 || TURA_IPERL
#elif TORUN_50 || TURA_IPERL || TURA_IPERL_NEW
const ulong VL11 = (1L << 0);
const ulong VL13 = (1L << 1);
const ulong VL15 = (1L << 2);
@ -545,7 +545,7 @@ namespace TBF.BenchControl
if (Div1sim && (SimRoute & Path1) == Path1) Mass1sim += DiffKg(Flow1sim, time);
if (Div1sim && (SimRoute & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time);
if (Div1sim && (SimRoute & Path3) == Path3) Mass1sim += DiffKg(Flow3sim, time);
#elif TORUN_50 || TURA_IPERL /// Path1,2,3,4,5 do WT1, Path6 do WT2
#elif TORUN_50 || TURA_IPERL || TURA_IPERL_NEW /// Path1,2,3,4,5 do WT1, Path6 do WT2
if (Div1sim && (SimRoute & Path1) == Path1) Mass1sim += DiffKg(Flow1sim, time);
if (Div1sim && (SimRoute & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time);
if (Div1sim && (SimRoute & Path3) == Path3) Mass1sim += DiffKg(Flow3sim, time);
@ -695,7 +695,7 @@ namespace TBF.BenchControl
if (toTank) { /* throw (new Exception()); */ }
break;
}
#elif TORUN_50 || TURA_IPERL
#elif TORUN_50 || TURA_IPERL || TURA_IPERL_NEW
switch (regulValveNo)
{
case 1:

2
TBF/Forms/LoginDlgWithBenchSelection.cs
View File

@ -99,7 +99,7 @@ namespace TBF.Forms
smartCardReader = null; /// null = No smart card reader detected
#if TURA_IPERL || TURA_SPECIAL
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
try
{
card = new CardNative();

2
TBF/Forms/PreviousResultCtrl.cs
View File

@ -102,7 +102,7 @@ namespace TBF.Forms
{
parent.OnReload(this, new PreviousResultIdEventArgs(BatchNr));
}
#if TURA_IPERL || TURA_SPECIAL
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
else if (mode == PreviousResultsMode.Fix)
{
/// Access only to thise who manage production tracing

2
TBF/MainWnd.Designer.cs generated
View File

@ -693,7 +693,7 @@ namespace TBF
#elif TURA_SPECIAL || SLM_50
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
private TBF.Screens.ProcessTabPageExCtrl processTabPageCtrl;
#elif TURA_IPERL || IZRAEL_50
#elif TURA_IPERL || TURA_IPERL_NEW || IZRAEL_50
private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
private TBF.Screens.ProcessTabPageCtrl48 processTabPageCtrl;
#endif

4
TBF/MainWnd.cs
View File

@ -497,7 +497,7 @@ namespace TBF
{
Users.DB.ConnectionString = Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString;
Users.DB.DbType = Config.Data.CurrentBench.ProceduresDBSettings.DbType;
#if TURA_IPERL || TURA_SPECIAL
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
Users.Forms.UserManagementDlg dlg = new Users.Forms.UserManagementDlg(Users.DB.CreateSession(), true);
string connStr = Users.DB.ConnectionString;
int len = connStr.ToUpper().IndexOf("; UID=");
@ -795,7 +795,7 @@ namespace TBF
private void statusStrip1_DoubleClick(object sender, EventArgs e)
{
#if TURA_IPERL || TURA_SPECIAL
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
Users.Grp.GID[] reqGrpMembership = new Users.Grp.GID[] { Users.Grp.GID.Testers, Users.Grp.GID.TestingSpecialists, Users.Grp.GID.Metrologists, Users.Grp.GID.HeadOfLab };
#else
Users.Grp.GID[] reqGrpMembership = null;

2
TBF/Program.cs
View File

@ -220,7 +220,7 @@ namespace TBF
Users.Entities.User loadedUser = null;
try
{
#if TURA_IPERL || TURA_SPECIAL
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
Grp.GID[] reqGrpMembership = new Grp.GID[] { Grp.GID.Testers, Grp.GID.TestingSpecialists, Grp.GID.Metrologists, Grp.GID.HeadOfLab };
#else
Grp.GID[] reqGrpMembership = null;

4
TBF/Properties/AssemblyInfo.cs
View File

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

4
TBF/Screens/ResultsTabPageCtrl.cs
View File

@ -113,7 +113,7 @@ namespace TBF.Screens
void OnButtonsEtc(object sender, UiBridge.ButtonsEtcEventArgs args)
{
reloadPreviousResultsButton.Enabled = ((args.Flags & UiBridge.ButtonsEtc.ProcedureCmbBoxEn) != 0);
#if TURA_IPERL || TURA_SPECIAL
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
fixPreviousResultsButton.Visible = ((args.Flags & UiBridge.ButtonsEtc.ProcedureCmbBoxEn) != 0);
#endif
}
@ -132,7 +132,7 @@ namespace TBF.Screens
pictureBox2.BackColor = NokColor;
label2.Text = Strings.Failed;
#if TURA_IPERL || TURA_SPECIAL
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
label2.Text += " (zopakovať)";
pictureBox3.BackColor = RejectColor;

6
TBF/UiControls/BenchControlPanel.cs
View File

@ -248,7 +248,7 @@ namespace TBF.UiControls
private void emptyTank1Btn_Click(object sender, EventArgs e)
{
#if TURA_IPERL
#if TURA_IPERL || TURA_IPERL_NEW
/// Prevent 'Stop draining' by password
if (drain1Highlighted && !Users.GlobalData.CurrentUser.IsMemberOf(Users.Grp.GID.TestingSpecialists))
{
@ -265,7 +265,7 @@ namespace TBF.UiControls
private void emptyTank2Btn_Click(object sender, EventArgs e)
{
#if TURA_IPERL
#if TURA_IPERL || TURA_IPERL_NEW
/// Prevent 'Stop draining' by password
if (drain1Highlighted && !Users.GlobalData.CurrentUser.IsMemberOf(Users.Grp.GID.TestingSpecialists))
{
@ -282,7 +282,7 @@ namespace TBF.UiControls
private void emptyTank3Btn_Click(object sender, EventArgs e)
{
#if TURA_IPERL
#if TURA_IPERL || TURA_IPERL_NEW
/// Prevent 'Stop draining' by password
if (drain1Highlighted && !Users.GlobalData.CurrentUser.IsMemberOf(Users.Grp.GID.TestingSpecialists))
{

2
Users/Forms/EditSelectedUser.cs
View File

@ -56,7 +56,7 @@ namespace Users.Forms
smartCardReader = null; /// null = No smart card reader detected
#if TURA_IPERL || TURA_SPECIAL
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
try
{
card = new CardNative();

2
Users/Forms/LoginDlg.cs
View File

@ -98,7 +98,7 @@ namespace Users.Forms
///
smartCardReader = null; /// null = No smart card reader detected
#if TURA_IPERL || TURA_SPECIAL
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
try
{
card = new CardNative();

6
Users/Forms/UserManagementDlg.cs
View File

@ -57,7 +57,7 @@ namespace Users.Forms
listViewUsers.Columns.Add(Strings.User_name, 100); /// column 0
listViewUsers.Columns.Add(Strings.User_code, 70); /// column 1: UserNumberColumn
listViewUsers.Columns.Add(Strings.Full_name, 150); /// column 2: NameSurnameColumn
#if TURA_IPERL || TURA_SPECIAL
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
listViewUsers.Columns.Add(Strings.Tag, 110);
#endif
listViewUsers.Columns.Add(Strings.Groups, 370);
@ -83,7 +83,7 @@ namespace Users.Forms
{
string grps = string.Empty;
///
#if TURA_IPERL
#if TURA_IPERL || TURA_IPERL_NEW
foreach (var gid in new Grp.GID[] { Grp.GID.TraceabilityManagement,
Grp.GID.Administrators,
Grp.GID.HeadOfLab,
@ -112,7 +112,7 @@ namespace Users.Forms
ListViewItem item = new ListViewItem(u.UserName);
item.SubItems.Add(u.Number.ToString());
item.SubItems.Add(u.FullName);
#if TURA_IPERL || TURA_SPECIAL
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
item.SubItems.Add(string.IsNullOrEmpty(u.Tag) ? string.Empty : u.Tag);
#endif
item.SubItems.Add(grps);

4
Users/Grp.cs
View File

@ -31,7 +31,7 @@ namespace Users
Metrologists,
CalibrationSpecialists,
Administrators, // application / network / database administrator
#if TURA_IPERL || TURA_SPECIAL
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
TraceabilityManagement,
#endif
NrOfGroups, // Number of groups (this is not a GroupID)
@ -55,7 +55,7 @@ namespace Users
case GID.Metrologists: return Strings.metrologist;
case GID.CalibrationSpecialists: return Strings.calibration_specialist;
case GID.Administrators: return Strings.administrator;
#if TURA_IPERL || TURA_SPECIAL
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
case GID.TraceabilityManagement: return Strings.production_tracing_administrator;
#endif
default: return Strings.invalid;

2
Users/Mappings/UserMap.cs
View File

@ -12,7 +12,7 @@ namespace Users.Mappings
Id(x => x.Id);
Map(x => x.UserName).Column("Name");
Map(x => x.Number);
#if TURA_IPERL || TURA_SPECIAL
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
Map(x => x.Tag);
#endif
Map(x => x.Password);

4
Users/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
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.18.1234.0")]
[assembly: AssemblyFileVersion("2.18.1234.0")]
[assembly: AssemblyVersion("2.18.1273.0")]
[assembly: AssemblyFileVersion("2.18.1273.0")]

BIN
packages/ControlBoard/iPerlST-new/ControlComponent3U.dll Normal file
View File

Binary file not shown.