Commit Graph

431 Commits

Author SHA1 Message Date
Dominic Oram
ccc24e4a13 Fixed whitespace 2021-09-03 12:50:17 +01:00
Dominic Oram
b5e04aeca5 Merge branch 'master' into MBP-113_Dom_OPC_codes 2021-09-03 12:42:53 +01:00
SCooper
d46bfcdd8e update to point at new tc_mca_master - fix whitespace issue in GVL 2021-09-03 12:21:16 +01:00
SCooper
00cdb1f8bd update to point at new tc_mca_master 2021-09-03 12:13:19 +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
Dominic Oram
830ecbe969 Update submodule 2021-09-01 16:10:07 +01:00
Federico Rojas
a7e214719e Merged in MBP-182-add-interlock-fwd-and-bwd (pull request #56)
MBP-182 add interlock fwd and bwd
2021-06-17 11:37:04 +00:00
Federico Rojas
0ca1513fcd Update submodule pointer to latest commit 2021-06-17 13:29:14 +02:00
Federico Rojas
0d193957ac Update tc_mca_std_lib to latest commit 2021-06-10 16:45:56 +02:00
Federico Rojas
5a82379d8a Merged in MBP-176-Localmode (pull request #54)
Update pointer to merge commit of MBP-176 in tc_mca_std_lib
2021-03-23 10:07:39 +00:00
Federico Rojas
237b01cb3b Update pointer to merge commit of MBP-176 in tc_mca_std_lib 2021-03-23 10:11:53 +01:00
Federico Rojas
5e247bf128 Merged in federicor/210312-update-submodule-pointer (pull request #53)
Update submodule pointer to the merge of latest submodule commit
2021-03-12 10:17:27 +00:00
Federico Rojas
0f46356645 Update submodule pointer to the merge of latest version 2021-03-12 11:13:17 +01:00
Federico Rojas
529e83fada Merged in MBP-177-interlock-bit-in-gvl (pull request #52)
Update pointer of mca_std_lib

Approved-by: Harald Kleines
2021-03-12 08:47:57 +00:00
Federico Rojas
64a74eeee7 Disable auto priority management of tasks so it does not change with every compile 2021-03-10 11:19:41 +01:00
Federico Rojas
bb4328e6b5 Update pointer of mca_std_lib 2021-03-08 15:13:40 +01:00
Federico Rojas
0aa6894d6c Merged in MBP-173-delete-unit-test-files (pull request #51)
MBP-173 delete unit test files

Approved-by: Harald Kleines
2021-02-23 09:39:56 +00:00
Federico Rojas
8ad900e534 Add tc_project_app as an independent project file and activate auto priroty manager for tasks 2021-02-19 12:05:24 +01:00
Federico Rojas
9d760988a0 Delete all files related to the Test unit folder and library 2021-02-19 12:04:06 +01:00
Federico Rojas
440717aadc Update Tc2_Mc2 library to version 3.3.41.0 2021-02-19 11:34:19 +01:00
Federico Rojas
f620652a84 Update tc_mca_std_lib to latest version 2021-02-19 11:33:55 +01:00
Federico Rojas
2dc6dbdb14 Merged in MBP-169-pou-for-application-specific-code (pull request #49)
MBP-169 pou for application specific code
2021-01-29 11:03:12 +00:00
Federico Rojas
4bdb673424 Fix white space damage and update std_lib pointer 2021-01-25 13:45:36 +01:00
Federico Rojas
d7060a75e0 Update tc_mca_std_lib's pointer to match MBP-169 2021-01-25 13:40:54 +01:00
Federico Rojas
5394cec66b Add the folder strucutre, templates and necessary variables for the Application Specific section 2021-01-25 13:39:54 +01:00
Federico Rojas
c4a9e96037 Update version number to 3.1.4024.11 in the pyhton file for the pipeline 2020-12-09 16:17:26 +01:00
Federico Rojas
b7388e21c6 Delete the program prog from the solution and just leave the action from MAIN 2020-12-09 15:59:35 +01:00
Federico Rojas
393d1282ab Merge branch 'MBP-169-pou-for-application-specific-code' of https://bitbucket.org/europeanspallationsource/tc_generic_structure into MBP-169-pou-for-application-specific-code 2020-12-09 15:56:26 +01:00
Federico Rojas
6cdfc7a0f3 Create EXAMPLE() program and call it to show the intended use 2020-12-09 15:50:58 +01:00
Federico Rojas
7a92737f10 create folder for Application Specific programs 2020-12-09 15:50:17 +01:00
Federico Rojas
91efd95975 Add POU PROG to the solution and call it from MAIN 2020-12-09 15:25:02 +01:00
Federico Rojas
cf3c760290 Delete the action PROG() from the solution 2020-12-09 15:18:00 +01:00
Torsten Bögershausen
995bb53182 Merged in MBP-163-update-and-test-twincat-version- (pull request #46)
MBP-163 update and test twincat version
2020-12-07 10:57:48 +00:00
Torsten Bögershausen
5c07bb2db3 Update solution/tc_project_app/tc_mca_std_lib to master branch
Update tc_mca_std_lib to
Merged in MBP-163-update-and-test-twincat-version- (pull request #36)
MBP-163 update and test twincat version
Approved-by: Federico Rojas
2020-12-04 12:35:31 +01:00
Torsten Bögershausen
1f619fefe4 Change to TwinCAT 4024.12 2020-11-16 09:19:28 +01:00
Torsten Bögershausen
cfe52c143d solution/tc_project_app/tc_mca_std_libDUTs/E_AxisParameters.TcTLEO: Fix whitespace damage 2020-11-11 11:54: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
PaulBarron
877b0620a9 Merged in MBP-155-access-to-NC-parameters (pull request #44)
MBP-155 access to NC parameters
2020-07-03 15:05:14 +00:00
Paul Barron
5727b63cb0 Update to latest version of tc_mca_std_lib 2020-07-01 19:27:14 +02:00
Paul Barron
798e4c4fd8 Update to latest pointer of tc_mca_std_lib
Fix VISU bug with homing
2020-07-01 19:15:51 +02:00
Paul Barron
0810280ba4 Update to latest commit of tc_mca_std_lib 2020-07-01 18:28:40 +02:00
Paul Barron
42d908d8b7 Update tc_mca_std_lib 2020-07-01 12:45:20 +02:00
Paul Barron
02addfc848 Merge branch 'master' into MBP-155-access-to-NC-parameters 2020-07-01 12:35:17 +02:00
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
Paul Barron
c335b85e40 Update to latest commit of tc_mca_std_lib 2020-06-29 11:03:54 +02: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