Commit Graph

291 Commits

Author SHA1 Message Date
kleines
211968a18f do not set nResetErrorID to 0 if an error in fbReset occurs 2020-06-22 12:18:36 +02:00
kleines
064d2c1728 did some minor editorial changes 2020-06-18 18:37:43 +02:00
kleines
5d79e74e6c changed bBUSY to bBusy 2020-06-16 12:56:52 +02:00
kleines
c72741a8b8 corrected white space errors 2020-06-04 18:24:18 +02:00
kleines
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
kleines
b49c9f6101 removed busy check for fbReadParameters 2020-06-04 17:22:05 +02:00
kleines
518156b387 added changes according Simons suggestions in MBP-116 with bxxxx helper
variables.
2020-06-02 17:50:59 +02:00
kleines
7724dbee1a did changes according Federicos comments to the pull request. Added code
from MBP-100.
2020-06-02 17:03:28 +02:00
Federico Rojas
5d7df10f13 Update submodule pointer and add tc_project_app.xti file 2020-05-07 15:15:15 +02:00
kleines
27b8606f25 Merge remote-tracking branch 'origin/master' into MBP-116-motion-function-blocks-outputs 2020-05-05 20:45:03 +02:00
kleines
2e497bbf42 corrected white spaces 2020-05-05 18:59:16 +02:00
Luke Nisbet
ace0a2174a Fixed code not complying with the coding standard 2020-05-05 17:34:48 +01:00
kleines
e2321a2b9c added new homing code from MBP-131 2020-05-05 17:26:10 +02:00
kleines
c2cc2f0705 removed inconsitency regarding reset 2020-05-04 11:29:19 +02:00
Luke Nisbet
ad5c0324a6 Updated Submodule Pointer 2020-05-01 13:12:01 +01:00
Luke Nisbet
10d416dc95 Renamed elements in the VISU 2020-04-29 11:39:38 +01:00
Luke Nisbet
d081ee3680 Removed Axis from GVLs/GVL_APP 2020-04-28 10:45:22 +01:00
Luke Nisbet
4bf14f99ab Merged submodule to master 2020-04-27 15:42:29 +01:00
Luke Nisbet
00e087b54b Merge branch 'master' into mbp-100-read-write-axis-parameters 2020-04-27 15:16:01 +01:00
kleines
d55cae194f improved handling of reset and jogging 2020-04-27 15:05:41 +02:00
Paul Barron
29b9b5e959 Comment out bOutputs 2020-04-24 10:54:17 +02:00
Paul Barron
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
Luke Nisbet
1c5388bf06 Removed Redundant RTRIG 2020-04-22 14:35:59 +01:00
Luke Nisbet
12ae95898e Fixed formating to fit standard 2020-04-20 15:04:12 +01:00
kleines
8caafdc53c Initial commit 2020-04-20 14:42:36 +02:00
Luke Nisbet
d7ae3a4c00 Fixed White Space 2020-04-08 17:04:32 +01:00
Luke Nisbet
80bb47123a Removed unknown file tash show 2020-04-08 15:57:54 +01:00
Luke Nisbet
6572d59420 Ran check white space 2020-04-08 12:28:17 +01:00
Luke Nisbet
f03ac15f95 fixed Whitespace Damage 2020-04-07 16:39:13 +01:00
Luke Nisbet
bd9629cbbd Fixing issues caused by auto merge 2020-04-07 13:59:19 +01:00
Luke Nisbet
91145db1b6 Merge branch 'master' into mbp-100-read-write-axis-parameters 2020-04-06 18:04:10 +01:00
Luke Nisbet
dfb809b53d Commit for merge 2020-04-06 17:21:03 +01:00
Federico Rojas
48dafb43a4 Change GVL_APP.nAxisNum to GVL_APP.nAXIS_NUM because it is a constant 2020-04-03 15:14:25 +02:00
Federico Rojas
43d13b9320 Change homing stat eHomeFbDone to eHomeWaitForFbDone 2020-03-27 13:31:48 +01:00
[Luke Nisbet]
48a6b2e793 Trying to sucsessfully push 2020-03-26 13:45:12 +00:00
Federico Rojas
a02cbe7b3a Fix white space damage 2020-03-25 13:14:37 +01:00
Federico Rojas
a77bf83d00 Delete an extra ENTER - cosmetic 2020-03-25 13:06:34 +01:00
Federico Rojas
4be8acede1 Fix indenting of comments 2020-03-25 12:51:52 +01:00
Federico Rojas
5fd88c7f22 Update pointer to latest commit of tc_mca_std_lib 2020-03-24 10:53:13 +01:00
Federico Rojas
089fd4700f fix white space damage 2020-03-23 15:53:16 +01:00
Federico Rojas
277f7544b0 Change in E_MotorTypeClass from eNoMotor to eVirtualMotor 2020-03-23 15:49:46 +01:00
Federico Rojas
e485fcc455 Changes in tc_mca_std_lib to follow coding standards 2020-03-23 15:44:23 +01:00
Federico Rojas
8c554fd19c Delete space after //comment in all POU in Test directory 2020-03-23 15:43:39 +01:00
Federico Rojas
5399e85127 Update refrences from GVL variable aAxes to astAxes 2020-03-23 15:13:51 +01:00
Federico Rojas
a8e4f88884 Delete sapces after //, add e to variables in E_RestorePosition 2020-03-23 14:46:56 +01:00
Federico Rojas
9105bd2001 Change variable nHomeSeq to eHomeSeq inside Test actions 2020-03-23 14:46:09 +01:00
Federico Rojas
3181c4b69f Delete space after // from restor position actions 2020-03-23 14:35:31 +01:00
Federico Rojas
743ad6c6d8 Change the array variables of Main and all thier refernces to follow coding standards 2020-03-23 14:15:21 +01:00
Federico Rojas
217ef33021 Update tc_mca_std_lib pointer to latest commit 4c2008fa 2020-03-20 16:53:47 +01:00
Federico Rojas
594d4cd208 Fix white space damage 2020-03-19 17:22:35 +01:00