AIK-FAT/TC_iTomcat-ES2-Detector-Tower-FAT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in MBP-237-bug-bdone-stays-true-in_MC_MoveVelocity (pull request #74)

Browse Source 
MBP-237 bug bdone stays true in MC MoveVelocity

Approved-by: Federico Rojas
This commit is contained in:
Harald Kleines
2023-02-03 14:13:07 +00:00
committed by Federico Rojas
parent e35748d5d5 886c7e387f
commit 7819f72260
5 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
solution/_Config/PLC/tc_project_app.xti
View File

@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.32" ClassName="CNestedPlcProjDef">
<Project GUID="{FB261665-FD20-4BF2-97F8-2854C82B752D}" Name="tc_project_app" PrjFilePath="..\..\tc_project_app\tc_project_app.plcproj" TmcFilePath="..\..\tc_project_app\tc_project_app.tmc" ReloadTmc="true" AmsPort="852" FileArchiveSettings="#x000e" SymbolicMapping="true">
<Instance Id="#x08502040" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tc_project_app\tc_project_app.tmc" TmcHash="{ADC2B2A9-6B59-ADAD-13BB-395B58F0375E}">
<Instance Id="#x08502040" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tc_project_app\tc_project_app.tmc" TmcHash="{4D60DAD6-60EF-E84B-B0BE-6EF31A5C5743}">
<Name>tc_project_app Instance</Name>
<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
<Contexts>

30
solution/tc_project_app/GlobalTextList.TcGTLO
View File

@@ -10,6 +10,11 @@
<v n="TextDefault">" LocalMode"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"972"</v>
<v n="TextDefault">" bLocalMode"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"587"</v>
<v n="TextDefault">"%1d"</v>
@@ -140,6 +145,16 @@
<v n="TextDefault">"bInterlock"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"512"</v>
<v n="TextDefault">"bInVelocity"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"541"</v>
<v n="TextDefault">"bInVeloit"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"485"</v>
<v n="TextDefault">"bMovingExtend"</v>
@@ -190,6 +205,11 @@
<v n="TextDefault">"ehomeDirect"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"350"</v>
<v n="TextDefault">"eHomeDirect"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"198"</v>
<v n="TextDefault">"eHomeToEncPulse_Bwd"</v>
@@ -255,6 +275,11 @@
<v n="TextDefault">"English"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"1004"</v>
<v n="TextDefault">"eReadParameter"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"939"</v>
<v n="TextDefault">"errID"</v>
@@ -365,6 +390,11 @@
<v n="TextDefault">"HOME"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"568"</v>
<v n="TextDefault">"Home"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"169"</v>
<v n="TextDefault">"homeDirect"</v>

32
solution/tc_project_app/Visualization Manager.TcVMO
View File

@@ -45,10 +45,10 @@
<d n="FbMethods" t="CaseInsensitiveHashtable" ckt="String" cvt="Guid">
<v>FB_Init</v>
<v>c98701bd-1e9f-450a-a2a8-a2474d536f2e</v>
<v>FB_Exit</v>
<v>0be1b9ab-e8eb-4b33-b803-109abb46bde4</v>
<v>FB_Reinit</v>
<v>5b6e372a-a69d-40e8-aef7-f470b7c53d95</v>
<v>FB_Exit</v>
<v>0be1b9ab-e8eb-4b33-b803-109abb46bde4</v>
</d>
<v n="FbName">"NotImportant"</v>
<v n="FbGuid">{aa8b7e42-e967-427f-8f2e-f00f9d706470}</v>
@@ -466,34 +466,34 @@
<d n="FbMethods" t="CaseInsensitiveHashtable" ckt="String" cvt="Guid">
<v>ExecuteLooseCapture</v>
<v>4e2884cd-dc97-4120-914c-87a83e618f1f</v>
<v>ExecuteMouseUp</v>
<v>57eea9a5-15d9-4269-bb8d-9fee5420cdb2</v>
<v>Init</v>
<v>e61a0910-39b6-4bcc-9a64-fcab62230628</v>
<v>FB_Exit</v>
<v>e6e1ea47-0811-4b03-9888-d0564361e0d6</v>
<v>ExecuteMouseDblClick</v>
<v>a517a0ac-170b-4df4-b289-55dcb57628ed</v>
<v>ExecuteMouseDown</v>
<v>94bab392-b395-4c03-9d0e-5738d11bd021</v>
<v>ExecuteMouseUp</v>
<v>57eea9a5-15d9-4269-bb8d-9fee5420cdb2</v>
<v>ExecuteMouseEnter</v>
<v>569205fa-533b-4fc2-8d51-21ccab693305</v>
<v>FB_Reinit</v>
<v>97933c03-0169-4afe-ac83-de892204e120</v>
<v>GetElementInfo</v>
<v>f64cb89f-3016-4fba-85f5-02efcd4282c1</v>
<v>abstrGetDefaultCursor</v>
<v>25718998-50a9-408d-8b3f-20a55e2cc784</v>
<v>ExecuteMouseDown</v>
<v>94bab392-b395-4c03-9d0e-5738d11bd021</v>
<v>FB_Reinit</v>
<v>97933c03-0169-4afe-ac83-de892204e120</v>
<v>Initialize</v>
<v>6946d6e0-129f-4425-b8b0-ef98281a99e9</v>
<v>ExecuteMouseMove</v>
<v>58fc221c-be14-4e34-871e-a118f8ba9539</v>
<v>ExecuteDialogClosed</v>
<v>f08d08b6-e70c-4bef-a136-38845bd246d8</v>
<v>ExecuteKeyUp</v>
<v>7403635b-2725-4f00-93d4-e0dd125959de</v>
<v>ExecuteKeyDown</v>
<v>9649ecda-3794-4d6b-a8a7-71e528d9d170</v>
<v>ExecuteMouseMove</v>
<v>58fc221c-be14-4e34-871e-a118f8ba9539</v>
<v>Initialize</v>
<v>6946d6e0-129f-4425-b8b0-ef98281a99e9</v>
<v>abstrGetDefaultCursor</v>
<v>25718998-50a9-408d-8b3f-20a55e2cc784</v>
<v>ExecuteMouseEnter</v>
<v>569205fa-533b-4fc2-8d51-21ccab693305</v>
<v>ExecuteMouseLeave</v>
<v>3bacea68-55b4-4764-928e-e69910299932</v>
<v>FB_Init</v>

2
solution/tc_project_app/tc_mca_std_lib

Submodule solution/tc_project_app/tc_mca_std_lib updated: da32442585...009c682376

2
solution/tc_project_app/tc_project_app.plcproj
View File

@@ -93,7 +93,7 @@
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\DUTs\I_Axis.TcIO">
<SubType>Code</SubType>
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\DUTs\E_SlitPairStatesV2.TcDUT">
<SubType>Code</SubType>