diff --git a/.gitignore b/.gitignore index bf5d509..b1ac876 100644 --- a/.gitignore +++ b/.gitignore @@ -39,7 +39,7 @@ LineIDs.dbg.bak # exclude not required folders **/_Boot/ **/_CompileInfo/ -#**/_Libraries/ +**/_Libraries/ **/_ModuleInstall/ **/_Deployment/ **/_Repository/ diff --git a/TwinCAT Projekt1/BaseComponents.sln b/BaseComponents.sln similarity index 100% rename from TwinCAT Projekt1/BaseComponents.sln rename to BaseComponents.sln diff --git a/TwinCAT Projekt1/BaseComponents.tsproj b/BaseComponents.tsproj similarity index 58% rename from TwinCAT Projekt1/BaseComponents.tsproj rename to BaseComponents.tsproj index 113b20b..0f7e462 100644 --- a/TwinCAT Projekt1/BaseComponents.tsproj +++ b/BaseComponents.tsproj @@ -1,24 +1,5 @@ - - - - TestAlarms - - - TestError - - Error - - - TestWarning - - Warning - - - - - - + @@ -28,264 +9,264 @@ - + - + PLC Instance {08500001-0000-0000-F000-000000000064} PlcTask Inputs - MAIN._fbAnalogInputTest._fbAIErrorLowOn.iAnalogValue + PRG_MAIN._fbAnalogInputTest._fbAIErrorLowOn.iAnalogValue INT - MAIN._fbAnalogInputTest._fbAIErrorLowOn.xUnderrange + PRG_MAIN._fbAnalogInputTest._fbAIErrorLowOn.xUnderrange BOOL - MAIN._fbAnalogInputTest._fbAIErrorLowOn.xOverrange + PRG_MAIN._fbAnalogInputTest._fbAIErrorLowOn.xOverrange BOOL - MAIN._fbAnalogInputTest._fbAIErrorLowOn.xErrorCard + PRG_MAIN._fbAnalogInputTest._fbAIErrorLowOn.xErrorCard BOOL - MAIN._fbAnalogInputTest._fbAIWarningLowOn.iAnalogValue + PRG_MAIN._fbAnalogInputTest._fbAIWarningLowOn.iAnalogValue INT - MAIN._fbAnalogInputTest._fbAIWarningLowOn.xUnderrange + PRG_MAIN._fbAnalogInputTest._fbAIWarningLowOn.xUnderrange BOOL - MAIN._fbAnalogInputTest._fbAIWarningLowOn.xOverrange + PRG_MAIN._fbAnalogInputTest._fbAIWarningLowOn.xOverrange BOOL - MAIN._fbAnalogInputTest._fbAIWarningLowOn.xErrorCard + PRG_MAIN._fbAnalogInputTest._fbAIWarningLowOn.xErrorCard BOOL - MAIN._fbAnalogInputTest._fbAIWarningHighOn.iAnalogValue + PRG_MAIN._fbAnalogInputTest._fbAIWarningHighOn.iAnalogValue INT - MAIN._fbAnalogInputTest._fbAIWarningHighOn.xUnderrange + PRG_MAIN._fbAnalogInputTest._fbAIWarningHighOn.xUnderrange BOOL - MAIN._fbAnalogInputTest._fbAIWarningHighOn.xOverrange + PRG_MAIN._fbAnalogInputTest._fbAIWarningHighOn.xOverrange BOOL - MAIN._fbAnalogInputTest._fbAIWarningHighOn.xErrorCard + PRG_MAIN._fbAnalogInputTest._fbAIWarningHighOn.xErrorCard BOOL - MAIN._fbAnalogInputTest._fbAIErrorHighOn.iAnalogValue + PRG_MAIN._fbAnalogInputTest._fbAIErrorHighOn.iAnalogValue INT - MAIN._fbAnalogInputTest._fbAIErrorHighOn.xUnderrange + PRG_MAIN._fbAnalogInputTest._fbAIErrorHighOn.xUnderrange BOOL - MAIN._fbAnalogInputTest._fbAIErrorHighOn.xOverrange + PRG_MAIN._fbAnalogInputTest._fbAIErrorHighOn.xOverrange BOOL - MAIN._fbAnalogInputTest._fbAIErrorHighOn.xErrorCard + PRG_MAIN._fbAnalogInputTest._fbAIErrorHighOn.xErrorCard BOOL - MAIN._fbAnalogInputTest._fbAIOverrangeOn.iAnalogValue + PRG_MAIN._fbAnalogInputTest._fbAIOverrangeOn.iAnalogValue INT - MAIN._fbAnalogInputTest._fbAIOverrangeOn.xUnderrange + PRG_MAIN._fbAnalogInputTest._fbAIOverrangeOn.xUnderrange BOOL - MAIN._fbAnalogInputTest._fbAIOverrangeOn.xOverrange + PRG_MAIN._fbAnalogInputTest._fbAIOverrangeOn.xOverrange BOOL - MAIN._fbAnalogInputTest._fbAIOverrangeOn.xErrorCard + PRG_MAIN._fbAnalogInputTest._fbAIOverrangeOn.xErrorCard BOOL - MAIN._fbAnalogInputTest._fbAIUnderrangeOn.iAnalogValue + PRG_MAIN._fbAnalogInputTest._fbAIUnderrangeOn.iAnalogValue INT - MAIN._fbAnalogInputTest._fbAIUnderrangeOn.xUnderrange + PRG_MAIN._fbAnalogInputTest._fbAIUnderrangeOn.xUnderrange BOOL - MAIN._fbAnalogInputTest._fbAIUnderrangeOn.xOverrange + PRG_MAIN._fbAnalogInputTest._fbAIUnderrangeOn.xOverrange BOOL - MAIN._fbAnalogInputTest._fbAIUnderrangeOn.xErrorCard + PRG_MAIN._fbAnalogInputTest._fbAIUnderrangeOn.xErrorCard BOOL - MAIN._fbAnalogInputTest._fbAIErrorLowOff.iAnalogValue + PRG_MAIN._fbAnalogInputTest._fbAIErrorLowOff.iAnalogValue INT - MAIN._fbAnalogInputTest._fbAIErrorLowOff.xUnderrange + PRG_MAIN._fbAnalogInputTest._fbAIErrorLowOff.xUnderrange BOOL - MAIN._fbAnalogInputTest._fbAIErrorLowOff.xOverrange + PRG_MAIN._fbAnalogInputTest._fbAIErrorLowOff.xOverrange BOOL - MAIN._fbAnalogInputTest._fbAIErrorLowOff.xErrorCard + PRG_MAIN._fbAnalogInputTest._fbAIErrorLowOff.xErrorCard BOOL - MAIN._fbAnalogInputTest._fbAIWarningLowOff.iAnalogValue + PRG_MAIN._fbAnalogInputTest._fbAIWarningLowOff.iAnalogValue INT - MAIN._fbAnalogInputTest._fbAIWarningLowOff.xUnderrange + PRG_MAIN._fbAnalogInputTest._fbAIWarningLowOff.xUnderrange BOOL - MAIN._fbAnalogInputTest._fbAIWarningLowOff.xOverrange + PRG_MAIN._fbAnalogInputTest._fbAIWarningLowOff.xOverrange BOOL - MAIN._fbAnalogInputTest._fbAIWarningLowOff.xErrorCard + PRG_MAIN._fbAnalogInputTest._fbAIWarningLowOff.xErrorCard BOOL - MAIN._fbAnalogInputTest._fbAIWarningHighOff.iAnalogValue + PRG_MAIN._fbAnalogInputTest._fbAIWarningHighOff.iAnalogValue INT - MAIN._fbAnalogInputTest._fbAIWarningHighOff.xUnderrange + PRG_MAIN._fbAnalogInputTest._fbAIWarningHighOff.xUnderrange BOOL - MAIN._fbAnalogInputTest._fbAIWarningHighOff.xOverrange + PRG_MAIN._fbAnalogInputTest._fbAIWarningHighOff.xOverrange BOOL - MAIN._fbAnalogInputTest._fbAIWarningHighOff.xErrorCard + PRG_MAIN._fbAnalogInputTest._fbAIWarningHighOff.xErrorCard BOOL - MAIN._fbAnalogInputTest._fbAIErrorHighOff.iAnalogValue + PRG_MAIN._fbAnalogInputTest._fbAIErrorHighOff.iAnalogValue INT - MAIN._fbAnalogInputTest._fbAIErrorHighOff.xUnderrange + PRG_MAIN._fbAnalogInputTest._fbAIErrorHighOff.xUnderrange BOOL - MAIN._fbAnalogInputTest._fbAIErrorHighOff.xOverrange + PRG_MAIN._fbAnalogInputTest._fbAIErrorHighOff.xOverrange BOOL - MAIN._fbAnalogInputTest._fbAIErrorHighOff.xErrorCard + PRG_MAIN._fbAnalogInputTest._fbAIErrorHighOff.xErrorCard BOOL - MAIN._fbAnalogInputTest._fbAIUnderrangeOff.iAnalogValue + PRG_MAIN._fbAnalogInputTest._fbAIUnderrangeOff.iAnalogValue INT - MAIN._fbAnalogInputTest._fbAIUnderrangeOff.xUnderrange + PRG_MAIN._fbAnalogInputTest._fbAIUnderrangeOff.xUnderrange BOOL - MAIN._fbAnalogInputTest._fbAIUnderrangeOff.xOverrange + PRG_MAIN._fbAnalogInputTest._fbAIUnderrangeOff.xOverrange BOOL - MAIN._fbAnalogInputTest._fbAIUnderrangeOff.xErrorCard + PRG_MAIN._fbAnalogInputTest._fbAIUnderrangeOff.xErrorCard BOOL - MAIN._fbAnalogInputTest._fbAIOverrangeOff.iAnalogValue + PRG_MAIN._fbAnalogInputTest._fbAIOverrangeOff.iAnalogValue INT - MAIN._fbAnalogInputTest._fbAIOverrangeOff.xUnderrange + PRG_MAIN._fbAnalogInputTest._fbAIOverrangeOff.xUnderrange BOOL - MAIN._fbAnalogInputTest._fbAIOverrangeOff.xOverrange + PRG_MAIN._fbAnalogInputTest._fbAIOverrangeOff.xOverrange BOOL - MAIN._fbAnalogInputTest._fbAIOverrangeOff.xErrorCard + PRG_MAIN._fbAnalogInputTest._fbAIOverrangeOff.xErrorCard BOOL @@ -308,10 +289,5 @@ - - ANALYTICS - 437 - Hauptstraße 5, 32567 Berlin123.4143.4555LatestBoot Project PathFILE%TC_BOOTPRJPATH%127.0.0.11883false3000000060000000032768NO_SECURITYfalsefalsefalsefalsefalseHexKeyNonefalse]]> - diff --git a/PLC/PLC.plcproj b/PLC/PLC.plcproj new file mode 100644 index 0000000..96cadb9 --- /dev/null +++ b/PLC/PLC.plcproj @@ -0,0 +1,2509 @@ + + + + 1.0.0.0 + 2.0 + {4e62d9e7-436c-457d-8dc4-82d2fef91c96} + true + true + false + false + PLC + 3.1.4026.19 + {7cc9c530-510c-48e6-a294-2e6b5e6fa820} + {951d7a0c-817c-4013-8204-ecd29ee0162e} + {e6d3915d-876b-4120-9e42-92be330ed750} + {86bdbf68-2971-41b8-9b27-17e052a7f55d} + {173a046e-fc1b-4ea3-9ec8-0d52397c403c} + {c870d3c5-a637-481e-9586-ab8eaa6f8f36} + false + false + false + false + + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + + + + + + + + + + + + + + + + Tc2_Standard, * (Beckhoff Automation GmbH) + Tc2_Standard + + + Tc2_System, * (Beckhoff Automation GmbH) + Tc2_System + + + Tc2_Utilities, * (Beckhoff Automation GmbH) + Tc2_Utilities + + + Tc3_EventLogger, * (Beckhoff Automation GmbH) + Tc3_EventLogger + + + Tc3_IotBase, * (Beckhoff Automation GmbH) + Tc3_IotBase + + + Tc3_JsonXml, * (Beckhoff Automation GmbH) + Tc3_JsonXml + + + Tc3_Module, * (Beckhoff Automation GmbH) + Tc3_Module + true + + + TcUnit, * (www.tcunit.org) + TcUnit + + + + + Content + + + + + + + + "<ProjectRoot>" + + {192FAD59-8248-4824-A8DE-9177C94C195A} + + "{192FAD59-8248-4824-A8DE-9177C94C195A}" + + + + {246001F4-279D-43AC-B241-948EB31120E1} + + "{246001F4-279D-43AC-B241-948EB31120E1}" + + + + {29BD8D0C-3586-4548-BB48-497B9A01693F} + + "{29BD8D0C-3586-4548-BB48-497B9A01693F}" + + Metrics + + "Metrics" + + 0ade9a3b-311c-4293-bc26-bcf994cdbbdc + + "0ade9a3b-311c-4293-bc26-bcf994cdbbdc" + + + bActive + true + stLowerLimit + "" + stUpperLimit + "" + + + 0ba696f2-ce22-4330-931f-4ddd5c597896 + + "0ba696f2-ce22-4330-931f-4ddd5c597896" + + + bActive + true + stLowerLimit + "" + stUpperLimit + "" + + + 15c07c54-9586-460c-802f-b3b4a408e3c7 + + "15c07c54-9586-460c-802f-b3b4a408e3c7" + + + bActive + true + stLowerLimit + "" + stUpperLimit + "" + + + 19fab17a-876c-4a8d-9d74-3e5d92b63dc8 + + "19fab17a-876c-4a8d-9d74-3e5d92b63dc8" + + + bActive + true + stLowerLimit + "" + stUpperLimit + "" + + + 2a5d0bd7-5767-43e1-92ab-90d924ade69e + + "2a5d0bd7-5767-43e1-92ab-90d924ade69e" + + + bActive + false + stLowerLimit + "" + stUpperLimit + "" + + + 2ee16325-7a34-4109-82cd-e99144bdbf43 + + "2ee16325-7a34-4109-82cd-e99144bdbf43" + + + bActive + false + stLowerLimit + "" + stUpperLimit + "" + + + 3fb5ac29-8ac7-4ca4-863e-49c3c89643b9 + + "3fb5ac29-8ac7-4ca4-863e-49c3c89643b9" + + + bActive + false + stLowerLimit + "" + stUpperLimit + "" + + + 40f104a2-99f0-486d-9c44-47e8c759ca07 + + "40f104a2-99f0-486d-9c44-47e8c759ca07" + + + bActive + false + stLowerLimit + "" + stUpperLimit + "" + + + 571980c1-792d-4355-a9cb-4c3a8f254ab0 + + "571980c1-792d-4355-a9cb-4c3a8f254ab0" + + + bActive + false + stLowerLimit + "" + stUpperLimit + "" + + + 62b98ef9-b4c6-4777-bc0a-29245bb8b9f3 + + "62b98ef9-b4c6-4777-bc0a-29245bb8b9f3" + + + bActive + true + stLowerLimit + "" + stUpperLimit + "" + + + 6549803a-9e82-4b28-aff1-2425cbec813b + + "6549803a-9e82-4b28-aff1-2425cbec813b" + + + bActive + true + stLowerLimit + "" + stUpperLimit + "" + + + 6c74d656-f35f-41b9-b449-eae882ed12fe + + "6c74d656-f35f-41b9-b449-eae882ed12fe" + + + bActive + true + stLowerLimit + "" + stUpperLimit + "" + + + 6cb1bfb1-4d4a-43ed-96f4-cd0254fc33b5 + + "6cb1bfb1-4d4a-43ed-96f4-cd0254fc33b5" + + + bActive + false + stLowerLimit + "" + stUpperLimit + "" + + + 87b20586-90da-40d8-82ce-62a7dd0ba8af + + "87b20586-90da-40d8-82ce-62a7dd0ba8af" + + + bActive + false + stLowerLimit + "" + stUpperLimit + "" + + + 9b526466-3bbe-40a9-b5a5-1cfadd791459 + + "9b526466-3bbe-40a9-b5a5-1cfadd791459" + + + bActive + true + stLowerLimit + "" + stUpperLimit + "" + + + aebdfc4d-fc4f-4fac-bf2e-22b603bc1880 + + "aebdfc4d-fc4f-4fac-bf2e-22b603bc1880" + + + bActive + false + stLowerLimit + "" + stUpperLimit + "" + + + b42720b9-b152-4b52-ad89-630e0f5acab1 + + "b42720b9-b152-4b52-ad89-630e0f5acab1" + + + bActive + true + stLowerLimit + "" + stUpperLimit + "" + + + c4137578-73e0-4a9c-ad9c-7773a1cff401 + + "c4137578-73e0-4a9c-ad9c-7773a1cff401" + + + bActive + true + stLowerLimit + "" + stUpperLimit + "" + + + cccccccc-1d56-4a6c-a0bc-05d25846cb02 + + "cccccccc-1d56-4a6c-a0bc-05d25846cb02" + + + bActive + true + stLowerLimit + "" + stUpperLimit + "" + + + daa3e89b-a727-4bc9-bd38-29afc6024f90 + + "daa3e89b-a727-4bc9-bd38-29afc6024f90" + + + bActive + true + stLowerLimit + "" + stUpperLimit + "" + + + e58378e8-a2fb-4a33-8013-8a91270388d0 + + "e58378e8-a2fb-4a33-8013-8a91270388d0" + + + bActive + true + stLowerLimit + "" + stUpperLimit + "" + + + f6dd9a78-1e71-4d9c-9e61-394eb38f3809 + + "f6dd9a78-1e71-4d9c-9e61-394eb38f3809" + + + bActive + true + stLowerLimit + "" + stUpperLimit + "" + + + + + + NamingConventions + + "NamingConventions" + + 10 + + "10" + + + stPrefix + ui + + + 102 + + "102" + + + stPrefix + PRG_ + + + 103 + + "103" + + + stPrefix + FB_ + + + 104 + + "104" + + + stPrefix + FC_ + + + 105 + + "105" + + + stPrefix + + + + 106 + + "106" + + + stPrefix + + + + 107 + + "107" + + + stPrefix + + + + 108 + + "108" + + + stPrefix + I_ + + + 11 + + "11" + + + stPrefix + udi + + + 12 + + "12" + + + stPrefix + uli + + + 121 + + "121" + + + stPrefix + + + + 122 + + "122" + + + stPrefix + + + + 123 + + "123" + + + stPrefix + + + + 124 + + "124" + + + stPrefix + + + + 13 + + "13" + + + stPrefix + si + + + 14 + + "14" + + + stPrefix + i + + + 15 + + "15" + + + stPrefix + di + + + 151 + + "151" + + + stPrefix + ST_ + + + 152 + + "152" + + + stPrefix + E_ + + + 153 + + "153" + + + stPrefix + + + + 154 + + "154" + + + stPrefix + + + + 16 + + "16" + + + stPrefix + li + + + 161 + + "161" + + F_TRIG + + "F_TRIG" + + + stPrefix + ftrig + + + R_TRIG + + "R_TRIG" + + + stPrefix + rtrig + + + T_HSERVER + + "T_HSERVER" + + + stPrefix + h + + + T_HSOCKET + + "T_HSOCKET" + + + stPrefix + h + + + T_INTERLOCK + + "T_INTERLOCK" + + + stPrefix + w + + + T_MaxString + + "T_MaxString" + + + stPrefix + s + + + TOF + + "TOF" + + + stPrefix + fb + + + TON + + "TON" + + + stPrefix + fb + + + + + + 17 + + "17" + + + stPrefix + r + + + 18 + + "18" + + + stPrefix + lr + + + 19 + + "19" + + + stPrefix + s + + + 20 + + "20" + + + stPrefix + ws + + + 21 + + "21" + + + stPrefix + tim + + + 22 + + "22" + + + stPrefix + ltim + + + 23 + + "23" + + + stPrefix + d + + + 24 + + "24" + + + stPrefix + dt + + + 25 + + "25" + + + stPrefix + td + + + 26 + + "26" + + + stPrefix + p + + + 27 + + "27" + + + stPrefix + ref + + + 28 + + "28" + + + stPrefix + + + + 29 + + "29" + + + stPrefix + e + + + 3 + + "3" + + + stPrefix + x + + + 30 + + "30" + + + stPrefix + a + + + 31 + + "31" + + + stPrefix + fb + + + 32 + + "32" + + + stPrefix + st + + + 33 + + "33" + + + stPrefix + + + + 34 + + "34" + + + stPrefix + + + + 35 + + "35" + + + stPrefix + + + + 36 + + "36" + + + stPrefix + fb + + + 37 + + "37" + + + stPrefix + + + + 38 + + "38" + + + stPrefix + + + + 4 + + "4" + + + stPrefix + + + + 5 + + "5" + + + stPrefix + b + + + 51 + + "51" + + + stPrefix + + + + 53 + + "53" + + + stPrefix + _ + + + 54 + + "54" + + + stPrefix + _ + + + 55 + + "55" + + + stPrefix + _ + + + 56 + + "56" + + + stPrefix + + + + 57 + + "57" + + + stPrefix + + + + 58 + + "58" + + + stPrefix + + + + 59 + + "59" + + + stPrefix + + + + 6 + + "6" + + + stPrefix + w + + + 61 + + "61" + + + stPrefix + + + + 62 + + "62" + + + stPrefix + + + + 63 + + "63" + + + stPrefix + + + + 64 + + "64" + + + stPrefix + + + + 65 + + "65" + + + stPrefix + + + + 7 + + "7" + + + stPrefix + dw + + + 70 + + "70" + + + stPrefix + + + + 71 + + "71" + + + stPrefix + + + + 72 + + "72" + + + stPrefix + + + + 73 + + "73" + + + stPrefix + + + + 8 + + "8" + + + stPrefix + lw + + + 9 + + "9" + + + stPrefix + usi + + + + + + NamingConventionsSettings + + "NamingConventionsSettings" + + + CombinedDataTypesRecursive + True + CombineScopeWithDatatypePrefix + True + FirstCharUpperCase + True + + + Rules + + "Rules" + + 1 + + "1" + + + bActive + False + bWarning + True + + + 10 + + "10" + + + bActive + False + bWarning + False + + + 100 + + "100" + + + bActive + false + bWarning + true + nUpperLimit + 1024 + + + 101 + + "101" + + + bActive + false + bWarning + false + Exceptions + "" + MaxChars + 30 + MinChars + 5 + + + 102 + + "102" + + + bActive + False + bWarning + False + + + 103 + + "103" + + + bActive + False + bWarning + False + + + 105 + + "105" + + + bActive + False + bWarning + False + + + 106 + + "106" + + + bActive + False + bWarning + False + + + 107 + + "107" + + + bActive + False + bWarning + False + + + 11 + + "11" + + + bActive + False + bWarning + False + + + 111 + + "111" + + + bActive + False + bWarning + False + + + 112 + + "112" + + + bActive + False + bWarning + False + + + 113 + + "113" + + + bActive + False + bWarning + False + + + 114 + + "114" + + + bActive + False + bWarning + False + + + 115 + + "115" + + + bActive + False + bWarning + False + + + 117 + + "117" + + + bActive + False + bWarning + False + + + 118 + + "118" + + + bActive + False + bWarning + False + + + 119 + + "119" + + + bActive + False + bWarning + False + + + 12 + + "12" + + + bActive + False + bWarning + False + + + 120 + + "120" + + + bActive + False + bWarning + False + + + 121 + + "121" + + + bActive + False + bWarning + False + + + 122 + + "122" + + + bActive + False + bWarning + False + + + 123 + + "123" + + + bActive + False + bWarning + False + + + 124 + + "124" + + + bActive + False + bWarning + False + + + 125 + + "125" + + + bActive + False + bWarning + False + + + 13 + + "13" + + + bActive + False + bWarning + False + + + 130 + + "130" + + + bActive + True + bWarning + False + + + 133 + + "133" + + + bActive + False + bWarning + False + + + 134 + + "134" + + + bActive + False + bWarning + False + + + 14 + + "14" + + + bActive + True + bWarning + False + + + 140 + + "140" + + + bActive + True + bWarning + False + + + 145 + + "145" + + + bActive + True + bWarning + False + + + 147 + + "147" + + + bActive + False + bWarning + False + + + 148 + + "148" + + + bActive + False + bWarning + False + + + 15 + + "15" + + + bActive + True + bWarning + False + + + 150 + + "150" + + + bActive + False + bWarning + False + + + 16 + + "16" + + + bActive + False + bWarning + True + + + 160 + + "160" + + + bActive + False + bWarning + False + + + 161 + + "161" + + + bActive + False + bWarning + False + + + 162 + + "162" + + + bActive + False + bWarning + False + + + 163 + + "163" + + + bActive + False + bWarning + False + + + 164 + + "164" + + + bActive + False + bWarning + False + + + 166 + + "166" + + + bActive + false + bWarning + false + MaxInOuts + 10 + MaxInputs + 10 + MaxOutputs + 10 + + + 167 + + "167" + + + bActive + False + bWarning + False + + + 168 + + "168" + + + bActive + False + bWarning + False + + + 169 + + "169" + + + bActive + False + bWarning + True + + + 17 + + "17" + + + bActive + True + bWarning + False + + + 170 + + "170" + + + bActive + True + bWarning + False + + + 171 + + "171" + + + bActive + False + bWarning + False + + + 172 + + "172" + + + bActive + True + bWarning + False + + + 175 + + "175" + + + bActive + False + bWarning + False + + + 178 + + "178" + + + bActive + false + bWarning + true + nCognitiveComplexityLimit + 20 + + + 179 + + "179" + + + bActive + true + bWarning + false + nCouplingLimit + 30 + + + 18 + + "18" + + + bActive + True + bWarning + False + + + 180 + + "180" + + + bActive + True + bWarning + False + + + 19 + + "19" + + + bActive + True + bWarning + False + + + 2 + + "2" + + + bActive + False + bWarning + False + + + 20 + + "20" + + + bActive + False + bWarning + True + + + 21 + + "21" + + + bActive + True + bWarning + False + + + 22 + + "22" + + + bActive + False + bWarning + False + + + 23 + + "23" + + + bActive + False + bWarning + False + + + 24 + + "24" + + + bActive + False + bWarning + False + + + 25 + + "25" + + + bActive + True + bWarning + False + + + 26 + + "26" + + + bActive + True + bWarning + False + + + 27 + + "27" + + + bActive + True + bWarning + False + + + 28 + + "28" + + + bActive + True + bWarning + False + + + 29 + + "29" + + + bActive + True + bWarning + False + + + 3 + + "3" + + + bActive + False + bWarning + False + + + 31 + + "31" + + + bActive + False + bWarning + False + + + 32 + + "32" + + + bActive + False + bWarning + False + + + 33 + + "33" + + + bActive + True + bWarning + False + + + 34 + + "34" + + + bActive + True + bWarning + False + + + 35 + + "35" + + + bActive + False + bWarning + False + + + 36 + + "36" + + + bActive + False + bWarning + False + + + 37 + + "37" + + + bActive + True + bWarning + False + + + 38 + + "38" + + + bActive + True + bWarning + False + + + 39 + + "39" + + + bActive + True + bWarning + False + + + 4 + + "4" + + + bActive + True + bWarning + False + + + 40 + + "40" + + + bActive + True + bWarning + False + + + 41 + + "41" + + + bActive + True + bWarning + False + + + 42 + + "42" + + + bActive + True + bWarning + False + + + 43 + + "43" + + + bActive + True + bWarning + False + + + 44 + + "44" + + + bActive + True + bWarning + False + + + 46 + + "46" + + + bActive + True + bWarning + False + + + 47 + + "47" + + + bActive + True + bWarning + False + + + 48 + + "48" + + + bActive + True + bWarning + False + + + 5 + + "5" + + + bActive + False + bWarning + False + + + 51 + + "51" + + + bActive + True + bWarning + False + + + 52 + + "52" + + + bActive + True + bWarning + False + + + 53 + + "53" + + + bActive + True + bWarning + False + + + 54 + + "54" + + + bActive + False + bWarning + False + + + 55 + + "55" + + + bActive + True + bWarning + False + + + 56 + + "56" + + + bActive + True + bWarning + False + + + 57 + + "57" + + + bActive + True + bWarning + False + + + 58 + + "58" + + + bActive + True + bWarning + False + + + 59 + + "59" + + + bActive + True + bWarning + False + + + 6 + + "6" + + + bActive + True + bWarning + False + + + 60 + + "60" + + + bActive + True + bWarning + False + + + 61 + + "61" + + + bActive + True + bWarning + False + + + 62 + + "62" + + + bActive + True + bWarning + False + + + 63 + + "63" + + + bActive + True + bWarning + False + + + 64 + + "64" + + + bActive + True + bWarning + False + + + 65 + + "65" + + + bActive + True + bWarning + False + + + 66 + + "66" + + + bActive + False + bWarning + True + + + 7 + + "7" + + + bActive + True + bWarning + False + + + 72 + + "72" + + + bActive + True + bWarning + False + + + 73 + + "73" + + + bActive + False + bWarning + False + + + 75 + + "75" + + + bActive + True + bWarning + False + + + 76 + + "76" + + + bActive + False + bWarning + True + + + 77 + + "77" + + + bActive + True + bWarning + False + + + 78 + + "78" + + + bActive + True + bWarning + False + + + 8 + + "8" + + + bActive + True + bWarning + False + + + 81 + + "81" + + + bActive + True + bWarning + False + + + 9 + + "9" + + + bActive + False + bWarning + True + + + 90 + + "90" + + + bActive + False + bWarning + False + + + 95 + + "95" + + + bActive + True + bWarning + False + + + + + + + + MaxStaticAnalysisErrors + 500U + MaxStaticAnalysisWarnings + 500U + PerformStaticAnalyse + true + SuppressedKeywords + "" + + + {40450F57-0AA3-4216-96F3-5444ECB29763} + + "{40450F57-0AA3-4216-96F3-5444ECB29763}" + + + ActiveVisuProfile + IR0whWr8bwfyBwAAaCbC8QAAAABVAgAA1xHl6QAAAAABAAAAAAAAAAEaUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwACTHsAZgA5ADUAYgBiADQAMgA2AC0ANQA1ADIANAAtADQAYgA0ADUALQA5ADQAMAAwAC0AZgBiADAAZgAyAGUANwA3AGUANQAxAGIAfQADCE4AYQBtAGUABDJUAHcAaQBuAEMAQQBUACAAMwAuADEAIABCAHUAaQBsAGQAIAA0ADAAMgA2AC4AMQA1AAUWUAByAG8AZgBpAGwAZQBEAGEAdABhAAZMewAxADYAZQA1ADUAYgA2ADAALQA3ADAANAAzAC0ANABhADYAMwAtAGIANgA1AGIALQA2ADEANAA3ADEAMwA4ADcAOABkADQAMgB9AAcSTABpAGIAcgBhAHIAaQBlAHMACEx7ADMAYgBmAGQANQA0ADUAOQAtAGIAMAA3AGYALQA0AGQANgBlAC0AYQBlADEAYQAtAGEAOAAzADMANQA2AGEANQA1ADEANAAyAH0ACUx7ADkAYwA5ADUAOAA5ADYAOAAtADIAYwA4ADUALQA0ADEAYgBiAC0AOAA4ADcAMQAtADgAOQA1AGYAZgAxAGYAZQBkAGUAMQBhAH0ACg5WAGUAcgBzAGkAbwBuAAsGaQBuAHQADApVAHMAYQBnAGUADQpUAGkAdABsAGUADhpWAGkAcwB1AEUAbABlAG0ATQBlAHQAZQByAA8OQwBvAG0AcABhAG4AeQAQDFMAeQBzAHQAZQBtABESVgBpAHMAdQBFAGwAZQBtAHMAEjBWAGkAcwB1AEUAbABlAG0AcwBTAHAAZQBjAGkAYQBsAEMAbwBuAHQAcgBvAGwAcwATKFYAaQBzAHUARQBsAGUAbQBzAFcAaQBuAEMAbwBuAHQAcgBvAGwAcwAUJFYAaQBzAHUARQBsAGUAbQBUAGUAeAB0AEUAZABpAHQAbwByABUiVgBpAHMAdQBOAGEAdABpAHYAZQBDAG8AbgB0AHIAbwBsABYUVgBpAHMAdQBJAG4AcAB1AHQAcwAXGFYAaQBzAHUARQBsAGUAbQBCAGEAcwBlABgmRABlAHYAUABsAGEAYwBlAGgAbwBsAGQAZQByAHMAVQBzAGUAZAAZCGIAbwBvAGwAGiJQAGwAdQBnAGkAbgBDAG8AbgBzAHQAcgBhAGkAbgB0AHMAG0x7ADQAMwBkADUAMgBiAGMAZQAtADkANAAyAGMALQA0ADQAZAA3AC0AOQBlADkANAAtADEAYgBmAGQAZgAzADEAMABlADYAMwBjAH0AHBxBAHQATABlAGEAcwB0AFYAZQByAHMAaQBvAG4AHRRQAGwAdQBnAGkAbgBHAHUAaQBkAB4WUwB5AHMAdABlAG0ALgBHAHUAaQBkAB9IYQBmAGMAZAA1ADQANAA2AC0ANAA5ADEANAAtADQAZgBlADcALQBiAGIANwA4AC0AOQBiAGYAZgBlAGIANwAwAGYAZAAxADcAIBRVAHAAZABhAHQAZQBJAG4AZgBvACFMewBiADAAMwAzADYANgBhADgALQBiADUAYwAwAC0ANABiADkAYQAtAGEAMAAwAGUALQBlAGIAOAA2ADAAMQAxADEAMAA0AGMAMwB9ACIOVQBwAGQAYQB0AGUAcwAjTHsAMQA4ADYAOABmAGYAYwA5AC0AZQA0AGYAYwAtADQANQAzADIALQBhAGMAMAA2AC0AMQBlADMAOQBiAGIANQA1ADcAYgA2ADkAfQAkTHsAYQA1AGIAZAA0ADgAYwAzAC0AMABkADEANwAtADQAMQBiADUALQBiADEANgA0AC0ANQBmAGMANgBhAGQAMgBiADkANgBiADcAfQAlFk8AYgBqAGUAYwB0AHMAVAB5AHAAZQAmVFUAcABkAGEAdABlAEwAYQBuAGcAdQBhAGcAZQBNAG8AZABlAGwARgBvAHIAQwBvAG4AdgBlAHIAdABpAGIAbABlAEwAaQBiAHIAYQByAGkAZQBzACcQTABpAGIAVABpAHQAbABlACgUTABpAGIAQwBvAG0AcABhAG4AeQApHlUAcABkAGEAdABlAFAAcgBvAHYAaQBkAGUAcgBzACo4UwB5AHMAdABlAG0ALgBDAG8AbABsAGUAYwB0AGkAbwBuAHMALgBIAGEAcwBoAHQAYQBiAGwAZQArEnYAaQBzAHUAZQBsAGUAbQBzACwMcwB5AHMAdABlAG0ALUg2AGMAYgAxAGMAZABlADEALQBkADUAZABjAC0ANABhADMAYgAtADkAMAA1ADQALQAyADEAZgBhADcANQA2AGEAMwBmAGEANAAuKEkAbgB0AGUAcgBmAGEAYwBlAFYAZQByAHMAaQBvAG4ASQBuAGYAbwAvTHsAYwA2ADEAMQBlADQAMAAwAC0ANwBmAGIAOQAtADQAYwAzADUALQBiADkAYQBjAC0ANABlADMAMQA0AGIANQA5ADkANgA0ADMAfQAwGE0AYQBqAG8AcgBWAGUAcgBzAGkAbwBuADEYTQBpAG4AbwByAFYAZQByAHMAaQBvAG4AMgxMAGUAZwBhAGMAeQAzMEwAYQBuAGcAdQBhAGcAZQBNAG8AZABlAGwAVgBlAHIAcwBpAG8AbgBJAG4AZgBvADQwTABvAGEAZABMAGkAYgByAGEAcgBpAGUAcwBJAG4AdABvAFAAcgBvAGoAZQBjAHQANRpDAG8AbQBwAGEAdABpAGIAaQBsAGkAdAB5ANAAAhoD0AMBLQTQBQYaB9AHCBoBRQcJCNAACRoERQoLBAQAAAAHAAAAAAAAAAAAAADQDAutAgAAANANAS0O0A8BLRDQAAkaBEUKCwQEAAAABwAAAAAAAAAAAAAA0AwLrQEAAADQDQEtEdAPAS0Q0AAJGgRFCgsEBAAAAAcAAAAAAAAAAAAAANAMC60CAAAA0A0BLRLQDwEtENAACRoERQoLBAQAAAAHAAAAAAAAAAAAAADQDAutAgAAANANAS0T0A8BLRDQAAkaBEUKCwQEAAAABwAAAAAAAAAAAAAA0AwLrQIAAADQDQEtFNAPAS0Q0AAJGgRFCgsEBAAAAAcAAAAAAAAAAAAAANAMC60CAAAA0A0BLRXQDwEtENAACRoERQoLBAQAAAAHAAAAAAAAAAAAAADQDAutAgAAANANAS0W0A8BLRDQAAkaBEUKCwQEAAAABwAAAAAAAAAAAAAA0AwLrQQAAADQDQEtF9APAS0Q0BgZrQFFGhsB0AAbGgJFHAsEBAAAAAIAAAAAAAAAAAAAANAdHi0f0CAhGgJFIiMC0AAkGgVFCgsEAwAAAAMAAAAAAAAACgAAANAlC60AAAAA0AMBLSbQJwEtEdAoAS0Q0AAkGgVFCgsEAwAAAAMAAAAAAAAACgAAANAlC60BAAAA0AMBLSbQJwEtEdAoAS0QmikqAUUAAQLQAAEtK9AAAS0s0AAeLS3QLi8aA9AwC60BAAAA0DELrSQAAADQMhmtANAzLxoD0DALrQIAAADQMQutBgAAANAyGa0A0DQZrQDQNRmtAA== + + + {8A0FB252-96EB-4DCC-A5B4-B4804D05E2D6} + + "{8A0FB252-96EB-4DCC-A5B4-B4804D05E2D6}" + + + WriteLineIDs + False + + + {8F99A816-E488-41E4-9FA3-846536012284} + + "{8F99A816-E488-41E4-9FA3-846536012284}" + + + DisabledWarningIds + 410,5410 + + + {F66C7017-BDD8-4114-926C-81D6D687E35F} + + "{F66C7017-BDD8-4114-926C-81D6D687E35F}" + + + CalcActiveTransOnly + True + + + + + + + + System.Boolean + System.Collections.Hashtable + System.Int32 + {54dd0eac-a6d8-46f2-8c27-2f43c7e49861} + System.String + System.UInt32 + + + + + \ No newline at end of file diff --git a/TwinCAT Projekt1/PLC/POUs/Analog/FB_AnalogInput.TcPOU b/PLC/POUs/Analog/FB_AnalogInput.TcPOU similarity index 89% rename from TwinCAT Projekt1/PLC/POUs/Analog/FB_AnalogInput.TcPOU rename to PLC/POUs/Analog/FB_AnalogInput.TcPOU index 56ebf83..5124de2 100644 --- a/TwinCAT Projekt1/PLC/POUs/Analog/FB_AnalogInput.TcPOU +++ b/PLC/POUs/Analog/FB_AnalogInput.TcPOU @@ -17,10 +17,10 @@ VAR_INPUT xErrorCard AT %I* : BOOL; // IO config data - stAnalogIOConfig : REFERENCE TO ST_ANALOG_IO_CONFIG; + stAnalogIOConfig : ST_ANALOG_IO_CONFIG; // Error and warning config data - stAnalogEWConfig : REFERENCE TO ST_ANALOG_EW_CONFIG; + stAnalogEWConfig : ST_ANALOG_EW_CONFIG; // Global switch to dissable all errors xReleaseErrors : BOOL := TRUE; @@ -120,12 +120,21 @@ VAR // Clamped analog value _iClampedAnalogValue : INT; + // Internal scaled value + _rScaledValue : REAL; + // Name of the function block _sName : STRING; - //{attribute 'instance-path'} - //{attribute 'noinit'} - //_sDebugName : STRING; + // Internal warning flags + _xWarningLow : BOOL; + _xWarningHigh : BOOL; + _xWarning : BOOL; + + // Internal error flag + _xErrorLow : BOOL; + _xErrorHigh : BOOL; + _xError : BOOL; // Alarm handlers _fbAlarmCardError : FB_TcAlarm; @@ -161,7 +170,7 @@ CheckEWLevels(); IF xReleaseErrors AND (_xConfigError OR (_xEWConfigError AND xReleaseLimitErrors)) THEN // Latch error - xError := TRUE; + _xError := TRUE; // Raise alarm IF (NOT xInUnitTestMode) AND (NOT _fbAlarmConfigError.bRaised) THEN @@ -177,15 +186,6 @@ IF (NOT _xConfigError) AND (NOT _xEWConfigError) AND _fbAlarmConfigError.bRaised END_IF -// ============================================= -// Abort if config parameter are not a valid ref -// ============================================= - -IF (NOT __ISVALIDREF(stAnalogIOConfig)) AND (NOT __ISVALIDREF(stAnalogEWConfig)) THEN - RETURN; -END_IF - - // ======================== // Analog value calculation // ======================== @@ -195,7 +195,7 @@ _iClampedAnalogValue := MAX(_iAIMin, iAnalogValue); _iClampedAnalogValue := MIN(_iAIMax, _iClampedAnalogValue); // Calc scaled value -rScaledValue := _iClampedAnalogValue * _rConversionFactor + _rBaseOffset; +_rScaledValue := _iClampedAnalogValue * _rConversionFactor + _rBaseOffset; // ========================= @@ -211,7 +211,7 @@ _fbSignalDelayUnderrangeError( // Latch error signal IF _fbSignalDelayUnderrangeError.xReleaseSignal THEN - xError := TRUE; + _xError := TRUE; END_IF // Raise alarm @@ -243,7 +243,7 @@ _fbSignalDelayOverloadError( // Latch error signal IF _fbSignalDelayOverloadError.xReleaseSignal THEN - xError := TRUE; + _xError := TRUE; END_IF // Raise alarm @@ -277,7 +277,7 @@ _fbSignalDelayCardError( // Latch error signal IF _fbSignalDelayCardError.xReleaseSignal THEN - xError := TRUE; + _xError := TRUE; END_IF // Raise alarm @@ -301,16 +301,16 @@ END_IF // =========================== _fbSignalDelayErrorHigh( - xSignal:= (rScaledValue >= _rMaxErrorLevel), + xSignal:= (_rScaledValue >= _rMaxErrorLevel), xRelease:= stAnalogIOConfig.xUsed AND xReleaseErrors AND xReleaseLimitErrors AND (NOT _xEWConfigError), timOnDelay:= stAnalogEWConfig.stDelays.timErrorHighOn, timOffDelay:= stAnalogEWConfig.stDelays.timErrorHighOff); -xErrorHigh := _fbSignalDelayErrorHigh.xReleaseSignal; +_xErrorHigh := _fbSignalDelayErrorHigh.xReleaseSignal; // Latch error -IF xErrorLow THEN - xError := TRUE; +IF _xErrorHigh THEN + _xError := TRUE; END_IF // Raise alarm @@ -334,16 +334,16 @@ END_IF // =========================== _fbSignalDelayErrorLow( - xSignal:= (rScaledValue <= _rMinErrorLevel), + xSignal:= (_rScaledValue <= _rMinErrorLevel), xRelease:= stAnalogIOConfig.xUsed AND xReleaseErrors AND xReleaseLimitErrors AND (NOT _xEWConfigError), timOnDelay:= stAnalogEWConfig.stDelays.timErrorLowOn, timOffDelay:= stAnalogEWConfig.stDelays.timErrorLowOff); -xErrorLow := _fbSignalDelayErrorLow.xReleaseSignal; +_xErrorLow := _fbSignalDelayErrorLow.xReleaseSignal; // Latch error -IF xErrorLow THEN - xError := TRUE; +IF _xErrorLow THEN + _xError := TRUE; END_IF // Raise alarm @@ -367,12 +367,12 @@ END_IF // =========================== _fbSignalDelayWarningHigh( - xSignal:= (rScaledValue >= _rMaxWarningLevel), + xSignal:= (_rScaledValue >= _rMaxWarningLevel), xRelease:= stAnalogIOConfig.xUsed AND xReleaseErrors AND xReleaseLimitErrors AND (NOT _xEWConfigError), timOnDelay:= stAnalogEWConfig.stDelays.timWarningHighOn, timOffDelay:= stAnalogEWConfig.stDelays.timWarningHighOff); -xWarningHigh := _fbSignalDelayWarningHigh.xReleaseSignal; +_xWarningHigh := _fbSignalDelayWarningHigh.xReleaseSignal; // Raise alarm IF _fbSignalDelayWarningHigh.xReleaseSignal AND (NOT xInUnitTestMode) AND (NOT _fbAlarmWarningHigh.bRaised) THEN @@ -395,12 +395,12 @@ END_IF // =========================== _fbSignalDelayWarningLow( - xSignal:= (rScaledValue <= _rMinWarningLevel), + xSignal:= (_rScaledValue <= _rMinWarningLevel), xRelease:= stAnalogIOConfig.xUsed AND xReleaseErrors AND xReleaseLimitErrors AND (NOT _xEWConfigError), timOnDelay:= stAnalogEWConfig.stDelays.timWarningLowOn, timOffDelay:= stAnalogEWConfig.stDelays.timWarningLowOff); -xWarningLow := _fbSignalDelayWarningLow.xReleaseSignal; +_xWarningLow := _fbSignalDelayWarningLow.xReleaseSignal; // Raise alarm IF _fbSignalDelayWarningLow.xReleaseSignal AND (NOT xInUnitTestMode) AND (NOT _fbAlarmWarningLow.bRaised) THEN @@ -422,7 +422,7 @@ END_IF // Warning flag // ============ -xWarning := xWarningLow OR xWarningHigh; +_xWarning := _xWarningLow OR _xWarningHigh; // ================ @@ -440,9 +440,20 @@ _xInputErrorsActive := _fbSignalDelayUnderrangeError.xReleaseSignal OR _fbSignalDelayOverloadError.xReleaseSignal OR _fbSignalDelayCardError.xReleaseSignal; -IF xConfirmAlarms AND xError AND (NOT _xAlarmsActive) AND (NOT _xInputErrorsActive) AND (NOT _xConfigError) THEN - xError := FALSE; -END_IF]]> +IF xConfirmAlarms AND _xError AND (NOT _xAlarmsActive) AND (NOT _xInputErrorsActive) AND (NOT _xConfigError) THEN + _xError := FALSE; +END_IF + +// Copy internal signals to outputs +xWarningLow := _xWarningLow; +xWarningHigh := _xWarningHigh; +xWarning := _xWarning; + +xErrorLow := _xErrorLow; +xErrorHigh := _xErrorHigh; +xError := _xError; + +rScaledValue := _rScaledValue;]]> - - stAnalogEWConfig.stLevels.rWarningMax) OR (_rMaxErrorLevel <> stAnalogEWConfig.stLevels.rErrorMax) THEN {analysis +54} - //CreateAlarmLimitsMSG(); + CreateAlarmLimitsMSG(); END_IF // Set new values @@ -548,12 +547,7 @@ VAR END_VAR ]]> - '' THEN _sTempUnit := CONCAT(' ', stAnalogIOConfig.sUnit); ELSE @@ -566,11 +560,13 @@ _sTempWarningMin := CONCAT(REAL_TO_STRING(stAnalogEWConfig.stLevels.rWarningMin) _sTempWarningMax := CONCAT(REAL_TO_STRING(stAnalogEWConfig.stLevels.rWarningMax), _sTempUnit); _sTempErrorMax := CONCAT(REAL_TO_STRING(stAnalogEWConfig.stLevels.rErrorMax), _sTempUnit); +{analysis -46} // Inser message parameters _fbAlarmErrorLow.ipArguments.Clear().AddString(_sName).AddString(_sTempErrorMin); _fbAlarmWarningLow.ipArguments.Clear().AddString(_sName).AddString(_sTempWarningMin); _fbAlarmWarningHigh.ipArguments.Clear().AddString(_sName).AddString(_sTempWarningMax); -_fbAlarmErrorHigh.ipArguments.Clear().AddString(_sName).AddString(_sTempErrorMax);]]> +_fbAlarmErrorHigh.ipArguments.Clear().AddString(_sName).AddString(_sTempErrorMax); +{analysis +46}]]> @@ -579,10 +575,12 @@ VAR_INPUT END_VAR ]]> - +_fbAlarmConfigError.ipArguments.Clear().AddString(_sName); +{analysis +46}]]> diff --git a/TwinCAT Projekt1/PLC/POUs/Analog/FB_AnalogOutput.TcPOU b/PLC/POUs/Analog/FB_AnalogOutput.TcPOU similarity index 100% rename from TwinCAT Projekt1/PLC/POUs/Analog/FB_AnalogOutput.TcPOU rename to PLC/POUs/Analog/FB_AnalogOutput.TcPOU diff --git a/TwinCAT Projekt1/PLC/POUs/Analog/Types/ST_ANALOG_EW_CONFIG.TcDUT b/PLC/POUs/Analog/Types/ST_ANALOG_EW_CONFIG.TcDUT similarity index 100% rename from TwinCAT Projekt1/PLC/POUs/Analog/Types/ST_ANALOG_EW_CONFIG.TcDUT rename to PLC/POUs/Analog/Types/ST_ANALOG_EW_CONFIG.TcDUT diff --git a/TwinCAT Projekt1/PLC/POUs/Analog/Types/ST_ANALOG_EW_DELAYS.TcDUT b/PLC/POUs/Analog/Types/ST_ANALOG_EW_DELAYS.TcDUT similarity index 100% rename from TwinCAT Projekt1/PLC/POUs/Analog/Types/ST_ANALOG_EW_DELAYS.TcDUT rename to PLC/POUs/Analog/Types/ST_ANALOG_EW_DELAYS.TcDUT diff --git a/TwinCAT Projekt1/PLC/POUs/Analog/Types/ST_ANALOG_EW_LEVELS.TcDUT b/PLC/POUs/Analog/Types/ST_ANALOG_EW_LEVELS.TcDUT similarity index 100% rename from TwinCAT Projekt1/PLC/POUs/Analog/Types/ST_ANALOG_EW_LEVELS.TcDUT rename to PLC/POUs/Analog/Types/ST_ANALOG_EW_LEVELS.TcDUT diff --git a/TwinCAT Projekt1/PLC/POUs/Analog/Types/ST_ANALOG_IO_CONFIG.TcDUT b/PLC/POUs/Analog/Types/ST_ANALOG_IO_CONFIG.TcDUT similarity index 100% rename from TwinCAT Projekt1/PLC/POUs/Analog/Types/ST_ANALOG_IO_CONFIG.TcDUT rename to PLC/POUs/Analog/Types/ST_ANALOG_IO_CONFIG.TcDUT diff --git a/PLC/POUs/EventListener/FB_EventListener.TcPOU b/PLC/POUs/EventListener/FB_EventListener.TcPOU new file mode 100644 index 0000000..19715ea --- /dev/null +++ b/PLC/POUs/EventListener/FB_EventListener.TcPOU @@ -0,0 +1,334 @@ + + + + + + 0 THEN + {analysis -19} + _fbBuffer.A_RemoveHead(pRead:= ADR(_stBufferEventEntryFromBuffer), + cbRead:= SIZEOF(_stBufferEventEntryFromBuffer), + pBuffer:= ADR(_abAlarmBuffer), + cbBuffer:= SIZEOF(_abAlarmBuffer), + bOk=> _xSuccess, + nCount => _udiCurrentEntries); + {analysis +19} + IF _xSuccess THEN + _uiState := 10; + END_IF +END_IF + +CASE _uiState OF + 0: // Idle + + 10: // Get alarm text + _xGetTextDone := _stBufferEventEntryFromBuffer.fbAlarm.RequestEventText( + nLangId := 1033, + sResult := _sLastMessageText, + nResultSize := SIZEOF(_sLastMessageText), + bError => _xGetTextError); + + IF _xGetTextError THEN + _sLastMessageText := ''; + _uiState := 20; + ELSIF _xGetTextDone THEN + _uiState := 20; + END_IF + + 20: // Create mqtt message + CreateMessage(); + _uiState := 0; + + ELSE + // Do nothing + ; +END_CASE]]> + + + + + _xOk, + nCount => _udiCurrentEntries); +{analysis +19} + +AddAlarmToQueue := _xOk; +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PLC/POUs/EventListener/Types/E_EventType.TcDUT b/PLC/POUs/EventListener/Types/E_EventType.TcDUT new file mode 100644 index 0000000..d7ccfed --- /dev/null +++ b/PLC/POUs/EventListener/Types/E_EventType.TcDUT @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/PLC/POUs/EventListener/Types/ST_BufferEventEntry.TcDUT b/PLC/POUs/EventListener/Types/ST_BufferEventEntry.TcDUT new file mode 100644 index 0000000..c8db92e --- /dev/null +++ b/PLC/POUs/EventListener/Types/ST_BufferEventEntry.TcDUT @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/PLC/POUs/PRG_MAIN.TcPOU b/PLC/POUs/PRG_MAIN.TcPOU new file mode 100644 index 0000000..786374f --- /dev/null +++ b/PLC/POUs/PRG_MAIN.TcPOU @@ -0,0 +1,17 @@ + + + + + + + + + \ No newline at end of file diff --git a/TwinCAT Projekt1/PLC/POUs/Unittests/AITests/FB_AnalogInputTest.TcPOU b/PLC/POUs/Unittests/AITests/FB_AnalogInputTest.TcPOU similarity index 100% rename from TwinCAT Projekt1/PLC/POUs/Unittests/AITests/FB_AnalogInputTest.TcPOU rename to PLC/POUs/Unittests/AITests/FB_AnalogInputTest.TcPOU diff --git a/TwinCAT Projekt1/PLC/POUs/Utilities/FB_ReleaseSignal.TcPOU b/PLC/POUs/Utilities/FB_ReleaseSignal.TcPOU similarity index 100% rename from TwinCAT Projekt1/PLC/POUs/Utilities/FB_ReleaseSignal.TcPOU rename to PLC/POUs/Utilities/FB_ReleaseSignal.TcPOU diff --git a/TwinCAT Projekt1/PLC/PlcTask.TcTTO b/PLC/PlcTask.TcTTO similarity index 95% rename from TwinCAT Projekt1/PLC/PlcTask.TcTTO rename to PLC/PlcTask.TcTTO index 801aaae..4838516 100644 --- a/TwinCAT Projekt1/PLC/PlcTask.TcTTO +++ b/PLC/PlcTask.TcTTO @@ -5,7 +5,7 @@ 10000 20 - MAIN + PRG_MAIN {a83be5e0-d5cf-4aec-b38e-29e42c090d19} {4deed5d2-49a0-440e-8d82-d09251814781} diff --git a/TwinCAT Projekt1/PLC/PLC.plcproj b/TwinCAT Projekt1/PLC/PLC.plcproj deleted file mode 100644 index e566b44..0000000 --- a/TwinCAT Projekt1/PLC/PLC.plcproj +++ /dev/null @@ -1,184 +0,0 @@ - - - - 1.0.0.0 - 2.0 - {4e62d9e7-436c-457d-8dc4-82d2fef91c96} - true - true - false - false - PLC - 3.1.4026.19 - {7cc9c530-510c-48e6-a294-2e6b5e6fa820} - {951d7a0c-817c-4013-8204-ecd29ee0162e} - {e6d3915d-876b-4120-9e42-92be330ed750} - {86bdbf68-2971-41b8-9b27-17e052a7f55d} - {173a046e-fc1b-4ea3-9ec8-0d52397c403c} - {c870d3c5-a637-481e-9586-ab8eaa6f8f36} - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - - - - - - - - true - - - - - - - Tc2_Standard, * (Beckhoff Automation GmbH) - Tc2_Standard - - - Tc2_System, * (Beckhoff Automation GmbH) - Tc2_System - - - Tc3_EventLogger, * (Beckhoff Automation GmbH) - Tc3_EventLogger - - - Tc3_Module, * (Beckhoff Automation GmbH) - Tc3_Module - true - - - TcUnit, * (www.tcunit.org) - TcUnit - - - - - Content - - - - - - - - "<ProjectRoot>" - - {192FAD59-8248-4824-A8DE-9177C94C195A} - - "{192FAD59-8248-4824-A8DE-9177C94C195A}" - - - - {246001F4-279D-43AC-B241-948EB31120E1} - - "{246001F4-279D-43AC-B241-948EB31120E1}" - - - - {29BD8D0C-3586-4548-BB48-497B9A01693F} - - "{29BD8D0C-3586-4548-BB48-497B9A01693F}" - - NamingConventions - - "NamingConventions" - - - - Rules - - "Rules" - - - - - - - {40450F57-0AA3-4216-96F3-5444ECB29763} - - "{40450F57-0AA3-4216-96F3-5444ECB29763}" - - - - {8A0FB252-96EB-4DCC-A5B4-B4804D05E2D6} - - "{8A0FB252-96EB-4DCC-A5B4-B4804D05E2D6}" - - - WriteLineIDs - False - - - {8F99A816-E488-41E4-9FA3-846536012284} - - "{8F99A816-E488-41E4-9FA3-846536012284}" - - - DisabledWarningIds - 410,5410 - - - {F66C7017-BDD8-4114-926C-81D6D687E35F} - - "{F66C7017-BDD8-4114-926C-81D6D687E35F}" - - - CalcActiveTransOnly - True - - - - - - - - System.Boolean - System.Collections.Hashtable - {54dd0eac-a6d8-46f2-8c27-2f43c7e49861} - System.String - - - - - \ No newline at end of file diff --git a/TwinCAT Projekt1/PLC/POUs/MAIN.TcPOU b/TwinCAT Projekt1/PLC/POUs/MAIN.TcPOU deleted file mode 100644 index 26421ca..0000000 --- a/TwinCAT Projekt1/PLC/POUs/MAIN.TcPOU +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/TwinCAT Projekt1/PLC/POUs/Tests/FB_Machine.TcPOU b/TwinCAT Projekt1/PLC/POUs/Tests/FB_Machine.TcPOU deleted file mode 100644 index ec9ad88..0000000 --- a/TwinCAT Projekt1/PLC/POUs/Tests/FB_Machine.TcPOU +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/TwinCAT Projekt1/PLC/POUs/Tests/MAIN_TESTS.TcPOU b/TwinCAT Projekt1/PLC/POUs/Tests/MAIN_TESTS.TcPOU deleted file mode 100644 index 4986f1f..0000000 --- a/TwinCAT Projekt1/PLC/POUs/Tests/MAIN_TESTS.TcPOU +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc2_Standard/3.4.5.0/Tc2_Standard.compiled-library-ge33 b/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc2_Standard/3.4.5.0/Tc2_Standard.compiled-library-ge33 deleted file mode 100644 index c4c4fb0..0000000 Binary files a/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc2_Standard/3.4.5.0/Tc2_Standard.compiled-library-ge33 and /dev/null differ diff --git a/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc2_System/3.9.1.0/Tc2_System.compiled-library-ge33 b/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc2_System/3.9.1.0/Tc2_System.compiled-library-ge33 deleted file mode 100644 index 7055541..0000000 Binary files a/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc2_System/3.9.1.0/Tc2_System.compiled-library-ge33 and /dev/null differ diff --git a/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc2_Utilities/3.10.1.0/Tc2_Utilities.compiled-library-ge33 b/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc2_Utilities/3.10.1.0/Tc2_Utilities.compiled-library-ge33 deleted file mode 100644 index 31570ec..0000000 Binary files a/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc2_Utilities/3.10.1.0/Tc2_Utilities.compiled-library-ge33 and /dev/null differ diff --git a/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc3_DynamicMemory/1.1.4.0/Tc3_DynamicMemory.compiled-library-ge33 b/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc3_DynamicMemory/1.1.4.0/Tc3_DynamicMemory.compiled-library-ge33 deleted file mode 100644 index f41a9b4..0000000 Binary files a/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc3_DynamicMemory/1.1.4.0/Tc3_DynamicMemory.compiled-library-ge33 and /dev/null differ diff --git a/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc3_EventLogger/3.3.13.0/Tc3_EventLogger.compiled-library-ge33 b/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc3_EventLogger/3.3.13.0/Tc3_EventLogger.compiled-library-ge33 deleted file mode 100644 index 21a69e3..0000000 Binary files a/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc3_EventLogger/3.3.13.0/Tc3_EventLogger.compiled-library-ge33 and /dev/null differ diff --git a/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc3_IotBase/3.5.3.0/Tc3_IotBase.compiled-library-ge33 b/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc3_IotBase/3.5.3.0/Tc3_IotBase.compiled-library-ge33 deleted file mode 100644 index 9511e9c..0000000 Binary files a/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc3_IotBase/3.5.3.0/Tc3_IotBase.compiled-library-ge33 and /dev/null differ diff --git a/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc3_JsonXml/3.4.7.0/Tc3_JsonXml.compiled-library-ge33 b/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc3_JsonXml/3.4.7.0/Tc3_JsonXml.compiled-library-ge33 deleted file mode 100644 index 206aa42..0000000 Binary files a/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc3_JsonXml/3.4.7.0/Tc3_JsonXml.compiled-library-ge33 and /dev/null differ diff --git a/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc3_Module/3.4.5.0/Tc3_Module.compiled-library-ge33 b/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc3_Module/3.4.5.0/Tc3_Module.compiled-library-ge33 deleted file mode 100644 index f60ac24..0000000 Binary files a/TwinCAT Projekt1/PLC/_Libraries/Beckhoff Automation GmbH/Tc3_Module/3.4.5.0/Tc3_Module.compiled-library-ge33 and /dev/null differ diff --git a/TwinCAT Projekt1/PLC/_Libraries/Nikon SLM Solutions/SLM_Base/0.2.0.22/SLM_Base_0_2_0_22.library b/TwinCAT Projekt1/PLC/_Libraries/Nikon SLM Solutions/SLM_Base/0.2.0.22/SLM_Base_0_2_0_22.library deleted file mode 100644 index 7b92112..0000000 Binary files a/TwinCAT Projekt1/PLC/_Libraries/Nikon SLM Solutions/SLM_Base/0.2.0.22/SLM_Base_0_2_0_22.library and /dev/null differ diff --git a/TwinCAT Projekt1/PLC/_Libraries/System/Base Interfaces/3.5.17.0/Base_Itfs.compiled-library-v3 b/TwinCAT Projekt1/PLC/_Libraries/System/Base Interfaces/3.5.17.0/Base_Itfs.compiled-library-v3 deleted file mode 100644 index afeedf1..0000000 Binary files a/TwinCAT Projekt1/PLC/_Libraries/System/Base Interfaces/3.5.17.0/Base_Itfs.compiled-library-v3 and /dev/null differ diff --git a/TwinCAT Projekt1/PLC/_Libraries/System/CmpErrors2 Interfaces/3.5.19.0/CmpErrors2_Itfs.compiled-library-v3 b/TwinCAT Projekt1/PLC/_Libraries/System/CmpErrors2 Interfaces/3.5.19.0/CmpErrors2_Itfs.compiled-library-v3 deleted file mode 100644 index a0618b9..0000000 Binary files a/TwinCAT Projekt1/PLC/_Libraries/System/CmpErrors2 Interfaces/3.5.19.0/CmpErrors2_Itfs.compiled-library-v3 and /dev/null differ diff --git a/TwinCAT Projekt1/PLC/_Libraries/System/SysDir/3.5.17.0/SysDir.compiled-library-v3 b/TwinCAT Projekt1/PLC/_Libraries/System/SysDir/3.5.17.0/SysDir.compiled-library-v3 deleted file mode 100644 index 1982691..0000000 Binary files a/TwinCAT Projekt1/PLC/_Libraries/System/SysDir/3.5.17.0/SysDir.compiled-library-v3 and /dev/null differ diff --git a/TwinCAT Projekt1/PLC/_Libraries/System/SysFile/3.5.17.0/SysFile.compiled-library-v3 b/TwinCAT Projekt1/PLC/_Libraries/System/SysFile/3.5.17.0/SysFile.compiled-library-v3 deleted file mode 100644 index d763bea..0000000 Binary files a/TwinCAT Projekt1/PLC/_Libraries/System/SysFile/3.5.17.0/SysFile.compiled-library-v3 and /dev/null differ diff --git a/TwinCAT Projekt1/PLC/_Libraries/System/SysTypes2 Interfaces/3.5.17.0/SysTypes2_Itfs.compiled-library-v3 b/TwinCAT Projekt1/PLC/_Libraries/System/SysTypes2 Interfaces/3.5.17.0/SysTypes2_Itfs.compiled-library-v3 deleted file mode 100644 index 9494204..0000000 Binary files a/TwinCAT Projekt1/PLC/_Libraries/System/SysTypes2 Interfaces/3.5.17.0/SysTypes2_Itfs.compiled-library-v3 and /dev/null differ diff --git a/TwinCAT Projekt1/PLC/_Libraries/www.tcunit.org/TcUnit/1.3.1/TcUnit.library b/TwinCAT Projekt1/PLC/_Libraries/www.tcunit.org/TcUnit/1.3.1/TcUnit.library deleted file mode 100644 index a74a6a9..0000000 Binary files a/TwinCAT Projekt1/PLC/_Libraries/www.tcunit.org/TcUnit/1.3.1/TcUnit.library and /dev/null differ