ce8d745cca
Update all files to new build version. To 3024.11 and 3024.32
2022-08-16 15:29:05 +02:00
4492ed868c
Merge remote-tracking branch 'origin/master' into MBP-105-control-of-pneumatic-actuators
2021-06-15 11:30:39 +02:00
7421924815
Add pneumatic axis to the solution
...
Added pnuematic acutator FB, programs and DUTs.
2021-05-04 12:57:14 +02:00
64a74eeee7
Disable auto priority management of tasks so it does not change with every compile
2021-03-10 11:19:41 +01:00
8ad900e534
Add tc_project_app as an independent project file and activate auto priroty manager for tasks
2021-02-19 12:05:24 +01:00
6cdfc7a0f3
Create EXAMPLE() program and call it to show the intended use
2020-12-09 15:50:58 +01:00
6b96fe55be
Update to latest commit of tc_mca_std_lib
2020-06-26 10:29:36 +02:00
038ad8e844
Merge branch 'master' of https://bitbucket.org/europeanspallationsource/tc_generic_structure into MBP-155-access-to-NC-parameters
2020-06-26 09:20:45 +02:00
3b2cdd91b2
Add hardware, plc and links using Simon's C# tool
2020-06-10 12:25:16 +02:00
de92272d7a
Merged master into MBP-116
...
Merge remote-tracking branch 'origin/master' into MBP-116-motion-function-blocks-outputs
2020-06-04 18:07:14 +02:00
5d7df10f13
Update submodule pointer and add tc_project_app.xti file
2020-05-07 15:15:15 +02:00
27b8606f25
Merge remote-tracking branch 'origin/master' into MBP-116-motion-function-blocks-outputs
2020-05-05 20:45:03 +02:00
ace0a2174a
Fixed code not complying with the coding standard
2020-05-05 17:34:48 +01:00
10d416dc95
Renamed elements in the VISU
2020-04-29 11:39:38 +01:00
d081ee3680
Removed Axis from GVLs/GVL_APP
2020-04-28 10:45:22 +01:00
4bf14f99ab
Merged submodule to master
2020-04-27 15:42:29 +01:00
6dc8d31bbd
MBP-131: Update advanced homing
...
Update pointer to tc_mca_std_lib
Fix reference to MC2 library: changed to 3.3.28.0 instead of 3.3.31.0
There may be some changes to the TcUnit tests but these were not
intended to be part of the commit. As I am halfway through the merge I
will commit what is there and then fix later on if required. These
should be part of another ticket.
2020-04-24 10:16:36 +02:00
6c9885ee54
Change to coding standards all variables in MAIN and their references
2020-03-11 13:30:47 +01:00
ebe450b3a5
Delete PlcTaskCom task from SYSTEM/TASKS
2020-03-04 16:35:32 +01:00
1f3a874736
Prepare branch for merging into master
2020-03-04 14:38:46 +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
ca85a0c07b
Removed epicscommmodule from solution
2020-03-04 13:28:51 +00:00
c8602c8eb7
Resolved merge conflicts
2020-03-04 11:05:47 +00:00
bb7af4fcdf
Updated after merge resolution
2020-03-04 10:09:51 +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
de53c24b15
solution.tsproj: Remove the 2 axes, commit with TC 3.1.4024.0
2020-02-10 10:53:57 +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
f0037bcaba
Added std_lib unit tests
2019-12-24 11:36:25 +00:00
6e0735106d
Change PLCtask cycle time to 10ms
2019-12-18 17:19:00 +01: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
29f11a6db0
Rebuild solution after deletting the NC folder and content
2019-12-13 14:45:20 +01:00
c49d1d0faf
Increase homing and jog speeds
...
For axis 1 and 2
2019-12-10 10:37:08 +01:00
c6cac2ce7c
Set monitoring parameters
...
E.g. position lag, target position etc.
Done for axis 1 and 2.
2019-12-10 10:26:57 +01:00
f59a9dfccf
Invert motor polarity for axis 1
2019-12-09 15:02:05 +01:00
ad48a4c161
Invert encoder counting direction on axis 2
2019-12-09 14:57:14 +01:00
dd4cfbe34b
Set dynamic parameters for Axis 1 and 2
2019-12-09 14:49:00 +01:00
57aa137e4e
Change encoder scaling factor denominator to 2000
...
Done for axis 1 and 2
2019-12-09 14:43:50 +01:00
173400e7f0
Change Reference Velocity to 600
...
Changed for axis 1 and 2
2019-12-09 14:41:16 +01:00
35eb7a5261
Change encoder scaling factor to num=60 and den=1000
...
Done for axis 1 and 2
2019-12-09 14:30:44 +01:00
b7ae38ad86
Change link of encoder for axis 1 and 2 to hardware terminals
2019-12-09 14:16:51 +01:00
f36a636a4e
Link hardware inputs to bLimitFwd, bLimitBwd, bLimitHome
...
Done for both axis 1 and 2.
2019-12-09 14:05:32 +01:00
8b2779fe61
Link boutput 2,3,6,7 to the hardware
2019-12-09 13:32:10 +01:00
c8775e5ae5
Create bOutput 2,3,6,7 for switches in MAIN.TcPOU
...
modified: solution/solution.tsproj
modified: solution/tc_project_app/POUs/MAIN.TcPOU
2019-12-09 13:29:28 +01:00
5fe5abbbf3
Link bOutput1 and bOutput5 to hardware
2019-12-09 13:27:22 +01:00
d36efd414d
Create bOutput5 for axis 2 switches
2019-12-09 13:25:06 +01:00
82c00f9999
Link PLC axes 1 & 2 to motion axes 1 & 2
2019-12-09 13:19:38 +01:00
97f4607b7c
Scan the bus
2019-12-09 13:17:30 +01:00
Federico Rojas