Commit Graph

32 Commits

Author SHA1 Message Date
Federico Rojas
ce8d745cca Update all files to new build version. To 3024.11 and 3024.32 2022-08-16 15:29:05 +02:00
Kristina Jurisic
f9aabf8513 Merge remote-tracking branch 'origin/master' into MBP-105-control-of-pneumatic-actuators 2021-11-01 10:36:56 +01:00
Federico Rojas
bcd7c497b3 Add comments to Axis_template and remove supply outputs from MAIN 2021-09-21 15:18:09 +02:00
Kristina Jurisic
30987cb389 Change names of variables 2021-07-27 12:32:18 +02:00
Kristina Jurisic
13a09ebb2b Solved merge conflicts 2021-06-28 10:30:53 +02:00
Kristina Jurisic
ef6507744c Resolved merge conflicts 2021-06-28 10:21:47 +02:00
Kristina Jurisic
1250efe4d6 Changes from pneumatic visu to global text list 2021-06-27 11:56:42 +02:00
Kristina Jurisic
6a91fcb121 Compile solution with latest code changes 2021-06-15 11:17:51 +02:00
Federico Rojas
0d193957ac Update tc_mca_std_lib to latest commit 2021-06-10 16:45:56 +02:00
Torsten Bögershausen
1f619fefe4 Change to TwinCAT 4024.12 2020-11-16 09:19:28 +01:00
Torsten Bögershausen
bdefd8a969 Update to TwinCAT TC31-Full-Setup.3.1.4024.11
Update to TwinCAT TC31-Full-Setup.3.1.4024.11
Note: we see  ProductVersion=3.1.4024.5
2020-11-11 11:40:48 +01:00
kleines
fe9b971f3f Inital coding 2020-06-26 14:28:38 +02:00
kleines
de92272d7a Merged master into MBP-116
Merge remote-tracking branch 'origin/master' into MBP-116-motion-function-blocks-outputs
2020-06-04 18:07:14 +02:00
kleines
7724dbee1a did changes according Federicos comments to the pull request. Added code
from MBP-100.
2020-06-02 17:03:28 +02:00
kleines
27b8606f25 Merge remote-tracking branch 'origin/master' into MBP-116-motion-function-blocks-outputs 2020-05-05 20:45:03 +02:00
kleines
2e497bbf42 corrected white spaces 2020-05-05 18:59:16 +02:00
kleines
e2321a2b9c added new homing code from MBP-131 2020-05-05 17:26:10 +02:00
Luke Nisbet
00e087b54b Merge branch 'master' into mbp-100-read-write-axis-parameters 2020-04-27 15:16:01 +01:00
Paul Barron
6dc8d31bbd MBP-131: Update advanced homing
Update pointer to tc_mca_std_lib

Fix reference to MC2 library: changed to 3.3.28.0 instead of 3.3.31.0

There may be some changes to the TcUnit tests but these were not
intended to be part of the commit. As I am halfway through the merge I
will commit what is there and then fix later on if required. These
should be part of another ticket.
2020-04-24 10:16:36 +02:00
kleines
8caafdc53c Initial commit 2020-04-20 14:42:36 +02:00
Luke Nisbet
bd9629cbbd Fixing issues caused by auto merge 2020-04-07 13:59:19 +01:00
Luke Nisbet
dfb809b53d Commit for merge 2020-04-06 17:21:03 +01:00
Federico Rojas
f22ce8c6d0 Move VISU directory a level higher, directly under tc_mca_std_lib 2020-03-19 14:09:14 +01:00
[Luke Nisbet]
aeb84c2a7a Ticket READY FOR REVIEW
The functionality is esentially thhe same as the lasat commit
but it has now been changed to fit into the current framework
a little better by making fbWriteParameters only run when called.
2020-03-04 09:52:22 +00:00
[Luke Nisbet]
bf64da273b Ticket compleated to original specification
The code can read and write all possible PLC Open and Beckhoff
axis parameters it uses the MC_ReadParameter and MC_WriteParameter
function block within FB_Axis. Errors are passed out to the error
handling and it is possible to control it all through MainVisu.
2020-02-06 13:38:32 +00:00
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
Dominic Oram
1d3a7d6c59 Updated version 2019-10-11 23:18:38 +01: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
b52a2a34a9 All file change with hexadecimal represenation in visu for ErrorID 2019-07-12 10:37:45 +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
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