Browse Source

1. 修复GuidePin报错
2. LiftPin2中增加Reset地址

zhouhr 2 months ago
parent
commit
27cb698723

+ 1 - 1
JetVirgoPM/Config/JetVirgoPM/DeviceModelPMPlus.xml

@@ -363,7 +363,7 @@
                diServoAlarm ="DI_LiftPin2_L_Servo_Driver_Alarm"
                diCCWLimitAlarm =""
                diOverSoftwareLimitAlarm=""
-               doReset =""
+               doReset ="DO_ResetSignal"
                doOrigin="DO_LiftPin2_Servo_Group_Search_ORG"
                doP1 ="DO_LiftPin2_Servo_Group_Go_POS1"
                doP2 ="DO_LiftPin2_Servo_Group_Go_POS2"

+ 20 - 2
Mars/EfemDualUI/Views/PMs/PmOverviewViewModel.cs

@@ -368,7 +368,16 @@ namespace EfemDualUI.Views.PMs
             set;
         }
 
-        public bool GuidePin1UpFeedback { get { return GuidePin1.OpenFeedback; } }
+        public bool GuidePin1UpFeedback
+        {
+            get
+            {
+                if (GuidePin1 != null)
+                    return GuidePin1.OpenFeedback;
+                else
+                    return false;
+            }
+        }
         [Subscription("GuidePin1.DeviceData")]
         public AITCylinderData GuidePin1
         {
@@ -376,7 +385,16 @@ namespace EfemDualUI.Views.PMs
             set;
         }
 
-        public bool GuidePin2UpFeedback { get { return GuidePin2.OpenFeedback; } }
+        public bool GuidePin2UpFeedback
+        {
+            get
+            {
+                if (GuidePin2 != null)
+                    return GuidePin2.OpenFeedback;
+                else
+                    return false;
+            }
+        }
         [Subscription("GuidePin2.DeviceData")]
         public AITCylinderData GuidePin2
         {