berti_r/Motion_test
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
548 Commits 1 Branch 0 Tags
3d3d3aebfbc486277ac80acfb448f32397e67c3d
Commit Graph

548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torsten Bögershausen
3d3d3aebfb Ignore LineIDs.dbg 2022-10-17 10:13:03 +02:00
Federico Rojas
0f741497d1 Updatepointer to OOP std_lib version 2022-10-04 17:17:55 +02:00
Federico Rojas
e79eb244d1 Merged in MBP-226-fb-getdeviceidentification-obsolete (pull request #68) 
Replace obsolete FB_GetDeviceIdentification for FB_GetDeviceIdentificationEx
 2022-10-04 14:25:16 +00:00
Federico Rojas
ba6c691646 Replace obsolete FB_GetDeviceIdentification for FB_GetDeviceIdentificationEx 2022-09-19 14:44:26 +02:00
Federico Rojas
9b4fc9f313 Merged in MBP-202_NewSlitCode (pull request #65) 
MBP-202 NewSlitCode
 2022-08-25 09:25:06 +00: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
baa181d99a Merged in federicor/rename-relocate-ess-monitoring-files (pull request #66) 
Build solution with new name and location of ess monitoring files

Approved-by: Torsten Bögershausen
 2022-08-19 11:23:49 +00: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
5172e3150b Merged in MBP-225-update-version-control-pipeline (pull request #64) 
Update all files to new build version. To 3024.11 and 3024.32
 2022-08-17 12:25:25 +00: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
Torsten Bögershausen
87b8b64fb7 Merged in MBP-223-remove-lineids-from-twincat-sour (pull request #63) 
Ignore LineIDs.dbg

Approved-by: Federico Rojas
 2022-08-17 12:03:45 +00:00
Federico Rojas
d5d18d5b5d Merge remote-tracking branch 'origin/master' into MBP-223-remove-lineids-from-twincat-sour 2022-08-17 14:03:00 +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
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
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