Commit Graph

  • 99f89c3bc8 OOP: Introduce interfaces for application specific code Torsten Bögershausen 2022-10-17 10:22:46 +02:00
  • c026a0bc6c Fix OPC attributes in GVL_APP.TcGVL Torsten Bögershausen 2022-10-17 10:22:10 +02:00
  • e7a5394c02 update TwinCAT version in solution/_Config/NC/NC.xti Torsten Bögershausen 2022-10-17 10:20:42 +02:00
  • 7eda64fa5f Summary :twincat_version_manager.py: Check .xti files for correct version Torsten Bögershausen 2022-10-17 10:20:06 +02:00
  • df503583e1 Remove LineIDs from files Torsten Bögershausen 2022-10-17 10:14:55 +02:00
  • 3d3d3aebfb Ignore LineIDs.dbg Torsten Bögershausen 2022-10-17 10:13:03 +02:00
  • 3335971d3f Refactoring code with new variable name fEncoderBiasAtShutdown Federico Rojas 2022-10-14 16:06:29 +02:00
  • 0350afac73 Merge remote-tracking branch 'origin/MBP-198_OOP' into MBP-221-add-restore-position-bias Federico Rojas 2022-10-14 15:55:30 +02:00
  • 3c0a37a0e7 Format notes and correct indentation to MAIN.RESTORE_POSITION() Federico Rojas 2022-10-14 15:11:03 +02:00
  • 2d5075390a Update tc_mca_Std_lib pointer after OOP merge Federico Rojas 2022-10-14 14:42:52 +02:00
  • c8a3bd3619 Restore files that have nothing to do with the MBP_OOP ticket Federico Rojas 2022-10-14 13:51:44 +02:00
  • 0aa2f1745c Update pointer to newest verison of tc_mca_std_lib Federico Rojas 2022-10-06 12:55:33 +02:00
  • dc531c102f Recompile files without LineIDs Federico Rojas 2022-10-06 11:16:02 +02:00
  • a13f780a6d Add git ignore for the LineIDs.dbg file Federico Rojas 2022-10-06 10:57:56 +02:00
  • bbf233a637 Merge branch 'origin/master' into MBP-198_OOP Federico Rojas 2022-10-04 17:19:45 +02:00
  • 0f741497d1 Updatepointer to OOP std_lib version Federico Rojas 2022-10-04 17:17:55 +02:00
  • 99a3efce66 Add FB_CustomAxis example and update pointer Federico Rojas 2022-10-04 17:11:37 +02:00
  • e79eb244d1 Merged in MBP-226-fb-getdeviceidentification-obsolete (pull request #68) Federico Rojas 2022-10-04 14:25:16 +00:00
  • 33c2c06338 Test: Delete redundancy in linking FB and interfaces in AXES() Federico Rojas 2022-09-30 16:07:16 +02:00
  • 054a460e8d Build solution with new code and new commits form tc_mca_std_lib Federico Rojas 2022-09-27 16:51:22 +02:00
  • 1b57b2e04c Add code to read. store and restore the encoder position BIAS in case of power failure Federico Rojas 2022-09-27 16:50:37 +02:00
  • ba6c691646 Replace obsolete FB_GetDeviceIdentification for FB_GetDeviceIdentificationEx Federico Rojas 2022-09-19 14:44:26 +02:00
  • 0d6a9e255a Delete file tc_project_app.tmcRefac Federico Rojas 2022-08-25 13:18:31 +02:00
  • c852cd9e57 Merge branch 'origin/master' into MBP-198_OOP Federico Rojas 2022-08-25 13:11:11 +02:00
  • 9b4fc9f313 Merged in MBP-202_NewSlitCode (pull request #65) Federico Rojas 2022-08-25 09:25:06 +00:00
  • e78b719352 Build solution with new code changes and updated versions Federico Rojas 2022-08-25 11:18:44 +02:00
  • d1c156f502 Merge 'origin/master' into MBP-202_NewSlitCode Federico Rojas 2022-08-19 15:30:17 +02:00
  • 4685872bc1 Build solution with new state names in slit code Federico Rojas 2022-08-19 15:28:16 +02:00
  • baa181d99a Merged in federicor/rename-relocate-ess-monitoring-files (pull request #66) Federico Rojas 2022-08-19 11:23:49 +00:00
  • 52d00a2f92 Build solution with new name and location of ess monitoring files Federico Rojas 2022-08-19 13:18:32 +02:00
  • 996e273812 Merge'origin/master' into MBP-202_NewSlitCode Federico Rojas 2022-08-17 16:40:45 +02:00
  • 5172e3150b Merged in MBP-225-update-version-control-pipeline (pull request #64) Federico Rojas 2022-08-17 12:25:25 +00:00
  • 505c96cc8e Merge 'origin/master' into MBP-225-update-version-control-pipeline Federico Rojas 2022-08-17 14:20:05 +02:00
  • 87b8b64fb7 Merged in MBP-223-remove-lineids-from-twincat-sour (pull request #63) Torsten Bögershausen 2022-08-17 12:03:45 +00:00
  • d5d18d5b5d Merge remote-tracking branch 'origin/master' into MBP-223-remove-lineids-from-twincat-sour Federico Rojas 2022-08-17 14:03:00 +02:00
  • 1fea6ede0e Build solution in version 4024.32 and update pointer of tc_mca_std_lib Federico Rojas 2022-08-17 14:01:24 +02:00
  • ce8d745cca Update all files to new build version. To 3024.11 and 3024.32 Federico Rojas 2022-08-16 15:24:12 +02:00
  • c4bdac87e8 Code refactor to meeting coding standards Cooper 2022-08-15 15:20:29 +01:00
  • 60700b1d46 Swap AXES and PROG execution order, allow logic to execute and send commands on the same cycle SCooper 2022-07-29 14:26:18 +01:00
  • 15bc90833a Update tc_mca_std_lib SCooper 2022-07-27 15:37:44 +01:00
  • 387a662d19 include TMC and TPY, remove axes from test SCooper 2022-07-27 15:34:28 +01:00
  • 2222e7539e refactoring to clean up whitespace SCooper 2022-07-27 15:25:53 +01:00
  • 37b8f7490c Write parameter implemented SCooper 2022-07-27 14:39:02 +01:00
  • 2bdf9e786b Read parameter added to OOP implementation. Visu parameter reads fixed to reference GVL not afbaxes. Text list support added for parameters to allow combo box selection on Visu rather than typing in number SCooper 2022-07-27 12:28:33 +01:00
  • 35a43cb4b9 Update pointer to latest version of tc_mca_std_lib Federico Rojas 2022-07-21 10:00:48 +02:00
  • 014de5a579 Update pointer to latest version of tc_mca_std_lib Federico Rojas 2022-07-21 09:56:42 +02:00
  • ccfd2ace00 Merge branch 'master' of https://bitbucket.org/europeanspallationsource/tc_generic_structure Federico Rojas 2022-07-20 10:20:20 +02:00
  • 7da57bc5e3 Ignore LineIDs.dbg Torsten Bögershausen 2022-07-18 15:20:27 +02:00
  • 0033d95627 Error IDs propragating through SCooper 2022-07-13 15:19:46 +01:00
  • f0dff8ea56 multi gearing logic improved. Status logic changed to array of pointers for easier scaling. Homing added SCooper 2022-07-13 11:30:28 +01:00
  • 0808f6c41b Gear in and gear out implemented SCooper 2022-07-08 15:00:47 +01:00
  • 7020a23a83 new status methods added for done, busy, error, cmdAborted. MoveVelocity added SCooper 2022-07-08 11:33:32 +01:00
  • 976ef8dedc OOP implementation of FB_Axis created with basic functionality Cooper 2022-07-07 14:36:10 +01:00
  • 2a288d8d21 Merged in MBP-166-Remove-Config-From-gitignore (pull request #62) luke.nisbet 2022-07-06 08:38:56 +00:00
  • 57297e54c4 Removed _Config/NC/Axes and _Config/IO from .gitignore LNisbet 2022-07-05 14:59:24 +01:00
  • b3cdf0885e Merge branch 'master' of https://bitbucket.org/europeanspallationsource/tc_generic_structure Federico Rojas 2022-06-08 10:56:04 +02:00
  • 010f31886d point to latest tc_mca commit Cooper 2022-06-01 11:01:36 +01:00
  • 2166eb14b7 fix to whitespace damage Cooper 2022-06-01 11:00:45 +01:00
  • 31d836f8d9 clean up of whitespace and test hardware Cooper 2022-06-01 10:43:51 +01:00
  • 51b3029691 Revert GVL_APP axis count to 0 Cooper 2022-06-01 09:10:10 +01:00
  • 598918bbab move v2 slit code to tc_mca submodule and delete IO and NC axes from testing Cooper 2022-06-01 09:04:46 +01:00
  • 037218b267 Homing 'fixed' on state machine SCooper 2022-04-12 15:13:01 +01:00
  • 2b41f3aa4b Fixed an issue with setpoint generators not enabling when a limit is pressed SCooper 2022-04-12 11:14:11 +01:00
  • 54ca280288 FB_SlitPairV2 implemented SCooper 2022-04-11 16:01:40 +01:00
  • 7d007f9249 WIP new slit code SCooper 2022-04-11 14:47:46 +01:00
  • 8c95fa90f4 Biuld solution with latest update of tc_mca_std_lib Federico Rojas 2022-04-05 15:10:16 +02:00
  • 1d871d7de3 Merge branch 'master' of https://bitbucket.org/europeanspallationsource/tc_generic_structure Federico Rojas 2022-03-21 14:43:06 +01:00
  • 69ebe9e125 Comment the templates call for pneumatics and application in MAIN/PROG federicorojas 2022-02-04 13:56:40 +01:00
  • 3eec9b48d0 Comment the templates call for pneumatics and application in MAIN/PROG federicorojas 2022-02-04 13:56:40 +01:00
  • bb62c2b55f Relocate Pneumatics_Template() PROG to be under Axes Folder federicorojas 2022-02-04 13:44:15 +01:00
  • 58aca048b2 Update tc_mca_Std_lib submodule pointer Federico Rojas 2022-01-18 10:58:32 +01:00
  • c15278fbbb Merged in MBP-105-control-of-pneumatic-actuators (pull request #57) Kristina Jurisic 2021-11-10 14:39:01 +00:00
  • c9db4970f2 Merge remote-tracking branch 'origin/master' into MBP-105-control-of-pneumatic-actuators Federico Rojas 2021-11-10 15:37:17 +01:00
  • dba7a2e728 Rebiuld solution with new changes Federico Rojas 2021-11-10 15:36:25 +01:00
  • 78d6708762 Delete testing comments and put them to pull request Federico Rojas 2021-11-10 15:35:58 +01:00
  • 04b8be52f7 update submodule pointer Federico Rojas 2021-11-10 15:35:11 +01:00
  • e97ca48e43 update submodule pointer Federico Rojas 2021-11-10 15:26:00 +01:00
  • 119cb87cb7 Merged in MBP-189_FB_SlitPairBug (pull request #61) Simon Cooper 2021-11-10 14:12:05 +00:00
  • fb07d21219 Update pneumatics FB in mca_std_lib Kristina Jurisic 2021-11-04 12:05:12 +01:00
  • 8fe2a7d8a1 Update plc project after variable name change Kristina Jurisic 2021-11-04 12:04:06 +01:00
  • 1b8ad61f58 Change pneumatic axis constant to 0 in the GVLs Kristina Jurisic 2021-11-04 12:01:51 +01:00
  • 1ca80e7e2b Pneumatic axis FB update, change variable names Kristina Jurisic 2021-11-04 12:01:01 +01:00
  • 7ec94571f3 File versions fixed Cooper 2021-11-02 09:34:15 +00:00
  • 4685e124c5 White space cleanup. Add bResetting to FB_SlitPair to allow reset commands to function Cooper 2021-11-02 09:28:51 +00:00
  • e20b162703 Add new state to FB_SlitPair to clear the calibration flag of the virtual axes Cooper 2021-11-02 08:41:56 +00:00
  • 3698d6c1ea Add code changes from tc_mca_std_lib Kristina Jurisic 2021-11-01 12:55:25 +01:00
  • 994b2a4358 Create variable hmiPneumaticAxis for Pneumatic VISU Kristina Jurisic 2021-11-01 12:54:49 +01:00
  • a502e2275b Set pneumatic axis to 1 Kristina Jurisic 2021-11-01 12:53:52 +01:00
  • f9aabf8513 Merge remote-tracking branch 'origin/master' into MBP-105-control-of-pneumatic-actuators Kristina Jurisic 2021-11-01 10:36:56 +01:00
  • a2afeeb99e Change pneumatic axis number in GVL_APP to 0 and build Kristina Jurisic 2021-11-01 10:22:39 +01:00
  • fdf5921942 Update for the mca_std_lib after solving GVLs errors Kristina Jurisic 2021-10-27 11:39:44 +02:00
  • 413b965db4 Merged in MBP-188-delete-suuply-output-from-main (pull request #59) Federico Rojas 2021-09-21 13:25:13 +00:00
  • bcd7c497b3 Add comments to Axis_template and remove supply outputs from MAIN Federico Rojas 2021-09-21 15:18:09 +02:00
  • d487177dc0 Merged master into MBP-188-delete-suuply-output-from-main Federico Rojas 2021-09-21 13:06:30 +00:00
  • 763f810c74 Update tc_mca_std_lib pointer federicorojas 2021-09-21 14:41:33 +02:00
  • a3df820dbe Merged in MBP-107_SlitFB (pull request #60) Simon Cooper 2021-09-21 12:33:05 +00:00
  • 91e5e592a0 Update submodule pointer federicorojas 2021-09-21 14:32:16 +02:00
  • 38f43aa00c Merged master into MBP-188-delete-suuply-output-from-main Federico Rojas 2021-09-21 12:16:19 +00:00
  • 29901054b7 Look at local system SCooper 2021-09-21 13:01:36 +01:00
  • 298c54c67f mcaStdLib update for multimaster gear snyc mode SCooper 2021-09-21 12:55:25 +01:00