This website requires JavaScript.
35eb7a5261
Change encoder scaling factor to num=60 and den=1000
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
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
2019-12-09 12:25:01 +01:00
892258bd84
Merge 'tc_generic_struct/integration' into mbp-77/191204-SaveValuesOnPowerOff
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
2019-12-09 11:59:42 +01:00
bbfe0ab3e9
Commit after updating TwinCAT
2019-12-09 11:54:52 +01:00
3edb9fd098
check_fix_white_space.py: Fix whitespace damage
2019-12-09 11:21:05 +01:00
619331cc28
After white space fix?
2019-12-09 11:11:08 +01:00
608f6c0335
check_fix_white_space.py: Tell user about TAB and/or trailing WS
2019-12-09 11:10:07 +01:00
a57ae08ebe
check_fix_white_space.py: Hint the user about --fix
2019-12-09 11:00:50 +01:00
6e723594b5
bitbucket-pipelines.yml: Don't run git submodule
2019-12-09 10:30:41 +01:00
c6c63bfa4c
Merge 'origin/integration' into MBP-127-commit-files-with-lf-in-repo-crlf
2019-12-09 06:25:29 +01:00
bb3d895439
Merged in MBP-128-twincat-4024-0-is-shipped-with-4023-119 (pull request #18 )
2019-12-06 11:01:22 +00:00
bfe373e932
.gitattributes: CRLF for all files that need them
2019-12-06 10:52:48 +01: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
2019-12-06 09:39:15 +01:00
4ca1f6e110
Normalize all line endings to LF in the repo
2019-12-04 16:30:58 +01:00
3331756998
Remove and ignore UpgradeLog.htm
2019-12-04 16:14:59 +01:00
1e8ecb1f6b
Remove and ignore solution/TrialLicense.tclrs
2019-12-04 16:11:52 +01:00
56e8fb1c9b
Change iStartup case to eStartup
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
2019-12-04 13:42:31 +01:00
31ff22d7a4
Merged in MBP-114-dont-use-tab-in-source-code (pull request #16 )
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 10:56:07 +01:00
bef8078e99
Fix whitespace damage
2019-11-29 09:45:53 +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
2019-11-29 09:28:54 +01:00
2004342dd3
bitbucket-pipelines.yml: Activate check_fix_white_space.py
2019-11-29 08:23:40 +01:00
df8fd4f4be
Add check_fix_white_space.py
2019-11-29 08:16:29 +01:00
5644dd9bb7
Update Hardware FB for the latest version from Viktor Heirich and 4024.0
2019-10-16 11:35:02 +02:00
da7b2d1625
Merged in MBP-109-test-pipelines-for-twincat (pull request #14 )
2019-10-15 12:22:31 +00:00
117f65b403
Merge origin/integration into MBP-109-test-pipelines-for-twincat
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 )
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
0adff94a46
Updated version
2019-10-11 23:13:43 +01:00
edbb3e8cdb
Try and fix for pipelines
2019-10-11 18:51:00 +01:00
81b5d1f1dc
Only do on PR
2019-10-11 18:38:05 +01:00
adff4d92d3
Just confirm we can pass a test
2019-10-11 18:25:39 +01:00
b2b97f583c
Should now do submodules
2019-10-11 18:23:32 +01:00
517bd5dc4e
Pipeline now checks versions
2019-10-11 18:18:44 +01:00
1946724be1
Fix syntax error
2019-10-11 17:15:21 +01:00
cf5349dced
Allow pipeline to be run manually
2019-10-11 17:11:57 +01:00
48788d138f
Add pipeline yaml
2019-10-11 17:09:09 +01:00
442f840065
First try at running a pipeline
2019-10-11 17:07:29 +01:00
80380cbcd1
Add action call of action STARTUP( ) to MAIN
2019-08-12 15:55:16 +02:00
ea525c4f49
Add a STARTUP and SHUTDOWN action to MAIN
2019-08-09 15:08:12 +02:00
0d757f16de
Merged in mbp-106/application-specific-gvl (pull request #10 )
2019-08-08 09:37:40 +00:00
232a454e21
fix conflict while merging to integration branch
2019-08-08 11:32:13 +02:00
3afaa99adc
Merge branch 'integration' into mbp-106/application-specific-gvl
2019-08-08 11:23:32 +02:00
f0df405a7a
Merged in mbp-99/execute-reset-triggers-and-status-links (pull request #7 )
2019-08-01 11:58:01 +00:00
05927a40a6
Change all references and links from GVL.axisNum to GVL_APP.axisNum
2019-08-01 13:03:33 +02:00
e9bac1d121
Create GVL_APP and add axisNum constant variable in it
2019-08-01 12:58:31 +02:00
08c6c6acaf
Delete Axis task from solution to have a clean solution
2019-08-01 12:38:27 +02:00
1bf298212a
set bExecute to FLASE at the end of the code
2019-08-01 12:13:24 +02:00
1b3ef2c20f
Reset bExecute when Axis are coupled
2019-07-18 10:03:08 +02:00
8beccc5cd8
Change representation to Hex of nNC_ErrorID in FB_NC_Error
2019-07-17 15:55:52 +02:00
bacbdf1e39
add missing FB for error handling EL7037 and EL7047
2019-07-17 13:52:07 +02:00
b3f741222f
Fix bug with bExecute reset after command
2019-07-17 10:14:43 +02:00
c03cead419
Fix typo in comment
2019-07-16 13:42:19 +02:00
f9544e549b
Update Links from Error_Log_Visu to new ST_AxisStruct
2019-07-16 13:31:10 +02:00
175bdae2de
Add missing FB for ErrorHandling FB_NC_Error
2019-07-16 13:29:44 +02:00
81b2a6c326
Delete bResetDone and bHome, change VISU location to tc_mca_std_lib
2019-07-16 11:32:47 +02:00
c488fd0489
delete unused old visualizations from tc_mca_std_lib
2019-07-16 10:41:16 +02:00
0602dd9e6e
bExecute realese when moved, bReset and bStop reset state fixed
2019-07-12 12:19:30 +02:00
b52a2a34a9
All file change with hexadecimal represenation in visu for ErrorID
2019-07-12 10:37:45 +02:00
2af2c7f5c5
Change ErrorID representation to hexadecimal for easier undertanding
2019-07-11 10:21:55 +02:00
f71f6ad113
bError and bStop set to FALSE after execution
2019-07-10 14:58:03 +02:00
72ff5a7449
Merge with mbp-94/error-handling
2019-07-10 10:44:37 +02:00
815e48507e
Make deafult value for the enum MotionFuncitons equal to Jog
2019-07-08 15:41:27 +02:00
062432bb3b
Delete Axis 1, 2 1nd 3 to have empty solution
2019-07-08 13:51:04 +02:00
f3ed214162
Add folder FeedbackTerminals to the solution tree
2019-07-05 11:32:36 +02:00
c52d1a5f01
Change in line due to build in new TwinCAT version 3.1.4022.28
2019-07-05 11:24:49 +02:00
ed7c121b3d
Update the solution strucutre with all the new Hardware FB's and FB_axis if error statements
2019-06-28 15:11:29 +02:00
d04cf0ed4b
Change the fbErrorList to the new fbErrorSystem in MAIN
2019-06-28 14:46:57 +02:00
e47e4aeef0
Merged in MBP-92 (pull request #2 )
2019-06-24 16:24:54 +00:00
a24a629546
Removed testing axis
2019-06-24 17:13:41 +01:00
a90c3a9dd7
Merge branch 'integration' into MBP-92
2019-06-24 16:58:49 +01:00
dad212b4af
Third NC axis to configuration Add third axis for testing gear-in/out Update to latest tc-std-lib commit of MBP-95
2019-06-20 15:38:37 +01:00
2791f6cf87
Add commit changes of TC_MCA_STD_LIB MPB-95
2019-06-20 11:33:13 +01:00
d2e05e98cf
integration bracnh ponitng to integration branch in tc_mca_std_lib
2019-06-17 16:38:05 +02:00
8e59e35241
Single gear in and gear out support
2019-06-04 11:46:53 +01:00
Paul Barron