Paul Barron
96ff81ced1
Merge branch 'MBP-155-access-to-NC-parameters'
2020-07-01 12:14:02 +02:00
Harald Kleines
00ea16974b
Merged in MBP-157-implement-application-access-to- (pull request #45 )
...
MBP-157 implement application access to
2020-07-01 09:56:38 +00:00
kleines
a6c7f5f3fc
added correct text list entry for help button
2020-06-26 15:35:34 +02:00
kleines
fe9b971f3f
Inital coding
2020-06-26 14:28:38 +02:00
Paul Barron
69b0036ff0
Remove spaces to conform to standard
...
No code change
2020-06-26 10:46:52 +02:00
Paul Barron
e49e8f6f68
Update to latest commit of tc_mca_std_lib
2020-06-26 10:41:22 +02:00
Paul Barron
6b96fe55be
Update to latest commit of tc_mca_std_lib
2020-06-26 10:29:36 +02:00
Paul Barron
038ad8e844
Merge branch 'master' of https://bitbucket.org/europeanspallationsource/tc_generic_structure into MBP-155-access-to-NC-parameters
2020-06-26 09:20:45 +02:00
luke.nisbet
1334522b0d
Merged in MBP-149-delete-changeconfig (pull request #43 )
...
MBP-149 delete changeconfig
Approved-by: Federico Rojas
2020-06-23 09:14:16 +00:00
Luke Nisbet
b9b5d3eb95
Merge branch 'master' into MBP-149-delete-changeconfig
2020-06-23 10:13:11 +01:00
Luke Nisbet
b7d597adce
Updated the Pointer to the Latest Submodule
2020-06-23 09:36:10 +01:00
Harald Kleines
9a350e85de
Merged in MBP-116-motion-function-blocks-outputs (pull request #42 )
...
MBP-116 motion function blocks outputs
2020-06-22 15:52:59 +00:00
kleines
211968a18f
do not set nResetErrorID to 0 if an error in fbReset occurs
2020-06-22 12:18:36 +02:00
kleines
064d2c1728
did some minor editorial changes
2020-06-18 18:37:43 +02:00
kleines
5d79e74e6c
changed bBUSY to bBusy
2020-06-16 12:56:52 +02:00
Luke Nisbet
69fc88aa24
Repointed to new submodule changes
2020-06-12 14:21:14 +01:00
Paul Barron
3b2cdd91b2
Add hardware, plc and links using Simon's C# tool
2020-06-10 12:25:16 +02:00
kleines
c72741a8b8
corrected white space errors
2020-06-04 18:24:18 +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
b49c9f6101
removed busy check for fbReadParameters
2020-06-04 17:22:05 +02:00
kleines
518156b387
added changes according Simons suggestions in MBP-116 with bxxxx helper
...
variables.
2020-06-02 17:50:59 +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
Luke Nisbet
bac7da9cfc
Updated submodule pointer
2020-05-18 12:24:35 +01:00
Luke Nisbet
cbd32f3f98
Repointed to Updated Submodule
2020-05-18 12:07:52 +01:00
Luke Nisbet
4ba790a701
Merge branch 'master' into MBP-149-delete-changeconfig
2020-05-15 10:47:29 +01:00
Luke Nisbet
b95a3437aa
Removed Deleted Files From The Submodule
2020-05-15 10:38:20 +01:00
Federico Rojas
5d7df10f13
Update submodule pointer and add tc_project_app.xti file
2020-05-07 15:15:15 +02:00
luke.nisbet
9a00db6c67
Merged in mbp-100-read-write-axis-parameters (pull request #40 )
...
Mbp 100 read write axis parameters
Approved-by: Federico Rojas
2020-05-06 12:15:54 +00: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
Luke Nisbet
ace0a2174a
Fixed code not complying with the coding standard
2020-05-05 17:34:48 +01:00
kleines
e2321a2b9c
added new homing code from MBP-131
2020-05-05 17:26:10 +02:00
kleines
c2cc2f0705
removed inconsitency regarding reset
2020-05-04 11:29:19 +02:00
Luke Nisbet
ad5c0324a6
Updated Submodule Pointer
2020-05-01 13:12:01 +01:00
Luke Nisbet
10d416dc95
Renamed elements in the VISU
2020-04-29 11:39:38 +01:00
Luke Nisbet
d081ee3680
Removed Axis from GVLs/GVL_APP
2020-04-28 10:45:22 +01:00
Luke Nisbet
4bf14f99ab
Merged submodule to master
2020-04-27 15:42:29 +01:00
Luke Nisbet
00e087b54b
Merge branch 'master' into mbp-100-read-write-axis-parameters
2020-04-27 15:16:01 +01:00
kleines
d55cae194f
improved handling of reset and jogging
2020-04-27 15:05:41 +02:00
PaulBarron
f49da8c901
Merged in MBP-131-Improve-homing-routines-squash (pull request #41 )
...
MBP-131: Update advanced homing routines
Approved-by: Federico Rojas
2020-04-24 09:14:55 +00:00
Paul Barron
29b9b5e959
Comment out bOutputs
2020-04-24 10:54:17 +02: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
Luke Nisbet
1c5388bf06
Removed Redundant RTRIG
2020-04-22 14:35:59 +01:00
Luke Nisbet
12ae95898e
Fixed formating to fit standard
2020-04-20 15:04:12 +01:00
kleines
8caafdc53c
Initial commit
2020-04-20 14:42:36 +02:00
Luke Nisbet
d7ae3a4c00
Fixed White Space
2020-04-08 17:04:32 +01:00
Luke Nisbet
80bb47123a
Removed unknown file tash show
2020-04-08 15:57:54 +01:00
Luke Nisbet
6572d59420
Ran check white space
2020-04-08 12:28:17 +01:00
Luke Nisbet
f03ac15f95
fixed Whitespace Damage
2020-04-07 16:39:13 +01:00
Luke Nisbet
bd9629cbbd
Fixing issues caused by auto merge
2020-04-07 13:59:19 +01:00
