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

32 Commits

Author SHA1 Message Date
SCooper
387a662d19 include TMC and TPY, remove axes from test 2022-07-27 15:34:28 +01:00
SCooper
0808f6c41b Gear in and gear out implemented 2022-07-08 15:00:47 +01:00
Cooper
976ef8dedc OOP implementation of FB_Axis created with basic functionality 2022-07-07 14:36:10 +01:00
Kristina Jurisic
1b8ad61f58 Change pneumatic axis constant to 0 in the GVLs 2021-11-04 12:01:51 +01:00
Kristina Jurisic
a502e2275b Set pneumatic axis to 1 2021-11-01 12:53:52 +01: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
Kristina Jurisic
a2afeeb99e Change pneumatic axis number in GVL_APP to 0 and build 2021-11-01 10:22:39 +01:00
Simon Cooper
a3df820dbe Merged in MBP-107_SlitFB (pull request #60) 
MBP-107 SlitFB

Approved-by: Federico Rojas
 2021-09-21 12:33:05 +00:00
Dominic Oram
ccc24e4a13 Fixed whitespace 2021-09-03 12:50:17 +01:00
Dominic Oram
83d508fbfb Make number of axes read only 2021-09-03 11:57:31 +01:00
Dominic Oram
b9ff6ca906 Add OPC tag for number of axes 2021-09-03 11:48:55 +01:00
SCooper
cd33896c8e Remove ISIS test crate hardware to make branch hardware independent 2021-07-29 11:33:08 +01:00
SCooper
4827ed4235 add hardware and functions for development with test crate 2021-07-23 12:03:59 +01:00
Kristina Jurisic
070efeee83 Define one pneumatic axis for testing 2021-06-16 13:01:05 +02:00
Kristina Jurisic
e5aa911ef0 Fix white space damage 2021-06-15 15:19:17 +02:00
Kristina Jurisic
caa514e97f Add constant var nPNEUMATIC_AXIS_NUM to GVL_APP 2021-06-15 13:40:22 +02:00
Kristina Jurisic
75e8a301f8 Fix broken branch thus a crash, commiting old changes 2021-06-15 11:05:53 +02: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
Paul Barron
6b96fe55be Update to latest commit of tc_mca_std_lib 2020-06-26 10:29:36 +02:00
Paul Barron
3b2cdd91b2 Add hardware, plc and links using Simon's C# tool 2020-06-10 12:25:16 +02:00
Federico Rojas
48dafb43a4 Change GVL_APP.nAxisNum to GVL_APP.nAXIS_NUM because it is a constant 2020-04-03 15:14:25 +02:00
Federico Rojas
9561494a7d Revert change from nAXIS_NUM to nAxisNum, it is not a constant 2020-03-17 11:27:21 +01:00
Federico Rojas
456f791f56 change nAxisNum constant to nAXIS_NUM in GVL.APP and their references 2020-03-11 13:07:28 +01:00
Federico Rojas
c504ae6ea3 change axisNum to nAxisNum in GVL.APP and their references 2020-03-11 13:01:52 +01:00
kleines
f42a22cbe0 deleted uncommented code in GVL_APP 2020-03-02 17:31:50 +01:00
Torsten Bögershausen
b914a2f62a Initial number of axes is 0 
Change axisNum in GVL_APP to 0
 2020-02-10 10:51:12 +01:00
Paul Barron
04c7827a7a Merge 'tc_generic_struct/integration' into mbp-77/191217-RemoveMode2 
Conflicts:
	solution/solution.tsproj
	solution/tc_project_app/GVLs/GVL_APP.TcGVL
	solution/tc_project_app/POUs/MAIN.TcPOU
	solution/tc_project_app/tc_project_app.plcproj
 2019-12-18 10:48:04 +01:00
Paul Barron
b61bf93b52 Remove hardware and rebuild 
Change axisNum to 2
 2019-12-17 14:54:20 +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
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
e9bac1d121 Create GVL_APP and add axisNum constant variable in it 2019-08-01 12:58:31 +02:00