Commit Graph

69 Commits

Author SHA1 Message Date
Federico Rojas c1930b89fd Some Homing sequences implmentation
Limit switch and direct homing are implemneted, the same with homing to a home snesor
Missing referencing to encoder index or external signal.
2019-03-27 11:57:24 +01:00
Federico Rojas 6dbf29a0c4 New solution structure to fit the array of gvl paramaters structure
AXES()creates the FB and associates the stAxisStruct structure of the gvl
MAIN has new varibales to fit the gvl array
New FB and new Strucutres under DUT Still developing in the tc_mca_std_lib
2019-03-20 15:37:31 +01:00
Federico Rojas 87a1efaba8 Add FB EL1018 in Hardware folder in solution 2018-10-31 17:19:34 +01:00
Federico Rojas 300e6d2d06 Add EL1018 to the hardware folder for error handling 2018-10-31 15:50:11 +01:00
Federico Rojas ca715d5810 Comment not used error FB 2018-10-31 11:41:34 +01:00
Federico Rojas 27e88b2c28 Merge branch 'master' of https://bitbucket.org/europeanspallationsource/tc_generic_structure 2018-10-30 15:41:05 +01:00
Federico Rojas 0875d1fb80 Updated my solution to use latest submodule mca_std_lib 2018-10-30 15:40:00 +01:00
Federico Rojas b0f5f0d901 Merged federicor/changes-for-workshop into master 2018-10-30 15:38:04 +01:00
Federico Rojas 88141fd42a Updated my solution to use latest submodule mca_std_lib 2018-10-30 15:36:17 +01:00
Federico Rojas d1f40c9a81 Merged federicor/changes-for-workshop into master 2018-10-30 15:27:33 +01:00
Federico Rojas e42fca65aa Submodule std_lib updated
Update to new master branch
2018-10-30 15:25:47 +01:00
Federico Rojas 9442e7d1a2 Add default instance call (FB) for the error handling
In the action ERROR() the necessary default instances are included
an example nin comments is included
Build solution without an error
2018-10-30 15:16:57 +01:00
Federico Rojas 2457083e95 Add the actions AXES, ERROR and PROG to MAIN
Three actions are in the MAIN
AXES: contains the FB of each axis en FBD language
EROR: Contians the FBs necessary for error handling
PROG: space for sequencing, safety or anything else application specific
2018-10-30 14:51:07 +01:00
Federico Rojas 2ef18dc1eb Add error handling variables in MAIN
Add the section for error handling variables in the MAIN puo.
2018-10-30 14:46:57 +01:00
Federico Rojas 5d1adbccf2 Delete the FB of hardware not used in error handling
Delete all the hardware FB that are not supported by MCAG in the error handling folder
2018-10-30 14:39:36 +01:00
Federico Rojas d4874c197c Add "Homing" folder in the solution structure
A folder called "Homing" containing all the FB required for homing is included
2018-10-30 14:16:52 +01:00
Federico Rojas 7b8e207e87 Add folder for licenses
A folder was created for pasting the licenses from the Beckhoff CPU as a backup.
A ReadMe file was included explaining where the licenses are located.
2018-10-30 14:07:59 +01:00
Federico Rojas b27a9fe3d0 Merge branch 'master' of https://bitbucket.org/europeanspallationsource/tc_generic_structure 2018-07-09 15:44:18 +02:00
Federico Rojas 3dec6ad15a Activate "Autostart Boot Project" in tc_epicscommodule and tc_project_app 2018-07-09 15:41:45 +02:00
Federico Rojas 7fd5c7cbc6 Enable RUN mode in CPU. Ticj Autostart project of the plc projects. 2018-07-09 15:38:34 +02:00
Federico Rojas 8ceb9312b5 Merged federicor/update-generic-structure-main-and-solution into master 2018-07-09 15:32:42 +02:00
Federico Rojas 87fc139e36 Chenge name of Outputs from bPowerOutput to just bOuput 2018-07-09 15:30:57 +02:00
Federico Rojas d9e71237d3 Solution with the new strucutre in MAIN POU and recen ProgramVersion
Solution with the current ProgramVersions in both .plcProj files.
MAIN progrma with new variable structure for easier understanding.
2018-07-09 15:25:57 +02:00
Federico Rojas 092b321772 Add Limits and HomeSensor variables. FB_DriveVirtual and FB_NcAxis for 2nd axis
Structure varibales of inputs and outputs in MAIN for better comprenhension.
Add all variables for a second axis and add commented varibales for extra axes.
2018-07-09 15:22:29 +02:00
Federico Rojas fba12f2ef5 Change ProgramVersion in tc_project_app to 3.1.4022.2
Update ProgramVersion to the newest TwinCAT
2018-07-09 15:20:49 +02:00
Federico Rojas f24a065022 Change ProgramVersion in tc_epicscommodule to 3.1.4022.2
When compile in new version autimatically changes that line. To avoid unecessary changes
in the future I am commiting this cahnge now
2018-07-09 15:14:10 +02:00
Federico Rojas ae89df4fda Update tc_epicscommodule submodule
Remove ExternalTypes.tmc and add the accidentally deleted tc_epicscommodule.plcProj
2018-07-06 14:15:46 +02:00
Federico Rojas 64e9e1a054 Merge anders/genericStructure branch to master 2018-07-06 13:21:54 +02:00
Federico Rojas 79db0090e6 Merged torstenb/add-error-handling-files-and-folder_update_epicscommodule into master 2018-07-06 09:22:41 +02:00
Torsten Bögershausen f2556d94ff EpicsComModule.plcProj -> tc_epicscommodule.plcProj 2018-07-04 14:15:42 +02:00
Federico Rojas a1b1cb9682 Merged federicor/add-error-handling-files-and-folders into master 2018-07-04 12:45:13 +02:00
Federico Rojas ab6c248613 No real change in submodule, file strangely modified when adding error handling files 2018-07-04 12:35:34 +02:00
Federico Rojas 19e3f7835e Add all files and directories for the error handling 2018-07-04 12:30:34 +02:00
Federico Rojas c202132f6a Name correction of solution 2018-03-22 16:12:12 +01:00
Federico Rojas 530737ef14 Fix pushed commit error, solution name change mistake 2018-03-22 15:39:02 +01:00
Federico Rojas 972abf2bf1 Update solution name and structure with mca_std_lib. 2018-03-22 15:29:53 +01:00
Anders Sandström ef39aca22d Merged anders/updateStdLib into master 2018-03-09 13:31:20 +01:00
Anders Sandström 67b4697fc2 Merge remote-tracking branch 'origin/master' 2018-03-09 13:28:48 +01:00
Anders Sandström aa26d308bc Use new stdLib. 2018-03-09 13:20:41 +01:00
Anders Sandström 13413cfa07 Add new Homing FBs in structure 2018-03-08 13:47:57 +01:00
Torsten Bögershausen c405a00b8f Merged torsten/180228_update_tc_mca_std_lib into master 2018-02-28 16:27:58 +01:00
Torsten Bögershausen 1a4fc32603 Update solution/tc_project_app/tc_mca_std_lib to master
Update tc_mca_std_lib to commit 40d37cd9eb7e23600d3cc1b0d:
  Merge: a774e80 ae3ebd9
  Author: Federico Rojas <federico.rojas@esss.se>
  Date:   Thu Feb 8 09:08:16 2018 +0100

    Merged federico/homing-comment-corrrection into master
2018-02-28 16:26:47 +01:00
Anders Sandström 47b977ae81 PLCTask cycle time 1ms (instead of 10ms). 2018-01-22 15:44:56 +01:00
Anders Sandström 5bcdbbb622 Update tc_mca_std_lib. 2018-01-22 15:41:46 +01:00
Anders Sandström 5bb4c5af4a Use updated tc_mca_std_lib. 2018-01-22 14:35:18 +01:00
Anders Sandström 0e62112c8c Use new tc_mca_std_lib version. 2018-01-22 14:07:32 +01:00
Anders Sandström 13f37c6478 Update tc_mca_std_lib 2018-01-22 12:27:13 +01:00
Anders Sandström a5122aafa9 Add FB_WriteFloatParameter to plc project. 2018-01-22 12:24:24 +01:00
Anders Sandström 7256b72277 Main.TcPOU.ACT: Update FB_DriveVirtual function call to reflect new interface. 2018-01-22 12:18:15 +01:00
Anders Sandström 6f6faf2fd7 Add new tc_mca_std_lib blocks to PLC project. 2018-01-22 12:16:14 +01:00