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

254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
aaronlong
13dc7a0ba1 Revert "Added tcUNIT, including helper functions and app test folder, to generic structure" 
This reverts commit 7ee4fae5ad.

Should have been pushed to a branch for review first
 2019-12-24 10:11:14 +00:00
aaronlong
7ee4fae5ad Added tcUNIT, including helper functions and app test folder, to generic structure 2019-12-24 10:08:59 +00:00
Federico Rojas
d0201452f6 Merged in MBP-111-bug-error-4b07-immediately-after (pull request #25) 
Change TC2_MC library version to 3.3.28

Approved-by: Torsten Bögershausen <torsten.bogershausen@esss.se>
 2019-12-18 16:28:34 +00:00
Federico Rojas
04a298cfb6 Merged in MBP-59-remove-plctask1 (pull request #24) 
MBP-59 remove plctask1

Approved-by: Torsten Bögershausen <torsten.bogershausen@esss.se>
 2019-12-18 16:23:13 +00:00
Federico Rojas
6e0735106d Change PLCtask cycle time to 10ms 2019-12-18 17:19:00 +01:00
Federico Rojas
0532cb9214 Remove PLCTask1 from solution 2019-12-18 17:16:49 +01:00
Federico Rojas
91b18c6e73 Change TC2_MC library version to 3.3.28 
No jogging error with this library version
 2019-12-18 16:44:53 +01:00
Paul Barron
f360d382a1 Update to latest commit of tc_mca_std_lib 
Remove variable fHomePosition which was defined twice
 2019-12-18 16:33:53 +01:00
PaulBarron
4dfaa181e0 Merged in mbp-59/191218-AdvancedHoming (pull request #23) 
Mbp 59/191218 AdvancedHoming
 2019-12-18 14:35:55 +00:00
Paul Barron
4af4094855 Change PLC cycle time to 10ms 2019-12-18 15:30:38 +01:00
Paul Barron
200ff88e6f Update to latest commit of tc_mca_std_lib 2019-12-18 15:26:33 +01:00
PaulBarron
8c9681895e Merged in mbp-77/191217-RemoveMode2 (pull request #22) 
Update tc_mca_std_lib to latest version
 2019-12-18 10:00:00 +00:00
Paul Barron
646085d03b Update tc_mca_std_lib to latest version 2019-12-18 10:57:49 +01:00
PaulBarron
91b4ee6f6a Merged in mbp-77/191217-RemoveMode2 (pull request #21) 
Mbp 77/191217 RemoveMode2
 2019-12-18 09:53:28 +00:00
Paul Barron
04c7827a7a Merge 'tc_generic_struct/integration' into mbp-77/191217-RemoveMode2 
Conflicts:
	solution/solution.tsproj
	solution/tc_project_app/GVLs/GVL_APP.TcGVL
	solution/tc_project_app/POUs/MAIN.TcPOU
	solution/tc_project_app/tc_project_app.plcproj
 2019-12-18 10:48:04 +01:00
Paul Barron
b61bf93b52 Remove hardware and rebuild 
Change axisNum to 2
 2019-12-17 14:54:20 +01:00
Paul Barron
4a59909ff1 Update to latest commit in tc_mca_std_lib 
Commented out mode 2 in position restore
 2019-12-17 14:49:07 +01:00
Paul Barron
1c9d8f3b6b Remove mode 2 from position restore 
It was decided in a code review that mode 2 wasn't doing exactly as we wanted
and that it probably wasn't required, at least for now.
Changes to logic so that the position restore is only done after a power cycle and
not a download, reset cold or reset origin.
 2019-12-17 14:46:55 +01:00
Paul Barron
e36d4bcab3 Change comment 2019-12-17 10:37:24 +01:00
Paul Barron
5d5ee5f4ad Add latest commit for tc_mca_std_lib 2019-12-17 10:33:57 +01:00
Paul Barron
5743a13513 Remove mode 2 from iRestoreCode 
Issues found regarding overiding of .config params in the axis struct.
Also doubts about whether it would actually be used.
 2019-12-17 10:27:25 +01:00
Federico Rojas
094480f040 Update submodules to latest versions to pass the white space test 2019-12-13 15:21:12 +01:00
Federico Rojas
29f11a6db0 Rebuild solution after deletting the NC folder and content 2019-12-13 14:45:20 +01:00
Federico Rojas
c68218106e Delete the NC folder under _Config folder 
There was some Axis infomation and this branch should not have HW. I delete the folder and the content
Delete _Config/NC
 2019-12-13 14:35:31 +01:00
Paul Barron
3e28bfd79a Not sure what is changed 
Maybe carriage return
 2019-12-13 13:55:04 +01:00
Paul Barron
e000543a7f Add ST_AxisPersistent.TcDUT to generic structure 2019-12-13 13:45:50 +01:00