Paul Barron
bbfe0ab3e9
Commit after updating TwinCAT
...
No code changes
modified: solution.sln
modified: solution/solution.tsproj
modified: solution/tc_project_app/tc_project_app.plcproj
2019-12-09 11:54:52 +01:00
Paul Barron
619331cc28
After white space fix?
2019-12-09 11:11:08 +01:00
Federico Rojas
117f65b403
Merge origin/integration into MBP-109-test-pipelines-for-twincat
...
Conflicts:
solution/solution.tsproj
2019-10-15 14:19:34 +02:00
Dominic Oram
1d3a7d6c59
Updated version
2019-10-11 23:18:38 +01:00
Dominic Oram
0adff94a46
Updated version
2019-10-11 23:13:43 +01:00
Federico Rojas
232a454e21
fix conflict while merging to integration branch
2019-08-08 11:32:13 +02:00
Federico Rojas
e9bac1d121
Create GVL_APP and add axisNum constant variable in it
2019-08-01 12:58:31 +02:00
Federico Rojas
08c6c6acaf
Delete Axis task from solution to have a clean solution
2019-08-01 12:38:27 +02:00
Federico Rojas
8beccc5cd8
Change representation to Hex of nNC_ErrorID in FB_NC_Error
2019-07-17 15:55:52 +02:00
Federico Rojas
175bdae2de
Add missing FB for ErrorHandling FB_NC_Error
2019-07-16 13:29:44 +02:00
Federico Rojas
81b2a6c326
Delete bResetDone and bHome, change VISU location to tc_mca_std_lib
...
Delete bResetDone from MainVisu and ST_AxisStatus
Delete bHome from ST_AxisControl
Move all VISU folder from tc_generic_struct to tc_mca_std_lib
2019-07-16 11:32:47 +02:00
Federico Rojas
f71f6ad113
bError and bStop set to FALSE after execution
2019-07-10 14:58:03 +02:00
Federico Rojas
72ff5a7449
Merge with mbp-94/error-handling
2019-07-10 10:44:37 +02:00
Federico Rojas
062432bb3b
Delete Axis 1, 2 1nd 3 to have empty solution
2019-07-08 13:51:04 +02:00
Federico Rojas
ed7c121b3d
Update the solution strucutre with all the new Hardware FB's and FB_axis if error statements
...
Update the solution strucutre tree with the new FB's
Modify the if statememts of the FB_Axis error handling for proper review
2019-06-28 15:11:29 +02:00
Simon-Cooper
2791f6cf87
Add commit changes of TC_MCA_STD_LIB MPB-95
2019-06-20 11:33:13 +01:00
Simon-Cooper
8e59e35241
Single gear in and gear out support
...
-Add visualisation elements for support of single gear in
-Add visualisation elements for support of gear out
-Change AXES() action call to use GVL.iAxis as index of FOR loop
2019-06-04 11:46:53 +01:00
Simon-Cooper
20c07ff66e
visu links updated to sub-structures
...
Change visualisation property links to variables within ST_AxisStruct sub structures
Add a single test axis linked to visualisation for testing and development
2019-06-03 14:35:25 +01:00
Frank Suxdorf
0ffd68a574
Add nested strutures to tc_mca_std_lib
2019-05-16 13:33:12 +02:00
Simon-Cooper
9f952987de
Visualisation added
...
Add PLC visualisation first pass
Functionality tested
GUI scales with axes
Issues identified due to base code solution:
A lot of outputs not linked
Execute not cleared by default in code, it is not possible to send repeated commands as if the eCommand is held then the mc_Fb.Execute:=false is never set
Reset not cleared by default in code (if errors again will just auto-reset)
Doesn't clear stop (however this may be a good thing)
Jog velocity input not utilised in mode 0 current set in code, we would need MC_JOGMODE_CONTINUOUS
2019-05-14 16:28:46 +01:00
Federico Rojas
702d8fed92
Implement comments of ISIS on 2019-04-09
...
Changes to make it work in any setup instead of the ESS test crates.
for further details check the commit of tc_mca_std_lib
2019-04-25 11:38:40 +02:00
Federico Rojas
d8555784b5
Add homing of FB_DriveVirtual V2 into FB_DriveVirtual V1
...
Homing sequences of FB_DriveVirtual V2 put into FB_Axis
FB_DriveVirtual change name to FB_Axis
Add enum for motion commands in the ST_AxisStruct
Add Case statement for the some motion functions
Delete FB_NcAxis, FB_Communication, FB_DriveVirtual_V2, ST_CommStates, DUT_AxisStatus
2019-04-05 13:22:53 +02:00
Federico Rojas
e5ba869ae8
Homing sequence to a enconder index signal
2019-03-29 14:02:34 +01:00
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
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
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
19e3f7835e
Add all files and directories for the error handling
2018-07-04 12:30:34 +02: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
47b977ae81
PLCTask cycle time 1ms (instead of 10ms).
2018-01-22 15:44:56 +01:00
Anders Sandström
54923f825c
Add code.
2017-12-08 12:13:55 +01:00
Anders Sandström
626c6260d3
Add changes when compile.
2017-12-08 11:01:51 +01:00
Anders Sandström
10ffa9e4d8
Add tc_mca_std files in TwinCAT structure.
2017-12-08 10:05:16 +01:00
Anders Sandström
891a0797ac
Change name of TwinCAT dir to tc_epicscommodule.
2017-12-08 09:38:18 +01:00
Anders Sandström
9fa966c937
Import tc_epicscommodule in TwinCAT.
2017-12-08 09:29:56 +01:00
Anders Sandström
fbddea94d1
Add solution.
2017-12-08 09:22:24 +01:00