Commit Graph

149 Commits

Author SHA1 Message Date
Federico Rojas df85fad7a2 Format IF statements with jump line each condition 2022-11-01 13:43:36 +01:00
Federico Rojas c4d865edc1 Optimize code for executing postiong restoring 2022-10-21 09:16:24 +02:00
Federico Rojas 3335971d3f Refactoring code with new variable name fEncoderBiasAtShutdown 2022-10-14 16:08:27 +02:00
Federico Rojas 0350afac73 Merge remote-tracking branch 'origin/MBP-198_OOP' into MBP-221-add-restore-position-bias
# Conflicts:
#	solution/tc_project_app/tc_mca_std_lib
2022-10-14 15:55:30 +02:00
Federico Rojas 3c0a37a0e7 Format notes and correct indentation to MAIN.RESTORE_POSITION()
Format the comments about the reference system types
Correct wierd identation
Fix Format of if evaluation of boolean variables withouth the "= True or = False"
2022-10-14 15:11:03 +02:00
Federico Rojas dc531c102f Recompile files without LineIDs 2022-10-06 11:16:02 +02:00
Federico Rojas bbf233a637 Merge branch 'origin/master' into MBP-198_OOP
Conflicts:
	solution/_Config/PLC/tc_project_app.xti
2022-10-06 10:38:10 +02:00
Federico Rojas 99a3efce66 Add FB_CustomAxis example and update pointer 2022-10-04 17:11:37 +02:00
Federico Rojas 33c2c06338 Test: Delete redundancy in linking FB and interfaces in AXES() 2022-09-30 16:07:16 +02:00
Federico Rojas 054a460e8d Build solution with new code and new commits form tc_mca_std_lib 2022-09-27 16:54:04 +02:00
Federico Rojas 1b57b2e04c Add code to read. store and restore the encoder position BIAS in case of power failure 2022-09-27 16:50:37 +02:00
Federico Rojas ba6c691646 Replace obsolete FB_GetDeviceIdentification for FB_GetDeviceIdentificationEx 2022-09-19 14:44:26 +02:00
Federico Rojas c852cd9e57 Merge branch 'origin/master' into MBP-198_OOP
Conflicts:
solution/_Config/PLC/tc_project_app.xti
solution/solution.tsproj
solution/tc_project_app/POUs/MAIN.TcPOU
solution/tc_project_app/tc_mca_std_lib
solution/tc_project_app/tc_project_app.plcproj
2022-08-25 13:11:11 +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 ce8d745cca Update all files to new build version. To 3024.11 and 3024.32 2022-08-16 15:29:05 +02:00
Cooper c4bdac87e8 Code refactor to meeting coding standards 2022-08-15 15:20:29 +01:00
SCooper 60700b1d46 Swap AXES and PROG execution order, allow logic to execute and send commands on the same cycle 2022-07-29 14:26:18 +01:00
SCooper 387a662d19 include TMC and TPY, remove axes from test 2022-07-27 15:34:28 +01:00
SCooper 2222e7539e refactoring to clean up whitespace 2022-07-27 15:25:53 +01:00
SCooper 2bdf9e786b Read parameter added to OOP implementation. Visu parameter reads fixed to reference GVL not afbaxes. Text list support added for parameters to allow combo box selection on Visu rather than typing in number 2022-07-27 12:28:33 +01:00
SCooper f0dff8ea56 multi gearing logic improved. Status logic changed to array of pointers for easier scaling. Homing added 2022-07-13 11:30:28 +01:00
Cooper 976ef8dedc OOP implementation of FB_Axis created with basic functionality 2022-07-07 14:36:10 +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 037218b267 Homing 'fixed' on state machine 2022-04-12 15:13:01 +01:00
SCooper 2b41f3aa4b Fixed an issue with setpoint generators not enabling when a limit is pressed 2022-04-12 11:14:11 +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
federicorojas 3eec9b48d0 Comment the templates call for pneumatics and application in MAIN/PROG 2022-02-04 13:56:40 +01:00
federicorojas bb62c2b55f Relocate Pneumatics_Template() PROG to be under Axes Folder 2022-02-04 13:44:15 +01:00
Federico Rojas 78d6708762 Delete testing comments and put them to pull request 2021-11-10 15:35:58 +01:00
Kristina Jurisic 994b2a4358 Create variable hmiPneumaticAxis for Pneumatic VISU 2021-11-01 12:54:49 +01:00
Kristina Jurisic f9aabf8513 Merge remote-tracking branch 'origin/master' into MBP-105-control-of-pneumatic-actuators 2021-11-01 10:36:56 +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
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 f2608e4812 Fix white space damage 2021-06-15 15:19:58 +02:00
Kristina Jurisic 1659537b9e Add array of FB_PneumaticAxis 2021-06-15 13:43:01 +02:00
Kristina Jurisic 26265f62d3 Readd the Application_Template POU 2021-06-15 11:39:35 +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