Commit Graph

  • 0e5b2240a7 Update tc_mca_std_lib pointer Federico Rojas 2021-09-14 10:44:37 +02:00
  • 7f388acd8c Update tc_mca_std_lib pointer Federico Rojas 2021-09-14 10:44:37 +02:00
  • 1ecfa38fbb Update tc_mca_std module Kristina Jurisic 2021-09-13 07:50:10 +02:00
  • 6c6fb400c3 Code clean up in the FB_Pneumatics Kristina Jurisic 2021-09-07 12:56:30 +02:00
  • d3c8d1451d Update in the tc_mca_std_lib module Kristina Jurisic 2021-09-07 12:55:51 +02:00
  • 9d5458dd7a Change variable names according to naming standard Kristina Jurisic 2021-09-07 12:54:57 +02:00
  • 041c6b1a1a Merged in MBP-113_Dom_OPC_codes (pull request #58) Dominic Oram 2021-09-03 11:53:33 +00:00
  • ccc24e4a13 Fixed whitespace Dominic Oram 2021-09-03 12:50:17 +01:00
  • b5e04aeca5 Merge branch 'master' into MBP-113_Dom_OPC_codes Dominic Oram 2021-09-03 12:42:53 +01:00
  • d46bfcdd8e update to point at new tc_mca_master - fix whitespace issue in GVL SCooper 2021-09-03 12:21:16 +01:00
  • 00cdb1f8bd update to point at new tc_mca_master SCooper 2021-09-03 12:13:19 +01:00
  • 83d508fbfb Make number of axes read only Dominic Oram 2021-09-03 11:57:31 +01:00
  • b9ff6ca906 Add OPC tag for number of axes Dominic Oram 2021-09-03 11:48:55 +01:00
  • 830ecbe969 Update submodule Dominic Oram 2021-09-01 16:10:07 +01:00
  • cd33896c8e Remove ISIS test crate hardware to make branch hardware independent SCooper 2021-07-29 11:33:08 +01:00
  • cc7d2233a7 re add axis and application templates SCooper 2021-07-29 11:23:29 +01:00
  • d982c3585e Clean up formatting and whitespace. Add ENUM states for slits. Improve error handling SCooper 2021-07-27 13:53:07 +01:00
  • ac692077d5 Add changes to mca_std_lib Kristina Jurisic 2021-07-27 12:32:56 +02:00
  • 30987cb389 Change names of variables Kristina Jurisic 2021-07-27 12:32:18 +02:00
  • 17031d104a Change names of variables bPermit and bInterlock Kristina Jurisic 2021-07-27 12:31:35 +02:00
  • 6a79f654f1 Add test program for implementing slit set, add hardware for testing slit set implementation. Update solution to point at new tc_mca_Std_lib files SCooper 2021-07-27 09:22:14 +01:00
  • 4827ed4235 add hardware and functions for development with test crate SCooper 2021-07-23 12:03:59 +01:00
  • 13a09ebb2b Solved merge conflicts Kristina Jurisic 2021-06-28 10:30:53 +02:00
  • ef6507744c Resolved merge conflicts Kristina Jurisic 2021-06-28 10:21:47 +02:00
  • ef3266b3de Update submodule tc_mca_std_lib Kristina Jurisic 2021-06-27 12:02:05 +02:00
  • 8fd5903dea Code clean up in FB_PneumaticAxis Kristina Jurisic 2021-06-27 12:01:11 +02:00
  • 21cb8a5430 Made hmiPneumaticAxisvariable to use for PneumaticsVisu Kristina Jurisic 2021-06-27 11:58:48 +02:00
  • aa0f6d47d4 Made instructions on how to use PneumaticsVisu Kristina Jurisic 2021-06-27 11:57:37 +02:00
  • 1250efe4d6 Changes from pneumatic visu to global text list Kristina Jurisic 2021-06-27 11:56:42 +02:00
  • e8f1b751d7 Change some variable names, add bPermit Kristina Jurisic 2021-06-27 11:54:44 +02:00
  • a7e214719e Merged in MBP-182-add-interlock-fwd-and-bwd (pull request #56) Federico Rojas 2021-06-17 11:37:04 +00:00
  • 0ca1513fcd Update submodule pointer to latest commit Federico Rojas 2021-06-17 13:24:46 +02:00
  • 88d6e5881c Add changes in the tc_mca_std_lib submodule Kristina Jurisic 2021-06-16 13:01:55 +02:00
  • 070efeee83 Define one pneumatic axis for testing Kristina Jurisic 2021-06-16 13:01:05 +02:00
  • 07fde8b83a Cleaning up code Kristina Jurisic 2021-06-16 13:00:20 +02:00
  • 895f7ab849 Update tc_mca_std_lib Kristina Jurisic 2021-06-15 15:35:06 +02:00
  • f2608e4812 Fix white space damage Kristina Jurisic 2021-06-15 15:19:58 +02:00
  • e5aa911ef0 Fix white space damage Kristina Jurisic 2021-06-15 15:19:17 +02:00
  • 4fdd4a3e6f Add all variables to the PneumaticAxisStruct Kristina Jurisic 2021-06-15 14:49:25 +02:00
  • 7c4025ab16 Delete Pneumatic_Axis PROG Kristina Jurisic 2021-06-15 13:50:14 +02:00
  • 1659537b9e Add array of FB_PneumaticAxis Kristina Jurisic 2021-06-15 13:43:01 +02:00
  • caa514e97f Add constant var nPNEUMATIC_AXIS_NUM to GVL_APP Kristina Jurisic 2021-06-15 13:40:22 +02:00
  • 26265f62d3 Readd the Application_Template POU Kristina Jurisic 2021-06-15 11:39:35 +02:00
  • 4492ed868c Merge remote-tracking branch 'origin/master' into MBP-105-control-of-pneumatic-actuators Kristina Jurisic 2021-06-15 11:30:39 +02:00
  • 6a91fcb121 Compile solution with latest code changes Kristina Jurisic 2021-06-15 11:17:51 +02:00
  • 2499611ae0 rename folder to Apllication_Specific Kristina Jurisic 2021-06-15 11:11:26 +02:00
  • 75e8a301f8 Fix broken branch thus a crash, commiting old changes Kristina Jurisic 2021-06-15 11:05:53 +02:00
  • b0e9ee51bc Add Pneumatics_Template PROG Kristina Jurisic 2021-06-13 08:15:11 +02:00
  • 0d193957ac Update tc_mca_std_lib to latest commit Federico Rojas 2021-06-10 16:45:56 +02:00
  • df84335a9a Fixed white spaces Kristina Jurisic 2021-06-03 11:58:00 +02:00
  • 0644a7013f Add ERROR state machine Kristina Jurisic 2021-05-27 10:30:24 +02:00
  • 84cf7da942 Add timing of the move command Kristina Jurisic 2021-05-25 12:09:18 +02:00
  • d880757c7d Add timing variables Kristina Jurisic 2021-05-24 13:14:59 +02:00
  • 7bc5d39db3 Modified program Pneumatic_Axis Kristina Jurisic 2021-05-21 12:55:11 +02:00
  • 709e9d062d Add Pneumatic Axis struct Kristina Jurisic 2021-05-21 12:52:47 +02:00
  • b935535e71 Add actions in FB Pneumatic Axis Kristina Jurisic 2021-05-19 13:37:57 +02:00
  • 0e81f9b28c Change TwinCAT version Kristina Jurisic 2021-05-18 13:11:51 +02:00
  • 6fa5106669 Program to call Pneumatic Axis FB Kristina Jurisic 2021-05-18 12:59:14 +02:00
  • f30542ed8e Add call for a pneumatic FB from Main Kristina Jurisic 2021-05-04 13:05:44 +02:00
  • 330fc0c878 Add changes for the pneumatic axis Kristina Jurisic 2021-05-04 13:00:29 +02:00
  • 7421924815 Add pneumatic axis to the solution Kristina Jurisic 2021-05-04 12:57:14 +02:00
  • 2ee6e1376d Add program to call FB_PNEUMATIC_AXIS Kristina Jurisic 2021-05-04 12:52:47 +02:00
  • 9f2f07b960 Add FB_PNEUMATIC_AXIS Kristina Jurisic 2021-05-04 12:42:37 +02:00
  • 5a82379d8a Merged in MBP-176-Localmode (pull request #54) Federico Rojas 2021-03-23 10:07:39 +00:00
  • 237b01cb3b Update pointer to merge commit of MBP-176 in tc_mca_std_lib Federico Rojas 2021-03-23 10:11:53 +01:00
  • 5e247bf128 Merged in federicor/210312-update-submodule-pointer (pull request #53) Federico Rojas 2021-03-12 10:17:27 +00:00
  • 0f46356645 Update submodule pointer to the merge of latest version Federico Rojas 2021-03-12 11:13:17 +01:00
  • 529e83fada Merged in MBP-177-interlock-bit-in-gvl (pull request #52) Federico Rojas 2021-03-12 08:47:57 +00:00
  • 64a74eeee7 Disable auto priority management of tasks so it does not change with every compile Federico Rojas 2021-03-10 11:19:41 +01:00
  • bb4328e6b5 Update pointer of mca_std_lib Federico Rojas 2021-03-08 15:13:40 +01:00
  • 0aa6894d6c Merged in MBP-173-delete-unit-test-files (pull request #51) Federico Rojas 2021-02-23 09:39:56 +00:00
  • 8ad900e534 Add tc_project_app as an independent project file and activate auto priroty manager for tasks Federico Rojas 2021-02-19 12:05:24 +01:00
  • 9d760988a0 Delete all files related to the Test unit folder and library Federico Rojas 2021-02-19 12:04:06 +01:00
  • 440717aadc Update Tc2_Mc2 library to version 3.3.41.0 Federico Rojas 2021-02-19 11:34:19 +01:00
  • f620652a84 Update tc_mca_std_lib to latest version Federico Rojas 2021-02-19 11:33:55 +01:00
  • 2dc6dbdb14 Merged in MBP-169-pou-for-application-specific-code (pull request #49) Federico Rojas 2021-01-29 11:03:12 +00:00
  • 4bdb673424 Fix white space damage and update std_lib pointer Federico Rojas 2021-01-25 13:45:36 +01:00
  • d7060a75e0 Update tc_mca_std_lib's pointer to match MBP-169 Federico Rojas 2021-01-25 13:40:54 +01:00
  • 5394cec66b Add the folder strucutre, templates and necessary variables for the Application Specific section Federico Rojas 2021-01-25 13:39:54 +01:00
  • c4a9e96037 Update version number to 3.1.4024.11 in the pyhton file for the pipeline Federico Rojas 2020-12-09 16:17:26 +01:00
  • b7388e21c6 Delete the program prog from the solution and just leave the action from MAIN Federico Rojas 2020-12-09 15:59:35 +01:00
  • 393d1282ab Merge branch 'MBP-169-pou-for-application-specific-code' of https://bitbucket.org/europeanspallationsource/tc_generic_structure into MBP-169-pou-for-application-specific-code Federico Rojas 2020-12-09 15:56:26 +01:00
  • 6cdfc7a0f3 Create EXAMPLE() program and call it to show the intended use Federico Rojas 2020-12-09 15:50:58 +01:00
  • 7a92737f10 create folder for Application Specific programs Federico Rojas 2020-12-09 15:50:17 +01:00
  • 91efd95975 Add POU PROG to the solution and call it from MAIN Federico Rojas 2020-12-09 15:25:02 +01:00
  • cf3c760290 Delete the action PROG() from the solution Federico Rojas 2020-12-09 15:18:00 +01:00
  • 995bb53182 Merged in MBP-163-update-and-test-twincat-version- (pull request #46) Torsten Bögershausen 2020-12-07 10:57:48 +00:00
  • 5c07bb2db3 Update solution/tc_project_app/tc_mca_std_lib to master branch Torsten Bögershausen 2020-12-04 12:35:31 +01:00
  • 1f619fefe4 Change to TwinCAT 4024.12 Torsten Bögershausen 2020-11-16 09:19:28 +01:00
  • cfe52c143d solution/tc_project_app/tc_mca_std_libDUTs/E_AxisParameters.TcTLEO: Fix whitespace damage Torsten Bögershausen 2020-11-11 11:54:32 +01:00
  • bdefd8a969 Update to TwinCAT TC31-Full-Setup.3.1.4024.11 Torsten Bögershausen 2020-11-11 11:40:48 +01:00
  • 877b0620a9 Merged in MBP-155-access-to-NC-parameters (pull request #44) PaulBarron 2020-07-03 15:05:14 +00:00
  • 5727b63cb0 Update to latest version of tc_mca_std_lib Paul Barron 2020-07-01 19:27:14 +02:00
  • 798e4c4fd8 Update to latest pointer of tc_mca_std_lib Paul Barron 2020-07-01 19:15:51 +02:00
  • 0810280ba4 Update to latest commit of tc_mca_std_lib Paul Barron 2020-07-01 18:28:40 +02:00
  • 42d908d8b7 Update tc_mca_std_lib Paul Barron 2020-07-01 12:45:20 +02:00
  • 02addfc848 Merge branch 'master' into MBP-155-access-to-NC-parameters Paul Barron 2020-07-01 12:35:17 +02:00
  • 96ff81ced1 Merge branch 'MBP-155-access-to-NC-parameters' Paul Barron 2020-07-01 12:14:02 +02:00
  • 00ea16974b Merged in MBP-157-implement-application-access-to- (pull request #45) Harald Kleines 2020-07-01 09:56:38 +00:00
  • c335b85e40 Update to latest commit of tc_mca_std_lib Paul Barron 2020-06-29 11:03:54 +02:00