1

DeviceLibrary/DeviceLibrary/LiftMonitor.cs

@@ -26,10 +26,11 @@ namespace DeviceLibrary
         int upspeed;
         int upspeed;
         int downspeed;
         int downspeed;
         int StrokeLength = 270000;
         int StrokeLength = 270000;
-        MoveInfo moveInfo1 = new MoveInfo("升降机构", false);
+        MoveInfo moveInfo1;
         bool paused = false;
         bool paused = false;
-        public LiftMonitor(string _up, string _down, string _saftylight, string _break, AxisBean _axisBean, int _StrokeLength, int _upspeed, int _downspeed = 0)
+        public LiftMonitor(string _up, string _down, string _saftylight, string _break, AxisBean _axisBean, int _StrokeLength, int _upspeed, int _downspeed = 0,string name= "升降机构")
         {
         {
+            moveInfo1 = new MoveInfo(name, false);
             up = _up;
             up = _up;
             down = _down;
             down = _down;
             saftylight = _saftylight;
             saftylight = _saftylight;

DeviceLibrary/theMachine/MainMachine.cs

@@ -124,8 +124,8 @@ namespace DeviceLibrary
             {
             {
                 RobotManage.Config.DOList.Remove(IO_Type.ReelFlipDoor_Work);
                 RobotManage.Config.DOList.Remove(IO_Type.ReelFlipDoor_Work);
                 RobotManage.Config.DOList.Remove(IO_Type.ReelFlipDoor_Home);
                 RobotManage.Config.DOList.Remove(IO_Type.ReelFlipDoor_Home);
-                MotorFlipDoorB = new LiftMonitor(IO_Type.ReelFlipDoor_L_Home, IO_Type.ReelFlipDoor_L_Work, IO_Type.SafetyLightCurtains, null, new AxisBean(Config.FlipDoor_L_Axis, Name), Config.FlipDoorLength, Config.FlipDoorLength_speed);
-                MotorFlipDoorA = new LiftMonitor(IO_Type.ReelFlipDoor_R_Home, IO_Type.ReelFlipDoor_R_Work, IO_Type.SafetyLightCurtains, null, new AxisBean(Config.FlipDoor_R_Axis, Name), Config.FlipDoorLength, Config.FlipDoorLength_speed);
+                MotorFlipDoorB = new LiftMonitor(IO_Type.ReelFlipDoor_L_Home, IO_Type.ReelFlipDoor_L_Work, IO_Type.SafetyLightCurtains, null, new AxisBean(Config.FlipDoor_L_Axis, Name), Config.FlipDoorLength, Config.FlipDoorLength_speed,0,"B翻转门");
+                MotorFlipDoorA = new LiftMonitor(IO_Type.ReelFlipDoor_R_Home, IO_Type.ReelFlipDoor_R_Work, IO_Type.SafetyLightCurtains, null, new AxisBean(Config.FlipDoor_R_Axis, Name), Config.FlipDoorLength, Config.FlipDoorLength_speed,0, "A翻转门");
                 MotorFlipDoorB.SlowAftPause = true;
                 MotorFlipDoorB.SlowAftPause = true;
                 MotorFlipDoorB.SlowAftPause = true;
                 MotorFlipDoorB.SlowAftPause = true;
                 LogUtil.info("加载翻板门类型为:步进");
                 LogUtil.info("加载翻板门类型为:步进");
@@ -143,7 +143,7 @@ namespace DeviceLibrary
                 var sf = "";
                 var sf = "";
                 if (ConfigHelper.Config.Get("Device_IO_X08IsStringDoor_SafetyLightCurtains", false))
                 if (ConfigHelper.Config.Get("Device_IO_X08IsStringDoor_SafetyLightCurtains", false))
                     sf = IO_Type.AGV_OnPosition;
                     sf = IO_Type.AGV_OnPosition;
-                StringDoor = new LiftMonitor(IO_Type.StringDoor_Open, IO_Type.StringDoor_Close, sf, IO_Type.StringDoor_Axis_Break, new AxisBean(Config.StringDoor_Axis, Name), Config.StringDoorLength, Config.StringDoorLength_speed);
+                StringDoor = new LiftMonitor(IO_Type.StringDoor_Open, IO_Type.StringDoor_Close, sf, IO_Type.StringDoor_Axis_Break, new AxisBean(Config.StringDoor_Axis, Name), Config.StringDoorLength, Config.StringDoorLength_speed,0,"折叠门");
                 StringDoor.DownOverTimeMS = ConfigHelper.Config.Get("Device_StringDoor_DownOverTimeMS", 0);
                 StringDoor.DownOverTimeMS = ConfigHelper.Config.Get("Device_StringDoor_DownOverTimeMS", 0);
                 StringDoor.UpOverTimeMS = ConfigHelper.Config.Get("Device_StringDoor_UpOverTimeMS", 0);
                 StringDoor.UpOverTimeMS = ConfigHelper.Config.Get("Device_StringDoor_UpOverTimeMS", 0);
                 StringDoor.ResumeWaitTimeSec = 5;
                 StringDoor.ResumeWaitTimeSec = 5;