Commit Graph

787 Commits

Author SHA1 Message Date
60ad70f818 ISO-230 Measurement
All checks were successful
checkformat / build (push) Successful in 3s
2025-05-15 15:24:08 +02:00
bc6acf1be5 a lot 2025-05-15 12:14:17 +02:00
3de034418c Merge branch 'schwarb/2025-05-09-config-hw' of https://gitea.psi.ch/AIK_MechSys/TC_iTomcat-ES2-Detector-Tower-FAT into schwarb/2025-05-09-config-hw
All checks were successful
checkformat / build (push) Successful in 2s
2025-05-14 12:41:55 +02:00
441008fba7 changes 2025-05-14 12:32:48 +02:00
3efde090fa Readme.md aktualisiert
All checks were successful
checkformat / build (push) Successful in 2s
2025-05-09 14:14:20 +02:00
c61edcfeb8 add image 2025-05-09 13:18:53 +02:00
417d7cf967 set axis 2 2025-05-09 13:12:49 +02:00
24a371ff4a linking axis 2 and 3 to PLC 2025-05-09 08:56:40 +02:00
501cd1b773 Readme.md hinzugefügt
All checks were successful
checkformat / build (push) Successful in 2s
2025-05-09 08:52:05 +02:00
4a316b1e2a set number of PLC axes to 4 2025-05-09 08:15:45 +02:00
7d3903af36 basic configuration servo motors 2025-05-09 08:14:26 +02:00
4bfc03084a scan hardware
All checks were successful
checkformat / build (push) Successful in 4s
2025-05-09 08:11:08 +02:00
e6bd1f46e8 rename soluition; set nuber of axes to 2
All checks were successful
checkformat / build (push) Successful in 3s
2025-05-09 08:09:10 +02:00
6d2e24abda rename solution
All checks were successful
checkformat / build (push) Successful in 2s
2025-05-09 07:29:44 +02:00
Federico Rojas G
9afca435be Merge pull request #7 from EuropeanSpallationSource/federicor/release-notes-and-tag-v2-8-0
All checks were successful
checkformat / build (push) Successful in 3s
Federicor/release notes and tag v2 8 0
2025-05-06 10:23:26 +02:00
Federico Rojas
765b056a69 Update tc_mca_std_lib pointer to tagged v2.8.0 2025-04-30 13:19:34 +02:00
federicorojas
ad08935a0a Change varaibles to v2.8.0 and add release notes
Change the MAIN variable sVersion to 2.8.0 and add the corresponding
release notes.
Build solution.
2025-04-25 16:35:41 +02:00
Federico Rojas G
5132dec485 Merge pull request #6 from EuropeanSpallationSource/federicor/progs-for-pneumtaics
Federicor/progs for pneumtaics
2025-04-23 13:56:32 +02:00
Federico Rojas
1bf30748a3 Update pointer of std_lib to the merge to master of MBP-310 2025-04-23 13:49:41 +02:00
Federico Rojas
ecebae5752 Update pointer to tc_mca_std_lib to commit cd60a1f9 2025-04-23 12:06:38 +02:00
Federico Rojas
1ffb253d72 Update VISU text elements and delete unused elements 2025-04-23 12:05:25 +02:00
Federico Rojas
36e68aa23e Add output variable to power the green LED and the inside light of box, build solution
modified:   solution/_Config/PLC/tc_project_app.xti
modified:   solution/tc_project_app/POUs/Application_Specific/Applications/Pneumatic_Box.TcPOU
2025-04-23 11:49:22 +02:00
Federico Rojas
289c92d07c Extend the multiline comment to include the PSSPermit code 2025-04-23 11:43:47 +02:00
Federico Rojas
da58333671 Update pointer to tc_mca_Std_lib to MBP-310 commit 2025-04-16 15:47:35 +02:00
Federico Rojas
ad92cc97fa Add initial values to low and high pressure limits values, fix indentation
modified:   solution/tc_project_app/GVLs/GVL_APP.TcGVL
2025-04-16 15:45:55 +02:00
Federico Rojas
7cf9ab307b Build solution including the fix of typo in comment 2025-04-16 15:40:43 +02:00
Federico Rojas
b807a07723 Rename the Shutter operator panel program and update the PSS permit variable link
Add the comment to call the Shutter_Operator_Panel program from MAIN/PROG()
Build solution.
renamed:    solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU -> solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_Panel.TcPOU
modified:   solution/tc_project_app/POUs/MAIN.TcPOU
modified:   solution/tc_project_app/tc_project_app.plcproj
2025-04-16 15:37:43 +02:00
Federico Rojas
bf17f42be1 Program for Safety Shutters
Program includes all the needed Inputs and Outputs for the PSS signals
related to the Safety shutter.
Also contains all the needed configurable variables.
modified:   solution/tc_project_app/POUs/Application_Specific/Axes/Safety_Shutter.TcPOU
2025-04-16 15:25:58 +02:00
Federico Rojas
3d4b6d8b7d Add new lines for configurable variables fromg GVL_APP 2025-04-16 15:23:56 +02:00
Federico Rojas
ea3db4e15d Fix indentation and typo in comment 2025-04-16 15:22:25 +02:00
Federico Rojas
8dbdba11e2 Build solution with the new pneumatics progs and variables 2025-04-11 15:14:37 +02:00
Federico Rojas
2afdd9ae47 Add as constant variable the tTIME_PRESSURE_OUT_OF_RANGE variable 2025-04-11 15:13:45 +02:00
Federico Rojas
51a352d24a Remove the negation(NOT) from the PSS permit status signal 2025-04-11 15:11:47 +02:00
Federico Rojas
c7ddb22046 Rename Cabinet_Configuration to Cabinet_Monitoring
Remove the pneumatics variables from Cabinet_Configuration and move them to
Pneumatic_Box program.Because of that the program now handles onle the
cabinet monitoring. Rename the prgram to reflect that change
deleted:    solution/tc_project_app/POUs/Application_Specific/Applications/Cabinet_Configuration.TcPOU
new file:   solution/tc_project_app/POUs/Application_Specific/Applications/Cabinet_Monitoring.TcPOU
2025-04-11 15:08:11 +02:00
Federico Rojas
ecc0fa9323 Add new programs and templates for penaumtics
Add a template for safety shutter, wher ethe PSS permit signals are created.
Add a program for the Pneumatic_Box, where all the signals for pressure sensors
and pressure calcualtions are implemented.
Correct the Pneumatics_Template TaskInfo was missing a _, delete the pressurelimtis,
and add the pressure group selection.
Call the new programs from PROG() MAIN.
2025-04-11 15:02:24 +02:00
Federico Rojas G
5e7abf9d44 Merge pull request #4 from EuropeanSpallationSource/federicor/update-templates
Federicor/update templates
2025-04-02 16:10:53 +02:00
Federico Rojas G
e32e245438 Merge branch 'master' into federicor/update-templates 2025-04-02 14:33:35 +02:00
Federico Rojas G
3184bf8afe Merge pull request #5 from EuropeanSpallationSource/federicor/prog-for-cabinet-config
Federicor/prog for cabinet config
2025-04-02 14:32:06 +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
059707d03c Update pneumtics template
The variable bPSSPneumaticAxisShutter changed to bSafetyShutter
The low and high pressure limts are not defined per axis but per pressure group
in GVL_APP. Remove tehm from the template.
modified:   solution/tc_project_app/POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU
2025-04-02 13:58:53 +02:00
Federico Rojas
50a58a9d72 Add attribute TcLinkTo to the LEDs outputs
As all shutter OP are the same, it is safe to add the TcLinkTo attribute in the
outputs for the LEDs.

modified:   solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU
2025-04-02 13:36:42 +02:00
Federico Rojas
337762b88f Unpin version 4024.56 and rebuild solution with 4024.62 2025-04-02 12:21:28 +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
Federico Rojas
6f3184712f Add variables for pressure limits high and low
Because the pressure limits belong to the cabinet and are application specific,
move the variables to GVL_APP as constants

modified:   solution/tc_project_app/GVLs/GVL_APP.TcGVL
2025-04-02 12:14:21 +02:00
Federico Rojas G
091ae6a932 Merge pull request #3 from EuropeanSpallationSource/federicor/update-template-files
Federicor/update template files
2025-04-01 09:31:29 +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
1a8fe4a7f2 Add comment for the nEcMasterNetId input variable of fbCabinetMonitoring
Add the comment to explain the source of the AMS NetId for the fbCabinetMonitoring.
The NetId should be from the Device (EtherCAT) of the I/O section of the solution.
Add the commented call for the fbCabinetMonitoring in MAINS/PROG().
2025-03-31 15:38:29 +02:00
federicorojas
caf1e9a323 Add attribute TcLinkTo for the LEDs of the shutter OP
For each declared output of the shutter OP template add the attribute
TcLinkTo. The shutter OP are always the same and will have the same
terminals name and connected to the same ouputs.
modified:   solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU
2025-03-31 15:26:15 +02:00
federicorojas
3b4bef7169 Create Cabinet_Configuration program and call it from MAIN/PROG()
Cabinet_Configuraiton contains the cabinet monitoring and the
pressure limits high and low for the cbainets and pneumatic boxes.
modified:   solution/tc_project_app/POUs/Application_Specific/Applications/Cabinet_Configuration.TcPOU
modified:   solution/tc_project_app/POUs/MAIN.TcPOU
2025-03-31 14:31:31 +02:00
federicorojas
04cf94a1fe Move pressure high and low limits from Pneumatics_template to Cabinet_Configuration
The pressure limits are for the pressure groups and not for individual
axes therefore, the definition of those limits was move as part of the
cabinet_configuration.
modified:   solution/tc_project_app/POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU
2025-03-27 16:26:43 +01:00