Egalware/CMS-MTConn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

riconfigurazioni x agent

Browse Source
This commit is contained in:
Samuele E. Locatelli
2016-04-28 11:39:57 +02:00
parent 4b5f609407
commit 9f53661d5a
5 changed files with 58 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MTC_Sim/.vs/MTC_Sim/v14/.suo
BIN
View File
Binary file not shown.
MTC_Sim/MTC_Sim/AdapterGeneric.cs
+15 -9
View File
@@ -444,11 +444,11 @@ namespace MTC_Sim
/// <summary>
/// D.D1.AVAIL - disponibilità
/// </summary>
public Event mAvail = new Event("avail");
public Event mAvail = new Event("AVAIL");
/// <summary>
/// XX.XX.STOP - stop per pressione emergenze
/// </summary>
public Event mEStop = new Event("PROTECTION_STATUS");
public Event mEStop = new Event("E_STOP");
/// <summary>
/// STATUS macchina (ON/OFF)
/// </summary>
@@ -456,20 +456,21 @@ namespace MTC_Sim
/// <summary>
/// Minuti funzionamento globale macchina
/// </summary>
public Event mAccTime = new Event("ACC_TIME");
public Sample mAccTime = new Sample("ACC_TIME");
/// <summary>
/// Orologio
/// </summary>
public Event mClock = new Event("CLOCK_TIME");
public Sample mClock = new Sample("CLOCK");
/// <summary>
/// Consumo elettrico globale
/// </summary>
public Event mPower = new Event("POWER");
public Sample mPower = new Sample("POWER");
#if false
/// <summary>
/// D.D1.NAME
/// </summary>
public Event mName = new Event("Name");
public Event mName = new Event("Name");
/// <summary>
/// D.D1.ID
/// </summary>
@@ -477,11 +478,12 @@ namespace MTC_Sim
/// <summary>
/// D.D1.UUID
/// </summary>
public Event mUUID = new Event("UUID");
public Event mUUID = new Event("UUID");
/// <summary>
/// D.D1.SAMPLE_INTERVAL
/// </summary>
public Event mSampleInt = new Event("SampleInt");
#endif
/// <summary>
@@ -616,10 +618,12 @@ namespace MTC_Sim
mAdapter.AddDataItem(mPower);
mAdapter.AddDataItem(mEStop);
#if false
// nome ed ID/UUID - e li imposto...
mAdapter.AddDataItem(mName);
mAdapter.AddDataItem(mID);
mAdapter.AddDataItem(mUUID);
mAdapter.AddDataItem(mUUID);
#endif
// programma e produzione
mAdapter.AddDataItem(mProgram);
@@ -881,9 +885,11 @@ namespace MTC_Sim
/// </summary>
public void getConfigParam()
{
#if false
mName.Value = utils.CRS("D1_NAME");
mID.Value = utils.CRS("D1_ID");
mUUID.Value = utils.CRS("D1_UUID");
mUUID.Value = utils.CRS("D1_UUID");
#endif
}
/// <summary>
/// dati relativi al programma
MTC_Sim/MTC_Sim/App.config
+3 -3
View File
@@ -5,9 +5,9 @@
</startup>
<appSettings>
<add key="timerInt" value="2000"/>
<add key="D1_NAME" value="ARES-SIM"/>
<add key="D1_ID" value="12345"/>
<add key="D1_UUID" value="asdf12345erty9876"/>
<add key="D1_NAME" value="CMS-ARES-SIM"/>
<add key="D1_ID" value="demo_123456"/>
<add key="D1_UUID" value="000123456"/>
<add key="D1_PROGRAM" value="PROG_DEMO_01"/>
<add key="PartID" value="Prod_0001"/>
<add key="STATUS_PLC_ADP" value="0"/>
MTC_Sim/MTC_Sim/CMS_MachineSim.Designer.cs
Generated
+40 -31
View File
@@ -153,11 +153,8 @@
this.label30 = new System.Windows.Forms.Label();
this.txtPower = new System.Windows.Forms.TextBox();
this.label16 = new System.Windows.Forms.Label();
this.D1_UUID = new System.Windows.Forms.TextBox();
this.label15 = new System.Windows.Forms.Label();
this.D1_ID = new System.Windows.Forms.TextBox();
this.label14 = new System.Windows.Forms.Label();
this.D1_NAME = new System.Windows.Forms.TextBox();
this.groupBox10 = new System.Windows.Forms.GroupBox();
this.enableDataSim = new System.Windows.Forms.CheckBox();
this.groupBox8 = new System.Windows.Forms.GroupBox();
@@ -195,6 +192,9 @@
this.CncErr_03 = new System.Windows.Forms.CheckBox();
this.CncErr_01 = new System.Windows.Forms.CheckBox();
this.ErrRT_02 = new System.Windows.Forms.CheckBox();
this.D1_NAME = new System.Windows.Forms.Label();
this.D1_ID = new System.Windows.Forms.Label();
this.D1_UUID = new System.Windows.Forms.Label();
this.groupBox4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.PosAct)).BeginInit();
this.groupBox3.SuspendLayout();
@@ -1148,7 +1148,7 @@
this.tpStatus.Location = new System.Drawing.Point(4, 22);
this.tpStatus.Name = "tpStatus";
this.tpStatus.Padding = new System.Windows.Forms.Padding(3);
this.tpStatus.Size = new System.Drawing.Size(786, 649);
this.tpStatus.Size = new System.Drawing.Size(772, 649);
this.tpStatus.TabIndex = 0;
this.tpStatus.Text = "STATUS";
//
@@ -1367,16 +1367,16 @@
//
// groupBox7
//
this.groupBox7.Controls.Add(this.D1_UUID);
this.groupBox7.Controls.Add(this.D1_ID);
this.groupBox7.Controls.Add(this.D1_NAME);
this.groupBox7.Controls.Add(this.lblAT);
this.groupBox7.Controls.Add(this.txtAccTime);
this.groupBox7.Controls.Add(this.label30);
this.groupBox7.Controls.Add(this.txtPower);
this.groupBox7.Controls.Add(this.label16);
this.groupBox7.Controls.Add(this.D1_UUID);
this.groupBox7.Controls.Add(this.label15);
this.groupBox7.Controls.Add(this.D1_ID);
this.groupBox7.Controls.Add(this.label14);
this.groupBox7.Controls.Add(this.D1_NAME);
this.groupBox7.Location = new System.Drawing.Point(385, 3);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(380, 75);
@@ -1425,13 +1425,6 @@
this.label16.TabIndex = 59;
this.label16.Text = "UUID";
//
// D1_UUID
//
this.D1_UUID.Location = new System.Drawing.Point(234, 50);
this.D1_UUID.Name = "D1_UUID";
this.D1_UUID.Size = new System.Drawing.Size(140, 20);
this.D1_UUID.TabIndex = 58;
//
// label15
//
this.label15.AutoSize = true;
@@ -1441,13 +1434,6 @@
this.label15.TabIndex = 57;
this.label15.Text = "ID";
//
// D1_ID
//
this.D1_ID.Location = new System.Drawing.Point(51, 50);
this.D1_ID.Name = "D1_ID";
this.D1_ID.Size = new System.Drawing.Size(124, 20);
this.D1_ID.TabIndex = 56;
//
// label14
//
this.label14.AutoSize = true;
@@ -1457,13 +1443,6 @@
this.label14.TabIndex = 54;
this.label14.Text = "Nome";
//
// D1_NAME
//
this.D1_NAME.Location = new System.Drawing.Point(51, 17);
this.D1_NAME.Name = "D1_NAME";
this.D1_NAME.Size = new System.Drawing.Size(124, 20);
this.D1_NAME.TabIndex = 53;
//
// groupBox10
//
this.groupBox10.Controls.Add(this.enableDataSim);
@@ -1820,6 +1799,36 @@
this.ErrRT_02.Text = "ERR_fill";
this.ErrRT_02.UseVisualStyleBackColor = true;
//
// D1_NAME
//
this.D1_NAME.AutoSize = true;
this.D1_NAME.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.D1_NAME.Location = new System.Drawing.Point(54, 20);
this.D1_NAME.Name = "D1_NAME";
this.D1_NAME.Size = new System.Drawing.Size(19, 13);
this.D1_NAME.TabIndex = 64;
this.D1_NAME.Text = "...";
//
// D1_ID
//
this.D1_ID.AutoSize = true;
this.D1_ID.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.D1_ID.Location = new System.Drawing.Point(54, 53);
this.D1_ID.Name = "D1_ID";
this.D1_ID.Size = new System.Drawing.Size(19, 13);
this.D1_ID.TabIndex = 65;
this.D1_ID.Text = "...";
//
// D1_UUID
//
this.D1_UUID.AutoSize = true;
this.D1_UUID.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.D1_UUID.Location = new System.Drawing.Point(233, 54);
this.D1_UUID.Name = "D1_UUID";
this.D1_UUID.Size = new System.Drawing.Size(19, 13);
this.D1_UUID.TabIndex = 66;
this.D1_UUID.Text = "...";
//
// CMS_MachineSim
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1981,11 +1990,8 @@
private System.Windows.Forms.Label label30;
private System.Windows.Forms.TextBox txtPower;
private System.Windows.Forms.Label label16;
private System.Windows.Forms.TextBox D1_UUID;
private System.Windows.Forms.Label label15;
private System.Windows.Forms.TextBox D1_ID;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.TextBox D1_NAME;
private System.Windows.Forms.GroupBox groupBox10;
private System.Windows.Forms.CheckBox enableDataSim;
private System.Windows.Forms.GroupBox groupBox8;
@@ -2043,6 +2049,9 @@
private System.Windows.Forms.CheckBox CncErr_02;
private System.Windows.Forms.CheckBox CncErr_03;
private System.Windows.Forms.CheckBox CncErr_01;
private System.Windows.Forms.Label D1_NAME;
private System.Windows.Forms.Label D1_UUID;
private System.Windows.Forms.Label D1_ID;
}
}
MTC_Sim/MTC_Sim/CMS_MachineSim.resx
-18
View File
@@ -138,24 +138,6 @@
<metadata name="K.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="X.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Y.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Z.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="I.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="J.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="K.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>104, 17</value>
</metadata>