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
149 Commits
Author SHA1 Message Date
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
Federico Rojas 743ad6c6d8 Change the array variables of Main and all thier refernces to follow coding standards 2020-03-23 14:15:21 +01:00
Federico Rojas 594d4cd208 Fix white space damage 2020-03-19 17:22:35 +01:00
Federico Rojas c4c2fdc0f3 Changed FB_Axis and refernces to follow code standards 2020-03-18 17:05:52 +01:00
Federico Rojas 47199a6a16 Change all DUT's variable names and references after merge with MBP-138 2020-03-18 15:34:23 +01:00
Federico Rojas 014cc8d807 Chenge variable and references of axesPersistent to aAxesPersistent 2020-03-17 16:18:38 +01:00
Federico Rojas c99efebb07 Change GVL to follow our coding standards and update all the references in the FB's 2020-03-17 14:52:19 +01:00
Federico Rojas 56929e3be1 Fix all references from the chages DUT's in the FB's and POU's 2020-03-17 14:34:44 +01:00
Federico Rojas 68498ae44f Delete local variable i in MAIN and substitute it with GVL.iAxis 2020-03-17 13:33:21 +01: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 6c9885ee54 Change to coding standards all variables in MAIN and their references 2020-03-11 13:30:47 +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
aaronlong b984376f15 resolved merge conflicts 2020-03-04 10:59:33 +00:00
Federico Rojas a5fa028735 Delete all error handling from MAIN 
Delete the action ERROR()
Delete all the variable section for Error Handling in MAIN
 2020-03-02 16:07:10 +01:00
aaronlong 741d03da8d Test suite and examples for tc_mca_std_lib solution 2020-02-19 14:54:14 +00:00
Paul Barron 51464ddd87 Fix whitespace damage 2020-02-12 12:12:10 +01:00
Paul Barron 8433721ea4 Add check in MAIN.RESTOR_POSITIONS 
Add check when resetting bRestoreOnStartup flag to only reset
if the UPS is OK. Otherwise during a power loss it is set and then reset before
getting to the end of the PLC cycle.
This was a result of moving some code that was previously in MAIN to an ACT
and the RETURN command does not work the same. I believe it only returns
from the current act and not the whole code. Originally it was supposed to
prevent the rest of the code from executing in the event of a power failure but
this is no longer the case.
 2020-02-12 11:56:26 +01:00
Torsten Bögershausen 06fff58f08 MAIN.TcPOU: Save with TC version 3.1.4024.0 2020-02-10 10:58:35 +01:00
Torsten Bögershausen b522fe177e fix whitespace damage 2020-02-10 10:44:25 +01:00
Simon-Cooper 1079229ffb ALLOW LOCAL SIMULATIONS TO BYBASS UPS CHECK 
Add CHECK_UPS action to house monitoring of the UPS global status
Modify RESTORE_POSITIONS state machine to remove numerical enumeration
usage
Add device identity functionblock to check whether local simulation or
CX
Add POSITION RECOVERY action to check device type and determine whether
to run
position restore and ups checking
Add solution/_Config/ folder to gitignore to remove NC and IO
 2020-02-07 10:17:46 +00: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