Commit Graph

586 Commits

Author SHA1 Message Date
Federico Rojas
35a43cb4b9 Update pointer to latest version of tc_mca_std_lib 2022-07-21 10:00:48 +02:00
Federico Rojas
014de5a579 Update pointer to latest version of tc_mca_std_lib 2022-07-21 09:56:42 +02:00
Torsten Bögershausen
7da57bc5e3 Ignore LineIDs.dbg
Ignore LineIDs.dbg, which is needed internally to keep track of
source code lines where a breakpoint can be set
2022-07-18 15:24:51 +02:00
SCooper
0033d95627 Error IDs propragating through 2022-07-13 15:19:46 +01:00
SCooper
f0dff8ea56 multi gearing logic improved. Status logic changed to array of pointers for easier scaling. Homing added 2022-07-13 11:30:28 +01:00
SCooper
0808f6c41b Gear in and gear out implemented 2022-07-08 15:00:47 +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
luke.nisbet
2a288d8d21 Merged in MBP-166-Remove-Config-From-gitignore (pull request #62)
Removed _Config/NC/Axes and _Config/IO from .gitignore

Approved-by: Federico Rojas
2022-07-06 08:38:56 +00:00
LNisbet
57297e54c4 Removed _Config/NC/Axes and _Config/IO from .gitignore 2022-07-05 14:59:24 +01:00
Cooper
010f31886d point to latest tc_mca commit 2022-06-01 11:01:36 +01:00
Cooper
2166eb14b7 fix to whitespace damage 2022-06-01 11:00:45 +01:00
Cooper
31d836f8d9 clean up of whitespace and test hardware 2022-06-01 10:43:51 +01:00
Cooper
51b3029691 Revert GVL_APP axis count to 0 2022-06-01 09:10: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
037218b267 Homing 'fixed' on state machine 2022-04-12 15:13:01 +01:00
SCooper
2b41f3aa4b Fixed an issue with setpoint generators not enabling when a limit is pressed 2022-04-12 11:14:11 +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
federicorojas
bb62c2b55f Relocate Pneumatics_Template() PROG to be under Axes Folder 2022-02-04 13:44:15 +01:00
Federico Rojas
58aca048b2 Update tc_mca_Std_lib submodule pointer 2022-01-18 10:58:32 +01:00
Kristina Jurisic
c15278fbbb Merged in MBP-105-control-of-pneumatic-actuators (pull request #57)
MBP-105 control of pneumatic actuators

Approved-by: Federico Rojas
2021-11-10 14:39:01 +00:00
Federico Rojas
c9db4970f2 Merge remote-tracking branch 'origin/master' into MBP-105-control-of-pneumatic-actuators 2021-11-10 15:37:17 +01:00
Federico Rojas
dba7a2e728 Rebiuld solution with new changes 2021-11-10 15:36:25 +01:00
Federico Rojas
78d6708762 Delete testing comments and put them to pull request 2021-11-10 15:35:58 +01:00
Federico Rojas
04b8be52f7 update submodule pointer 2021-11-10 15:35:11 +01:00
Federico Rojas
e97ca48e43 update submodule pointer 2021-11-10 15:26:00 +01:00
Simon Cooper
119cb87cb7 Merged in MBP-189_FB_SlitPairBug (pull request #61)
MBP-189 FB SlitPairBug

Approved-by: Federico Rojas
2021-11-10 14:12:05 +00:00
Kristina Jurisic
fb07d21219 Update pneumatics FB in mca_std_lib 2021-11-04 12:05:12 +01:00
Kristina Jurisic
8fe2a7d8a1 Update plc project after variable name change 2021-11-04 12:04:06 +01:00
Kristina Jurisic
1b8ad61f58 Change pneumatic axis constant to 0 in the GVLs 2021-11-04 12:01:51 +01:00
Kristina Jurisic
1ca80e7e2b Pneumatic axis FB update, change variable names 2021-11-04 12:01:01 +01:00
Cooper
7ec94571f3 File versions fixed 2021-11-02 09:34:15 +00:00
Cooper
4685e124c5 White space cleanup. Add bResetting to FB_SlitPair to allow reset commands to function 2021-11-02 09:28:51 +00:00
Cooper
e20b162703 Add new state to FB_SlitPair to clear the calibration flag of the virtual axes 2021-11-02 08:41:56 +00:00
Kristina Jurisic
3698d6c1ea Add code changes from tc_mca_std_lib 2021-11-01 12:55:25 +01:00
Kristina Jurisic
994b2a4358 Create variable hmiPneumaticAxis for Pneumatic VISU 2021-11-01 12:54:49 +01:00
Kristina Jurisic
a502e2275b Set pneumatic axis to 1 2021-11-01 12:53:52 +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
a2afeeb99e Change pneumatic axis number in GVL_APP to 0 and build 2021-11-01 10:22:39 +01:00
Kristina Jurisic
fdf5921942 Update for the mca_std_lib after solving GVLs errors 2021-10-27 11:39:44 +02:00
Federico Rojas
413b965db4 Merged in MBP-188-delete-suuply-output-from-main (pull request #59)
Update tc_mca_std_lib pointer

Approved-by: Simon Cooper
2021-09-21 13:25:13 +00:00
Federico Rojas
bcd7c497b3 Add comments to Axis_template and remove supply outputs from MAIN 2021-09-21 15:18:09 +02:00
Federico Rojas
d487177dc0 Merged master into MBP-188-delete-suuply-output-from-main 2021-09-21 13:06:30 +00:00
federicorojas
763f810c74 Update tc_mca_std_lib pointer 2021-09-21 14:41:33 +02:00
Simon Cooper
a3df820dbe Merged in MBP-107_SlitFB (pull request #60)
MBP-107 SlitFB

Approved-by: Federico Rojas
2021-09-21 12:33:05 +00:00
federicorojas
91e5e592a0 Update submodule pointer 2021-09-21 14:32:16 +02:00
Federico Rojas
38f43aa00c Merged master into MBP-188-delete-suuply-output-from-main 2021-09-21 12:16:19 +00:00