berti_r/Motion_test
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • a6c7f5f3fc added correct text list entry for help button kleines 2020-06-26 15:35:34 +02:00
  • fe9b971f3f Inital coding kleines 2020-06-26 14:28:38 +02:00
  • 69b0036ff0 Remove spaces to conform to standard Paul Barron 2020-06-26 10:46:52 +02:00
  • e49e8f6f68 Update to latest commit of tc_mca_std_lib Paul Barron 2020-06-26 10:41:22 +02:00
  • 6b96fe55be Update to latest commit of tc_mca_std_lib Paul Barron 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 Paul Barron 2020-06-26 09:20:45 +02:00
  • 1334522b0d Merged in MBP-149-delete-changeconfig (pull request #43) luke.nisbet 2020-06-23 09:14:16 +00:00
  • b9b5d3eb95 Merge branch 'master' into MBP-149-delete-changeconfig Luke Nisbet 2020-06-23 10:13:11 +01:00
  • b7d597adce Updated the Pointer to the Latest Submodule Luke Nisbet 2020-06-23 09:36:10 +01:00
  • 9a350e85de Merged in MBP-116-motion-function-blocks-outputs (pull request #42) Harald Kleines 2020-06-22 15:52:59 +00:00
  • 211968a18f do not set nResetErrorID to 0 if an error in fbReset occurs kleines 2020-06-22 12:18:36 +02:00
  • 064d2c1728 did some minor editorial changes kleines 2020-06-18 18:37:43 +02:00
  • 5d79e74e6c changed bBUSY to bBusy kleines 2020-06-16 12:56:52 +02:00
  • 69fc88aa24 Repointed to new submodule changes Luke Nisbet 2020-06-12 14:21:14 +01:00
  • 3b2cdd91b2 Add hardware, plc and links using Simon's C# tool Paul Barron 2020-06-10 12:25:16 +02:00
  • c72741a8b8 corrected white space errors kleines 2020-06-04 18:24:18 +02:00
  • de92272d7a Merged master into MBP-116 Merge remote-tracking branch 'origin/master' into MBP-116-motion-function-blocks-outputs kleines 2020-06-04 18:07:14 +02:00
  • b49c9f6101 removed busy check for fbReadParameters kleines 2020-06-04 17:22:05 +02:00
  • 518156b387 added changes according Simons suggestions in MBP-116 with bxxxx helper variables. kleines 2020-06-02 17:50:59 +02:00
  • 7724dbee1a did changes according Federicos comments to the pull request. Added code from MBP-100. kleines 2020-06-02 17:03:28 +02:00
  • bac7da9cfc Updated submodule pointer Luke Nisbet 2020-05-18 12:24:35 +01:00
  • cbd32f3f98 Repointed to Updated Submodule Luke Nisbet 2020-05-18 12:07:52 +01:00
  • 4ba790a701 Merge branch 'master' into MBP-149-delete-changeconfig Luke Nisbet 2020-05-15 10:47:29 +01:00
  • b95a3437aa Removed Deleted Files From The Submodule Luke Nisbet 2020-05-15 10:38:20 +01:00
  • 5d7df10f13 Update submodule pointer and add tc_project_app.xti file Federico Rojas 2020-05-07 15:15:15 +02:00
  • 9a00db6c67 Merged in mbp-100-read-write-axis-parameters (pull request #40) luke.nisbet 2020-05-06 12:15:54 +00:00
  • 27b8606f25 Merge remote-tracking branch 'origin/master' into MBP-116-motion-function-blocks-outputs kleines 2020-05-05 20:45:03 +02:00
  • 2e497bbf42 corrected white spaces kleines 2020-05-05 18:59:16 +02:00
  • ace0a2174a Fixed code not complying with the coding standard Luke Nisbet 2020-05-05 17:34:48 +01:00
  • e2321a2b9c added new homing code from MBP-131 kleines 2020-05-05 17:26:10 +02:00
  • c2cc2f0705 removed inconsitency regarding reset kleines 2020-05-04 11:29:19 +02:00
  • ad5c0324a6 Updated Submodule Pointer Luke Nisbet 2020-05-01 13:12:01 +01:00
  • 10d416dc95 Renamed elements in the VISU Luke Nisbet 2020-04-29 11:39:38 +01:00
  • d081ee3680 Removed Axis from GVLs/GVL_APP Luke Nisbet 2020-04-28 10:45:22 +01:00
  • 4bf14f99ab Merged submodule to master Luke Nisbet 2020-04-27 15:42:29 +01:00
  • 00e087b54b Merge branch 'master' into mbp-100-read-write-axis-parameters Luke Nisbet 2020-04-27 15:16:01 +01:00
  • d55cae194f improved handling of reset and jogging kleines 2020-04-27 15:05:41 +02:00
  • f49da8c901 Merged in MBP-131-Improve-homing-routines-squash (pull request #41) PaulBarron 2020-04-24 09:14:55 +00:00
  • 29b9b5e959 Comment out bOutputs Paul Barron 2020-04-24 10:54:17 +02:00
  • 6dc8d31bbd MBP-131: Update advanced homing Paul Barron 2020-04-24 10:16:36 +02:00
  • 1c5388bf06 Removed Redundant RTRIG Luke Nisbet 2020-04-22 14:35:59 +01:00
  • 12ae95898e Fixed formating to fit standard Luke Nisbet 2020-04-20 15:04:12 +01:00
  • 8caafdc53c Initial commit kleines 2020-04-20 14:42:36 +02:00
  • d7ae3a4c00 Fixed White Space Luke Nisbet 2020-04-08 17:04:32 +01:00
  • 80bb47123a Removed unknown file tash show Luke Nisbet 2020-04-08 15:57:54 +01:00
  • 6572d59420 Ran check white space Luke Nisbet 2020-04-08 12:28:17 +01:00
  • f03ac15f95 fixed Whitespace Damage Luke Nisbet 2020-04-07 16:39:13 +01:00
  • bd9629cbbd Fixing issues caused by auto merge Luke Nisbet 2020-04-07 13:59:19 +01:00
  • 91145db1b6 Merge branch 'master' into mbp-100-read-write-axis-parameters Luke Nisbet 2020-04-06 18:04:10 +01:00
  • dfb809b53d Commit for merge Luke Nisbet 2020-04-06 17:21:03 +01:00
  • 586a07418e Merged in MBP-140-code-strict-cleanup (pull request #37) Federico Rojas 2020-04-03 15:52:48 +00:00
  • 48dafb43a4 Change GVL_APP.nAxisNum to GVL_APP.nAXIS_NUM because it is a constant Federico Rojas 2020-04-03 15:14:25 +02:00
  • 43d13b9320 Change homing stat eHomeFbDone to eHomeWaitForFbDone Federico Rojas 2020-03-27 13:31:48 +01:00
  • 48a6b2e793 Trying to sucsessfully push [Luke Nisbet] 2020-03-26 13:45:12 +00:00
  • a02cbe7b3a Fix white space damage Federico Rojas 2020-03-25 13:14:37 +01:00
  • a77bf83d00 Delete an extra ENTER - cosmetic Federico Rojas 2020-03-25 13:06:34 +01:00
  • 4be8acede1 Fix indenting of comments Federico Rojas 2020-03-25 12:51:52 +01:00
  • 5fd88c7f22 Update pointer to latest commit of tc_mca_std_lib Federico Rojas 2020-03-24 10:53:13 +01:00
  • 089fd4700f fix white space damage Federico Rojas 2020-03-23 15:53:16 +01:00
  • 277f7544b0 Change in E_MotorTypeClass from eNoMotor to eVirtualMotor Federico Rojas 2020-03-23 15:49:46 +01:00
  • e485fcc455 Changes in tc_mca_std_lib to follow coding standards Federico Rojas 2020-03-23 15:44:23 +01:00
  • 8c554fd19c Delete space after //comment in all POU in Test directory Federico Rojas 2020-03-23 15:43:39 +01:00
  • 5399e85127 Update refrences from GVL variable aAxes to astAxes Federico Rojas 2020-03-23 15:13:51 +01:00
  • a8e4f88884 Delete sapces after //, add e to variables in E_RestorePosition Federico Rojas 2020-03-23 14:46:56 +01:00
  • 9105bd2001 Change variable nHomeSeq to eHomeSeq inside Test actions Federico Rojas 2020-03-23 14:46:09 +01:00
  • 3181c4b69f Delete space after // from restor position actions Federico Rojas 2020-03-23 14:35:31 +01:00
  • 743ad6c6d8 Change the array variables of Main and all thier refernces to follow coding standards Federico Rojas 2020-03-23 14:15:21 +01:00
  • 217ef33021 Update tc_mca_std_lib pointer to latest commit 4c2008fa Federico Rojas 2020-03-20 16:53:47 +01:00
  • 594d4cd208 Fix white space damage Federico Rojas 2020-03-19 17:22:35 +01:00
  • 9a0e70450f Add enums and change refernces for Homing Routines and for Homing states in FB_Homing Federico Rojas 2020-03-19 16:10:39 +01:00
  • da6253ae75 Add enum for Homing routines Federico Rojas 2020-03-19 14:24:15 +01:00
  • f22ce8c6d0 Move VISU directory a level higher, directly under tc_mca_std_lib Federico Rojas 2020-03-19 14:09:14 +01:00
  • b30a96abbe Change all the files in the directory 'Test' to follow coding standards Federico Rojas 2020-03-19 14:01:13 +01:00
  • c4c2fdc0f3 Changed FB_Axis and refernces to follow code standards Federico Rojas 2020-03-18 17:05:52 +01:00
  • 47199a6a16 Change all DUT's variable names and references after merge with MBP-138 Federico Rojas 2020-03-18 15:34:23 +01:00
  • e551fc826a Add an 'e' at the beginning of all values of the enum E_MotionFunctions Federico Rojas 2020-03-18 15:03:46 +01:00
  • ab723f139b fix white space damage Federico Rojas 2020-03-18 13:38:02 +01:00
  • 014cc8d807 Chenge variable and references of axesPersistent to aAxesPersistent Federico Rojas 2020-03-17 16:18:38 +01:00
  • cfc3b146f8 Fix calling of FB's as define in the coding standards in Homing directory Federico Rojas 2020-03-17 16:17:30 +01:00
  • c99efebb07 Change GVL to follow our coding standards and update all the references in the FB's Federico Rojas 2020-03-17 14:52:19 +01:00
  • 56929e3be1 Fix all references from the chages DUT's in the FB's and POU's Federico Rojas 2020-03-17 14:34:44 +01:00
  • 68498ae44f Delete local variable i in MAIN and substitute it with GVL.iAxis Federico Rojas 2020-03-17 13:33:21 +01:00
  • d433e588f4 Adding latest files in order to work from home [Luke Nisbet] 2020-03-17 10:49:01 +00:00
  • 9561494a7d Revert change from nAXIS_NUM to nAxisNum, it is not a constant Federico Rojas 2020-03-17 11:27:21 +01:00
  • 6c9885ee54 Change to coding standards all variables in MAIN and their references Federico Rojas 2020-03-11 13:30:47 +01:00
  • 456f791f56 change nAxisNum constant to nAXIS_NUM in GVL.APP and their references Federico Rojas 2020-03-11 13:07:28 +01:00
  • c504ae6ea3 change axisNum to nAxisNum in GVL.APP and their references Federico Rojas 2020-03-11 13:01:52 +01:00
  • 5dfc715221 merge MBP-119 Federico Rojas 2020-03-11 12:47:59 +01:00
  • 94cb3f481d Merge branch 'master' into mbp-100-read-write-axis-parameters [Luke Nisbet] 2020-03-06 13:39:40 +00:00
  • 3e3afe789b Added enum to submodule [Luke Nisbet] 2020-03-05 13:15:31 +00:00
  • c1d435bf9a Merged in MBP-139-submodule-pointer-update (pull request #33) Federico Rojas 2020-03-04 16:36:04 +00:00
  • 8fe64ab461 Update the pointer to latest commit of master branch of tc_mca_std_lib Federico Rojas 2020-03-04 17:29:54 +01:00
  • ed55d3823a changed enums to coding conventions kleines 2020-03-04 17:23:20 +01:00
  • 5c78e276cf Merged in MBP-139-merge-integration-into-master (pull request #32) Aaron James Long 2020-03-04 15:52:50 +00:00
  • ebe450b3a5 Delete PlcTaskCom task from SYSTEM/TASKS Federico Rojas 2020-03-04 16:35:32 +01:00
  • 663f983a01 Change TC2_MC version to 3.3.28.0 and added Reference TcUnit Federico Rojas 2020-03-04 16:28:10 +01:00
  • 6931409b83 Remove again Hardware directory from solution tree Federico Rojas 2020-03-04 16:18:21 +01:00
  • b03486cf6d Delete Error Handling and Hardware directories from the solution tree Federico Rojas 2020-03-04 16:09:28 +01:00
  • 1f3a874736 Prepare branch for merging into master aaronlong 2020-03-04 14:38:46 +00:00
  • 8338314652 Merged in MBP-139-clean-the-git-repo (pull request #31) Aaron James Long 2020-03-04 14:18:47 +00:00