Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 7f72ec7b 由 几米阳光
选项

1

1 个父辈 ae90acbf
内嵌 并排
正在显示 3 个修改的文件 包含 19 行增加 和 32 行删除
source/ACSingleStore/FrmStoreBox.Designer.cs
...@@ -224,6 +224,7 @@ ...@@ -224,6 +224,7 @@
this.btnStoreStop = new System.Windows.Forms.Button(); this.btnStoreStop = new System.Windows.Forms.Button();
this.btnStoreStart = new System.Windows.Forms.Button(); this.btnStoreStart = new System.Windows.Forms.Button();
this.tabPage5 = new System.Windows.Forms.TabPage(); this.tabPage5 = new System.Windows.Forms.TabPage();
this.btnDebug = new System.Windows.Forms.Button();
this.btnAxisOff = new System.Windows.Forms.Button(); this.btnAxisOff = new System.Windows.Forms.Button();
this.btnAxisOn = new System.Windows.Forms.Button(); this.btnAxisOn = new System.Windows.Forms.Button();
this.btnScanCode = new System.Windows.Forms.Button(); this.btnScanCode = new System.Windows.Forms.Button();
...@@ -234,7 +235,6 @@ ...@@ -234,7 +235,6 @@
this.button4 = new System.Windows.Forms.Button(); this.button4 = new System.Windows.Forms.Button();
this.btnClearL = new System.Windows.Forms.Button(); this.btnClearL = new System.Windows.Forms.Button();
this.btnLogDebug = new System.Windows.Forms.Button(); this.btnLogDebug = new System.Windows.Forms.Button();
this.btnDebug = new System.Windows.Forms.Button();
this.groupAxis.SuspendLayout(); this.groupAxis.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupInout.SuspendLayout(); this.groupInout.SuspendLayout();
...@@ -362,7 +362,7 @@ ...@@ -362,7 +362,7 @@
// chbAutoRead // chbAutoRead
// //
this.chbAutoRead.AutoSize = true; this.chbAutoRead.AutoSize = true;
this.chbAutoRead.Location = new System.Drawing.Point(401, 238); this.chbAutoRead.Location = new System.Drawing.Point(418, 205);
this.chbAutoRead.Name = "chbAutoRead"; this.chbAutoRead.Name = "chbAutoRead";
this.chbAutoRead.Size = new System.Drawing.Size(99, 21); this.chbAutoRead.Size = new System.Drawing.Size(99, 21);
this.chbAutoRead.TabIndex = 296; this.chbAutoRead.TabIndex = 296;
...@@ -483,7 +483,7 @@ ...@@ -483,7 +483,7 @@
this.btnReadPosition.Cursor = System.Windows.Forms.Cursors.Default; this.btnReadPosition.Cursor = System.Windows.Forms.Cursors.Default;
this.btnReadPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnReadPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadPosition.ForeColor = System.Drawing.SystemColors.ControlText; this.btnReadPosition.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnReadPosition.Location = new System.Drawing.Point(401, 194); this.btnReadPosition.Location = new System.Drawing.Point(418, 298);
this.btnReadPosition.Name = "btnReadPosition"; this.btnReadPosition.Name = "btnReadPosition";
this.btnReadPosition.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnReadPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnReadPosition.Size = new System.Drawing.Size(90, 33); this.btnReadPosition.Size = new System.Drawing.Size(90, 33);
...@@ -2586,6 +2586,17 @@ ...@@ -2586,6 +2586,17 @@
this.tabPage5.Text = " 设备调试 "; this.tabPage5.Text = " 设备调试 ";
this.tabPage5.UseVisualStyleBackColor = true; this.tabPage5.UseVisualStyleBackColor = true;
// //
// btnDebug
//
this.btnDebug.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDebug.Location = new System.Drawing.Point(806, 4);
this.btnDebug.Name = "btnDebug";
this.btnDebug.Size = new System.Drawing.Size(132, 39);
this.btnDebug.TabIndex = 12;
this.btnDebug.Text = "启用调试";
this.btnDebug.UseVisualStyleBackColor = true;
this.btnDebug.Click += new System.EventHandler(this.btnDebug_Click);
//
// btnAxisOff // btnAxisOff
// //
this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
...@@ -2697,17 +2708,6 @@ ...@@ -2697,17 +2708,6 @@
this.btnLogDebug.UseVisualStyleBackColor = true; this.btnLogDebug.UseVisualStyleBackColor = true;
this.btnLogDebug.Click += new System.EventHandler(this.开启DEBUGToolStripMenuItem_Click); this.btnLogDebug.Click += new System.EventHandler(this.开启DEBUGToolStripMenuItem_Click);
// //
// btnDebug
//
this.btnDebug.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDebug.Location = new System.Drawing.Point(806, 4);
this.btnDebug.Name = "btnDebug";
this.btnDebug.Size = new System.Drawing.Size(132, 39);
this.btnDebug.TabIndex = 12;
this.btnDebug.Text = "启用调试";
this.btnDebug.UseVisualStyleBackColor = true;
this.btnDebug.Click += new System.EventHandler(this.btnDebug_Click);
//
// FrmStoreBox // FrmStoreBox
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......
source/ACSingleStore/FrmStoreBox.cs
...@@ -157,8 +157,7 @@ namespace OnlineStore.ACSingleStore ...@@ -157,8 +157,7 @@ namespace OnlineStore.ACSingleStore
cmbHomeType.SelectedIndex = 1; cmbHomeType.SelectedIndex = 1;
HideForm(); HideForm();
this.Opacity = 1; this.Opacity = 1;
txtTempPort.Text = store.Config.Humiture_Port;
// HumitureController.QueryData();
} }
private DateTime preReadModblsTime = DateTime.Now; private DateTime preReadModblsTime = DateTime.Now;
private void timer1_Tick(object sender, EventArgs e) private void timer1_Tick(object sender, EventArgs e)
...@@ -166,11 +165,8 @@ namespace OnlineStore.ACSingleStore ...@@ -166,11 +165,8 @@ namespace OnlineStore.ACSingleStore
if (!this.Visible) if (!this.Visible)
{ {
return; return;
} }
//HumitureServer.RandomData(store.Config.GetTempAddrList()); lblTemp.Text = store.currTempStr;
lblTemp.Text = store.currTempStr;
//验证运动是否完成
//CheckWait();
//忙碌状态不读取状态 //忙碌状态不读取状态
if (!store.storeRunStatus.Equals(StoreRunStatus.Busy)) if (!store.storeRunStatus.Equals(StoreRunStatus.Busy))
{ {
...@@ -235,15 +231,7 @@ namespace OnlineStore.ACSingleStore ...@@ -235,15 +231,7 @@ namespace OnlineStore.ACSingleStore
lblWarnMsg.Text = store.WarnMsg; lblWarnMsg.Text = store.WarnMsg;
if (store.Config.IsHasDoorLimit.Equals(1)) if (store.Config.IsHasDoorLimit.Equals(1))
{ {
//if (store.KNDIOValue(IO_Type.Left_Door_LimitSingle).Equals(IO_VALUE.LOW))
//{
// lblWarnMsg.Text = lblWarnMsg.Text + " 左侧门未关";
//}
//if (store.KNDIOValue(IO_Type.Right_Door_LimitSingle).Equals(IO_VALUE.LOW))
//{
// lblWarnMsg.Text = lblWarnMsg.Text + " 右侧门未关";
//}
if (store.KNDIOValue(IO_Type.Door_LimitSingle).Equals(IO_VALUE.LOW)) if (store.KNDIOValue(IO_Type.Door_LimitSingle).Equals(IO_VALUE.LOW))
{ {
lblWarnMsg.Text = lblWarnMsg.Text + " 前门未关"; lblWarnMsg.Text = lblWarnMsg.Text + " 前门未关";
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -188,8 +188,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -188,8 +188,7 @@ namespace OnlineStore.DeviceLibrary
//TODO 启动时先所有轴远点返回，测试暂时关闭 //TODO 启动时先所有轴远点返回，测试暂时关闭
storeRunStatus = StoreRunStatus.HomeMoving; storeRunStatus = StoreRunStatus.HomeMoving;
storeStatus = StoreStatus.ResetMove; storeStatus = StoreStatus.ResetMove;
//启动温湿度服务器 //启动温湿度服务器
//HumitureServer.StartTemperateServer(Config.TemperateServer_Port);
HumitureController.Init(Config.Humiture_Port); HumitureController.Init(Config.Humiture_Port);
ReturnHome(); ReturnHome();
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!