Commit Graph

36 Commits

Author SHA1 Message Date
Federico Rojas
8dbdba11e2 Build solution with the new pneumatics progs and variables 2025-04-11 15:14:37 +02:00
Federico Rojas G
8dac3ad719 Merge branch 'master' into federicor/prog-for-cabinet-config and update std_lib pointer
Update pointer of tc_mca_std_lib
2025-04-02 14:16:33 +02:00
Federico Rojas
b21d984ce0 Add pressure scaling method and variables to Cabinet_Configuration program
Add getting the scaled values of the cabinet pressure groups as part of the
Cabinet_Configuration program. To later link those values for the alarms in
PILS

modified:   solution/_Config/PLC/tc_project_app.xti
modified:   solution/tc_project_app/POUs/Application_Specific/Applications/Cabinet_Configuration.TcPOU
modified:   solution/tc_project_app/POUs/MAIN.TcPOU
2025-04-02 12:16:59 +02:00
federicorojas
d05f187bb8 Build solution with version 4024.62. Update pointer of tc_mca_std_lib
Unpin the TwinCAT verison 4024.56 and build solution with version 4024.62.
Update the tc_mca_std_lib to commit 9cfc5a1.
Build solution including the new variables from tc_mca_std_lib and new templates.
2025-03-31 15:45:55 +02:00
federicorojas
b1af57436e Build solution without the ST_Backlashconfig.fRampVelocity variable 2025-01-14 15:35:04 +01:00
Federico Rojas
2e51f4e8c5 Update pointer to tc_mca_Std_lib v2.5.0 and build solution 2024-07-16 15:23:42 +02:00
Federico Rojas
c5988a399e Clear invalid persisten data set to TRUE
The option "Clear invlaid persistent data" is set to true.
2024-07-15 16:03:50 +02:00
Federico Rojas
2ca16a4d8d Build solution with the changes in std_lib for MBP-265 2023-12-06 15:39:01 +01:00
kleines
934bca647b Added changes to mc_std_lib 2022-11-16 17:57:58 +01:00
kleines
82f75d9d6a added bInvelocity to VISU 2022-11-16 14:14:28 +01:00
Torsten Bögershausen
e7a5394c02 update TwinCAT version in solution/_Config/NC/NC.xti 2022-10-17 10:20:42 +02:00
Federico Rojas
ba6c691646 Replace obsolete FB_GetDeviceIdentification for FB_GetDeviceIdentificationEx 2022-09-19 14:44:26 +02:00
Federico Rojas
e78b719352 Build solution with new code changes and updated versions 2022-08-25 11:18:44 +02:00
Federico Rojas
4685872bc1 Build solution with new state names in slit code 2022-08-19 15:28:16 +02:00
Federico Rojas
996e273812 Merge'origin/master' into MBP-202_NewSlitCode
Conflicts:
	solution/_Config/PLC/tc_project_app.xti
	solution/solution.tsproj
	solution/tc_project_app/tc_mca_std_lib
2022-08-17 16:40:45 +02:00
Federico Rojas
1fea6ede0e Build solution in version 4024.32 and update pointer of tc_mca_std_lib 2022-08-17 14:01:41 +02:00
Cooper
2166eb14b7 fix to whitespace damage 2022-06-01 11:00:45 +01:00
Cooper
31d836f8d9 clean up of whitespace and test hardware 2022-06-01 10:43:51 +01:00
Cooper
598918bbab move v2 slit code to tc_mca submodule and delete IO and NC axes from testing 2022-06-01 09:04:46 +01:00
SCooper
54ca280288 FB_SlitPairV2 implemented 2022-04-11 16:01:40 +01:00
SCooper
7d007f9249 WIP new slit code 2022-04-11 14:47:46 +01:00
Federico Rojas
bcd7c497b3 Add comments to Axis_template and remove supply outputs from MAIN 2021-09-21 15:18:09 +02: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
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
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
5d7df10f13 Update submodule pointer and add tc_project_app.xti file 2020-05-07 15:15:15 +02:00
Torsten Bögershausen
bcbc791fe1 Add solution/_Config/NC/NC.xti
The NC.xti file is needed for the PLC NC task.
So we re-add it here.
2020-02-10 10:39:51 +01:00
Federico Rojas
c68218106e Delete the NC folder under _Config folder
There was some Axis infomation and this branch should not have HW. I delete the folder and the content
Delete _Config/NC
2019-12-13 14:35:31 +01:00
Torsten Bögershausen
4ca1f6e110 Normalize all line endings to LF in the repo
Change the CRLF strategie:
All (nearly all) files have LF in the repo, and CRLF in the working tree.
When we started, all files had been commited "as is".
Now it is more and more disturbing that Git shows "^M" in git diff
when a line was added or chenged.
To avoid this, store all files in the repo with LF.

To normalzie existing repos for a crate, run:

Step 1)
(unless you have done that already)
git remote add tc_generic_structure https://bitbucket.org/europeanspallationsource/tc_generic_structure.git

Step 2)
git fetch tc_generic_structure

Step 3)
(master below may be integration)
git merge tc_generic_structure/master  -X renormalize
2019-12-04 16:30:58 +01:00
Federico Rojas
062432bb3b Delete Axis 1, 2 1nd 3 to have empty solution 2019-07-08 13:51:04 +02:00
Simon-Cooper
2791f6cf87 Add commit changes of TC_MCA_STD_LIB MPB-95 2019-06-20 11:33:13 +01:00
Simon-Cooper
8e59e35241 Single gear in and gear out support
-Add visualisation elements for support of single gear in
-Add visualisation elements for support of gear out
-Change AXES() action call to use GVL.iAxis as index of FOR loop
2019-06-04 11:46:53 +01:00
Simon-Cooper
9f952987de Visualisation added
Add PLC visualisation first pass
Functionality tested
GUI scales with axes

Issues identified due to base code solution:
A lot of outputs not linked
Execute not cleared by default in code, it is not possible to send repeated commands as if the eCommand is held then the mc_Fb.Execute:=false is never set
Reset not cleared by default in code (if errors again will just auto-reset)
Doesn't clear stop (however this may be a good thing)
Jog velocity input not utilised in mode 0 current set in code, we would need MC_JOGMODE_CONTINUOUS
2019-05-14 16:28:46 +01:00