Commit Graph

85 Commits

Author SHA1 Message Date
Paul Barron a9dea34c41 Capitalise variable names of eStartUp
No code changes
2019-12-09 12:25:01 +01:00
Paul Barron f98fa633a5 Fix whitespace damage in MAIN.TcPOU 2019-12-09 12:04:08 +01:00
Paul Barron 0772b525ab Update MAIN.TcPOU for TwinCAT version
Open MAIN.TcPOU in TwinCAT, add one line, delete it, save it.
TwinCAT updates the TwinCAT version number to 3.1.4024.0.
No code changes.
2019-12-09 11:59:42 +01:00
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 56e8fb1c9b Change iStartup case to eStartup
Change int to enum for better readability
2019-12-04 15:09:05 +01:00
Paul Barron fe65683e7c White space fix 2019-12-04 14:50:58 +01:00
Paul Barron 5d0116f27c Add comment plus variable name consistency fix 2019-12-04 14:44:49 +01:00
Paul Barron 1fd4d9bad6 Fix white-space danage 2019-12-04 14:09:59 +01:00
Paul Barron 3374ed36ae Merge 'tc_generic_struct/integration' into mbp-77/191204-SaveValuesOnPowerOff
Conflicts:
	solution/tc_project_app/POUs/MAIN.TcPOU
	solution/tc_project_app/tc_mca_std_lib
2019-12-04 13:42:31 +01:00
Torsten Bögershausen 4b2302d0d4 Fix whitespace damage in solution/tc_project_app/tc_mca_std_lib 2019-11-29 11:51:27 +01:00
Torsten Bögershausen bef8078e99 Fix whitespace damage
Fix the whitespaces using check_fix_white_space.py
modified:   solution/tc_project_app/GVLs/GVL_APP.TcGVL
modified:   solution/tc_project_app/POUs/MAIN.TcPOU
2019-11-29 09:47:11 +01:00
Federico Rojas 5644dd9bb7 Update Hardware FB for the latest version from Viktor Heirich and 4024.0
Some FB in the Etercat Termianls folder were not the latest version
They were replaced by the latest version according to  the developer Viktor Heirich# Please enter the commit message for your changes. Lines starting
2019-10-16 11:35:02 +02:00
Federico Rojas 8ced80123e Update tc_mca_std_lib to version 3024.0 2019-10-15 14:05:11 +02:00
Dominic Oram 0adff94a46 Updated version 2019-10-11 23:13:43 +01:00
Federico Rojas 80380cbcd1 Add action call of action STARTUP( ) to MAIN 2019-08-12 15:55:16 +02:00
Paul Barron ea525c4f49 Add a STARTUP and SHUTDOWN action to MAIN
SHUTDOWN saves the current act pos of all axes and a bit to indicate
whether the axes is moving. STARTUP checks all axes to see if they are
incremental and not moving at previous shutdown and opt-in for value
restore. If all are true then position is restored.
UPS reference library from Beckhoff also added for the saving of values
at shutdown. Might need to be modified as this one is specific for the
particular CPU.
2019-08-09 15:08:12 +02:00
Federico Rojas 05927a40a6 Change all references and links from GVL.axisNum to GVL_APP.axisNum 2019-08-01 13:03:33 +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 1bf298212a set bExecute to FLASE at the end of the code 2019-08-01 12:13:24 +02:00
Federico Rojas 1b3ef2c20f Reset bExecute when Axis are coupled 2019-07-18 10:03:08 +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 bacbdf1e39 add missing FB for error handling EL7037 and EL7047 2019-07-17 13:52:07 +02:00
Federico Rojas b3f741222f Fix bug with bExecute reset after command 2019-07-17 10:14:43 +02:00
Federico Rojas c03cead419 Fix typo in comment 2019-07-16 13:42:19 +02:00
Federico Rojas f9544e549b Update Links from Error_Log_Visu to new ST_AxisStruct 2019-07-16 13:31:10 +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 c488fd0489 delete unused old visualizations from tc_mca_std_lib 2019-07-16 10:41:16 +02:00
Federico Rojas 0602dd9e6e bExecute realese when moved, bReset and bStop reset state fixed 2019-07-12 12:19:30 +02:00
Federico Rojas b52a2a34a9 All file change with hexadecimal represenation in visu for ErrorID 2019-07-12 10:37:45 +02:00
Federico Rojas 2af2c7f5c5 Change ErrorID representation to hexadecimal for easier undertanding 2019-07-11 10:21:55 +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 815e48507e Make deafult value for the enum MotionFuncitons equal to Jog 2019-07-08 15:41:27 +02:00
Federico Rojas f3ed214162 Add folder FeedbackTerminals to the solution tree 2019-07-05 11:32:36 +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
Federico Rojas d04cf0ed4b Change the fbErrorList to the new fbErrorSystem in MAIN
Update the FB's in ERROR()
2019-06-28 14:46:57 +02:00
Dominic Oram a24a629546 Removed testing axis 2019-06-24 17:13:41 +01:00
Dominic Oram a90c3a9dd7 Merge branch 'integration' into MBP-92 2019-06-24 16:58:49 +01:00
Simon-Cooper dad212b4af Third NC axis to configuration
Add third axis for testing gear-in/out
Update to latest tc-std-lib commit of MBP-95
2019-06-20 15:38:37 +01:00
Simon-Cooper 2791f6cf87 Add commit changes of TC_MCA_STD_LIB MPB-95 2019-06-20 11:33:13 +01:00
Federico Rojas d2e05e98cf integration bracnh ponitng to integration branch in tc_mca_std_lib 2019-06-17 16:38:05 +02: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 fbfa2e1b74 Visu elements tidied up
Group visualisation elements in to 'like' components.
Update button executions so they visually "press" when selected
2019-05-16 08:29:22 +01: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 755b3db471 Change tc_mca_std_lib to comments of mbp-78
Removes all of the VAR_INPUTS and VAR_OUTPUTS and instead sets the FB_AXIS variables to their structure variables
2019-05-03 13:36:19 +02: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