Commit Graph

590 Commits

Author SHA1 Message Date
Kristina Jurisic d3c8d1451d Update in the tc_mca_std_lib module 2021-09-07 12:55:51 +02:00
Kristina Jurisic 9d5458dd7a Change variable names according to naming standard 2021-09-07 12:54:57 +02:00
Dominic Oram ccc24e4a13 Fixed whitespace 2021-09-03 12:50:17 +01:00
Dominic Oram b5e04aeca5 Merge branch 'master' into MBP-113_Dom_OPC_codes 2021-09-03 12:42:53 +01:00
SCooper d46bfcdd8e update to point at new tc_mca_master - fix whitespace issue in GVL 2021-09-03 12:21:16 +01:00
SCooper 00cdb1f8bd update to point at new tc_mca_master 2021-09-03 12:13:19 +01:00
Dominic Oram 83d508fbfb Make number of axes read only 2021-09-03 11:57:31 +01:00
Dominic Oram b9ff6ca906 Add OPC tag for number of axes 2021-09-03 11:48:55 +01:00
Dominic Oram 830ecbe969 Update submodule 2021-09-01 16:10:07 +01:00
SCooper cd33896c8e Remove ISIS test crate hardware to make branch hardware independent 2021-07-29 11:33:08 +01:00
SCooper cc7d2233a7 re add axis and application templates 2021-07-29 11:23:29 +01:00
SCooper d982c3585e Clean up formatting and whitespace. Add ENUM states for slits. Improve error handling 2021-07-27 13:53:07 +01:00
Kristina Jurisic ac692077d5 Add changes to mca_std_lib 2021-07-27 12:32:56 +02:00
Kristina Jurisic 30987cb389 Change names of variables 2021-07-27 12:32:18 +02:00
Kristina Jurisic 17031d104a Change names of variables bPermit and bInterlock 2021-07-27 12:31:35 +02:00
SCooper 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 2021-07-27 09:22:14 +01:00
SCooper 4827ed4235 add hardware and functions for development with test crate 2021-07-23 12:03:59 +01:00
Kristina Jurisic 13a09ebb2b Solved merge conflicts 2021-06-28 10:30:53 +02:00
Kristina Jurisic ef6507744c Resolved merge conflicts 2021-06-28 10:21:47 +02:00
Kristina Jurisic ef3266b3de Update submodule tc_mca_std_lib 2021-06-27 12:02:05 +02:00
Kristina Jurisic 8fd5903dea Code clean up in FB_PneumaticAxis 2021-06-27 12:01:11 +02:00
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