Skip to content

刘韬 / SO20242OutBound

转到一个项目
切换导航栏
切换导航栏固定状态
Commit c6ed25ab 由 LN
选项

1

1 个父辈 5dd81603
内嵌 并排
正在显示 18 个修改的文件 包含 675 行增加 和 128 行删除
DeviceLibrary/DeviceLibrary.csproj
......@@ -50,8 +50,9 @@
<Reference Include="halcondotnet">
<HintPath>..\..\RC1271-DUOStore\dll\halcondotnet.dll</HintPath>
</Reference>
<Reference Include="HuichuanLibrary">
<HintPath>..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\HuichuanLibrary.dll</HintPath>
<Reference Include="HuichuanLibrary, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\SharedDLL\HuichuanLibrary.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=692fbea5521e1304, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion>
......
DeviceLibrary/DeviceLibrary/AxisBean.cs
......@@ -341,6 +341,10 @@ namespace DeviceLibrary
{
AxisManager.SuddenStop(Config.DeviceName, Config.GetAxisValue());
}
public void MoveStop()
{
AxisManager.MoveStop(Config.DeviceName, Config.GetAxisValue());
}
/// <summary>
/// 判断轴运动是否安全
/// </summary>
......
DeviceLibrary/DeviceLibrary/AxisManager.cs
......@@ -67,6 +67,10 @@ namespace DeviceLibrary
{
instance.SuddenStop(portName, slvAddr);
}
public static void MoveStop(string portName, short slvAddr)
{
instance.MoveStop(portName, slvAddr);
}
public static bool isInPosition(string portName, short slvAddr, int PPosition, int canErrorCount, bool isLog = false)
{
return instance.isInPosition(portName, slvAddr, PPosition, canErrorCount, isLog);
......
DeviceLibrary/DeviceLibrary/HC/HCAxisManager.cs
......@@ -120,6 +120,10 @@ namespace DeviceLibrary
{
HCBoardManager.AxisStop(slvAddr);
}
public void MoveStop(string portName, short slvAddr )
{
HCBoardManager.AxisStop(slvAddr, 0);
}
public bool AbsMoveIsEnd(string portName, short axisNo, int targetPosition, int canErrorCount, out bool countError)
{
countError = false;
......
DeviceLibrary/DeviceLibrary/HttpServer.cs
......@@ -267,6 +267,7 @@ namespace DeviceLibrary
/// 料架位置，1-31
/// </summary>
public int rfidLoc = 0;
/// <summary>
/// 虚拟料架号
/// </summary>
......@@ -284,6 +285,20 @@ namespace DeviceLibrary
/// </summary>
public string usedRfidList = "";
public string getShelfLoc(string name)
{
string reLoc = name + "_B1_" + rfidLoc;
if (rfidLoc <= 13)
{
reLoc = name + "_A1_" + rfidLoc;
}
else if (rfidLoc <= 26)
{
reLoc = name + "_A2_" + rfidLoc;
}
return reLoc;
}
public int w = 7;
public int h = 8;
......
DeviceLibrary/DeviceLibrary/IAxisManager.cs
......@@ -30,6 +30,7 @@ namespace DeviceLibrary
void SpeedMove(string portName, short slvAddr, int speed,int acc,int dec);
void SuddenStop(string portName, short slvAddr);
void MoveStop(string portName, short slvAddr);
bool isInPosition(string portName, short slvAddr, int PPosition, int canErrorCount, bool isLog = false);
void AbsMove(string portName, short slvAddr, int targetPosition, int targetSpeed , int ptpAcc , int ptpDec );
......
DeviceLibrary/theMachine/OutShelfBean.cs
......@@ -72,7 +72,7 @@ namespace DeviceLibrary
CurrShelf.rfid = CurrTray.rfid;
LogUtil.info(Name + "增加虚拟料架号绑定：" + CurrShelf.ToStr());
}
ShelfPosId = Name + "_" + +CurrTray.rfidLoc;
ShelfPosId = CurrTray.getShelfLoc(Name);
return true;
}
else if (String.IsNullOrEmpty(CurrTray.realRfid))
......@@ -80,7 +80,7 @@ namespace DeviceLibrary
if ((!CurrShelf.rfid.Equals("")) && CurrShelf.rfid.Equals(CurrTray.rfid))
{
CurrTray.realRfid = CurrShelf.realRFID;
ShelfPosId = Name + "_" + +CurrTray.rfidLoc;
ShelfPosId = CurrTray.getShelfLoc(Name);
return true;
}
if (!String.IsNullOrEmpty(CurrTray.usedRfidList))
......@@ -97,7 +97,7 @@ namespace DeviceLibrary
CurrShelf.rfid = CurrTray.rfid;
CurrTray.realRfid = CurrShelf.realRFID;
LogUtil.info(Name + "增加虚拟料架号绑定：" + CurrShelf.ToStr());
ShelfPosId = Name + "_" + CurrTray.rfidLoc;
ShelfPosId = CurrTray.getShelfLoc(Name);
return true;
}
}
......
DeviceLibrary/userControl/AxisMoveControl.cs
......@@ -27,11 +27,11 @@ namespace DeviceLibrary
{
InitializeComponent();
crc.OpenResourceLog = true;
crc.LanguageChangeEvent += Crc_LanguageChangeEvent;
if (Setting_Init.Device_Default_Language != null)
{
crc.CurrLanguage = Setting_Init.Device_Default_Language;
}
crc.LanguageChangeEvent += Crc_LanguageChangeEvent;
//if (Setting_Init.Device_Default_Language != null)
//{
// crc.CurrLanguage = Setting_Init.Device_Default_Language;
//}
}
private void Crc_LanguageChangeEvent(object sender, EventArgs e)
......@@ -160,7 +160,7 @@ namespace DeviceLibrary
var axis = axisList.Single(a => a.Config.IsSameAxis(PortName, SlvAddr));
var targetSpeed = speed;
var AddSpeed = axis.Config.AddSpeed > 0 ? axis.Config.AddSpeed : targetSpeed * 4;
var DelSpeed = axis.Config.DelSpeed > 0 ? axis.Config.DelSpeed : targetSpeed * 4;
var DelSpeed = axis.Config.DelSpeed > 0 ? axis.Config.DelSpeed : targetSpeed / 4;
LogUtil.info("" + "点击【匀速运动】，【" + PortName + "_" + SlvAddr + "】 速度【" + speed + "】" + $",AddSpeed:{AddSpeed}, DelSpeed:{DelSpeed}");
AxisManager.SpeedMove(PortName, SlvAddr, speed, AddSpeed, DelSpeed);
......
LoadCVSLibrary/Config/Magzine.csv
位置,类型,备注,优先级,高度,宽度,旋转轴位置P2,升降轴库位入料高点P3,升降轴库位入料低点P4,进出轴库位点取料点P3
U1_1,0,出口1_1,0,24,7,99198,417323,379066,227002
U1_2,0,出口1_2,0,24,7,219347,91377,80569,206929
U1_3,0,出口1_3,0,24,7,99198,417323,-99999999,227002
U1_4,0,出口1_4,0,24,7,219347,91377,-99999999,206929
U1_5,0,出口1_5,0,24,7,219347,91377,123,206929
U1_6,0,出口1_6,0,24,7,219347,91377,1231,206929
U1_7,0,出口1_7,0,24,7,219347,91377,23,206929
,,,,,,,,,
U2_1,0,出口2_1,0,24,7,99198,417323,379066,227002
U2_2,0,出口2_2,0,24,7,219347,91377,80569,206929
U2_3,0,出口2_3,0,24,7,99198,417323,-99999999,227002
U2_4,0,出口2_4,0,24,7,219347,91377,-99999999,206929
U2_5,0,出口2_5,0,24,7,219347,91377,123,206929
U2_6,0,出口2_6,0,24,7,219347,91377,1231,206929
U2_7,0,出口2_7,0,24,7,219347,91377,23,206929
,,,,,,,,,
U3_1,0,出口3_1,0,24,7,99198,417323,379066,227002
U3_2,0,出口3_2,0,24,7,219347,91377,80569,206929
U3_3,0,出口3_3,0,24,7,99198,417323,-99999999,227002
U3_4,0,出口3_4,0,24,7,219347,91377,-99999999,206929
U3_5,0,出口3_5,0,24,7,219347,91377,123,206929
U3_6,0,出口3_6,0,24,7,219347,91377,1231,206929
U3_7,0,出口3_7,0,24,7,219347,91377,23,206929
,,,,,,,,,
U4_1,0,出口4_1,0,24,7,99198,417323,379066,227002
U4_2,0,出口4_2,0,24,7,219347,91377,80569,206929
U4_3,0,出口4_3,0,24,7,99198,417323,-99999999,227002
U4_4,0,出口4_4,0,24,7,219347,91377,-99999999,206929
U4_5,0,出口4_5,0,24,7,219347,91377,123,206929
U4_6,0,出口4_6,0,24,7,219347,91377,1231,206929
U4_7,0,出口4_7,0,24,7,219347,91377,23,206929
U1A1_1,0,U4A1_1,0,24,7,99198,91377,379066,227002
U1A1_2,0,U4A1_2,0,24,7,99199,91377,379067,227003
U1A1_3,0,U4A1_3,0,24,7,99200,91377,379068,227004
U1A1_4,0,U4A1_4,0,24,7,99201,91377,379069,227005
U1A1_5,0,U4A1_5,0,24,7,99202,91377,379070,227006
U1A1_6,0,U4A1_6,0,24,7,99203,91377,379071,227007
U1A1_7,0,U4A1_7,0,24,7,99204,91377,379072,227008
U1A1_8,0,U4A1_8,0,24,7,99205,91377,379073,227009
U1A1_9,0,U4A1_9,0,24,7,99206,91377,379074,227010
U1A1_10,0,U4A1_10,0,24,7,99207,91377,379075,227011
U1A1_11,0,U4A1_11,0,24,7,99208,91377,379076,227012
U1A1_12,0,U4A1_12,0,24,7,99209,91377,379077,227013
U1A1_13,0,U4A1_13,0,24,7,99210,91377,379078,227014
U1A2_1,0,U4A2_1,0,24,7,99211,91377,379079,227015
U1A2_2,0,U4A2_2,0,24,7,99212,91377,379080,227016
U1A2_3,0,U4A2_3,0,24,7,99213,91377,379081,227017
U1A2_4,0,U4A2_4,0,24,7,99214,91377,379082,227018
U1A2_5,0,U4A2_5,0,24,7,99215,91377,379083,227019
U1A2_6,0,U4A2_6,0,24,7,99216,91377,379084,227020
U1A2_7,0,U4A2_7,0,24,7,99217,91377,379085,227021
U1A2_8,0,U4A2_8,0,24,7,99218,91377,379086,227022
U1A2_9,0,U4A2_9,0,24,7,99219,91377,379087,227023
U1A2_10,0,U4A2_10,0,24,7,99220,91377,379088,227024
U1A2_11,0,U4A2_11,0,24,7,99221,91377,379089,227025
U1A2_12,0,U4A2_12,0,24,7,99222,91377,379090,227026
U1A2_13,0,U4A2_13,0,24,7,99223,91377,379091,227027
U1B1_1,0,U4B1_1,0,24,7,99224,91377,379092,227028
U1B1_2,0,U4B1_2,0,24,7,99225,91377,379093,227029
U1B1_3,0,U4B1_3,0,24,7,99226,91377,379094,227030
U1B1_4,0,U4B1_4,0,24,7,99227,91377,379095,227031
U1B1_5,0,U4B1_5,0,24,7,99228,91377,379096,227032
U2A1_1,0,U4A1_1,0,24,7,99229,91377,379097,227033
U2A1_2,0,U4A1_2,0,24,7,99230,91377,379098,227034
U2A1_3,0,U4A1_3,0,24,7,99231,91377,379099,227035
U2A1_4,0,U4A1_4,0,24,7,99232,91377,379100,227036
U2A1_5,0,U4A1_5,0,24,7,99233,91377,379101,227037
U2A1_6,0,U4A1_6,0,24,7,99234,91377,379102,227038
U2A1_7,0,U4A1_7,0,24,7,99235,91377,379103,227039
U2A1_8,0,U4A1_8,0,24,7,99236,91377,379104,227040
U2A1_9,0,U4A1_9,0,24,7,99237,91377,379105,227041
U2A1_10,0,U4A1_10,0,24,7,99238,91377,379106,227042
U2A1_11,0,U4A1_11,0,24,7,99239,91377,379107,227043
U2A1_12,0,U4A1_12,0,24,7,99240,91377,379108,227044
U2A1_13,0,U4A1_13,0,24,7,99241,91377,379109,227045
U2A2_1,0,U4A2_1,0,24,7,99242,91377,379110,227046
U2A2_2,0,U4A2_2,0,24,7,99243,91377,379111,227047
U2A2_3,0,U4A2_3,0,24,7,99244,91377,379112,227048
U2A2_4,0,U4A2_4,0,24,7,99245,91377,379113,227049
U2A2_5,0,U4A2_5,0,24,7,99246,91377,379114,227050
U2A2_6,0,U4A2_6,0,24,7,99247,91377,379115,227051
U2A2_7,0,U4A2_7,0,24,7,99248,91377,379116,227052
U2A2_8,0,U4A2_8,0,24,7,99249,91377,379117,227053
U2A2_9,0,U4A2_9,0,24,7,99250,91377,379118,227054
U2A2_10,0,U4A2_10,0,24,7,99251,91377,379119,227055
U2A2_11,0,U4A2_11,0,24,7,99252,91377,379120,227056
U2A2_12,0,U4A2_12,0,24,7,99253,91377,379121,227057
U2A2_13,0,U4A2_13,0,24,7,99254,91377,379122,227058
U2B1_1,0,U4B1_1,0,24,7,99255,91377,379123,227059
U2B1_2,0,U4B1_2,0,24,7,99256,91377,379124,227060
U2B1_3,0,U4B1_3,0,24,7,99257,91377,379125,227061
U2B1_4,0,U4B1_4,0,24,7,99258,91377,379126,227062
U2B1_5,0,U4B1_5,0,24,7,99259,91377,379127,227063
U3A1_1,0,U4A1_1,0,24,7,99260,91377,379128,227064
U3A1_2,0,U4A1_2,0,24,7,99261,91377,379129,227065
U3A1_3,0,U4A1_3,0,24,7,99262,91377,379130,227066
U3A1_4,0,U4A1_4,0,24,7,99263,91377,379131,227067
U3A1_5,0,U4A1_5,0,24,7,99264,91377,379132,227068
U3A1_6,0,U4A1_6,0,24,7,99265,91377,379133,227069
U3A1_7,0,U4A1_7,0,24,7,99266,91377,379134,227070
U3A1_8,0,U4A1_8,0,24,7,99267,91377,379135,227071
U3A1_9,0,U4A1_9,0,24,7,99268,91377,379136,227072
U3A1_10,0,U4A1_10,0,24,7,99269,91377,379137,227073
U3A1_11,0,U4A1_11,0,24,7,99270,91377,379138,227074
U3A1_12,0,U4A1_12,0,24,7,99271,91377,379139,227075
U3A1_13,0,U4A1_13,0,24,7,99272,91377,379140,227076
U3A2_1,0,U4A2_1,0,24,7,99273,91377,379141,227077
U3A2_2,0,U4A2_2,0,24,7,99274,91377,379142,227078
U3A2_3,0,U4A2_3,0,24,7,99275,91377,379143,227079
U3A2_4,0,U4A2_4,0,24,7,99276,91377,379144,227080
U3A2_5,0,U4A2_5,0,24,7,99277,91377,379145,227081
U3A2_6,0,U4A2_6,0,24,7,99278,91377,379146,227082
U3A2_7,0,U4A2_7,0,24,7,99279,91377,379147,227083
U3A2_8,0,U4A2_8,0,24,7,99280,91377,379148,227084
U3A2_9,0,U4A2_9,0,24,7,99281,91377,379149,227085
U3A2_10,0,U4A2_10,0,24,7,99282,91377,379150,227086
U3A2_11,0,U4A2_11,0,24,7,99283,91377,379151,227087
U3A2_12,0,U4A2_12,0,24,7,99284,91377,379152,227088
U3A2_13,0,U4A2_13,0,24,7,99285,91377,379153,227089
U3B1_1,0,U4B1_1,0,24,7,99286,91377,379154,227090
U3B1_2,0,U4B1_2,0,24,7,99287,91377,379155,227091
U3B1_3,0,U4B1_3,0,24,7,99288,91377,379156,227092
U3B1_4,0,U4B1_4,0,24,7,99289,91377,379157,227093
U3B1_5,0,U4B1_5,0,24,7,99290,91377,379158,227094
U4A1_1,0,U4A1_1,0,24,7,99291,91377,379159,227095
U4A1_2,0,U4A1_2,0,24,7,99292,91377,379160,227096
U4A1_3,0,U4A1_3,0,24,7,99293,91377,379161,227097
U4A1_4,0,U4A1_4,0,24,7,99294,91377,379162,227098
U4A1_5,0,U4A1_5,0,24,7,99295,91377,379163,227099
U4A1_6,0,U4A1_6,0,24,7,99296,91377,379164,227100
U4A1_7,0,U4A1_7,0,24,7,99297,91377,379165,227101
U4A1_8,0,U4A1_8,0,24,7,99298,91377,379166,227102
U4A1_9,0,U4A1_9,0,24,7,99299,91377,379167,227103
U4A1_10,0,U4A1_10,0,24,7,99300,91377,379168,227104
U4A1_11,0,U4A1_11,0,24,7,99301,91377,379169,227105
U4A1_12,0,U4A1_12,0,24,7,99302,91377,379170,227106
U4A1_13,0,U4A1_13,0,24,7,99303,91377,379171,227107
U4A2_1,0,U4A2_1,0,24,7,99304,91377,379172,227108
U4A2_2,0,U4A2_2,0,24,7,99305,91377,379173,227109
U4A2_3,0,U4A2_3,0,24,7,99306,91377,379174,227110
U4A2_4,0,U4A2_4,0,24,7,99307,91377,379175,227111
U4A2_5,0,U4A2_5,0,24,7,99308,91377,379176,227112
U4A2_6,0,U4A2_6,0,24,7,99309,91377,379177,227113
U4A2_7,0,U4A2_7,0,24,7,99310,91377,379178,227114
U4A2_8,0,U4A2_8,0,24,7,99311,91377,379179,227115
U4A2_9,0,U4A2_9,0,24,7,99312,91377,379180,227116
U4A2_10,0,U4A2_10,0,24,7,99313,91377,379181,227117
U4A2_11,0,U4A2_11,0,24,7,99314,91377,379182,227118
U4A2_12,0,U4A2_12,0,24,7,99315,91377,379183,227119
U4A2_13,0,U4A2_13,0,24,7,99316,91377,379184,227120
U4B1_1,0,U4B1_1,0,24,7,99317,91377,379185,227121
U4B1_2,0,U4B1_2,0,24,7,99318,91377,379186,227122
U4B1_3,0,U4B1_3,0,24,7,99319,91377,379187,227123
U4B1_4,0,U4B1_4,0,24,7,99320,91377,379188,227124
U4B1_5,0,U4B1_5,0,24,7,99321,91377,379189,227125
LoadCVSLibrary/position/ACSAStorePosition.cs
......@@ -34,11 +34,11 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary>
[CSVAttribute("进出轴库位点取料点P3"), Editable("2")]
public int InOutAxis_Position_P3 { get; set; }
/// <summary>
/// 备注
/// </summary>
[CSVAttribute("备注")]
public string memo { get; set; }
///// <summary>
///// 备注
///// </summary>
//[CSVAttribute("备注")]
//public string memo { get; set; }
}
}
SharedDLL/HuichuanLibrary(1).zip 0 → 100644
此文件类型无法预览
SharedDLL/HuichuanLibrary.dll 0 → 100644
此文件类型无法预览
SharedDLL/HuichuanLibrary.xml 0 → 100644
<?xml version="1.0"?>
<doc>
<assembly>
<name>HuichuanLibrary</name>
</assembly>
<members>
<member name="F:HuichuanLibrary.FrmHuiChuanTest.components">
<summary>
Required designer variable.
</summary>
</member>
<member name="M:HuichuanLibrary.FrmHuiChuanTest.Dispose(System.Boolean)">
<summary>
Clean up any resources being used.
</summary>
<param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
</member>
<member name="M:HuichuanLibrary.FrmHuiChuanTest.InitializeComponent">
<summary>
Required method for Designer support - do not modify
the contents of this method with the code editor.
</summary>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.InitConfig(System.String,System.String,System.String)">
<summary>
初始化配置信息，初始化板卡之前，先初始化配置
</summary>
<param name="deviceConfigPath"></param>
<param name="systemConfigPath"></param>
<param name="logName"></param>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.OpenCard">
<summary>
初始化板卡
</summary>
<returns></returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.CloseCard">
<summary>
关闭板卡
</summary>
<returns></returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.CardInitOk(System.Boolean)">
<summary>
板卡是否已经初始化OK
</summary>
<param name="isShowLog"></param>
<returns></returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.GetAdVal(System.Int16)">
<summary>
模拟量IO值获取 获取EtherCAT 第 adNo号的ad值
</summary>
<param name="adNo">ad的通道：0~配置个数</param>
<returns>获取AD的输入值</returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.StartHomeMove(System.Int16,System.UInt32,System.UInt32,System.UInt32,System.Int16,System.Int32,System.UInt32,System.Int16)">
<summary>
开始回零
</summary>
<param name="axisNo">轴号</param>
<param name="highVel">回零高速</param>
<param name="lowVel">回零低速</param>
<param name="acc">回零加速度</param>
<param name="homeMethod">回零方法，默认28</param>
<param name="offset">回零偏移，默认0</param>
<param name="overtime">超时时间，默认120000</param>
<param name="posSrc">端子板信号源，默认0</param>
<returns></returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.HomeingIsEnd(System.Int16)">
<summary>
判断回零是否完成
</summary>
<param name="axisNo">轴号</param>
<returns></returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.IsInPosition(System.Int16,System.Double,System.Double)">
<summary>
判断轴是否在指定的位置
</summary>
<param name="axisNo">轴号</param>
<param name="targetPos">目标位置</param>
<param name="maxError">最大误差脉冲值</param>
<returns></returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.AxisStop(System.Int16,System.Int16)">
<summary>
</summary>
<param name="axisNo"></param>
<param name="stoplevel">1=立即停止,0=缓慢停止</param>
<returns></returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.SetEcatSdo(System.UInt16,System.Int32,System.Int32)">
<summary>
设置齿轮比
</summary>
<param name="axisNo">轴号</param>
<param name="Motor_Revolution">电子齿轮分子：电机分辨率</param>
<param name="Shaft_Revolution">电子齿轮分母：一圈脉冲数</param>
<returns></returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.SetSdo(System.UInt16,System.UInt16,System.UInt16,System.Byte[])">
<summary>
写sdo
</summary>
<param name="axisNo">轴号</param>
<param name="index">0x6091</param>
<param name="subindex">0x02</param>
<param name="value">2000</param>
<param name="datasize">4</param>
<returns></returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.GetAxisPrfMode(System.Int16)">
<summary>
获取轴规划模式
</summary>
<param name="axisNo">轴号</param>
<returns></returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.GetAxisSts(System.Int16)">
<summary>
获取轴状态
</summary>
<param name="axisNo">轴号</param>
<returns></returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.GetAxisPrfPos(System.Int16)">
<summary>
获取轴规划位置
</summary>
<param name="axisNo">轴号</param>
<returns></returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.GetAxisPrfVel(System.Int16)">
<summary>
获取轴规划速度
</summary>
<param name="axisNo">轴号</param>
<returns></returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.GetAxisCurrPos(System.Int16)">
<summary>
获取轴反馈位置
</summary>
<param name="axisNo">轴号</param>
<returns></returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.GetAxisCurrVel(System.Int16)">
<summary>
获取轴反馈速度
</summary>
<param name="axisNo">轴号</param>
<returns></returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.GetAxisCurrAcc(System.Int16)">
<summary>
获取轴反馈加速度
</summary>
<param name="axisNo">轴号</param>
<returns></returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.ClearAxisSts(System.Int16)">
<summary>
清楚轴报警状态
</summary>
<param name="axisNo">轴号</param>
<returns></returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.GetEcatAxPosTorqLmt(System.Int16)">
<summary>
获取EtherCAT类型轴对应的正向力矩限制
</summary>
<param name="axisNo">轴号0-31</param>
<returns>正向力矩限制</returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.SetEcatAxPosTorqLmt(System.Int16,System.Int16)">
<summary>
设置EtherCAT类型轴对应的正向力矩限制
</summary>
<param name="axisNo">轴号0-31</param>
<param name="value">正向力矩限制</param>
<returns></returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.GetEcatAxNegTorqLmt(System.Int16)">
<summary>
获取EtherCAT类型轴对应的负向力矩限制
</summary>
<param name="axisNo">轴号0-31</param>
<returns>负向力矩限制</returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.SetEcatAxNegTorqLmt(System.Int16,System.Int16)">
<summary>
设置EtherCAT类型轴对应的负向力矩限制
</summary>
<param name="axisNo">轴号0-31</param>
<param name="value">负向力矩限制</param>
<returns></returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.GetEcatAxMaxTorqLmt(System.Int16)">
<summary>
获取EtherCAT类型轴对应的最大力矩限制
</summary>
<param name="axisNo">轴号0-31</param>
<returns>最大力矩限制</returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.SetEcatAxMaxTorqLmt(System.Int16,System.Int16)">
<summary>
设置EtherCAT类型轴对应的最大力矩限制
</summary>
<param name="axisNo">轴号0-31</param>
<param name="value">最大力矩限制</param>
<returns></returns>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.GetAxisLoadRate(System.Int16)">
<summary>
获取轴的负载率
</summary>
<param name="axisNo"></param>
<returns></returns>
</member>
<member name="F:HuichuanLibrary.HCBoardManager.HomeSts_Moveing">
<summary>
回原点状态：0=正在回零中
</summary>
</member>
<member name="F:HuichuanLibrary.HCBoardManager.HomeSts_NotStart">
<summary>
回原点状态：1=回零中断或者没有开始启动
</summary>
</member>
<member name="F:HuichuanLibrary.HCBoardManager.HomeSts_OK">
<summary>
回原点状态：3=回零完成
</summary>
</member>
<member name="M:HuichuanLibrary.HCBoardManager.GetAxisErrorDetail(System.Int16)">
<summary>
获取伺服报警错误信息
</summary>
<param name="axisNo"></param>
<returns>[0]错误编号,[1]错误信息,[2]cd[5] ,[3]错误范围,[4],[5]</returns>
</member>
<member name="F:HuichuanLibrary.AxisSts.ALM">
<summary>
轴报警信号
</summary>
</member>
<member name="F:HuichuanLibrary.AxisSts.WARN">
<summary>
轴警告信号
</summary>
</member>
<member name="F:HuichuanLibrary.AxisSts.EMG">
<summary>
轴急停信号
</summary>
</member>
<member name="F:HuichuanLibrary.AxisSts.ServoOn">
<summary>
轴伺服使能信号
</summary>
</member>
<member name="F:HuichuanLibrary.AxisSts.BUSY">
<summary>
轴忙碌状态
</summary>
</member>
<member name="F:HuichuanLibrary.AxisSts.INP">
<summary>
轴到位信号
</summary>
</member>
<member name="F:HuichuanLibrary.AxisSts.PEL">
<summary>
正限位信号
</summary>
</member>
<member name="F:HuichuanLibrary.AxisSts.ORG">
<summary>
原点信号
</summary>
</member>
<member name="F:HuichuanLibrary.AxisSts.NEL">
<summary>
负限位信号
</summary>
</member>
<member name="M:HuichuanLibrary.ImcApi.IMC_GetCardsNum(System.Int32@)">
*==========================================================================*/
*---- FUNCTION DEFINE ---*/
*==========================================================================*/
*==========================================================================*/
*----1.1 板卡的操作以及资源的获取接口 ---*/
*==========================================================================*/
</member>
<member name="M:HuichuanLibrary.ImcApi.IMC_SetEcatGrpDiInverse(System.UInt64,System.Int16,System.Int16)">
*==========================================================================*/
*----1.2.1 ECAT资源设置接口 ---*/
*==========================================================================*/
</member>
<member name="M:HuichuanLibrary.ImcApi.IMC_GetBoardWorkSts(System.UInt64,System.Int16@)">
*==========================================================================*/
*----1.2.2 端子板资源设置接口 ---*/
*==========================================================================*/
</member>
<member name="M:HuichuanLibrary.ImcApi.IMC_GetHwSysPara(System.UInt64,System.Int16@,System.Int16@)">
*==========================================================================*/
*----1.2.3 系统参数设置接口 ---*/
*==========================================================================*/
</member>
<member name="M:HuichuanLibrary.ImcApi.IMC_SetAxActive(System.UInt64,System.Int16,System.Int16)">
*==========================================================================*/
*----1.2.4 轴参数设置接口 ---*/
*==========================================================================*/
</member>
<member name="M:HuichuanLibrary.ImcApi.IMC_GetSlaveCurSts(System.UInt64,System.UInt16,System.UInt16,System.Int16[])">
*==========================================================================*/
*----2.1 ECAT硬件操作接口 ---*/
*==========================================================================*/
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
*----2.1.1ECAT总线 SDO操作以及状态查询 ---*/
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
</member>
<member name="M:HuichuanLibrary.ImcApi.IMC_SetLocalDoBit(System.UInt64,System.Int16,System.Int16)">
*==========================================================================*/
*----2.2 端子板硬件操作接口 ---*/
*==========================================================================*/
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
*----2.2.1 DIO操作接口 ---*/
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
</member>
<member name="M:HuichuanLibrary.ImcApi.IMC_GetLocalCntPos(System.UInt64,System.Int16,System.Int32[],System.Int16)">
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
*----2.2.2 编码器操作接口 ---*/
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
</member>
<member name="M:HuichuanLibrary.ImcApi.IMC_CompareSrcConfig(System.UInt64,System.Int16,System.Int16,System.Int16[],System.Int16[])">
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
*----2.2.4 位置比较输出操作接口 ---*/
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
</member>
<member name="M:HuichuanLibrary.ImcApi.IMC_StartHoming(System.UInt64,System.Int16,HuichuanLibrary.ImcApi.THomingPara@)">
*==========================================================================*/
*----3 回零操作接口 ---*/
*==========================================================================*/
</member>
<member name="M:HuichuanLibrary.ImcApi.IMC_GetAxPrfMode(System.UInt64,System.Int16,System.Int16[],System.Int16)">
*==========================================================================*/
*----4 状态管理接口 ---*/
*==========================================================================*/
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
*----4.2 轴状态管理接口 ---*/
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
</member>
<member name="M:HuichuanLibrary.ImcApi.IMC_SetAxCaptMode(System.UInt64,System.Int16,System.Int16,System.Int16,System.Int16)">
*==========================================================================*/
*----5 数据采集接口 ---*/
*==========================================================================*/
</member>
<member name="M:HuichuanLibrary.ImcApi.IMC_SetSingleAxMvPara(System.UInt64,System.Int16,System.Double,System.Double,System.Double)">
*==========================================================================*/
*----7 运动模式接口 ---*/
*==========================================================================*/
</member>
<member name="M:HuichuanLibrary.ImcApi.IMC_StartPtpMove(System.UInt64,System.Int16,System.Double,System.Int16)">
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
*----7.1 PTP点位模式接口 ---*/
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
</member>
<member name="M:HuichuanLibrary.ImcApi.IMC_StartJogMove(System.UInt64,System.Int16,System.Double)">
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
*----7.2 Jog运动模式接口 ---*/
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
</member>
<member name="M:HuichuanLibrary.ImcApi.IMC_EnterHandWheelMode(System.UInt64,System.Int16,System.Int16,System.Int16,System.Double,System.Double,System.Double)">
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
*----7.3 手轮跟随运动模式接口 ---*/
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
</member>
</members>
</doc>
TheMachine/AxisControl.Designer.cs
......@@ -43,7 +43,7 @@ namespace TheMachine
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1234, 924);
this.panel1.Size = new System.Drawing.Size(1218, 607);
this.panel1.TabIndex = 2;
//
// axisMoveControl1
......@@ -58,9 +58,9 @@ namespace TheMachine
//
this.configControl1.Config = null;
this.configControl1.Location = new System.Drawing.Point(568, 3);
this.configControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.configControl1.Margin = new System.Windows.Forms.Padding(4);
this.configControl1.Name = "configControl1";
this.configControl1.Size = new System.Drawing.Size(647, 550);
this.configControl1.Size = new System.Drawing.Size(647, 523);
this.configControl1.TabIndex = 1;
this.configControl1.Tag = "not";
//
......@@ -71,7 +71,7 @@ namespace TheMachine
this.Controls.Add(this.panel1);
this.Font = new System.Drawing.Font("新宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Name = "AxisControl";
this.Size = new System.Drawing.Size(1234, 924);
this.Size = new System.Drawing.Size(1218, 607);
this.Load += new System.EventHandler(this.AxisControl_Load);
this.panel1.ResumeLayout(false);
this.ResumeLayout(false);
......
TheMachine/AxisControl.cs
......@@ -20,10 +20,14 @@ namespace TheMachine
public AxisControl()
{
InitializeComponent();
}
private void AxisControl_Load(object sender, EventArgs e)
{
RobotManage.LoadFinishEvent += RobotManage_LoadFinishEvent;
crc.LanguageChangeEvent += Crc_LanguageChangeEvent;
}
private void Crc_LanguageChangeEvent(object sender, EventArgs e)
{
RobotManage_LoadFinishEvent(true, "");
......@@ -52,9 +56,5 @@ namespace TheMachine
private void AxisControl_Load(object sender, EventArgs e)
{
}
}
}
TheMachine/FormMain.Designer.cs
......@@ -47,6 +47,10 @@ namespace TheMachine
this.tabc = new System.Windows.Forms.TabControl();
this.tabP1 = new System.Windows.Forms.TabPage();
this.pnl = new System.Windows.Forms.Panel();
this.btnResetOut4 = new System.Windows.Forms.Button();
this.btnResetOut3 = new System.Windows.Forms.Button();
this.btnResetOut2 = new System.Windows.Forms.Button();
this.btnResetOut1 = new System.Windows.Forms.Button();
this.listReelInfo = new System.Windows.Forms.ListView();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.stateView = new System.Windows.Forms.ListView();
......@@ -54,10 +58,8 @@ namespace TheMachine
this.btn_IgnoreX09 = new System.Windows.Forms.Button();
this.btn_PauseBuzzer = new System.Windows.Forms.Button();
this.listView1 = new System.Windows.Forms.ListView();
this.btnResetOut1 = new System.Windows.Forms.Button();
this.btnResetOut2 = new System.Windows.Forms.Button();
this.btnResetOut3 = new System.Windows.Forms.Button();
this.btnResetOut4 = new System.Windows.Forms.Button();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1.SuspendLayout();
this.tabc.SuspendLayout();
this.tabP1.SuspendLayout();
......@@ -91,6 +93,8 @@ namespace TheMachine
this.toolStripSeparator4,
this.禁用蜂鸣器ToolStripMenuItem,
this.toolStripSeparator1,
this.toolStripMenuItem1,
this.toolStripSeparator5,
this.退出ToolStripMenuItem});
this.设备操作ToolStripMenuItem.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.设备操作ToolStripMenuItem.Name = "设备操作ToolStripMenuItem";
......@@ -100,32 +104,32 @@ namespace TheMachine
// btn_run
//
this.btn_run.Name = "btn_run";
this.btn_run.Size = new System.Drawing.Size(176, 26);
this.btn_run.Size = new System.Drawing.Size(180, 26);
this.btn_run.Text = "启动";
this.btn_run.Click += new System.EventHandler(this.btn_run_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator2.Size = new System.Drawing.Size(177, 6);
//
// btn_stop
//
this.btn_stop.Name = "btn_stop";
this.btn_stop.Size = new System.Drawing.Size(176, 26);
this.btn_stop.Size = new System.Drawing.Size(180, 26);
this.btn_stop.Text = "停止";
this.btn_stop.Click += new System.EventHandler(this.btn_stop_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator3.Size = new System.Drawing.Size(177, 6);
//
// 启用调试模式ToolStripMenuItem
//
this.启用调试模式ToolStripMenuItem.Enabled = false;
this.启用调试模式ToolStripMenuItem.Name = "启用调试模式ToolStripMenuItem";
this.启用调试模式ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.启用调试模式ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.启用调试模式ToolStripMenuItem.Tag = "not";
this.启用调试模式ToolStripMenuItem.Text = "启用配置模式";
this.启用调试模式ToolStripMenuItem.Click += new System.EventHandler(this.启用调试模式ToolStripMenuItem_Click);
......@@ -133,24 +137,24 @@ namespace TheMachine
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator4.Size = new System.Drawing.Size(177, 6);
//
// 禁用蜂鸣器ToolStripMenuItem
//
this.禁用蜂鸣器ToolStripMenuItem.Name = "禁用蜂鸣器ToolStripMenuItem";
this.禁用蜂鸣器ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.禁用蜂鸣器ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.禁用蜂鸣器ToolStripMenuItem.Text = "禁用蜂鸣器";
this.禁用蜂鸣器ToolStripMenuItem.Click += new System.EventHandler(this.禁用蜂鸣器ToolStripMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6);
//
// 退出ToolStripMenuItem
//
this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.退出ToolStripMenuItem.Text = "退出";
this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click);
//
......@@ -167,7 +171,7 @@ namespace TheMachine
// 简体中文ToolStripMenuItem
//
this.简体中文ToolStripMenuItem.Name = "简体中文ToolStripMenuItem";
this.简体中文ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.简体中文ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.简体中文ToolStripMenuItem.Tag = "not";
this.简体中文ToolStripMenuItem.Text = "简体中文";
this.简体中文ToolStripMenuItem.Click += new System.EventHandler(this.简体中文ToolStripMenuItem_Click);
......@@ -175,7 +179,7 @@ namespace TheMachine
// englishToolStripMenuItem
//
this.englishToolStripMenuItem.Name = "englishToolStripMenuItem";
this.englishToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.englishToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.englishToolStripMenuItem.Tag = "not";
this.englishToolStripMenuItem.Text = "English";
this.englishToolStripMenuItem.Click += new System.EventHandler(this.englishToolStripMenuItem_Click);
......@@ -228,6 +232,54 @@ namespace TheMachine
this.pnl.Size = new System.Drawing.Size(1000, 576);
this.pnl.TabIndex = 273;
//
// btnResetOut4
//
this.btnResetOut4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnResetOut4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnResetOut4.Location = new System.Drawing.Point(862, 133);
this.btnResetOut4.Name = "btnResetOut4";
this.btnResetOut4.Size = new System.Drawing.Size(130, 32);
this.btnResetOut4.TabIndex = 274;
this.btnResetOut4.Text = "出料口4复位";
this.btnResetOut4.UseVisualStyleBackColor = true;
this.btnResetOut4.Click += new System.EventHandler(this.btnResetOut4_Click);
//
// btnResetOut3
//
this.btnResetOut3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnResetOut3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnResetOut3.Location = new System.Drawing.Point(862, 94);
this.btnResetOut3.Name = "btnResetOut3";
this.btnResetOut3.Size = new System.Drawing.Size(130, 32);
this.btnResetOut3.TabIndex = 273;
this.btnResetOut3.Text = "出料口3复位";
this.btnResetOut3.UseVisualStyleBackColor = true;
this.btnResetOut3.Click += new System.EventHandler(this.btnResetOut3_Click);
//
// btnResetOut2
//
this.btnResetOut2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnResetOut2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnResetOut2.Location = new System.Drawing.Point(862, 55);
this.btnResetOut2.Name = "btnResetOut2";
this.btnResetOut2.Size = new System.Drawing.Size(130, 32);
this.btnResetOut2.TabIndex = 272;
this.btnResetOut2.Text = "出料口2复位";
this.btnResetOut2.UseVisualStyleBackColor = true;
this.btnResetOut2.Click += new System.EventHandler(this.btnResetOut2_Click);
//
// btnResetOut1
//
this.btnResetOut1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnResetOut1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnResetOut1.Location = new System.Drawing.Point(862, 16);
this.btnResetOut1.Name = "btnResetOut1";
this.btnResetOut1.Size = new System.Drawing.Size(130, 32);
this.btnResetOut1.TabIndex = 271;
this.btnResetOut1.Text = "出料口1复位";
this.btnResetOut1.UseVisualStyleBackColor = true;
this.btnResetOut1.Click += new System.EventHandler(this.btnResetOut1_Click);
//
// listReelInfo
//
this.listReelInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
......@@ -322,53 +374,17 @@ namespace TheMachine
this.listView1.TabIndex = 2;
this.listView1.UseCompatibleStateImageBehavior = false;
//
// btnResetOut1
//
this.btnResetOut1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnResetOut1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnResetOut1.Location = new System.Drawing.Point(862, 16);
this.btnResetOut1.Name = "btnResetOut1";
this.btnResetOut1.Size = new System.Drawing.Size(130, 32);
this.btnResetOut1.TabIndex = 271;
this.btnResetOut1.Text = "出料口1复位";
this.btnResetOut1.UseVisualStyleBackColor = true;
this.btnResetOut1.Click += new System.EventHandler(this.btnResetOut1_Click);
//
// btnResetOut2
//
this.btnResetOut2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnResetOut2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnResetOut2.Location = new System.Drawing.Point(862, 55);
this.btnResetOut2.Name = "btnResetOut2";
this.btnResetOut2.Size = new System.Drawing.Size(130, 32);
this.btnResetOut2.TabIndex = 272;
this.btnResetOut2.Text = "出料口2复位";
this.btnResetOut2.UseVisualStyleBackColor = true;
this.btnResetOut2.Click += new System.EventHandler(this.btnResetOut2_Click);
//
// btnResetOut3
// toolStripSeparator5
//
this.btnResetOut3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnResetOut3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnResetOut3.Location = new System.Drawing.Point(862, 94);
this.btnResetOut3.Name = "btnResetOut3";
this.btnResetOut3.Size = new System.Drawing.Size(130, 32);
this.btnResetOut3.TabIndex = 273;
this.btnResetOut3.Text = "出料口3复位";
this.btnResetOut3.UseVisualStyleBackColor = true;
this.btnResetOut3.Click += new System.EventHandler(this.btnResetOut3_Click);
this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(177, 6);
//
// btnResetOut4
// toolStripMenuItem1
//
this.btnResetOut4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnResetOut4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnResetOut4.Location = new System.Drawing.Point(862, 133);
this.btnResetOut4.Name = "btnResetOut4";
this.btnResetOut4.Size = new System.Drawing.Size(130, 32);
this.btnResetOut4.TabIndex = 274;
this.btnResetOut4.Text = "出料口4复位";
this.btnResetOut4.UseVisualStyleBackColor = true;
this.btnResetOut4.Click += new System.EventHandler(this.btnResetOut4_Click);
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(180, 26);
this.toolStripMenuItem1.Text = "扫码测试";
this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
//
// FormMain
//
......@@ -428,6 +444,8 @@ namespace TheMachine
private System.Windows.Forms.Button btnResetOut4;
private System.Windows.Forms.Button btnResetOut3;
private System.Windows.Forms.Button btnResetOut2;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
}
}
TheMachine/FormMain.cs
using CodeLibrary;
using DeviceLibrary;
using OnlineStore;
using OnlineStore.Common;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
using System.Drawing;
......@@ -684,5 +686,25 @@ namespace TheMachine
{
outSheftReset("U4");
}
private void toolStripMenuItem1_Click(object sender, EventArgs e)
{
IOManager.IOMove(IO_Type.Camera_Led, IO_VALUE.HIGH);
if (Camera._cam != null)
{
Camera._cam.CloseAll();
}
CodeLibrary.CodeResourceControl.GetLanguageEvent += Crc_GetLanguageEvent;
CodeLibrary.FrmCodeDecode frm = new CodeLibrary.FrmCodeDecode();
frm.CurrLanguage = Crc_GetLanguageEvent();
frm.chbZxing.Checked = false;
try
{
frm.ShowDialog();
frm.Dispose();
}
catch { }
}
}
}
\ No newline at end of file
TheMachine/UC/uc_boxdebug.cs
......@@ -196,13 +196,14 @@ namespace TheMachine
for (int i = 0; i < RobotManage.AllPosList.Count; i++)
{
string posname = RobotManage.AllPosList[i];
string ab = posname.Substring(0, 3);
string ab = posname.Substring(0, 2);
if (posname.StartsWith("Sca") || posname.StartsWith("Doo"))
{
ab = "aa";
}
string memo = CSVPositionReader<ACStorePosition>.allPositionMap[posname].memo;
//if (posname.StartsWith("Sca") || posname.StartsWith("Doo"))
//{
// ab = "aa";
//}
//string memo = "";
//string memo = CSVPositionReader<ACStorePosition>.allPositionMap[posname].memo;
var showname = posname;
if (ab != lastAB)
......@@ -210,12 +211,13 @@ namespace TheMachine
currentRowIndex = 0;
currentColIndex++;
string headerText = crc.GetString("Res0090", "其他取放料口");
headerText = ab;
lastAB = ab;
string[] posArray = posname.Split('_');
if (posArray.Length >= 2)
{
headerText = posArray[0];
}
//if (posArray.Length >= 2)
//{
// headerText = posArray[0];
//}
//if (posname.StartsWith("L"))
//{
// dataGridView1.Columns[currentColIndex].HeaderText = crc.GetString(memo, memo) + "(" + posname.Substring(0, 2) + ")";
......@@ -228,7 +230,7 @@ namespace TheMachine
}
//if (!posname.StartsWith("L"))
{
showname = posname + "(" + crc.GetString(memo, memo) + ")";
showname = posname ;
}
var currentRow = dataGridView1.Rows[currentRowIndex];
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!