Skip to content

Mbp 371 pneumatic bug second op #46

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

Merged
federrg merged 5 commits into from
Mar 31, 2026
Merged

Mbp 371 pneumatic bug second op #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
93f50c2
Add OpenManual and CloseManual variables for control from OPs.
kristinajurisic Mar 26, 2026
bd3f726
Assign input values to the OpenManual and CloseManual variables.
kristinajurisic Mar 26, 2026
3adb674
Add single variables for Open and Close from OPs
kristinajurisic Mar 26, 2026
39ce8ee
Add two sets of buttons for OP control
kristinajurisic Mar 26, 2026
da54655
Changes after filter cleanup.
kristinajurisic Mar 26, 2026
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
2 changes: 2 additions & 0 deletions DUTs/Pneumatics/ST_PneumaticAxisControl.TcDUT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ STRUCT
bRetract: BOOL; //Variable to control solenoid valve from PLC
bInterlock: BOOL; //Input interlock signal for the movement
bReset: BOOL; //Reset signal from EPICS
bOpenManual: BOOL; //Variable to control the solenoid valve from the OP
bCloseManual: BOOL; //Variable to close the solenoid valve from the OP
END_STRUCT
END_TYPE

Expand Down
38 changes: 24 additions & 14 deletions POUs/Pneumatics/FB_PneumaticAxis.TcPOU
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,9 @@ IF NOT _stPneumaticAxis.stPneumaticAxisControl.bInterlock THEN
_stPneumaticAxis.ePneumaticAxisErrors := E_PneumaticAxisErrors.eNoError;
_stPneumaticAxis.ePneumaticAxisMode := E_PneumaticMode.eSingleSolenoidControl;
END_IF
IF (_stPneumaticAxis.stPneumaticAxisControl.bRetract OR _stPneumaticAxis.stPneumaticAxisInputs.bCloseManualOP1 OR _stPneumaticAxis.stPneumaticAxisInputs.bCloseManualOP2) OR bInterlockedExtended THEN
IF (_stPneumaticAxis.stPneumaticAxisControl.bRetract
OR _stPneumaticAxis.stPneumaticAxisControl.bCloseManual)
OR bInterlockedExtended THEN
_stPneumaticAxis.ePneumaticAxisErrors := E_PneumaticAxisErrors.eExtendInterlocked;
_stPneumaticAxis.ePneumaticAxisMode := E_PneumaticMode.eCylinderExtendInterlockedError;
END_IF
Expand Down Expand Up @@ -392,10 +394,10 @@ END_IF
_stPneumaticAxis.stPneumaticAxisOutputs.bValveOn := FALSE;
_stPneumaticAxis.stPneumaticAxisStatus.sStatus := 'WARNING: NO PERMIT SIGNAL.';
IF (_stPneumaticAxis.stPneumaticAxisControl.bExtend
OR _stPneumaticAxis.stPneumaticAxisInputs.bOpenManualOP1
OR _stPneumaticAxis.stPneumaticAxisInputs.bOpenManualOP2
OR _stPneumaticAxis.stPneumaticAxisControl.bOpenManual
OR _stPneumaticAxis.stPneumaticAxisControl.bRetract
OR _stPneumaticAxis.stPneumaticAxisInputs.bCloseManualOP1 OR _stPneumaticAxis.stPneumaticAxisInputs.bCloseManualOP2) OR bNoPSSPermitError THEN
OR _stPneumaticAxis.stPneumaticAxisControl.bCloseManual
OR bNoPSSPermitError) THEN
_stPneumaticAxis.ePneumaticAxisErrors := E_PneumaticAxisErrors.eNoPSSPermit;
_stPneumaticAxis.ePneumaticAxisMode := E_PneumaticMode.eNoPSSPermitError;
END_IF
Expand Down Expand Up @@ -487,7 +489,9 @@ IF NOT _stPneumaticAxis.stPneumaticAxisControl.bInterlock THEN
_stPneumaticAxis.ePneumaticAxisErrors := E_PneumaticAxisErrors.eNoError;
_stPneumaticAxis.ePneumaticAxisMode := E_PneumaticMode.eSingleSolenoidControl;
END_IF
IF (_stPneumaticAxis.stPneumaticAxisControl.bExtend OR _stPneumaticAxis.stPneumaticAxisInputs.bOpenManualOP1 OR _stPneumaticAxis.stPneumaticAxisInputs.bOpenManualOP2) OR bInterlockedRetracted THEN
IF (_stPneumaticAxis.stPneumaticAxisControl.bExtend
OR _stPneumaticAxis.stPneumaticAxisControl.bOpenManual)
OR bInterlockedRetracted THEN
_stPneumaticAxis.ePneumaticAxisErrors := E_PneumaticAxisErrors.eRetractInterlocked;
_stPneumaticAxis.ePneumaticAxisMode := E_PneumaticMode.eCylinderRetractInterlockedError;
END_IF
Expand Down Expand Up @@ -616,10 +620,12 @@ fbTimerRetract.PT := INT_TO_TIME( _stPneumaticAxis.stPneumaticAxisConfig.nTimeTo
_stPneumaticAxis.stPneumaticAxisStatus.bRetracted := _stPneumaticAxis.stPneumaticAxisInputs.bEndSwitchBwd;
_stPneumaticAxis.stPneumaticAxisStatus.bExtended := _stPneumaticAxis.stPneumaticAxisInputs.bEndSwitchFwd;
_stPneumaticAxis.stPneumaticAxisStatus.bInterlocked := _stPneumaticAxis.stPneumaticAxisControl.bInterlock;
_stPneumaticAxis.stPneumaticAxisControl.bCloseManual := _stPneumaticAxis.stPneumaticAxisInputs.bCloseManualOP1 OR _stPneumaticAxis.stPneumaticAxisInputs.bCloseManualOP2;
_stPneumaticAxis.stPneumaticAxisControl.bOpenManual := _stPneumaticAxis.stPneumaticAxisInputs.bOpenManualOP1 OR _stPneumaticAxis.stPneumaticAxisInputs.bOpenManualOP2;
]]></ST>
</Implementation>
</Method>
<Method Name="mSingleSolenoid" Id="{7947fd9c-1dec-078f-0fa8-640a9c506249}">
<Method Name="mSingleSolenoid" Id="{b00d3187-fb9b-06fe-3a49-6151a7623336}">
<Declaration><![CDATA[METHOD PUBLIC mSingleSolenoid

]]></Declaration>
Expand All @@ -634,45 +640,49 @@ mCheckStatusOfInterlockSignal();

//Starting the retraction movement and retraction timing
fbTimerRetract (IN := bStartRetractPLC OR bStartRetractManual);
//Set status of the Elapsed time of fbTimerRetract

mRetractTimeStatus();

fbTrigRetract(clk:=_stPneumaticAxis.stPneumaticAxisControl.bRetract);
IF fbTrigRetract.Q THEN
bStartRetractPLC := TRUE;
END_IF

//Closing the shutter from the OP
//If the manual momentary push button is used for control of the pneumatic cylinder
IF NOT _stPneumaticAxis.stPneumaticAxisConfig.bSecondOperatorPanel THEN
fbTrigRetractManual(clk:=_stPneumaticAxis.stPneumaticAxisInputs.bCloseManualOP1);
_stPneumaticAxis.stPneumaticAxisControl.bCloseManual := _stPneumaticAxis.stPneumaticAxisInputs.bCloseManualOP1;
fbTrigRetractManual(clk:=_stPneumaticAxis.stPneumaticAxisControl.bCloseManual);
IF fbTrigRetractManual.Q THEN
bStartRetractManual := TRUE;
END_IF
ELSE
fbTrigRetractManual(clk:=_stPneumaticAxis.stPneumaticAxisInputs.bCloseManualOP1 OR _stPneumaticAxis.stPneumaticAxisInputs.bCloseManualOP2);
_stPneumaticAxis.stPneumaticAxisControl.bCloseManual := _stPneumaticAxis.stPneumaticAxisInputs.bCloseManualOP1 OR _stPneumaticAxis.stPneumaticAxisInputs.bCloseManualOP2;
fbTrigRetractManual(clk:=_stPneumaticAxis.stPneumaticAxisControl.bCloseManual);
IF fbTrigRetractManual.Q THEN
bStartRetractManual := TRUE;
END_IF
END_IF

//Starting the timing of extraction movement
fbTimerExtend(IN := bStartExtendPLC OR bStartExtendManual);
//Set status of the Elapsed time of fbTimerExtend

mExtendTimeStatus();

fbTrigExtend(clk:=_stPneumaticAxis.stPneumaticAxisControl.bExtend);
IF fbTrigExtend.Q THEN
bStartExtendPLC := TRUE;
END_IF

//Opening the shutter from the OP
//If the manual momentary push button is used for control of the pneumatic cylinder
IF NOT _stPneumaticAxis.stPneumaticAxisConfig.bSecondOperatorPanel THEN
fbTrigExtendManual(clk:=_stPneumaticAxis.stPneumaticAxisInputs.bOpenManualOP1);
_stPneumaticAxis.stPneumaticAxisControl.bOpenManual := _stPneumaticAxis.stPneumaticAxisInputs.bOpenManualOP1;
fbTrigExtendManual(clk:=_stPneumaticAxis.stPneumaticAxisControl.bOpenManual);
IF fbTrigExtendManual.Q THEN
bStartExtendManual := TRUE;
END_IF
ELSE
fbTrigExtendManual(clk:=_stPneumaticAxis.stPneumaticAxisInputs.bOpenManualOP1 OR _stPneumaticAxis.stPneumaticAxisInputs.bOpenManualOP2);
_stPneumaticAxis.stPneumaticAxisControl.bOpenManual := _stPneumaticAxis.stPneumaticAxisInputs.bOpenManualOP1 OR _stPneumaticAxis.stPneumaticAxisInputs.bOpenManualOP2;
fbTrigExtendManual(clk:=_stPneumaticAxis.stPneumaticAxisControl.bOpenManual);
IF fbTrigExtendManual.Q THEN
bStartExtendManual := TRUE;
END_IF
Expand Down
Loading
Loading