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

121 Commits

Author SHA1 Message Date
federicorojas
69ebe9e125 Comment the templates call for pneumatics and application in MAIN/PROG 2022-02-07 13:42:28 +01:00
federicorojas
bb62c2b55f Relocate Pneumatics_Template() PROG to be under Axes Folder 2022-02-04 13:44:15 +01:00
Federico Rojas
78d6708762 Delete testing comments and put them to pull request 2021-11-10 15:35:58 +01:00
Kristina Jurisic
994b2a4358 Create variable hmiPneumaticAxis for Pneumatic VISU 2021-11-01 12:54:49 +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
Federico Rojas
bcd7c497b3 Add comments to Axis_template and remove supply outputs from MAIN 2021-09-21 15:18:09 +02:00
SCooper
cd33896c8e Remove ISIS test crate hardware to make branch hardware independent 2021-07-29 11:33:08 +01:00
SCooper
cc7d2233a7 re add axis and application templates 2021-07-29 11:23:29 +01:00
SCooper
d982c3585e Clean up formatting and whitespace. Add ENUM states for slits. Improve error handling 2021-07-27 13:53:07 +01:00
SCooper
6a79f654f1 Add test program for implementing slit set, add hardware for testing slit set implementation. Update solution to point at new tc_mca_Std_lib files 2021-07-27 09:22:14 +01:00
SCooper
4827ed4235 add hardware and functions for development with test crate 2021-07-23 12:03:59 +01:00
Kristina Jurisic
21cb8a5430 Made hmiPneumaticAxisvariable to use for PneumaticsVisu 2021-06-27 11:58:48 +02:00
Kristina Jurisic
aa0f6d47d4 Made instructions on how to use PneumaticsVisu 2021-06-27 11:57:37 +02:00
Kristina Jurisic
f2608e4812 Fix white space damage 2021-06-15 15:19:58 +02:00
Kristina Jurisic
1659537b9e Add array of FB_PneumaticAxis 2021-06-15 13:43:01 +02:00
Kristina Jurisic
26265f62d3 Readd the Application_Template POU 2021-06-15 11:39:35 +02:00
Kristina Jurisic
2499611ae0 rename folder to Apllication_Specific 2021-06-15 11:11:26 +02:00
Kristina Jurisic
75e8a301f8 Fix broken branch thus a crash, commiting old changes 2021-06-15 11:05:53 +02:00
Kristina Jurisic
b0e9ee51bc Add Pneumatics_Template PROG 
Added PROG with the instructions for user.
 2021-06-13 08:15:11 +02:00
Federico Rojas
0d193957ac Update tc_mca_std_lib to latest commit 2021-06-10 16:45:56 +02:00
Kristina Jurisic
df84335a9a Fixed white spaces 
Fixed white spaces in the code of FB_PNEUMATIC_AXIS.
 2021-06-03 11:58:00 +02:00
Kristina Jurisic
0644a7013f Add ERROR state machine 
Added state machine for different errors that can occur during pneumatic
cylinder work:
the cylinder didn't reach the position in allowed time
cylinder didn't move after the move command
no permit to move
 2021-05-27 10:30:24 +02:00
Kristina Jurisic
84cf7da942 Add timing of the move command 
If the cylinder doesn't start moving from one of the end positions after
certain time, this means that the cylinder is in error state.
 2021-05-25 12:09:18 +02:00
Kristina Jurisic
d880757c7d Add timing variables 
User can define allowed time in seconds for the extraction and retraction of the
pneumatic cylinder.
 2021-05-24 13:14:59 +02:00
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
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
4bdb673424 Fix white space damage and update std_lib pointer 2021-01-25 13:45:36 +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
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
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
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
69b0036ff0 Remove spaces to conform to standard 
No code change
 2020-06-26 10:46:52 +02: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
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
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
a77bf83d00 Delete an extra ENTER - cosmetic 2020-03-25 13:06:34 +01:00
Federico Rojas
5399e85127 Update refrences from GVL variable aAxes to astAxes 2020-03-23 15:13:51 +01:00
Federico Rojas
a8e4f88884 Delete sapces after //, add e to variables in E_RestorePosition 2020-03-23 14:46:56 +01:00
Federico Rojas
3181c4b69f Delete space after // from restor position actions 2020-03-23 14:35:31 +01:00