Merge pull request pcdshub#112 from tongju12/st1k4

 adding IN and OUT states for ST1K4

plc-kfe-motion/kfe_motion/POUs/PRG_3_PMPS_POST.TcPOU

@@ -6,12 +6,17 @@ VAR
     fbArbiterIO: FB_SubSysToArbiter_IO;
     fb_vetoArbiter: FB_VetoArbiter;
     bM1K1_Veto_IN: BOOL;
+
 END_VAR
 ]]></Declaration>
     <Implementation>
       <ST><![CDATA[// create MR1K1 as veto for K4 lines
 bM1K1_Veto_IN := NOT PMPS_GVL.stCurrentBeamParameters.aVetoDevices[PMPS.K_Stopper.MR1K1_OUT]
                 AND PMPS_GVL.stCurrentBeamParameters.aVetoDevices[PMPS.K_Stopper.MR1K1_IN];
+
+
+				
+				
 //create a preemptive request from Arbiter 2 in Arbiter 1
 fb_vetoArbiter(bVeto:=bM1K1_Veto_IN,
                 HigherAuthority := GVL.fbArbiter,

plc-kfe-motion/kfe_motion/POUs/PRG_ST1K4_TEST.TcPOU

@@ -13,26 +13,26 @@ VAR
     '}
 	
 	
- {*    fbST1K4_InOut_States:FB_PositionStateInOut;
+     fbST1K4_InOut_States:FB_PositionStateInOut;
 	 
 	 ST1K4_In:DUT_PositionState:= (
 		 bUseRawCounts := FALSE,
 		 bMoveOK := TRUE,
 		 bValid := TRUE,
 		 sName := 'IN',
-		 fPosition := -30.997,
+		 fPosition := 0,
 		 fDelta := 1,
-		 fVelocity := 6);
+		 fVelocity := 12);
 	
      ST1K4_Out:DUT_PositionState:= (
 		 bUseRawCounts := FALSE,
 		 bMoveOK := TRUE,
 		 bValid := TRUE,
 		 sName := 'OUT',
-		 fPosition := 8.080,
+		 fPosition := 40,
 		 fDelta := 1,
-		 fVelocity := 6);
-*}
+		 fVelocity := 12);
+
 
 END_VAR
 
@@ -46,12 +46,20 @@ Main.M33.nBrakeMode := ENUM_StageBrakeMode.IF_ENABLED;
 fbMotion1(stMotionStage:=Main.M33);
 // in and out position 
  
-{*    fbST1K4_InOut_States(
+    fbST1K4_InOut_States(
           bEnable := TRUE,
           stIn := ST1K4_In,
           stOut := ST1K4_OUT,
           stMotionStage := Main.M33); 		  
- 
+     
+
+
+ {*     bIn := PMPS_GVL.stCurrentBeamParameters.aVetoDevices[PMPS.K_Stopper.ST3K4];
+	    IF bIn
+		 fbST1K4_InOut_States.enumSet:= ENUM_EpicsInOut.IN;
+		fbST1K4_Out_States;
+		
+
 *}
 
 ]]></ST>