Commit Graph

622 Commits

Author SHA1 Message Date
Federico Rojas
fbdffde633 Give file execute permission git update-index --chmod=+x *.sh 2023-02-06 09:12:49 +01:00
Federico Rojas
3055a49972 Re-run the filters 2023-02-03 16:10:50 +01:00
Federico Rojas
9748047085 Add files and configuration for filters
Changes to be committed:
    modified:   .gitattributes
    modified:   bitbucket-pipelines.yml
    new file:   filter/cleanCode.sed
    new file:   filter/gitconfig
    new file:   filter/ignoreTargetNetId.sed
2023-02-03 16:09:09 +01:00
Federico Rojas
72fa809ac4 Add two pipeline checks
Add file check_code_before_sq_brackets.sh
Add file check_no_lineids.sh
2023-02-03 15:30:11 +01:00
Harald Kleines
7819f72260 Merged in MBP-237-bug-bdone-stays-true-in_MC_MoveVelocity (pull request #74)
MBP-237 bug bdone stays true in MC MoveVelocity

Approved-by: Federico Rojas
2023-02-03 14:13:07 +00:00
Federico Rojas
886c7e387f Revert uncessary change in solution.sln. Vidaul studio version 2023-02-03 15:09:39 +01:00
Federico Rojas
076d304f60 Merge remote-tracking branch 'origin/master' into MBP-237-bug-bdone-stays-true-in_MC_MoveVelocity 2023-02-03 15:02:18 +01:00
Federico Rojas
98dcca4a07 Update pointer to latest commit of mca_std_lib 009c6 2023-02-03 11:28:28 +01:00
Federico Rojas
e35748d5d5 .gitignore edited to delete double ignore of LineIDs.dbg 2023-02-01 08:28:14 +00:00
kleines
934bca647b Added changes to mc_std_lib 2022-11-16 17:57:58 +01:00
kleines
82f75d9d6a added bInvelocity to VISU 2022-11-16 14:14:28 +01:00
Federico Rojas
2e773b36a5 Update submodule pointer tc_mca_std_lib to commit da32442 2022-11-09 13:11:26 +01:00
Federico Rojas
d025ddd365 Merged in MBP-221-add-restore-position-bias (pull request #69)
MBP-221 add restore position bias

Approved-by: Simon Cooper
2022-11-01 13:24:34 +00:00
Federico Rojas
aa67924650 Add example to configure retore position of an axis in Axis_Template 2022-11-01 14:23:16 +01:00
Federico Rojas
834336a773 Update pointer of tc_mca_std_lib to commit 28617c 2022-11-01 13:51:59 +01:00
Federico Rojas
df85fad7a2 Format IF statements with jump line each condition 2022-11-01 13:43:36 +01:00
Federico Rojas
8b085864be Update tc_mca_std_lib pointer to latest commit 28617c2 2022-11-01 13:34:26 +01:00
Federico Rojas
1668a2c734 Merged in MBP-217-add-fFastDecel-variable (pull request #73)
Update tc_mca_std_lib pointer
2022-10-25 14:20:58 +00:00
Federico Rojas
18dceb1d00 Merge remote-tracking branch 'origin/master' into MBP-217-add-fFastDecel-variable 2022-10-25 16:19:57 +02:00
Federico Rojas
accf56f08e Update tc_mca_std_lib pointer to commit 4636615 2022-10-25 16:11:32 +02:00
Federico Rojas
2fd69d7585 Merged in MBP-148-remove-single-master-coupling (pull request #71)
MBP-148 remove single master coupling

Approved-by: Simon Cooper
2022-10-24 13:20:06 +00:00
Federico Rojas
02f22528fc Merge remote-tracking branch 'origin/master' into MBP-148-remove-single-master-coupling 2022-10-24 15:18:59 +02:00
Federico Rojas
1009f6e4e7 Update tc_mca_std_lib pointer 2022-10-24 15:15:56 +02:00
Federico Rojas
f628c7679e Merged in MBP-210-add-in-target-pos-status (pull request #72)
Update tc_mca_std_lib pointer

Approved-by: Simon Cooper
2022-10-24 13:03:40 +00:00
Federico Rojas
63e6af01d2 Update tc_mca_std_lib pointer 2022-10-24 15:03:01 +02:00
Federico Rojas
bd4538b2c5 Update tc_mca_std_lib pointer 2022-10-21 15:10:43 +02:00
Federico Rojas
5393edea74 Update tc_mca_std_lib pointer 2022-10-21 14:30:31 +02:00
Federico Rojas
7caeacaed4 Update tc_mca_std_lib pointer for new commits 2022-10-21 13:59:13 +02:00
Federico Rojas
5544826ae3 Buils solution with pinned version 4032 2022-10-21 13:58:21 +02:00
Federico Rojas
c3d6aa05f9 Merged in MBP-212-remove-jog-function (pull request #70)
Update pointer for tc_mca_std_lib
2022-10-21 07:40:58 +00:00
Federico Rojas
cc476b48a2 Update tc_mca_std_lib pointer 2022-10-21 09:34:28 +02:00
Federico Rojas
695ea97bb4 Update tc_mca_Std_lib pointer 2022-10-21 09:32:25 +02:00
Federico Rojas
c4d865edc1 Optimize code for executing postiong restoring 2022-10-21 09:16:24 +02:00
Federico Rojas
2849607a1f Update pointer for tc_mca_std_lib 2022-10-19 14:48:52 +02:00
Federico Rojas
deae8bbb73 update tc_mca_std_lib pointer to commit 41d4f1f 2022-10-17 11:25:44 +02:00
Federico Rojas
1213f608e2 Merge branch 'master' of https://bitbucket.org/europeanspallationsource/tc_generic_structure 2022-10-17 11:23:40 +02:00
Federico Rojas
a3be1ea7f8 Merged master into MBP-221-add-restore-position-bias 2022-10-17 08:33:25 +00:00
Federico Rojas
a033926254 Merged in MBP-198_OOP (pull request #67)
MBP-198 OOP

Approved-by: Torsten Bögershausen
2022-10-17 08:31:36 +00:00
Torsten Bögershausen
99f89c3bc8 OOP: Introduce interfaces for application specific code
Add interfaces for application-specific
(or non application specific) code execution per axis.

Add an array of interfaces and call them.
Changes to be committed:
    modified:   solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU
    modified:   solution/tc_project_app/POUs/MAIN.TcPOU
    modified:   solution/tc_project_app/Visualization Manager.TcVMO
    modified:   solution/tc_project_app/tc_project_app.plcproj
2022-10-17 10:22:46 +02:00
Torsten Bögershausen
c026a0bc6c Fix OPC attributes in GVL_APP.TcGVL 2022-10-17 10:22:10 +02:00
Torsten Bögershausen
e7a5394c02 update TwinCAT version in solution/_Config/NC/NC.xti 2022-10-17 10:20:42 +02:00
Torsten Bögershausen
7eda64fa5f Summary :twincat_version_manager.py: Check .xti files for correct version 2022-10-17 10:20:06 +02:00
Torsten Bögershausen
df503583e1 Remove LineIDs from files 2022-10-17 10:14:55 +02:00
Torsten Bögershausen
3d3d3aebfb Ignore LineIDs.dbg 2022-10-17 10:13:03 +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
2d5075390a Update tc_mca_Std_lib pointer after OOP merge 2022-10-14 14:42:52 +02:00
Federico Rojas
c8a3bd3619 Restore files that have nothing to do with the MBP_OOP ticket 2022-10-14 13:51:44 +02:00
Federico Rojas
0aa2f1745c Update pointer to newest verison of tc_mca_std_lib 2022-10-06 12:55:33 +02:00