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

567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Federico Rojas
0aa2f1745c Update pointer to newest verison of tc_mca_std_lib 2022-10-06 12:55:33 +02:00
Federico Rojas
dc531c102f Recompile files without LineIDs 2022-10-06 11:16:02 +02:00
Federico Rojas
a13f780a6d Add git ignore for the LineIDs.dbg file 2022-10-06 10:57:56 +02:00
Federico Rojas
bbf233a637 Merge branch 'origin/master' into MBP-198_OOP 
Conflicts:
	solution/_Config/PLC/tc_project_app.xti
 2022-10-06 10:38:10 +02:00
Federico Rojas
0f741497d1 Updatepointer to OOP std_lib version 2022-10-04 17:17:55 +02:00
Federico Rojas
99a3efce66 Add FB_CustomAxis example and update pointer 2022-10-04 17:11:37 +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
33c2c06338 Test: Delete redundancy in linking FB and interfaces in AXES() 2022-09-30 16:07:16 +02:00
Federico Rojas
ba6c691646 Replace obsolete FB_GetDeviceIdentification for FB_GetDeviceIdentificationEx 2022-09-19 14:44:26 +02:00
Federico Rojas
0d6a9e255a Delete file tc_project_app.tmcRefac 2022-08-25 13:18:31 +02:00
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
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
Cooper
c4bdac87e8 Code refactor to meeting coding standards 2022-08-15 15:20:29 +01:00
SCooper
60700b1d46 Swap AXES and PROG execution order, allow logic to execute and send commands on the same cycle 2022-07-29 14:26:18 +01:00
SCooper
15bc90833a Update tc_mca_std_lib 2022-07-27 15:37:44 +01:00
SCooper
387a662d19 include TMC and TPY, remove axes from test 2022-07-27 15:34:28 +01:00
SCooper
2222e7539e refactoring to clean up whitespace 2022-07-27 15:25:53 +01:00
SCooper
37b8f7490c Write parameter implemented 2022-07-27 14:39:02 +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
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