Commit Graph
22 Commits
Author SHA1 Message Date
Torsten Bögershausen 4ca1f6e110 Normalize all line endings to LF in the repo
Change the CRLF strategie:
All (nearly all) files have LF in the repo, and CRLF in the working tree.
When we started, all files had been commited "as is".
Now it is more and more disturbing that Git shows "^M" in git diff
when a line was added or chenged.
To avoid this, store all files in the repo with LF.

To normalzie existing repos for a crate, run:

Step 1)
(unless you have done that already)
git remote add tc_generic_structure https://bitbucket.org/europeanspallationsource/tc_generic_structure.git

Step 2)
git fetch tc_generic_structure

Step 3)
(master below may be integration)
git merge tc_generic_structure/master  -X renormalize
2019-12-04 16:30:58 +01:00
Torsten Bögershausen bef8078e99 Fix whitespace damage
Fix the whitespaces using check_fix_white_space.py
modified:   solution/tc_project_app/GVLs/GVL_APP.TcGVL
modified:   solution/tc_project_app/POUs/MAIN.TcPOU
2019-11-29 09:47:11 +01:00
Dominic Oram 1d3a7d6c59 Updated version 2019-10-11 23:18:38 +01: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 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 72ff5a7449 Merge with mbp-94/error-handling 2019-07-10 10:44:37 +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 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 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
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 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 ca715d5810 Comment not used error FB 2018-10-31 11:41:34 +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 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
Anders Sandström 7256b72277 Main.TcPOU.ACT: Update FB_DriveVirtual function call to reflect new interface. 2018-01-22 12:18:15 +01:00
Anders Sandström 54923f825c Add code. 2017-12-08 12:13:55 +01:00
Anders Sandström 77bc81ce82 Add tc_project_app. 2017-12-08 09:43:50 +01:00