-
Notifications
You must be signed in to change notification settings - Fork 0
Rubenm/slits code multimaster #28
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.
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
Closed
Closed
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
5382f7e
FB_SlitPair updated with improvements (soft limits update, operationa…
rubenmess 86a2c8c
formating fix
rubenmess 130915b
FB_Axis update, take away multiaxes 3 and 4 to avoid issue coupling …
rubenmess 1494817
enable and reset out of the inputs var
rubenmess 6fc92af
error report to virtual axis
rubenmess 103aed9
multimaster index 3&4 not used, gear out if axes disabled
rubenmess f80d61c
SOFT LIMITS FUNCTION UPDATE
rubenmess 064cdfd
Fix formatting and spelling
mac-kan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <TcPlcObject Version="1.1.0.1"> | ||
| <DUT Name="E_SlitSoftLimits" Id="{5a8c53db-c513-01b1-1e81-1ca22261b4f2}"> | ||
| <Declaration><![CDATA[{attribute 'qualified_only'} | ||
| {attribute 'strict'} | ||
| TYPE E_SlitSoftLimits : | ||
| ( | ||
| START := 0, | ||
| WRITE_GAP_CENTRE_FWD, | ||
| WRITE_GAP_CENTRE_BWD, | ||
| WRITE_GAP_SIZE_FWD, | ||
| FINISH | ||
| ); | ||
| END_TYPE | ||
| ]]></Declaration> | ||
| </DUT> | ||
| </TcPlcObject> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -638,16 +638,16 @@ IF _stAxis.stControl.eCommand = E_MotionFunctions.eGearInMultiMaster AND _stAxis | |
| //Transfer gear ratios to FB | ||
| fbGearInMultiMaster.GearRatio1 := _stAxis.stConfig.astMultiMasterAxisLatched[1].fRatio; | ||
| fbGearInMultiMaster.GearRatio2 := _stAxis.stConfig.astMultiMasterAxisLatched[2].fRatio; | ||
| fbGearInMultiMaster.GearRatio3 := _stAxis.stConfig.astMultiMasterAxisLatched[3].fRatio; | ||
| fbGearInMultiMaster.GearRatio4 := _stAxis.stConfig.astMultiMasterAxisLatched[4].fRatio; | ||
| // fbGearInMultiMaster.GearRatio3 := _stAxis.stConfig.astMultiMasterAxisLatched[3].fRatio; (Not in use, commented due to slits code) | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is there a reason for leaving the code commented instead of removing it? |
||
| // fbGearInMultiMaster.GearRatio4 := _stAxis.stConfig.astMultiMasterAxisLatched[4].fRatio; (Not in use, commented due to slits code) | ||
| fbGearInMultiMaster.Enable := TRUE; | ||
| END_IF | ||
|
|
||
| fbGearInMultiMaster(Slave := _stAxis.Axis, | ||
| Master1 := GVL.astAxes[_stAxis.stConfig.astMultiMasterAxisLatched[1].nIndex].Axis, | ||
| Master2 := GVL.astAxes[_stAxis.stConfig.astMultiMasterAxisLatched[2].nIndex].Axis, | ||
| Master3 := GVL.astAxes[_stAxis.stConfig.astMultiMasterAxisLatched[3].nIndex].Axis, | ||
| Master4 := GVL.astAxes[_stAxis.stConfig.astMultiMasterAxisLatched[4].nIndex].Axis); | ||
| Master2 := GVL.astAxes[_stAxis.stConfig.astMultiMasterAxisLatched[2].nIndex].Axis); | ||
| // Master3 := GVL.astAxes[_stAxis.stConfig.astMultiMasterAxisLatched[3].nIndex].Axis, | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. See comment above. |
||
| // Master4 := GVL.astAxes[_stAxis.stConfig.astMultiMasterAxisLatched[4].nIndex].Axis); | ||
| fbGearInMultiMaster.Enable:= FALSE; | ||
|
|
||
| IF fbGearInMultiMaster.InGear THEN | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The E_SlitSoftLimits is not reused, and instead of creating a DUT, it could be declared directly in FB_Axis as:
eSoftLimitsUpdate: (START, WRITE_GAP_CENTRE_FWD, WRITE_GAP_CENTRE_BWD, WRITE_GAP_SIZE_FWD) := START;
@federrg Do we have any defined standard regarding this?