Kristina Jurisic
f9aabf8513
Merge remote-tracking branch 'origin/master' into MBP-105-control-of-pneumatic-actuators
2021-11-01 10:36:56 +01:00
Kristina Jurisic
a2afeeb99e
Change pneumatic axis number in GVL_APP to 0 and build
2021-11-01 10:22:39 +01:00
Kristina Jurisic
fdf5921942
Update for the mca_std_lib after solving GVLs errors
2021-10-27 11:39:44 +02:00
Federico Rojas
bcd7c497b3
Add comments to Axis_template and remove supply outputs from MAIN
2021-09-21 15:18:09 +02:00
federicorojas
763f810c74
Update tc_mca_std_lib pointer
2021-09-21 14:41:33 +02:00
Simon Cooper and Federico Rojas
a3df820dbe
Merged in MBP-107_SlitFB (pull request #60 )
...
MBP-107 SlitFB
Approved-by: Federico Rojas
2021-09-21 12:33:05 +00:00
federicorojas
91e5e592a0
Update submodule pointer
2021-09-21 14:32:16 +02:00
SCooper
298c54c67f
mcaStdLib update for multimaster gear snyc mode
2021-09-21 12:55:25 +01:00
Federico Rojas
7f388acd8c
Update tc_mca_std_lib pointer
2021-09-14 10:44:37 +02:00
Kristina Jurisic
1ecfa38fbb
Update tc_mca_std module
2021-09-13 07:50:10 +02:00
Kristina Jurisic
6c6fb400c3
Code clean up in the FB_Pneumatics
2021-09-07 12:56:30 +02:00
Kristina Jurisic
d3c8d1451d
Update in the tc_mca_std_lib module
2021-09-07 12:55:51 +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
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
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
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
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
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