From c4bdac87e8d3ed78f3bf6ef5c18452e680b52bc3 Mon Sep 17 00:00:00 2001 From: Cooper Date: Mon, 15 Aug 2022 15:20:29 +0100 Subject: [PATCH] Code refactor to meeting coding standards --- solution.sln | 16 ---- solution/tc_project_app/LineIDs.dbg | Bin 0 -> 3272 bytes solution/tc_project_app/POUs/MAIN.TcPOU | 76 ++-------------- solution/tc_project_app/tc_mca_std_lib | 2 +- .../tc_project_app/tc_project_app.tmcRefac | 85 ++++++++++++++++++ 5 files changed, 93 insertions(+), 86 deletions(-) create mode 100644 solution/tc_project_app/LineIDs.dbg create mode 100644 solution/tc_project_app/tc_project_app.tmcRefac diff --git a/solution.sln b/solution.sln index 60113c2..725c379 100644 --- a/solution.sln +++ b/solution.sln @@ -33,22 +33,6 @@ Global {9CF97348-B9D3-4938-B1F2-5F0B0B6AA66A}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64) {9CF97348-B9D3-4938-B1F2-5F0B0B6AA66A}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86) {9CF97348-B9D3-4938-B1F2-5F0B0B6AA66A}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86) - {FB261665-FD20-4BF2-97F8-2854C82B752D}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7) - {FB261665-FD20-4BF2-97F8-2854C82B752D}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7) - {FB261665-FD20-4BF2-97F8-2854C82B752D}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|TwinCAT OS (ARMT2) - {FB261665-FD20-4BF2-97F8-2854C82B752D}.Debug|TwinCAT OS (ARMT2).Build.0 = Debug|TwinCAT OS (ARMT2) - {FB261665-FD20-4BF2-97F8-2854C82B752D}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64) - {FB261665-FD20-4BF2-97F8-2854C82B752D}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64) - {FB261665-FD20-4BF2-97F8-2854C82B752D}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86) - {FB261665-FD20-4BF2-97F8-2854C82B752D}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86) - {FB261665-FD20-4BF2-97F8-2854C82B752D}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7) - {FB261665-FD20-4BF2-97F8-2854C82B752D}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7) - {FB261665-FD20-4BF2-97F8-2854C82B752D}.Release|TwinCAT OS (ARMT2).ActiveCfg = Release|TwinCAT OS (ARMT2) - {FB261665-FD20-4BF2-97F8-2854C82B752D}.Release|TwinCAT OS (ARMT2).Build.0 = Release|TwinCAT OS (ARMT2) - {FB261665-FD20-4BF2-97F8-2854C82B752D}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64) - {FB261665-FD20-4BF2-97F8-2854C82B752D}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64) - {FB261665-FD20-4BF2-97F8-2854C82B752D}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86) - {FB261665-FD20-4BF2-97F8-2854C82B752D}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86) EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/solution/tc_project_app/LineIDs.dbg b/solution/tc_project_app/LineIDs.dbg new file mode 100644 index 0000000000000000000000000000000000000000..be60dce36d6d6ab41dc2fe82046b3f48d0d20a9c GIT binary patch literal 3272 zcmbVO2~d?)6#f%T1Q9_oapS?0<$)_=nwrLAd9uhd>NL4EWQ}1ilc`KWE@hfYiY!6% zBy&O#0|UiWv=l2VaY0j`#B)I-aiC1gD242NzWX_E9GjZX%zfuS_rLd?@0{=4`@bRH zSIhkLS*8^Zt;aTYIvw+frfHpJKxP{@4355=9Fsriuf0wkPMW&O+@mraWb~8)akVL} zkJ7zFcaZUzvimCCU(NSZc307eWl%PJcT@vYe)tgykb!mnFhmYlUs~DKU=1&{7_VP^ zx1~G$Io*4sY0gTAipHK0Wg`}ZSl#8>QHC2PMSvBUnG69KL8aPHP+eg`5ls!;1a&}SnlS&(v4pVx((l3ooYZw<98UNPebkFhg8xxTi z_#k$~8m`u&-VoMTC(n34NCw1L26FR;Ap+hY$QAQLV2BKpfqg?^h|KM|rf=}6>i9Q< z4OhHMM-&1(FklUGfv~RVBltqSA?$_jHdFIZx`$}w;H5ONxIcb1$vG+6nB|inJbT*t znW#Bqv4-FtF&KNp(L3KoZ$A<7aYN0bTl(e~!FeYc@Xs~O8Q3w$zR}4u1UMkXLH>!K zwPi1}U-FZ@T0Bx)CYCq-RyoCa)DmEWf8b*bo-O9?DeoYL?jlAI(`JirCJ3!fb(Gd1A@|4z>iJ_B;j;g?pO0q#pEsd zX}YIJ+e%<&-HD%Pj=jtLfDb$|FPts-CZ?a;?&Oqbj*Hl%KVKWEf9?eQp+B&OeS^H< zgLujHV3~t}AK(d=fjThn_D$x_FX-n+eNY*&*t*$27rbK~urXJjeb#_ngIi!AmwTIn zQ@l1`j@;kx%QqZP1ZDukf5l0k#EbeP9_|guKpBV?1VhB%rZj6sX#IkNQ^E@;uZuo) zso3>lF?oJbUvT?ijs7V%YZNGZ5Sv&IZSwu-d23_BitX7sS=O|7{twsS3-Tb>$D$9k|StLGIdyZZU7% zdOX2AYM#|`hU2%q50M|&pg*yf{l~uK`671gg#ZuM^X#)9_&sBNc^4cxSUh4^`?RRf zf{bT7)merBBL;k+@7Txom~j7rJKh1kZX0rHzMmSqzQ^ji#`@M2av)1I;KEvdyNDNi z?S1l$pyx49{0_O-stRu8M68+HkYBoU>=EE%O?Z|s_P=hr(cUt#On0p7H$~=kz)$~- zi#Z7QFb?ZH;Oo4aTIZV)m2-}^HY8U3iuF7%Sw468ah|NZP$@jH`mI)$(I3Br2}_y4nMhpo07DBFh$Ab^-XRq-rM`5uDbA8ojY9^%@ zD;=%$YfAGh@*WIP^WX@Ay9(lOQ};PeS9Y4xF?}ZPK3()hT;c4-xWwQcp93Rm1#yqa z?BlwtF>+V4rFWbqY~uSj(_7Q3u2D>~O@H#qnc3q+EXgCv`&C9c2u%brQE zB$VHpm;OWbtOaxWZ)K*6nIwNpd-OAt&$!0mtwO4xz~%dIrLHAptv=PBMo^ zXVmGc^7@^-i#{cPtSft!cN=;LxOhhf$TNg@pr6gue3aIUMm*j*lNt|07DVrCuKo2 - - - - - - @@ -93,7 +84,10 @@ END_IF]]> - END_FOR]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib index 9df77c9..3a2e248 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit 9df77c95a603fd24efa32522784df02c340607ec +Subproject commit 3a2e248736bd864a9353a265a966120f6a09f1dc diff --git a/solution/tc_project_app/tc_project_app.tmcRefac b/solution/tc_project_app/tc_project_app.tmcRefac new file mode 100644 index 0000000..b12bc24 --- /dev/null +++ b/solution/tc_project_app/tc_project_app.tmcRefac @@ -0,0 +1,85 @@ + + + + + FB_Axis + mcStatusPower + stMcStatusPower + + + FB_Axis + mcStatusStop + stMcStatusStop + + + FB_Axis + mcStatusHalt + stMcStatusHalt + + + FB_Axis + mcStatusReset + stMcStatusReset + + + FB_Axis + mcStatusMoveAbsolute + stMcStatusMoveAbsolute + + + FB_Axis + mcStatusMoveRelative + stMcStatusMoveRelative + + + FB_Axis + mcStatusMoveVelocity + stMcStatusMoveVelocity + + + FB_Axis + mcStatusMoveModulo + stMcStatusMoveModulo + + + FB_Axis + mcStatusHome + stMcStatusHome + + + FB_Axis + mcStatusReadParameter + stMcStatusReadParameter + + + FB_Axis + mcStatusWriteParameter + stMcStatusWriteParameter + + + FB_Axis + mcStatusGearIn + stMcStatusGearIn + + + FB_Axis + mcStatusGearOut + stMcStatusGearOut + + + FB_Axis + mcStatusGearInMultiMaster + stMcStatusGearInMultiMaster + + + FB_Axis + mcSTATUS_ARRAY_SIZE + nMCSTATUS_ARRAY_SIZE + + + FB_Axis + mcStatus + astMcStatus + + + \ No newline at end of file