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

424 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kristina Jurisic
7bc5d39db3 Modified program Pneumatic_Axis 
Removed setting Permit parameter from the program Pneumatic_Axis.
 2021-05-21 12:55:11 +02:00
Kristina Jurisic
709e9d062d Add Pneumatic Axis struct 
Added struct of structs Pneumatic Axis in the FB_PNEUMATIC_AXIS.
It includes all the inputs, control, status and errors for the pneumatic axis.
 2021-05-21 12:52:47 +02:00
Kristina Jurisic
b935535e71 Add actions in FB Pneumatic Axis 
Added actions for single solenoid state machine.
 2021-05-19 13:37:57 +02:00
Kristina Jurisic
0e81f9b28c Change TwinCAT version 
Changed version from 3.1.4024.6 to 3.1.4024.5
 2021-05-18 13:11:51 +02:00
Kristina Jurisic
6fa5106669 Program to call Pneumatic Axis FB 
Call pneumatic axis FB
 2021-05-18 12:59:14 +02:00
Kristina Jurisic
f30542ed8e Add call for a pneumatic FB from Main 
Added program call for the pneumatic axis FB from Main PROG().
 2021-05-04 13:05:44 +02:00
Kristina Jurisic
330fc0c878 Add changes for the pneumatic axis 
Added FB and a program for the pneumatic axis.
 2021-05-04 13:00:29 +02:00
Kristina Jurisic
7421924815 Add pneumatic axis to the solution 
Added pnuematic acutator FB, programs and DUTs.
 2021-05-04 12:57:14 +02:00
Kristina Jurisic
2ee6e1376d Add program to call FB_PNEUMATIC_AXIS 
Program Pneumatic_Axis used to call for the pneumatic actuator axis FB.
 2021-05-04 12:52:47 +02:00
Kristina Jurisic
9f2f07b960 Add FB_PNEUMATIC_AXIS 
FB to control pneumatic actuator.
Currently implemented: single solenoid valve control, from PLC and manually.
 2021-05-04 12:42:37 +02: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
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