-
Notifications
You must be signed in to change notification settings - Fork 25
Restructuring DS402 support. Added MCS2ChanParameters ST and additional FBs to support cleaner and extra operations aside from FB_motionStage & ST_MotionStage #249
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
Open
yannS2016
wants to merge
5
commits into
pcdshub:master
Choose a base branch
from
yannS2016:ECS-9134
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
0fa5f37
DS402/MCS2 upgrades: Homing config, Channel State Refactor & Function…
6ca2220
Tracking latest tc_mca_std_lib updates, remove unfound types
71f6d52
remove PLC property prefix, set 5s default SDO monitoring time
a967135
Added feature to turn MCS2 FB_MotionStage stage into a simulation sta…
9543031
Update lcls-twincat-motion/Library/POUs/Motion/DS402/MCS2/FB_MCS2Driv…
yannS2016 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
16 changes: 0 additions & 16 deletions
16
lcls-twincat-motion/Library/DUTs/DS402/ENUM_AxisStates.TcDUT
This file was deleted.
Oops, something went wrong.
25 changes: 25 additions & 0 deletions
25
lcls-twincat-motion/Library/DUTs/DS402/E_MoveDoneCause.TcDUT
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,25 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <TcPlcObject Version="1.1.0.1"> | ||
| <DUT Name="E_MoveDoneCause" Id="{f11d0b8d-a319-4919-8ad2-0dfa2b932888}"> | ||
| <Declaration><![CDATA[{attribute 'qualified_only'} | ||
| {attribute 'strict'} | ||
| {attribute 'to_string'} | ||
| TYPE E_MoveDoneCause : | ||
| ( | ||
| Unknown := 0, // Default/uncategorized | ||
| MoveDone, // Absolute move completed | ||
| StepMoveDone, // Step/JOG move completed | ||
| HomeDone, // Homing completed | ||
| CalibrationDone, // Calibration completed | ||
| ResetDone, // Reset command completed | ||
| HaltDone, // Manual halt completed | ||
| AbortedHome, // Home aborted | ||
| AbortedStepMove, // Step move aborted | ||
| AbortedCalibration, // Calibration aborted | ||
| Referenced, // Axis became referenced | ||
| Calibrated // Axis became calibrated | ||
| ); | ||
| END_TYPE | ||
| ]]></Declaration> | ||
| </DUT> | ||
| </TcPlcObject> | ||
19 changes: 19 additions & 0 deletions
19
lcls-twincat-motion/Library/DUTs/DS402/E_StartupState.TcDUT
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,19 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <TcPlcObject Version="1.1.0.1"> | ||
| <DUT Name="E_StartupState" Id="{a438f9d9-85e4-4a52-b694-851762491b8a}"> | ||
| <Declaration><![CDATA[{attribute 'qualified_only'} | ||
| {attribute 'strict'} | ||
| {attribute 'to_string'} | ||
| TYPE E_StartupState : | ||
| ( | ||
| STARTUP_IDLE:=0, | ||
| STARTUP_CLEAR, | ||
| STARTUP_RESET_FAULT, | ||
| STARTUP_SHUTDOWN, | ||
| STARTUP_SWITCH_ON, | ||
| STARTUP_ENABLE_OP | ||
| ); | ||
| END_TYPE | ||
| ]]></Declaration> | ||
| </DUT> | ||
| </TcPlcObject> |
142 changes: 142 additions & 0 deletions
142
lcls-twincat-motion/Library/DUTs/DS402/ST_ChannelState.TcDUT
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,142 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <TcPlcObject Version="1.1.0.1"> | ||
| <DUT Name="ST_ChannelState" Id="{57a8c6a5-d804-4041-a922-2988413bdf86}"> | ||
| <Declaration><![CDATA[TYPE ST_ChannelState : | ||
| STRUCT | ||
| {attribute 'pytmc' := ' | ||
| pv: nChannelStateRaw | ||
| io: i | ||
| field: DESC Channel state raw | ||
| '} | ||
| nChannelStateRaw : DWORD; | ||
|
|
||
| {attribute 'pytmc' := ' | ||
| pv: bActivelyMoving | ||
| io: i | ||
| field: DESC Actively moving | ||
| '} | ||
| bActivelyMoving : BOOL; | ||
| {attribute 'pytmc' := ' | ||
| pv: bClosedLoopActive | ||
| io: i | ||
| field: DESC Closed loop active | ||
| '} | ||
| bClosedLoopActive : BOOL; | ||
| {attribute 'pytmc' := ' | ||
| pv: bCalibrating | ||
| io: i | ||
| field: DESC Calibrating | ||
| '} | ||
| bCalibrating : BOOL; | ||
| {attribute 'pytmc' := ' | ||
| pv: bReferencing | ||
| io: i | ||
| field: DESC Referencing | ||
| '} | ||
| bReferencing : BOOL; | ||
| {attribute 'pytmc' := ' | ||
| pv: bMoveDelayed | ||
| io: i | ||
| field: DESC Move delayed | ||
| '} | ||
| bMoveDelayed : BOOL; | ||
| {attribute 'pytmc' := ' | ||
| pv: bSensorPresent | ||
| io: i | ||
| field: DESC Sensor present | ||
| '} | ||
| bSensorPresent : BOOL; | ||
| {attribute 'pytmc' := ' | ||
| pv: bIsCalibrated | ||
| io: i | ||
| field: DESC Is calibrated | ||
| '} | ||
| bIsCalibrated : BOOL; | ||
| {attribute 'pytmc' := ' | ||
| pv: bIsReferenced | ||
| io: i | ||
| field: DESC Is referenced | ||
| '} | ||
| bIsReferenced : BOOL; | ||
| {attribute 'pytmc' := ' | ||
| pv: bEndStopReached | ||
| io: i | ||
| field: DESC End stop reached | ||
| '} | ||
| bEndStopReached : BOOL; | ||
| {attribute 'pytmc' := ' | ||
| pv: bRangeLimitReached | ||
| io: i | ||
| field: DESC Range limit reached | ||
| '} | ||
| bRangeLimitReached : BOOL; | ||
| {attribute 'pytmc' := ' | ||
| pv: bFollowingLimitReached | ||
| io: i | ||
| field: DESC Following limit reached | ||
| '} | ||
| bFollowingLimitReached : BOOL; | ||
| {attribute 'pytmc' := ' | ||
| pv: bMovementFailed | ||
| io: i | ||
| field: DESC Movement failed | ||
| '} | ||
| bMovementFailed : BOOL; | ||
| {attribute 'pytmc' := ' | ||
| pv: bIsStreaming | ||
| io: i | ||
| field: DESC Is streaming | ||
| '} | ||
| bIsStreaming : BOOL; | ||
| {attribute 'pytmc' := ' | ||
| pv: bPositionerOverload | ||
| io: i | ||
| field: DESC Positioner overload | ||
| '} | ||
| bPositionerOverload : BOOL; | ||
| {attribute 'pytmc' := ' | ||
| pv: bOverTemperature | ||
| io: i | ||
| field: DESC Over temperature | ||
| '} | ||
| bOverTemperature : BOOL; | ||
| {attribute 'pytmc' := ' | ||
| pv: bReferenceMark | ||
| io: i | ||
| field: DESC Reference mark | ||
| '} | ||
| bReferenceMark : BOOL; | ||
| {attribute 'pytmc' := ' | ||
| pv: bIsPhased | ||
| io: i | ||
| field: DESC Is phased | ||
| '} | ||
| bIsPhased : BOOL; | ||
| {attribute 'pytmc' := ' | ||
| pv: bPositionerFault | ||
| io: i | ||
| field: DESC Positioner fault | ||
| '} | ||
| bPositionerFault : BOOL; | ||
| {attribute 'pytmc' := ' | ||
| pv: bAmplifierEnabled | ||
| io: i | ||
| field: DESC Amplifier enabled | ||
| '} | ||
| bAmplifierEnabled : BOOL; | ||
| {attribute 'pytmc' := ' | ||
| pv: bInPosition | ||
| io: i | ||
| field: DESC In position | ||
| '} | ||
| bInPosition : BOOL; | ||
| {attribute 'pytmc' := ' | ||
| pv: bBrakeEnabled | ||
| io: i | ||
| field: DESC Brake enabled | ||
| '} | ||
| bBrakeEnabled : BOOL; | ||
| END_STRUCT | ||
| 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
Oops, something went wrong.
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.
Should these be capitalized?