diff --git a/IOB-WIN-NEXT/AdapterForm.Designer.cs b/IOB-WIN-NEXT/AdapterForm.Designer.cs index 30bb34c4..93084e4c 100644 --- a/IOB-WIN-NEXT/AdapterForm.Designer.cs +++ b/IOB-WIN-NEXT/AdapterForm.Designer.cs @@ -49,63 +49,63 @@ this.chkForceDequeue = new System.Windows.Forms.CheckBox(); this.displTimer = new System.Windows.Forms.Timer(this.components); this.tabMes = new System.Windows.Forms.TabPage(); - this.panel1 = new System.Windows.Forms.Panel(); - this.lblQueueLen = new System.Windows.Forms.Label(); - this.lblDataProc = new System.Windows.Forms.Label(); - this.label10 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.lblComStats = new System.Windows.Forms.Label(); - this.lblStatus = new System.Windows.Forms.Label(); - this.lblQueueFLogLen = new System.Windows.Forms.Label(); - this.label21 = new System.Windows.Forms.Label(); - this.lblQueueMessLen = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.lblQueueAlarmLen = new System.Windows.Forms.Label(); - this.label19 = new System.Windows.Forms.Label(); this.btnForceAutoOdl = new System.Windows.Forms.Button(); + this.panel1 = new System.Windows.Forms.Panel(); + this.label19 = new System.Windows.Forms.Label(); + this.lblQueueAlarmLen = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); + this.lblQueueMessLen = new System.Windows.Forms.Label(); + this.label21 = new System.Windows.Forms.Label(); + this.lblQueueFLogLen = new System.Windows.Forms.Label(); + this.lblStatus = new System.Windows.Forms.Label(); + this.lblComStats = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); + this.label9 = new System.Windows.Forms.Label(); + this.label10 = new System.Windows.Forms.Label(); + this.lblDataProc = new System.Windows.Forms.Label(); + this.lblQueueLen = new System.Windows.Forms.Label(); this.tabPlc = new System.Windows.Forms.TabPage(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.panel4 = new System.Windows.Forms.Panel(); - this.label16 = new System.Windows.Forms.Label(); - this.label17 = new System.Windows.Forms.Label(); - this.label18 = new System.Windows.Forms.Label(); - this.lblCounter = new System.Windows.Forms.Label(); - this.lblBitmap = new System.Windows.Forms.Label(); - this.label14 = new System.Windows.Forms.Label(); - this.lblWatchDog = new System.Windows.Forms.Label(); - this.txtMReadStart = new System.Windows.Forms.TextBox(); - this.label15 = new System.Windows.Forms.Label(); - this.txtMReadSize = new System.Windows.Forms.TextBox(); - this.label20 = new System.Windows.Forms.Label(); this.panel3 = new System.Windows.Forms.Panel(); - this.label12 = new System.Windows.Forms.Label(); - this.chkEdit = new System.Windows.Forms.CheckBox(); - this.label5 = new System.Windows.Forms.Label(); - this.btnSendPLC = new System.Windows.Forms.Button(); - this.cmbParamValues = new System.Windows.Forms.ComboBox(); - this.label22 = new System.Windows.Forms.Label(); - this.label23 = new System.Windows.Forms.Label(); - this.txtValue = new System.Windows.Forms.TextBox(); this.panel2 = new System.Windows.Forms.Panel(); this.lblTaskLog = new System.Windows.Forms.Label(); + this.txtValue = new System.Windows.Forms.TextBox(); + this.label23 = new System.Windows.Forms.Label(); + this.label22 = new System.Windows.Forms.Label(); + this.cmbParamValues = new System.Windows.Forms.ComboBox(); + this.btnSendPLC = new System.Windows.Forms.Button(); + this.label5 = new System.Windows.Forms.Label(); + this.chkEdit = new System.Windows.Forms.CheckBox(); + this.label12 = new System.Windows.Forms.Label(); + this.panel4 = new System.Windows.Forms.Panel(); + this.label20 = new System.Windows.Forms.Label(); + this.txtMReadSize = new System.Windows.Forms.TextBox(); + this.label15 = new System.Windows.Forms.Label(); + this.txtMReadStart = new System.Windows.Forms.TextBox(); + this.lblWatchDog = new System.Windows.Forms.Label(); + this.label14 = new System.Windows.Forms.Label(); + this.lblBitmap = new System.Windows.Forms.Label(); + this.lblCounter = new System.Windows.Forms.Label(); + this.label18 = new System.Windows.Forms.Label(); + this.label17 = new System.Windows.Forms.Label(); + this.label16 = new System.Windows.Forms.Label(); this.tabLog = new System.Windows.Forms.TabPage(); + this.btnOpenLog = new System.Windows.Forms.Button(); + this.label6 = new System.Windows.Forms.Label(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.lblLogfile = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - this.btnOpenLog = new System.Windows.Forms.Button(); this.tabRealtime = new System.Windows.Forms.TabPage(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); - this.lblOutMessage2 = new System.Windows.Forms.Label(); - this.lblOutMessage3 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.lblRawData = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); this.lblOutMessage = 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.label4 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.lblOutMessage3 = new System.Windows.Forms.Label(); + this.lblOutMessage2 = new System.Windows.Forms.Label(); this.tabData = new System.Windows.Forms.TabControl(); this.statusStrip1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); @@ -116,9 +116,9 @@ this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); - this.panel4.SuspendLayout(); this.panel3.SuspendLayout(); this.panel2.SuspendLayout(); + this.panel4.SuspendLayout(); this.tabLog.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); this.tabRealtime.SuspendLayout(); @@ -349,6 +349,16 @@ this.tabMes.TabIndex = 1; this.tabMes.Text = "IOB <--> MES"; // + // btnForceAutoOdl + // + this.btnForceAutoOdl.Location = new System.Drawing.Point(352, 6); + this.btnForceAutoOdl.Name = "btnForceAutoOdl"; + this.btnForceAutoOdl.Size = new System.Drawing.Size(173, 23); + this.btnForceAutoOdl.TabIndex = 89; + this.btnForceAutoOdl.Text = "Force AutoODL"; + this.btnForceAutoOdl.UseVisualStyleBackColor = true; + this.btnForceAutoOdl.Click += new System.EventHandler(this.btnForceAutoOdl_Click); + // // panel1 // this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; @@ -373,129 +383,14 @@ this.panel1.Size = new System.Drawing.Size(343, 231); this.panel1.TabIndex = 88; // - // lblQueueLen + // label19 // - this.lblQueueLen.AutoSize = true; - this.lblQueueLen.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblQueueLen.Location = new System.Drawing.Point(105, 117); - this.lblQueueLen.Name = "lblQueueLen"; - this.lblQueueLen.Size = new System.Drawing.Size(31, 13); - this.lblQueueLen.TabIndex = 83; - this.lblQueueLen.Text = "###"; - // - // lblDataProc - // - this.lblDataProc.AutoSize = true; - this.lblDataProc.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblDataProc.Location = new System.Drawing.Point(105, 44); - this.lblDataProc.Name = "lblDataProc"; - this.lblDataProc.Size = new System.Drawing.Size(19, 13); - this.lblDataProc.TabIndex = 82; - this.lblDataProc.Text = "---"; - // - // label10 - // - this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(14, 67); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(37, 13); - this.label10.TabIndex = 84; - this.label10.Text = "Status"; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(14, 118); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(87, 13); - this.label9.TabIndex = 81; - this.label9.Text = "Event Queue len"; - // - // label8 - // - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(14, 44); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(86, 13); - this.label8.TabIndex = 80; - this.label8.Text = "Data Processed:"; - // - // label11 - // - this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(14, 92); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(63, 13); - this.label11.TabIndex = 86; - this.label11.Text = "Comm Stats"; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(12, 11); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(119, 25); - this.label1.TabIndex = 0; - this.label1.Text = "IOB STATS"; - // - // lblComStats - // - this.lblComStats.AutoSize = true; - this.lblComStats.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblComStats.Location = new System.Drawing.Point(105, 93); - this.lblComStats.Name = "lblComStats"; - this.lblComStats.Size = new System.Drawing.Size(18, 13); - this.lblComStats.TabIndex = 87; - this.lblComStats.Text = "-|-"; - // - // lblStatus - // - this.lblStatus.AutoSize = true; - this.lblStatus.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblStatus.Location = new System.Drawing.Point(105, 67); - this.lblStatus.Name = "lblStatus"; - this.lblStatus.Size = new System.Drawing.Size(19, 13); - this.lblStatus.TabIndex = 85; - this.lblStatus.Text = "..."; - // - // lblQueueFLogLen - // - this.lblQueueFLogLen.AutoSize = true; - this.lblQueueFLogLen.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblQueueFLogLen.Location = new System.Drawing.Point(104, 141); - this.lblQueueFLogLen.Name = "lblQueueFLogLen"; - this.lblQueueFLogLen.Size = new System.Drawing.Size(31, 13); - this.lblQueueFLogLen.TabIndex = 89; - this.lblQueueFLogLen.Text = "###"; - // - // label21 - // - this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(14, 141); - this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(83, 13); - this.label21.TabIndex = 88; - this.label21.Text = "FLog Queue len"; - // - // lblQueueMessLen - // - this.lblQueueMessLen.AutoSize = true; - this.lblQueueMessLen.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblQueueMessLen.Location = new System.Drawing.Point(104, 189); - this.lblQueueMessLen.Name = "lblQueueMessLen"; - this.lblQueueMessLen.Size = new System.Drawing.Size(31, 13); - this.lblQueueMessLen.TabIndex = 91; - this.lblQueueMessLen.Text = "###"; - // - // label13 - // - this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(14, 189); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(84, 13); - this.label13.TabIndex = 90; - this.label13.Text = "Mess Queue len"; + this.label19.AutoSize = true; + this.label19.Location = new System.Drawing.Point(14, 166); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(85, 13); + this.label19.TabIndex = 92; + this.label19.Text = "Alarm Queue len"; // // lblQueueAlarmLen // @@ -507,24 +402,129 @@ this.lblQueueAlarmLen.TabIndex = 93; this.lblQueueAlarmLen.Text = "###"; // - // label19 + // label13 // - this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(14, 166); - this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(85, 13); - this.label19.TabIndex = 92; - this.label19.Text = "Alarm Queue len"; + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(14, 189); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(84, 13); + this.label13.TabIndex = 90; + this.label13.Text = "Mess Queue len"; // - // btnForceAutoOdl + // lblQueueMessLen // - this.btnForceAutoOdl.Location = new System.Drawing.Point(352, 6); - this.btnForceAutoOdl.Name = "btnForceAutoOdl"; - this.btnForceAutoOdl.Size = new System.Drawing.Size(173, 23); - this.btnForceAutoOdl.TabIndex = 89; - this.btnForceAutoOdl.Text = "Force AutoODL"; - this.btnForceAutoOdl.UseVisualStyleBackColor = true; - this.btnForceAutoOdl.Click += new System.EventHandler(this.btnForceAutoOdl_Click); + this.lblQueueMessLen.AutoSize = true; + this.lblQueueMessLen.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblQueueMessLen.Location = new System.Drawing.Point(104, 189); + this.lblQueueMessLen.Name = "lblQueueMessLen"; + this.lblQueueMessLen.Size = new System.Drawing.Size(31, 13); + this.lblQueueMessLen.TabIndex = 91; + this.lblQueueMessLen.Text = "###"; + // + // label21 + // + this.label21.AutoSize = true; + this.label21.Location = new System.Drawing.Point(14, 141); + this.label21.Name = "label21"; + this.label21.Size = new System.Drawing.Size(83, 13); + this.label21.TabIndex = 88; + this.label21.Text = "FLog Queue len"; + // + // lblQueueFLogLen + // + this.lblQueueFLogLen.AutoSize = true; + this.lblQueueFLogLen.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblQueueFLogLen.Location = new System.Drawing.Point(104, 141); + this.lblQueueFLogLen.Name = "lblQueueFLogLen"; + this.lblQueueFLogLen.Size = new System.Drawing.Size(31, 13); + this.lblQueueFLogLen.TabIndex = 89; + this.lblQueueFLogLen.Text = "###"; + // + // lblStatus + // + this.lblStatus.AutoSize = true; + this.lblStatus.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblStatus.Location = new System.Drawing.Point(105, 67); + this.lblStatus.Name = "lblStatus"; + this.lblStatus.Size = new System.Drawing.Size(19, 13); + this.lblStatus.TabIndex = 85; + this.lblStatus.Text = "..."; + // + // lblComStats + // + this.lblComStats.AutoSize = true; + this.lblComStats.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblComStats.Location = new System.Drawing.Point(105, 93); + this.lblComStats.Name = "lblComStats"; + this.lblComStats.Size = new System.Drawing.Size(18, 13); + this.lblComStats.TabIndex = 87; + this.lblComStats.Text = "-|-"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(12, 11); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(119, 25); + this.label1.TabIndex = 0; + this.label1.Text = "IOB STATS"; + // + // label11 + // + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(14, 92); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(63, 13); + this.label11.TabIndex = 86; + this.label11.Text = "Comm Stats"; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(14, 44); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(86, 13); + this.label8.TabIndex = 80; + this.label8.Text = "Data Processed:"; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(14, 118); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(87, 13); + this.label9.TabIndex = 81; + this.label9.Text = "Event Queue len"; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.Location = new System.Drawing.Point(14, 67); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(37, 13); + this.label10.TabIndex = 84; + this.label10.Text = "Status"; + // + // lblDataProc + // + this.lblDataProc.AutoSize = true; + this.lblDataProc.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblDataProc.Location = new System.Drawing.Point(105, 44); + this.lblDataProc.Name = "lblDataProc"; + this.lblDataProc.Size = new System.Drawing.Size(19, 13); + this.lblDataProc.TabIndex = 82; + this.lblDataProc.Text = "---"; + // + // lblQueueLen + // + this.lblQueueLen.AutoSize = true; + this.lblQueueLen.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblQueueLen.Location = new System.Drawing.Point(105, 117); + this.lblQueueLen.Name = "lblQueueLen"; + this.lblQueueLen.Size = new System.Drawing.Size(31, 13); + this.lblQueueLen.TabIndex = 83; + this.lblQueueLen.Text = "###"; // // tabPlc // @@ -554,137 +554,6 @@ this.splitContainer1.SplitterDistance = 485; this.splitContainer1.TabIndex = 94; // - // panel4 - // - this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.panel4.Controls.Add(this.label20); - this.panel4.Controls.Add(this.txtMReadSize); - this.panel4.Controls.Add(this.label15); - this.panel4.Controls.Add(this.txtMReadStart); - this.panel4.Controls.Add(this.lblWatchDog); - this.panel4.Controls.Add(this.label14); - this.panel4.Controls.Add(this.lblBitmap); - this.panel4.Controls.Add(this.lblCounter); - this.panel4.Controls.Add(this.label18); - this.panel4.Controls.Add(this.label17); - this.panel4.Controls.Add(this.label16); - this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel4.Location = new System.Drawing.Point(0, 0); - this.panel4.Margin = new System.Windows.Forms.Padding(2); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(397, 513); - this.panel4.TabIndex = 92; - // - // label16 - // - this.label16.AutoSize = true; - this.label16.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label16.Location = new System.Drawing.Point(12, 14); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(131, 25); - this.label16.TabIndex = 2; - this.label16.Text = "PLC --> MES"; - // - // label17 - // - this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(14, 54); - this.label17.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(44, 13); - this.label17.TabIndex = 4; - this.label17.Text = "Counter"; - // - // label18 - // - this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(14, 76); - this.label18.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(47, 13); - this.label18.TabIndex = 6; - this.label18.Text = "BIT map"; - // - // lblCounter - // - this.lblCounter.AutoSize = true; - this.lblCounter.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblCounter.Location = new System.Drawing.Point(98, 54); - this.lblCounter.Name = "lblCounter"; - this.lblCounter.Size = new System.Drawing.Size(28, 13); - this.lblCounter.TabIndex = 88; - this.lblCounter.Text = "000"; - // - // lblBitmap - // - this.lblBitmap.AutoSize = true; - this.lblBitmap.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblBitmap.Location = new System.Drawing.Point(98, 76); - this.lblBitmap.Name = "lblBitmap"; - this.lblBitmap.Size = new System.Drawing.Size(243, 13); - this.lblBitmap.TabIndex = 89; - this.lblBitmap.Text = "00000000 00000000 00000000 00000000"; - // - // label14 - // - this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(180, 54); - this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(59, 13); - this.label14.TabIndex = 90; - this.label14.Text = "WatchDog"; - // - // lblWatchDog - // - this.lblWatchDog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.lblWatchDog.AutoSize = true; - this.lblWatchDog.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblWatchDog.Location = new System.Drawing.Point(350, 53); - this.lblWatchDog.Name = "lblWatchDog"; - this.lblWatchDog.Size = new System.Drawing.Size(35, 13); - this.lblWatchDog.TabIndex = 91; - this.lblWatchDog.Text = "0000"; - this.lblWatchDog.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // txtMReadStart - // - this.txtMReadStart.Location = new System.Drawing.Point(210, 19); - this.txtMReadStart.Name = "txtMReadStart"; - this.txtMReadStart.Size = new System.Drawing.Size(56, 20); - this.txtMReadStart.TabIndex = 108; - this.txtMReadStart.Text = "0"; - this.txtMReadStart.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - this.txtMReadStart.TextChanged += new System.EventHandler(this.txtMReadStart_TextChanged); - // - // label15 - // - this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(165, 22); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(39, 13); - this.label15.TabIndex = 109; - this.label15.Text = "Start #"; - // - // txtMReadSize - // - this.txtMReadSize.Location = new System.Drawing.Point(327, 19); - this.txtMReadSize.Name = "txtMReadSize"; - this.txtMReadSize.Size = new System.Drawing.Size(56, 20); - this.txtMReadSize.TabIndex = 110; - this.txtMReadSize.Text = "8"; - this.txtMReadSize.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; - this.txtMReadSize.TextChanged += new System.EventHandler(this.txtMReadSize_TextChanged); - // - // label20 - // - this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(282, 22); - this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(38, 13); - this.label20.TabIndex = 111; - this.label20.Text = "# Byte"; - // // panel3 // this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; @@ -704,86 +573,6 @@ this.panel3.Size = new System.Drawing.Size(485, 513); this.panel3.TabIndex = 91; // - // label12 - // - this.label12.AutoSize = true; - this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label12.Location = new System.Drawing.Point(14, 17); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(131, 25); - this.label12.TabIndex = 1; - this.label12.Text = "MES --> PLC"; - // - // chkEdit - // - this.chkEdit.AutoSize = true; - this.chkEdit.Location = new System.Drawing.Point(252, 22); - this.chkEdit.Margin = new System.Windows.Forms.Padding(2); - this.chkEdit.Name = "chkEdit"; - this.chkEdit.Size = new System.Drawing.Size(79, 17); - this.chkEdit.TabIndex = 8; - this.chkEdit.Text = "SET DATA"; - this.chkEdit.UseVisualStyleBackColor = true; - this.chkEdit.Click += new System.EventHandler(this.ChkEdit_CheckedChanged); - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.Location = new System.Drawing.Point(14, 184); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(115, 25); - this.label5.TabIndex = 1; - this.label5.Text = "TASK LIST"; - // - // btnSendPLC - // - this.btnSendPLC.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnSendPLC.Location = new System.Drawing.Point(19, 132); - this.btnSendPLC.Margin = new System.Windows.Forms.Padding(2); - this.btnSendPLC.Name = "btnSendPLC"; - this.btnSendPLC.Size = new System.Drawing.Size(312, 30); - this.btnSendPLC.TabIndex = 6; - this.btnSendPLC.Text = "SEND --> PLC"; - this.btnSendPLC.UseVisualStyleBackColor = true; - this.btnSendPLC.Click += new System.EventHandler(this.BtnSendPLC_Click); - // - // cmbParamValues - // - this.cmbParamValues.FormattingEnabled = true; - this.cmbParamValues.Location = new System.Drawing.Point(95, 54); - this.cmbParamValues.Name = "cmbParamValues"; - this.cmbParamValues.Size = new System.Drawing.Size(236, 21); - this.cmbParamValues.TabIndex = 82; - // - // label22 - // - this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(26, 57); - this.label22.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(55, 13); - this.label22.TabIndex = 83; - this.label22.Text = "Parameter"; - // - // label23 - // - this.label23.AutoSize = true; - this.label23.Location = new System.Drawing.Point(25, 91); - this.label23.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(34, 13); - this.label23.TabIndex = 84; - this.label23.Text = "Value"; - // - // txtValue - // - this.txtValue.Location = new System.Drawing.Point(95, 91); - this.txtValue.Margin = new System.Windows.Forms.Padding(2); - this.txtValue.Name = "txtValue"; - this.txtValue.Size = new System.Drawing.Size(236, 20); - this.txtValue.TabIndex = 85; - // // panel2 // this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -805,6 +594,217 @@ this.lblTaskLog.TabIndex = 81; this.lblTaskLog.Text = "..."; // + // txtValue + // + this.txtValue.Location = new System.Drawing.Point(95, 91); + this.txtValue.Margin = new System.Windows.Forms.Padding(2); + this.txtValue.Name = "txtValue"; + this.txtValue.Size = new System.Drawing.Size(236, 20); + this.txtValue.TabIndex = 85; + // + // label23 + // + this.label23.AutoSize = true; + this.label23.Location = new System.Drawing.Point(25, 91); + this.label23.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label23.Name = "label23"; + this.label23.Size = new System.Drawing.Size(34, 13); + this.label23.TabIndex = 84; + this.label23.Text = "Value"; + // + // label22 + // + this.label22.AutoSize = true; + this.label22.Location = new System.Drawing.Point(26, 57); + this.label22.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label22.Name = "label22"; + this.label22.Size = new System.Drawing.Size(55, 13); + this.label22.TabIndex = 83; + this.label22.Text = "Parameter"; + // + // cmbParamValues + // + this.cmbParamValues.FormattingEnabled = true; + this.cmbParamValues.Location = new System.Drawing.Point(95, 54); + this.cmbParamValues.Name = "cmbParamValues"; + this.cmbParamValues.Size = new System.Drawing.Size(236, 21); + this.cmbParamValues.TabIndex = 82; + // + // btnSendPLC + // + this.btnSendPLC.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnSendPLC.Location = new System.Drawing.Point(19, 132); + this.btnSendPLC.Margin = new System.Windows.Forms.Padding(2); + this.btnSendPLC.Name = "btnSendPLC"; + this.btnSendPLC.Size = new System.Drawing.Size(312, 30); + this.btnSendPLC.TabIndex = 6; + this.btnSendPLC.Text = "SEND --> PLC"; + this.btnSendPLC.UseVisualStyleBackColor = true; + this.btnSendPLC.Click += new System.EventHandler(this.BtnSendPLC_Click); + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label5.Location = new System.Drawing.Point(14, 184); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(115, 25); + this.label5.TabIndex = 1; + this.label5.Text = "TASK LIST"; + // + // chkEdit + // + this.chkEdit.AutoSize = true; + this.chkEdit.Location = new System.Drawing.Point(252, 22); + this.chkEdit.Margin = new System.Windows.Forms.Padding(2); + this.chkEdit.Name = "chkEdit"; + this.chkEdit.Size = new System.Drawing.Size(79, 17); + this.chkEdit.TabIndex = 8; + this.chkEdit.Text = "SET DATA"; + this.chkEdit.UseVisualStyleBackColor = true; + this.chkEdit.Click += new System.EventHandler(this.ChkEdit_CheckedChanged); + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label12.Location = new System.Drawing.Point(14, 17); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(131, 25); + this.label12.TabIndex = 1; + this.label12.Text = "MES --> PLC"; + // + // panel4 + // + this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.panel4.Controls.Add(this.label20); + this.panel4.Controls.Add(this.txtMReadSize); + this.panel4.Controls.Add(this.label15); + this.panel4.Controls.Add(this.txtMReadStart); + this.panel4.Controls.Add(this.lblWatchDog); + this.panel4.Controls.Add(this.label14); + this.panel4.Controls.Add(this.lblBitmap); + this.panel4.Controls.Add(this.lblCounter); + this.panel4.Controls.Add(this.label18); + this.panel4.Controls.Add(this.label17); + this.panel4.Controls.Add(this.label16); + this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel4.Location = new System.Drawing.Point(0, 0); + this.panel4.Margin = new System.Windows.Forms.Padding(2); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(397, 513); + this.panel4.TabIndex = 92; + // + // label20 + // + this.label20.AutoSize = true; + this.label20.Location = new System.Drawing.Point(282, 22); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(38, 13); + this.label20.TabIndex = 111; + this.label20.Text = "# Byte"; + // + // txtMReadSize + // + this.txtMReadSize.Location = new System.Drawing.Point(327, 19); + this.txtMReadSize.Name = "txtMReadSize"; + this.txtMReadSize.Size = new System.Drawing.Size(56, 20); + this.txtMReadSize.TabIndex = 110; + this.txtMReadSize.Text = "8"; + this.txtMReadSize.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.txtMReadSize.TextChanged += new System.EventHandler(this.txtMReadSize_TextChanged); + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(165, 22); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(39, 13); + this.label15.TabIndex = 109; + this.label15.Text = "Start #"; + // + // txtMReadStart + // + this.txtMReadStart.Location = new System.Drawing.Point(210, 19); + this.txtMReadStart.Name = "txtMReadStart"; + this.txtMReadStart.Size = new System.Drawing.Size(56, 20); + this.txtMReadStart.TabIndex = 108; + this.txtMReadStart.Text = "0"; + this.txtMReadStart.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; + this.txtMReadStart.TextChanged += new System.EventHandler(this.txtMReadStart_TextChanged); + // + // lblWatchDog + // + this.lblWatchDog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.lblWatchDog.AutoSize = true; + this.lblWatchDog.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblWatchDog.Location = new System.Drawing.Point(350, 53); + this.lblWatchDog.Name = "lblWatchDog"; + this.lblWatchDog.Size = new System.Drawing.Size(35, 13); + this.lblWatchDog.TabIndex = 91; + this.lblWatchDog.Text = "0000"; + this.lblWatchDog.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // label14 + // + this.label14.AutoSize = true; + this.label14.Location = new System.Drawing.Point(180, 54); + this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(59, 13); + this.label14.TabIndex = 90; + this.label14.Text = "WatchDog"; + // + // lblBitmap + // + this.lblBitmap.AutoSize = true; + this.lblBitmap.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblBitmap.Location = new System.Drawing.Point(98, 76); + this.lblBitmap.Name = "lblBitmap"; + this.lblBitmap.Size = new System.Drawing.Size(243, 13); + this.lblBitmap.TabIndex = 89; + this.lblBitmap.Text = "00000000 00000000 00000000 00000000"; + // + // lblCounter + // + this.lblCounter.AutoSize = true; + this.lblCounter.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblCounter.Location = new System.Drawing.Point(98, 54); + this.lblCounter.Name = "lblCounter"; + this.lblCounter.Size = new System.Drawing.Size(28, 13); + this.lblCounter.TabIndex = 88; + this.lblCounter.Text = "000"; + // + // label18 + // + this.label18.AutoSize = true; + this.label18.Location = new System.Drawing.Point(14, 76); + this.label18.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(47, 13); + this.label18.TabIndex = 6; + this.label18.Text = "BIT map"; + // + // label17 + // + this.label17.AutoSize = true; + this.label17.Location = new System.Drawing.Point(14, 54); + this.label17.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(44, 13); + this.label17.TabIndex = 4; + this.label17.Text = "Counter"; + // + // label16 + // + this.label16.AutoSize = true; + this.label16.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label16.Location = new System.Drawing.Point(12, 14); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(131, 25); + this.label16.TabIndex = 2; + this.label16.Text = "PLC --> MES"; + // // tabLog // this.tabLog.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); @@ -818,6 +818,29 @@ this.tabLog.TabIndex = 3; this.tabLog.Text = "logfile"; // + // btnOpenLog + // + this.btnOpenLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnOpenLog.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; + this.btnOpenLog.Location = new System.Drawing.Point(730, 6); + this.btnOpenLog.Margin = new System.Windows.Forms.Padding(2); + this.btnOpenLog.Name = "btnOpenLog"; + this.btnOpenLog.Size = new System.Drawing.Size(158, 22); + this.btnOpenLog.TabIndex = 5; + this.btnOpenLog.Text = "Open Machine FULL LOG"; + this.btnOpenLog.UseVisualStyleBackColor = true; + this.btnOpenLog.Click += new System.EventHandler(this.BtnOpenLog_Click); + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label6.Location = new System.Drawing.Point(12, 6); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(215, 13); + this.label6.TabIndex = 4; + this.label6.Text = "Log message watcher (last message)"; + // // flowLayoutPanel1 // this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -842,29 +865,6 @@ this.lblLogfile.TabIndex = 2; this.lblLogfile.Text = resources.GetString("lblLogfile.Text"); // - // label6 - // - this.label6.AutoSize = true; - this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label6.Location = new System.Drawing.Point(12, 6); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(215, 13); - this.label6.TabIndex = 4; - this.label6.Text = "Log message watcher (last message)"; - // - // btnOpenLog - // - this.btnOpenLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnOpenLog.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.btnOpenLog.Location = new System.Drawing.Point(730, 6); - this.btnOpenLog.Margin = new System.Windows.Forms.Padding(2); - this.btnOpenLog.Name = "btnOpenLog"; - this.btnOpenLog.Size = new System.Drawing.Size(158, 22); - this.btnOpenLog.TabIndex = 5; - this.btnOpenLog.Text = "Open Machine FULL LOG"; - this.btnOpenLog.UseVisualStyleBackColor = true; - this.btnOpenLog.Click += new System.EventHandler(this.BtnOpenLog_Click); - // // tabRealtime // this.tabRealtime.BackColor = System.Drawing.Color.Black; @@ -905,54 +905,40 @@ this.tableLayoutPanel2.Size = new System.Drawing.Size(948, 546); this.tableLayoutPanel2.TabIndex = 65; // - // lblOutMessage2 + // lblOutMessage // - 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(156, 16); - this.lblOutMessage2.Name = "lblOutMessage2"; - this.lblOutMessage2.Size = new System.Drawing.Size(789, 13); - this.lblOutMessage2.TabIndex = 62; - this.lblOutMessage2.Text = "..."; + this.lblOutMessage.AutoSize = true; + this.lblOutMessage.Dock = System.Windows.Forms.DockStyle.Top; + this.lblOutMessage.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblOutMessage.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); + this.lblOutMessage.Location = new System.Drawing.Point(25, 16); + this.lblOutMessage.Name = "lblOutMessage"; + this.lblOutMessage.Size = new System.Drawing.Size(44, 13); + this.lblOutMessage.TabIndex = 61; + this.lblOutMessage.Text = "..."; // - // lblOutMessage3 + // label2 // - 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(74, 16); - this.lblOutMessage3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.lblOutMessage3.Name = "lblOutMessage3"; - this.lblOutMessage3.Size = new System.Drawing.Size(77, 13); - this.lblOutMessage3.TabIndex = 68; - this.lblOutMessage3.Text = "..."; + this.label2.AutoSize = true; + this.label2.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.label2.Location = new System.Drawing.Point(24, 0); + this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(46, 13); + this.label2.TabIndex = 65; + this.label2.Text = "SIGNAL"; // - // label3 + // label7 // - this.label3.AutoSize = true; - this.label3.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.label3.Location = new System.Drawing.Point(155, 0); - this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(73, 13); - this.label3.TabIndex = 64; - this.label3.Text = "URL CALLED"; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.label4.Location = new System.Drawing.Point(74, 0); - this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(77, 13); - this.label4.TabIndex = 65; - this.label4.Text = "OTHER DATA"; + this.label7.AutoSize = true; + this.label7.BackColor = System.Drawing.Color.Black; + this.label7.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.label7.Location = new System.Drawing.Point(2, 0); + this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(18, 13); + this.label7.TabIndex = 66; + this.label7.Text = "IN"; // // lblRawData // @@ -969,40 +955,54 @@ this.lblRawData.Text = "..."; this.lblRawData.TextAlign = System.Drawing.ContentAlignment.TopRight; // - // label7 + // label4 // - this.label7.AutoSize = true; - this.label7.BackColor = System.Drawing.Color.Black; - this.label7.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.label7.Location = new System.Drawing.Point(2, 0); - this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(18, 13); - this.label7.TabIndex = 66; - this.label7.Text = "IN"; + this.label4.AutoSize = true; + this.label4.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.label4.Location = new System.Drawing.Point(74, 0); + this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(77, 13); + this.label4.TabIndex = 65; + this.label4.Text = "OTHER DATA"; // - // label2 + // label3 // - this.label2.AutoSize = true; - this.label2.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.label2.Location = new System.Drawing.Point(24, 0); - this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(46, 13); - this.label2.TabIndex = 65; - this.label2.Text = "SIGNAL"; + this.label3.AutoSize = true; + this.label3.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.label3.Location = new System.Drawing.Point(155, 0); + this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(73, 13); + this.label3.TabIndex = 64; + this.label3.Text = "URL CALLED"; // - // lblOutMessage + // lblOutMessage3 // - this.lblOutMessage.AutoSize = true; - this.lblOutMessage.Dock = System.Windows.Forms.DockStyle.Top; - this.lblOutMessage.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblOutMessage.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); - this.lblOutMessage.Location = new System.Drawing.Point(25, 16); - this.lblOutMessage.Name = "lblOutMessage"; - this.lblOutMessage.Size = new System.Drawing.Size(44, 13); - this.lblOutMessage.TabIndex = 61; - this.lblOutMessage.Text = "..."; + 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(74, 16); + this.lblOutMessage3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblOutMessage3.Name = "lblOutMessage3"; + this.lblOutMessage3.Size = new System.Drawing.Size(77, 13); + 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(156, 16); + this.lblOutMessage2.Name = "lblOutMessage2"; + this.lblOutMessage2.Size = new System.Drawing.Size(789, 13); + this.lblOutMessage2.TabIndex = 62; + this.lblOutMessage2.Text = "..."; // // tabData // @@ -1047,12 +1047,12 @@ this.splitContainer1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); - this.panel4.ResumeLayout(false); - this.panel4.PerformLayout(); this.panel3.ResumeLayout(false); this.panel3.PerformLayout(); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); + this.panel4.ResumeLayout(false); + this.panel4.PerformLayout(); this.tabLog.ResumeLayout(false); this.tabLog.PerformLayout(); this.flowLayoutPanel1.ResumeLayout(false); diff --git a/IOB-WIN-NEXT/IobGeneric.cs b/IOB-WIN-NEXT/IobGeneric.cs index cd1c35c7..50bb2bdd 100644 --- a/IOB-WIN-NEXT/IobGeneric.cs +++ b/IOB-WIN-NEXT/IobGeneric.cs @@ -915,7 +915,7 @@ namespace IOB_WIN_NEXT { lgInfo("SERVER ONLINE in checkServerAlive"); parentForm.commSrvActive = 1; - dtVetoPing = DateTime.Now.AddMilliseconds(baseUtils.nextPauseSendMSec); + dtVetoPing = DateTime.Now.AddMilliseconds(baseUtils.nextPauseSendMSec * 2); } else { @@ -928,7 +928,7 @@ namespace IOB_WIN_NEXT else { // allungo periodo controllo... - dtVetoPing = DateTime.Now.AddMilliseconds(baseUtils.nextPauseSendMSec * 3); + dtVetoPing = DateTime.Now.AddMilliseconds(baseUtils.nextPauseSendMSec * 5); } } else @@ -936,7 +936,7 @@ namespace IOB_WIN_NEXT lgInfo($"SERVER NOT RESPONDING (PING at {cIobConf.serverData.MPIP})"); MPOnline = false; // imposto veto a 10 volte reinvio dati standard... - dtVetoPing = DateTime.Now.AddMilliseconds(baseUtils.nextPauseSendMSec * 3); + dtVetoPing = DateTime.Now.AddMilliseconds(baseUtils.nextPauseSendMSec * 5); utils.dtVetoSend = dtVetoPing; } } @@ -2872,8 +2872,7 @@ namespace IOB_WIN_NEXT // indico quanti allarmi foreach (var item in alarmMaps) { - // inizializzo array status degli allarmi - item.alarmsState = new int[item.size / 2]; + item.SetupData(); // loggo lgInfo($"Decodifica aree alarmMap: {item.description} | {item.memAddr} x {item.size} byte | {item.messages} messaggi allarme"); } @@ -4526,6 +4525,10 @@ namespace IOB_WIN_NEXT public bool sendAlarmVariations(string memAddr, int index, int lastStatus, int currStatus) { bool fatto = false; + // confronto allarmi filtrato stile blink per bit status: + // - allarmi che iniziano per # IGNORATI + // - altri allarmi con un countdown da MAX_COUNTER_BLINK a 0 per il fronte di discesa + if (lastStatus != currStatus) { // invio GET del MemoryAddress, del banco e del valore currStatus diff --git a/IOB-WIN-NEXT/MainForm.cs b/IOB-WIN-NEXT/MainForm.cs index b5f93ec6..71aaeec1 100644 --- a/IOB-WIN-NEXT/MainForm.cs +++ b/IOB-WIN-NEXT/MainForm.cs @@ -370,7 +370,7 @@ namespace IOB_WIN_NEXT if (answ) { lgInfo("SERVER ONLINE"); - utils.dtVetoPing = DateTime.Now.AddMilliseconds(baseUtils.nextPauseSendMSec); + utils.dtVetoPing = DateTime.Now.AddMilliseconds(baseUtils.nextPauseSendMSec * 2); } else { @@ -382,7 +382,7 @@ namespace IOB_WIN_NEXT else { // allungo periodo controllo... - utils.dtVetoPing = DateTime.Now.AddMilliseconds(baseUtils.nextPauseSendMSec * 3); + utils.dtVetoPing = DateTime.Now.AddMilliseconds(baseUtils.nextPauseSendMSec * 5); } } else