014cc8d807
Chenge variable and references of axesPersistent to aAxesPersistent
2020-03-17 16:18:38 +01:00
cfc3b146f8
Fix calling of FB's as define in the coding standards in Homing directory
2020-03-17 16:17:30 +01:00
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
56929e3be1
Fix all references from the chages DUT's in the FB's and POU's
2020-03-17 14:34:44 +01:00
68498ae44f
Delete local variable i in MAIN and substitute it with GVL.iAxis
2020-03-17 13:33:21 +01:00
9561494a7d
Revert change from nAXIS_NUM to nAxisNum, it is not a constant
2020-03-17 11:27:21 +01:00
6c9885ee54
Change to coding standards all variables in MAIN and their references
2020-03-11 13:30:47 +01:00
456f791f56
change nAxisNum constant to nAXIS_NUM in GVL.APP and their references
2020-03-11 13:07:28 +01:00
c504ae6ea3
change axisNum to nAxisNum in GVL.APP and their references
2020-03-11 13:01:52 +01:00
5dfc715221
merge MBP-119
2020-03-11 12:47:59 +01:00
8fe64ab461
Update the pointer to latest commit of master branch of tc_mca_std_lib
2020-03-04 17:29:54 +01:00
ed55d3823a
changed enums to coding conventions
2020-03-04 17:23:20 +01:00
ebe450b3a5
Delete PlcTaskCom task from SYSTEM/TASKS
2020-03-04 16:35:32 +01:00
663f983a01
Change TC2_MC version to 3.3.28.0 and added Reference TcUnit
2020-03-04 16:28:10 +01:00
6931409b83
Remove again Hardware directory from solution tree
2020-03-04 16:18:21 +01:00
b03486cf6d
Delete Error Handling and Hardware directories from the solution tree
2020-03-04 16:09:28 +01:00
1f3a874736
Prepare branch for merging into master
2020-03-04 14:38:46 +00:00
14b9793ff2
Merge remote-tracking branch 'origin/integration' into MBP-139-clean-the-git-repo
2020-03-04 15:16:25 +01:00
f44a0283fd
Fixed typo in tc_project_app.plcproj
2020-03-04 14:13:30 +00:00
c4a825340d
resolved merge conflicts
2020-03-04 13:59:35 +00:00
a79e447496
Resolved merging conflicts
2020-03-04 14:44:23 +01:00
345b0cf56b
Removed submodule epicscommodule
2020-03-04 13:32:41 +00:00
ca85a0c07b
Removed epicscommmodule from solution
2020-03-04 13:28:51 +00:00
e8e944b812
Removed incorrectly added PLC task
2020-03-04 13:03:25 +00:00
27e8814a66
added descriptive substructure to axes struct in std_lib
2020-03-04 13:00:17 +01:00
dcc427cab9
Cleaned up axis files
2020-03-04 11:12:07 +00:00
c8602c8eb7
Resolved merge conflicts
2020-03-04 11:05:47 +00:00
b984376f15
resolved merge conflicts
2020-03-04 10:59:33 +00:00
bb7af4fcdf
Updated after merge resolution
2020-03-04 10:09:51 +00:00
f22b6bfaa4
Merge branch 'integration' into MBP-120_add_tcUNIT_to_generic_structure
2020-03-04 10:06:10 +00:00
71da3cce15
Updated submodule
2020-03-02 17:12:31 +00:00
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
597881796f
Update submodule
2020-03-02 16:35:29 +00:00
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
f42a22cbe0
deleted uncommented code in GVL_APP
2020-03-02 17:31:50 +01:00
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
aaea8a67a3
Update submodule
2020-03-02 16:29:07 +00:00
e29e5a6fd0
Delete the directories with all the error handling files. New tree structure
2020-03-02 16:16:30 +01:00
9e3a609823
Add commits in tc_mca_std_lib for deleting all the error handling files
2020-03-02 16:08:34 +01:00
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
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
18125e42ba
Added test for LREAL assert using tcUNIT helper methods
2020-02-19 15:46:14 +00:00
c6f051cc61
Used script to fix 'whitespace damage'
2020-02-19 15:11:53 +00:00
9c985be4ef
Attempt to fix whitespace damage
2020-02-19 14:58:39 +00:00
741d03da8d
Test suite and examples for tc_mca_std_lib solution
2020-02-19 14:54:14 +00:00
1855a0ad58
Reolved merge conflicts
2020-02-17 13:29:12 +00:00
51464ddd87
Fix whitespace damage
2020-02-12 12:12:10 +01:00
8433721ea4
Add check in MAIN.RESTOR_POSITIONS
...
Add check when resetting bRestoreOnStartup flag to only reset
if the UPS is OK. Otherwise during a power loss it is set and then reset before
getting to the end of the PLC cycle.
This was a result of moving some code that was previously in MAIN to an ACT
and the RETURN command does not work the same. I believe it only returns
from the current act and not the whole code. Originally it was supposed to
prevent the rest of the code from executing in the event of a power failure but
this is no longer the case.
2020-02-12 11:56:26 +01:00
06fff58f08
MAIN.TcPOU: Save with TC version 3.1.4024.0
2020-02-10 10:58:35 +01:00
de53c24b15
solution.tsproj: Remove the 2 axes, commit with TC 3.1.4024.0
2020-02-10 10:53:57 +01:00
Federico Rojas