Commit Graph

640 Commits

Author SHA1 Message Date
Federico Rojas
a5f31e0808 Merged in MBP-233-motor-temperature-monitoring (pull request #81)
MBP-233 motor temperature monitoring

Approved-by: Torsten Bögershausen
2023-06-21 12:47:57 +00:00
Federico Rojas
4fef6dadce Merge remote-tracking branch 'origin/master' into MBP-233-motor-temperature-monitoring 2023-06-21 11:55:17 +02:00
Federico Rojas
95f4d396f7 Merged in MBP-193-freeze-compile-and-libs-versions (pull request #77)
Set 3.4024 as set compiler version of the solution

Approved-by: Torsten Bögershausen
2023-06-21 09:49:57 +00:00
Federico Rojas
3379fec945 Merged in federicor/update-std-lib-to-version-210 (pull request #80)
Update tc_mca_std_lib to v2.1.0

Approved-by: Torsten Bögershausen
2023-06-20 14:11:40 +00:00
Federico Rojas
b191deb396 Merge branch 'MBP-233-motor-temperature-monitoring' of https://bitbucket.org/europeanspallationsource/tc_generic_structure into MBP-233-motor-temperature-monitoring 2023-06-20 15:17:11 +02:00
Federico Rojas
41596ae954 Update std_lib pointer 2023-06-20 15:15:17 +02:00
Federico Rojas
dde1edb0db Update tc_mca_std_lib to v2.1.0 2023-06-20 15:01:26 +02:00
Federico Rojas
9383b2526a update std_lib pointer to v1.2.0 2023-05-26 13:39:32 +02:00
Federico Rojas
71fc3c10c2 Update submodule pointer to latest commit d76537 2023-05-08 10:22:26 +02:00
Federico Rojas
5965d5100c Update pointer to tc_mca_Std_liv v2.0.2 2023-05-04 09:58:28 +02:00
Federico Rojas
c40eccd1ae Add FB_AxisTemperature.TcPOU to the solution tree and update submodule pointer 2023-03-03 09:37:16 +01:00
Torsten Bögershausen
48fdb7f078 Merged in MBP-246-explaining-git-filter (pull request #79)
.gitattribute: Cleanup the help for the filter

Approved-by: Federico Rojas
2023-02-14 13:46:16 +00:00
Torsten Bögershausen
1727999f55 .gitattribute: Cleanup the help for the filter
The initial filter setup procedure was not very clear.
Clean it up by removing a not used line.
Make clear that a command must be executed rather than commenting
out lines.
2023-02-14 12:19:39 +01:00
Federico Rojas
e5b08abedb Merged in MBP-245-remove-opc-tags (pull request #76)
Remove comments containing OPC tags

Approved-by: Kristina Jurisic
2023-02-09 12:38:29 +00:00
Federico Rojas
d5d1b516b3 update pointer of tc_mca_std_lib to commit 4a3ecc5 2023-02-09 13:37:28 +01:00
Federico Rojas
66c3eca7a9 Set 3.4024 as set compiler version of the solution and freeze motion libraries 2023-02-06 13:58:35 +01:00
Federico Rojas
3b53e6616b Remove comments containing OPC tags
modified:   solution/tc_project_app/GVLs/GVL_APP.TcGVL
modified:   solution/tc_project_app/tc_mca_std_lib
2023-02-06 13:36:18 +01:00
Federico Rojas
00edb061d8 Merged in federicor/add-check-to-pipeline (pull request #75)
Federicor/add check to pipeline

Approved-by: Torsten Bögershausen
2023-02-06 08:35:15 +00:00
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