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
44ec03e93c
Merged in MBP-132/SaveRestoreOnSimulatedPLCS (pull request #26 )
...
ALLOW LOCAL SIMULATIONS TO BYBASS UPS CHECK
2020-02-12 11:41:14 +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
b914a2f62a
Initial number of axes is 0
...
Change axisNum in GVL_APP to 0
2020-02-10 10:51:12 +01:00
b522fe177e
fix whitespace damage
2020-02-10 10:44:25 +01:00
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
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
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
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
f0037bcaba
Added std_lib unit tests
2019-12-24 11:36:25 +00:00
30c80940c7
Renamed tcUNIT folder to Test
2019-12-24 11:07:12 +00:00
7c1c9eadcf
Removed trailing CR
2019-12-24 10:37:06 +00:00
3257c21d12
Added tcUNIT, including helper functions and app test folder, to generic structure
2019-12-24 10:29:00 +00:00
13dc7a0ba1
Revert "Added tcUNIT, including helper functions and app test folder, to generic structure"
...
This reverts commit 7ee4fae5ad
2019-12-24 10:11:14 +00:00
7ee4fae5ad
Added tcUNIT, including helper functions and app test folder, to generic structure
2019-12-24 10:08:59 +00:00
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
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
6e0735106d
Change PLCtask cycle time to 10ms
2019-12-18 17:19:00 +01:00
0532cb9214
Remove PLCTask1 from solution
2019-12-18 17:16:49 +01:00
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
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
4dfaa181e0
Merged in mbp-59/191218-AdvancedHoming (pull request #23 )
...
Mbp 59/191218 AdvancedHoming
2019-12-18 14:35:55 +00:00
4af4094855
Change PLC cycle time to 10ms
2019-12-18 15:30:38 +01:00
200ff88e6f
Update to latest commit of tc_mca_std_lib
2019-12-18 15:26:33 +01:00
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
646085d03b
Update tc_mca_std_lib to latest version
2019-12-18 10:57:49 +01:00
91b4ee6f6a
Merged in mbp-77/191217-RemoveMode2 (pull request #21 )
...
Mbp 77/191217 RemoveMode2
2019-12-18 09:53:28 +00:00
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
b61bf93b52
Remove hardware and rebuild
...
Change axisNum to 2
2019-12-17 14:54:20 +01:00
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
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
e36d4bcab3
Change comment
2019-12-17 10:37:24 +01:00
5d5ee5f4ad
Add latest commit for tc_mca_std_lib
2019-12-17 10:33:57 +01:00
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
094480f040
Update submodules to latest versions to pass the white space test
2019-12-13 15:21:12 +01:00
29f11a6db0
Rebuild solution after deletting the NC folder and content
2019-12-13 14:45:20 +01:00
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
3e28bfd79a
Not sure what is changed
...
Maybe carriage return
2019-12-13 13:55:04 +01:00
e000543a7f
Add ST_AxisPersistent.TcDUT to generic structure
2019-12-13 13:45:50 +01:00
5570b03fad
Changes inside tc_mca_std_lib
...
Moved persistent variables from MAIN to a new struct in the generic_structure
called ST_AxisPersistent
2019-12-13 13:44:16 +01:00
f1063b56d7
Change names of MAIN.STARTUP and MAIN.SHUTDOWN
...
Change to MAIN.RESTORE_POSITIONS and MAIN.STORE_PERSISTENT
Bug fix: add check in MAIN.RESTORE_POSITIONS to check whether
an axis was moving at shutdown.
Variable name changes to acommodate moving the persistent variables
from MAIN to a DUT in the generic structure.
2019-12-13 13:41:25 +01:00
f2d73d013f
Fix whitespace damage
...
No code changes
2019-12-11 15:24:00 +01:00
aaronlong