Skip to content

刘韬 / MIMO

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 8563a8cf 由 刘韬
选项

1

1 个父辈 03248b0f
全部展开
内嵌 并排
正在显示 13 个修改的文件 包含 376 行增加 和 34 行删除
DeviceLibrary/DeviceLibrary.csproj
...@@ -126,6 +126,12 @@ ...@@ -126,6 +126,12 @@
<Compile Include="userControl\AxisTipControl.Designer.cs"> <Compile Include="userControl\AxisTipControl.Designer.cs">
<DependentUpon>AxisTipControl.cs</DependentUpon> <DependentUpon>AxisTipControl.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="userControl\FixtureSizeConfigControl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="userControl\FixtureSizeConfigControl.Designer.cs">
<DependentUpon>FixtureSizeConfigControl.cs</DependentUpon>
</Compile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="userControl\AxisMoveControl.resx"> <EmbeddedResource Include="userControl\AxisMoveControl.resx">
...@@ -134,6 +140,9 @@ ...@@ -134,6 +140,9 @@
<EmbeddedResource Include="userControl\AxisTipControl.resx"> <EmbeddedResource Include="userControl\AxisTipControl.resx">
<DependentUpon>AxisTipControl.cs</DependentUpon> <DependentUpon>AxisTipControl.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="userControl\FixtureSizeConfigControl.resx">
<DependentUpon>FixtureSizeConfigControl.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Common\Common.csproj"> <ProjectReference Include="..\Common\Common.csproj">
......
DeviceLibrary/DeviceLibrary/AxisBean.cs
...@@ -357,21 +357,18 @@ namespace DeviceLibrary ...@@ -357,21 +357,18 @@ namespace DeviceLibrary
return true; return true;
} }
private bool IsInProcess = false; private bool IsInProcess = false;
private DateTime lastOkTime = DateTime.Now;
private void CheckTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) private void CheckTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{ {
TimeSpan pan = DateTime.Now - lastOkTime; if (IsInProcess ) { return; }
if (IsInProcess && pan.TotalMilliseconds < 100) { return; }
try try
{ {
IsInProcess = true; IsInProcess = true;
lastOkTime = DateTime.Now;
if (IOManager.IOValue(TargetIoType).Equals(TargetIoValue)) if (IOManager.IOValue(TargetIoType).Equals(TargetIoValue))
{ {
SuddenStop();
StopAxisCheckMove(); StopAxisCheckMove();
LogUtil.info(AxisName + "上料轴，检测到 " + TargetIoType + "=" + TargetIoValue + "，停止运动"); LogUtil.info(AxisName + "上料轴，检测到 " + TargetIoType + "=" + TargetIoValue + "，停止运动");
SuddenStop();
} }
} }
catch (Exception ex) catch (Exception ex)
......
DeviceLibrary/DeviceLibrary/Camera.cs
...@@ -156,6 +156,8 @@ public class HIKCamera ...@@ -156,6 +156,8 @@ public class HIKCamera
if (WareNumber.Length > 200) { if (WareNumber.Length > 200) {
WareNumber = ""; WareNumber = "";
} }
if (string.IsNullOrEmpty(WareNumber))
WareNumber = DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss");
string dir = $"\\image\\Fixture\\{storeMoveType}\\{PositionNum}\\"; string dir = $"\\image\\Fixture\\{storeMoveType}\\{PositionNum}\\";
Directory.CreateDirectory(dir); Directory.CreateDirectory(dir);
......
DeviceLibrary/DeviceLibrary/ServerCommunication.cs
...@@ -159,12 +159,19 @@ namespace DeviceLibrary ...@@ -159,12 +159,19 @@ namespace DeviceLibrary
//= 7x12 = CODE //= 7x12 = CODE
foreach (string str in codeList) foreach (string str in codeList)
{ {
string code = str.Replace("\r",""); string code = str.Replace("\r", "");
code = code.Replace("\n",""); code = code.Replace("\n", "");
//根据二维码开头获取固定尺寸 //根据二维码开头获取固定尺寸
string codeSize = $"{reelw}x{reelh}"; string codeSize = $"{reelw}x{reelh}";
message = message + "=" + "1+0x0-" + codeSize + "=" + code + spiltStr; if (FixtureConfig.GetCodeSize(str, out int h, out int w, out bool rcode))
{
codeSize = $"{w}x{h}";
if (!rcode)
message = message + "=" + "1+0x0-" + codeSize + "=" + code + spiltStr;
LogUtil.info($"加载到fixcode,{w}x{h},remove:{rcode}");
}else
message = message + "=" + "1+0x0-" + codeSize + "=" + code + spiltStr;
} }
return message; return message;
} }
......
DeviceLibrary/DeviceLibrary/SocketScanner.cs
...@@ -72,6 +72,10 @@ namespace DeviceLibrary ...@@ -72,6 +72,10 @@ namespace DeviceLibrary
{ {
return false; return false;
} }
while (socket.Client.Available > 0) {
var tmp = new byte[200];
socket.Client.Receive(tmp);
}
var bf = Encoding.ASCII.GetBytes(trigger); var bf = Encoding.ASCII.GetBytes(trigger);
socket.Client.Send(bf); socket.Client.Send(bf);
var buff = new byte[200]; var buff = new byte[200];
......
DeviceLibrary/theMachine/LabelParam.cs
...@@ -148,14 +148,23 @@ namespace DeviceLibrary ...@@ -148,14 +148,23 @@ namespace DeviceLibrary
UpDown_PH = aCStorePosition.UpDownAxis_IHPosition_P3; UpDown_PH = aCStorePosition.UpDownAxis_IHPosition_P3;
UpDown_PL = aCStorePosition.UpDownAxis_ILPosition_P4; UpDown_PL = aCStorePosition.UpDownAxis_ILPosition_P4;
Comp_PH = Config.Comp_P2 - Config.Comp_PoToMM * (aCStorePosition.BagHigh-8 + Config.Comp_PH_MM);
int BagHigh = aCStorePosition.BagHigh;
Comp_PL = Config.Comp_P2 - Config.Comp_PoToMM * (reel.PlateH-8) - (reel.PlateH > 8 ? Config.Comp_PoToMM * Config.Comp_PL_MM : 0); if (FixtureConfig.GetFixtureHeight(aCStorePosition.BagWidth, aCStorePosition.BagHigh, out int actualheight))
BagHigh = actualheight;
Comp_PH = Config.Comp_P2 - Config.Comp_PoToMM * (BagHigh - 8 + Config.Comp_PH_MM);
int ReelHeight = reel.PlateH;
if (FixtureConfig.GetFixtureHeight(reel.PlateW, reel.PlateH, out int actualheight1))
ReelHeight = actualheight1;
Comp_PL = Config.Comp_P2 - Config.Comp_PoToMM * (ReelHeight - 8);
Comp_PH = Comp_PH < 0 ? 0 : Comp_PH; Comp_PH = Comp_PH < 0 ? 0 : Comp_PH;
Comp_PL = Comp_PL < 0 ? 0 : Comp_PL; Comp_PL = Comp_PL < 0 ? 0 : Comp_PL;
posid = aCStorePosition.PositionNum; posid = aCStorePosition.PositionNum;
Reel = reel.clone(); Reel = reel.clone();
LogUtil.info($"BSP:{posid},Comp_PH:{Comp_PH}={Config.Comp_P2}-({aCStorePosition.BagHigh}-{8}+{Config.Comp_PH_MM})*{Config.Comp_PoToMM},Comp_PL:{Comp_PL}={reel.PlateH},Comp_PL_MM:{Config.Comp_PL_MM},{JsonHelper.SerializeObject(this)}"); LogUtil.info($"BSP:{posid},Comp_PH:{Comp_PH}={Config.Comp_P2}-({BagHigh}-{8}+{Config.Comp_PH_MM})*{Config.Comp_PoToMM},Comp_PL:{Comp_PL}={ReelHeight},{JsonHelper.SerializeObject(this)}");
} }
public const string ngdoor = "单料口"; public const string ngdoor = "单料口";
public const string clamp = "夹爪位"; public const string clamp = "夹爪位";
...@@ -163,8 +172,12 @@ namespace DeviceLibrary ...@@ -163,8 +172,12 @@ namespace DeviceLibrary
public BoxStorePosition(Robot_Config Config, StoreSide storeSide, ReelParam reel) public BoxStorePosition(Robot_Config Config, StoreSide storeSide, ReelParam reel)
{ {
Comp_PH = Config.Comp_P2 - Config.Comp_PoToMM * (reel.PlateH - 8 + Config.Comp_PH_MM); int Height = reel.PlateH;
Comp_PL = Config.Comp_P2 - Config.Comp_PoToMM * (reel.PlateH - 8) - (reel.PlateH > 8 ? Config.Comp_PoToMM * Config.Comp_PL_MM : 0); if (FixtureConfig.GetFixtureHeight(reel.PlateW, reel.PlateH, out int actualheight))
Height = actualheight;
Comp_PH = Config.Comp_P2 - Config.Comp_PoToMM * (Height - 8 + Config.Comp_PH_MM);
Comp_PL = Config.Comp_P2 - Config.Comp_PoToMM * (Height - 8);
Comp_PH = Comp_PH < 0 ? 0 : Comp_PH; Comp_PH = Comp_PH < 0 ? 0 : Comp_PH;
Comp_PL = Comp_PL < 0 ? 0 : Comp_PL; Comp_PL = Comp_PL < 0 ? 0 : Comp_PL;
if (storeSide == StoreSide.NGDoor) if (storeSide == StoreSide.NGDoor)
......
DeviceLibrary/theMachine/MainMachine_Clamp.cs
...@@ -224,7 +224,7 @@ namespace DeviceLibrary ...@@ -224,7 +224,7 @@ namespace DeviceLibrary
case MoveStep.NGOUT_09: case MoveStep.NGOUT_09:
if (IOValue(IO_Type.SafetyLightCurtains).Equals(IO_VALUE.HIGH) && NGDoor_Tray_Test_Reel) if (IOValue(IO_Type.SafetyLightCurtains).Equals(IO_VALUE.HIGH) && NGDoor_Tray_Test_Reel)
{ {
ClampMoveInfo.log("NG口还是检测到料盘"); ClampMoveInfo.log("NG口任然检测到料盘");
ClampMoveInfo.NextMoveStep(MoveStep.NGOUT_06); ClampMoveInfo.NextMoveStep(MoveStep.NGOUT_06);
} }
else if (IOValue(IO_Type.SafetyLightCurtains).Equals(IO_VALUE.HIGH) && IOValue(IO_Type.NGDoor_Tray_Check).Equals(IO_VALUE.LOW)) else if (IOValue(IO_Type.SafetyLightCurtains).Equals(IO_VALUE.HIGH) && IOValue(IO_Type.NGDoor_Tray_Check).Equals(IO_VALUE.LOW))
...@@ -427,8 +427,6 @@ namespace DeviceLibrary ...@@ -427,8 +427,6 @@ namespace DeviceLibrary
{ {
LastCodeList = CodeManager.CameraScan(CodeManager.hikNameList); LastCodeList = CodeManager.CameraScan(CodeManager.hikNameList);
} }
return LastCodeList; return LastCodeList;
})); }));
} }
......
DeviceLibrary/userControl/FixtureSizeConfigControl.cs 0 → 100644
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace DeviceLibrary
{
public partial class FixtureSizeConfigControl : UserControl
{
public FixtureSizeConfigControl()
{
InitializeComponent();
}
private void FixtureSizeConfigControl_Load(object sender, EventArgs e)
{
RefreshList();
}
void RefreshList() {
listBox1.Items.Clear();
FixtureConfig.FixtureConfigList.ForEach(fc =>
{
listBox1.Items.Add(fc);
});
}
private void button1_Click(object sender, EventArgs e)
{
if (string.IsNullOrWhiteSpace(textBox_startcode.Text))
{
MessageBox.Show("条码首字母不能为空");
return;
}
FixtureConfig fixtureConfig = new FixtureConfig();
fixtureConfig.StartCode = textBox_startcode.Text.Trim();
fixtureConfig.Width = (int)num_width.Value;
fixtureConfig.Height = (int)num_height.Value;
fixtureConfig.UseActualHeight = checkBox_fixtureheight.Checked;
fixtureConfig.ActualHeight = (int)num_actualheight.Value;
fixtureConfig.AbandonCode = checkBox_useedremove.Checked;
FixtureConfig.Add(fixtureConfig);
RefreshList();
}
private void button2_Click(object sender, EventArgs e)
{
if (listBox1.SelectedIndex < 0) {
return;
}
var fc = (FixtureConfig)listBox1.SelectedItem;
FixtureConfig.Del(fc);
RefreshList();
}
private void listBox1_SelectedIndexChanged(object sender, EventArgs e)
{
if (listBox1.SelectedIndex < 0)
return;
var fixtureConfig = (FixtureConfig)listBox1.SelectedItem;
textBox_startcode.Text = fixtureConfig.StartCode;
num_width.Value = fixtureConfig.Width;
num_height.Value = fixtureConfig.Height;
checkBox_fixtureheight.Checked = fixtureConfig.UseActualHeight;
num_actualheight.Value = fixtureConfig.ActualHeight;
checkBox_useedremove.Checked = fixtureConfig.AbandonCode;
}
private void checkBox_useedremove_CheckedChanged(object sender, EventArgs e)
{
}
}
public class FixtureConfig {
public string StartCode;
public int Width;
public int Height;
public bool UseActualHeight;
public int ActualHeight;
public bool AbandonCode;
public override string ToString()
{
return $"[{StartCode}]={Width}x{Height}"+ (UseActualHeight?$", "+"物理厚度"+$":{ActualHeight}":"") + (AbandonCode? ", "+"自动弃用" : "");
}
public static bool GetCodeSize(string code, out int FixtureHeight, out int FixtureWidth, out bool isAbandonCode)
{
FixtureHeight = 0;
FixtureWidth = 0;
isAbandonCode = false;
var fcc = FixtureConfigList.Find(fc => code.StartsWith(fc.StartCode));
if (fcc == null)
return false;
if (!fcc.UseActualHeight)
return false;
FixtureHeight = fcc.Height;
FixtureWidth = fcc.Width;
isAbandonCode = fcc.AbandonCode;
return true;
}
public static bool GetFixtureHeight(int poswidth,int posheight, out int FixtureHeight) {
FixtureHeight = 0;
var fcc = FixtureConfigList.Find(fc => fc.Width == poswidth && fc.Height == posheight);
if (fcc == null)
return false;
if (!fcc.UseActualHeight)
return false;
FixtureHeight = fcc.ActualHeight;
return true;
}
public static List<FixtureConfig> FixtureConfigList = new List<FixtureConfig>();
static FixtureConfig() {
if (!File.Exists("Config\\FixtureConfig.json"))
return;
try {
var fx = File.ReadAllText("Config\\FixtureConfig.json");
FixtureConfigList = JsonConvert.DeserializeObject<List<FixtureConfig>>(fx);
} catch { }
}
public static void Add(FixtureConfig fixtureConfig) {
var fcc = FixtureConfigList.FindIndex(fc => fc.StartCode == fixtureConfig.StartCode);
if (fcc <0)
FixtureConfigList.Add(fixtureConfig);
else
FixtureConfigList[fcc] = fixtureConfig;
Save();
}
public static void Del(FixtureConfig fixtureConfig) {
var fcc = FixtureConfigList.FindIndex(fc => fc.StartCode == fixtureConfig.StartCode);
if (fcc < 0)
return;
else
FixtureConfigList.RemoveAt(fcc);
Save();
}
public static void Save() {
File.WriteAllText("Config\\FixtureConfig.json", JsonConvert.SerializeObject(FixtureConfigList));
}
}
}
DeviceLibrary/userControl/FixtureSizeConfigControl.resx 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file \ No newline at end of file
TheMachine/SettingControl.Designer.cs
...@@ -42,20 +42,23 @@ namespace TheMachine ...@@ -42,20 +42,23 @@ namespace TheMachine
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage_set = new System.Windows.Forms.TabPage(); this.tabPage_set = new System.Windows.Forms.TabPage();
this.tabPage_ledtower = new System.Windows.Forms.TabPage(); this.tabPage_ledtower = new System.Windows.Forms.TabPage();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.fixtureSizeConfigControl1 = new DeviceLibrary.FixtureSizeConfigControl();
this.tp.SuspendLayout(); this.tp.SuspendLayout();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage_set.SuspendLayout(); this.tabPage_set.SuspendLayout();
this.tabPage_ledtower.SuspendLayout(); this.tabPage_ledtower.SuspendLayout();
this.tabPage1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// chbAutoRun // chbAutoRun
// //
this.chbAutoRun.AutoSize = true; this.chbAutoRun.AutoSize = true;
this.tp.SetColumnSpan(this.chbAutoRun, 2); this.tp.SetColumnSpan(this.chbAutoRun, 2);
this.chbAutoRun.Location = new System.Drawing.Point(10, 175); this.chbAutoRun.Location = new System.Drawing.Point(10, 166);
this.chbAutoRun.Margin = new System.Windows.Forms.Padding(10); this.chbAutoRun.Margin = new System.Windows.Forms.Padding(10);
this.chbAutoRun.Name = "chbAutoRun"; this.chbAutoRun.Name = "chbAutoRun";
this.chbAutoRun.Size = new System.Drawing.Size(101, 19); this.chbAutoRun.Size = new System.Drawing.Size(84, 16);
this.chbAutoRun.TabIndex = 1; this.chbAutoRun.TabIndex = 1;
this.chbAutoRun.Text = "开机自启动"; this.chbAutoRun.Text = "开机自启动";
this.chbAutoRun.UseVisualStyleBackColor = true; this.chbAutoRun.UseVisualStyleBackColor = true;
...@@ -64,10 +67,10 @@ namespace TheMachine ...@@ -64,10 +67,10 @@ namespace TheMachine
// //
this.cb_tempsensorport.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cb_tempsensorport.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_tempsensorport.FormattingEnabled = true; this.cb_tempsensorport.FormattingEnabled = true;
this.cb_tempsensorport.Location = new System.Drawing.Point(161, 6); this.cb_tempsensorport.Location = new System.Drawing.Point(139, 6);
this.cb_tempsensorport.Margin = new System.Windows.Forms.Padding(6); this.cb_tempsensorport.Margin = new System.Windows.Forms.Padding(6);
this.cb_tempsensorport.Name = "cb_tempsensorport"; this.cb_tempsensorport.Name = "cb_tempsensorport";
this.cb_tempsensorport.Size = new System.Drawing.Size(121, 23); this.cb_tempsensorport.Size = new System.Drawing.Size(121, 20);
this.cb_tempsensorport.TabIndex = 2; this.cb_tempsensorport.TabIndex = 2;
this.cb_tempsensorport.Tag = "not"; this.cb_tempsensorport.Tag = "not";
// //
...@@ -78,7 +81,7 @@ namespace TheMachine ...@@ -78,7 +81,7 @@ namespace TheMachine
this.label_tempsensor.Location = new System.Drawing.Point(10, 10); this.label_tempsensor.Location = new System.Drawing.Point(10, 10);
this.label_tempsensor.Margin = new System.Windows.Forms.Padding(10); this.label_tempsensor.Margin = new System.Windows.Forms.Padding(10);
this.label_tempsensor.Name = "label_tempsensor"; this.label_tempsensor.Name = "label_tempsensor";
this.label_tempsensor.Size = new System.Drawing.Size(135, 15); this.label_tempsensor.Size = new System.Drawing.Size(107, 12);
this.label_tempsensor.TabIndex = 3; this.label_tempsensor.TabIndex = 3;
this.label_tempsensor.Text = "温湿度控制器端口:"; this.label_tempsensor.Text = "温湿度控制器端口:";
this.label_tempsensor.TextAlign = System.Drawing.ContentAlignment.TopRight; this.label_tempsensor.TextAlign = System.Drawing.ContentAlignment.TopRight;
...@@ -86,7 +89,7 @@ namespace TheMachine ...@@ -86,7 +89,7 @@ namespace TheMachine
// button_positiontool // button_positiontool
// //
this.tp.SetColumnSpan(this.button_positiontool, 2); this.tp.SetColumnSpan(this.button_positiontool, 2);
this.button_positiontool.Location = new System.Drawing.Point(10, 80); this.button_positiontool.Location = new System.Drawing.Point(10, 74);
this.button_positiontool.Margin = new System.Windows.Forms.Padding(10); this.button_positiontool.Margin = new System.Windows.Forms.Padding(10);
this.button_positiontool.Name = "button_positiontool"; this.button_positiontool.Name = "button_positiontool";
this.button_positiontool.Size = new System.Drawing.Size(181, 36); this.button_positiontool.Size = new System.Drawing.Size(181, 36);
...@@ -99,10 +102,10 @@ namespace TheMachine ...@@ -99,10 +102,10 @@ namespace TheMachine
// //
this.lbl_hmdstate.AutoSize = true; this.lbl_hmdstate.AutoSize = true;
this.tp.SetColumnSpan(this.lbl_hmdstate, 2); this.tp.SetColumnSpan(this.lbl_hmdstate, 2);
this.lbl_hmdstate.Location = new System.Drawing.Point(10, 45); this.lbl_hmdstate.Location = new System.Drawing.Point(10, 42);
this.lbl_hmdstate.Margin = new System.Windows.Forms.Padding(10); this.lbl_hmdstate.Margin = new System.Windows.Forms.Padding(10);
this.lbl_hmdstate.Name = "lbl_hmdstate"; this.lbl_hmdstate.Name = "lbl_hmdstate";
this.lbl_hmdstate.Size = new System.Drawing.Size(67, 15); this.lbl_hmdstate.Size = new System.Drawing.Size(53, 12);
this.lbl_hmdstate.TabIndex = 5; this.lbl_hmdstate.TabIndex = 5;
this.lbl_hmdstate.Tag = "not"; this.lbl_hmdstate.Tag = "not";
this.lbl_hmdstate.Text = "当前状态"; this.lbl_hmdstate.Text = "当前状态";
...@@ -137,17 +140,17 @@ namespace TheMachine ...@@ -137,17 +140,17 @@ namespace TheMachine
this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tp.Size = new System.Drawing.Size(310, 204); this.tp.Size = new System.Drawing.Size(266, 192);
this.tp.TabIndex = 6; this.tp.TabIndex = 6;
// //
// cb_usefixpos // cb_usefixpos
// //
this.cb_usefixpos.AutoSize = true; this.cb_usefixpos.AutoSize = true;
this.tp.SetColumnSpan(this.cb_usefixpos, 2); this.tp.SetColumnSpan(this.cb_usefixpos, 2);
this.cb_usefixpos.Location = new System.Drawing.Point(10, 136); this.cb_usefixpos.Location = new System.Drawing.Point(10, 130);
this.cb_usefixpos.Margin = new System.Windows.Forms.Padding(10); this.cb_usefixpos.Margin = new System.Windows.Forms.Padding(10);
this.cb_usefixpos.Name = "cb_usefixpos"; this.cb_usefixpos.Name = "cb_usefixpos";
this.cb_usefixpos.Size = new System.Drawing.Size(116, 19); this.cb_usefixpos.Size = new System.Drawing.Size(96, 16);
this.cb_usefixpos.TabIndex = 6; this.cb_usefixpos.TabIndex = 6;
this.cb_usefixpos.Text = "启用校准库位"; this.cb_usefixpos.Text = "启用校准库位";
this.cb_usefixpos.UseVisualStyleBackColor = true; this.cb_usefixpos.UseVisualStyleBackColor = true;
...@@ -158,7 +161,7 @@ namespace TheMachine ...@@ -158,7 +161,7 @@ namespace TheMachine
this.uC_LedConfig1.Dock = System.Windows.Forms.DockStyle.Fill; this.uC_LedConfig1.Dock = System.Windows.Forms.DockStyle.Fill;
this.uC_LedConfig1.Location = new System.Drawing.Point(3, 3); this.uC_LedConfig1.Location = new System.Drawing.Point(3, 3);
this.uC_LedConfig1.Name = "uC_LedConfig1"; this.uC_LedConfig1.Name = "uC_LedConfig1";
this.uC_LedConfig1.Size = new System.Drawing.Size(1010, 705); this.uC_LedConfig1.Size = new System.Drawing.Size(1010, 708);
this.uC_LedConfig1.TabIndex = 7; this.uC_LedConfig1.TabIndex = 7;
this.uC_LedConfig1.Tag = "not"; this.uC_LedConfig1.Tag = "not";
// //
...@@ -166,6 +169,7 @@ namespace TheMachine ...@@ -166,6 +169,7 @@ namespace TheMachine
// //
this.tabControl1.Controls.Add(this.tabPage_set); this.tabControl1.Controls.Add(this.tabPage_set);
this.tabControl1.Controls.Add(this.tabPage_ledtower); this.tabControl1.Controls.Add(this.tabPage_ledtower);
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl1.Location = new System.Drawing.Point(0, 0); this.tabControl1.Location = new System.Drawing.Point(0, 0);
this.tabControl1.Name = "tabControl1"; this.tabControl1.Name = "tabControl1";
...@@ -176,10 +180,10 @@ namespace TheMachine ...@@ -176,10 +180,10 @@ namespace TheMachine
// tabPage_set // tabPage_set
// //
this.tabPage_set.Controls.Add(this.tp); this.tabPage_set.Controls.Add(this.tp);
this.tabPage_set.Location = new System.Drawing.Point(4, 25); this.tabPage_set.Location = new System.Drawing.Point(4, 22);
this.tabPage_set.Name = "tabPage_set"; this.tabPage_set.Name = "tabPage_set";
this.tabPage_set.Padding = new System.Windows.Forms.Padding(3); this.tabPage_set.Padding = new System.Windows.Forms.Padding(3);
this.tabPage_set.Size = new System.Drawing.Size(1016, 711); this.tabPage_set.Size = new System.Drawing.Size(1016, 714);
this.tabPage_set.TabIndex = 0; this.tabPage_set.TabIndex = 0;
this.tabPage_set.Text = "常规设置"; this.tabPage_set.Text = "常规设置";
this.tabPage_set.UseVisualStyleBackColor = true; this.tabPage_set.UseVisualStyleBackColor = true;
...@@ -187,14 +191,33 @@ namespace TheMachine ...@@ -187,14 +191,33 @@ namespace TheMachine
// tabPage_ledtower // tabPage_ledtower
// //
this.tabPage_ledtower.Controls.Add(this.uC_LedConfig1); this.tabPage_ledtower.Controls.Add(this.uC_LedConfig1);
this.tabPage_ledtower.Location = new System.Drawing.Point(4, 25); this.tabPage_ledtower.Location = new System.Drawing.Point(4, 22);
this.tabPage_ledtower.Name = "tabPage_ledtower"; this.tabPage_ledtower.Name = "tabPage_ledtower";
this.tabPage_ledtower.Padding = new System.Windows.Forms.Padding(3); this.tabPage_ledtower.Padding = new System.Windows.Forms.Padding(3);
this.tabPage_ledtower.Size = new System.Drawing.Size(1016, 711); this.tabPage_ledtower.Size = new System.Drawing.Size(1016, 714);
this.tabPage_ledtower.TabIndex = 1; this.tabPage_ledtower.TabIndex = 1;
this.tabPage_ledtower.Text = "灯塔设置"; this.tabPage_ledtower.Text = "灯塔设置";
this.tabPage_ledtower.UseVisualStyleBackColor = true; this.tabPage_ledtower.UseVisualStyleBackColor = true;
// //
// tabPage1
//
this.tabPage1.Controls.Add(this.fixtureSizeConfigControl1);
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(1016, 714);
this.tabPage1.TabIndex = 2;
this.tabPage1.Text = "治具设置";
this.tabPage1.UseVisualStyleBackColor = true;
//
// fixtureSizeConfigControl1
//
this.fixtureSizeConfigControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.fixtureSizeConfigControl1.Location = new System.Drawing.Point(3, 3);
this.fixtureSizeConfigControl1.Name = "fixtureSizeConfigControl1";
this.fixtureSizeConfigControl1.Size = new System.Drawing.Size(1010, 708);
this.fixtureSizeConfigControl1.TabIndex = 0;
//
// SettingControl // SettingControl
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
...@@ -208,6 +231,7 @@ namespace TheMachine ...@@ -208,6 +231,7 @@ namespace TheMachine
this.tabPage_set.ResumeLayout(false); this.tabPage_set.ResumeLayout(false);
this.tabPage_set.PerformLayout(); this.tabPage_set.PerformLayout();
this.tabPage_ledtower.ResumeLayout(false); this.tabPage_ledtower.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
} }
...@@ -225,5 +249,7 @@ namespace TheMachine ...@@ -225,5 +249,7 @@ namespace TheMachine
private System.Windows.Forms.TabControl tabControl1; private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.TabPage tabPage_set; private System.Windows.Forms.TabPage tabPage_set;
private System.Windows.Forms.TabPage tabPage_ledtower; private System.Windows.Forms.TabPage tabPage_ledtower;
private System.Windows.Forms.TabPage tabPage1;
private DeviceLibrary.FixtureSizeConfigControl fixtureSizeConfigControl1;
} }
} }
TheMachine/UC/StorePosControl.cs
...@@ -259,8 +259,11 @@ namespace TheMachine ...@@ -259,8 +259,11 @@ namespace TheMachine
} }
var positionConfigFile = Path.Combine(Application.StartupPath, "StoreConfig\\linePositions.csv"); var positionConfigFile = Path.Combine(Application.StartupPath, "StoreConfig\\linePositions.csv");
var positionConfigFile1 = Path.Combine(Application.StartupPath, "StoreConfig\\fixPositions.csv");
bool result = CSVPositionReader<ACStorePosition>.SavePostion(positionConfigFile, _aCStorePosition); bool result = CSVPositionReader<ACStorePosition>.SavePostion(positionConfigFile, _aCStorePosition);
result = CSVPositionReader<ACStorePosition>.SavePostion(positionConfigFile1, _aCStorePosition);
} }
} }
} }
TheMachine/UC/uc_boxdebug.cs
...@@ -261,6 +261,9 @@ namespace TheMachine ...@@ -261,6 +261,9 @@ namespace TheMachine
string ab = "A"; string ab = "A";
if (_posstr[2].Length > 1) if (_posstr[2].Length > 1)
ab = _posstr[2][1].ToString(); ab = _posstr[2][1].ToString();
else if (_posstr[1].Length > 1)
ab = _posstr[1][1].ToString();
if (ab != "A" && ab != "B") if (ab != "A" && ab != "B")
{ {
if (ab == "1") if (ab == "1")
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!