berti_r/Motion_test
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
586 Commits 1 Branch 0 Tags
df85fad7a270e1663e817dbedecc87f76648dfae
Commit Graph

586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
[Luke Nisbet]
aeb84c2a7a Ticket READY FOR REVIEW 
The functionality is esentially thhe same as the lasat commit
but it has now been changed to fit into the current framework
a little better by making fbWriteParameters only run when called.
 2020-03-04 09:52:22 +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
Paul Barron
51464ddd87 Fix whitespace damage 2020-02-12 12:12:10 +01:00
Paul Barron
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
Torsten Bögershausen
06fff58f08 MAIN.TcPOU: Save with TC version 3.1.4024.0 2020-02-10 10:58:35 +01:00
Torsten Bögershausen
de53c24b15 solution.tsproj: Remove the 2 axes, commit with TC 3.1.4024.0 2020-02-10 10:53:57 +01:00
Torsten Bögershausen
b914a2f62a Initial number of axes is 0 
Change axisNum in GVL_APP to 0
 2020-02-10 10:51:12 +01:00
Torsten Bögershausen
b522fe177e fix whitespace damage 2020-02-10 10:44:25 +01:00
Torsten Bögershausen
5c19425abc Partly ignore solution/_Config/ 
We need NC/nc.xti to be able to run the NC PLC task.
So don't ignore it.
But ignore all IO and Axes.
 2020-02-10 10:42:26 +01:00
Torsten Bögershausen
bcbc791fe1 Add solution/_Config/NC/NC.xti 
The NC.xti file is needed for the PLC NC task.
So we re-add it here.
 2020-02-10 10:39:51 +01:00
Simon-Cooper
1079229ffb ALLOW LOCAL SIMULATIONS TO BYBASS UPS CHECK 
Add CHECK_UPS action to house monitoring of the UPS global status
Modify RESTORE_POSITIONS state machine to remove numerical enumeration
usage
Add device identity functionblock to check whether local simulation or
CX
Add POSITION RECOVERY action to check device type and determine whether
to run
position restore and ups checking
Add solution/_Config/ folder to gitignore to remove NC and IO
 2020-02-07 10:17:46 +00:00
[Luke Nisbet]
bf64da273b Ticket compleated to original specification 
The code can read and write all possible PLC Open and Beckhoff
axis parameters it uses the MC_ReadParameter and MC_WriteParameter
function block within FB_Axis. Errors are passed out to the error
handling and it is possible to control it all through MainVisu.
 2020-02-06 13:38:32 +00:00
aaronlong
f0037bcaba Added std_lib unit tests 2019-12-24 11:36:25 +00:00
aaronlong
30c80940c7 Renamed tcUNIT folder to Test 2019-12-24 11:07:12 +00:00