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
Trial-licenses should not be part of any Git - they
experire and soon and cause a lot of merge-conflicts.
Remove solution/TrialLicense.tclrs and
ignore it in .gitignore (keep .gitignore sorted)
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
Some FB in the Etercat Termianls folder were not the latest version
They were replaced by the latest version according to the developer Viktor Heirich# Please enter the commit message for your changes. Lines starting
-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
Change visualisation property links to variables within ST_AxisStruct sub structures
Add a single test axis linked to visualisation for testing and development
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