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
kleines
41f6e1c95e
deleted uncommented code in GVL_APP
...
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 17:33:55 +01:00
kleines
f42a22cbe0
deleted uncommented code in GVL_APP
2020-03-02 17:31:50 +01:00
Dominic Oram
c12210b5f3
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:29:22 +00:00
Dominic Oram
aaea8a67a3
Update submodule
2020-03-02 16:29:07 +00:00
Federico Rojas
e29e5a6fd0
Delete the directories with all the error handling files. New tree structure
2020-03-02 16:16:30 +01:00
Federico Rojas
9e3a609823
Add commits in tc_mca_std_lib for deleting all the error handling files
2020-03-02 16:08:34 +01:00
Federico Rojas
a5fa028735
Delete all error handling from MAIN
...
Delete the action ERROR()
Delete all the variable section for Error Handling in MAIN
2020-03-02 16:07:10 +01:00
aaronlong
b8c4e3ff3f
Added tcUNIT libarary 1.0.0 references to resources and Test folder inc. app and common tests structure
2020-02-19 16:03:29 +00:00
aaronlong
18125e42ba
Added test for LREAL assert using tcUNIT helper methods
2020-02-19 15:46:14 +00:00
aaronlong
c6f051cc61
Used script to fix 'whitespace damage'
2020-02-19 15:11:53 +00:00
aaronlong
9c985be4ef
Attempt to fix whitespace damage
2020-02-19 14:58:39 +00:00
aaronlong
741d03da8d
Test suite and examples for tc_mca_std_lib solution
2020-02-19 14:54:14 +00:00
aaronlong
1855a0ad58
Reolved merge conflicts
2020-02-17 13:29:12 +00:00
Simon Cooper
44ec03e93c
Merged in MBP-132/SaveRestoreOnSimulatedPLCS (pull request #26 )
...
ALLOW LOCAL SIMULATIONS TO BYBASS UPS CHECK
2020-02-12 11:41:14 +00:00
