From 562fe6d0615eecf92a7e5c5edf9d316f8295b199 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期五, 10 七月 2020 17:16:55 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs
index f89c6b7..60a09b0 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.Designer.cs
@@ -64,7 +64,7 @@
this.ioIn6 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
this.ioIn5 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
this.ioIn1 = new Bro.UI.Model.Winform.IOIndicatorCtrl();
- this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.timerIOStatus = new System.Windows.Forms.Timer(this.components);
this.tableLayoutPanel1.SuspendLayout();
this.groupBoxIOOut.SuspendLayout();
this.groupBoxIOIn.SuspendLayout();
@@ -425,11 +425,11 @@
this.ioIn1.Size = new System.Drawing.Size(90, 24);
this.ioIn1.TabIndex = 4;
//
- // timer1
+ // timerIOStatus
//
- this.timer1.Enabled = true;
- this.timer1.Interval = 200;
- this.timer1.Tick += new System.EventHandler(this.RefreshIOStatus);
+ this.timerIOStatus.Enabled = true;
+ this.timerIOStatus.Interval = 200;
+ this.timerIOStatus.Tick += new System.EventHandler(this.RefreshIOStatus);
//
// CtrlMotionCardIOStatus
//
@@ -482,6 +482,6 @@
private Model.Winform.IOIndicatorCtrl ioOut6;
private Model.Winform.IOIndicatorCtrl ioOut5;
private Model.Winform.IOIndicatorCtrl ioOut1;
- private System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.Timer timerIOStatus;
}
}
--
Gitblit v1.8.0