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

107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Federico Rojas
b3f741222f Fix bug with bExecute reset after command 2019-07-17 10:14:43 +02:00
Federico Rojas
c03cead419 Fix typo in comment 2019-07-16 13:42:19 +02:00
Federico Rojas
f9544e549b Update Links from Error_Log_Visu to new ST_AxisStruct 2019-07-16 13:31:10 +02:00
Federico Rojas
175bdae2de Add missing FB for ErrorHandling FB_NC_Error 2019-07-16 13:29:44 +02:00
Federico Rojas
81b2a6c326 Delete bResetDone and bHome, change VISU location to tc_mca_std_lib 
Delete bResetDone from MainVisu and ST_AxisStatus
Delete bHome from ST_AxisControl
Move all VISU folder from tc_generic_struct to tc_mca_std_lib
 2019-07-16 11:32:47 +02:00
Federico Rojas
c488fd0489 delete unused old visualizations from tc_mca_std_lib 2019-07-16 10:41:16 +02:00
Federico Rojas
0602dd9e6e bExecute realese when moved, bReset and bStop reset state fixed 2019-07-12 12:19:30 +02:00
Federico Rojas
b52a2a34a9 All file change with hexadecimal represenation in visu for ErrorID 2019-07-12 10:37:45 +02:00
Federico Rojas
2af2c7f5c5 Change ErrorID representation to hexadecimal for easier undertanding 2019-07-11 10:21:55 +02:00
Federico Rojas
f71f6ad113 bError and bStop set to FALSE after execution 2019-07-10 14:58:03 +02:00
Federico Rojas
72ff5a7449 Merge with mbp-94/error-handling 2019-07-10 10:44:37 +02:00
Federico Rojas
815e48507e Make deafult value for the enum MotionFuncitons equal to Jog 2019-07-08 15:41:27 +02:00
Federico Rojas
062432bb3b Delete Axis 1, 2 1nd 3 to have empty solution 2019-07-08 13:51:04 +02:00
Federico Rojas
f3ed214162 Add folder FeedbackTerminals to the solution tree 2019-07-05 11:32:36 +02:00
Federico Rojas
ed7c121b3d Update the solution strucutre with all the new Hardware FB's and FB_axis if error statements 
Update the solution strucutre tree with the new FB's
Modify the if statememts of the FB_Axis error handling for proper review
 2019-06-28 15:11:29 +02:00
Federico Rojas
d04cf0ed4b Change the fbErrorList to the new fbErrorSystem in MAIN 
Update the FB's in ERROR()
 2019-06-28 14:46:57 +02:00
Simon Cooper
e47e4aeef0 Merged in MBP-92 (pull request #2) 
MBP-92/PLC_VISUALISATION

Approved-by: Dominic Oram <dominic.oram@stfc.ac.uk>
 2019-06-24 16:24:54 +00:00
Dominic Oram
a24a629546 Removed testing axis 2019-06-24 17:13:41 +01:00
Dominic Oram
a90c3a9dd7 Merge branch 'integration' into MBP-92 2019-06-24 16:58:49 +01:00
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
Federico Rojas
d2e05e98cf integration bracnh ponitng to integration branch in tc_mca_std_lib 2019-06-17 16:38:05 +02: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
Federico Rojas
817c191059 Merged in franks/mbp-79_nested_structs 
mbp-79: Add nested strutures to tc_mca_std_lib
 2019-05-21 09:47:31 +00:00
Frank Suxdorf
0ffd68a574 Add nested strutures to tc_mca_std_lib 2019-05-16 13:33:12 +02: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