Commit Graph

10 Commits

Author SHA1 Message Date
Federico Rojas
c852cd9e57 Merge branch 'origin/master' into MBP-198_OOP
Conflicts:
solution/_Config/PLC/tc_project_app.xti
solution/solution.tsproj
solution/tc_project_app/POUs/MAIN.TcPOU
solution/tc_project_app/tc_mca_std_lib
solution/tc_project_app/tc_project_app.plcproj
2022-08-25 13:11:11 +02:00
Federico Rojas
ce8d745cca Update all files to new build version. To 3024.11 and 3024.32 2022-08-16 15:29:05 +02:00
SCooper
7020a23a83 new status methods added for done, busy, error, cmdAborted. MoveVelocity added 2022-07-08 11:33:32 +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
8caafdc53c Initial commit 2020-04-20 14:42:36 +02: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
b52a2a34a9 All file change with hexadecimal represenation in visu for ErrorID 2019-07-12 10:37:45 +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