Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed bug where holding current couldn't be disabled from the button once enabled. #10

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed bug where holding current couldn't be disabled from the button once enabled. #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions TwinCAT Measurement Project1/VSSettings/.vsm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<Children>
<Node>
<Title>Scope Project1</Title>
<Expanded>True</Expanded>
<Expanded>False</Expanded>
<FileName>C:\Users\nlentz\Documents\PLC\lcls-plc-mfx-motion\TwinCAT Measurement Project1\Scope Project1.tcscopex</FileName>
<Children>
<Node>
<Title>DataPool</Title>
<Expanded>True</Expanded>
<Expanded>False</Expanded>
<FileName></FileName>
<Children>
<Node>
Expand Down Expand Up @@ -131,12 +131,12 @@
</Node>
<Node>
<Title>Axis Plot</Title>
<Expanded>True</Expanded>
<Expanded>False</Expanded>
<FileName></FileName>
<Children>
<Node>
<Title>MFX-LIB-MMS-01</Title>
<Expanded>True</Expanded>
<Expanded>False</Expanded>
<FileName></FileName>
<Children>
<Node>
Expand All @@ -155,7 +155,7 @@
</Node>
<Node>
<Title>MFX-LIB-MMS-02</Title>
<Expanded>True</Expanded>
<Expanded>False</Expanded>
<FileName></FileName>
<Children>
<Node>
Expand All @@ -174,7 +174,7 @@
</Node>
<Node>
<Title>MFX-LIB-MMS-03</Title>
<Expanded>True</Expanded>
<Expanded>False</Expanded>
<FileName></FileName>
<Children>
<Node>
Expand All @@ -193,7 +193,7 @@
</Node>
<Node>
<Title>MFX-LIB-MMS-04</Title>
<Expanded>True</Expanded>
<Expanded>False</Expanded>
<FileName></FileName>
<Children>
<Node>
Expand Down
36 changes: 36 additions & 0 deletions plc-mfx-motion/mfx_motion/POUs/PRG_SPEC.TcPOU
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, good catch!

Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,42 @@ IF bHoldingCurrentEnable THEN
Main.M31.nEnableMode := ENUM_StageEnableMode.ALWAYS;

Main.M32.nEnableMode := ENUM_StageEnableMode.ALWAYS;
ELSE
Main.M15.nEnableMode := ENUM_StageEnableMode.DURING_MOTION;

Main.M16.nEnableMode := ENUM_StageEnableMode.DURING_MOTION;

Main.M17.nEnableMode := ENUM_StageEnableMode.DURING_MOTION;

Main.M18.nEnableMode := ENUM_StageEnableMode.DURING_MOTION;

Main.M19.nEnableMode := ENUM_StageEnableMode.DURING_MOTION;

Main.M20.nEnableMode := ENUM_StageEnableMode.DURING_MOTION;

Main.M21.nEnableMode := ENUM_StageEnableMode.DURING_MOTION;

Main.M22.nEnableMode := ENUM_StageEnableMode.DURING_MOTION;

Main.M23.nEnableMode := ENUM_StageEnableMode.DURING_MOTION;

Main.M24.nEnableMode := ENUM_StageEnableMode.DURING_MOTION;

Main.M25.nEnableMode := ENUM_StageEnableMode.DURING_MOTION;

Main.M26.nEnableMode := ENUM_StageEnableMode.DURING_MOTION;

Main.M27.nEnableMode := ENUM_StageEnableMode.DURING_MOTION;

Main.M28.nEnableMode := ENUM_StageEnableMode.DURING_MOTION;

Main.M29.nEnableMode := ENUM_StageEnableMode.DURING_MOTION;

Main.M30.nEnableMode := ENUM_StageEnableMode.DURING_MOTION;

Main.M31.nEnableMode := ENUM_StageEnableMode.DURING_MOTION;

Main.M32.nEnableMode := ENUM_StageEnableMode.DURING_MOTION;
END_IF
]]></ST>
</Implementation>
Expand Down
10 changes: 5 additions & 5 deletions plc-mfx-motion/mfx_motion/mfx_motion.tmc
View file
Open in desktop
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="{7A2A3D77-64AD-3B0F-B004-9436D263D0D6}" 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="{314615AC-5017-15BD-981B-847CF6BF1751}" GeneratedBy="TwinCAT XAE Plc">
<DataTypes>
<DataType>
<Name GUID="{18071995-0000-0000-0000-000000000041}" TcBaseType="true" HideSubItems="true" CName="AmsNetId">AMSNETID</Name>
Expand Down Expand Up @@ -56521,9 +56521,9 @@ ELSE:
<Property>
<Name>pytmc</Name>
<Value>
pv: MFX:SPEC:HOLDCUREN
io: io
</Value>
pv: MFX:SPEC:HOLDCUREN
io: io
</Value>
</Property>
</Properties>
<BitOffs>634826016</BitOffs>
Expand Down Expand Up @@ -58528,7 +58528,7 @@ ELSE:
</Property>
<Property>
<Name>ChangeDate</Name>
<Value>2024-12-05T14:21:02</Value>
<Value>2024-12-07T10:12:35</Value>
</Property>
<Property>
<Name>GeneratedCodeSize</Name>
Expand Down