Commit Graph

438 Commits

Author SHA1 Message Date
Federico Rojas
0f741497d1 Updatepointer to OOP std_lib version 2022-10-04 17:17:55 +02:00
Federico Rojas
ba6c691646 Replace obsolete FB_GetDeviceIdentification for FB_GetDeviceIdentificationEx 2022-09-19 14:44:26 +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
505c96cc8e Merge 'origin/master' into MBP-225-update-version-control-pipeline
Conflicts:
	solution/tc_project_app/tc_mca_std_lib
2022-08-17 14:20:05 +02:00
Federico Rojas
1fea6ede0e Build solution in version 4024.32 and update pointer of tc_mca_std_lib 2022-08-17 14:01:41 +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
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
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
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
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
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
bcd7c497b3 Add comments to Axis_template and remove supply outputs from MAIN 2021-09-21 15:18:09 +02: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
SCooper
29901054b7 Look at local system 2021-09-21 13:01:36 +01:00
SCooper
298c54c67f mcaStdLib update for multimaster gear snyc mode 2021-09-21 12:55:25 +01:00
Federico Rojas
7f388acd8c Update tc_mca_std_lib pointer 2021-09-14 10:44:37 +02:00
Kristina Jurisic
1ecfa38fbb Update tc_mca_std module 2021-09-13 07:50:10 +02:00
Kristina Jurisic
6c6fb400c3 Code clean up in the FB_Pneumatics 2021-09-07 12:56:30 +02:00
Kristina Jurisic
d3c8d1451d Update in the tc_mca_std_lib module 2021-09-07 12:55:51 +02:00
Kristina Jurisic
9d5458dd7a Change variable names according to naming standard 2021-09-07 12:54:57 +02:00