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

Adding veto for link fault and changing max_faults to 200 #57

Merged
merged 7 commits into from
Oct 16, 2023
Merged

Adding veto for link fault and changing max_faults to 200 #57

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eb898f8
Adding veto for link fault and changing max_faults to 200
jyotiphy Oct 14, 2023
1be1966
Ran pre-commit
jyotiphy Oct 16, 2023
e58c9ea
Merge branch 'master' into arb2
jyotiphy Oct 16, 2023
c0e327b
Updating libraries to new verisons, mainly motion library to decraese…
jyotiphy Oct 16, 2023
36205c3
Merge branch 'arb2' of github.com:jyotiphy/lcls-plc-kfe-rix-motion in…
jyotiphy Oct 16, 2023
e2b89f4
Ran pre-commit
jyotiphy Oct 16, 2023
906c152
New IOC build
Oct 16, 2023
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
16 changes: 8 additions & 8 deletions plc-kfe-rix-motion/_Config/PLC/kfe_rix_motion.xti
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6384,14 +6384,6 @@ External Setpoint Generation:
</Comment>
</SubVar>
</Var>
<Var>
<Name>GVL.fbFastFaultOutput1.q_xFastFaultOut</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL.fbFastFaultOutput2.q_xFastFaultOut</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL.rCurTrans</Name>
<Type GUID="{6D319B26-4590-2152-3DE7-3BA9B629CA65}">ARRAY [1..16] OF ST_PMPS_Attenuator_IO</Type>
Expand Down Expand Up @@ -6693,6 +6685,14 @@ External Setpoint Generation:
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL.fbFastFaultOutput1.q_xFastFaultOut</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL.fbFastFaultOutput2.q_xFastFaultOut</Name>
<Type>BOOL</Type>
</Var>
</Vars>
<Vars VarGrpType="8">
<Name>PlcTask Retains</Name>
Expand Down
2 changes: 1 addition & 1 deletion plc-kfe-rix-motion/kfe_rix_motion/POUs/PRG_3_PMPS_POST.TcPOU
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ fb_vetoArbiter(bVeto:= bST1K2_Veto,

ff2_ff1_link_motion(
io_fbFFHWO := GVL.fbFastFaultOutput1,
i_xOK := GVL.fbFastFaultOutput2.q_xFastFaultOut);
i_xOK := GVL.fbFastFaultOutput2.q_xFastFaultOut OR bST1K2_Veto);


MOTION_GVL.fbStandardPMPSDB(
Expand Down
2 changes: 1 addition & 1 deletion plc-kfe-rix-motion/kfe_rix_motion/kfe_rix_motion.plcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
<Parameters>
<Parameter>
<Key>MAX_FAST_FAULTS</Key>
<Value>100</Value>
<Value>200</Value>
</Parameter>
<Parameter>
<Key>MAX_ASSERTIONS</Key>
Expand Down
Loading
Loading