diff --git a/IOB-UT/baseUtils.cs b/IOB-UT/baseUtils.cs
index 28bf3001..7f79394c 100644
--- a/IOB-UT/baseUtils.cs
+++ b/IOB-UT/baseUtils.cs
@@ -967,7 +967,9 @@ namespace IOB_UT
AL15 = 1 << 30,
AL16 = 1 << 31
}
-
+ ///
+ /// Enumerazione tipi di semaforo
+ ///
public enum Semaforo
{
///
@@ -987,4 +989,18 @@ namespace IOB_UT
///
SS
}
+ ///
+ /// Enumerazione tipi di tipi di URL x invio
+ ///
+ public enum urlType
+ {
+ ///
+ /// Salvataggio FluxLog (valori estesi che non provocano calcoli di macchine a stati, eventi...)
+ ///
+ FLog,
+ ///
+ /// INPUT segnali in ingresso (standard base MAPO)
+ ///
+ SignIN
+ }
}
\ No newline at end of file
diff --git a/IOB-WIN/IobFanuc.cs b/IOB-WIN/IobFanuc.cs
index 5a41ec60..57412d72 100644
--- a/IOB-WIN/IobFanuc.cs
+++ b/IOB-WIN/IobFanuc.cs
@@ -254,12 +254,14 @@ namespace IOB_WIN
}
///
- /// Recupero programma in lavorazione
+ /// Recupero programma in lavorazione come Dictionary FANUC...
+ /// - SYSINFO: (prima KEY globale) TUTTI i valori separati da # (x fare check modifica)
+ /// - altre stringhe: ogni singolo parametro / valore
///
///
- public override string getSysInfo()
+ public override Dictionary getSysInfo()
{
- string outVal = "";
+ Dictionary outVal = new Dictionary();
CncLib.Focas1.ODBSYS answ = FANUC_ref.getSysInfo();
try
{
@@ -270,7 +272,13 @@ namespace IOB_WIN
string axes = new string(answ.axes);
//short addInfo = answ.addinfo;
short max_axis = answ.max_axis;
- outVal = string.Format("SYS: CNC {0} | Type {1} | Ser {2} | Ver {3} | Ax {4}/{5} ", cnc_type, mt_type, series, version, axes, max_axis);
+ // preparo i singoli valori dell'array...
+ outVal.Add("SYSINFO", string.Format("{0}#{1}#{2}#{3}#{4}#{5}", cnc_type, mt_type, series, version, axes, max_axis));
+ outVal.Add("CNC", cnc_type);
+ outVal.Add("MTT", mt_type);
+ outVal.Add("SER", series);
+ outVal.Add("VER", cnc_type);
+ outVal.Add("AXS", string.Format("{0}|{1}", axes, max_axis));
}
catch (Exception exc)
{
diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs
index 0610f1ac..db32c19c 100644
--- a/IOB-WIN/IobGeneric.cs
+++ b/IOB-WIN/IobGeneric.cs
@@ -123,9 +123,13 @@ namespace IOB_WIN
}
}
///
- /// Contatore x invio dati
+ /// Contatore x invio dati SignalIN
///
- public int counter { get; set; }
+ public int counterSigIN { get; set; }
+ ///
+ /// Contatore x invio dati FluxLog
+ ///
+ public int counterFLog { get; set; }
///
/// Ultimo URL
///
@@ -187,7 +191,7 @@ namespace IOB_WIN
return answ;
}
}
-
+
///
/// Determina se utilizzare blocchi di memoria IOT contigui (e quindi processing "monoblocco" semplificato"=
///
@@ -228,9 +232,8 @@ namespace IOB_WIN
/// stato Online/Offline della IOB
///
public bool MPOnline;
-
- #endregion
+ #endregion
///
/// Form chiamante
@@ -276,6 +279,7 @@ namespace IOB_WIN
if (!DemoIn)
{
QueueIN.Clear();
+ QueueFLog.Clear();
QueueSIM.Clear();
}
// imposto contatori blink a zero...
@@ -317,11 +321,18 @@ namespace IOB_WIN
/// indica se si debba tentare di riavviare l'adapter (con caduta connessione viene fermato in automatico)
public void stopAdapter(bool tryRestart)
{
- parentForm.displayTaskAndLog("Svuotamento FORZATO coda invio...");
+ // svuoto le code dei valori letti e non ancora trasmessi...
+ parentForm.displayTaskAndLog("Svuotamento FORZATO coda segnali...");
while (QueueIN.Count > 0)
{
// INVIO SE PERMESSO...!!!
- sendToMoonPro(QueueIN.Dequeue());
+ sendToMoonPro(urlType.SignIN, QueueIN.Dequeue());
+ }
+ parentForm.displayTaskAndLog("Svuotamento FORZATO coda FluxLOG...");
+ while (QueueFLog.Count > 0)
+ {
+ // INVIO SE PERMESSO...!!!
+ sendToMoonPro(urlType.FLog, QueueFLog.Dequeue());
}
//reportDataProc();
@@ -394,8 +405,11 @@ namespace IOB_WIN
// eventuale log!
if (utils.CRB("recTime")) logTimeResults();
}
- // gestione queue (invio, display)
- svuotaCoda();
+ // gestione queue SignalIN (invio, display)
+ svuotaCodaSignIN();
+ // gestione queue FluxLog (invio, display)
+ svuotaCodaFLog();
+ // mostra eventuali altri dati di processo...
reportDataProc();
if (showDebugData)
{
@@ -846,19 +860,18 @@ namespace IOB_WIN
///
/// Fornisce URL di tipo FluxLog
///
- /// nome del FLUSSO di cui salvare il valore
- /// valore salvato in coda nel formato dtEve#valore#counter
+ /// valore salvato in coda nel formato dtEve#flux#valore#counter
///
- public string urlFLog(string flux, string queueVal)
+ public string urlFLog(string queueVal)
{
// URL base x input
string answ = string.Format(@"{0}{1}{2}", currIobConf.serverData.MPIP, currIobConf.serverData.MPURL, currIobConf.serverData.CMDFLOG);
// decodifica valore!
string[] valori = qDecodeIN(queueVal);
// aggiungo macchina e valore...
- answ += string.Format(@"{0}?valore={1}", currIobConf.codIOB, valori[1]);
+ answ += string.Format(@"{0}?flux={1}&valore={2}", currIobConf.codIOB, valori[1], valori[2]);
// aggiondo dataOra evento e corrente + contatore...
- answ += string.Format(@"&&dtEve={0}&&dtCurr={1:yyyyMMddHHmmssfff}&&cnt={2}", valori[0], DateTime.Now, valori[2]);
+ answ += string.Format(@"&&dtEve={0}&&dtCurr={1:yyyyMMddHHmmssfff}&&cnt={2}", valori[0], DateTime.Now, valori[3]);
return answ;
}
///
@@ -924,7 +937,7 @@ namespace IOB_WIN
bool answ = false;
if (DemoOut)
{
- answ = (QueueIN.Count >= nMaxSend);
+ answ = (QueueIN.Count + QueueFLog.Count >= nMaxSend);
}
else
{
@@ -954,11 +967,10 @@ namespace IOB_WIN
return answ;
}
}
-
///
- /// Processo la coda...
+ /// Processo la coda SignalIN...
///
- private void svuotaCoda()
+ private void svuotaCodaSignIN()
{
// verifico SE la coda abbia dei valori...
if (QueueIN.Count > 0)
@@ -976,7 +988,45 @@ namespace IOB_WIN
if (QueueIN.Count > 0)
{
// INVIO!!!
- sendToMoonPro(QueueIN.Dequeue());
+ sendToMoonPro(urlType.SignIN, QueueIN.Dequeue());
+ }
+ }
+ }
+ else
+ {
+ // mostro VETO-SEND x invio... GIALLO
+ parentForm.sOUT = Semaforo.SG;
+ }
+ }
+ else
+ {
+ // mostro SERVER KO x invio... ROSSO
+ parentForm.sOUT = Semaforo.SR;
+ }
+ }
+ }
+ ///
+ /// Processo la coda FLog...
+ ///
+ private void svuotaCodaFLog()
+ {
+ // verifico SE la coda abbia dei valori...
+ if (QueueFLog.Count > 0)
+ {
+ // verifico se risponde il server...
+ if (checkServerAlive)
+ {
+ // verifico SE posso inviare dati
+ if (checkIobEnabled)
+ {
+ // invio pacchetto di dati (max da conf)
+ for (int i = 0; i < nMaxSend; i++)
+ {
+ // SE ho qualcosa in coda...
+ if (QueueFLog.Count > 0)
+ {
+ // INVIO!!!
+ sendToMoonPro(urlType.FLog, QueueFLog.Dequeue());
}
}
}
@@ -1012,10 +1062,10 @@ namespace IOB_WIN
// --> accodo (valore già formattato)!
QueueIN.Enqueue(qEncodeIN);
nReadFilt++;
- // Gestione counter!
- counter++;
+ // Gestione counter SignIn!
+ counterSigIN++;
// se supera 10k resetto...
- if (counter > 9999) counter = 0;
+ if (counterSigIN > 9999) counterSigIN = 0;
}
}
///
@@ -1095,7 +1145,7 @@ namespace IOB_WIN
string answ = "";
try
{
- answ = string.Format("{0:yyyyMMddHHmmssfff}#{1:X2}#{2}", DateTime.Now, (int)B_output, counter);
+ answ = string.Format("{0:yyyyMMddHHmmssfff}#{1:X2}#{2}", DateTime.Now, (int)B_output, counterSigIN);
}
catch
{ }
@@ -1103,6 +1153,20 @@ namespace IOB_WIN
}
}
///
+ /// Fornisce il valore di flusso e valore in formato valido x messa in coda nel formato dtEve#flux#value#cont
+ ///
+ protected string qEncodeFLog(string flusso, string valore)
+ {
+ string answ = "";
+ try
+ {
+ answ = string.Format("{0:yyyyMMddHHmmssfff}#{1}#{2}#{3}", DateTime.Now, flusso, valore, counterFLog);
+ }
+ catch
+ { }
+ return answ;
+ }
+ ///
/// Decodifica valore della coda IN nel formato
/// answ[0]=dtEve
/// answ[1]=valore
@@ -1153,7 +1217,7 @@ namespace IOB_WIN
}
else
{
- currPrgName = string.Format("PROG: {0:HHmmss}", DateTime.Now);
+ currPrgName = string.Format("P-{0:HHmmss}", DateTime.Now);
}
// verifico SE sia cambiato il programma...
if (lastPrgName != currPrgName)
@@ -1162,7 +1226,13 @@ namespace IOB_WIN
lastPrgName = currPrgName;
displayOtherData(currPrgName);
lg.Info(string.Format("{0}", currPrgName));
- // !!!FARE!!! deve inviare!!!
+ // --> accodo (valore già formattato)!
+ QueueFLog.Enqueue(qEncodeFLog("PROG", currPrgName));
+ // Gestione counter FLog!
+ counterFLog++;
+ // se supera 10k resetto...
+ if (counterFLog > 9999) counterFLog = 0;
+
}
}
///
@@ -1170,32 +1240,44 @@ namespace IOB_WIN
///
private void processSysInfo()
{
- string currSysInfo = "";
+ Dictionary currSysInfo = new Dictionary();
if (!DemoIn)
{
currSysInfo = getSysInfo();
}
else
{
- currSysInfo = string.Format("SYS: {0:HHmm}", DateTime.Now);
+ currSysInfo.Add("SYS-DEMO", string.Format("S-{0:HHmm}", DateTime.Now));
}
// verifico SE sia cambiato il programma...
- if (lastSysInfo != currSysInfo)
+ if (lastSysInfo != currSysInfo["SYSINFO"])
{
// salvo!
- lastSysInfo = currSysInfo;
- displayOtherData(currSysInfo);
- lg.Info(string.Format("{0}", currSysInfo));
- // !!!FARE!!! deve inviare!!!
+ lastSysInfo = currSysInfo["SYSINFO"];
+ // per ogni valore del dizionario mostro ed accodo!
+ string sVal = "";
+ foreach (var item in currSysInfo)
+ {
+ sVal = string.Format("{0}: {1}", item.Key, item.Value);
+ displayOtherData(sVal);
+ lg.Info(string.Format("{0}", sVal));
+ // --> accodo (valore già formattato)!
+ QueueFLog.Enqueue(qEncodeFLog(item.Key, item.Value));
+ // Gestione counter FLog!
+ counterFLog++;
+ // se supera 10k resetto...
+ if (counterFLog > 9999) counterFLog = 0;
+ }
}
}
///
/// Restituisce info sistema
///
///
- public virtual string getSysInfo()
+ public virtual Dictionary getSysInfo()
{
- return "";
+ Dictionary outVal = new Dictionary();
+ return outVal;
}
///
@@ -1214,12 +1296,27 @@ namespace IOB_WIN
}
///
- /// Effettua invio a MoonPro dello status rilevato in HEX
+ /// Effettua invio a MoonPro del valore richiesto
///
- public void sendToMoonPro(string queueVal)
+ ///
+ /// Valore da trasmettere: es
+ /// INPUT: lo status rilevato in HEX
+ /// FLog: il valore da trasmettere per il flusso indicato
+ public void sendToMoonPro(urlType tipoUrl, string queueVal)
{
// recupero e formatto URL dati da coda...
- lastUrl = urlInput(queueVal);
+ switch (tipoUrl)
+ {
+ case urlType.FLog:
+ lastUrl = urlFLog(queueVal);
+ break;
+ case urlType.SignIN:
+ lastUrl = urlInput(queueVal);
+ break;
+ default:
+ lastUrl = "";
+ break;
+ }
// se NON sono in demo effettuo invio!
if (!DemoOut)
{
@@ -1250,9 +1347,9 @@ namespace IOB_WIN
#endregion
-
+
#region gestione dataMonitor (accodamento valori)
-
+
///
/// Mostra i dati grezzi letti in esadecimale
///
@@ -1270,7 +1367,7 @@ namespace IOB_WIN
public void displayInData()
{
// mostro update...
- string newString = string.Format("{0:0000}|{1}", counter, utils.IntToBinStr((int)B_output, 8));
+ string newString = string.Format("{0:0000}|{1}", counterSigIN, utils.IntToBinStr((int)B_output, 8));
accodaSignaInlData(newString);
}
///
diff --git a/IOB-WIN/MainForm.Designer.cs b/IOB-WIN/MainForm.Designer.cs
index 291030a9..0f58befe 100644
--- a/IOB-WIN/MainForm.Designer.cs
+++ b/IOB-WIN/MainForm.Designer.cs
@@ -65,17 +65,17 @@
this.lblOutMessage = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
- this.lblOutMessage2 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.lblRawData = new System.Windows.Forms.Label();
- this.lblOutMessage3 = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
this.lQueueLen = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.nLines = new System.Windows.Forms.TextBox();
this.displTimer = new System.Windows.Forms.Timer(this.components);
+ this.lblOutMessage3 = new System.Windows.Forms.Label();
+ this.lblOutMessage2 = new System.Windows.Forms.Label();
this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
@@ -234,7 +234,7 @@
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 33F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 34F));
this.tableLayoutPanel1.Controls.Add(this.lblTopCent, 2, 0);
this.tableLayoutPanel1.Controls.Add(this.lblTopDx, 3, 0);
this.tableLayoutPanel1.Controls.Add(this.lblTopSx, 1, 0);
@@ -256,7 +256,7 @@
this.lblTopCent.Location = new System.Drawing.Point(313, 0);
this.lblTopCent.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblTopCent.Name = "lblTopCent";
- this.lblTopCent.Size = new System.Drawing.Size(551, 42);
+ this.lblTopCent.Size = new System.Drawing.Size(550, 42);
this.lblTopCent.TabIndex = 68;
this.lblTopCent.Text = "IOB loaded: N.A.";
this.lblTopCent.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -267,7 +267,7 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblTopDx.AutoSize = true;
- this.lblTopDx.Location = new System.Drawing.Point(871, 0);
+ this.lblTopDx.Location = new System.Drawing.Point(870, 0);
this.lblTopDx.Name = "lblTopDx";
this.lblTopDx.Size = new System.Drawing.Size(273, 42);
this.lblTopDx.TabIndex = 69;
@@ -306,9 +306,9 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.bOUT.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.bOUT.Location = new System.Drawing.Point(1150, 3);
+ this.bOUT.Location = new System.Drawing.Point(1149, 3);
this.bOUT.Name = "bOUT";
- this.bOUT.Size = new System.Drawing.Size(28, 36);
+ this.bOUT.Size = new System.Drawing.Size(29, 36);
this.bOUT.TabIndex = 72;
this.bOUT.Text = "O";
this.bOUT.UseVisualStyleBackColor = true;
@@ -412,14 +412,15 @@
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel2.Controls.Add(this.lblOutMessage, 1, 1);
- this.tableLayoutPanel2.Controls.Add(this.label3, 2, 0);
- this.tableLayoutPanel2.Controls.Add(this.label4, 3, 0);
- this.tableLayoutPanel2.Controls.Add(this.lblOutMessage2, 2, 1);
this.tableLayoutPanel2.Controls.Add(this.label2, 1, 0);
this.tableLayoutPanel2.Controls.Add(this.label7, 0, 0);
this.tableLayoutPanel2.Controls.Add(this.lblRawData, 0, 1);
- this.tableLayoutPanel2.Controls.Add(this.lblOutMessage3, 3, 1);
+ this.tableLayoutPanel2.Controls.Add(this.label4, 2, 0);
+ this.tableLayoutPanel2.Controls.Add(this.label3, 3, 0);
+ this.tableLayoutPanel2.Controls.Add(this.lblOutMessage3, 2, 1);
+ this.tableLayoutPanel2.Controls.Add(this.lblOutMessage2, 3, 1);
this.tableLayoutPanel2.Location = new System.Drawing.Point(6, 27);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 2;
@@ -444,7 +445,7 @@
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(94, 0);
+ this.label3.Location = new System.Drawing.Point(198, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(93, 17);
this.label3.TabIndex = 64;
@@ -453,25 +454,12 @@
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(193, 0);
+ this.label4.Location = new System.Drawing.Point(94, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(98, 17);
this.label4.TabIndex = 65;
this.label4.Text = "OTHER DATA";
//
- // lblOutMessage2
- //
- this.lblOutMessage2.AutoSize = true;
- this.lblOutMessage2.Dock = System.Windows.Forms.DockStyle.Top;
- this.lblOutMessage2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblOutMessage2.ForeColor = System.Drawing.Color.Yellow;
- this.lblOutMessage2.Location = new System.Drawing.Point(95, 20);
- this.lblOutMessage2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.lblOutMessage2.Name = "lblOutMessage2";
- this.lblOutMessage2.Size = new System.Drawing.Size(91, 15);
- this.lblOutMessage2.TabIndex = 62;
- this.lblOutMessage2.Text = "...";
- //
// label2
//
this.label2.AutoSize = true;
@@ -496,7 +484,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.lblRawData.AutoSize = true;
this.lblRawData.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblRawData.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
+ this.lblRawData.ForeColor = System.Drawing.Color.Red;
this.lblRawData.Location = new System.Drawing.Point(3, 20);
this.lblRawData.Name = "lblRawData";
this.lblRawData.Size = new System.Drawing.Size(21, 15);
@@ -504,19 +492,6 @@
this.lblRawData.Text = "...";
this.lblRawData.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
- // lblOutMessage3
- //
- this.lblOutMessage3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.lblOutMessage3.AutoSize = true;
- this.lblOutMessage3.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblOutMessage3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.lblOutMessage3.Location = new System.Drawing.Point(193, 20);
- this.lblOutMessage3.Name = "lblOutMessage3";
- this.lblOutMessage3.Size = new System.Drawing.Size(973, 15);
- this.lblOutMessage3.TabIndex = 68;
- this.lblOutMessage3.Text = "...";
- //
// panel1
//
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -571,6 +546,33 @@
//
this.displTimer.Tick += new System.EventHandler(this.displTimer_Tick);
//
+ // lblOutMessage3
+ //
+ this.lblOutMessage3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lblOutMessage3.AutoSize = true;
+ this.lblOutMessage3.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblOutMessage3.ForeColor = System.Drawing.Color.CornflowerBlue;
+ this.lblOutMessage3.Location = new System.Drawing.Point(94, 20);
+ this.lblOutMessage3.Name = "lblOutMessage3";
+ this.lblOutMessage3.Size = new System.Drawing.Size(98, 15);
+ this.lblOutMessage3.TabIndex = 68;
+ this.lblOutMessage3.Text = "...";
+ //
+ // lblOutMessage2
+ //
+ this.lblOutMessage2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lblOutMessage2.AutoSize = true;
+ this.lblOutMessage2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblOutMessage2.ForeColor = System.Drawing.Color.Yellow;
+ this.lblOutMessage2.Location = new System.Drawing.Point(199, 20);
+ this.lblOutMessage2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblOutMessage2.Name = "lblOutMessage2";
+ this.lblOutMessage2.Size = new System.Drawing.Size(966, 15);
+ this.lblOutMessage2.TabIndex = 62;
+ this.lblOutMessage2.Text = "...";
+ //
// MainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
@@ -633,7 +635,6 @@
private System.Windows.Forms.GroupBox gbMonitor;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
private System.Windows.Forms.Label lblOutMessage;
- private System.Windows.Forms.Label lblOutMessage2;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label3;
@@ -653,7 +654,8 @@
private System.Windows.Forms.Timer displTimer;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label lblRawData;
- private System.Windows.Forms.Label lblOutMessage3;
private System.Windows.Forms.ToolStripMenuItem mCheckUpdates;
+ private System.Windows.Forms.Label lblOutMessage3;
+ private System.Windows.Forms.Label lblOutMessage2;
}
}
\ No newline at end of file