adding sp1k4-att pmps database

tongju12 · Aug 14, 2023 · 7f6aeea · 7f6aeea
1 parent 6ca7635
commit 7f6aeea
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 29 deletions.
diff --git a/...ion/DUTs/ENUM_SolidAttenuator_Staes.TcDUT → ...on/DUTs/ENUM_SolidAttenuator_States.TcDUT b/...ion/DUTs/ENUM_SolidAttenuator_Staes.TcDUT → ...on/DUTs/ENUM_SolidAttenuator_States.TcDUT
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.18">
-  <DUT Name="ENUM_SolidAttenuator_Staes" Id="{a9b56f49-37af-4519-bf3c-f4ee10056eb1}">
+  <DUT Name="ENUM_SolidAttenuator_States" Id="{a9b56f49-37af-4519-bf3c-f4ee10056eb1}">
     <Declaration><![CDATA[{attribute 'qualified_only'}
 {attribute 'strict'}
-TYPE ENUM_SolidAttenuator_Staes :
+TYPE ENUM_SolidAttenuator_States :
 (
 
     Unknown := 0,

diff --git a/plc-tmo-motion/tmo_motion/POUs/PRG_SP1K4.TcPOU b/plc-tmo-motion/tmo_motion/POUs/PRG_SP1K4.TcPOU
@@ -78,12 +78,12 @@ VAR
         pv: SP1K4:ATT:STATE:SET
         io: io
     '}
-    att_enumSet: ENUM_SolidAttenuator_Staes;
+    att_enumSet: ENUM_SolidAttenuator_States;
      {attribute 'pytmc' := '
         pv: SP1K4:ATT:STATE:GET
         io: io
     '}
-    att_enumGet: ENUM_SolidAttenuator_Staes;
+    att_enumGet: ENUM_SolidAttenuator_States;
     fbATTSetup: FB_StateSetupHelper;
     fbATTDefault: ST_PositionState := (
         fDelta:=0.5,
@@ -175,7 +175,7 @@ fbZPSetup(stPositionState:=aZPYStates[ENUM_ZonePlate_States.FZP290_2], sName:='F
 fbZPSetup(stPositionState:=aZPZStates[ENUM_ZonePlate_States.FZP290_2], sName:='FZP-290-C2', fPosition:=0);
 
 
-bAttIn := att_enumGet <> ENUM_SolidAttenuator_Staes.OUT AND  att_enumGet <> ENUM_SolidAttenuator_Staes.Unknown;
+bAttIn := att_enumGet <> ENUM_SolidAttenuator_States.OUT AND  att_enumGet <> ENUM_SolidAttenuator_States.Unknown;
 
 IF bAttIn THEN
     // Attenuator is in, pick the ATT_IN states
@@ -214,6 +214,7 @@ ELSE
     aZPXStates[ENUM_ZonePlate_States.FZP290_2].stPMPS.sPmpsState := 'SP1K4:FZP-290-C2_ATT_OUT';
 END_IF
 
+
 fbZPStates(
     stMotionStage1:=Main.M34,
     stMotionStage2:=Main.M35,
@@ -250,26 +251,33 @@ fbMotionTLX(stMotionStage:=Main.M43);
 //FOIL Y (Solid-ATT-Y)
 fbMotionFoilY(stMotionStage:=Main.M44);
 
-
+// SP1K4-SOLID-ATT PMPS
 fbATTSetup(stPositionState:=fbATTDefault, bSetDefault:=TRUE);
 
-fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_Staes.OUT], sName:='OUT', fPosition:=0);
-fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_Staes.OUT], sName:='OUT', fPosition:=0);
+fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_States.OUT], sName:='OUT', fPosition:=0);
+fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_States.OUT], sName:='OUT', fPosition:=0);
+
+fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_States.Target1], sName:='TARGET1', fPosition:=0);
+fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_States.Target1], sName:='TARGET1', fPosition:=0);
 
-fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_Staes.Target1], sName:='TARGET1', fPosition:=0);
-fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_Staes.Target1], sName:='TARGET1', fPosition:=0);
+fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_States.Target2], sName:='TARGET2', fPosition:=0);
+fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_States.Target2], sName:='TARGET2', fPosition:=0);
 
-fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_Staes.Target2], sName:='TARGET2', fPosition:=0);
-fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_Staes.Target2], sName:='TARGET2', fPosition:=0);
+fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_States.Target3], sName:='TARGET3', fPosition:=0);
+fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_States.Target3], sName:='TARGET3', fPosition:=0);
 
-fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_Staes.Target3], sName:='TARGET3', fPosition:=0);
-fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_Staes.Target3], sName:='TARGET3', fPosition:=0);
+fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_States.Target4], sName:='TARGET4', fPosition:=0);
+fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_States.Target4], sName:='TARGET4', fPosition:=0);
 
-fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_Staes.Target4], sName:='TARGET4', fPosition:=0);
-fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_Staes.Target4], sName:='TARGET4', fPosition:=0);
+fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_States.Target5], sName:='TARGET5', fPosition:=0);
+fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_States.Target5], sName:='TARGET5', fPosition:=0);
 
-fbATTSetup(stPositionState:=aATTXStates[ENUM_SolidAttenuator_Staes.Target5], sName:='TARGET5', fPosition:=0);
-fbATTSetup(stPositionState:=aATTYStates[ENUM_SolidAttenuator_Staes.Target5], sName:='TARGET5', fPosition:=0);
+aATTXStates[ENUM_SolidAttenuator_States.OUT].stPMPS.sPmpsState := 'SP1K4:ATT-OUT';
+aATTXStates[ENUM_SolidAttenuator_States.Target1].stPMPS.sPmpsState := 'SP1K4:ATT-TARGET1';
+aATTXStates[ENUM_SolidAttenuator_States.Target2].stPMPS.sPmpsState := 'SP1K4:ATT-TARGET2';
+aATTXStates[ENUM_SolidAttenuator_States.Target3].stPMPS.sPmpsState := 'SP1K4:ATT-TARGET3';
+aATTXStates[ENUM_SolidAttenuator_States.Target4].stPMPS.sPmpsState := 'SP1K4:ATT-TARGET4';
+aATTXStates[ENUM_SolidAttenuator_States.Target5].stPMPS.sPmpsState := 'SP1K4:ATT-TARGET5';
 
 fbATTStates(
     stMotionStage1:=Main.M33,

diff --git a/plc-tmo-motion/tmo_motion/tmo_motion.plcproj b/plc-tmo-motion/tmo_motion/tmo_motion.plcproj
@@ -21,7 +21,7 @@
     <CompilerDefines>K</CompilerDefines>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="DUTs\ENUM_SolidAttenuator_Staes.TcDUT">
+    <Compile Include="DUTs\ENUM_SolidAttenuator_States.TcDUT">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="DUTs\ENUM_ZonePlate_States.TcDUT">

diff --git a/plc-tmo-motion/tmo_motion/tmo_motion.tmc b/plc-tmo-motion/tmo_motion/tmo_motion.tmc
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<TcModuleClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2009/05/TcModuleClass" Hash="{5B46E39C-4ABC-F349-FFB0-90A893E75B7E}" GeneratedBy="TwinCAT XAE Plc">
+<TcModuleClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2009/05/TcModuleClass" Hash="{57922ABF-CB1F-4436-D907-6EC80DF55899}" GeneratedBy="TwinCAT XAE Plc">
   <DataTypes>
     <DataType>
       <Name Namespace="LCLS_General">ST_System</Name>
@@ -52688,11 +52688,11 @@ Digital outputs</Comment>
         <Text>FZP290_2</Text>
         <Enum>15</Enum>
         <Comment>C2
-	FZP250_1 := 16    //w1  </Comment>
+	FZP250_1 := 16    //w1</Comment>
       </EnumInfo>
     </DataType>
     <DataType>
-      <Name>ENUM_SolidAttenuator_Staes</Name>
+      <Name>ENUM_SolidAttenuator_States</Name>
       <BitSize>16</BitSize>
       <BaseType>UINT</BaseType>
       <EnumInfo>
@@ -59492,7 +59492,7 @@ Digital outputs</Comment>
           <AreaNo AreaType="InputDst" CreateSymbols="true">0</AreaNo>
           <Name>PlcTask Inputs</Name>
           <ContextId>0</ContextId>
-          <ByteSize>85458944</ByteSize>
+          <ByteSize>85524480</ByteSize>
           <Symbol>
             <Name>PRG_AL1K4_L2SI.fbAL1K4.fbYStage.fbDriveVirtual.MasterAxis.NcToPlc</Name>
             <BitSize>2048</BitSize>
@@ -68491,7 +68491,7 @@ Digital outputs</Comment>
           <AreaNo AreaType="OutputSrc" CreateSymbols="true">1</AreaNo>
           <Name>PlcTask Outputs</Name>
           <ContextId>0</ContextId>
-          <ByteSize>85458944</ByteSize>
+          <ByteSize>85524480</ByteSize>
           <Symbol>
             <Name>PRG_AL1K4_L2SI.fbAL1K4.fbYStage.fbDriveVirtual.MasterAxis.PlcToNc</Name>
             <BitSize>1024</BitSize>
@@ -71083,7 +71083,7 @@ Digital outputs</Comment>
           <AreaNo AreaType="Internal" CreateSymbols="true">3</AreaNo>
           <Name>PlcTask Internal</Name>
           <ContextId>0</ContextId>
-          <ByteSize>85458944</ByteSize>
+          <ByteSize>85524480</ByteSize>
           <Symbol>
             <Name>DefaultGlobals.stSys</Name>
             <Comment>Included for you</Comment>
@@ -78347,7 +78347,7 @@ Digital outputs</Comment>
           <Symbol>
             <Name>PRG_SP1K4.att_enumSet</Name>
             <BitSize>16</BitSize>
-            <BaseType>ENUM_SolidAttenuator_Staes</BaseType>
+            <BaseType>ENUM_SolidAttenuator_States</BaseType>
             <Properties>
               <Property>
                 <Name>pytmc</Name>
@@ -78362,7 +78362,7 @@ Digital outputs</Comment>
           <Symbol>
             <Name>PRG_SP1K4.att_enumGet</Name>
             <BitSize>16</BitSize>
-            <BaseType>ENUM_SolidAttenuator_Staes</BaseType>
+            <BaseType>ENUM_SolidAttenuator_States</BaseType>
             <Properties>
               <Property>
                 <Name>pytmc</Name>
@@ -80567,7 +80567,7 @@ Digital outputs</Comment>
           <AreaNo AreaType="RetainSrc" CreateSymbols="true">4</AreaNo>
           <Name>PlcTask Retains</Name>
           <ContextId>0</ContextId>
-          <ByteSize>85458944</ByteSize>
+          <ByteSize>85524480</ByteSize>
           <Symbol>
             <Name>PMPS_GVL.SuccessfulPreemption</Name>
             <Comment> Any time BPTM applies a new BP request which is confirmed</Comment>
@@ -80647,7 +80647,7 @@ Digital outputs</Comment>
         </Property>
         <Property>
           <Name>ChangeDate</Name>
-          <Value>2023-08-10T14:32:44</Value>
+          <Value>2023-08-14T10:14:06</Value>
         </Property>
         <Property>
           <Name>GeneratedCodeSize</Name>