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

125 Commits

Author SHA1 Message Date
Federico Rojas
df85fad7a2 Format IF statements with jump line each condition 2022-11-01 13:43:36 +01:00
Federico Rojas
c4d865edc1 Optimize code for executing postiong restoring 2022-10-21 09:16:24 +02:00
Federico Rojas
3335971d3f Refactoring code with new variable name fEncoderBiasAtShutdown 2022-10-14 16:08:27 +02:00
Federico Rojas
0350afac73 Merge remote-tracking branch 'origin/MBP-198_OOP' into MBP-221-add-restore-position-bias 
# Conflicts:
#	solution/tc_project_app/tc_mca_std_lib
 2022-10-14 15:55:30 +02:00
Federico Rojas
3c0a37a0e7 Format notes and correct indentation to MAIN.RESTORE_POSITION() 
Format the comments about the reference system types
Correct wierd identation
Fix Format of if evaluation of boolean variables withouth the "= True or = False"
 2022-10-14 15:11:03 +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
99a3efce66 Add FB_CustomAxis example and update pointer 2022-10-04 17:11:37 +02:00
Federico Rojas
33c2c06338 Test: Delete redundancy in linking FB and interfaces in AXES() 2022-09-30 16:07:16 +02:00
Federico Rojas
054a460e8d Build solution with new code and new commits form tc_mca_std_lib 2022-09-27 16:54:04 +02:00
Federico Rojas
1b57b2e04c Add code to read. store and restore the encoder position BIAS in case of power failure 2022-09-27 16:50:37 +02:00
Federico Rojas
ba6c691646 Replace obsolete FB_GetDeviceIdentification for FB_GetDeviceIdentificationEx 2022-09-19 14:44:26 +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
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
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
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
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
Cooper
976ef8dedc OOP implementation of FB_Axis created with basic functionality 2022-07-07 14:36:10 +01:00
Cooper
31d836f8d9 clean up of whitespace and test hardware 2022-06-01 10:43:51 +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
federicorojas
3eec9b48d0 Comment the templates call for pneumatics and application in MAIN/PROG 2022-02-04 13:56:40 +01:00
Kristina Jurisic
994b2a4358 Create variable hmiPneumaticAxis for Pneumatic VISU 2021-11-01 12:54:49 +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
SCooper
cd33896c8e Remove ISIS test crate hardware to make branch hardware independent 2021-07-29 11:33:08 +01:00
SCooper
cc7d2233a7 re add axis and application templates 2021-07-29 11:23:29 +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
6a79f654f1 Add test program for implementing slit set, add hardware for testing slit set implementation. Update solution to point at new tc_mca_Std_lib files 2021-07-27 09:22:14 +01:00
SCooper
4827ed4235 add hardware and functions for development with test crate 2021-07-23 12:03:59 +01:00
Kristina Jurisic
21cb8a5430 Made hmiPneumaticAxisvariable to use for PneumaticsVisu 2021-06-27 11:58:48 +02:00
Kristina Jurisic
f2608e4812 Fix white space damage 2021-06-15 15:19:58 +02:00
Kristina Jurisic
1659537b9e Add array of FB_PneumaticAxis 2021-06-15 13:43:01 +02:00
Kristina Jurisic
0e81f9b28c Change TwinCAT version 
Changed version from 3.1.4024.6 to 3.1.4024.5
 2021-05-18 13:11:51 +02:00
Kristina Jurisic
f30542ed8e Add call for a pneumatic FB from Main 
Added program call for the pneumatic axis FB from Main PROG().
 2021-05-04 13:05:44 +02:00
Federico Rojas
4bdb673424 Fix white space damage and update std_lib pointer 2021-01-25 13:45:36 +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
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
Federico Rojas
cf3c760290 Delete the action PROG() from the solution 2020-12-09 15:18:00 +01:00
Torsten Bögershausen
bdefd8a969 Update to TwinCAT TC31-Full-Setup.3.1.4024.11 
Update to TwinCAT TC31-Full-Setup.3.1.4024.11
Note: we see  ProductVersion=3.1.4024.5
 2020-11-11 11:40:48 +01:00
Paul Barron
69b0036ff0 Remove spaces to conform to standard 
No code change
 2020-06-26 10:46:52 +02:00
Paul Barron
6b96fe55be Update to latest commit of tc_mca_std_lib 2020-06-26 10:29:36 +02:00
Paul Barron
3b2cdd91b2 Add hardware, plc and links using Simon's C# tool 2020-06-10 12:25:16 +02:00
Paul Barron
29b9b5e959 Comment out bOutputs 2020-04-24 10:54:17 +02: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
Federico Rojas
48dafb43a4 Change GVL_APP.nAxisNum to GVL_APP.nAXIS_NUM because it is a constant 2020-04-03 15:14:25 +02:00