Federico Rojas
594d4cd208
Fix white space damage
2020-03-19 17:22:35 +01:00
Federico Rojas
9a0e70450f
Add enums and change refernces for Homing Routines and for Homing states in FB_Homing
2020-03-19 16:10:39 +01:00
Federico Rojas
da6253ae75
Add enum for Homing routines
2020-03-19 14:24:15 +01:00
Federico Rojas
f22ce8c6d0
Move VISU directory a level higher, directly under tc_mca_std_lib
2020-03-19 14:09:14 +01:00
Federico Rojas
b30a96abbe
Change all the files in the directory 'Test' to follow coding standards
2020-03-19 14:01:13 +01:00
Federico Rojas
c4c2fdc0f3
Changed FB_Axis and refernces to follow code standards
2020-03-18 17:05:52 +01:00
Federico Rojas
47199a6a16
Change all DUT's variable names and references after merge with MBP-138
2020-03-18 15:34:23 +01:00
Federico Rojas
e551fc826a
Add an 'e' at the beginning of all values of the enum E_MotionFunctions
2020-03-18 15:03:46 +01:00
Federico Rojas
ab723f139b
fix white space damage
2020-03-18 13:38:02 +01:00
Federico Rojas
014cc8d807
Chenge variable and references of axesPersistent to aAxesPersistent
2020-03-17 16:18:38 +01:00
Federico Rojas
cfc3b146f8
Fix calling of FB's as define in the coding standards in Homing directory
2020-03-17 16:17:30 +01:00
Federico Rojas
c99efebb07
Change GVL to follow our coding standards and update all the references in the FB's
2020-03-17 14:52:19 +01:00
Federico Rojas
56929e3be1
Fix all references from the chages DUT's in the FB's and POU's
2020-03-17 14:34:44 +01:00
Federico Rojas
68498ae44f
Delete local variable i in MAIN and substitute it with GVL.iAxis
2020-03-17 13:33:21 +01:00
Federico Rojas
9561494a7d
Revert change from nAXIS_NUM to nAxisNum, it is not a constant
2020-03-17 11:27:21 +01:00
Federico Rojas
6c9885ee54
Change to coding standards all variables in MAIN and their references
2020-03-11 13:30:47 +01:00
Federico Rojas
456f791f56
change nAxisNum constant to nAXIS_NUM in GVL.APP and their references
2020-03-11 13:07:28 +01:00
Federico Rojas
c504ae6ea3
change axisNum to nAxisNum in GVL.APP and their references
2020-03-11 13:01:52 +01:00
Federico Rojas
5dfc715221
merge MBP-119
2020-03-11 12:47:59 +01:00
Federico Rojas
c1d435bf9a
Merged in MBP-139-submodule-pointer-update (pull request #33 )
...
Update the pointer to latest commit of master branch of tc_mca_std_lib
Approved-by: Aaron James Long <aaron.long@stfc.ac.uk >
2020-03-04 16:36:04 +00:00
Federico Rojas
8fe64ab461
Update the pointer to latest commit of master branch of tc_mca_std_lib
2020-03-04 17:29:54 +01:00
kleines
ed55d3823a
changed enums to coding conventions
2020-03-04 17:23:20 +01:00
Aaron James Long
5c78e276cf
Merged in MBP-139-merge-integration-into-master (pull request #32 )
...
MBP-139 merge integration into master
2020-03-04 15:52:50 +00:00
Federico Rojas
ebe450b3a5
Delete PlcTaskCom task from SYSTEM/TASKS
2020-03-04 16:35:32 +01:00
Federico Rojas
663f983a01
Change TC2_MC version to 3.3.28.0 and added Reference TcUnit
2020-03-04 16:28:10 +01:00
Federico Rojas
6931409b83
Remove again Hardware directory from solution tree
2020-03-04 16:18:21 +01:00
Federico Rojas
b03486cf6d
Delete Error Handling and Hardware directories from the solution tree
2020-03-04 16:09:28 +01:00
aaronlong
1f3a874736
Prepare branch for merging into master
2020-03-04 14:38:46 +00:00
Aaron James Long
8338314652
Merged in MBP-139-clean-the-git-repo (pull request #31 )
...
MBP-139 clean the git repo
Approved-by: Federico Rojas <federico.rojas@esss.se >
2020-03-04 14:18:47 +00:00
Federico Rojas
14b9793ff2
Merge remote-tracking branch 'origin/integration' into MBP-139-clean-the-git-repo
2020-03-04 15:16:25 +01:00
Aaron James Long
f44a0283fd
Fixed typo in tc_project_app.plcproj
2020-03-04 14:13:30 +00:00
aaronlong
c4a825340d
resolved merge conflicts
2020-03-04 13:59:35 +00:00
Aaron James Long
6044949c93
Merged in MBP-122-automate-unit-testing-of-plc-code (pull request #30 )
...
MBP-122 automate unit testing of plc code
2020-03-04 13:46:11 +00:00
Torsten Bögershausen
68ee90e03e
Merged in MBP-129-check_fix_white_space-py---fix (pull request #19 )
...
MBP-129 check fix white space py fix
2020-03-04 13:44:50 +00:00
Federico Rojas
a79e447496
Resolved merging conflicts
2020-03-04 14:44:23 +01:00
aaronlong
345b0cf56b
Removed submodule epicscommodule
2020-03-04 13:32:41 +00:00
aaronlong
ca85a0c07b
Removed epicscommmodule from solution
2020-03-04 13:28:51 +00:00
aaronlong
e8e944b812
Removed incorrectly added PLC task
2020-03-04 13:03:25 +00:00
Aaron James Long
ad04362431
Merged in MBP-120_add_tcUNIT_to_generic_structure (pull request #27 )
...
Added tcUNIT libarary 1.0.0 references to resources and Test folder inc. app and common tests structure
Approved-by: Federico Rojas <federico.rojas@esss.se >
2020-03-04 12:13:39 +00:00
kleines
27e8814a66
added descriptive substructure to axes struct in std_lib
2020-03-04 13:00:17 +01:00
aaronlong
dcc427cab9
Cleaned up axis files
2020-03-04 11:12:07 +00:00
aaronlong
c8602c8eb7
Resolved merge conflicts
2020-03-04 11:05:47 +00:00
aaronlong
b984376f15
resolved merge conflicts
2020-03-04 10:59:33 +00:00
Dominic Oram
100a3c9741
Merge branch 'integration' into MBP-129-check_fix_white_space-py---fix
2020-03-04 10:24:53 +00:00
aaronlong
bb7af4fcdf
Updated after merge resolution
2020-03-04 10:09:51 +00:00
aaronlong
f22b6bfaa4
Merge branch 'integration' into MBP-120_add_tcUNIT_to_generic_structure
2020-03-04 10:06:10 +00:00
Dominic Oram
71da3cce15
Updated submodule
2020-03-02 17:12:31 +00:00
Dominic Oram
c39980d71b
Merged in MBP-136-clean-up-the-code (pull request #28 )
...
MBP-136 clean up the code
2020-03-02 17:07:43 +00:00
Dominic Oram
51354f0f10
Merge branch 'MBP-136-clean-up-the-code' of https://bitbucket.org/europeanspallationsource/tc_generic_structure into MBP-136-clean-up-the-code
2020-03-02 16:35:41 +00:00
Dominic Oram
597881796f
Update submodule
2020-03-02 16:35:29 +00:00
