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

128 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominic Oram
edbb3e8cdb Try and fix for pipelines 2019-10-11 18:51:00 +01:00
Dominic Oram
81b5d1f1dc Only do on PR 2019-10-11 18:38:05 +01:00
Dominic Oram
adff4d92d3 Just confirm we can pass a test 2019-10-11 18:25:39 +01:00
Dominic Oram
b2b97f583c Should now do submodules 2019-10-11 18:23:32 +01:00
Dominic Oram
517bd5dc4e Pipeline now checks versions 2019-10-11 18:18:44 +01:00
Dominic Oram
1946724be1 Fix syntax error 2019-10-11 17:15:21 +01:00
Dominic Oram
cf5349dced Allow pipeline to be run manually 2019-10-11 17:11:57 +01:00
Dominic Oram
48788d138f Add pipeline yaml 2019-10-11 17:09:09 +01:00
Dominic Oram
442f840065 First try at running a pipeline 2019-10-11 17:07:29 +01:00
Federico Rojas
0d757f16de Merged in mbp-106/application-specific-gvl (pull request #10) 
Mbp 106/application specific gvl
 2019-08-08 09:37:40 +00:00
Federico Rojas
232a454e21 fix conflict while merging to integration branch 2019-08-08 11:32:13 +02:00
Federico Rojas
3afaa99adc Merge branch 'integration' into mbp-106/application-specific-gvl 2019-08-08 11:23:32 +02:00
Federico Rojas
f0df405a7a Merged in mbp-99/execute-reset-triggers-and-status-links (pull request #7) 
Mbp 99/execute reset triggers and status links
 2019-08-01 11:58:01 +00:00
Federico Rojas
05927a40a6 Change all references and links from GVL.axisNum to GVL_APP.axisNum 2019-08-01 13:03:33 +02:00
Federico Rojas
e9bac1d121 Create GVL_APP and add axisNum constant variable in it 2019-08-01 12:58:31 +02:00
Federico Rojas
08c6c6acaf Delete Axis task from solution to have a clean solution 2019-08-01 12:38:27 +02:00
Federico Rojas
1bf298212a set bExecute to FLASE at the end of the code 2019-08-01 12:13:24 +02:00
Federico Rojas
1b3ef2c20f Reset bExecute when Axis are coupled 2019-07-18 10:03:08 +02:00
Federico Rojas
8beccc5cd8 Change representation to Hex of nNC_ErrorID in FB_NC_Error 2019-07-17 15:55:52 +02:00
Federico Rojas
bacbdf1e39 add missing FB for error handling EL7037 and EL7047 2019-07-17 13:52:07 +02:00
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
c52d1a5f01 Change in line due to build in new TwinCAT version 3.1.4022.28 2019-07-05 11:24:49 +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