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
a9dea34c41
Capitalise variable names of eStartUp
...
No code changes
2019-12-09 12:25:01 +01:00
892258bd84
Merge 'tc_generic_struct/integration' into mbp-77/191204-SaveValuesOnPowerOff
...
Conflicts:
solution/solution.tsproj
2019-12-09 12:07:27 +01:00
f98fa633a5
Fix whitespace damage in MAIN.TcPOU
2019-12-09 12:04:08 +01:00
0772b525ab
Update MAIN.TcPOU for TwinCAT version
...
Open MAIN.TcPOU in TwinCAT, add one line, delete it, save it.
TwinCAT updates the TwinCAT version number to 3.1.4024.0.
No code changes.
2019-12-09 11:59:42 +01:00
bbfe0ab3e9
Commit after updating TwinCAT
...
No code changes
modified: solution.sln
modified: solution/solution.tsproj
modified: solution/tc_project_app/tc_project_app.plcproj
2019-12-09 11:54:52 +01:00
619331cc28
After white space fix?
2019-12-09 11:11:08 +01:00
bb3d895439
Merged in MBP-128-twincat-4024-0-is-shipped-with-4023-119 (pull request #18 )
...
MBP-128 twincat 4024.0 is shipped with 4023.119
Approved-by: Aaron James Long <aaron.long@stfc.ac.uk >
2019-12-06 11:01:22 +00:00
b60f33ed5a
solution.tsproj: Update to version 4.1.4023.119
2019-12-06 09:52:04 +01:00
62086f488d
twincat_version_manager.py: Different versions for *.Tc and *.tsproj
...
"The 4024 release apparently shipped with the 4023.119
internal build for engineering"
It seems as if the *.Tc* files ue a different version numbering than
the *.tsproj files.
Adapt twincat_version_manager.py to handle different versions
for different file types (technically file names) and
check that the *.tsproj file have version "3.1.4023.119"
2019-12-06 09:44:27 +01:00
56e8fb1c9b
Change iStartup case to eStartup
...
Change int to enum for better readability
2019-12-04 15:09:05 +01:00
fe65683e7c
White space fix
2019-12-04 14:50:58 +01:00
5d0116f27c
Add comment plus variable name consistency fix
2019-12-04 14:44:49 +01:00
1fd4d9bad6
Fix white-space danage
2019-12-04 14:09:59 +01:00
3374ed36ae
Merge 'tc_generic_struct/integration' into mbp-77/191204-SaveValuesOnPowerOff
...
Conflicts:
solution/tc_project_app/POUs/MAIN.TcPOU
solution/tc_project_app/tc_mca_std_lib
2019-12-04 13:42:31 +01:00
31ff22d7a4
Merged in MBP-114-dont-use-tab-in-source-code (pull request #16 )
...
MBP-114 dont use tab in source code
2019-12-04 11:42:52 +00:00
4b2302d0d4
Fix whitespace damage in solution/tc_project_app/tc_mca_std_lib
2019-11-29 11:51:27 +01:00
403b1c9296
bitbucket-pipelines.yml: Print status of git submodule
2019-11-29 11:44:53 +01:00
69f8fc4696
solution/tc_epicscommodule updated to 3.1.4024.0
2019-11-29 11:34:27 +01:00
bef8078e99
Fix whitespace damage
...
Fix the whitespaces using check_fix_white_space.py
modified: solution/tc_project_app/GVLs/GVL_APP.TcGVL
modified: solution/tc_project_app/POUs/MAIN.TcPOU
2019-11-29 09:47:11 +01:00
9facfb89c1
Update tc_epicscommodule to a white+space clean version
2019-11-29 09:43:45 +01:00
7ce75ac945
bitbucket-pipelines.yml: Change pipline from pull-request to default
...
Allways run the pipeline, for each push, not only pull-requests.
This should detect problems early,
2019-11-29 09:31:37 +01:00
2004342dd3
bitbucket-pipelines.yml: Activate check_fix_white_space.py
2019-11-29 08:32:32 +01:00
df8fd4f4be
Add check_fix_white_space.py
...
Make it possible to check for whitespace-damage:
- a file uses TAB instead of space
- a file has trailing whitespace e.g.
"text on this line \n" instead of "text on this line\n"
Both make reviews unnecessary hard and may lead to merge conflicts,
which could be easily avoided.
In the next commit this script will be added to the continous integration.
2019-11-29 08:32:17 +01:00
5644dd9bb7
Update Hardware FB for the latest version from Viktor Heirich and 4024.0
...
Some FB in the Etercat Termianls folder were not the latest version
They were replaced by the latest version according to the developer Viktor Heirich# Please enter the commit message for your changes. Lines starting
2019-10-16 11:35:02 +02:00
da7b2d1625
Merged in MBP-109-test-pipelines-for-twincat (pull request #14 )
...
MBP-109 test pipelines for twincat
2019-10-15 12:22:31 +00:00
117f65b403
Merge origin/integration into MBP-109-test-pipelines-for-twincat
...
Conflicts:
solution/solution.tsproj
2019-10-15 14:19:34 +02:00
8ced80123e
Update tc_mca_std_lib to version 3024.0
2019-10-15 14:05:11 +02:00
9a0b8e98cc
Update tc_epicscommodule to master for new 3024.0
2019-10-15 14:04:02 +02:00
efeccb18bc
Merged in MBP-85-standardise-our-twincat-version (pull request #15 )
...
MBP-85 standardise our twincat version
2019-10-15 11:57:52 +00:00
eeeaf8a3a1
Fix exit codes
2019-10-14 18:17:55 +01:00
d57ad738ee
Attempt to fix bitbucket being wierd
2019-10-14 18:12:31 +01:00
9ba0d7a67e
Provide better error codes
2019-10-14 18:01:29 +01:00
7f9e9feff5
Updated submodules
2019-10-11 23:24:09 +01:00
1579c29d6f
Updated version
2019-10-11 23:20:39 +01:00
1d3a7d6c59
Updated version
2019-10-11 23:18:38 +01:00
Paul Barron