berti_r/Motion_test
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85 Commits 1 Branch 0 Tags
dad212b4af954356dcafe10590a772969ff339ce
Commit Graph

85 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon-Cooper
dad212b4af Third NC axis to configuration 
Add third axis for testing gear-in/out
Update to latest tc-std-lib commit of MBP-95
 2019-06-20 15:38:37 +01:00
Simon-Cooper
2791f6cf87 Add commit changes of TC_MCA_STD_LIB MPB-95 2019-06-20 11:33:13 +01:00
Simon-Cooper
8e59e35241 Single gear in and gear out support 
-Add visualisation elements for support of single gear in
-Add visualisation elements for support of gear out
-Change AXES() action call to use GVL.iAxis as index of FOR loop
 2019-06-04 11:46:53 +01:00
Simon-Cooper
20c07ff66e visu links updated to sub-structures 
Change visualisation property links to variables within ST_AxisStruct sub structures
Add a single test axis linked to visualisation for testing and development
 2019-06-03 14:35:25 +01:00
Simon-Cooper
fbfa2e1b74 Visu elements tidied up 
Group visualisation elements in to 'like' components.
Update button executions so they visually "press" when selected
 2019-05-16 08:29:22 +01:00
Simon-Cooper
9f952987de Visualisation added 
Add PLC visualisation first pass
Functionality tested
GUI scales with axes

Issues identified due to base code solution:
A lot of outputs not linked
Execute not cleared by default in code, it is not possible to send repeated commands as if the eCommand is held then the mc_Fb.Execute:=false is never set
Reset not cleared by default in code (if errors again will just auto-reset)
Doesn't clear stop (however this may be a good thing)
Jog velocity input not utilised in mode 0 current set in code, we would need MC_JOGMODE_CONTINUOUS
 2019-05-14 16:28:46 +01:00
Simon-Cooper
6e8f09c37c Merge branch 'mbp-78/homing-of-v2-to-fb_DriveVirtual-v1' 
Merge of mbp-78/homing-of-v2-to-fb_DriveVirtual-v1 features to master branch. This provides the starting point for our base code solution.
 2019-05-07 11:09:52 +01:00
Federico Rojas
0232de9be3 Update mca_std_lib changes done for mbp-78 2019-05-07 11:48:30 +02:00
Federico Rojas
9f06d87dcd Merge 'origin/mbp-78/homing-of-v2-to-fb_DriveVirtual-v1' into mbp-78/homing-of-v2-to-fb_DriveVirtual-v1 2019-05-06 10:31:21 +02:00
Federico Rojas
755b3db471 Change tc_mca_std_lib to comments of mbp-78 
Removes all of the VAR_INPUTS and VAR_OUTPUTS and instead sets the FB_AXIS variables to their structure variables
 2019-05-03 13:36:19 +02:00
Simon-Cooper
62083aae7e tc_mca_std_lib submodule update to remove VAR_INPUTS and VAR_OUPUTS 
Removed VAR_INPUTS and VAR_OUPUTS of FB_Axis and relinked variables to their equivalent ST_AxisStruct variables
 2019-04-30 14:47:57 +01:00
Simon-Cooper
fc50b52411 Revert "updated tc_mca_std_lib submodule" 
This reverts commit 6c491186e7.
 2019-04-30 14:32:02 +01:00
Simon-Cooper
6c491186e7 updated tc_mca_std_lib submodule 2019-04-30 13:59:15 +01:00
Federico Rojas
702d8fed92 Implement comments of ISIS on 2019-04-09 
Changes to make it work in any setup instead of the ESS test crates.
for further details check the commit of tc_mca_std_lib
 2019-04-25 11:38:40 +02:00
Federico Rojas
d8555784b5 Add homing of FB_DriveVirtual V2 into FB_DriveVirtual V1 
Homing sequences of FB_DriveVirtual V2 put into FB_Axis
FB_DriveVirtual change name to FB_Axis
Add enum for motion commands in the ST_AxisStruct
Add Case statement for the some motion functions
Delete FB_NcAxis, FB_Communication, FB_DriveVirtual_V2, ST_CommStates, DUT_AxisStatus
 2019-04-05 13:22:53 +02:00
Federico Rojas
e5ba869ae8 Homing sequence to a enconder index signal 2019-03-29 14:02:34 +01:00
Federico Rojas
c1930b89fd Some Homing sequences implmentation 
Limit switch and direct homing are implemneted, the same with homing to a home snesor
Missing referencing to encoder index or external signal.
 2019-03-27 11:57:24 +01:00
Federico Rojas
6dbf29a0c4 New solution structure to fit the array of gvl paramaters structure 
AXES()creates the FB and associates the stAxisStruct structure of the gvl
MAIN has new varibales to fit the gvl array
New FB and new Strucutres under DUT Still developing in the tc_mca_std_lib
 2019-03-20 15:37:31 +01:00
Federico Rojas
87a1efaba8 Add FB EL1018 in Hardware folder in solution 2018-10-31 17:19:34 +01:00
Federico Rojas
300e6d2d06 Add EL1018 to the hardware folder for error handling 2018-10-31 15:50:11 +01:00
Federico Rojas
ca715d5810 Comment not used error FB 2018-10-31 11:41:34 +01:00
Federico Rojas
27e88b2c28 Merge branch 'master' of https://bitbucket.org/europeanspallationsource/tc_generic_structure 2018-10-30 15:41:05 +01:00
Federico Rojas
0875d1fb80 Updated my solution to use latest submodule mca_std_lib 2018-10-30 15:40:00 +01:00
Federico Rojas
b0f5f0d901 Merged federicor/changes-for-workshop into master 2018-10-30 15:38:04 +01:00
Federico Rojas
88141fd42a Updated my solution to use latest submodule mca_std_lib 2018-10-30 15:36:17 +01:00
Federico Rojas
d1f40c9a81 Merged federicor/changes-for-workshop into master 2018-10-30 15:27:33 +01:00
Federico Rojas
e42fca65aa Submodule std_lib updated 
Update to new master branch
 2018-10-30 15:25:47 +01:00
Federico Rojas
9442e7d1a2 Add default instance call (FB) for the error handling 
In the action ERROR() the necessary default instances are included
an example nin comments is included
Build solution without an error
 2018-10-30 15:16:57 +01:00
Federico Rojas
2457083e95 Add the actions AXES, ERROR and PROG to MAIN 
Three actions are in the MAIN
AXES: contains the FB of each axis en FBD language
EROR: Contians the FBs necessary for error handling
PROG: space for sequencing, safety or anything else application specific
 2018-10-30 14:51:07 +01:00
Federico Rojas
2ef18dc1eb Add error handling variables in MAIN 
Add the section for error handling variables in the MAIN puo.
 2018-10-30 14:46:57 +01:00
Federico Rojas
5d1adbccf2 Delete the FB of hardware not used in error handling 
Delete all the hardware FB that are not supported by MCAG in the error handling folder
 2018-10-30 14:39:36 +01:00
Federico Rojas
d4874c197c Add "Homing" folder in the solution structure 
A folder called "Homing" containing all the FB required for homing is included
 2018-10-30 14:16:52 +01:00
Federico Rojas
7b8e207e87 Add folder for licenses 
A folder was created for pasting the licenses from the Beckhoff CPU as a backup.
A ReadMe file was included explaining where the licenses are located.
 2018-10-30 14:07:59 +01:00
Federico Rojas
b27a9fe3d0 Merge branch 'master' of https://bitbucket.org/europeanspallationsource/tc_generic_structure 2018-07-09 15:44:18 +02:00
Federico Rojas
3dec6ad15a Activate "Autostart Boot Project" in tc_epicscommodule and tc_project_app 2018-07-09 15:41:45 +02:00
Federico Rojas
7fd5c7cbc6 Enable RUN mode in CPU. Ticj Autostart project of the plc projects. 2018-07-09 15:38:34 +02:00
Federico Rojas
8ceb9312b5 Merged federicor/update-generic-structure-main-and-solution into master 2018-07-09 15:32:42 +02:00
Federico Rojas
87fc139e36 Chenge name of Outputs from bPowerOutput to just bOuput 2018-07-09 15:30:57 +02:00
Federico Rojas
d9e71237d3 Solution with the new strucutre in MAIN POU and recen ProgramVersion 
Solution with the current ProgramVersions in both .plcProj files.
MAIN progrma with new variable structure for easier understanding.
 2018-07-09 15:25:57 +02:00
Federico Rojas
092b321772 Add Limits and HomeSensor variables. FB_DriveVirtual and FB_NcAxis for 2nd axis 
Structure varibales of inputs and outputs in MAIN for better comprenhension.
Add all variables for a second axis and add commented varibales for extra axes.
 2018-07-09 15:22:29 +02:00
Federico Rojas
fba12f2ef5 Change ProgramVersion in tc_project_app to 3.1.4022.2 
Update ProgramVersion to the newest TwinCAT
 2018-07-09 15:20:49 +02:00
Federico Rojas
f24a065022 Change ProgramVersion in tc_epicscommodule to 3.1.4022.2 
When compile in new version autimatically changes that line. To avoid unecessary changes
in the future I am commiting this cahnge now
 2018-07-09 15:14:10 +02:00
Federico Rojas
ae89df4fda Update tc_epicscommodule submodule 
Remove ExternalTypes.tmc and add the accidentally deleted tc_epicscommodule.plcProj
 2018-07-06 14:15:46 +02:00
Federico Rojas
64e9e1a054 Merge anders/genericStructure branch to master 2018-07-06 13:21:54 +02:00
Federico Rojas
79db0090e6 Merged torstenb/add-error-handling-files-and-folder_update_epicscommodule into master 2018-07-06 09:22:41 +02:00
Torsten Bögershausen
f2556d94ff EpicsComModule.plcProj -> tc_epicscommodule.plcProj 2018-07-04 14:15:42 +02:00
Federico Rojas
a1b1cb9682 Merged federicor/add-error-handling-files-and-folders into master 2018-07-04 12:45:13 +02:00
Federico Rojas
ab6c248613 No real change in submodule, file strangely modified when adding error handling files 2018-07-04 12:35:34 +02:00
Federico Rojas
19e3f7835e Add all files and directories for the error handling 2018-07-04 12:30:34 +02:00
Federico Rojas
c202132f6a Name correction of solution 2018-03-22 16:12:12 +01:00