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
114 Commits
Author SHA1 Message Date
Federico Rojas c852cd9e57 Merge branch 'origin/master' into MBP-198_OOP 
Conflicts:
solution/_Config/PLC/tc_project_app.xti
solution/solution.tsproj
solution/tc_project_app/POUs/MAIN.TcPOU
solution/tc_project_app/tc_mca_std_lib
solution/tc_project_app/tc_project_app.plcproj
 2022-08-25 13:11:11 +02:00
Federico Rojas e78b719352 Build solution with new code changes and updated versions 2022-08-25 11:18:44 +02:00
Federico Rojas d1c156f502 Merge 'origin/master' into MBP-202_NewSlitCode 
Conflicts:
	solution.sln
	solution/tc_project_app/tc_project_app.plcproj
 2022-08-19 15:30:17 +02:00
Federico Rojas 4685872bc1 Build solution with new state names in slit code 2022-08-19 15:28:16 +02:00
Federico Rojas 52d00a2f92 Build solution with new name and location of ess monitoring files 
Changes to be committed:
modified:   solution.sln
modified:   solution/tc_project_app/tc_mca_std_lib
modified:   solution/tc_project_app/tc_project_app.plcproj
 2022-08-19 13:18:32 +02:00
Federico Rojas 996e273812 Merge'origin/master' into MBP-202_NewSlitCode 
Conflicts:
	solution/_Config/PLC/tc_project_app.xti
	solution/solution.tsproj
	solution/tc_project_app/tc_mca_std_lib
 2022-08-17 16:40:45 +02:00
Federico Rojas ce8d745cca Update all files to new build version. To 3024.11 and 3024.32 2022-08-16 15:29:05 +02:00
SCooper 387a662d19 include TMC and TPY, remove axes from test 2022-07-27 15:34:28 +01:00
SCooper 2bdf9e786b Read parameter added to OOP implementation. Visu parameter reads fixed to reference GVL not afbaxes. Text list support added for parameters to allow combo box selection on Visu rather than typing in number 2022-07-27 12:28:33 +01:00
SCooper 7020a23a83 new status methods added for done, busy, error, cmdAborted. MoveVelocity added 2022-07-08 11:33:32 +01:00
Cooper 976ef8dedc OOP implementation of FB_Axis created with basic functionality 2022-07-07 14:36:10 +01:00
Cooper 598918bbab move v2 slit code to tc_mca submodule and delete IO and NC axes from testing 2022-06-01 09:04:46 +01:00
SCooper 54ca280288 FB_SlitPairV2 implemented 2022-04-11 16:01:40 +01:00
SCooper 7d007f9249 WIP new slit code 2022-04-11 14:47:46 +01:00
Federico Rojas 8c95fa90f4 Biuld solution with latest update of tc_mca_std_lib 2022-04-05 15:10:16 +02:00
federicorojas 3eec9b48d0 Comment the templates call for pneumatics and application in MAIN/PROG 2022-02-04 13:56:40 +01:00
Federico Rojas dba7a2e728 Rebiuld solution with new changes 2021-11-10 15:36:25 +01:00
Kristina Jurisic 8fe2a7d8a1 Update plc project after variable name change 2021-11-04 12:04:06 +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
Kristina Jurisic 6c6fb400c3 Code clean up in the FB_Pneumatics 2021-09-07 12:56:30 +02:00
SCooper cd33896c8e Remove ISIS test crate hardware to make branch hardware independent 2021-07-29 11:33:08 +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 4827ed4235 add hardware and functions for development with test crate 2021-07-23 12:03:59 +01:00
Kristina Jurisic ef6507744c Resolved merge conflicts 2021-06-28 10:21:47 +02:00
Kristina Jurisic 8fd5903dea Code clean up in FB_PneumaticAxis 2021-06-27 12:01:11 +02:00
Kristina Jurisic 7c4025ab16 Delete Pneumatic_Axis PROG 2021-06-15 13:50:14 +02:00
Kristina Jurisic 26265f62d3 Readd the Application_Template POU 2021-06-15 11:39:35 +02:00
Kristina Jurisic 6a91fcb121 Compile solution with latest code changes 2021-06-15 11:17:51 +02:00
Kristina Jurisic 75e8a301f8 Fix broken branch thus a crash, commiting old changes 2021-06-15 11:05:53 +02:00
Federico Rojas 0d193957ac Update tc_mca_std_lib to latest commit 2021-06-10 16:45:56 +02:00
Kristina Jurisic 330fc0c878 Add changes for the pneumatic axis 
Added FB and a program for the pneumatic axis.
 2021-05-04 13:00:29 +02:00
Federico Rojas 8ad900e534 Add tc_project_app as an independent project file and activate auto priroty manager for tasks 2021-02-19 12:05:24 +01:00
Federico Rojas 440717aadc Update Tc2_Mc2 library to version 3.3.41.0 2021-02-19 11:34:19 +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
Torsten Bögershausen 1f619fefe4 Change to TwinCAT 4024.12 2020-11-16 09:19:28 +01:00
Luke Nisbet b9b5d3eb95 Merge branch 'master' into MBP-149-delete-changeconfig 2020-06-23 10:13:11 +01:00
kleines de92272d7a Merged master into MBP-116 
Merge remote-tracking branch 'origin/master' into MBP-116-motion-function-blocks-outputs
 2020-06-04 18:07:14 +02:00
kleines 7724dbee1a did changes according Federicos comments to the pull request. Added code 
from MBP-100.
 2020-06-02 17:03:28 +02:00
Luke Nisbet b95a3437aa Removed Deleted Files From The Submodule 2020-05-15 10:38:20 +01:00
kleines 27b8606f25 Merge remote-tracking branch 'origin/master' into MBP-116-motion-function-blocks-outputs 2020-05-05 20:45:03 +02:00
kleines e2321a2b9c added new homing code from MBP-131 2020-05-05 17:26:10 +02:00
Luke Nisbet 00e087b54b Merge branch 'master' into mbp-100-read-write-axis-parameters 2020-04-27 15:16:01 +01: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
kleines 8caafdc53c Initial commit 2020-04-20 14:42:36 +02:00
Luke Nisbet 91145db1b6 Merge branch 'master' into mbp-100-read-write-axis-parameters 2020-04-06 18:04:10 +01:00
Luke Nisbet dfb809b53d Commit for merge 2020-04-06 17:21:03 +01:00