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

106 Commits

Author SHA1 Message Date
aaronlong
80e4ea356e Submodule update: tc_mca_std_lib 2019-12-10 14:44:21 +00:00
Torsten Bögershausen
c6c63bfa4c Merge 'origin/integration' into MBP-127-commit-files-with-lf-in-repo-crlf 
Conflicts:

	solution/solution.tsproj

	twincat_version_manager.py
 2019-12-09 06:25:29 +01:00
Torsten Bögershausen
b60f33ed5a solution.tsproj: Update to version 4.1.4023.119 2019-12-06 09:52:04 +01: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
Torsten Bögershausen
1e8ecb1f6b Remove and ignore solution/TrialLicense.tclrs 
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)
 2019-12-04 16:11:52 +01:00
Torsten Bögershausen
4b2302d0d4 Fix whitespace damage in solution/tc_project_app/tc_mca_std_lib 2019-11-29 11:51:27 +01:00
Torsten Bögershausen
69f8fc4696 solution/tc_epicscommodule updated to 3.1.4024.0 2019-11-29 11:34:27 +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
Torsten Bögershausen
9facfb89c1 Update tc_epicscommodule to a white+space clean version 2019-11-29 09:43:45 +01:00
Federico Rojas
5644dd9bb7 Update Hardware FB for the latest version from Viktor Heirich and 4024.0 
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
 2019-10-16 11:35:02 +02:00
Federico Rojas
117f65b403 Merge origin/integration into MBP-109-test-pipelines-for-twincat 
Conflicts:

  solution/solution.tsproj
 2019-10-15 14:19:34 +02:00
Federico Rojas
8ced80123e Update tc_mca_std_lib to version 3024.0 2019-10-15 14:05:11 +02:00
Federico Rojas
9a0b8e98cc Update tc_epicscommodule to master for new 3024.0 2019-10-15 14:04:02 +02:00
Dominic Oram
7f9e9feff5 Updated submodules 2019-10-11 23:24:09 +01:00
Dominic Oram
1579c29d6f Updated version 2019-10-11 23:20:39 +01:00
Dominic Oram
1d3a7d6c59 Updated version 2019-10-11 23:18:38 +01:00
Dominic Oram
0adff94a46 Updated version 2019-10-11 23:13:43 +01:00
Federico Rojas
232a454e21 fix conflict while merging to integration branch 2019-08-08 11:32:13 +02: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
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
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
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