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

Commit Graph

  • 14b9793ff2 Merge remote-tracking branch 'origin/integration' into MBP-139-clean-the-git-repo Federico Rojas 2020-03-04 15:16:25 +01:00
  • f44a0283fd Fixed typo in tc_project_app.plcproj Aaron James Long 2020-03-04 14:13:30 +00:00
  • c4a825340d resolved merge conflicts aaronlong 2020-03-04 13:59:35 +00:00
  • 6044949c93 Merged in MBP-122-automate-unit-testing-of-plc-code (pull request #30) Aaron James Long 2020-03-04 13:46:11 +00:00
  • 68ee90e03e Merged in MBP-129-check_fix_white_space-py---fix (pull request #19) Torsten Bögershausen 2020-03-04 13:44:50 +00:00
  • a79e447496 Resolved merging conflicts Federico Rojas 2020-03-04 14:44:23 +01:00
  • 345b0cf56b Removed submodule epicscommodule aaronlong 2020-03-04 13:32:41 +00:00
  • ca85a0c07b Removed epicscommmodule from solution aaronlong 2020-03-04 13:28:51 +00:00
  • e8e944b812 Removed incorrectly added PLC task aaronlong 2020-03-04 13:03:25 +00:00
  • ad04362431 Merged in MBP-120_add_tcUNIT_to_generic_structure (pull request #27) Aaron James Long 2020-03-04 12:13:39 +00:00
  • 27e8814a66 added descriptive substructure to axes struct in std_lib kleines 2020-03-04 13:00:17 +01:00
  • dcc427cab9 Cleaned up axis files aaronlong 2020-03-04 11:12:07 +00:00
  • c8602c8eb7 Resolved merge conflicts aaronlong 2020-03-04 11:05:47 +00:00
  • b984376f15 resolved merge conflicts aaronlong 2020-03-04 10:59:33 +00:00
  • 100a3c9741 Merge branch 'integration' into MBP-129-check_fix_white_space-py---fix Dominic Oram 2020-03-04 10:24:53 +00:00
  • bb7af4fcdf Updated after merge resolution aaronlong 2020-03-04 10:09:51 +00:00
  • f22b6bfaa4 Merge branch 'integration' into MBP-120_add_tcUNIT_to_generic_structure aaronlong 2020-03-04 10:06:10 +00:00
  • aeb84c2a7a Ticket READY FOR REVIEW [Luke Nisbet] 2020-03-04 09:52:22 +00:00
  • 71da3cce15 Updated submodule Dominic Oram 2020-03-02 17:12:31 +00:00
  • c39980d71b Merged in MBP-136-clean-up-the-code (pull request #28) Dominic Oram 2020-03-02 17:07:43 +00:00
  • 51354f0f10 Merge branch 'MBP-136-clean-up-the-code' of https://bitbucket.org/europeanspallationsource/tc_generic_structure into MBP-136-clean-up-the-code Dominic Oram 2020-03-02 16:35:41 +00:00
  • 597881796f Update submodule Dominic Oram 2020-03-02 16:35:29 +00:00
  • 41f6e1c95e deleted uncommented code in GVL_APP Merge branch 'MBP-136-clean-up-the-code' of https://bitbucket.org/europeanspallationsource/tc_generic_structure into MBP-136-clean-up-the-code kleines 2020-03-02 17:33:55 +01:00
  • f42a22cbe0 deleted uncommented code in GVL_APP kleines 2020-03-02 17:31:50 +01:00
  • c12210b5f3 Merge branch 'MBP-136-clean-up-the-code' of https://bitbucket.org/europeanspallationsource/tc_generic_structure into MBP-136-clean-up-the-code Dominic Oram 2020-03-02 16:29:22 +00:00
  • aaea8a67a3 Update submodule Dominic Oram 2020-03-02 16:29:07 +00:00
  • e29e5a6fd0 Delete the directories with all the error handling files. New tree structure Federico Rojas 2020-03-02 16:16:30 +01:00
  • 9e3a609823 Add commits in tc_mca_std_lib for deleting all the error handling files Federico Rojas 2020-03-02 16:08:34 +01:00
  • a5fa028735 Delete all error handling from MAIN Federico Rojas 2020-03-02 16:07:10 +01:00
  • b8c4e3ff3f Added tcUNIT libarary 1.0.0 references to resources and Test folder inc. app and common tests structure aaronlong 2020-02-19 16:03:29 +00:00
  • 18125e42ba Added test for LREAL assert using tcUNIT helper methods aaronlong 2020-02-19 15:46:14 +00:00
  • c6f051cc61 Used script to fix 'whitespace damage' aaronlong 2020-02-19 15:11:53 +00:00
  • 9c985be4ef Attempt to fix whitespace damage aaronlong 2020-02-19 14:58:39 +00:00
  • 741d03da8d Test suite and examples for tc_mca_std_lib solution aaronlong 2020-02-19 14:54:14 +00:00
  • 1855a0ad58 Reolved merge conflicts aaronlong 2020-02-17 13:29:12 +00:00
  • 44ec03e93c Merged in MBP-132/SaveRestoreOnSimulatedPLCS (pull request #26) Simon Cooper 2020-02-12 11:41:14 +00:00
  • 51464ddd87 Fix whitespace damage Paul Barron 2020-02-12 12:12:10 +01:00
  • 8433721ea4 Add check in MAIN.RESTOR_POSITIONS Paul Barron 2020-02-12 11:56:26 +01:00
  • 06fff58f08 MAIN.TcPOU: Save with TC version 3.1.4024.0 Torsten Bögershausen 2020-02-10 10:58:35 +01:00
  • de53c24b15 solution.tsproj: Remove the 2 axes, commit with TC 3.1.4024.0 Torsten Bögershausen 2020-02-10 10:53:57 +01:00
  • b914a2f62a Initial number of axes is 0 Torsten Bögershausen 2020-02-10 10:51:12 +01:00
  • b522fe177e fix whitespace damage Torsten Bögershausen 2020-02-10 10:44:25 +01:00
  • 5c19425abc Partly ignore solution/_Config/ Torsten Bögershausen 2020-02-10 10:42:26 +01:00
  • bcbc791fe1 Add solution/_Config/NC/NC.xti Torsten Bögershausen 2020-02-10 10:39:51 +01:00
  • 1079229ffb ALLOW LOCAL SIMULATIONS TO BYBASS UPS CHECK Simon-Cooper 2020-02-07 10:17:46 +00:00
  • bf64da273b Ticket compleated to original specification [Luke Nisbet] 2020-02-06 13:38:32 +00:00
  • f0037bcaba Added std_lib unit tests aaronlong 2019-12-24 11:36:25 +00:00
  • 30c80940c7 Renamed tcUNIT folder to Test aaronlong 2019-12-24 11:07:12 +00:00
  • 7c1c9eadcf Removed trailing CR aaronlong 2019-12-24 10:37:06 +00:00
  • 3257c21d12 Added tcUNIT, including helper functions and app test folder, to generic structure aaronlong 2019-12-24 10:29:00 +00:00
  • 13dc7a0ba1 Revert "Added tcUNIT, including helper functions and app test folder, to generic structure" aaronlong 2019-12-24 10:11:14 +00:00
  • 7ee4fae5ad Added tcUNIT, including helper functions and app test folder, to generic structure aaronlong 2019-12-24 10:08:59 +00:00
  • d0201452f6 Merged in MBP-111-bug-error-4b07-immediately-after (pull request #25) Federico Rojas 2019-12-18 16:28:34 +00:00
  • 04a298cfb6 Merged in MBP-59-remove-plctask1 (pull request #24) Federico Rojas 2019-12-18 16:23:13 +00:00
  • 6e0735106d Change PLCtask cycle time to 10ms Federico Rojas 2019-12-18 17:19:00 +01:00
  • 0532cb9214 Remove PLCTask1 from solution Federico Rojas 2019-12-18 17:16:49 +01:00
  • 91b18c6e73 Change TC2_MC library version to 3.3.28 Federico Rojas 2019-12-18 16:44:53 +01:00
  • f360d382a1 Update to latest commit of tc_mca_std_lib Paul Barron 2019-12-18 16:33:53 +01:00
  • 4dfaa181e0 Merged in mbp-59/191218-AdvancedHoming (pull request #23) PaulBarron 2019-12-18 14:35:55 +00:00
  • 4af4094855 Change PLC cycle time to 10ms Paul Barron 2019-12-16 16:18:12 +01:00
  • 200ff88e6f Update to latest commit of tc_mca_std_lib Paul Barron 2019-12-18 15:26:33 +01:00
  • 8c9681895e Merged in mbp-77/191217-RemoveMode2 (pull request #22) PaulBarron 2019-12-18 10:00:00 +00:00
  • 646085d03b Update tc_mca_std_lib to latest version Paul Barron 2019-12-18 10:57:49 +01:00
  • 91b4ee6f6a Merged in mbp-77/191217-RemoveMode2 (pull request #21) PaulBarron 2019-12-18 09:53:28 +00:00
  • 04c7827a7a Merge 'tc_generic_struct/integration' into mbp-77/191217-RemoveMode2 Paul Barron 2019-12-18 10:48:04 +01:00
  • b61bf93b52 Remove hardware and rebuild Paul Barron 2019-12-17 14:54:20 +01:00
  • 4a59909ff1 Update to latest commit in tc_mca_std_lib Paul Barron 2019-12-17 14:49:07 +01:00
  • 1c9d8f3b6b Remove mode 2 from position restore Paul Barron 2019-12-17 14:46:55 +01:00
  • e36d4bcab3 Change comment Paul Barron 2019-12-17 10:37:24 +01:00
  • 5d5ee5f4ad Add latest commit for tc_mca_std_lib Paul Barron 2019-12-17 10:33:57 +01:00
  • 5743a13513 Remove mode 2 from iRestoreCode Paul Barron 2019-12-17 10:27:25 +01:00
  • 094480f040 Update submodules to latest versions to pass the white space test Federico Rojas 2019-12-13 15:21:12 +01:00
  • 29f11a6db0 Rebuild solution after deletting the NC folder and content Federico Rojas 2019-12-13 14:45:20 +01:00
  • c68218106e Delete the NC folder under _Config folder Federico Rojas 2019-12-13 14:35:31 +01:00
  • 3e28bfd79a Not sure what is changed Paul Barron 2019-12-13 13:55:04 +01:00
  • e000543a7f Add ST_AxisPersistent.TcDUT to generic structure Paul Barron 2019-12-13 13:45:50 +01:00
  • 5570b03fad Changes inside tc_mca_std_lib Paul Barron 2019-12-13 13:44:16 +01:00
  • f1063b56d7 Change names of MAIN.STARTUP and MAIN.SHUTDOWN Paul Barron 2019-12-13 13:41:25 +01:00
  • f2d73d013f Fix whitespace damage Paul Barron 2019-12-11 15:24:00 +01:00
  • 3b633b1487 Changes in tc_mca_std_lib Paul Barron 2019-12-11 15:22:36 +01:00
  • a9d5e51ac0 Added saving of position values throughout the normal PLC cycle Paul Barron 2019-12-11 15:17:59 +01:00
  • 10ef1a594d Remove MAIN.SHUTDOWN from ordinary PLC cycle Paul Barron 2019-12-11 15:02:11 +01:00
  • df44dd3b82 Bug fix: add additional check in MAIN.SHUTDOWN Paul Barron 2019-12-11 14:28:54 +01:00
  • 83f1b66c9b Fix white space damage Paul Barron 2019-12-11 13:57:26 +01:00
  • 480f4098bb Moved the cycle through of the read parameter fbs inside if statement Paul Barron 2019-12-11 13:54:19 +01:00
  • 534a318269 Remove timer tmrRetry from MAIN.STARTUP Paul Barron 2019-12-11 13:35:50 +01:00
  • 090fbd03eb Lots of changes in MAIN.STARTUP Paul Barron 2019-12-10 16:48:34 +01:00
  • 80e4ea356e Submodule update: tc_mca_std_lib aaronlong 2019-12-10 14:44:21 +00:00
  • b0338408d3 Merged in MBP-127-commit-files-with-lf-in-repo-crlf (pull request #17) Torsten Bögershausen 2019-12-10 14:28:26 +00:00
  • ac37748fbe Add comments to MAIN.STARTUP Paul Barron 2019-12-10 13:27:05 +01:00
  • dbd145ed68 Add DUT RestorePosition in tc_mca_std_lib Paul Barron 2019-12-10 12:49:37 +01:00
  • f7906d265a Readability change, make case statements easier to read Paul Barron 2019-12-10 11:39:00 +01:00
  • d88816156a Change to variable in axis struct for restore of incremental enc values on lose of power Paul Barron 2019-12-10 11:37:34 +01:00
  • c49d1d0faf Increase homing and jog speeds Paul Barron 2019-12-10 10:37:08 +01:00
  • c6cac2ce7c Set monitoring parameters Paul Barron 2019-12-10 10:26:57 +01:00
  • f59a9dfccf Invert motor polarity for axis 1 Paul Barron 2019-12-09 15:02:05 +01:00
  • ad48a4c161 Invert encoder counting direction on axis 2 Paul Barron 2019-12-09 14:57:14 +01:00
  • dd4cfbe34b Set dynamic parameters for Axis 1 and 2 Paul Barron 2019-12-09 14:49:00 +01:00
  • 57aa137e4e Change encoder scaling factor denominator to 2000 Paul Barron 2019-12-09 14:43:50 +01:00
  • 173400e7f0 Change Reference Velocity to 600 Paul Barron 2019-12-09 14:41:16 +01:00