IO点位变更

刘韬
Commit 6f4bfe8d 由刘韬编写于 2022-08-19 15:18:31 +0800
LoadCVSLibrary/Config/Config.csv
LoadCVSLibrary/storeConfig/config/IO_Type.cs
LoadCVSLibrary/storeConfig/config/Robot_Config.cs
TheMachine/IOControls.Designer.cs
--- a/LoadCVSLibrary/Config/Config.csv
查看文件 @6f4bfe8
+++ b/LoadCVSLibrary/Config/Config.csv
查看文件 @6f4bfe8
@@ -16,7 +16,7 @@ PRO,10,AMH移栽设备每毫米脉冲,AMH_TS_PoToMM,1000,,,,,,,,,,,,
 PRO,10,AMH移栽设备待机点P1,AMH_TS_P1,1000,,,10000,,,,,,,,,
 PRO,14,机器人压紧轴每毫米脉冲,AMH_RoboComp_PoToMM,1000,,,,,,,,,,,,
 PRO,14,机器人压紧轴待机点P1,AMH_RoboComp_P1,1000,,,10000,,,,,,,,,
-PRO,50,托盘旋转轴每度脉冲,AMH_Route_PoToMM,1000,,,,,,,,,,,,
+PRO,15,托盘旋转轴每度脉冲,AMH_Route_PoToMM,1000,,,10000,,,,,,,,,
 ,,,,,,,,,,,,,,,,
 DI,0,急停,SuddenStop_BTN,0,,X00,,,,,,,,,,
 DI,0,复位,Reset_BTN,1,,X01,,,,,,,,,,
@@ -80,6 +80,11 @@ DI,0,AMH-MI1托盘到位检测,MI_In_Check,51,AMH-MI1,X51,,,,,,,,,,
 DI,0,AMH-MI1托盘物料检测,MI_Reel_Check,52,AMH-MI1,X52,,,,,,,,,,
 DI,0,ROBOT-MI1物料检测,MI_Robot_Reel_Check,53,AMH-MI1,X53,,,,,,,,,,
 DI,0,ROBOT-MI1夹紧检测,MI_Robot_Clamp_Check,54,AMH-MI1,X54,,,,,,,,,,
+DI,0,MI1-7寸物料检测,MI_w7_Check,55,AMH-MI1,X55,,,,,,,,,,
+DI,0,MI1-13寸物料检测,MI_w13_Check,56,AMH-MI1,X56,,,,,,,,,,
+DI,0,MI1-15寸物料检测,MI_w15_Check,57,AMH-MI1,X57,,,,,,,,,,
+DI,0,MI1物料顶升上升端,MI_Reel_Location_Up,58,AMH-MI1,X58,,,,,,,,,,
+DI,0,MI1物料顶升下降端,MI_Reel_Location_Down,59,AMH-MI1,X59,,,,,,,,,,
 ,,,,,,,,,,,,,,,,
 DI,0,AMH-SBDH3-1顶升上升端,AMH_Location_Up,64,AMH-SBDH3-1,X64,,,,,,,,,,
 DI,0,AMH-SBDH3-1顶升下降端,AMH_Location_Down,65,AMH-SBDH3-1,X65,,,,,,,,,,
@@ -119,11 +124,11 @@ DI,0,AMH-CI托盘前阻挡检测,MI_Front_Check,94,CI,X94,,,,,,,,,,
 DI,0,AMH-CI托盘到位检测,MI_In_Check,95,CI,X95,,,,,,,,,,
 DI,0,AMH-CI托盘物料检测,MI_Reel_Check,96,CI,X96,,,,,,,,,,
 ,,,,,,,,,,,,,,,,
-DI,0,CI点料完成,CI_Count_Finished,97,,X97,,,,,,,,,,
+DI,0,CI点料完成,CI_Count_Finished,97,CI,X97,,,,,,,,,,
-DI,0,CI物料放置区门开启按钮,CI_Cache_Door_Open,98,,X98,,,,,,,,,,
+DI,0,CI物料放置区门开启按钮,CI_Cache_Door_Open,98,CI,X98,,,,,,,,,,
-DI,0,CI物料放置区门关闭按钮,CI_Cache_Door_Close,99,,X99,,,,,,,,,,
+DI,0,CI物料放置区门关闭按钮,CI_Cache_Door_Close,99,CI,X99,,,,,,,,,,
-DI,0,CI物料放置区门关闭检测,CI_Cache_Door_Close_Check,100,,X100,,,,,,,,,,
+DI,0,CI物料放置区门关闭检测,CI_Cache_Door_Close_Check,100,CI,X100,,,,,,,,,,
-DI,0,CI物料检测,CI_Cache_Reel_Check,101,,X101,,,,,,,,,,
+DI,0,CI物料检测,CI_Cache_Reel_Check,101,CI,X101,,,,,,,,,,
 ,,,,,,,,,,,,,,,,
 DI,0,LS3-1顶升上升端,Ls_A_Location_Up,112,LS3,X112,,,,,,,,,,
 DI,0,LS3-1顶升下降端,Ls_A_Location_Down,113,LS3,X113,,,,,,,,,,
@@ -163,6 +168,11 @@ DI,0,AMH-MI2托盘到位检测,MI_In_Check,140,AMH-MI2,X140,,,,,,,,,,
 DI,0,AMH-MI2托盘物料检测,MI_Reel_Check,141,AMH-MI2,X141,,,,,,,,,,
 DI,0,ROBOT-MI2物料检测,MI_Robot_Reel_Check,142,AMH-MI2,X142,,,,,,,,,,
 DI,0,ROBOT-MI2夹紧检测,MI_Robot_Clamp_Check,143,AMH-MI2,X143,,,,,,,,,,
+DI,0,MI2-7寸物料检测,MI_w7_Check,144,AMH-MI2,X144,,,,,,,,,,
+DI,0,MI2-13寸物料检测,MI_w13_Check,145,AMH-MI2,X145,,,,,,,,,,
+DI,0,MI2-15寸物料检测,MI_w15_Check,146,AMH-MI2,X146,,,,,,,,,,
+DI,0,MI2物料顶升上升端,MI_Reel_Location_Up,147,AMH-MI2,X147,,,,,,,,,,
+DI,0,MI2物料顶升下降端,MI_Reel_Location_Down,148,AMH-MI2,X148,,,,,,,,,,
 ,,,,,,,,,,,,,,,,
 DO,0,运行指示灯,Run_Led,0,,Y00,,,,,,,,,,
 DO,0,待机指示灯,Alarm_Led,1,,Y01,,,,,,,,,,
@@ -227,6 +237,8 @@ DO,0,AMH-MI1顶升下降,MI_Location_Down,52,AMH-MI1,Y52,,,,,,,,,,
 DO,0,AMH-MI1托盘前阻挡下降,AMH_Front_Stop,53,AMH-MI1,Y53,,,,,,,,,,
 DO,0,AMH-MI1托盘阻挡下降,AMH_Tray_Stop,54,AMH-MI1,Y54,,,,,,,,,,
 DO,0,MI1照明开启,MI_Robot_Light,55,AMH-MI1,Y55,,,,,,,,,,
+DO,0,MI1物料顶升上升,MI_Reel_Location_Up,56,AMH-MI1,Y56,,,,,,,,,,
+DO,0,MI1物料顶升下降,MI_Reel_Location_Down,57,AMH-MI1,Y57,,,,,,,,,,
 ,,,,,,,,,,,,,,,,
 DO,0,AMH-SBDH3-1顶升上升,AMH_Location_Up,64,AMH-SBDH3-1,Y64,,,,,,,,,,
 DO,0,AMH-SBDH3-1顶升下降,AMH_Location_Down,65,AMH-SBDH3-1,Y65,,,,,,,,,,
@@ -265,12 +277,12 @@ DO,0,AMH-CI顶升下降,MI_Location_Down,93,CI,Y93,,,,,,,,,,
 DO,0,AMH-CI托盘前阻挡下降,AMH_Front_Stop,94,CI,Y94,,,,,,,,,,
 DO,0,AMH-CI托盘阻挡下降,AMH_Tray_Stop,95,CI,Y95,,,,,,,,,,
 ,,,,,,,,,,,,,,,,
-DO,0,CI物料放置区门锁打开,CI_Cache_Door_UNLock,96,,Y96,,,,,,,,,,
+DO,0,CI物料放置区门锁打开,CI_Cache_Door_UNLock,96,CI,Y96,,,,,,,,,,
-DO,0,ROBOT-CI吸盘吸料,CI_sa,97,,Y97,,,,,,,,,,
+DO,0,ROBOT-CI吸盘吸料,CI_sa,97,CI,Y97,,,,,,,,,,
-DO,0,CI物料放置区照明开启,CI_Cache_Light,98,,Y98,,,,,,,,,,
+DO,0,CI物料放置区照明开启,CI_Cache_Light,98,CI,Y98,,,,,,,,,,
-DO,0,CI启动,CI_Start,99,,Y99,,,,,,,,,,
+DO,0,CI启动,CI_Start,99,CI,Y99,,,,,,,,,,
-DO,0,CI物料放置区门可开启指示灯,CI_Cache_Door_StandbyLED,100,,Y100,,,,,,,,,,
+DO,0,CI物料放置区门可开启指示灯,CI_Cache_Door_StandbyLED,100,CI,Y100,,,,,,,,,,
-DO,0,CI物料放置区物料NG指示灯,CI_Cache_Door_NGLED,101,,Y101,,,,,,,,,,
+DO,0,CI物料放置区物料NG指示灯,CI_Cache_Door_NGLED,101,CI,Y101,,,,,,,,,,
 ,,,,,,,,,,,,,,,,
 DO,0,LS3横移电机正转,Ls_A_LineRun,112,LS3,Y112,,,,,,,,,,
 DO,0,LS3横移电机反转,Ls_A_LineRwd,113,LS3,Y113,,,,,,,,,,
@@ -312,3 +324,5 @@ DO,0,AMH-MI2顶升下降,MI_Location_Down,143,AMH-MI2,Y143,,,,,,,,,,
 DO,0,AMH-MI2托盘前阻挡下降,AMH_Front_Stop,144,AMH-MI2,Y144,,,,,,,,,,
 DO,0,AMH-MI2托盘阻挡下降,AMH_Tray_Stop,145,AMH-MI2,Y145,,,,,,,,,,
 DO,0,MI2照明开启,MI_Robot_Light,146,AMH-MI2,Y146,,,,,,,,,,
+DO,0,MI2物料顶升上升,MI_Reel_Location_Up,147,AMH-MI2,Y147,,,,,,,,,,
+DO,0,MI2物料顶升下降,MI_Reel_Location_Down,148,AMH-MI2,Y148,,,,,,,,,,
--- a/LoadCVSLibrary/storeConfig/config/IO_Type.cs
查看文件 @6f4bfe8
+++ b/LoadCVSLibrary/storeConfig/config/IO_Type.cs
查看文件 @6f4bfe8
@@ -243,7 +243,27 @@ namespace OnlineStore.LoadCSVLibrary
        /// </summary>
        public static string Ls_B_Front_Stop = "Ls_B_Front_Stop";
+        /// <summary>
+        ///  DO,0,MI1物料顶升上升,MI_Reel_Location_Up,56,AMH-MI1,Y56,,,,,,,,,,
+        /// </summary>
+        public static string MI_Reel_Location_Up = "MI_Reel_Location_Up";
+        /// <summary>
+        ///  DO,0,MI1物料顶升下降,MI_Reel_Location_Down,57,AMH-MI1,Y57,,,,,,,,,,
+        /// </summary>
+        public static string MI_Reel_Location_Down = "MI_Reel_Location_Down";
+        /// <summary>
+        ///  DI,0,MI1-7寸物料检测,MI_w7_Check,55,AMH-MI1,X55,,,,,,,,,,
+        /// </summary>
+        public static string MI_w7_Check = "MI_w7_Check";
+        /// <summary>
+        ///  DI,0,MI1-13寸物料检测,MI_w13_Check,56,AMH-MI1,X56,,,,,,,,,,
+        /// </summary>
+        public static string MI_w13_Check = "MI_w13_Check";
+        /// <summary>
+        ///  DI,0,MI1-15寸物料检测,MI_w15_Check,57,AMH-MI1,X57,,,,,,,,,,
+        /// </summary>
+        public static string MI_w15_Check = "MI_w15_Check";
    }
    public enum IO_VALUE
    {

--- a/LoadCVSLibrary/storeConfig/config/Robot_Config.cs
查看文件 @6f4bfe8
+++ b/LoadCVSLibrary/storeConfig/config/Robot_Config.cs
查看文件 @6f4bfe8
@@ -121,6 +121,11 @@ namespace OnlineStore.LoadCSVLibrary
        /// </summary>
        [ConfigProAttribute("AMH_Route_PoToMM")]
        public int AMH_Route_PoToMM { get; set; }
+        /// <summary>
+        ///  PRO,50,托盘旋转轴每度脉冲,AMH_Route_PoToMM,1000,,,,,,,,,,,,
+        /// </summary>
+        [ConfigProAttribute("AMH_Route_PoToMM_speed")]
+        public int AMH_Route_PoToMM_speed { get; set; }
        public ConfigIO GetWaitIO(string ioType,string device="root")
        {
            if (DIList[device].ContainsKey(ioType))

--- a/TheMachine/IOControls.Designer.cs
查看文件 @6f4bfe8
+++ b/TheMachine/IOControls.Designer.cs
查看文件 @6f4bfe8
@@ -38,7 +38,7 @@ namespace TheMachine
            this.ioControl1.BackColor = System.Drawing.Color.White;
            this.ioControl1.Location = new System.Drawing.Point(0, 0);
            this.ioControl1.Name = "ioControl1";
-            this.ioControl1.Size = new System.Drawing.Size(975, 303);
+            this.ioControl1.Size = new System.Drawing.Size(975, 229);
            this.ioControl1.TabIndex = 0;
            this.ioControl1.Tag = "not";
            this.ioControl1.Load += new System.EventHandler(this.ioControl1_Load);
@@ -46,9 +46,9 @@ namespace TheMachine
            // configControl1
            // 
            this.configControl1.Config = null;
-            this.configControl1.Location = new System.Drawing.Point(3, 309);
+            this.configControl1.Location = new System.Drawing.Point(3, 235);
            this.configControl1.Name = "configControl1";
-            this.configControl1.Size = new System.Drawing.Size(705, 230);
+            this.configControl1.Size = new System.Drawing.Size(705, 254);
            this.configControl1.TabIndex = 1;
            this.configControl1.Tag = "not";
            //