Merge pull request #16 from jozamudi/lamp-motion-checkout

Lamp motion checkout changes.
pcdshub · Apr 18, 2024 · 191a889 · 191a889
2 parents cb288a9 + 60c7630
commit 191a889
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 113 deletions.
diff --git a/iocBoot/ioc-lamp-motion/st.cmd b/iocBoot/ioc-lamp-motion/st.cmd
@@ -3,9 +3,9 @@
 #
 #         Project: lcls-plc-lamp-motion.tsproj
 #        PLC name: lamp_motion (lamp_motion Instance)
-# Generated using: pytmc 2.15.1
-# Project version: d538f6c
-#    Project hash: d538f6c902852110e3a7683cb962052550ad0e2e
+# Generated using: pytmc 2.16.0
+# Project version: 0d3b914
+#    Project hash: 0d3b9149f7d9723e53dcd1a8301d787de83e1a16
 #     PLC IP/host: 172.21.132.58
 #      PLC Net ID: 172.21.132.58.1.1
 #  ** Production mode IOC **
@@ -299,7 +299,7 @@ dbLoadRecords("caPutLog.db", "IOC=$(IOC)")
 dbLoadRecords("TwinCAT_TaskInfo.db", "PORT=$(ASYN_PORT),PREFIX=PLC:LAMP:MOTION,IDX=1")
 dbLoadRecords("TwinCAT_AppInfo.db", "PORT=$(ASYN_PORT), PREFIX=PLC:LAMP:MOTION")
 
-dbLoadRecords("TwinCAT_Project.db", "PREFIX=PLC:LAMP:MOTION,PROJECT=lcls-plc-lamp-motion.tsproj,HASH=d538f6c,VERSION=d538f6c,PYTMC=2.15.1,PLC_HOST=172.21.132.58")
+dbLoadRecords("TwinCAT_Project.db", "PREFIX=PLC:LAMP:MOTION,PROJECT=lcls-plc-lamp-motion.tsproj,HASH=0d3b914,VERSION=0d3b914,PYTMC=2.16.0,PLC_HOST=172.21.132.58")
 
 #   Tc2_MC2: * (Beckhoff Automation GmbH)
 dbLoadRecords("TwinCAT_Dependency.db", "PREFIX=PLC:LAMP:MOTION,DEPENDENCY=Tc2_MC2,VERSION=*,VENDOR=Beckhoff Automation GmbH")

diff --git a/lamp_motion_scope/VSSettings/.vsm b/lamp_motion_scope/VSSettings/.vsm
@@ -6,7 +6,7 @@
     <Node>
       <Title>Scope YT NC Project</Title>
       <Expanded>False</Expanded>
-      <FileName>C:\Users\jozamudi\Documents\TcXaeShell\TMO\lcls-plc-lamp-motion\lamp_motion_scope\Scope YT NC Project.tcscopex</FileName>
+      <FileName>C:\Users\jozamudi\Documents\TcXaeShell\lcls-plc-lamp-motion\lamp_motion_scope\Scope YT NC Project.tcscopex</FileName>
       <Children>
         <Node>
           <Title>DataPool</Title>

diff --git a/lcls-plc-lamp-motion/_Config/PLC/lamp_motion.xti b/lcls-plc-lamp-motion/_Config/PLC/lamp_motion.xti
@@ -3034,6 +3034,18 @@ External Setpoint Generation:
 				<Link VarA="PlcTask Inputs^Main.M9.Axis.NcToPlc" VarB="Outputs^ToPlc"/>
 				<Link VarA="PlcTask Outputs^Main.M9.Axis.PlcToNc" VarB="Inputs^FromPlc"/>
 			</OwnerB>
+			<OwnerB Name="TINC^NC-Task 1 SAF^Axes^TIXELX">
+				<Link VarA="PlcTask Inputs^Main.M14.Axis.NcToPlc" VarB="Outputs^ToPlc"/>
+				<Link VarA="PlcTask Outputs^Main.M14.Axis.PlcToNc" VarB="Inputs^FromPlc"/>
+			</OwnerB>
+			<OwnerB Name="TINC^NC-Task 1 SAF^Axes^TIXELY">
+				<Link VarA="PlcTask Inputs^Main.M15.Axis.NcToPlc" VarB="Outputs^ToPlc"/>
+				<Link VarA="PlcTask Outputs^Main.M15.Axis.PlcToNc" VarB="Inputs^FromPlc"/>
+			</OwnerB>
+			<OwnerB Name="TINC^NC-Task 1 SAF^Axes^TIXELZ">
+				<Link VarA="PlcTask Inputs^Main.M16.Axis.NcToPlc" VarB="Outputs^ToPlc"/>
+				<Link VarA="PlcTask Outputs^Main.M16.Axis.PlcToNc" VarB="Inputs^FromPlc"/>
+			</OwnerB>
 		</OwnerA>
 	</Mappings>
 </TcSmItem>
diff --git a/lcls-plc-lamp-motion/lamp_motion/POUs/Main.TcPOU b/lcls-plc-lamp-motion/lamp_motion/POUs/Main.TcPOU
@@ -87,22 +87,25 @@ VAR
 
     // ...//
     // TIXEL
-    {attribute 'TcLinkTo' := '.bLimitForwardEnable:=TIIB[TIXELX-EL7041]^STM Status^Status^Digital input 1;
-                              .bLimitBackwardEnable:=TIIB[TIXELX-EL7041]^STM Status^Status^Digital input 2'}
+    {attribute 'TcLinkTo' := '	.bLimitForwardEnable:=TIIB[TIXELX-EL7041]^STM Status^Status^Digital input 1;
+                                  .bLimitBackwardEnable:=TIIB[TIXELX-EL7041]^STM Status^Status^Digital input 2';
+                                .nRawEncoderULINT:=TIIB[TIXELXY_ENC-EL5042]^FB Inputs Channel 1^Position'}
     {attribute 'pytmc' := '
         pv: TMO:LAMP:MMS:14
     '}
     M14		: DUT_MotionStage := (bPowerSelf:=TRUE, nEnableMode:=ENUM_StageEnableMode.DURING_MOTION); // TIXEL X
 
-    {attribute 'TcLinkTo' := '.bLimitForwardEnable:=TIIB[TIXELY-EL7041]^STM Status^Status^Digital input 1;
-                              .bLimitBackwardEnable:=TIIB[TIXELY-EL7041]^STM Status^Status^Digital input 2'}
+    {attribute 'TcLinkTo' := '	.bLimitForwardEnable:=TIIB[TIXELY-EL7041]^STM Status^Status^Digital input 1;
+                                  .bLimitBackwardEnable:=TIIB[TIXELY-EL7041]^STM Status^Status^Digital input 2';
+                                .nRawEncoderULINT:=TIIB[TIXELXY_ENC-EL5042]^FB Inputs Channel 2^Position'}
     {attribute 'pytmc' := '
         pv: TMO:LAMP:MMS:15
     '}
     M15		: DUT_MotionStage := (bPowerSelf:=TRUE, nEnableMode:=ENUM_StageEnableMode.DURING_MOTION); // TIXEL Y
 
-    {attribute 'TcLinkTo' := '.bLimitForwardEnable:=TIIB[TIXELZ-EL7041]^STM Status^Status^Digital input 1;
-                              .bLimitBackwardEnable:=TIIB[TIXELZ-EL7041]^STM Status^Status^Digital input 2'}
+    {attribute 'TcLinkTo' := '	.bLimitForwardEnable:=TIIB[TIXELZ-EL7041]^STM Status^Status^Digital input 1;
+                                  .bLimitBackwardEnable:=TIIB[TIXELZ-EL7041]^STM Status^Status^Digital input 2';
+                                .nRawEncoderULINT:=TIIB[TIXELZ_ENC-EL5042]^FB Inputs Channel 1^Position'}
     {attribute 'pytmc' := '
         pv: TMO:LAMP:MMS:16
     '}