Commit Graph

469 Commits

Author SHA1 Message Date
Kristina Jurisic 21cb8a5430 Made hmiPneumaticAxisvariable to use for PneumaticsVisu 2021-06-27 11:58:48 +02:00
Kristina Jurisic aa0f6d47d4 Made instructions on how to use PneumaticsVisu 2021-06-27 11:57:37 +02:00
Kristina Jurisic 1250efe4d6 Changes from pneumatic visu to global text list 2021-06-27 11:56:42 +02:00
Kristina Jurisic e8f1b751d7 Change some variable names, add bPermit 2021-06-27 11:54:44 +02:00
Federico Rojas 0ca1513fcd Update submodule pointer to latest commit 2021-06-17 13:29:14 +02:00
Kristina Jurisic 88d6e5881c Add changes in the tc_mca_std_lib submodule 2021-06-16 13:01:55 +02:00
Kristina Jurisic 070efeee83 Define one pneumatic axis for testing 2021-06-16 13:01:05 +02:00
Kristina Jurisic 07fde8b83a Cleaning up code 2021-06-16 13:00:20 +02:00
Kristina Jurisic 895f7ab849 Update tc_mca_std_lib 2021-06-15 15:35:06 +02:00
Kristina Jurisic f2608e4812 Fix white space damage 2021-06-15 15:19:58 +02:00
Kristina Jurisic e5aa911ef0 Fix white space damage 2021-06-15 15:19:17 +02:00
Kristina Jurisic 4fdd4a3e6f Add all variables to the PneumaticAxisStruct 2021-06-15 14:49:25 +02:00
Kristina Jurisic 7c4025ab16 Delete Pneumatic_Axis PROG 2021-06-15 13:50:14 +02:00
Kristina Jurisic 1659537b9e Add array of FB_PneumaticAxis 2021-06-15 13:43:01 +02:00
Kristina Jurisic caa514e97f Add constant var nPNEUMATIC_AXIS_NUM to GVL_APP 2021-06-15 13:40:22 +02:00
Kristina Jurisic 26265f62d3 Readd the Application_Template POU 2021-06-15 11:39:35 +02:00
Kristina Jurisic 4492ed868c Merge remote-tracking branch 'origin/master' into MBP-105-control-of-pneumatic-actuators 2021-06-15 11:30:39 +02:00
Kristina Jurisic 6a91fcb121 Compile solution with latest code changes 2021-06-15 11:17:51 +02:00
Kristina Jurisic 2499611ae0 rename folder to Apllication_Specific 2021-06-15 11:11:26 +02:00
Kristina Jurisic 75e8a301f8 Fix broken branch thus a crash, commiting old changes 2021-06-15 11:05:53 +02:00
Kristina Jurisic b0e9ee51bc Add Pneumatics_Template PROG
Added PROG with the instructions for user.
2021-06-13 08:15:11 +02:00
Federico Rojas 0d193957ac Update tc_mca_std_lib to latest commit 2021-06-10 16:45:56 +02:00
Kristina Jurisic df84335a9a Fixed white spaces
Fixed white spaces in the code of FB_PNEUMATIC_AXIS.
2021-06-03 11:58:00 +02:00
Kristina Jurisic 0644a7013f Add ERROR state machine
Added state machine for different errors that can occur during pneumatic
cylinder work:
the cylinder didn't reach the position in allowed time
cylinder didn't move after the move command
no permit to move
2021-05-27 10:30:24 +02:00
Kristina Jurisic 84cf7da942 Add timing of the move command
If the cylinder doesn't start moving from one of the end positions after
certain time, this means that the cylinder is in error state.
2021-05-25 12:09:18 +02:00
Kristina Jurisic d880757c7d Add timing variables
User can define allowed time in seconds for the extraction and retraction of the
pneumatic cylinder.
2021-05-24 13:14:59 +02:00
Kristina Jurisic 7bc5d39db3 Modified program Pneumatic_Axis
Removed setting Permit parameter from the program Pneumatic_Axis.
2021-05-21 12:55:11 +02:00
Kristina Jurisic 709e9d062d Add Pneumatic Axis struct
Added struct of structs Pneumatic Axis in the FB_PNEUMATIC_AXIS.
It includes all the inputs, control, status and errors for the pneumatic axis.
2021-05-21 12:52:47 +02:00
Kristina Jurisic b935535e71 Add actions in FB Pneumatic Axis
Added actions for single solenoid state machine.
2021-05-19 13:37:57 +02:00
Kristina Jurisic 0e81f9b28c Change TwinCAT version
Changed version from 3.1.4024.6 to 3.1.4024.5
2021-05-18 13:11:51 +02:00
Kristina Jurisic 6fa5106669 Program to call Pneumatic Axis FB
Call pneumatic axis FB
2021-05-18 12:59:14 +02:00
Kristina Jurisic f30542ed8e Add call for a pneumatic FB from Main
Added program call for the pneumatic axis FB from Main PROG().
2021-05-04 13:05:44 +02:00
Kristina Jurisic 330fc0c878 Add changes for the pneumatic axis
Added FB and a program for the pneumatic axis.
2021-05-04 13:00:29 +02:00
Kristina Jurisic 7421924815 Add pneumatic axis to the solution
Added pnuematic acutator FB, programs and DUTs.
2021-05-04 12:57:14 +02:00
Kristina Jurisic 2ee6e1376d Add program to call FB_PNEUMATIC_AXIS
Program Pneumatic_Axis used to call for the pneumatic actuator axis FB.
2021-05-04 12:52:47 +02:00
Kristina Jurisic 9f2f07b960 Add FB_PNEUMATIC_AXIS
FB to control pneumatic actuator.
Currently implemented: single solenoid valve control, from PLC and manually.
2021-05-04 12:42:37 +02:00
Federico Rojas 237b01cb3b Update pointer to merge commit of MBP-176 in tc_mca_std_lib 2021-03-23 10:11:53 +01:00
Federico Rojas 0f46356645 Update submodule pointer to the merge of latest version 2021-03-12 11:13:17 +01:00
Federico Rojas 64a74eeee7 Disable auto priority management of tasks so it does not change with every compile 2021-03-10 11:19:41 +01:00
Federico Rojas bb4328e6b5 Update pointer of mca_std_lib 2021-03-08 15:13:40 +01:00
Federico Rojas 8ad900e534 Add tc_project_app as an independent project file and activate auto priroty manager for tasks 2021-02-19 12:05:24 +01:00
Federico Rojas 9d760988a0 Delete all files related to the Test unit folder and library 2021-02-19 12:04:06 +01:00
Federico Rojas 440717aadc Update Tc2_Mc2 library to version 3.3.41.0 2021-02-19 11:34:19 +01:00
Federico Rojas f620652a84 Update tc_mca_std_lib to latest version 2021-02-19 11:33:55 +01:00
Federico Rojas 4bdb673424 Fix white space damage and update std_lib pointer 2021-01-25 13:45:36 +01:00
Federico Rojas d7060a75e0 Update tc_mca_std_lib's pointer to match MBP-169 2021-01-25 13:40:54 +01:00
Federico Rojas 5394cec66b Add the folder strucutre, templates and necessary variables for the Application Specific section 2021-01-25 13:39:54 +01:00
Federico Rojas b7388e21c6 Delete the program prog from the solution and just leave the action from MAIN 2020-12-09 15:59:35 +01:00
Federico Rojas 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 2020-12-09 15:56:26 +01:00
Federico Rojas 6cdfc7a0f3 Create EXAMPLE() program and call it to show the intended use 2020-12-09 15:50:58 +01:00