Skip to content

Commit

Permalink
modify sp1k4-att delta and velocity
Browse files Browse the repository at this point in the history
  • Loading branch information
@tongju12
tongju12 committed Oct 10, 2024
1 parent 3aa02f9 commit dd535f7
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 53 deletions.
2 changes: 1 addition & 1 deletion plc-tmo-motion/_Config/PLC/tmo_motion.xti
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1260,7 +1260,7 @@ External Setpoint Generation:
</DataType>
</DataTypes>
<Project GUID="{9DD0BA81-4A92-4D5E-8BD9-E101C02702D4}" Name="tmo_motion" PrjFilePath="..\..\tmo_motion\tmo_motion.plcproj" TmcFilePath="..\..\tmo_motion\tmo_motion.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" SymbolicMapping="true">
<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tmo_motion\tmo_motion.tmc" TmcHash="{AB843895-9D55-82CC-59D2-B7B5F13DFC54}">
<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tmo_motion\tmo_motion.tmc" TmcHash="{809F7B1D-2ADE-E1E2-94D2-070C6BB450C6}">
<Name>tmo_motion Instance</Name>
<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
<Vars VarGrpType="1">
Expand Down
4 changes: 2 additions & 2 deletions plc-tmo-motion/tmo_motion/POUs/PRG_SP1K4.TcPOU
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ VAR
att_enumGet: ENUM_SolidAttenuator_States;
fbATTSetup: FB_StateSetupHelper;
fbATTDefault: ST_PositionState := (
fDelta:=1.5,
fVelocity:=1,
fDelta:=2.0,
fVelocity:=2,
// bMoveOk:=TRUE,
bValid:=TRUE
);
Expand Down
100 changes: 50 additions & 50 deletions plc-tmo-motion/tmo_motion/tmo_motion.tmc
View file
Original file line number Diff line number Diff line change
@@ -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="{AB843895-9D55-82CC-59D2-B7B5F13DFC54}" 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="{809F7B1D-2ADE-E1E2-94D2-070C6BB450C6}" GeneratedBy="TwinCAT XAE Plc">
<DataTypes>
<DataType>
<Name Namespace="LCLS_General">ST_System</Name>
Expand Down Expand Up @@ -19263,21 +19263,6 @@ contributing fast faults, unless the FFO is currently vetoed.
</Property>
</Properties>
</DataType>
<DataType>
<Name>USINT (USINT#1..255)</Name>
<BitSize>8</BitSize>
<BaseType>USINT</BaseType>
<Properties>
<Property>
<Name>LowerBorder</Name>
<Value>1</Value>
</Property>
<Property>
<Name>UpperBorder</Name>
<Value>255</Value>
</Property>
</Properties>
</DataType>
<DataType>
<Name Namespace="lcls_twincat_common_components.lcls_twincat_motion.Tc3_IPCDiag">E_IPCDiag_Datatype</Name>
<Comment> parameter datatype 1..15</Comment>
Expand Down Expand Up @@ -20886,7 +20871,7 @@ contributing fast faults, unless the FFO is currently vetoed.
</Parameter>
<Local>
<Name>nParameterIdx</Name>
<Type>USINT (USINT#1..255)</Type>
<Type>USINT (1..255)</Type>
<BitSize>8</BitSize>
</Local>
<Local>
Expand Down Expand Up @@ -24747,7 +24732,7 @@ contributing fast faults, unless the FFO is currently vetoed.
</Method>
</DataType>
<DataType>
<Name>UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestsForEachTestSuite)</Name>
<Name>UINT (1..GVL_Param_TcUnit.MaxNumberOfTestsForEachTestSuite)</Name>
<BitSize>16</BitSize>
<BaseType>UINT</BaseType>
<Properties>
Expand All @@ -24761,6 +24746,21 @@ contributing fast faults, unless the FFO is currently vetoed.
</Property>
</Properties>
</DataType>
<DataType>
<Name>UINT (1..GVL_Param_TcUnit.MaxNumberOfTestSuites)</Name>
<BitSize>16</BitSize>
<BaseType>UINT</BaseType>
<Properties>
<Property>
<Name>LowerBorder</Name>
<Value>1</Value>
</Property>
<Property>
<Name>UpperBorder</Name>
<Value>1000</Value>
</Property>
</Properties>
</DataType>
<DataType>
<Name Namespace="lcls_twincat_common_components.lcls_twincat_motion.PMPS.TcUnit">FB_AdsTestResultLogger</Name>
<Comment>
Expand All @@ -24778,7 +24778,7 @@ contributing fast faults, unless the FFO is currently vetoed.
</SubItem>
<SubItem>
<Name>PrintingTestSuiteResultNumber</Name>
<Type>UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestSuites)</Type>
<Type>UINT (1..GVL_Param_TcUnit.MaxNumberOfTestSuites)</Type>
<BitSize>16</BitSize>
<BitOffs>192</BitOffs>
</SubItem>
Expand Down Expand Up @@ -24816,12 +24816,12 @@ contributing fast faults, unless the FFO is currently vetoed.
</Local>
<Local>
<Name>TestsInTestSuiteCounter</Name>
<Type>UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestsForEachTestSuite)</Type>
<Type>UINT (1..GVL_Param_TcUnit.MaxNumberOfTestsForEachTestSuite)</Type>
<BitSize>16</BitSize>
</Local>
<Local>
<Name>MaxNumberOfTestsToPrint</Name>
<Type>UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestsForEachTestSuite)</Type>
<Type>UINT (1..GVL_Param_TcUnit.MaxNumberOfTestsForEachTestSuite)</Type>
<BitSize>16</BitSize>
</Local>
<Local>
Expand Down Expand Up @@ -25754,7 +25754,7 @@ contributing fast faults, unless the FFO is currently vetoed.
</SubItem>
<SubItem>
<Name>WritingTestSuiteResultNumber</Name>
<Type>UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestSuites)</Type>
<Type>UINT (1..GVL_Param_TcUnit.MaxNumberOfTestSuites)</Type>
<BitSize>16</BitSize>
<BitOffs>530752</BitOffs>
</SubItem>
Expand Down Expand Up @@ -26156,21 +26156,6 @@ contributing fast faults, unless the FFO is currently vetoed.
</Property>
</Properties>
</DataType>
<DataType>
<Name>UINT (1..GVL_Param_TcUnit.MaxNumberOfTestsForEachTestSuite)</Name>
<BitSize>16</BitSize>
<BaseType>UINT</BaseType>
<Properties>
<Property>
<Name>LowerBorder</Name>
<Value>1</Value>
</Property>
<Property>
<Name>UpperBorder</Name>
<Value>100</Value>
</Property>
</Properties>
</DataType>
<DataType>
<Name Namespace="lcls_twincat_common_components.lcls_twincat_motion.PMPS.TcUnit">U_ExpectedOrActual</Name>
<BitSize>4096</BitSize>
Expand Down Expand Up @@ -27794,7 +27779,7 @@ contributing fast faults, unless the FFO is currently vetoed.
</Local>
<Local>
<Name>NumberOfTestsToAnalyse</Name>
<Type>UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestSuites)</Type>
<Type>UINT (1..GVL_Param_TcUnit.MaxNumberOfTestSuites)</Type>
<BitSize>16</BitSize>
</Local>
<Local>
Expand Down Expand Up @@ -29329,7 +29314,7 @@ contributing fast faults, unless the FFO is currently vetoed.
</Local>
<Local>
<Name>NumberOfTestsToAnalyse</Name>
<Type>UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestSuites)</Type>
<Type>UINT (1..GVL_Param_TcUnit.MaxNumberOfTestSuites)</Type>
<BitSize>16</BitSize>
</Local>
</Method>
Expand Down Expand Up @@ -29914,7 +29899,7 @@ contributing fast faults, unless the FFO is currently vetoed.
</Local>
<Local>
<Name>NumberOfTestsToAnalyse</Name>
<Type>UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestSuites)</Type>
<Type>UINT (1..GVL_Param_TcUnit.MaxNumberOfTestSuites)</Type>
<BitSize>16</BitSize>
</Local>
</Method>
Expand Down Expand Up @@ -30362,7 +30347,7 @@ contributing fast faults, unless the FFO is currently vetoed.
</Local>
<Local>
<Name>NumberOfTestsToAnalyse</Name>
<Type>UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestSuites)</Type>
<Type>UINT (1..GVL_Param_TcUnit.MaxNumberOfTestSuites)</Type>
<BitSize>16</BitSize>
</Local>
</Method>
Expand Down Expand Up @@ -30736,7 +30721,7 @@ contributing fast faults, unless the FFO is currently vetoed.
</Local>
<Local>
<Name>NumberOfTestsToAnalyse</Name>
<Type>UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestSuites)</Type>
<Type>UINT (1..GVL_Param_TcUnit.MaxNumberOfTestSuites)</Type>
<BitSize>16</BitSize>
</Local>
</Method>
Expand Down Expand Up @@ -31243,6 +31228,21 @@ contributing fast faults, unless the FFO is currently vetoed.
</Property>
</Properties>
</DataType>
<DataType>
<Name>UINT (UINT#1..GVL_Param_TcUnit.MaxNumberOfTestsForEachTestSuite)</Name>
<BitSize>16</BitSize>
<BaseType>UINT</BaseType>
<Properties>
<Property>
<Name>LowerBorder</Name>
<Value>1</Value>
</Property>
<Property>
<Name>UpperBorder</Name>
<Value>100</Value>
</Property>
</Properties>
</DataType>
<DataType>
<Name Namespace="lcls_twincat_common_components.lcls_twincat_motion.PMPS.TcUnit">ST_AdsLogStringMessage</Name>
<BitSize>4128</BitSize>
Expand Down Expand Up @@ -77617,7 +77617,7 @@ second version of targets paddle 2</Comment>
<AreaNo AreaType="InputDst" CreateSymbols="true">0</AreaNo>
<Name>PlcTask Inputs</Name>
<ContextId>0</ContextId>
<ByteSize>88604672</ByteSize>
<ByteSize>88670208</ByteSize>
<Symbol>
<Name>PRG_AL1K4_L2SI.fbAL1K4.fbYStage.fbDriveVirtual.MasterAxis.NcToPlc</Name>
<BitSize>2048</BitSize>
Expand Down Expand Up @@ -90647,7 +90647,7 @@ second version of targets paddle 2</Comment>
<AreaNo AreaType="OutputSrc" CreateSymbols="true">1</AreaNo>
<Name>PlcTask Outputs</Name>
<ContextId>0</ContextId>
<ByteSize>88604672</ByteSize>
<ByteSize>88670208</ByteSize>
<Symbol>
<Name>PRG_AL1K4_L2SI.fbAL1K4.fbYStage.fbDriveVirtual.MasterAxis.PlcToNc</Name>
<BitSize>1024</BitSize>
Expand Down Expand Up @@ -93900,7 +93900,7 @@ second version of targets paddle 2</Comment>
<AreaNo AreaType="Internal" CreateSymbols="true">3</AreaNo>
<Name>PlcTask Internal</Name>
<ContextId>0</ContextId>
<ByteSize>88604672</ByteSize>
<ByteSize>88670208</ByteSize>
<Symbol>
<Name>DefaultGlobals.stSys</Name>
<Comment>Included for you</Comment>
Expand Down Expand Up @@ -101753,11 +101753,11 @@ second version of targets paddle 2</Comment>
<Default>
<SubItem>
<Name>.fDelta</Name>
<Value>1.5</Value>
<Value>2</Value>
</SubItem>
<SubItem>
<Name>.fVelocity</Name>
<Value>1</Value>
<Value>2</Value>
</SubItem>
<SubItem>
<Name>.bValid</Name>
Expand Down Expand Up @@ -104528,7 +104528,7 @@ second version of targets paddle 2</Comment>
<AreaNo AreaType="RetainSrc" CreateSymbols="true">4</AreaNo>
<Name>PlcTask Retains</Name>
<ContextId>0</ContextId>
<ByteSize>88604672</ByteSize>
<ByteSize>88670208</ByteSize>
<Symbol>
<Name>PMPS_GVL.SuccessfulPreemption</Name>
<Comment> Any time BPTM applies a new BP request which is confirmed</Comment>
Expand Down Expand Up @@ -104614,11 +104614,11 @@ second version of targets paddle 2</Comment>
</Property>
<Property>
<Name>ChangeDate</Name>
<Value>2024-10-10T09:05:51</Value>
<Value>2024-10-10T14:06:46</Value>
</Property>
<Property>
<Name>GeneratedCodeSize</Name>
<Value>1286144</Value>
<Value>1224704</Value>
</Property>
<Property>
<Name>GlobalDataSize</Name>
Expand Down

0 comments on commit dd535f7

Please sign in to comment.