From e44cad50dd2508406406bbbc86d9575462a9771f Mon Sep 17 00:00:00 2001 From: Alois Zoitl Date: Sun, 28 Mar 2021 18:11:23 +0200 Subject: [PATCH] [572371] Prefix all IN and OUT functions with st_ In order to avoid build problems on windows this fix prefixes all IN and OUT port accessor functions with st_. Furthermore all undefs for IN and OUT are removed as well. Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=572371 Change-Id: Iaa39aabae43b1a7b00c6410a5e445d7343e2e0e1 Signed-off-by: Alois Zoitl --- forte_config.h.in | 3 --- src/com/opc_ua/FBs/LocalizedText2LocalizedText.cpp | 2 +- src/com/opc_ua/FBs/LocalizedText2LocalizedText.h | 4 ++-- src/core/fmi/processinterface.h | 8 -------- src/core/funcbloc.h | 8 -------- src/modules/IEC61131-3/Arithmetic/F_ADD.h | 4 ++-- src/modules/IEC61131-3/Arithmetic/F_ADD_DT_TIME.cpp | 2 +- src/modules/IEC61131-3/Arithmetic/F_ADD_DT_TIME.h | 2 +- src/modules/IEC61131-3/Arithmetic/F_ADD_TOD_TIME.cpp | 2 +- src/modules/IEC61131-3/Arithmetic/F_ADD_TOD_TIME.h | 2 +- src/modules/IEC61131-3/Arithmetic/F_DIV.h | 4 ++-- src/modules/IEC61131-3/Arithmetic/F_DIVTIME.h | 4 ++-- src/modules/IEC61131-3/Arithmetic/F_EXPT.h | 4 ++-- src/modules/IEC61131-3/Arithmetic/F_MOD.h | 4 ++-- src/modules/IEC61131-3/Arithmetic/F_MOVE.cpp | 2 +- src/modules/IEC61131-3/Arithmetic/F_MOVE.h | 8 ++++---- src/modules/IEC61131-3/Arithmetic/F_MUL.h | 4 ++-- src/modules/IEC61131-3/Arithmetic/F_MULTIME.h | 4 ++-- src/modules/IEC61131-3/Arithmetic/F_SUB.h | 4 ++-- .../IEC61131-3/Arithmetic/F_SUB_DATE_DATE.cpp | 2 +- src/modules/IEC61131-3/Arithmetic/F_SUB_DATE_DATE.h | 2 +- src/modules/IEC61131-3/Arithmetic/F_SUB_DT_DT.cpp | 2 +- src/modules/IEC61131-3/Arithmetic/F_SUB_DT_DT.h | 2 +- src/modules/IEC61131-3/Arithmetic/F_SUB_DT_TIME.cpp | 2 +- src/modules/IEC61131-3/Arithmetic/F_SUB_DT_TIME.h | 2 +- src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TIME.cpp | 2 +- src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TIME.h | 2 +- src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TOD.cpp | 2 +- src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TOD.h | 2 +- src/modules/IEC61131-3/Arithmetic/F_TRUNC.cpp | 6 +++--- src/modules/IEC61131-3/Arithmetic/F_TRUNC.h | 4 ++-- src/modules/IEC61131-3/Arithmetic/GEN_ADD.cpp | 2 +- src/modules/IEC61131-3/Arithmetic/GEN_ADD.h | 8 ++++---- src/modules/IEC61131-3/BitwiseOperators/F_AND.h | 4 ++-- src/modules/IEC61131-3/BitwiseOperators/F_NOT.cpp | 2 +- src/modules/IEC61131-3/BitwiseOperators/F_NOT.h | 8 ++++---- src/modules/IEC61131-3/BitwiseOperators/F_OR.h | 4 ++-- src/modules/IEC61131-3/BitwiseOperators/F_ROL.cpp | 2 +- src/modules/IEC61131-3/BitwiseOperators/F_ROL.h | 8 ++++---- src/modules/IEC61131-3/BitwiseOperators/F_ROR.cpp | 2 +- src/modules/IEC61131-3/BitwiseOperators/F_ROR.h | 8 ++++---- src/modules/IEC61131-3/BitwiseOperators/F_SHL.cpp | 2 +- src/modules/IEC61131-3/BitwiseOperators/F_SHL.h | 8 ++++---- src/modules/IEC61131-3/BitwiseOperators/F_SHR.cpp | 2 +- src/modules/IEC61131-3/BitwiseOperators/F_SHR.h | 8 ++++---- src/modules/IEC61131-3/BitwiseOperators/F_XOR.h | 4 ++-- src/modules/IEC61131-3/BitwiseOperators/GEN_AND.cpp | 2 +- src/modules/IEC61131-3/BitwiseOperators/GEN_AND.h | 6 +++--- src/modules/IEC61131-3/BitwiseOperators/GEN_OR.cpp | 2 +- src/modules/IEC61131-3/BitwiseOperators/GEN_OR.h | 6 +++--- src/modules/IEC61131-3/BitwiseOperators/GEN_XOR.cpp | 2 +- src/modules/IEC61131-3/BitwiseOperators/GEN_XOR.h | 10 +++++----- src/modules/IEC61131-3/BitwiseOperators/genbitbase.h | 2 +- src/modules/IEC61131-3/CharacterString/F_CONCAT.h | 4 ++-- .../IEC61131-3/CharacterString/F_CONCAT_DATE_TOD.cpp | 2 +- .../IEC61131-3/CharacterString/F_CONCAT_DATE_TOD.h | 2 +- src/modules/IEC61131-3/CharacterString/F_DELETE.cpp | 2 +- src/modules/IEC61131-3/CharacterString/F_DELETE.h | 8 ++++---- src/modules/IEC61131-3/CharacterString/F_FIND.cpp | 2 +- src/modules/IEC61131-3/CharacterString/F_FIND.h | 2 +- src/modules/IEC61131-3/CharacterString/F_INSERT.h | 4 ++-- src/modules/IEC61131-3/CharacterString/F_LEFT.cpp | 2 +- src/modules/IEC61131-3/CharacterString/F_LEFT.h | 8 ++++---- src/modules/IEC61131-3/CharacterString/F_LEN.cpp | 2 +- src/modules/IEC61131-3/CharacterString/F_LEN.h | 10 +++++----- src/modules/IEC61131-3/CharacterString/F_MID.cpp | 2 +- src/modules/IEC61131-3/CharacterString/F_MID.h | 8 ++++---- src/modules/IEC61131-3/CharacterString/F_REPLACE.h | 4 ++-- src/modules/IEC61131-3/CharacterString/F_RIGHT.cpp | 2 +- src/modules/IEC61131-3/CharacterString/F_RIGHT.h | 8 ++++---- src/modules/IEC61131-3/Comparison/F_EQ.h | 4 ++-- src/modules/IEC61131-3/Comparison/F_GE.h | 4 ++-- src/modules/IEC61131-3/Comparison/F_GT.h | 4 ++-- src/modules/IEC61131-3/Comparison/F_LE.h | 4 ++-- src/modules/IEC61131-3/Comparison/F_LT.h | 4 ++-- src/modules/IEC61131-3/Comparison/F_NE.h | 4 ++-- .../Conversion/BCD/F_BYTE_BCD_TO_USINT.cpp | 2 +- .../IEC61131-3/Conversion/BCD/F_BYTE_BCD_TO_USINT.h | 4 ++-- .../Conversion/BCD/F_DWORD_BCD_TO_UDINT.cpp | 2 +- .../IEC61131-3/Conversion/BCD/F_DWORD_BCD_TO_UDINT.h | 4 ++-- .../Conversion/BCD/F_LWORD_BCD_TO_ULINT.cpp | 2 +- .../IEC61131-3/Conversion/BCD/F_LWORD_BCD_TO_ULINT.h | 4 ++-- .../Conversion/BCD/F_UDINT_TO_BCD_DWORD.cpp | 2 +- .../IEC61131-3/Conversion/BCD/F_UDINT_TO_BCD_DWORD.h | 4 ++-- .../IEC61131-3/Conversion/BCD/F_UINT_TO_BCD_WORD.cpp | 2 +- .../IEC61131-3/Conversion/BCD/F_UINT_TO_BCD_WORD.h | 4 ++-- .../Conversion/BCD/F_ULINT_TO_BCD_LWORD.cpp | 2 +- .../IEC61131-3/Conversion/BCD/F_ULINT_TO_BCD_LWORD.h | 4 ++-- .../Conversion/BCD/F_USINT_TO_BCD_BYTE.cpp | 2 +- .../IEC61131-3/Conversion/BCD/F_USINT_TO_BCD_BYTE.h | 4 ++-- .../IEC61131-3/Conversion/BCD/F_WORD_BCD_TO_UINT.cpp | 2 +- .../IEC61131-3/Conversion/BCD/F_WORD_BCD_TO_UINT.h | 4 ++-- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_BYTE.cpp | 2 +- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_BYTE.h | 4 ++-- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_DINT.cpp | 2 +- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_DINT.h | 4 ++-- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_DWORD.cpp | 2 +- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_DWORD.h | 4 ++-- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_INT.cpp | 2 +- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_INT.h | 4 ++-- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_LINT.cpp | 2 +- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_LINT.h | 4 ++-- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_LWORD.cpp | 2 +- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_LWORD.h | 4 ++-- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_SINT.cpp | 2 +- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_SINT.h | 4 ++-- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_STRING.cpp | 2 +- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_STRING.h | 4 ++-- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_UDINT.cpp | 2 +- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_UDINT.h | 4 ++-- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_UINT.cpp | 2 +- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_UINT.h | 4 ++-- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_ULINT.cpp | 2 +- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_ULINT.h | 4 ++-- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_USINT.cpp | 2 +- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_USINT.h | 4 ++-- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_WORD.cpp | 2 +- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_WORD.h | 4 ++-- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_WSTRING.cpp | 2 +- .../IEC61131-3/Conversion/BOOL/F_BOOL_TO_WSTRING.h | 4 ++-- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_DINT.cpp | 2 +- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_DINT.h | 4 ++-- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_DWORD.cpp | 2 +- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_DWORD.h | 4 ++-- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_INT.cpp | 2 +- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_INT.h | 4 ++-- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_LINT.cpp | 2 +- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_LINT.h | 4 ++-- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_LWORD.cpp | 2 +- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_LWORD.h | 4 ++-- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_SINT.cpp | 2 +- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_SINT.h | 4 ++-- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_STRING.cpp | 2 +- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_STRING.h | 4 ++-- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_UDINT.cpp | 2 +- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_UDINT.h | 4 ++-- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_UINT.cpp | 2 +- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_UINT.h | 4 ++-- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_ULINT.cpp | 2 +- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_ULINT.h | 4 ++-- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_USINT.cpp | 2 +- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_USINT.h | 4 ++-- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_WORD.cpp | 2 +- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_WORD.h | 4 ++-- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_WSTRING.cpp | 2 +- .../IEC61131-3/Conversion/BYTE/F_BYTE_TO_WSTRING.h | 4 ++-- .../IEC61131-3/Conversion/DINT/F_DINT_TO_BYTE.cpp | 2 +- .../IEC61131-3/Conversion/DINT/F_DINT_TO_BYTE.h | 4 ++-- .../IEC61131-3/Conversion/DINT/F_DINT_TO_DWORD.cpp | 2 +- .../IEC61131-3/Conversion/DINT/F_DINT_TO_DWORD.h | 4 ++-- .../IEC61131-3/Conversion/DINT/F_DINT_TO_INT.cpp | 2 +- .../IEC61131-3/Conversion/DINT/F_DINT_TO_INT.h | 4 ++-- .../IEC61131-3/Conversion/DINT/F_DINT_TO_LINT.cpp | 2 +- .../IEC61131-3/Conversion/DINT/F_DINT_TO_LINT.h | 4 ++-- .../IEC61131-3/Conversion/DINT/F_DINT_TO_LREAL.cpp | 2 +- .../IEC61131-3/Conversion/DINT/F_DINT_TO_LREAL.h | 4 ++-- .../IEC61131-3/Conversion/DINT/F_DINT_TO_LWORD.cpp | 2 +- .../IEC61131-3/Conversion/DINT/F_DINT_TO_LWORD.h | 4 ++-- .../IEC61131-3/Conversion/DINT/F_DINT_TO_REAL.cpp | 2 +- .../IEC61131-3/Conversion/DINT/F_DINT_TO_REAL.h | 4 ++-- .../IEC61131-3/Conversion/DINT/F_DINT_TO_SINT.cpp | 2 +- .../IEC61131-3/Conversion/DINT/F_DINT_TO_SINT.h | 4 ++-- .../IEC61131-3/Conversion/DINT/F_DINT_TO_STRING.cpp | 2 +- .../IEC61131-3/Conversion/DINT/F_DINT_TO_STRING.h | 4 ++-- .../IEC61131-3/Conversion/DINT/F_DINT_TO_UDINT.cpp | 2 +- .../IEC61131-3/Conversion/DINT/F_DINT_TO_UDINT.h | 4 ++-- .../IEC61131-3/Conversion/DINT/F_DINT_TO_UINT.cpp | 2 +- .../IEC61131-3/Conversion/DINT/F_DINT_TO_UINT.h | 4 ++-- .../IEC61131-3/Conversion/DINT/F_DINT_TO_ULINT.cpp | 2 +- .../IEC61131-3/Conversion/DINT/F_DINT_TO_ULINT.h | 4 ++-- .../IEC61131-3/Conversion/DINT/F_DINT_TO_USINT.cpp | 2 +- .../IEC61131-3/Conversion/DINT/F_DINT_TO_USINT.h | 4 ++-- .../IEC61131-3/Conversion/DINT/F_DINT_TO_WORD.cpp | 2 +- .../IEC61131-3/Conversion/DINT/F_DINT_TO_WORD.h | 4 ++-- .../IEC61131-3/Conversion/DINT/F_DINT_TO_WSTRING.cpp | 2 +- .../IEC61131-3/Conversion/DINT/F_DINT_TO_WSTRING.h | 4 ++-- .../IEC61131-3/Conversion/DT/F_DT_TO_DATE.cpp | 2 +- src/modules/IEC61131-3/Conversion/DT/F_DT_TO_DATE.h | 4 ++-- src/modules/IEC61131-3/Conversion/DT/F_DT_TO_TOD.cpp | 2 +- src/modules/IEC61131-3/Conversion/DT/F_DT_TO_TOD.h | 4 ++-- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_BYTE.cpp | 2 +- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_BYTE.h | 4 ++-- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_DINT.cpp | 2 +- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_DINT.h | 4 ++-- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_INT.cpp | 2 +- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_INT.h | 4 ++-- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_LINT.cpp | 2 +- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_LINT.h | 4 ++-- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_LWORD.cpp | 2 +- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_LWORD.h | 4 ++-- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_REAL.cpp | 2 +- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_REAL.h | 4 ++-- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_SINT.cpp | 2 +- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_SINT.h | 4 ++-- .../Conversion/DWORD/F_DWORD_TO_STRING.cpp | 2 +- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_STRING.h | 4 ++-- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_UDINT.cpp | 2 +- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_UDINT.h | 4 ++-- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_UINT.cpp | 2 +- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_UINT.h | 4 ++-- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_ULINT.cpp | 2 +- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_ULINT.h | 4 ++-- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_USINT.cpp | 2 +- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_USINT.h | 4 ++-- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_WORD.cpp | 2 +- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_WORD.h | 4 ++-- .../Conversion/DWORD/F_DWORD_TO_WSTRING.cpp | 2 +- .../IEC61131-3/Conversion/DWORD/F_DWORD_TO_WSTRING.h | 4 ++-- .../IEC61131-3/Conversion/INT/F_INT_TO_BYTE.cpp | 2 +- .../IEC61131-3/Conversion/INT/F_INT_TO_BYTE.h | 4 ++-- .../IEC61131-3/Conversion/INT/F_INT_TO_DINT.cpp | 2 +- .../IEC61131-3/Conversion/INT/F_INT_TO_DINT.h | 4 ++-- .../IEC61131-3/Conversion/INT/F_INT_TO_DWORD.cpp | 2 +- .../IEC61131-3/Conversion/INT/F_INT_TO_DWORD.h | 4 ++-- .../IEC61131-3/Conversion/INT/F_INT_TO_LINT.cpp | 2 +- .../IEC61131-3/Conversion/INT/F_INT_TO_LINT.h | 4 ++-- .../IEC61131-3/Conversion/INT/F_INT_TO_LREAL.cpp | 2 +- .../IEC61131-3/Conversion/INT/F_INT_TO_LREAL.h | 4 ++-- .../IEC61131-3/Conversion/INT/F_INT_TO_LWORD.cpp | 2 +- .../IEC61131-3/Conversion/INT/F_INT_TO_LWORD.h | 4 ++-- .../IEC61131-3/Conversion/INT/F_INT_TO_REAL.cpp | 2 +- .../IEC61131-3/Conversion/INT/F_INT_TO_REAL.h | 4 ++-- .../IEC61131-3/Conversion/INT/F_INT_TO_SINT.cpp | 2 +- .../IEC61131-3/Conversion/INT/F_INT_TO_SINT.h | 4 ++-- .../IEC61131-3/Conversion/INT/F_INT_TO_STRING.cpp | 2 +- .../IEC61131-3/Conversion/INT/F_INT_TO_STRING.h | 4 ++-- .../IEC61131-3/Conversion/INT/F_INT_TO_UDINT.cpp | 2 +- .../IEC61131-3/Conversion/INT/F_INT_TO_UDINT.h | 4 ++-- .../IEC61131-3/Conversion/INT/F_INT_TO_UINT.cpp | 2 +- .../IEC61131-3/Conversion/INT/F_INT_TO_UINT.h | 4 ++-- .../IEC61131-3/Conversion/INT/F_INT_TO_ULINT.cpp | 2 +- .../IEC61131-3/Conversion/INT/F_INT_TO_ULINT.h | 4 ++-- .../IEC61131-3/Conversion/INT/F_INT_TO_USINT.cpp | 2 +- .../IEC61131-3/Conversion/INT/F_INT_TO_USINT.h | 4 ++-- .../IEC61131-3/Conversion/INT/F_INT_TO_WORD.cpp | 2 +- .../IEC61131-3/Conversion/INT/F_INT_TO_WORD.h | 4 ++-- .../IEC61131-3/Conversion/INT/F_INT_TO_WSTRING.cpp | 2 +- .../IEC61131-3/Conversion/INT/F_INT_TO_WSTRING.h | 4 ++-- .../IEC61131-3/Conversion/LINT/F_LINT_TO_BYTE.cpp | 2 +- .../IEC61131-3/Conversion/LINT/F_LINT_TO_BYTE.h | 4 ++-- .../IEC61131-3/Conversion/LINT/F_LINT_TO_DINT.cpp | 2 +- .../IEC61131-3/Conversion/LINT/F_LINT_TO_DINT.h | 4 ++-- .../IEC61131-3/Conversion/LINT/F_LINT_TO_DWORD.cpp | 2 +- .../IEC61131-3/Conversion/LINT/F_LINT_TO_DWORD.h | 4 ++-- .../IEC61131-3/Conversion/LINT/F_LINT_TO_INT.cpp | 2 +- .../IEC61131-3/Conversion/LINT/F_LINT_TO_INT.h | 4 ++-- .../IEC61131-3/Conversion/LINT/F_LINT_TO_LREAL.cpp | 2 +- .../IEC61131-3/Conversion/LINT/F_LINT_TO_LREAL.h | 4 ++-- .../IEC61131-3/Conversion/LINT/F_LINT_TO_LWORD.cpp | 2 +- .../IEC61131-3/Conversion/LINT/F_LINT_TO_LWORD.h | 4 ++-- .../IEC61131-3/Conversion/LINT/F_LINT_TO_REAL.cpp | 2 +- .../IEC61131-3/Conversion/LINT/F_LINT_TO_REAL.h | 4 ++-- .../IEC61131-3/Conversion/LINT/F_LINT_TO_SINT.cpp | 2 +- .../IEC61131-3/Conversion/LINT/F_LINT_TO_SINT.h | 4 ++-- .../IEC61131-3/Conversion/LINT/F_LINT_TO_STRING.cpp | 2 +- .../IEC61131-3/Conversion/LINT/F_LINT_TO_STRING.h | 4 ++-- .../IEC61131-3/Conversion/LINT/F_LINT_TO_UDINT.cpp | 2 +- .../IEC61131-3/Conversion/LINT/F_LINT_TO_UDINT.h | 4 ++-- .../IEC61131-3/Conversion/LINT/F_LINT_TO_UINT.cpp | 2 +- .../IEC61131-3/Conversion/LINT/F_LINT_TO_UINT.h | 4 ++-- .../IEC61131-3/Conversion/LINT/F_LINT_TO_ULINT.cpp | 2 +- .../IEC61131-3/Conversion/LINT/F_LINT_TO_ULINT.h | 4 ++-- .../IEC61131-3/Conversion/LINT/F_LINT_TO_USINT.cpp | 2 +- .../IEC61131-3/Conversion/LINT/F_LINT_TO_USINT.h | 4 ++-- .../IEC61131-3/Conversion/LINT/F_LINT_TO_WORD.cpp | 2 +- .../IEC61131-3/Conversion/LINT/F_LINT_TO_WORD.h | 4 ++-- .../IEC61131-3/Conversion/LINT/F_LINT_TO_WSTRING.cpp | 2 +- .../IEC61131-3/Conversion/LINT/F_LINT_TO_WSTRING.h | 4 ++-- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_DINT.cpp | 2 +- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_DINT.h | 4 ++-- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_INT.cpp | 2 +- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_INT.h | 4 ++-- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_LINT.cpp | 2 +- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_LINT.h | 4 ++-- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_LWORD.cpp | 2 +- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_LWORD.h | 4 ++-- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_REAL.cpp | 2 +- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_REAL.h | 4 ++-- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_SINT.cpp | 2 +- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_SINT.h | 4 ++-- .../Conversion/LREAL/F_LREAL_TO_STRING.cpp | 2 +- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_STRING.h | 4 ++-- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_UDINT.cpp | 2 +- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_UDINT.h | 4 ++-- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_UINT.cpp | 2 +- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_UINT.h | 4 ++-- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_ULINT.cpp | 2 +- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_ULINT.h | 4 ++-- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_USINT.cpp | 2 +- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_USINT.h | 4 ++-- .../Conversion/LREAL/F_LREAL_TO_WSTRING.cpp | 2 +- .../IEC61131-3/Conversion/LREAL/F_LREAL_TO_WSTRING.h | 4 ++-- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_BYTE.cpp | 2 +- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_BYTE.h | 4 ++-- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_DINT.cpp | 2 +- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_DINT.h | 4 ++-- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_DWORD.cpp | 2 +- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_DWORD.h | 4 ++-- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_INT.cpp | 2 +- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_INT.h | 4 ++-- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_LINT.cpp | 2 +- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_LINT.h | 4 ++-- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_LREAL.cpp | 2 +- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_LREAL.h | 4 ++-- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_SINT.cpp | 2 +- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_SINT.h | 4 ++-- .../Conversion/LWORD/F_LWORD_TO_STRING.cpp | 2 +- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_STRING.h | 4 ++-- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_UDINT.cpp | 2 +- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_UDINT.h | 4 ++-- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_UINT.cpp | 2 +- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_UINT.h | 4 ++-- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_ULINT.cpp | 2 +- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_ULINT.h | 4 ++-- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_USINT.cpp | 2 +- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_USINT.h | 4 ++-- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_WORD.cpp | 2 +- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_WORD.h | 4 ++-- .../Conversion/LWORD/F_LWORD_TO_WSTRING.cpp | 2 +- .../IEC61131-3/Conversion/LWORD/F_LWORD_TO_WSTRING.h | 4 ++-- .../IEC61131-3/Conversion/REAL/F_REAL_TO_DINT.cpp | 2 +- .../IEC61131-3/Conversion/REAL/F_REAL_TO_DINT.h | 4 ++-- .../IEC61131-3/Conversion/REAL/F_REAL_TO_DWORD.cpp | 2 +- .../IEC61131-3/Conversion/REAL/F_REAL_TO_DWORD.h | 4 ++-- .../IEC61131-3/Conversion/REAL/F_REAL_TO_INT.cpp | 2 +- .../IEC61131-3/Conversion/REAL/F_REAL_TO_INT.h | 4 ++-- .../IEC61131-3/Conversion/REAL/F_REAL_TO_LINT.cpp | 2 +- .../IEC61131-3/Conversion/REAL/F_REAL_TO_LINT.h | 4 ++-- .../IEC61131-3/Conversion/REAL/F_REAL_TO_LREAL.cpp | 2 +- .../IEC61131-3/Conversion/REAL/F_REAL_TO_LREAL.h | 4 ++-- .../IEC61131-3/Conversion/REAL/F_REAL_TO_SINT.cpp | 2 +- .../IEC61131-3/Conversion/REAL/F_REAL_TO_SINT.h | 4 ++-- .../IEC61131-3/Conversion/REAL/F_REAL_TO_STRING.cpp | 2 +- .../IEC61131-3/Conversion/REAL/F_REAL_TO_STRING.h | 4 ++-- .../IEC61131-3/Conversion/REAL/F_REAL_TO_UDINT.cpp | 2 +- .../IEC61131-3/Conversion/REAL/F_REAL_TO_UDINT.h | 4 ++-- .../IEC61131-3/Conversion/REAL/F_REAL_TO_UINT.cpp | 2 +- .../IEC61131-3/Conversion/REAL/F_REAL_TO_UINT.h | 4 ++-- .../IEC61131-3/Conversion/REAL/F_REAL_TO_ULINT.cpp | 2 +- .../IEC61131-3/Conversion/REAL/F_REAL_TO_ULINT.h | 4 ++-- .../IEC61131-3/Conversion/REAL/F_REAL_TO_USINT.cpp | 2 +- .../IEC61131-3/Conversion/REAL/F_REAL_TO_USINT.h | 4 ++-- .../IEC61131-3/Conversion/REAL/F_REAL_TO_WSTRING.cpp | 2 +- .../IEC61131-3/Conversion/REAL/F_REAL_TO_WSTRING.h | 4 ++-- .../IEC61131-3/Conversion/SINT/F_SINT_TO_BYTE.cpp | 2 +- .../IEC61131-3/Conversion/SINT/F_SINT_TO_BYTE.h | 4 ++-- .../IEC61131-3/Conversion/SINT/F_SINT_TO_DINT.cpp | 2 +- .../IEC61131-3/Conversion/SINT/F_SINT_TO_DINT.h | 4 ++-- .../IEC61131-3/Conversion/SINT/F_SINT_TO_DWORD.cpp | 2 +- .../IEC61131-3/Conversion/SINT/F_SINT_TO_DWORD.h | 4 ++-- .../IEC61131-3/Conversion/SINT/F_SINT_TO_INT.cpp | 2 +- .../IEC61131-3/Conversion/SINT/F_SINT_TO_INT.h | 4 ++-- .../IEC61131-3/Conversion/SINT/F_SINT_TO_LINT.cpp | 2 +- .../IEC61131-3/Conversion/SINT/F_SINT_TO_LINT.h | 4 ++-- .../IEC61131-3/Conversion/SINT/F_SINT_TO_LREAL.cpp | 2 +- .../IEC61131-3/Conversion/SINT/F_SINT_TO_LREAL.h | 4 ++-- .../IEC61131-3/Conversion/SINT/F_SINT_TO_LWORD.cpp | 2 +- .../IEC61131-3/Conversion/SINT/F_SINT_TO_LWORD.h | 4 ++-- .../IEC61131-3/Conversion/SINT/F_SINT_TO_REAL.cpp | 2 +- .../IEC61131-3/Conversion/SINT/F_SINT_TO_REAL.h | 4 ++-- .../IEC61131-3/Conversion/SINT/F_SINT_TO_STRING.cpp | 2 +- .../IEC61131-3/Conversion/SINT/F_SINT_TO_STRING.h | 4 ++-- .../IEC61131-3/Conversion/SINT/F_SINT_TO_UDINT.cpp | 2 +- .../IEC61131-3/Conversion/SINT/F_SINT_TO_UDINT.h | 4 ++-- .../IEC61131-3/Conversion/SINT/F_SINT_TO_UINT.cpp | 2 +- .../IEC61131-3/Conversion/SINT/F_SINT_TO_UINT.h | 4 ++-- .../IEC61131-3/Conversion/SINT/F_SINT_TO_ULINT.cpp | 2 +- .../IEC61131-3/Conversion/SINT/F_SINT_TO_ULINT.h | 4 ++-- .../IEC61131-3/Conversion/SINT/F_SINT_TO_USINT.cpp | 2 +- .../IEC61131-3/Conversion/SINT/F_SINT_TO_USINT.h | 4 ++-- .../IEC61131-3/Conversion/SINT/F_SINT_TO_WORD.cpp | 2 +- .../IEC61131-3/Conversion/SINT/F_SINT_TO_WORD.h | 4 ++-- .../IEC61131-3/Conversion/SINT/F_SINT_TO_WSTRING.cpp | 2 +- .../IEC61131-3/Conversion/SINT/F_SINT_TO_WSTRING.h | 4 ++-- .../Conversion/STRING/F_STRING_TO_BOOL.cpp | 2 +- .../IEC61131-3/Conversion/STRING/F_STRING_TO_BOOL.h | 4 ++-- .../Conversion/STRING/F_STRING_TO_BYTE.cpp | 2 +- .../IEC61131-3/Conversion/STRING/F_STRING_TO_BYTE.h | 4 ++-- .../Conversion/STRING/F_STRING_TO_DINT.cpp | 2 +- .../IEC61131-3/Conversion/STRING/F_STRING_TO_DINT.h | 4 ++-- .../Conversion/STRING/F_STRING_TO_DWORD.cpp | 2 +- .../IEC61131-3/Conversion/STRING/F_STRING_TO_DWORD.h | 4 ++-- .../IEC61131-3/Conversion/STRING/F_STRING_TO_INT.cpp | 2 +- .../IEC61131-3/Conversion/STRING/F_STRING_TO_INT.h | 4 ++-- .../Conversion/STRING/F_STRING_TO_LINT.cpp | 2 +- .../IEC61131-3/Conversion/STRING/F_STRING_TO_LINT.h | 4 ++-- .../Conversion/STRING/F_STRING_TO_LREAL.cpp | 2 +- .../IEC61131-3/Conversion/STRING/F_STRING_TO_LREAL.h | 4 ++-- .../Conversion/STRING/F_STRING_TO_LWORD.cpp | 2 +- .../IEC61131-3/Conversion/STRING/F_STRING_TO_LWORD.h | 4 ++-- .../Conversion/STRING/F_STRING_TO_REAL.cpp | 2 +- .../IEC61131-3/Conversion/STRING/F_STRING_TO_REAL.h | 4 ++-- .../Conversion/STRING/F_STRING_TO_SINT.cpp | 2 +- .../IEC61131-3/Conversion/STRING/F_STRING_TO_SINT.h | 4 ++-- .../Conversion/STRING/F_STRING_TO_TIME.cpp | 2 +- .../IEC61131-3/Conversion/STRING/F_STRING_TO_TIME.h | 4 ++-- .../Conversion/STRING/F_STRING_TO_UDINT.cpp | 2 +- .../IEC61131-3/Conversion/STRING/F_STRING_TO_UDINT.h | 4 ++-- .../Conversion/STRING/F_STRING_TO_UINT.cpp | 2 +- .../IEC61131-3/Conversion/STRING/F_STRING_TO_UINT.h | 4 ++-- .../Conversion/STRING/F_STRING_TO_ULINT.cpp | 2 +- .../IEC61131-3/Conversion/STRING/F_STRING_TO_ULINT.h | 4 ++-- .../Conversion/STRING/F_STRING_TO_USINT.cpp | 2 +- .../IEC61131-3/Conversion/STRING/F_STRING_TO_USINT.h | 4 ++-- .../Conversion/STRING/F_STRING_TO_WORD.cpp | 2 +- .../IEC61131-3/Conversion/STRING/F_STRING_TO_WORD.h | 4 ++-- .../Conversion/STRING/F_STRING_TO_WSTRING.cpp | 2 +- .../Conversion/STRING/F_STRING_TO_WSTRING.h | 4 ++-- .../Conversion/TIME/F_TIME_IN_MS_TO_LINT.cpp | 2 +- .../Conversion/TIME/F_TIME_IN_MS_TO_LINT.h | 4 ++-- .../Conversion/TIME/F_TIME_IN_MS_TO_LREAL.cpp | 2 +- .../Conversion/TIME/F_TIME_IN_MS_TO_LREAL.h | 4 ++-- .../Conversion/TIME/F_TIME_IN_MS_TO_ULINT.cpp | 2 +- .../Conversion/TIME/F_TIME_IN_MS_TO_ULINT.h | 4 ++-- .../Conversion/TIME/F_TIME_IN_NS_TO_LINT.cpp | 2 +- .../Conversion/TIME/F_TIME_IN_NS_TO_LINT.h | 4 ++-- .../Conversion/TIME/F_TIME_IN_NS_TO_LREAL.cpp | 2 +- .../Conversion/TIME/F_TIME_IN_NS_TO_LREAL.h | 4 ++-- .../Conversion/TIME/F_TIME_IN_NS_TO_ULINT.cpp | 2 +- .../Conversion/TIME/F_TIME_IN_NS_TO_ULINT.h | 4 ++-- .../Conversion/TIME/F_TIME_IN_S_TO_LINT.cpp | 2 +- .../IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_LINT.h | 4 ++-- .../Conversion/TIME/F_TIME_IN_S_TO_LREAL.cpp | 2 +- .../Conversion/TIME/F_TIME_IN_S_TO_LREAL.h | 4 ++-- .../Conversion/TIME/F_TIME_IN_S_TO_ULINT.cpp | 2 +- .../Conversion/TIME/F_TIME_IN_S_TO_ULINT.h | 4 ++-- .../Conversion/TIME/F_TIME_IN_US_TO_LINT.cpp | 2 +- .../Conversion/TIME/F_TIME_IN_US_TO_LINT.h | 4 ++-- .../Conversion/TIME/F_TIME_IN_US_TO_LREAL.cpp | 2 +- .../Conversion/TIME/F_TIME_IN_US_TO_LREAL.h | 4 ++-- .../Conversion/TIME/F_TIME_IN_US_TO_ULINT.cpp | 2 +- .../Conversion/TIME/F_TIME_IN_US_TO_ULINT.h | 4 ++-- .../IEC61131-3/Conversion/TIME/F_TIME_TO_STRING.cpp | 2 +- .../IEC61131-3/Conversion/TIME/F_TIME_TO_STRING.h | 4 ++-- .../IEC61131-3/Conversion/TIME/F_TIME_TO_WSTRING.cpp | 2 +- .../IEC61131-3/Conversion/TIME/F_TIME_TO_WSTRING.h | 4 ++-- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_BYTE.cpp | 2 +- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_BYTE.h | 4 ++-- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_DINT.cpp | 2 +- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_DINT.h | 4 ++-- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_DWORD.cpp | 2 +- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_DWORD.h | 4 ++-- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_INT.cpp | 2 +- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_INT.h | 4 ++-- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_LINT.cpp | 2 +- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_LINT.h | 4 ++-- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_LREAL.cpp | 2 +- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_LREAL.h | 4 ++-- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_LWORD.cpp | 2 +- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_LWORD.h | 4 ++-- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_REAL.cpp | 2 +- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_REAL.h | 4 ++-- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_SINT.cpp | 2 +- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_SINT.h | 4 ++-- .../Conversion/UDINT/F_UDINT_TO_STRING.cpp | 2 +- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_STRING.h | 4 ++-- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_UINT.cpp | 2 +- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_UINT.h | 4 ++-- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_ULINT.cpp | 2 +- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_ULINT.h | 4 ++-- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_USINT.cpp | 2 +- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_USINT.h | 4 ++-- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_WORD.cpp | 2 +- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_WORD.h | 4 ++-- .../Conversion/UDINT/F_UDINT_TO_WSTRING.cpp | 2 +- .../IEC61131-3/Conversion/UDINT/F_UDINT_TO_WSTRING.h | 4 ++-- .../IEC61131-3/Conversion/UINT/F_UINT_TO_BYTE.cpp | 2 +- .../IEC61131-3/Conversion/UINT/F_UINT_TO_BYTE.h | 4 ++-- .../IEC61131-3/Conversion/UINT/F_UINT_TO_DINT.cpp | 2 +- .../IEC61131-3/Conversion/UINT/F_UINT_TO_DINT.h | 4 ++-- .../IEC61131-3/Conversion/UINT/F_UINT_TO_DWORD.cpp | 2 +- .../IEC61131-3/Conversion/UINT/F_UINT_TO_DWORD.h | 4 ++-- .../IEC61131-3/Conversion/UINT/F_UINT_TO_INT.cpp | 2 +- .../IEC61131-3/Conversion/UINT/F_UINT_TO_INT.h | 4 ++-- .../IEC61131-3/Conversion/UINT/F_UINT_TO_LINT.cpp | 2 +- .../IEC61131-3/Conversion/UINT/F_UINT_TO_LINT.h | 4 ++-- .../IEC61131-3/Conversion/UINT/F_UINT_TO_LREAL.cpp | 2 +- .../IEC61131-3/Conversion/UINT/F_UINT_TO_LREAL.h | 4 ++-- .../IEC61131-3/Conversion/UINT/F_UINT_TO_LWORD.cpp | 2 +- .../IEC61131-3/Conversion/UINT/F_UINT_TO_LWORD.h | 4 ++-- .../IEC61131-3/Conversion/UINT/F_UINT_TO_REAL.cpp | 2 +- .../IEC61131-3/Conversion/UINT/F_UINT_TO_REAL.h | 4 ++-- .../IEC61131-3/Conversion/UINT/F_UINT_TO_SINT.cpp | 2 +- .../IEC61131-3/Conversion/UINT/F_UINT_TO_SINT.h | 4 ++-- .../IEC61131-3/Conversion/UINT/F_UINT_TO_STRING.cpp | 2 +- .../IEC61131-3/Conversion/UINT/F_UINT_TO_STRING.h | 4 ++-- .../IEC61131-3/Conversion/UINT/F_UINT_TO_UDINT.cpp | 2 +- .../IEC61131-3/Conversion/UINT/F_UINT_TO_UDINT.h | 4 ++-- .../IEC61131-3/Conversion/UINT/F_UINT_TO_ULINT.cpp | 2 +- .../IEC61131-3/Conversion/UINT/F_UINT_TO_ULINT.h | 4 ++-- .../IEC61131-3/Conversion/UINT/F_UINT_TO_USINT.cpp | 2 +- .../IEC61131-3/Conversion/UINT/F_UINT_TO_USINT.h | 4 ++-- .../IEC61131-3/Conversion/UINT/F_UINT_TO_WORD.cpp | 2 +- .../IEC61131-3/Conversion/UINT/F_UINT_TO_WORD.h | 4 ++-- .../IEC61131-3/Conversion/UINT/F_UINT_TO_WSTRING.cpp | 2 +- .../IEC61131-3/Conversion/UINT/F_UINT_TO_WSTRING.h | 4 ++-- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_BYTE.cpp | 2 +- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_BYTE.h | 4 ++-- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_DINT.cpp | 2 +- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_DINT.h | 4 ++-- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_DWORD.cpp | 2 +- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_DWORD.h | 4 ++-- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_INT.cpp | 2 +- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_INT.h | 4 ++-- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_LINT.cpp | 2 +- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_LINT.h | 4 ++-- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_LREAL.cpp | 2 +- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_LREAL.h | 4 ++-- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_LWORD.cpp | 2 +- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_LWORD.h | 4 ++-- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_REAL.cpp | 2 +- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_REAL.h | 4 ++-- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_SINT.cpp | 2 +- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_SINT.h | 4 ++-- .../Conversion/ULINT/F_ULINT_TO_STRING.cpp | 2 +- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_STRING.h | 4 ++-- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_UDINT.cpp | 2 +- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_UDINT.h | 4 ++-- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_UINT.cpp | 2 +- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_UINT.h | 4 ++-- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_USINT.cpp | 2 +- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_USINT.h | 4 ++-- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_WORD.cpp | 2 +- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_WORD.h | 4 ++-- .../Conversion/ULINT/F_ULINT_TO_WSTRING.cpp | 2 +- .../IEC61131-3/Conversion/ULINT/F_ULINT_TO_WSTRING.h | 4 ++-- .../IEC61131-3/Conversion/USINT/F_USINT_TO_BYTE.cpp | 2 +- .../IEC61131-3/Conversion/USINT/F_USINT_TO_BYTE.h | 4 ++-- .../IEC61131-3/Conversion/USINT/F_USINT_TO_DINT.cpp | 2 +- .../IEC61131-3/Conversion/USINT/F_USINT_TO_DINT.h | 4 ++-- .../IEC61131-3/Conversion/USINT/F_USINT_TO_DWORD.cpp | 2 +- .../IEC61131-3/Conversion/USINT/F_USINT_TO_DWORD.h | 4 ++-- .../IEC61131-3/Conversion/USINT/F_USINT_TO_INT.cpp | 2 +- .../IEC61131-3/Conversion/USINT/F_USINT_TO_INT.h | 4 ++-- .../IEC61131-3/Conversion/USINT/F_USINT_TO_LINT.cpp | 2 +- .../IEC61131-3/Conversion/USINT/F_USINT_TO_LINT.h | 4 ++-- .../IEC61131-3/Conversion/USINT/F_USINT_TO_LREAL.cpp | 2 +- .../IEC61131-3/Conversion/USINT/F_USINT_TO_LREAL.h | 4 ++-- .../IEC61131-3/Conversion/USINT/F_USINT_TO_LWORD.cpp | 2 +- .../IEC61131-3/Conversion/USINT/F_USINT_TO_LWORD.h | 4 ++-- .../IEC61131-3/Conversion/USINT/F_USINT_TO_REAL.cpp | 2 +- .../IEC61131-3/Conversion/USINT/F_USINT_TO_REAL.h | 4 ++-- .../IEC61131-3/Conversion/USINT/F_USINT_TO_SINT.cpp | 2 +- .../IEC61131-3/Conversion/USINT/F_USINT_TO_SINT.h | 4 ++-- .../Conversion/USINT/F_USINT_TO_STRING.cpp | 2 +- .../IEC61131-3/Conversion/USINT/F_USINT_TO_STRING.h | 4 ++-- .../IEC61131-3/Conversion/USINT/F_USINT_TO_UDINT.cpp | 2 +- .../IEC61131-3/Conversion/USINT/F_USINT_TO_UDINT.h | 4 ++-- .../IEC61131-3/Conversion/USINT/F_USINT_TO_UINT.cpp | 2 +- .../IEC61131-3/Conversion/USINT/F_USINT_TO_UINT.h | 4 ++-- .../IEC61131-3/Conversion/USINT/F_USINT_TO_ULINT.cpp | 2 +- .../IEC61131-3/Conversion/USINT/F_USINT_TO_ULINT.h | 4 ++-- .../IEC61131-3/Conversion/USINT/F_USINT_TO_WORD.cpp | 2 +- .../IEC61131-3/Conversion/USINT/F_USINT_TO_WORD.h | 4 ++-- .../Conversion/USINT/F_USINT_TO_WSTRING.cpp | 2 +- .../IEC61131-3/Conversion/USINT/F_USINT_TO_WSTRING.h | 4 ++-- .../IEC61131-3/Conversion/WORD/F_WORD_TO_BYTE.cpp | 2 +- .../IEC61131-3/Conversion/WORD/F_WORD_TO_BYTE.h | 4 ++-- .../IEC61131-3/Conversion/WORD/F_WORD_TO_DINT.cpp | 2 +- .../IEC61131-3/Conversion/WORD/F_WORD_TO_DINT.h | 4 ++-- .../IEC61131-3/Conversion/WORD/F_WORD_TO_DWORD.cpp | 2 +- .../IEC61131-3/Conversion/WORD/F_WORD_TO_DWORD.h | 4 ++-- .../IEC61131-3/Conversion/WORD/F_WORD_TO_INT.cpp | 2 +- .../IEC61131-3/Conversion/WORD/F_WORD_TO_INT.h | 4 ++-- .../IEC61131-3/Conversion/WORD/F_WORD_TO_LINT.cpp | 2 +- .../IEC61131-3/Conversion/WORD/F_WORD_TO_LINT.h | 4 ++-- .../IEC61131-3/Conversion/WORD/F_WORD_TO_LWORD.cpp | 2 +- .../IEC61131-3/Conversion/WORD/F_WORD_TO_LWORD.h | 4 ++-- .../IEC61131-3/Conversion/WORD/F_WORD_TO_SINT.cpp | 2 +- .../IEC61131-3/Conversion/WORD/F_WORD_TO_SINT.h | 4 ++-- .../IEC61131-3/Conversion/WORD/F_WORD_TO_STRING.cpp | 2 +- .../IEC61131-3/Conversion/WORD/F_WORD_TO_STRING.h | 4 ++-- .../IEC61131-3/Conversion/WORD/F_WORD_TO_UDINT.cpp | 2 +- .../IEC61131-3/Conversion/WORD/F_WORD_TO_UDINT.h | 4 ++-- .../IEC61131-3/Conversion/WORD/F_WORD_TO_UINT.cpp | 2 +- .../IEC61131-3/Conversion/WORD/F_WORD_TO_UINT.h | 4 ++-- .../IEC61131-3/Conversion/WORD/F_WORD_TO_ULINT.cpp | 2 +- .../IEC61131-3/Conversion/WORD/F_WORD_TO_ULINT.h | 4 ++-- .../IEC61131-3/Conversion/WORD/F_WORD_TO_USINT.cpp | 2 +- .../IEC61131-3/Conversion/WORD/F_WORD_TO_USINT.h | 4 ++-- .../IEC61131-3/Conversion/WORD/F_WORD_TO_WSTRING.cpp | 2 +- .../IEC61131-3/Conversion/WORD/F_WORD_TO_WSTRING.h | 4 ++-- .../Conversion/WSTRING/F_WSTRING_TO_BOOL.cpp | 2 +- .../Conversion/WSTRING/F_WSTRING_TO_BOOL.h | 4 ++-- .../Conversion/WSTRING/F_WSTRING_TO_BYTE.cpp | 2 +- .../Conversion/WSTRING/F_WSTRING_TO_BYTE.h | 4 ++-- .../Conversion/WSTRING/F_WSTRING_TO_DINT.cpp | 2 +- .../Conversion/WSTRING/F_WSTRING_TO_DINT.h | 4 ++-- .../Conversion/WSTRING/F_WSTRING_TO_DWORD.cpp | 2 +- .../Conversion/WSTRING/F_WSTRING_TO_DWORD.h | 4 ++-- .../Conversion/WSTRING/F_WSTRING_TO_INT.cpp | 2 +- .../IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_INT.h | 4 ++-- .../Conversion/WSTRING/F_WSTRING_TO_LINT.cpp | 2 +- .../Conversion/WSTRING/F_WSTRING_TO_LINT.h | 4 ++-- .../Conversion/WSTRING/F_WSTRING_TO_LREAL.cpp | 2 +- .../Conversion/WSTRING/F_WSTRING_TO_LREAL.h | 4 ++-- .../Conversion/WSTRING/F_WSTRING_TO_LWORD.cpp | 2 +- .../Conversion/WSTRING/F_WSTRING_TO_LWORD.h | 4 ++-- .../Conversion/WSTRING/F_WSTRING_TO_REAL.cpp | 2 +- .../Conversion/WSTRING/F_WSTRING_TO_REAL.h | 4 ++-- .../Conversion/WSTRING/F_WSTRING_TO_SINT.cpp | 2 +- .../Conversion/WSTRING/F_WSTRING_TO_SINT.h | 4 ++-- .../Conversion/WSTRING/F_WSTRING_TO_STRING.cpp | 2 +- .../Conversion/WSTRING/F_WSTRING_TO_STRING.h | 4 ++-- .../Conversion/WSTRING/F_WSTRING_TO_TIME.cpp | 2 +- .../Conversion/WSTRING/F_WSTRING_TO_TIME.h | 4 ++-- .../Conversion/WSTRING/F_WSTRING_TO_UDINT.cpp | 2 +- .../Conversion/WSTRING/F_WSTRING_TO_UDINT.h | 4 ++-- .../Conversion/WSTRING/F_WSTRING_TO_UINT.cpp | 2 +- .../Conversion/WSTRING/F_WSTRING_TO_UINT.h | 4 ++-- .../Conversion/WSTRING/F_WSTRING_TO_ULINT.cpp | 2 +- .../Conversion/WSTRING/F_WSTRING_TO_ULINT.h | 4 ++-- .../Conversion/WSTRING/F_WSTRING_TO_USINT.cpp | 2 +- .../Conversion/WSTRING/F_WSTRING_TO_USINT.h | 4 ++-- .../Conversion/WSTRING/F_WSTRING_TO_WORD.cpp | 2 +- .../Conversion/WSTRING/F_WSTRING_TO_WORD.h | 4 ++-- src/modules/IEC61131-3/Numerical/F_ABS.cpp | 2 +- src/modules/IEC61131-3/Numerical/F_ABS.h | 8 ++++---- src/modules/IEC61131-3/Numerical/F_ACOS.cpp | 2 +- src/modules/IEC61131-3/Numerical/F_ACOS.h | 8 ++++---- src/modules/IEC61131-3/Numerical/F_ASIN.cpp | 2 +- src/modules/IEC61131-3/Numerical/F_ASIN.h | 8 ++++---- src/modules/IEC61131-3/Numerical/F_ATAN.cpp | 2 +- src/modules/IEC61131-3/Numerical/F_ATAN.h | 8 ++++---- src/modules/IEC61131-3/Numerical/F_COS.cpp | 2 +- src/modules/IEC61131-3/Numerical/F_COS.h | 8 ++++---- src/modules/IEC61131-3/Numerical/F_EXP.cpp | 2 +- src/modules/IEC61131-3/Numerical/F_EXP.h | 8 ++++---- src/modules/IEC61131-3/Numerical/F_LN.cpp | 2 +- src/modules/IEC61131-3/Numerical/F_LN.h | 8 ++++---- src/modules/IEC61131-3/Numerical/F_LOG.cpp | 2 +- src/modules/IEC61131-3/Numerical/F_LOG.h | 8 ++++---- src/modules/IEC61131-3/Numerical/F_SIN.cpp | 2 +- src/modules/IEC61131-3/Numerical/F_SIN.h | 8 ++++---- src/modules/IEC61131-3/Numerical/F_SQRT.cpp | 2 +- src/modules/IEC61131-3/Numerical/F_SQRT.h | 8 ++++---- src/modules/IEC61131-3/Numerical/F_TAN.cpp | 2 +- src/modules/IEC61131-3/Numerical/F_TAN.h | 8 ++++---- src/modules/IEC61131-3/Selection/F_LIMIT.cpp | 2 +- src/modules/IEC61131-3/Selection/F_LIMIT.h | 6 +++--- src/modules/IEC61131-3/Selection/F_MAX.h | 4 ++-- src/modules/IEC61131-3/Selection/F_MIN.h | 4 ++-- src/modules/IEC61131-3/Selection/F_MUX_2.cpp | 2 +- src/modules/IEC61131-3/Selection/F_MUX_2.h | 2 +- src/modules/IEC61131-3/Selection/F_SEL.h | 4 ++-- src/modules/IEC61131-3/Timers/FB_TOF.cpp | 2 +- src/modules/IEC61131-3/Timers/FB_TOF.h | 2 +- src/modules/IEC61131-3/Timers/FB_TON.cpp | 2 +- src/modules/IEC61131-3/Timers/FB_TON.h | 2 +- src/modules/IEC61131-3/Timers/FB_TP.cpp | 4 ++-- src/modules/IEC61131-3/Timers/FB_TP.h | 2 +- .../OrchestrationForm2OrchestrationForm.cpp | 2 +- .../OrchestrationForm2OrchestrationForm.h | 4 ++-- .../ServiceRegistryEntry2ServiceRegistryEntry.cpp | 2 +- .../ServiceRegistryEntry2ServiceRegistryEntry.h | 4 ++-- src/modules/convert/BOOL2BOOL.cpp | 2 +- src/modules/convert/BOOL2BOOL.h | 4 ++-- src/modules/convert/BYTE2BYTE.cpp | 2 +- src/modules/convert/BYTE2BYTE.h | 4 ++-- src/modules/convert/DINT2DINT.cpp | 2 +- src/modules/convert/DINT2DINT.h | 4 ++-- src/modules/convert/DWORD2DWORD.cpp | 2 +- src/modules/convert/DWORD2DWORD.h | 4 ++-- src/modules/convert/GEN_STRUCT_DEMUX.cpp | 4 ++-- src/modules/convert/GEN_STRUCT_DEMUX.h | 2 +- src/modules/convert/GEN_STRUCT_MUX.cpp | 4 ++-- src/modules/convert/GEN_STRUCT_MUX.h | 2 +- src/modules/convert/INT2INT.cpp | 2 +- src/modules/convert/INT2INT.h | 4 ++-- src/modules/convert/LREAL2LREAL.cpp | 2 +- src/modules/convert/LREAL2LREAL.h | 4 ++-- src/modules/convert/REAL2REAL.cpp | 2 +- src/modules/convert/REAL2REAL.h | 4 ++-- src/modules/convert/SINT2SINT.cpp | 2 +- src/modules/convert/SINT2SINT.h | 4 ++-- src/modules/convert/STRING2STRING.cpp | 2 +- src/modules/convert/STRING2STRING.h | 4 ++-- src/modules/convert/TIME2TIME.cpp | 2 +- src/modules/convert/TIME2TIME.h | 4 ++-- src/modules/convert/UDINT2UDINT.cpp | 2 +- src/modules/convert/UDINT2UDINT.h | 4 ++-- src/modules/convert/UINT2UINT.cpp | 2 +- src/modules/convert/UINT2UINT.h | 4 ++-- src/modules/convert/USINT2USINT.cpp | 2 +- src/modules/convert/USINT2USINT.h | 4 ++-- src/modules/convert/WORD2WORD.cpp | 2 +- src/modules/convert/WORD2WORD.h | 4 ++-- src/modules/convert/WSTRING2WSTRING.cpp | 2 +- src/modules/convert/WSTRING2WSTRING.h | 4 ++-- src/modules/utils/GET_AT_INDEX.cpp | 4 ++-- src/modules/utils/GET_AT_INDEX.h | 2 +- src/modules/utils/OUT_ANY_CONSOLE.cpp | 12 ++++++------ src/modules/utils/OUT_ANY_CONSOLE.h | 2 +- src/stdfblib/io/IB.h | 12 +----------- src/stdfblib/io/ID.h | 10 +--------- src/stdfblib/io/IL.h | 10 +--------- src/stdfblib/io/IW.h | 9 +-------- src/stdfblib/io/IX.h | 9 +-------- src/stdfblib/io/QB.h | 9 +-------- src/stdfblib/io/QD.h | 9 +-------- src/stdfblib/io/QL.h | 9 +-------- src/stdfblib/io/QW.h | 9 +-------- src/stdfblib/io/QX.h | 9 +-------- 703 files changed, 1103 insertions(+), 1197 deletions(-) diff --git a/forte_config.h.in b/forte_config.h.in index 944187d52..b4163cb48 100644 --- a/forte_config.h.in +++ b/forte_config.h.in @@ -13,9 +13,6 @@ #ifndef _CONFIG_H_ #define _CONFIG_H_ -#undef IN -#undef OUT - #include diff --git a/src/com/opc_ua/FBs/LocalizedText2LocalizedText.cpp b/src/com/opc_ua/FBs/LocalizedText2LocalizedText.cpp index ca9b09875..29d443d70 100644 --- a/src/com/opc_ua/FBs/LocalizedText2LocalizedText.cpp +++ b/src/com/opc_ua/FBs/LocalizedText2LocalizedText.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_LocalizedText2LocalizedText::scm_stFBInterfaceSpec void FORTE_LocalizedText2LocalizedText::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID) { - OUT() = IN(); + st_OUT() = st_IN(); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/com/opc_ua/FBs/LocalizedText2LocalizedText.h b/src/com/opc_ua/FBs/LocalizedText2LocalizedText.h index b99ab23e0..71ee251c2 100644 --- a/src/com/opc_ua/FBs/LocalizedText2LocalizedText.h +++ b/src/com/opc_ua/FBs/LocalizedText2LocalizedText.h @@ -22,13 +22,13 @@ class FORTE_LocalizedText2LocalizedText: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LocalizedText &IN() { + CIEC_LocalizedText &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LocalizedText &OUT() { + CIEC_LocalizedText &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/core/fmi/processinterface.h b/src/core/fmi/processinterface.h index 87b519139..18d0c8800 100644 --- a/src/core/fmi/processinterface.h +++ b/src/core/fmi/processinterface.h @@ -18,14 +18,6 @@ #include #include -#ifdef OUT -#undef OUT -#endif - -#ifdef IN -#undef IN -#endif - class CFMUProcessInterface : public CProcessInterfaceBase{ public: CFMUProcessInterface(CResource *paSrcRes, const SFBInterfaceSpec *paInterfaceSpec, const CStringDictionary::TStringId paInstanceNameId, TForteByte *paFBConnData, TForteByte *paFBVarsData); diff --git a/src/core/funcbloc.h b/src/core/funcbloc.h index d89b45220..e2a3c51ab 100644 --- a/src/core/funcbloc.h +++ b/src/core/funcbloc.h @@ -520,14 +520,6 @@ typedef CFunctionBlock *TFunctionBlockPtr; fbBaseClass( pa_poSrcRes, &scm_stFBInterfaceSpec, pa_nInstanceNameId, m_anFBConnData, m_anFBVarsData) -#ifdef IN -#undef IN -#endif - -#ifdef OUT -#undef OUT -#endif - #ifdef OPTIONAL #undef OPTIONAL #endif diff --git a/src/modules/IEC61131-3/Arithmetic/F_ADD.h b/src/modules/IEC61131-3/Arithmetic/F_ADD.h index d227228ec..fb2d006aa 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_ADD.h +++ b/src/modules/IEC61131-3/Arithmetic/F_ADD.h @@ -31,7 +31,7 @@ class FORTE_F_ADD: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_MAGNITUDE &OUT() { + CIEC_ANY_MAGNITUDE &st_OUT() { return *static_cast(getDO(0)); }; @@ -59,7 +59,7 @@ class FORTE_F_ADD: public CFunctionBlock{ T &roIn1(static_cast(IN1())); T oIn2; oIn2.saveAssign(IN2()); - OUT().saveAssign(ADD(roIn1,oIn2)); + st_OUT().saveAssign(ADD(roIn1,oIn2)); } virtual ~FORTE_F_ADD(){}; diff --git a/src/modules/IEC61131-3/Arithmetic/F_ADD_DT_TIME.cpp b/src/modules/IEC61131-3/Arithmetic/F_ADD_DT_TIME.cpp index a9975ea78..b54be0640 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_ADD_DT_TIME.cpp +++ b/src/modules/IEC61131-3/Arithmetic/F_ADD_DT_TIME.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_ADD_DT_TIME::scm_stFBInterfaceSpec = { void FORTE_F_ADD_DT_TIME::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = ADD_DT_TIME(IN1(), IN2()); + st_OUT() = ADD_DT_TIME(IN1(), IN2()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Arithmetic/F_ADD_DT_TIME.h b/src/modules/IEC61131-3/Arithmetic/F_ADD_DT_TIME.h index 7dd7c3ca5..ccdc947c4 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_ADD_DT_TIME.h +++ b/src/modules/IEC61131-3/Arithmetic/F_ADD_DT_TIME.h @@ -32,7 +32,7 @@ class FORTE_F_ADD_DT_TIME: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DATE_AND_TIME &OUT() { + CIEC_DATE_AND_TIME &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Arithmetic/F_ADD_TOD_TIME.cpp b/src/modules/IEC61131-3/Arithmetic/F_ADD_TOD_TIME.cpp index 64b8312d9..89834ae9a 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_ADD_TOD_TIME.cpp +++ b/src/modules/IEC61131-3/Arithmetic/F_ADD_TOD_TIME.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_ADD_TOD_TIME::scm_stFBInterfaceSpec = { void FORTE_F_ADD_TOD_TIME::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = ADD_TOD_TIME(IN1(), IN2()); + st_OUT() = ADD_TOD_TIME(IN1(), IN2()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Arithmetic/F_ADD_TOD_TIME.h b/src/modules/IEC61131-3/Arithmetic/F_ADD_TOD_TIME.h index 95215124b..85802503a 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_ADD_TOD_TIME.h +++ b/src/modules/IEC61131-3/Arithmetic/F_ADD_TOD_TIME.h @@ -32,7 +32,7 @@ class FORTE_F_ADD_TOD_TIME: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_TIME_OF_DAY &OUT() { + CIEC_TIME_OF_DAY &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Arithmetic/F_DIV.h b/src/modules/IEC61131-3/Arithmetic/F_DIV.h index afe416bcd..e36a20e54 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_DIV.h +++ b/src/modules/IEC61131-3/Arithmetic/F_DIV.h @@ -31,7 +31,7 @@ class FORTE_F_DIV: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_NUM &OUT() { + CIEC_ANY_NUM &st_OUT() { return *static_cast(getDO(0)); }; @@ -61,7 +61,7 @@ class FORTE_F_DIV: public CFunctionBlock{ oIn1.saveAssign(IN1()); oIn2.saveAssign(IN2()); - OUT().saveAssign(DIV(oIn1,oIn2)); + st_OUT().saveAssign(DIV(oIn1,oIn2)); } virtual ~FORTE_F_DIV(){}; diff --git a/src/modules/IEC61131-3/Arithmetic/F_DIVTIME.h b/src/modules/IEC61131-3/Arithmetic/F_DIVTIME.h index 8abaf8744..49d8094a4 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_DIVTIME.h +++ b/src/modules/IEC61131-3/Arithmetic/F_DIVTIME.h @@ -32,7 +32,7 @@ class FORTE_F_DIVTIME: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_TIME &OUT() { + CIEC_TIME &st_OUT() { return *static_cast(getDO(0)); }; @@ -58,7 +58,7 @@ class FORTE_F_DIVTIME: public CFunctionBlock{ template void calculateValue(){ T &roIn2(static_cast(IN2())); - OUT().saveAssign(DIVTIME(IN1(), roIn2)); + st_OUT().saveAssign(DIVTIME(IN1(), roIn2)); } virtual ~FORTE_F_DIVTIME(){}; diff --git a/src/modules/IEC61131-3/Arithmetic/F_EXPT.h b/src/modules/IEC61131-3/Arithmetic/F_EXPT.h index 043542f10..52a369a6c 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_EXPT.h +++ b/src/modules/IEC61131-3/Arithmetic/F_EXPT.h @@ -32,7 +32,7 @@ class FORTE_F_EXPT: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_REAL &OUT() { + CIEC_ANY_REAL &st_OUT() { return *static_cast(getDO(0)); }; @@ -60,7 +60,7 @@ class FORTE_F_EXPT: public CFunctionBlock{ T &roIn1(static_cast(IN1())); T oIn2; oIn2.saveAssign(IN2()); - OUT().saveAssign(EXPT(roIn1,oIn2)); + st_OUT().saveAssign(EXPT(roIn1,oIn2)); } virtual ~FORTE_F_EXPT(){}; diff --git a/src/modules/IEC61131-3/Arithmetic/F_MOD.h b/src/modules/IEC61131-3/Arithmetic/F_MOD.h index 0c061cbb7..f23799602 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_MOD.h +++ b/src/modules/IEC61131-3/Arithmetic/F_MOD.h @@ -32,7 +32,7 @@ class FORTE_F_MOD: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_NUM &OUT() { + CIEC_ANY_NUM &st_OUT() { return *static_cast(getDO(0)); }; @@ -60,7 +60,7 @@ class FORTE_F_MOD: public CFunctionBlock{ T &roIn1(static_cast(IN1())); T oIn2; oIn2.saveAssign(IN2()); - OUT().saveAssign(MOD(roIn1,oIn2)); + st_OUT().saveAssign(MOD(roIn1,oIn2)); } virtual ~FORTE_F_MOD(){}; diff --git a/src/modules/IEC61131-3/Arithmetic/F_MOVE.cpp b/src/modules/IEC61131-3/Arithmetic/F_MOVE.cpp index 6cd2728c4..13c1c5cb2 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_MOVE.cpp +++ b/src/modules/IEC61131-3/Arithmetic/F_MOVE.cpp @@ -45,7 +45,7 @@ const SFBInterfaceSpec FORTE_F_MOVE::scm_stFBInterfaceSpec = { void FORTE_F_MOVE::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyMagnitudeFBHelper(IN().getDataTypeID(), *this); + anyMagnitudeFBHelper(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Arithmetic/F_MOVE.h b/src/modules/IEC61131-3/Arithmetic/F_MOVE.h index 944b8ccd5..83e973e25 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_MOVE.h +++ b/src/modules/IEC61131-3/Arithmetic/F_MOVE.h @@ -22,13 +22,13 @@ class FORTE_F_MOVE: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY &IN() { + CIEC_ANY &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY &OUT() { + CIEC_ANY &st_OUT() { return *static_cast(getDO(0)); }; @@ -53,8 +53,8 @@ class FORTE_F_MOVE: public CFunctionBlock{ }; template void calculateValue(){ - T &roIn(static_cast(IN())); - OUT().saveAssign(MOVE(roIn)); + T &roIn(static_cast(st_IN())); + st_OUT().saveAssign(MOVE(roIn)); } virtual ~FORTE_F_MOVE(){}; diff --git a/src/modules/IEC61131-3/Arithmetic/F_MUL.h b/src/modules/IEC61131-3/Arithmetic/F_MUL.h index eee61ff70..3763d2e0a 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_MUL.h +++ b/src/modules/IEC61131-3/Arithmetic/F_MUL.h @@ -31,7 +31,7 @@ class FORTE_F_MUL: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_NUM &OUT() { + CIEC_ANY_NUM &st_OUT() { return *static_cast(getDO(0)); }; @@ -59,7 +59,7 @@ class FORTE_F_MUL: public CFunctionBlock{ T &roIn1(static_cast(IN1())); T oIn2; oIn2.saveAssign(IN2()); - OUT().saveAssign(MUL(roIn1,oIn2)); + st_OUT().saveAssign(MUL(roIn1,oIn2)); } virtual ~FORTE_F_MUL(){}; diff --git a/src/modules/IEC61131-3/Arithmetic/F_MULTIME.h b/src/modules/IEC61131-3/Arithmetic/F_MULTIME.h index b11ac33a6..3fc58399f 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_MULTIME.h +++ b/src/modules/IEC61131-3/Arithmetic/F_MULTIME.h @@ -32,7 +32,7 @@ class FORTE_F_MULTIME: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_TIME &OUT() { + CIEC_TIME &st_OUT() { return *static_cast(getDO(0)); }; @@ -58,7 +58,7 @@ class FORTE_F_MULTIME: public CFunctionBlock{ template void calculateValue(){ T &roIn2(static_cast(IN2())); - OUT().saveAssign(MULTIME(IN1(), roIn2)); + st_OUT().saveAssign(MULTIME(IN1(), roIn2)); } virtual ~FORTE_F_MULTIME(){}; diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB.h b/src/modules/IEC61131-3/Arithmetic/F_SUB.h index 8e6f60e0c..8b1347b91 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_SUB.h +++ b/src/modules/IEC61131-3/Arithmetic/F_SUB.h @@ -31,7 +31,7 @@ class FORTE_F_SUB: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_MAGNITUDE &OUT() { + CIEC_ANY_MAGNITUDE &st_OUT() { return *static_cast(getDO(0)); }; @@ -59,7 +59,7 @@ class FORTE_F_SUB: public CFunctionBlock{ T &roIn1(static_cast(IN1())); T oIn2; oIn2.saveAssign(IN2()); - OUT().saveAssign(SUB(roIn1,oIn2)); + st_OUT().saveAssign(SUB(roIn1,oIn2)); } virtual ~FORTE_F_SUB(){}; diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB_DATE_DATE.cpp b/src/modules/IEC61131-3/Arithmetic/F_SUB_DATE_DATE.cpp index 73cf9e287..84f86077c 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_SUB_DATE_DATE.cpp +++ b/src/modules/IEC61131-3/Arithmetic/F_SUB_DATE_DATE.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SUB_DATE_DATE::scm_stFBInterfaceSpec = { void FORTE_F_SUB_DATE_DATE::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = SUB_DATE_DATE(IN1(), IN2()); + st_OUT() = SUB_DATE_DATE(IN1(), IN2()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB_DATE_DATE.h b/src/modules/IEC61131-3/Arithmetic/F_SUB_DATE_DATE.h index 3a04aee1d..9f2bfefab 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_SUB_DATE_DATE.h +++ b/src/modules/IEC61131-3/Arithmetic/F_SUB_DATE_DATE.h @@ -32,7 +32,7 @@ class FORTE_F_SUB_DATE_DATE: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_TIME &OUT() { + CIEC_TIME &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_DT.cpp b/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_DT.cpp index a7a2e776c..650aeb15f 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_DT.cpp +++ b/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_DT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SUB_DT_DT::scm_stFBInterfaceSpec = { void FORTE_F_SUB_DT_DT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = SUB_DT_DT(IN1(), IN2()); + st_OUT() = SUB_DT_DT(IN1(), IN2()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_DT.h b/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_DT.h index 94d150fd1..53a90b0f6 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_DT.h +++ b/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_DT.h @@ -32,7 +32,7 @@ class FORTE_F_SUB_DT_DT: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_TIME &OUT() { + CIEC_TIME &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_TIME.cpp b/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_TIME.cpp index 4f2c9ef56..697ca6339 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_TIME.cpp +++ b/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_TIME.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SUB_DT_TIME::scm_stFBInterfaceSpec = { void FORTE_F_SUB_DT_TIME::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = SUB_DT_TIME(IN1(), IN2()); + st_OUT() = SUB_DT_TIME(IN1(), IN2()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_TIME.h b/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_TIME.h index c166afe1f..8c0ce9158 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_TIME.h +++ b/src/modules/IEC61131-3/Arithmetic/F_SUB_DT_TIME.h @@ -32,7 +32,7 @@ class FORTE_F_SUB_DT_TIME: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DATE_AND_TIME &OUT() { + CIEC_DATE_AND_TIME &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TIME.cpp b/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TIME.cpp index dca516975..72c70db2d 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TIME.cpp +++ b/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TIME.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SUB_TOD_TIME::scm_stFBInterfaceSpec = { void FORTE_F_SUB_TOD_TIME::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = SUB_TOD_TIME(IN1(), IN2()); + st_OUT() = SUB_TOD_TIME(IN1(), IN2()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TIME.h b/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TIME.h index 0ae995f24..d73bb52c6 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TIME.h +++ b/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TIME.h @@ -32,7 +32,7 @@ class FORTE_F_SUB_TOD_TIME: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_TIME_OF_DAY &OUT() { + CIEC_TIME_OF_DAY &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TOD.cpp b/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TOD.cpp index c53085cee..5936d8a7c 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TOD.cpp +++ b/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TOD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SUB_TOD_TOD::scm_stFBInterfaceSpec = { void FORTE_F_SUB_TOD_TOD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = SUB_TOD_TOD(IN1(), IN2()); + st_OUT() = SUB_TOD_TOD(IN1(), IN2()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TOD.h b/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TOD.h index 2aa0794b0..8753afe4e 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TOD.h +++ b/src/modules/IEC61131-3/Arithmetic/F_SUB_TOD_TOD.h @@ -32,7 +32,7 @@ class FORTE_F_SUB_TOD_TOD: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_TIME &OUT() { + CIEC_TIME &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Arithmetic/F_TRUNC.cpp b/src/modules/IEC61131-3/Arithmetic/F_TRUNC.cpp index ebf46d19b..2a82609f2 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_TRUNC.cpp +++ b/src/modules/IEC61131-3/Arithmetic/F_TRUNC.cpp @@ -44,12 +44,12 @@ const SFBInterfaceSpec FORTE_F_TRUNC::scm_stFBInterfaceSpec = { void FORTE_F_TRUNC::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - switch(IN().getDataTypeID()){ + switch(st_IN().getDataTypeID()){ case CIEC_ANY::e_REAL: - OUT().setSignedValue(TRUNC(static_cast(IN()))); + st_OUT().setSignedValue(TRUNC(static_cast(st_IN()))); break; default: - OUT().setSignedValue(TRUNC(static_cast(IN()))); + st_OUT().setSignedValue(TRUNC(static_cast(st_IN()))); break; } sendOutputEvent(scm_nEventCNFID); diff --git a/src/modules/IEC61131-3/Arithmetic/F_TRUNC.h b/src/modules/IEC61131-3/Arithmetic/F_TRUNC.h index c52a9a301..d96e7efdb 100644 --- a/src/modules/IEC61131-3/Arithmetic/F_TRUNC.h +++ b/src/modules/IEC61131-3/Arithmetic/F_TRUNC.h @@ -22,13 +22,13 @@ class FORTE_F_TRUNC: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_REAL &IN() { + CIEC_ANY_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_INT &OUT() { + CIEC_ANY_INT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Arithmetic/GEN_ADD.cpp b/src/modules/IEC61131-3/Arithmetic/GEN_ADD.cpp index 6cd308b59..ede02357f 100644 --- a/src/modules/IEC61131-3/Arithmetic/GEN_ADD.cpp +++ b/src/modules/IEC61131-3/Arithmetic/GEN_ADD.cpp @@ -50,7 +50,7 @@ void GEN_ADD::executeEvent(int paEIID){ switch (paEIID){ case scm_nEventREQID: - anyMagnitudeFBHelper(OUT().getDataTypeID(), *this); + anyMagnitudeFBHelper(st_OUT().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); break; diff --git a/src/modules/IEC61131-3/Arithmetic/GEN_ADD.h b/src/modules/IEC61131-3/Arithmetic/GEN_ADD.h index b40a26c3e..8cfe4c8c7 100644 --- a/src/modules/IEC61131-3/Arithmetic/GEN_ADD.h +++ b/src/modules/IEC61131-3/Arithmetic/GEN_ADD.h @@ -27,7 +27,7 @@ DECLARE_GENERIC_FIRMWARE_FB(GEN_ADD) static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_MAGNITUDE &OUT() { + CIEC_ANY_MAGNITUDE &st_OUT() { return *static_cast(getDO(0)); } @@ -62,10 +62,10 @@ DECLARE_GENERIC_FIRMWARE_FB(GEN_ADD) oIn.saveAssign(*static_cast(getDI(nInputIndex))); if (0 == nInputIndex) { - OUT().saveAssign(oIn); + st_OUT().saveAssign(oIn); } else { - oOut.saveAssign(OUT()); - OUT().saveAssign(ADD(oOut, oIn)); + oOut.saveAssign(st_OUT()); + st_OUT().saveAssign(ADD(oOut, oIn)); } } } diff --git a/src/modules/IEC61131-3/BitwiseOperators/F_AND.h b/src/modules/IEC61131-3/BitwiseOperators/F_AND.h index a8f04bd7c..6be8e837c 100644 --- a/src/modules/IEC61131-3/BitwiseOperators/F_AND.h +++ b/src/modules/IEC61131-3/BitwiseOperators/F_AND.h @@ -31,7 +31,7 @@ class FORTE_F_AND: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_BIT &OUT() { + CIEC_ANY_BIT &st_OUT() { return *static_cast(getDO(0)); }; @@ -60,7 +60,7 @@ class FORTE_F_AND: public CFunctionBlock{ T oIn2; oIn1.saveAssign(IN1()); oIn2.saveAssign(IN2()); - OUT().saveAssign(AND(oIn1, oIn2)); + st_OUT().saveAssign(AND(oIn1, oIn2)); } virtual ~FORTE_F_AND(){}; diff --git a/src/modules/IEC61131-3/BitwiseOperators/F_NOT.cpp b/src/modules/IEC61131-3/BitwiseOperators/F_NOT.cpp index f6322bf55..f73870cc8 100644 --- a/src/modules/IEC61131-3/BitwiseOperators/F_NOT.cpp +++ b/src/modules/IEC61131-3/BitwiseOperators/F_NOT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_NOT::scm_stFBInterfaceSpec = { void FORTE_F_NOT::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyBitFBHelper(IN().getDataTypeID(), *this); + anyBitFBHelper(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/BitwiseOperators/F_NOT.h b/src/modules/IEC61131-3/BitwiseOperators/F_NOT.h index 206a74feb..08f8e8a6f 100644 --- a/src/modules/IEC61131-3/BitwiseOperators/F_NOT.h +++ b/src/modules/IEC61131-3/BitwiseOperators/F_NOT.h @@ -21,13 +21,13 @@ class FORTE_F_NOT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_BIT &IN() { + CIEC_ANY_BIT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_BIT &OUT() { + CIEC_ANY_BIT &st_OUT() { return *static_cast(getDO(0)); }; @@ -53,8 +53,8 @@ class FORTE_F_NOT: public CFunctionBlock{ template void calculateValue(){ T oIn; - oIn.saveAssign(IN()); - OUT().saveAssign(NOT(oIn)); + oIn.saveAssign(st_IN()); + st_OUT().saveAssign(NOT(oIn)); } virtual ~FORTE_F_NOT(){}; diff --git a/src/modules/IEC61131-3/BitwiseOperators/F_OR.h b/src/modules/IEC61131-3/BitwiseOperators/F_OR.h index a615f7b6c..e8ba591e6 100644 --- a/src/modules/IEC61131-3/BitwiseOperators/F_OR.h +++ b/src/modules/IEC61131-3/BitwiseOperators/F_OR.h @@ -31,7 +31,7 @@ class FORTE_F_OR: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_BIT &OUT() { + CIEC_ANY_BIT &st_OUT() { return *static_cast(getDO(0)); }; @@ -60,7 +60,7 @@ class FORTE_F_OR: public CFunctionBlock{ T oIn2; oIn1.saveAssign(IN1()); oIn2.saveAssign(IN2()); - OUT().saveAssign(OR(oIn1, oIn2)); + st_OUT().saveAssign(OR(oIn1, oIn2)); } virtual ~FORTE_F_OR(){}; diff --git a/src/modules/IEC61131-3/BitwiseOperators/F_ROL.cpp b/src/modules/IEC61131-3/BitwiseOperators/F_ROL.cpp index 7fd8cfdf7..7e5adfc6f 100644 --- a/src/modules/IEC61131-3/BitwiseOperators/F_ROL.cpp +++ b/src/modules/IEC61131-3/BitwiseOperators/F_ROL.cpp @@ -45,7 +45,7 @@ const SFBInterfaceSpec FORTE_F_ROL::scm_stFBInterfaceSpec = { void FORTE_F_ROL::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyBitFBHelperWithoutBool(IN().getDataTypeID(), *this); + anyBitFBHelperWithoutBool(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/BitwiseOperators/F_ROL.h b/src/modules/IEC61131-3/BitwiseOperators/F_ROL.h index c9505689d..425305748 100644 --- a/src/modules/IEC61131-3/BitwiseOperators/F_ROL.h +++ b/src/modules/IEC61131-3/BitwiseOperators/F_ROL.h @@ -22,7 +22,7 @@ class FORTE_F_ROL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_BIT &IN() { + CIEC_ANY_BIT &st_IN() { return *static_cast(getDI(0)); }; @@ -32,7 +32,7 @@ class FORTE_F_ROL: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_BIT &OUT() { + CIEC_ANY_BIT &st_OUT() { return *static_cast(getDO(0)); }; @@ -64,9 +64,9 @@ class FORTE_F_ROL: public CFunctionBlock{ CIEC_UDINT oN; #endif //FORTE_USE_64BIT_DATATYPES - oIn.saveAssign(IN()); + oIn.saveAssign(st_IN()); oN.saveAssign(N()); - OUT().saveAssign(ROL(oIn, oN)); + st_OUT().saveAssign(ROL(oIn, oN)); } virtual ~FORTE_F_ROL(){}; diff --git a/src/modules/IEC61131-3/BitwiseOperators/F_ROR.cpp b/src/modules/IEC61131-3/BitwiseOperators/F_ROR.cpp index e3e1f9a58..3840d2260 100644 --- a/src/modules/IEC61131-3/BitwiseOperators/F_ROR.cpp +++ b/src/modules/IEC61131-3/BitwiseOperators/F_ROR.cpp @@ -45,7 +45,7 @@ const SFBInterfaceSpec FORTE_F_ROR::scm_stFBInterfaceSpec = { void FORTE_F_ROR::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyBitFBHelperWithoutBool(IN().getDataTypeID(), *this); + anyBitFBHelperWithoutBool(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/BitwiseOperators/F_ROR.h b/src/modules/IEC61131-3/BitwiseOperators/F_ROR.h index a1c53dae9..535153d73 100644 --- a/src/modules/IEC61131-3/BitwiseOperators/F_ROR.h +++ b/src/modules/IEC61131-3/BitwiseOperators/F_ROR.h @@ -22,7 +22,7 @@ class FORTE_F_ROR: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_BIT &IN() { + CIEC_ANY_BIT &st_IN() { return *static_cast(getDI(0)); }; @@ -32,7 +32,7 @@ class FORTE_F_ROR: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_BIT &OUT() { + CIEC_ANY_BIT &st_OUT() { return *static_cast(getDO(0)); }; @@ -63,9 +63,9 @@ class FORTE_F_ROR: public CFunctionBlock{ #else // FORTE_USE_64BIT_DATATYPES CIEC_UDINT oN; #endif // FORTE_USE_64BIT_DATATYPES - oIn.saveAssign(IN()); + oIn.saveAssign(st_IN()); oN.saveAssign(N()); - OUT().saveAssign(ROR(oIn, oN)); + st_OUT().saveAssign(ROR(oIn, oN)); } virtual ~FORTE_F_ROR(){}; diff --git a/src/modules/IEC61131-3/BitwiseOperators/F_SHL.cpp b/src/modules/IEC61131-3/BitwiseOperators/F_SHL.cpp index ea1e4cf31..66b4b13af 100644 --- a/src/modules/IEC61131-3/BitwiseOperators/F_SHL.cpp +++ b/src/modules/IEC61131-3/BitwiseOperators/F_SHL.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_SHL::scm_stFBInterfaceSpec = { void FORTE_F_SHL::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyBitFBHelperWithoutBool(IN().getDataTypeID(), *this); + anyBitFBHelperWithoutBool(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/BitwiseOperators/F_SHL.h b/src/modules/IEC61131-3/BitwiseOperators/F_SHL.h index 67c2d833b..e4c6150b9 100644 --- a/src/modules/IEC61131-3/BitwiseOperators/F_SHL.h +++ b/src/modules/IEC61131-3/BitwiseOperators/F_SHL.h @@ -21,7 +21,7 @@ class FORTE_F_SHL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_BIT &IN() { + CIEC_ANY_BIT &st_IN() { return *static_cast(getDI(0)); }; @@ -31,7 +31,7 @@ class FORTE_F_SHL: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_BIT &OUT() { + CIEC_ANY_BIT &st_OUT() { return *static_cast(getDO(0)); }; @@ -62,9 +62,9 @@ class FORTE_F_SHL: public CFunctionBlock{ #else //FORTE_USE_64BIT_DATATYPES CIEC_UDINT oN; #endif //FORTE_USE_64BIT_DATATYPES - oIn.saveAssign(IN()); + oIn.saveAssign(st_IN()); oN.saveAssign(N()); - OUT().saveAssign(SHL(oIn, oN)); + st_OUT().saveAssign(SHL(oIn, oN)); } virtual ~FORTE_F_SHL(){}; diff --git a/src/modules/IEC61131-3/BitwiseOperators/F_SHR.cpp b/src/modules/IEC61131-3/BitwiseOperators/F_SHR.cpp index 5d882c91c..e69992332 100644 --- a/src/modules/IEC61131-3/BitwiseOperators/F_SHR.cpp +++ b/src/modules/IEC61131-3/BitwiseOperators/F_SHR.cpp @@ -45,7 +45,7 @@ const SFBInterfaceSpec FORTE_F_SHR::scm_stFBInterfaceSpec = { void FORTE_F_SHR::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyBitFBHelperWithoutBool(IN().getDataTypeID(), *this); + anyBitFBHelperWithoutBool(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/BitwiseOperators/F_SHR.h b/src/modules/IEC61131-3/BitwiseOperators/F_SHR.h index 26c3e9b56..314022c3d 100644 --- a/src/modules/IEC61131-3/BitwiseOperators/F_SHR.h +++ b/src/modules/IEC61131-3/BitwiseOperators/F_SHR.h @@ -22,7 +22,7 @@ class FORTE_F_SHR: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_BIT &IN() { + CIEC_ANY_BIT &st_IN() { return *static_cast(getDI(0)); }; @@ -32,7 +32,7 @@ class FORTE_F_SHR: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_BIT &OUT() { + CIEC_ANY_BIT &st_OUT() { return *static_cast(getDO(0)); }; @@ -63,9 +63,9 @@ class FORTE_F_SHR: public CFunctionBlock{ #else //FORTE_USE_64BIT_DATATYPES CIEC_UDINT oN; #endif //FORTE_USE_64BIT_DATATYPES - oIn.saveAssign(IN()); + oIn.saveAssign(st_IN()); oN.saveAssign(N()); - OUT().saveAssign(SHR(oIn, oN)); + st_OUT().saveAssign(SHR(oIn, oN)); } virtual ~FORTE_F_SHR(){}; diff --git a/src/modules/IEC61131-3/BitwiseOperators/F_XOR.h b/src/modules/IEC61131-3/BitwiseOperators/F_XOR.h index 5661239cc..179664d33 100644 --- a/src/modules/IEC61131-3/BitwiseOperators/F_XOR.h +++ b/src/modules/IEC61131-3/BitwiseOperators/F_XOR.h @@ -32,7 +32,7 @@ class FORTE_F_XOR: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_BIT &OUT() { + CIEC_ANY_BIT &st_OUT() { return *static_cast(getDO(0)); }; @@ -61,7 +61,7 @@ class FORTE_F_XOR: public CFunctionBlock{ T oIn2; oIn1.saveAssign(IN1()); oIn2.saveAssign(IN2()); - OUT().saveAssign(XOR(oIn1, oIn2)); + st_OUT().saveAssign(XOR(oIn1, oIn2)); } virtual ~FORTE_F_XOR(){}; diff --git a/src/modules/IEC61131-3/BitwiseOperators/GEN_AND.cpp b/src/modules/IEC61131-3/BitwiseOperators/GEN_AND.cpp index c54064706..086e8f436 100644 --- a/src/modules/IEC61131-3/BitwiseOperators/GEN_AND.cpp +++ b/src/modules/IEC61131-3/BitwiseOperators/GEN_AND.cpp @@ -33,7 +33,7 @@ void GEN_AND::executeEvent(int paEIID) { switch (paEIID) { case scm_nEventREQID: - anyBitFBHelper(OUT().getDataTypeID(), *this); + anyBitFBHelper(st_OUT().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); break; diff --git a/src/modules/IEC61131-3/BitwiseOperators/GEN_AND.h b/src/modules/IEC61131-3/BitwiseOperators/GEN_AND.h index 37fed1f7d..7fd4b83fe 100644 --- a/src/modules/IEC61131-3/BitwiseOperators/GEN_AND.h +++ b/src/modules/IEC61131-3/BitwiseOperators/GEN_AND.h @@ -36,10 +36,10 @@ DECLARE_GENERIC_FIRMWARE_FB(GEN_AND) for (unsigned int nInputIndex = 0; nInputIndex < getFBInterfaceSpec()->m_nNumDIs; nInputIndex++) { oIn.saveAssign(*static_cast(getDI(nInputIndex))); if (0 == nInputIndex) { - OUT().saveAssign(oIn); + st_OUT().saveAssign(oIn); } else { - oOut.saveAssign(OUT()); - OUT().saveAssign(AND(oOut, oIn)); + oOut.saveAssign(st_OUT()); + st_OUT().saveAssign(AND(oOut, oIn)); } } } diff --git a/src/modules/IEC61131-3/BitwiseOperators/GEN_OR.cpp b/src/modules/IEC61131-3/BitwiseOperators/GEN_OR.cpp index 9a2706ab9..316a44b99 100644 --- a/src/modules/IEC61131-3/BitwiseOperators/GEN_OR.cpp +++ b/src/modules/IEC61131-3/BitwiseOperators/GEN_OR.cpp @@ -32,7 +32,7 @@ void GEN_OR::executeEvent(int paEIID) { switch (paEIID) { case scm_nEventREQID: - anyBitFBHelper(OUT().getDataTypeID(), *this); + anyBitFBHelper(st_OUT().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); break; diff --git a/src/modules/IEC61131-3/BitwiseOperators/GEN_OR.h b/src/modules/IEC61131-3/BitwiseOperators/GEN_OR.h index 5a16a7fd8..af7df37cc 100644 --- a/src/modules/IEC61131-3/BitwiseOperators/GEN_OR.h +++ b/src/modules/IEC61131-3/BitwiseOperators/GEN_OR.h @@ -39,10 +39,10 @@ DECLARE_GENERIC_FIRMWARE_FB(GEN_OR) oIn.saveAssign(*static_cast(getDI(nInputIndex))); if (0 == nInputIndex) { - OUT().saveAssign(oIn); + st_OUT().saveAssign(oIn); } else { - oOut.saveAssign(OUT()); - OUT().saveAssign(OR(oOut, oIn)); + oOut.saveAssign(st_OUT()); + st_OUT().saveAssign(OR(oOut, oIn)); } } } diff --git a/src/modules/IEC61131-3/BitwiseOperators/GEN_XOR.cpp b/src/modules/IEC61131-3/BitwiseOperators/GEN_XOR.cpp index ce230f060..9d05130f3 100644 --- a/src/modules/IEC61131-3/BitwiseOperators/GEN_XOR.cpp +++ b/src/modules/IEC61131-3/BitwiseOperators/GEN_XOR.cpp @@ -33,7 +33,7 @@ void GEN_XOR::executeEvent(int paEIID) { switch (paEIID) { case scm_nEventREQID: - anyBitFBHelper(OUT().getDataTypeID(), *this); + anyBitFBHelper(st_OUT().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); break; diff --git a/src/modules/IEC61131-3/BitwiseOperators/GEN_XOR.h b/src/modules/IEC61131-3/BitwiseOperators/GEN_XOR.h index 2844d7926..d0e029ee2 100644 --- a/src/modules/IEC61131-3/BitwiseOperators/GEN_XOR.h +++ b/src/modules/IEC61131-3/BitwiseOperators/GEN_XOR.h @@ -41,7 +41,7 @@ class GEN_XOR : public CGenBitBase{ * iff (if and only if) one of the boolean * inputs is set to 'true'. */ - if(CIEC_ANY::e_BOOL == OUT().getDataTypeID()){ + if(CIEC_ANY::e_BOOL == st_OUT().getDataTypeID()){ unsigned int nInputSet = 0; for(unsigned int nInputIndex = 0; nInputIndex < getFBInterfaceSpec()->m_nNumDIs; nInputIndex++){ oIn.saveAssign(*static_cast(getDI(nInputIndex))); @@ -49,7 +49,7 @@ class GEN_XOR : public CGenBitBase{ nInputSet = oIn ? nInputSet + 1 : nInputSet; } - OUT().saveAssign(static_cast(1 == nInputSet)); + st_OUT().saveAssign(static_cast(1 == nInputSet)); } /* @@ -66,11 +66,11 @@ class GEN_XOR : public CGenBitBase{ oIn.saveAssign(*static_cast(getDI(nInputIndex))); if(0 == nInputIndex){ - OUT().saveAssign(oIn); + st_OUT().saveAssign(oIn); } else{ - oOut.saveAssign(OUT()); - OUT().saveAssign(XOR(oOut, oIn)); + oOut.saveAssign(st_OUT()); + st_OUT().saveAssign(XOR(oOut, oIn)); } } } diff --git a/src/modules/IEC61131-3/BitwiseOperators/genbitbase.h b/src/modules/IEC61131-3/BitwiseOperators/genbitbase.h index 7e84610ec..7537bc638 100644 --- a/src/modules/IEC61131-3/BitwiseOperators/genbitbase.h +++ b/src/modules/IEC61131-3/BitwiseOperators/genbitbase.h @@ -21,7 +21,7 @@ class CGenBitBase : public CGenFunctionBlock { CGenBitBase(const CStringDictionary::TStringId paInstanceNameId, CResource *paSrcRes); virtual ~CGenBitBase(); - CIEC_ANY_BIT &OUT(){ + CIEC_ANY_BIT &st_OUT(){ return *static_cast(getDO(0)); } diff --git a/src/modules/IEC61131-3/CharacterString/F_CONCAT.h b/src/modules/IEC61131-3/CharacterString/F_CONCAT.h index 78ae710c8..42a5ee5d1 100644 --- a/src/modules/IEC61131-3/CharacterString/F_CONCAT.h +++ b/src/modules/IEC61131-3/CharacterString/F_CONCAT.h @@ -32,7 +32,7 @@ class FORTE_F_CONCAT: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_STRING &OUT() { + CIEC_ANY_STRING &st_OUT() { return *static_cast(getDO(0)); }; @@ -61,7 +61,7 @@ class FORTE_F_CONCAT: public CFunctionBlock{ T oIn2; oIn1.saveAssign(IN1()); oIn2.saveAssign(IN2()); - OUT().saveAssign(CONCAT(oIn1,oIn2)); + st_OUT().saveAssign(CONCAT(oIn1,oIn2)); } virtual ~FORTE_F_CONCAT(){}; diff --git a/src/modules/IEC61131-3/CharacterString/F_CONCAT_DATE_TOD.cpp b/src/modules/IEC61131-3/CharacterString/F_CONCAT_DATE_TOD.cpp index 8475a7c8e..5bb4a73f4 100644 --- a/src/modules/IEC61131-3/CharacterString/F_CONCAT_DATE_TOD.cpp +++ b/src/modules/IEC61131-3/CharacterString/F_CONCAT_DATE_TOD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_CONCAT_DATE_TOD::scm_stFBInterfaceSpec = { void FORTE_F_CONCAT_DATE_TOD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = CONCAT_DATE_TOD(IN1(), IN2()); + st_OUT() = CONCAT_DATE_TOD(IN1(), IN2()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/CharacterString/F_CONCAT_DATE_TOD.h b/src/modules/IEC61131-3/CharacterString/F_CONCAT_DATE_TOD.h index 7d629cde4..22f4c8af5 100644 --- a/src/modules/IEC61131-3/CharacterString/F_CONCAT_DATE_TOD.h +++ b/src/modules/IEC61131-3/CharacterString/F_CONCAT_DATE_TOD.h @@ -32,7 +32,7 @@ class FORTE_F_CONCAT_DATE_TOD: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DATE_AND_TIME &OUT() { + CIEC_DATE_AND_TIME &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/CharacterString/F_DELETE.cpp b/src/modules/IEC61131-3/CharacterString/F_DELETE.cpp index 52ae1b901..796a8bfa3 100644 --- a/src/modules/IEC61131-3/CharacterString/F_DELETE.cpp +++ b/src/modules/IEC61131-3/CharacterString/F_DELETE.cpp @@ -45,7 +45,7 @@ const SFBInterfaceSpec FORTE_F_DELETE::scm_stFBInterfaceSpec = { void FORTE_F_DELETE::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyStringFBHelper(IN().getDataTypeID(), *this); + anyStringFBHelper(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/CharacterString/F_DELETE.h b/src/modules/IEC61131-3/CharacterString/F_DELETE.h index 09be27fa2..3e8866d29 100644 --- a/src/modules/IEC61131-3/CharacterString/F_DELETE.h +++ b/src/modules/IEC61131-3/CharacterString/F_DELETE.h @@ -22,7 +22,7 @@ class FORTE_F_DELETE: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_STRING &IN() { + CIEC_ANY_STRING &st_IN() { return *static_cast(getDI(0)); }; @@ -36,7 +36,7 @@ class FORTE_F_DELETE: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_STRING &OUT() { + CIEC_ANY_STRING &st_OUT() { return *static_cast(getDO(0)); }; @@ -62,8 +62,8 @@ class FORTE_F_DELETE: public CFunctionBlock{ template void calculateValueString(){ T oIn1; - oIn1.saveAssign(IN()); - OUT().saveAssign(DELETE(oIn1,L(),P())); + oIn1.saveAssign(st_IN()); + st_OUT().saveAssign(DELETE(oIn1,L(),P())); } virtual ~FORTE_F_DELETE(){}; diff --git a/src/modules/IEC61131-3/CharacterString/F_FIND.cpp b/src/modules/IEC61131-3/CharacterString/F_FIND.cpp index 572c001f7..e1fb356e8 100644 --- a/src/modules/IEC61131-3/CharacterString/F_FIND.cpp +++ b/src/modules/IEC61131-3/CharacterString/F_FIND.cpp @@ -45,7 +45,7 @@ const SFBInterfaceSpec FORTE_F_FIND::scm_stFBInterfaceSpec = { void FORTE_F_FIND::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - OUT().setSignedValue(FIND(IN1(),IN2()).getSignedValue()); + st_OUT().setSignedValue(FIND(IN1(),IN2()).getSignedValue()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/CharacterString/F_FIND.h b/src/modules/IEC61131-3/CharacterString/F_FIND.h index d759c7b59..6056bf688 100644 --- a/src/modules/IEC61131-3/CharacterString/F_FIND.h +++ b/src/modules/IEC61131-3/CharacterString/F_FIND.h @@ -32,7 +32,7 @@ class FORTE_F_FIND: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_INT &OUT() { + CIEC_ANY_INT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/CharacterString/F_INSERT.h b/src/modules/IEC61131-3/CharacterString/F_INSERT.h index 6b7e1d0a7..db19b61b3 100644 --- a/src/modules/IEC61131-3/CharacterString/F_INSERT.h +++ b/src/modules/IEC61131-3/CharacterString/F_INSERT.h @@ -36,7 +36,7 @@ class FORTE_F_INSERT: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_STRING &OUT() { + CIEC_ANY_STRING &st_OUT() { return *static_cast(getDO(0)); }; @@ -65,7 +65,7 @@ class FORTE_F_INSERT: public CFunctionBlock{ T oIn2; oIn1.saveAssign(IN1()); oIn2.saveAssign(IN2()); - OUT().saveAssign(INSERT(oIn1,oIn2,P())); + st_OUT().saveAssign(INSERT(oIn1,oIn2,P())); } virtual ~FORTE_F_INSERT(){}; diff --git a/src/modules/IEC61131-3/CharacterString/F_LEFT.cpp b/src/modules/IEC61131-3/CharacterString/F_LEFT.cpp index e63458c1f..726fbe994 100644 --- a/src/modules/IEC61131-3/CharacterString/F_LEFT.cpp +++ b/src/modules/IEC61131-3/CharacterString/F_LEFT.cpp @@ -45,7 +45,7 @@ const SFBInterfaceSpec FORTE_F_LEFT::scm_stFBInterfaceSpec = { void FORTE_F_LEFT::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyStringFBHelper(IN().getDataTypeID(), *this); + anyStringFBHelper(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/CharacterString/F_LEFT.h b/src/modules/IEC61131-3/CharacterString/F_LEFT.h index 492dbdd3f..7b44b0d8c 100644 --- a/src/modules/IEC61131-3/CharacterString/F_LEFT.h +++ b/src/modules/IEC61131-3/CharacterString/F_LEFT.h @@ -22,7 +22,7 @@ class FORTE_F_LEFT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_STRING &IN() { + CIEC_ANY_STRING &st_IN() { return *static_cast(getDI(0)); }; @@ -32,7 +32,7 @@ class FORTE_F_LEFT: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_STRING &OUT() { + CIEC_ANY_STRING &st_OUT() { return *static_cast(getDO(0)); }; @@ -57,8 +57,8 @@ class FORTE_F_LEFT: public CFunctionBlock{ }; template void calculateValueString(){ - T &roIn(static_cast(IN())); - OUT().saveAssign(LEFT(roIn,L())); + T &roIn(static_cast(st_IN())); + st_OUT().saveAssign(LEFT(roIn,L())); } virtual ~FORTE_F_LEFT(){}; diff --git a/src/modules/IEC61131-3/CharacterString/F_LEN.cpp b/src/modules/IEC61131-3/CharacterString/F_LEN.cpp index 7bcdaa47b..f6a538c7c 100644 --- a/src/modules/IEC61131-3/CharacterString/F_LEN.cpp +++ b/src/modules/IEC61131-3/CharacterString/F_LEN.cpp @@ -45,7 +45,7 @@ const SFBInterfaceSpec FORTE_F_LEN::scm_stFBInterfaceSpec = { void FORTE_F_LEN::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyElementaryFBHelper(IN().getDataTypeID(), *this); + anyElementaryFBHelper(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/CharacterString/F_LEN.h b/src/modules/IEC61131-3/CharacterString/F_LEN.h index 8ffeb06d4..12b52fc82 100644 --- a/src/modules/IEC61131-3/CharacterString/F_LEN.h +++ b/src/modules/IEC61131-3/CharacterString/F_LEN.h @@ -22,13 +22,13 @@ class FORTE_F_LEN: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_STRING &IN() { + CIEC_ANY_STRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_INT &OUT() { + CIEC_ANY_INT &st_OUT() { return *static_cast(getDO(0)); }; @@ -53,12 +53,12 @@ class FORTE_F_LEN: public CFunctionBlock{ }; template void calculateValue(){ - OUT().saveAssign(CIEC_UDINT(0)); + st_OUT().saveAssign(CIEC_UDINT(0)); } template void calculateValueString(){ - T &roIn(static_cast(IN())); - OUT().saveAssign(LEN(roIn)); + T &roIn(static_cast(st_IN())); + st_OUT().saveAssign(LEN(roIn)); } virtual ~FORTE_F_LEN(){}; diff --git a/src/modules/IEC61131-3/CharacterString/F_MID.cpp b/src/modules/IEC61131-3/CharacterString/F_MID.cpp index 16e5ee460..5397d28df 100644 --- a/src/modules/IEC61131-3/CharacterString/F_MID.cpp +++ b/src/modules/IEC61131-3/CharacterString/F_MID.cpp @@ -45,7 +45,7 @@ const SFBInterfaceSpec FORTE_F_MID::scm_stFBInterfaceSpec = { void FORTE_F_MID::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyStringFBHelper(IN().getDataTypeID(), *this); + anyStringFBHelper(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/CharacterString/F_MID.h b/src/modules/IEC61131-3/CharacterString/F_MID.h index 0b7ce2062..d8bfbba92 100644 --- a/src/modules/IEC61131-3/CharacterString/F_MID.h +++ b/src/modules/IEC61131-3/CharacterString/F_MID.h @@ -22,7 +22,7 @@ class FORTE_F_MID: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_STRING &IN() { + CIEC_ANY_STRING &st_IN() { return *static_cast(getDI(0)); }; @@ -36,7 +36,7 @@ class FORTE_F_MID: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_STRING &OUT() { + CIEC_ANY_STRING &st_OUT() { return *static_cast(getDO(0)); }; @@ -61,8 +61,8 @@ class FORTE_F_MID: public CFunctionBlock{ }; template void calculateValueString(){ - T &roIn(static_cast(IN())); - OUT().saveAssign(MID(roIn,L(),P())); + T &roIn(static_cast(st_IN())); + st_OUT().saveAssign(MID(roIn,L(),P())); } virtual ~FORTE_F_MID(){}; diff --git a/src/modules/IEC61131-3/CharacterString/F_REPLACE.h b/src/modules/IEC61131-3/CharacterString/F_REPLACE.h index 93e3cf9ec..d3b4ad1f0 100644 --- a/src/modules/IEC61131-3/CharacterString/F_REPLACE.h +++ b/src/modules/IEC61131-3/CharacterString/F_REPLACE.h @@ -40,7 +40,7 @@ class FORTE_F_REPLACE: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_STRING &OUT() { + CIEC_ANY_STRING &st_OUT() { return *static_cast(getDO(0)); }; @@ -69,7 +69,7 @@ class FORTE_F_REPLACE: public CFunctionBlock{ oIn1.saveAssign(IN1()); T oIn2; oIn2.saveAssign(IN2()); - OUT().saveAssign(REPLACE(oIn1,oIn2,L(),P())); + st_OUT().saveAssign(REPLACE(oIn1,oIn2,L(),P())); } virtual ~FORTE_F_REPLACE(){}; diff --git a/src/modules/IEC61131-3/CharacterString/F_RIGHT.cpp b/src/modules/IEC61131-3/CharacterString/F_RIGHT.cpp index 42e892d45..31c4695b0 100644 --- a/src/modules/IEC61131-3/CharacterString/F_RIGHT.cpp +++ b/src/modules/IEC61131-3/CharacterString/F_RIGHT.cpp @@ -45,7 +45,7 @@ const SFBInterfaceSpec FORTE_F_RIGHT::scm_stFBInterfaceSpec = { void FORTE_F_RIGHT::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyStringFBHelper(IN().getDataTypeID(), *this); + anyStringFBHelper(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/CharacterString/F_RIGHT.h b/src/modules/IEC61131-3/CharacterString/F_RIGHT.h index d9021c243..24b8d7ab8 100644 --- a/src/modules/IEC61131-3/CharacterString/F_RIGHT.h +++ b/src/modules/IEC61131-3/CharacterString/F_RIGHT.h @@ -22,7 +22,7 @@ class FORTE_F_RIGHT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_STRING &IN() { + CIEC_ANY_STRING &st_IN() { return *static_cast(getDI(0)); }; @@ -32,7 +32,7 @@ class FORTE_F_RIGHT: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_STRING &OUT() { + CIEC_ANY_STRING &st_OUT() { return *static_cast(getDO(0)); }; @@ -57,8 +57,8 @@ class FORTE_F_RIGHT: public CFunctionBlock{ }; template void calculateValueString(){ - T &roIn(static_cast(IN())); - OUT().saveAssign(RIGHT(roIn,L())); + T &roIn(static_cast(st_IN())); + st_OUT().saveAssign(RIGHT(roIn,L())); } virtual ~FORTE_F_RIGHT(){}; diff --git a/src/modules/IEC61131-3/Comparison/F_EQ.h b/src/modules/IEC61131-3/Comparison/F_EQ.h index 845d5ca15..c3f47641b 100644 --- a/src/modules/IEC61131-3/Comparison/F_EQ.h +++ b/src/modules/IEC61131-3/Comparison/F_EQ.h @@ -35,7 +35,7 @@ class FORTE_F_EQ : public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BOOL &OUT(){ + CIEC_BOOL &st_OUT(){ return *static_cast(getDO(0)); } ; @@ -68,7 +68,7 @@ class FORTE_F_EQ : public CFunctionBlock{ oIn1.saveAssign(IN1()); oIn2.saveAssign(IN2()); - OUT().saveAssign(EQ(oIn1, oIn2)); + st_OUT().saveAssign(EQ(oIn1, oIn2)); } template void calculateValueString() { diff --git a/src/modules/IEC61131-3/Comparison/F_GE.h b/src/modules/IEC61131-3/Comparison/F_GE.h index 175277317..c556d2245 100644 --- a/src/modules/IEC61131-3/Comparison/F_GE.h +++ b/src/modules/IEC61131-3/Comparison/F_GE.h @@ -32,7 +32,7 @@ class FORTE_F_GE: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BOOL &OUT() { + CIEC_BOOL &st_OUT() { return *static_cast(getDO(0)); }; @@ -61,7 +61,7 @@ class FORTE_F_GE: public CFunctionBlock{ T oIn2; oIn1.saveAssign(IN1()); oIn2.saveAssign(IN2()); - OUT().saveAssign(GE(oIn1, oIn2)); + st_OUT().saveAssign(GE(oIn1, oIn2)); } template void calculateValueString() const { diff --git a/src/modules/IEC61131-3/Comparison/F_GT.h b/src/modules/IEC61131-3/Comparison/F_GT.h index 0705a46d0..340031714 100644 --- a/src/modules/IEC61131-3/Comparison/F_GT.h +++ b/src/modules/IEC61131-3/Comparison/F_GT.h @@ -31,7 +31,7 @@ class FORTE_F_GT: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BOOL &OUT() { + CIEC_BOOL &st_OUT() { return *static_cast(getDO(0)); }; @@ -64,7 +64,7 @@ class FORTE_F_GT: public CFunctionBlock{ oIn1.saveAssign(IN1()); oIn2.saveAssign(IN2()); - OUT().saveAssign(GT(oIn1, oIn2)); + st_OUT().saveAssign(GT(oIn1, oIn2)); } template void calculateValueString() const { diff --git a/src/modules/IEC61131-3/Comparison/F_LE.h b/src/modules/IEC61131-3/Comparison/F_LE.h index 949e38218..8ddde8b3c 100644 --- a/src/modules/IEC61131-3/Comparison/F_LE.h +++ b/src/modules/IEC61131-3/Comparison/F_LE.h @@ -32,7 +32,7 @@ class FORTE_F_LE: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BOOL &OUT() { + CIEC_BOOL &st_OUT() { return *static_cast(getDO(0)); }; @@ -61,7 +61,7 @@ class FORTE_F_LE: public CFunctionBlock{ T oIn2; oIn1.saveAssign(IN1()); oIn2.saveAssign(IN2()); - OUT().saveAssign(LE(oIn1, oIn2)); + st_OUT().saveAssign(LE(oIn1, oIn2)); } template void calculateValueString() const { diff --git a/src/modules/IEC61131-3/Comparison/F_LT.h b/src/modules/IEC61131-3/Comparison/F_LT.h index 39f445ecf..6ee8dbf54 100644 --- a/src/modules/IEC61131-3/Comparison/F_LT.h +++ b/src/modules/IEC61131-3/Comparison/F_LT.h @@ -32,7 +32,7 @@ class FORTE_F_LT: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BOOL &OUT() { + CIEC_BOOL &st_OUT() { return *static_cast(getDO(0)); }; @@ -61,7 +61,7 @@ class FORTE_F_LT: public CFunctionBlock{ T oIn2; oIn1.saveAssign(IN1()); oIn2.saveAssign(IN2()); - OUT().saveAssign(LT(oIn1, oIn2)); + st_OUT().saveAssign(LT(oIn1, oIn2)); } template void calculateValueString() const { diff --git a/src/modules/IEC61131-3/Comparison/F_NE.h b/src/modules/IEC61131-3/Comparison/F_NE.h index c7b87fb96..dde4bedf4 100644 --- a/src/modules/IEC61131-3/Comparison/F_NE.h +++ b/src/modules/IEC61131-3/Comparison/F_NE.h @@ -33,7 +33,7 @@ class FORTE_F_NE: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BOOL &OUT() { + CIEC_BOOL &st_OUT() { return *static_cast(getDO(0)); }; @@ -62,7 +62,7 @@ class FORTE_F_NE: public CFunctionBlock{ T oIn2; oIn1.saveAssign(IN1()); oIn2.saveAssign(IN2()); - OUT().saveAssign(NE(oIn1, oIn2)); + st_OUT().saveAssign(NE(oIn1, oIn2)); } template void calculateValueString() { diff --git a/src/modules/IEC61131-3/Conversion/BCD/F_BYTE_BCD_TO_USINT.cpp b/src/modules/IEC61131-3/Conversion/BCD/F_BYTE_BCD_TO_USINT.cpp index dc03e7004..b27d57c24 100644 --- a/src/modules/IEC61131-3/Conversion/BCD/F_BYTE_BCD_TO_USINT.cpp +++ b/src/modules/IEC61131-3/Conversion/BCD/F_BYTE_BCD_TO_USINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BYTE_BCD_TO_USINT::scm_stFBInterfaceSpec = { void FORTE_F_BYTE_BCD_TO_USINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BYTE_BCD_TO_USINT(IN()); + st_OUT() = BYTE_BCD_TO_USINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BCD/F_BYTE_BCD_TO_USINT.h b/src/modules/IEC61131-3/Conversion/BCD/F_BYTE_BCD_TO_USINT.h index f34df81b4..1c141d4ef 100644 --- a/src/modules/IEC61131-3/Conversion/BCD/F_BYTE_BCD_TO_USINT.h +++ b/src/modules/IEC61131-3/Conversion/BCD/F_BYTE_BCD_TO_USINT.h @@ -22,13 +22,13 @@ class FORTE_F_BYTE_BCD_TO_USINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BYTE &IN() { + CIEC_BYTE &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_USINT &OUT() { + CIEC_USINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BCD/F_DWORD_BCD_TO_UDINT.cpp b/src/modules/IEC61131-3/Conversion/BCD/F_DWORD_BCD_TO_UDINT.cpp index 40af2154c..82e675fb9 100644 --- a/src/modules/IEC61131-3/Conversion/BCD/F_DWORD_BCD_TO_UDINT.cpp +++ b/src/modules/IEC61131-3/Conversion/BCD/F_DWORD_BCD_TO_UDINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DWORD_BCD_TO_UDINT::scm_stFBInterfaceSpec = { void FORTE_F_DWORD_BCD_TO_UDINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DWORD_BCD_TO_UDINT(IN()); + st_OUT() = DWORD_BCD_TO_UDINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BCD/F_DWORD_BCD_TO_UDINT.h b/src/modules/IEC61131-3/Conversion/BCD/F_DWORD_BCD_TO_UDINT.h index b72e3d17a..323a6a775 100644 --- a/src/modules/IEC61131-3/Conversion/BCD/F_DWORD_BCD_TO_UDINT.h +++ b/src/modules/IEC61131-3/Conversion/BCD/F_DWORD_BCD_TO_UDINT.h @@ -22,13 +22,13 @@ class FORTE_F_DWORD_BCD_TO_UDINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DWORD &IN() { + CIEC_DWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UDINT &OUT() { + CIEC_UDINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BCD/F_LWORD_BCD_TO_ULINT.cpp b/src/modules/IEC61131-3/Conversion/BCD/F_LWORD_BCD_TO_ULINT.cpp index 68ce1a779..1e88ca3e9 100644 --- a/src/modules/IEC61131-3/Conversion/BCD/F_LWORD_BCD_TO_ULINT.cpp +++ b/src/modules/IEC61131-3/Conversion/BCD/F_LWORD_BCD_TO_ULINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LWORD_BCD_TO_ULINT::scm_stFBInterfaceSpec = { void FORTE_F_LWORD_BCD_TO_ULINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LWORD_BCD_TO_ULINT(IN()); + st_OUT() = LWORD_BCD_TO_ULINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BCD/F_LWORD_BCD_TO_ULINT.h b/src/modules/IEC61131-3/Conversion/BCD/F_LWORD_BCD_TO_ULINT.h index e72cb9081..5ef701268 100644 --- a/src/modules/IEC61131-3/Conversion/BCD/F_LWORD_BCD_TO_ULINT.h +++ b/src/modules/IEC61131-3/Conversion/BCD/F_LWORD_BCD_TO_ULINT.h @@ -22,13 +22,13 @@ class FORTE_F_LWORD_BCD_TO_ULINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LWORD &IN() { + CIEC_LWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ULINT &OUT() { + CIEC_ULINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BCD/F_UDINT_TO_BCD_DWORD.cpp b/src/modules/IEC61131-3/Conversion/BCD/F_UDINT_TO_BCD_DWORD.cpp index 71d70721e..aed2ac641 100644 --- a/src/modules/IEC61131-3/Conversion/BCD/F_UDINT_TO_BCD_DWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/BCD/F_UDINT_TO_BCD_DWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_UDINT_TO_BCD_DWORD::scm_stFBInterfaceSpec = { void FORTE_F_UDINT_TO_BCD_DWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UDINT_TO_BCD_DWORD(IN()); + st_OUT() = UDINT_TO_BCD_DWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BCD/F_UDINT_TO_BCD_DWORD.h b/src/modules/IEC61131-3/Conversion/BCD/F_UDINT_TO_BCD_DWORD.h index f34a786c4..02d4cf5a7 100644 --- a/src/modules/IEC61131-3/Conversion/BCD/F_UDINT_TO_BCD_DWORD.h +++ b/src/modules/IEC61131-3/Conversion/BCD/F_UDINT_TO_BCD_DWORD.h @@ -22,13 +22,13 @@ class FORTE_F_UDINT_TO_BCD_DWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UDINT &IN() { + CIEC_UDINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DWORD &OUT() { + CIEC_DWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BCD/F_UINT_TO_BCD_WORD.cpp b/src/modules/IEC61131-3/Conversion/BCD/F_UINT_TO_BCD_WORD.cpp index f21d3770f..aa6e1f876 100644 --- a/src/modules/IEC61131-3/Conversion/BCD/F_UINT_TO_BCD_WORD.cpp +++ b/src/modules/IEC61131-3/Conversion/BCD/F_UINT_TO_BCD_WORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_UINT_TO_BCD_WORD::scm_stFBInterfaceSpec = { void FORTE_F_UINT_TO_BCD_WORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UINT_TO_BCD_WORD(IN()); + st_OUT() = UINT_TO_BCD_WORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BCD/F_UINT_TO_BCD_WORD.h b/src/modules/IEC61131-3/Conversion/BCD/F_UINT_TO_BCD_WORD.h index 7ffe9b085..cf61109d1 100644 --- a/src/modules/IEC61131-3/Conversion/BCD/F_UINT_TO_BCD_WORD.h +++ b/src/modules/IEC61131-3/Conversion/BCD/F_UINT_TO_BCD_WORD.h @@ -22,13 +22,13 @@ class FORTE_F_UINT_TO_BCD_WORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UINT &IN() { + CIEC_UINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WORD &OUT() { + CIEC_WORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BCD/F_ULINT_TO_BCD_LWORD.cpp b/src/modules/IEC61131-3/Conversion/BCD/F_ULINT_TO_BCD_LWORD.cpp index 7e0afd4dc..30faf7b45 100644 --- a/src/modules/IEC61131-3/Conversion/BCD/F_ULINT_TO_BCD_LWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/BCD/F_ULINT_TO_BCD_LWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_ULINT_TO_BCD_LWORD::scm_stFBInterfaceSpec = { void FORTE_F_ULINT_TO_BCD_LWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = ULINT_TO_BCD_LWORD(IN()); + st_OUT() = ULINT_TO_BCD_LWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BCD/F_ULINT_TO_BCD_LWORD.h b/src/modules/IEC61131-3/Conversion/BCD/F_ULINT_TO_BCD_LWORD.h index 8bb6d626f..4f5372178 100644 --- a/src/modules/IEC61131-3/Conversion/BCD/F_ULINT_TO_BCD_LWORD.h +++ b/src/modules/IEC61131-3/Conversion/BCD/F_ULINT_TO_BCD_LWORD.h @@ -22,13 +22,13 @@ class FORTE_F_ULINT_TO_BCD_LWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ULINT &IN() { + CIEC_ULINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LWORD &OUT() { + CIEC_LWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BCD/F_USINT_TO_BCD_BYTE.cpp b/src/modules/IEC61131-3/Conversion/BCD/F_USINT_TO_BCD_BYTE.cpp index b19f31a3c..fc925b119 100644 --- a/src/modules/IEC61131-3/Conversion/BCD/F_USINT_TO_BCD_BYTE.cpp +++ b/src/modules/IEC61131-3/Conversion/BCD/F_USINT_TO_BCD_BYTE.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_USINT_TO_BCD_BYTE::scm_stFBInterfaceSpec = { void FORTE_F_USINT_TO_BCD_BYTE::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = USINT_TO_BCD_BYTE(IN()); + st_OUT() = USINT_TO_BCD_BYTE(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BCD/F_USINT_TO_BCD_BYTE.h b/src/modules/IEC61131-3/Conversion/BCD/F_USINT_TO_BCD_BYTE.h index 170c0c7ed..016131e6b 100644 --- a/src/modules/IEC61131-3/Conversion/BCD/F_USINT_TO_BCD_BYTE.h +++ b/src/modules/IEC61131-3/Conversion/BCD/F_USINT_TO_BCD_BYTE.h @@ -22,13 +22,13 @@ class FORTE_F_USINT_TO_BCD_BYTE: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_USINT &IN() { + CIEC_USINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BYTE &OUT() { + CIEC_BYTE &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BCD/F_WORD_BCD_TO_UINT.cpp b/src/modules/IEC61131-3/Conversion/BCD/F_WORD_BCD_TO_UINT.cpp index eaa25e4ed..eb829f042 100644 --- a/src/modules/IEC61131-3/Conversion/BCD/F_WORD_BCD_TO_UINT.cpp +++ b/src/modules/IEC61131-3/Conversion/BCD/F_WORD_BCD_TO_UINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_WORD_BCD_TO_UINT::scm_stFBInterfaceSpec = { void FORTE_F_WORD_BCD_TO_UINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WORD_BCD_TO_UINT(IN()); + st_OUT() = WORD_BCD_TO_UINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BCD/F_WORD_BCD_TO_UINT.h b/src/modules/IEC61131-3/Conversion/BCD/F_WORD_BCD_TO_UINT.h index 76975c8fa..68996218b 100644 --- a/src/modules/IEC61131-3/Conversion/BCD/F_WORD_BCD_TO_UINT.h +++ b/src/modules/IEC61131-3/Conversion/BCD/F_WORD_BCD_TO_UINT.h @@ -22,13 +22,13 @@ class FORTE_F_WORD_BCD_TO_UINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WORD &IN() { + CIEC_WORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UINT &OUT() { + CIEC_UINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_BYTE.cpp b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_BYTE.cpp index f4c828d4a..63618da15 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_BYTE.cpp +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_BYTE.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BOOL_TO_BYTE::scm_stFBInterfaceSpec = { void FORTE_F_BOOL_TO_BYTE::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BOOL_TO_BYTE(IN()); + st_OUT() = BOOL_TO_BYTE(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_BYTE.h b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_BYTE.h index 14b106c83..74325c6af 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_BYTE.h +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_BYTE.h @@ -22,13 +22,13 @@ class FORTE_F_BOOL_TO_BYTE: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BOOL &IN() { + CIEC_BOOL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BYTE &OUT() { + CIEC_BYTE &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_DINT.cpp b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_DINT.cpp index b5cb6072c..dc2fb1cad 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_DINT.cpp +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_DINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BOOL_TO_DINT::scm_stFBInterfaceSpec = { void FORTE_F_BOOL_TO_DINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BOOL_TO_DINT(IN()); + st_OUT() = BOOL_TO_DINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_DINT.h b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_DINT.h index f1a123f4a..e011c0d13 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_DINT.h +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_DINT.h @@ -22,13 +22,13 @@ class FORTE_F_BOOL_TO_DINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BOOL &IN() { + CIEC_BOOL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DINT &OUT() { + CIEC_DINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_DWORD.cpp b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_DWORD.cpp index 3cea87e84..2e464fa45 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_DWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_DWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BOOL_TO_DWORD::scm_stFBInterfaceSpec = { void FORTE_F_BOOL_TO_DWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BOOL_TO_DWORD(IN()); + st_OUT() = BOOL_TO_DWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_DWORD.h b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_DWORD.h index a7eb8f531..ded2ec3b0 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_DWORD.h +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_DWORD.h @@ -22,13 +22,13 @@ class FORTE_F_BOOL_TO_DWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BOOL &IN() { + CIEC_BOOL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DWORD &OUT() { + CIEC_DWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_INT.cpp b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_INT.cpp index cabf0ef53..acc24f67f 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_INT.cpp +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_INT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BOOL_TO_INT::scm_stFBInterfaceSpec = { void FORTE_F_BOOL_TO_INT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BOOL_TO_INT(IN()); + st_OUT() = BOOL_TO_INT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_INT.h b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_INT.h index eebfa6a45..b3035c6bb 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_INT.h +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_INT.h @@ -22,13 +22,13 @@ class FORTE_F_BOOL_TO_INT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BOOL &IN() { + CIEC_BOOL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_INT &OUT() { + CIEC_INT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_LINT.cpp b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_LINT.cpp index a7e7bb2ce..eec7b7086 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_LINT.cpp +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_LINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BOOL_TO_LINT::scm_stFBInterfaceSpec = { void FORTE_F_BOOL_TO_LINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BOOL_TO_LINT(IN()); + st_OUT() = BOOL_TO_LINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_LINT.h b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_LINT.h index f808acbcd..eb7bdfe0b 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_LINT.h +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_LINT.h @@ -22,13 +22,13 @@ class FORTE_F_BOOL_TO_LINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BOOL &IN() { + CIEC_BOOL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LINT &OUT() { + CIEC_LINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_LWORD.cpp b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_LWORD.cpp index 1d4fa61e0..875a0b264 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_LWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_LWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BOOL_TO_LWORD::scm_stFBInterfaceSpec = { void FORTE_F_BOOL_TO_LWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BOOL_TO_LWORD(IN()); + st_OUT() = BOOL_TO_LWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_LWORD.h b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_LWORD.h index 282e6e163..b003b2525 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_LWORD.h +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_LWORD.h @@ -22,13 +22,13 @@ class FORTE_F_BOOL_TO_LWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BOOL &IN() { + CIEC_BOOL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LWORD &OUT() { + CIEC_LWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_SINT.cpp b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_SINT.cpp index 461ccf280..0971f557b 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_SINT.cpp +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_SINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BOOL_TO_SINT::scm_stFBInterfaceSpec = { void FORTE_F_BOOL_TO_SINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BOOL_TO_SINT(IN()); + st_OUT() = BOOL_TO_SINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_SINT.h b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_SINT.h index 3b5aebd22..7b7514535 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_SINT.h +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_SINT.h @@ -22,13 +22,13 @@ class FORTE_F_BOOL_TO_SINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BOOL &IN() { + CIEC_BOOL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_SINT &OUT() { + CIEC_SINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_STRING.cpp b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_STRING.cpp index 1b1d484c2..3ed4e5834 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_STRING.cpp +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_STRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BOOL_TO_STRING::scm_stFBInterfaceSpec = { void FORTE_F_BOOL_TO_STRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BOOL_TO_STRING(IN()); + st_OUT() = BOOL_TO_STRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_STRING.h b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_STRING.h index c08198f2f..88e19cdbd 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_STRING.h +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_STRING.h @@ -22,13 +22,13 @@ class FORTE_F_BOOL_TO_STRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BOOL &IN() { + CIEC_BOOL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_STRING &OUT() { + CIEC_STRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_UDINT.cpp b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_UDINT.cpp index 432c5bd85..34b695e9b 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_UDINT.cpp +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_UDINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BOOL_TO_UDINT::scm_stFBInterfaceSpec = { void FORTE_F_BOOL_TO_UDINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BOOL_TO_UDINT(IN()); + st_OUT() = BOOL_TO_UDINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_UDINT.h b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_UDINT.h index e84fcec94..b00ba1821 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_UDINT.h +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_UDINT.h @@ -22,13 +22,13 @@ class FORTE_F_BOOL_TO_UDINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BOOL &IN() { + CIEC_BOOL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UDINT &OUT() { + CIEC_UDINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_UINT.cpp b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_UINT.cpp index fdf64548b..709869ef3 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_UINT.cpp +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_UINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BOOL_TO_UINT::scm_stFBInterfaceSpec = { void FORTE_F_BOOL_TO_UINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BOOL_TO_UINT(IN()); + st_OUT() = BOOL_TO_UINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_UINT.h b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_UINT.h index 6538f03d8..3e4062e14 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_UINT.h +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_UINT.h @@ -22,13 +22,13 @@ class FORTE_F_BOOL_TO_UINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BOOL &IN() { + CIEC_BOOL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UINT &OUT() { + CIEC_UINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_ULINT.cpp b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_ULINT.cpp index 792df033c..6c8fc8c5f 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_ULINT.cpp +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_ULINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BOOL_TO_ULINT::scm_stFBInterfaceSpec = { void FORTE_F_BOOL_TO_ULINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BOOL_TO_ULINT(IN()); + st_OUT() = BOOL_TO_ULINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_ULINT.h b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_ULINT.h index 445ac3972..b2a8c66af 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_ULINT.h +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_ULINT.h @@ -22,13 +22,13 @@ class FORTE_F_BOOL_TO_ULINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BOOL &IN() { + CIEC_BOOL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ULINT &OUT() { + CIEC_ULINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_USINT.cpp b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_USINT.cpp index ffb0d82a9..d54dcf713 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_USINT.cpp +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_USINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BOOL_TO_USINT::scm_stFBInterfaceSpec = { void FORTE_F_BOOL_TO_USINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BOOL_TO_USINT(IN()); + st_OUT() = BOOL_TO_USINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_USINT.h b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_USINT.h index 664de5f54..0768ee5a6 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_USINT.h +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_USINT.h @@ -22,13 +22,13 @@ class FORTE_F_BOOL_TO_USINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BOOL &IN() { + CIEC_BOOL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_USINT &OUT() { + CIEC_USINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_WORD.cpp b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_WORD.cpp index 432972066..5a4982e3c 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_WORD.cpp +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_WORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BOOL_TO_WORD::scm_stFBInterfaceSpec = { void FORTE_F_BOOL_TO_WORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BOOL_TO_WORD(IN()); + st_OUT() = BOOL_TO_WORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_WORD.h b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_WORD.h index 3c6012a75..c9827a715 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_WORD.h +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_WORD.h @@ -22,13 +22,13 @@ class FORTE_F_BOOL_TO_WORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BOOL &IN() { + CIEC_BOOL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WORD &OUT() { + CIEC_WORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_WSTRING.cpp b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_WSTRING.cpp index 7ba480f58..c14498960 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_WSTRING.cpp +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_WSTRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BOOL_TO_WSTRING::scm_stFBInterfaceSpec = { void FORTE_F_BOOL_TO_WSTRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BOOL_TO_WSTRING(IN()); + st_OUT() = BOOL_TO_WSTRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_WSTRING.h b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_WSTRING.h index ecab09aa7..7d4a0bad4 100644 --- a/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_WSTRING.h +++ b/src/modules/IEC61131-3/Conversion/BOOL/F_BOOL_TO_WSTRING.h @@ -22,13 +22,13 @@ class FORTE_F_BOOL_TO_WSTRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BOOL &IN() { + CIEC_BOOL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WSTRING &OUT() { + CIEC_WSTRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_DINT.cpp b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_DINT.cpp index 0b68797c4..5f1ceb7a3 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_DINT.cpp +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_DINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BYTE_TO_DINT::scm_stFBInterfaceSpec = { void FORTE_F_BYTE_TO_DINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BYTE_TO_DINT(IN()); + st_OUT() = BYTE_TO_DINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_DINT.h b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_DINT.h index 764508ca9..a85d0f090 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_DINT.h +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_DINT.h @@ -22,13 +22,13 @@ class FORTE_F_BYTE_TO_DINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BYTE &IN() { + CIEC_BYTE &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DINT &OUT() { + CIEC_DINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_DWORD.cpp b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_DWORD.cpp index 75ba1794f..4fae76ac7 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_DWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_DWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BYTE_TO_DWORD::scm_stFBInterfaceSpec = { void FORTE_F_BYTE_TO_DWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BYTE_TO_DWORD(IN()); + st_OUT() = BYTE_TO_DWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_DWORD.h b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_DWORD.h index 35744182c..ca4fc86af 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_DWORD.h +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_DWORD.h @@ -22,13 +22,13 @@ class FORTE_F_BYTE_TO_DWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BYTE &IN() { + CIEC_BYTE &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DWORD &OUT() { + CIEC_DWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_INT.cpp b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_INT.cpp index a2d555651..e992ebc87 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_INT.cpp +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_INT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BYTE_TO_INT::scm_stFBInterfaceSpec = { void FORTE_F_BYTE_TO_INT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BYTE_TO_INT(IN()); + st_OUT() = BYTE_TO_INT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_INT.h b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_INT.h index 62b7fdeb5..71a6941bc 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_INT.h +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_INT.h @@ -22,13 +22,13 @@ class FORTE_F_BYTE_TO_INT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BYTE &IN() { + CIEC_BYTE &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_INT &OUT() { + CIEC_INT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_LINT.cpp b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_LINT.cpp index 784b2ddd5..f7358ad1a 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_LINT.cpp +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_LINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BYTE_TO_LINT::scm_stFBInterfaceSpec = { void FORTE_F_BYTE_TO_LINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BYTE_TO_LINT(IN()); + st_OUT() = BYTE_TO_LINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_LINT.h b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_LINT.h index c9407a007..3124136c6 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_LINT.h +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_LINT.h @@ -22,13 +22,13 @@ class FORTE_F_BYTE_TO_LINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BYTE &IN() { + CIEC_BYTE &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LINT &OUT() { + CIEC_LINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_LWORD.cpp b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_LWORD.cpp index 158fc1ec9..bc90030ff 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_LWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_LWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BYTE_TO_LWORD::scm_stFBInterfaceSpec = { void FORTE_F_BYTE_TO_LWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BYTE_TO_LWORD(IN()); + st_OUT() = BYTE_TO_LWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_LWORD.h b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_LWORD.h index 312c6c9a8..ef9881899 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_LWORD.h +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_LWORD.h @@ -22,13 +22,13 @@ class FORTE_F_BYTE_TO_LWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BYTE &IN() { + CIEC_BYTE &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LWORD &OUT() { + CIEC_LWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_SINT.cpp b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_SINT.cpp index beba762f4..e14aa89f0 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_SINT.cpp +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_SINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BYTE_TO_SINT::scm_stFBInterfaceSpec = { void FORTE_F_BYTE_TO_SINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BYTE_TO_SINT(IN()); + st_OUT() = BYTE_TO_SINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_SINT.h b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_SINT.h index 62177e070..9c6b87015 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_SINT.h +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_SINT.h @@ -22,13 +22,13 @@ class FORTE_F_BYTE_TO_SINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BYTE &IN() { + CIEC_BYTE &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_SINT &OUT() { + CIEC_SINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_STRING.cpp b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_STRING.cpp index 742fe892c..0d19baad4 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_STRING.cpp +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_STRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BYTE_TO_STRING::scm_stFBInterfaceSpec = { void FORTE_F_BYTE_TO_STRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BYTE_TO_STRING(IN()); + st_OUT() = BYTE_TO_STRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_STRING.h b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_STRING.h index 2c9826dad..4588c105f 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_STRING.h +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_STRING.h @@ -22,13 +22,13 @@ class FORTE_F_BYTE_TO_STRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BYTE &IN() { + CIEC_BYTE &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_STRING &OUT() { + CIEC_STRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_UDINT.cpp b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_UDINT.cpp index 2f0e803ed..d62f66b40 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_UDINT.cpp +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_UDINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BYTE_TO_UDINT::scm_stFBInterfaceSpec = { void FORTE_F_BYTE_TO_UDINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BYTE_TO_UDINT(IN()); + st_OUT() = BYTE_TO_UDINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_UDINT.h b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_UDINT.h index 68fca9d2d..04d64100c 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_UDINT.h +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_UDINT.h @@ -22,13 +22,13 @@ class FORTE_F_BYTE_TO_UDINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BYTE &IN() { + CIEC_BYTE &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UDINT &OUT() { + CIEC_UDINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_UINT.cpp b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_UINT.cpp index 9f0f26a69..af8def771 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_UINT.cpp +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_UINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_BYTE_TO_UINT::scm_stFBInterfaceSpec = { void FORTE_F_BYTE_TO_UINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BYTE_TO_UINT(IN()); + st_OUT() = BYTE_TO_UINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_UINT.h b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_UINT.h index 75d67b1ec..34e09f06c 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_UINT.h +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_UINT.h @@ -21,13 +21,13 @@ class FORTE_F_BYTE_TO_UINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BYTE &IN() { + CIEC_BYTE &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UDINT &OUT() { + CIEC_UDINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_ULINT.cpp b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_ULINT.cpp index 6ab95a722..42f065b3c 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_ULINT.cpp +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_ULINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BYTE_TO_ULINT::scm_stFBInterfaceSpec = { void FORTE_F_BYTE_TO_ULINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BYTE_TO_ULINT(IN()); + st_OUT() = BYTE_TO_ULINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_ULINT.h b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_ULINT.h index c36c5638a..ba22683c4 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_ULINT.h +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_ULINT.h @@ -22,13 +22,13 @@ class FORTE_F_BYTE_TO_ULINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BYTE &IN() { + CIEC_BYTE &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ULINT &OUT() { + CIEC_ULINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_USINT.cpp b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_USINT.cpp index d352b9a7f..7ba265ab8 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_USINT.cpp +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_USINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BYTE_TO_USINT::scm_stFBInterfaceSpec = { void FORTE_F_BYTE_TO_USINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BYTE_TO_USINT(IN()); + st_OUT() = BYTE_TO_USINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_USINT.h b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_USINT.h index be7033c0b..441837e1b 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_USINT.h +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_USINT.h @@ -22,13 +22,13 @@ class FORTE_F_BYTE_TO_USINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BYTE &IN() { + CIEC_BYTE &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_USINT &OUT() { + CIEC_USINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_WORD.cpp b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_WORD.cpp index 1cc359128..cfbbc8acf 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_WORD.cpp +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_WORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BYTE_TO_WORD::scm_stFBInterfaceSpec = { void FORTE_F_BYTE_TO_WORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BYTE_TO_WORD(IN()); + st_OUT() = BYTE_TO_WORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_WORD.h b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_WORD.h index 131057a5c..ae9ec4ab1 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_WORD.h +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_WORD.h @@ -22,13 +22,13 @@ class FORTE_F_BYTE_TO_WORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BYTE &IN() { + CIEC_BYTE &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WORD &OUT() { + CIEC_WORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_WSTRING.cpp b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_WSTRING.cpp index f1ca7ce3a..cbc235673 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_WSTRING.cpp +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_WSTRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_BYTE_TO_WSTRING::scm_stFBInterfaceSpec = { void FORTE_F_BYTE_TO_WSTRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = BYTE_TO_WSTRING(IN()); + st_OUT() = BYTE_TO_WSTRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_WSTRING.h b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_WSTRING.h index 4abae0bb4..ceb7c00ff 100644 --- a/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_WSTRING.h +++ b/src/modules/IEC61131-3/Conversion/BYTE/F_BYTE_TO_WSTRING.h @@ -22,13 +22,13 @@ class FORTE_F_BYTE_TO_WSTRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_BYTE &IN() { + CIEC_BYTE &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WSTRING &OUT() { + CIEC_WSTRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_BYTE.cpp b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_BYTE.cpp index ce1db2d44..1f17411dd 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_BYTE.cpp +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_BYTE.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DINT_TO_BYTE::scm_stFBInterfaceSpec = { void FORTE_F_DINT_TO_BYTE::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DINT_TO_BYTE(IN()); + st_OUT() = DINT_TO_BYTE(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_BYTE.h b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_BYTE.h index c6257eb47..c742af8bb 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_BYTE.h +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_BYTE.h @@ -22,13 +22,13 @@ class FORTE_F_DINT_TO_BYTE: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DINT &IN() { + CIEC_DINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BYTE &OUT() { + CIEC_BYTE &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_DWORD.cpp b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_DWORD.cpp index e3b200838..8c7c70783 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_DWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_DWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DINT_TO_DWORD::scm_stFBInterfaceSpec = { void FORTE_F_DINT_TO_DWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DINT_TO_DWORD(IN()); + st_OUT() = DINT_TO_DWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_DWORD.h b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_DWORD.h index a95cf3c13..13bb51cc6 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_DWORD.h +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_DWORD.h @@ -22,13 +22,13 @@ class FORTE_F_DINT_TO_DWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DINT &IN() { + CIEC_DINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DWORD &OUT() { + CIEC_DWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_INT.cpp b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_INT.cpp index 80579a991..bfb1c293f 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_INT.cpp +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_INT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DINT_TO_INT::scm_stFBInterfaceSpec = { void FORTE_F_DINT_TO_INT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DINT_TO_INT(IN()); + st_OUT() = DINT_TO_INT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_INT.h b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_INT.h index c1c4ec4f5..82a367072 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_INT.h +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_INT.h @@ -22,13 +22,13 @@ class FORTE_F_DINT_TO_INT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DINT &IN() { + CIEC_DINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_INT &OUT() { + CIEC_INT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LINT.cpp b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LINT.cpp index 501017fe1..d68ef2e4d 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LINT.cpp +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DINT_TO_LINT::scm_stFBInterfaceSpec = { void FORTE_F_DINT_TO_LINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DINT_TO_LINT(IN()); + st_OUT() = DINT_TO_LINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LINT.h b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LINT.h index 150ce96b4..b231132c1 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LINT.h +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LINT.h @@ -22,13 +22,13 @@ class FORTE_F_DINT_TO_LINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DINT &IN() { + CIEC_DINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LINT &OUT() { + CIEC_LINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LREAL.cpp b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LREAL.cpp index 7000e7351..aaa2459f3 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LREAL.cpp +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LREAL.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DINT_TO_LREAL::scm_stFBInterfaceSpec = { void FORTE_F_DINT_TO_LREAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DINT_TO_LREAL(IN()); + st_OUT() = DINT_TO_LREAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LREAL.h b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LREAL.h index 65126d614..6d042cd65 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LREAL.h +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LREAL.h @@ -22,13 +22,13 @@ class FORTE_F_DINT_TO_LREAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DINT &IN() { + CIEC_DINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LREAL &OUT() { + CIEC_LREAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LWORD.cpp b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LWORD.cpp index 7cd39732e..91ba10930 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DINT_TO_LWORD::scm_stFBInterfaceSpec = { void FORTE_F_DINT_TO_LWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DINT_TO_LWORD(IN()); + st_OUT() = DINT_TO_LWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LWORD.h b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LWORD.h index f6eb30d42..9f9d24096 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LWORD.h +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_LWORD.h @@ -22,13 +22,13 @@ class FORTE_F_DINT_TO_LWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DINT &IN() { + CIEC_DINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LWORD &OUT() { + CIEC_LWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_REAL.cpp b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_REAL.cpp index 4cfe812fe..38a0dd13b 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_REAL.cpp +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_REAL.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_DINT_TO_REAL::scm_stFBInterfaceSpec = { void FORTE_F_DINT_TO_REAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DINT_TO_REAL(IN()); + st_OUT() = DINT_TO_REAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_REAL.h b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_REAL.h index a4e6f2356..626165e15 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_REAL.h +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_REAL.h @@ -21,13 +21,13 @@ class FORTE_F_DINT_TO_REAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DINT &IN() { + CIEC_DINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_REAL &OUT() { + CIEC_REAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_SINT.cpp b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_SINT.cpp index 2e82a2062..aa652a61d 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_SINT.cpp +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_SINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DINT_TO_SINT::scm_stFBInterfaceSpec = { void FORTE_F_DINT_TO_SINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DINT_TO_SINT(IN()); + st_OUT() = DINT_TO_SINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_SINT.h b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_SINT.h index 45e4833f8..ffcfdc145 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_SINT.h +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_SINT.h @@ -22,13 +22,13 @@ class FORTE_F_DINT_TO_SINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DINT &IN() { + CIEC_DINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_SINT &OUT() { + CIEC_SINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_STRING.cpp b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_STRING.cpp index ae15d4ea8..841fe3306 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_STRING.cpp +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_STRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DINT_TO_STRING::scm_stFBInterfaceSpec = { void FORTE_F_DINT_TO_STRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DINT_TO_STRING(IN()); + st_OUT() = DINT_TO_STRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_STRING.h b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_STRING.h index 26878e806..882fe8b9c 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_STRING.h +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_STRING.h @@ -22,13 +22,13 @@ class FORTE_F_DINT_TO_STRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DINT &IN() { + CIEC_DINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_STRING &OUT() { + CIEC_STRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_UDINT.cpp b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_UDINT.cpp index 0b03d057e..7d5e2e666 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_UDINT.cpp +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_UDINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DINT_TO_UDINT::scm_stFBInterfaceSpec = { void FORTE_F_DINT_TO_UDINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DINT_TO_UDINT(IN()); + st_OUT() = DINT_TO_UDINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_UDINT.h b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_UDINT.h index 35fec5356..4ebe9f590 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_UDINT.h +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_UDINT.h @@ -22,13 +22,13 @@ class FORTE_F_DINT_TO_UDINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DINT &IN() { + CIEC_DINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UDINT &OUT() { + CIEC_UDINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_UINT.cpp b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_UINT.cpp index 5f131e3f6..bde0bb031 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_UINT.cpp +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_UINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DINT_TO_UINT::scm_stFBInterfaceSpec = { void FORTE_F_DINT_TO_UINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DINT_TO_UINT(IN()); + st_OUT() = DINT_TO_UINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_UINT.h b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_UINT.h index d5b70fe6b..5487f29cf 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_UINT.h +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_UINT.h @@ -22,13 +22,13 @@ class FORTE_F_DINT_TO_UINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DINT &IN() { + CIEC_DINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UINT &OUT() { + CIEC_UINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_ULINT.cpp b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_ULINT.cpp index 9225b36de..490980156 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_ULINT.cpp +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_ULINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DINT_TO_ULINT::scm_stFBInterfaceSpec = { void FORTE_F_DINT_TO_ULINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DINT_TO_ULINT(IN()); + st_OUT() = DINT_TO_ULINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_ULINT.h b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_ULINT.h index bbed02baa..db19a2125 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_ULINT.h +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_ULINT.h @@ -22,13 +22,13 @@ class FORTE_F_DINT_TO_ULINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DINT &IN() { + CIEC_DINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ULINT &OUT() { + CIEC_ULINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_USINT.cpp b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_USINT.cpp index 94adf6784..2feb3db3a 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_USINT.cpp +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_USINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DINT_TO_USINT::scm_stFBInterfaceSpec = { void FORTE_F_DINT_TO_USINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DINT_TO_USINT(IN()); + st_OUT() = DINT_TO_USINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_USINT.h b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_USINT.h index 5f206cd4a..35bc9d35e 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_USINT.h +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_USINT.h @@ -22,13 +22,13 @@ class FORTE_F_DINT_TO_USINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DINT &IN() { + CIEC_DINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_USINT &OUT() { + CIEC_USINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_WORD.cpp b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_WORD.cpp index 834b38e5e..ae98a317e 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_WORD.cpp +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_WORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DINT_TO_WORD::scm_stFBInterfaceSpec = { void FORTE_F_DINT_TO_WORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DINT_TO_WORD(IN()); + st_OUT() = DINT_TO_WORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_WORD.h b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_WORD.h index 938f040f5..42df46eec 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_WORD.h +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_WORD.h @@ -22,13 +22,13 @@ class FORTE_F_DINT_TO_WORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DINT &IN() { + CIEC_DINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WORD &OUT() { + CIEC_WORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_WSTRING.cpp b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_WSTRING.cpp index 54446b9bc..2de6b255e 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_WSTRING.cpp +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_WSTRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DINT_TO_WSTRING::scm_stFBInterfaceSpec = { void FORTE_F_DINT_TO_WSTRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DINT_TO_WSTRING(IN()); + st_OUT() = DINT_TO_WSTRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_WSTRING.h b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_WSTRING.h index e1a2871da..ca81a5db4 100644 --- a/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_WSTRING.h +++ b/src/modules/IEC61131-3/Conversion/DINT/F_DINT_TO_WSTRING.h @@ -22,13 +22,13 @@ class FORTE_F_DINT_TO_WSTRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DINT &IN() { + CIEC_DINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WSTRING &OUT() { + CIEC_WSTRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DT/F_DT_TO_DATE.cpp b/src/modules/IEC61131-3/Conversion/DT/F_DT_TO_DATE.cpp index 9ccc9ce1b..afcb304cf 100644 --- a/src/modules/IEC61131-3/Conversion/DT/F_DT_TO_DATE.cpp +++ b/src/modules/IEC61131-3/Conversion/DT/F_DT_TO_DATE.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DT_TO_DATE::scm_stFBInterfaceSpec = { void FORTE_F_DT_TO_DATE::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DT_TO_DATE(IN()); + st_OUT() = DT_TO_DATE(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DT/F_DT_TO_DATE.h b/src/modules/IEC61131-3/Conversion/DT/F_DT_TO_DATE.h index 6c57d359d..08f3c46dd 100644 --- a/src/modules/IEC61131-3/Conversion/DT/F_DT_TO_DATE.h +++ b/src/modules/IEC61131-3/Conversion/DT/F_DT_TO_DATE.h @@ -22,13 +22,13 @@ class FORTE_F_DT_TO_DATE: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DATE_AND_TIME &IN() { + CIEC_DATE_AND_TIME &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DATE &OUT() { + CIEC_DATE &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DT/F_DT_TO_TOD.cpp b/src/modules/IEC61131-3/Conversion/DT/F_DT_TO_TOD.cpp index 351e88b28..0748fced2 100644 --- a/src/modules/IEC61131-3/Conversion/DT/F_DT_TO_TOD.cpp +++ b/src/modules/IEC61131-3/Conversion/DT/F_DT_TO_TOD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DT_TO_TOD::scm_stFBInterfaceSpec = { void FORTE_F_DT_TO_TOD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DT_TO_TOD(IN()); + st_OUT() = DT_TO_TOD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DT/F_DT_TO_TOD.h b/src/modules/IEC61131-3/Conversion/DT/F_DT_TO_TOD.h index 483c9d753..e03ddfc9d 100644 --- a/src/modules/IEC61131-3/Conversion/DT/F_DT_TO_TOD.h +++ b/src/modules/IEC61131-3/Conversion/DT/F_DT_TO_TOD.h @@ -22,13 +22,13 @@ class FORTE_F_DT_TO_TOD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DATE_AND_TIME &IN() { + CIEC_DATE_AND_TIME &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_TIME_OF_DAY &OUT() { + CIEC_TIME_OF_DAY &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_BYTE.cpp b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_BYTE.cpp index f652347f5..70a8baad6 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_BYTE.cpp +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_BYTE.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DWORD_TO_BYTE::scm_stFBInterfaceSpec = { void FORTE_F_DWORD_TO_BYTE::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DWORD_TO_BYTE(IN()); + st_OUT() = DWORD_TO_BYTE(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_BYTE.h b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_BYTE.h index c17228791..96029f34e 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_BYTE.h +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_BYTE.h @@ -22,13 +22,13 @@ class FORTE_F_DWORD_TO_BYTE: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DWORD &IN() { + CIEC_DWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BYTE &OUT() { + CIEC_BYTE &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_DINT.cpp b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_DINT.cpp index 3643f906e..e101fbbb3 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_DINT.cpp +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_DINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DWORD_TO_DINT::scm_stFBInterfaceSpec = { void FORTE_F_DWORD_TO_DINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DWORD_TO_DINT(IN()); + st_OUT() = DWORD_TO_DINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_DINT.h b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_DINT.h index 6e460d0f6..44952ecfd 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_DINT.h +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_DINT.h @@ -22,13 +22,13 @@ class FORTE_F_DWORD_TO_DINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DWORD &IN() { + CIEC_DWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DINT &OUT() { + CIEC_DINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_INT.cpp b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_INT.cpp index 6c6d69975..29e8369e4 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_INT.cpp +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_INT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DWORD_TO_INT::scm_stFBInterfaceSpec = { void FORTE_F_DWORD_TO_INT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DWORD_TO_INT(IN()); + st_OUT() = DWORD_TO_INT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_INT.h b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_INT.h index 080a40783..53c340ff5 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_INT.h +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_INT.h @@ -22,13 +22,13 @@ class FORTE_F_DWORD_TO_INT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DWORD &IN() { + CIEC_DWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_INT &OUT() { + CIEC_INT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_LINT.cpp b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_LINT.cpp index 1887dd30e..d13ea5086 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_LINT.cpp +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_LINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DWORD_TO_LINT::scm_stFBInterfaceSpec = { void FORTE_F_DWORD_TO_LINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DWORD_TO_LINT(IN()); + st_OUT() = DWORD_TO_LINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_LINT.h b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_LINT.h index 867ab8bed..ba38c2446 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_LINT.h +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_LINT.h @@ -22,13 +22,13 @@ class FORTE_F_DWORD_TO_LINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DWORD &IN() { + CIEC_DWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LINT &OUT() { + CIEC_LINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_LWORD.cpp b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_LWORD.cpp index 89695f463..bd0c695ae 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_LWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_LWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DWORD_TO_LWORD::scm_stFBInterfaceSpec = { void FORTE_F_DWORD_TO_LWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DWORD_TO_LWORD(IN()); + st_OUT() = DWORD_TO_LWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_LWORD.h b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_LWORD.h index c0c250ff9..fb3a807a6 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_LWORD.h +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_LWORD.h @@ -22,13 +22,13 @@ class FORTE_F_DWORD_TO_LWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DWORD &IN() { + CIEC_DWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LWORD &OUT() { + CIEC_LWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_REAL.cpp b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_REAL.cpp index b22283556..71d328218 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_REAL.cpp +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_REAL.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_DWORD_TO_REAL::scm_stFBInterfaceSpec = { void FORTE_F_DWORD_TO_REAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DWORD_TO_REAL(IN()); + st_OUT() = DWORD_TO_REAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_REAL.h b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_REAL.h index 5c2a776d9..9fb288cd9 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_REAL.h +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_REAL.h @@ -22,13 +22,13 @@ class FORTE_F_DWORD_TO_REAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DWORD &IN() { + CIEC_DWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_REAL &OUT() { + CIEC_REAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_SINT.cpp b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_SINT.cpp index a26a36ca2..fba2eebb4 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_SINT.cpp +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_SINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DWORD_TO_SINT::scm_stFBInterfaceSpec = { void FORTE_F_DWORD_TO_SINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DWORD_TO_SINT(IN()); + st_OUT() = DWORD_TO_SINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_SINT.h b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_SINT.h index fea14d5aa..5754cbe16 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_SINT.h +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_SINT.h @@ -22,13 +22,13 @@ class FORTE_F_DWORD_TO_SINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DWORD &IN() { + CIEC_DWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_SINT &OUT() { + CIEC_SINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_STRING.cpp b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_STRING.cpp index 479a2266b..937e1e264 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_STRING.cpp +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_STRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DWORD_TO_STRING::scm_stFBInterfaceSpec = { void FORTE_F_DWORD_TO_STRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() =DWORD_TO_STRING(IN()); + st_OUT() =DWORD_TO_STRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_STRING.h b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_STRING.h index 8083e6356..f4c1cf98f 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_STRING.h +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_STRING.h @@ -22,13 +22,13 @@ class FORTE_F_DWORD_TO_STRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DWORD &IN() { + CIEC_DWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_STRING &OUT() { + CIEC_STRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_UDINT.cpp b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_UDINT.cpp index 0e5d51549..5cc367d62 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_UDINT.cpp +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_UDINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DWORD_TO_UDINT::scm_stFBInterfaceSpec = { void FORTE_F_DWORD_TO_UDINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DWORD_TO_UDINT(IN()); + st_OUT() = DWORD_TO_UDINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_UDINT.h b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_UDINT.h index 9f5d2b540..bb7a24aba 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_UDINT.h +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_UDINT.h @@ -22,13 +22,13 @@ class FORTE_F_DWORD_TO_UDINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DWORD &IN() { + CIEC_DWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UDINT &OUT() { + CIEC_UDINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_UINT.cpp b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_UINT.cpp index c930651f4..0949ce209 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_UINT.cpp +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_UINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DWORD_TO_UINT::scm_stFBInterfaceSpec = { void FORTE_F_DWORD_TO_UINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DWORD_TO_UINT(IN()); + st_OUT() = DWORD_TO_UINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_UINT.h b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_UINT.h index 9cf12c4e3..1028767fa 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_UINT.h +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_UINT.h @@ -22,13 +22,13 @@ class FORTE_F_DWORD_TO_UINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DWORD &IN() { + CIEC_DWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UINT &OUT() { + CIEC_UINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_ULINT.cpp b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_ULINT.cpp index 703dac7c8..63ff8ea65 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_ULINT.cpp +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_ULINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DWORD_TO_ULINT::scm_stFBInterfaceSpec = { void FORTE_F_DWORD_TO_ULINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DWORD_TO_ULINT(IN()); + st_OUT() = DWORD_TO_ULINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_ULINT.h b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_ULINT.h index e8db4d828..5bb91105b 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_ULINT.h +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_ULINT.h @@ -22,13 +22,13 @@ class FORTE_F_DWORD_TO_ULINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DWORD &IN() { + CIEC_DWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ULINT &OUT() { + CIEC_ULINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_USINT.cpp b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_USINT.cpp index 877459587..bc3eb3f22 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_USINT.cpp +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_USINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DWORD_TO_USINT::scm_stFBInterfaceSpec = { void FORTE_F_DWORD_TO_USINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DWORD_TO_USINT(IN()); + st_OUT() = DWORD_TO_USINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_USINT.h b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_USINT.h index bd2c1e7bc..70b79014c 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_USINT.h +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_USINT.h @@ -22,13 +22,13 @@ class FORTE_F_DWORD_TO_USINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DWORD &IN() { + CIEC_DWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_USINT &OUT() { + CIEC_USINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_WORD.cpp b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_WORD.cpp index f1e49e48f..38f39a13d 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_WORD.cpp +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_WORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DWORD_TO_WORD::scm_stFBInterfaceSpec = { void FORTE_F_DWORD_TO_WORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DWORD_TO_WORD(IN()); + st_OUT() = DWORD_TO_WORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_WORD.h b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_WORD.h index 37de6d8fe..b4e496650 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_WORD.h +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_WORD.h @@ -22,13 +22,13 @@ class FORTE_F_DWORD_TO_WORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DWORD &IN() { + CIEC_DWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WORD &OUT() { + CIEC_WORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_WSTRING.cpp b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_WSTRING.cpp index 2bfd4f308..901142e88 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_WSTRING.cpp +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_WSTRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_DWORD_TO_WSTRING::scm_stFBInterfaceSpec = { void FORTE_F_DWORD_TO_WSTRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = DWORD_TO_WSTRING(IN()); + st_OUT() = DWORD_TO_WSTRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_WSTRING.h b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_WSTRING.h index 899e39a4e..0227dfc1b 100644 --- a/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_WSTRING.h +++ b/src/modules/IEC61131-3/Conversion/DWORD/F_DWORD_TO_WSTRING.h @@ -22,13 +22,13 @@ class FORTE_F_DWORD_TO_WSTRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_DWORD &IN() { + CIEC_DWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WSTRING &OUT() { + CIEC_WSTRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_BYTE.cpp b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_BYTE.cpp index 3bcbab5b3..e9a0c0fce 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_BYTE.cpp +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_BYTE.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_INT_TO_BYTE::scm_stFBInterfaceSpec = { void FORTE_F_INT_TO_BYTE::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = INT_TO_BYTE(IN()); + st_OUT() = INT_TO_BYTE(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_BYTE.h b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_BYTE.h index 020ba7eed..1b17e2d15 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_BYTE.h +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_BYTE.h @@ -22,13 +22,13 @@ class FORTE_F_INT_TO_BYTE: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_INT &IN() { + CIEC_INT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BYTE &OUT() { + CIEC_BYTE &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_DINT.cpp b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_DINT.cpp index 48f25bac8..e476f00c6 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_DINT.cpp +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_DINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_INT_TO_DINT::scm_stFBInterfaceSpec = { void FORTE_F_INT_TO_DINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = INT_TO_DINT(IN()); + st_OUT() = INT_TO_DINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_DINT.h b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_DINT.h index 03f0c5eb4..60e828cc1 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_DINT.h +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_DINT.h @@ -22,13 +22,13 @@ class FORTE_F_INT_TO_DINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_INT &IN() { + CIEC_INT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DINT &OUT() { + CIEC_DINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_DWORD.cpp b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_DWORD.cpp index c2c95c616..1983bd7b1 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_DWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_DWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_INT_TO_DWORD::scm_stFBInterfaceSpec = { void FORTE_F_INT_TO_DWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = INT_TO_DWORD(IN()); + st_OUT() = INT_TO_DWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_DWORD.h b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_DWORD.h index 4b53ae3f3..ae585829e 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_DWORD.h +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_DWORD.h @@ -22,13 +22,13 @@ class FORTE_F_INT_TO_DWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_INT &IN() { + CIEC_INT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DWORD &OUT() { + CIEC_DWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LINT.cpp b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LINT.cpp index 7931d160b..2ee2c1eee 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LINT.cpp +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_INT_TO_LINT::scm_stFBInterfaceSpec = { void FORTE_F_INT_TO_LINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = INT_TO_LINT(IN()); + st_OUT() = INT_TO_LINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LINT.h b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LINT.h index c35464322..42ab31f88 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LINT.h +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LINT.h @@ -22,13 +22,13 @@ class FORTE_F_INT_TO_LINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_INT &IN() { + CIEC_INT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LINT &OUT() { + CIEC_LINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LREAL.cpp b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LREAL.cpp index 4cebbe7dd..571074754 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LREAL.cpp +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LREAL.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_INT_TO_LREAL::scm_stFBInterfaceSpec = { void FORTE_F_INT_TO_LREAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = INT_TO_LREAL(IN()); + st_OUT() = INT_TO_LREAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LREAL.h b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LREAL.h index eaec87d6b..7f4f0558f 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LREAL.h +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LREAL.h @@ -21,13 +21,13 @@ class FORTE_F_INT_TO_LREAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_INT &IN() { + CIEC_INT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LREAL &OUT() { + CIEC_LREAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LWORD.cpp b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LWORD.cpp index 28e0cc084..5e1228ea2 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_INT_TO_LWORD::scm_stFBInterfaceSpec = { void FORTE_F_INT_TO_LWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = INT_TO_LWORD(IN()); + st_OUT() = INT_TO_LWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LWORD.h b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LWORD.h index 810ac9dab..7114a213d 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LWORD.h +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_LWORD.h @@ -22,13 +22,13 @@ class FORTE_F_INT_TO_LWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_INT &IN() { + CIEC_INT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LWORD &OUT() { + CIEC_LWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_REAL.cpp b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_REAL.cpp index db2d71ab9..4c8de5296 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_REAL.cpp +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_REAL.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_INT_TO_REAL::scm_stFBInterfaceSpec = { void FORTE_F_INT_TO_REAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = INT_TO_REAL(IN()); + st_OUT() = INT_TO_REAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_REAL.h b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_REAL.h index 804fc4717..26477eb72 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_REAL.h +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_REAL.h @@ -22,13 +22,13 @@ class FORTE_F_INT_TO_REAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_INT &IN() { + CIEC_INT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_REAL &OUT() { + CIEC_REAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_SINT.cpp b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_SINT.cpp index fefd2194a..5d567e7d8 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_SINT.cpp +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_SINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_INT_TO_SINT::scm_stFBInterfaceSpec = { void FORTE_F_INT_TO_SINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = INT_TO_SINT(IN()); + st_OUT() = INT_TO_SINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_SINT.h b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_SINT.h index ff229a9ab..b09f9501f 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_SINT.h +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_SINT.h @@ -22,13 +22,13 @@ class FORTE_F_INT_TO_SINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_INT &IN() { + CIEC_INT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_SINT &OUT() { + CIEC_SINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_STRING.cpp b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_STRING.cpp index 1489d09f6..b879e8cfb 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_STRING.cpp +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_STRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_INT_TO_STRING::scm_stFBInterfaceSpec = { void FORTE_F_INT_TO_STRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = INT_TO_STRING(IN()); + st_OUT() = INT_TO_STRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_STRING.h b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_STRING.h index 995bf74d2..f452e2461 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_STRING.h +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_STRING.h @@ -22,13 +22,13 @@ class FORTE_F_INT_TO_STRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_INT &IN() { + CIEC_INT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_STRING &OUT() { + CIEC_STRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_UDINT.cpp b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_UDINT.cpp index 50823e601..ae8b5575a 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_UDINT.cpp +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_UDINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_INT_TO_UDINT::scm_stFBInterfaceSpec = { void FORTE_F_INT_TO_UDINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = INT_TO_UDINT(IN()); + st_OUT() = INT_TO_UDINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_UDINT.h b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_UDINT.h index 33e7245ba..f8643c8ec 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_UDINT.h +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_UDINT.h @@ -22,13 +22,13 @@ class FORTE_F_INT_TO_UDINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_INT &IN() { + CIEC_INT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UDINT &OUT() { + CIEC_UDINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_UINT.cpp b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_UINT.cpp index c2ff9d84e..0821e6042 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_UINT.cpp +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_UINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_INT_TO_UINT::scm_stFBInterfaceSpec = { void FORTE_F_INT_TO_UINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = INT_TO_UINT(IN()); + st_OUT() = INT_TO_UINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_UINT.h b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_UINT.h index ab50d63e1..45e184030 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_UINT.h +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_UINT.h @@ -22,13 +22,13 @@ class FORTE_F_INT_TO_UINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_INT &IN() { + CIEC_INT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UINT &OUT() { + CIEC_UINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_ULINT.cpp b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_ULINT.cpp index 74737442a..d37a0ef8c 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_ULINT.cpp +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_ULINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_INT_TO_ULINT::scm_stFBInterfaceSpec = { void FORTE_F_INT_TO_ULINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = INT_TO_ULINT(IN()); + st_OUT() = INT_TO_ULINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_ULINT.h b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_ULINT.h index 0f51aa442..0924e93ad 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_ULINT.h +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_ULINT.h @@ -22,13 +22,13 @@ class FORTE_F_INT_TO_ULINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_INT &IN() { + CIEC_INT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ULINT &OUT() { + CIEC_ULINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_USINT.cpp b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_USINT.cpp index d381be6db..51e919ab3 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_USINT.cpp +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_USINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_INT_TO_USINT::scm_stFBInterfaceSpec = { void FORTE_F_INT_TO_USINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = INT_TO_USINT(IN()); + st_OUT() = INT_TO_USINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_USINT.h b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_USINT.h index af8011f87..8b0075d7e 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_USINT.h +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_USINT.h @@ -22,13 +22,13 @@ class FORTE_F_INT_TO_USINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_INT &IN() { + CIEC_INT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_USINT &OUT() { + CIEC_USINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_WORD.cpp b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_WORD.cpp index 982add6f2..d1a76a579 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_WORD.cpp +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_WORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_INT_TO_WORD::scm_stFBInterfaceSpec = { void FORTE_F_INT_TO_WORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = INT_TO_WORD(IN()); + st_OUT() = INT_TO_WORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_WORD.h b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_WORD.h index 923bae1a3..c2adb5597 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_WORD.h +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_WORD.h @@ -22,13 +22,13 @@ class FORTE_F_INT_TO_WORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_INT &IN() { + CIEC_INT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WORD &OUT() { + CIEC_WORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_WSTRING.cpp b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_WSTRING.cpp index c76e0e330..55c2626dd 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_WSTRING.cpp +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_WSTRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_INT_TO_WSTRING::scm_stFBInterfaceSpec = { void FORTE_F_INT_TO_WSTRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = INT_TO_WSTRING(IN()); + st_OUT() = INT_TO_WSTRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_WSTRING.h b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_WSTRING.h index e679b348f..eb11e9de2 100644 --- a/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_WSTRING.h +++ b/src/modules/IEC61131-3/Conversion/INT/F_INT_TO_WSTRING.h @@ -22,13 +22,13 @@ class FORTE_F_INT_TO_WSTRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_INT &IN() { + CIEC_INT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WSTRING &OUT() { + CIEC_WSTRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_BYTE.cpp b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_BYTE.cpp index 7c33af26b..f8f70bc6d 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_BYTE.cpp +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_BYTE.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LINT_TO_BYTE::scm_stFBInterfaceSpec = { void FORTE_F_LINT_TO_BYTE::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LINT_TO_BYTE(IN()); + st_OUT() = LINT_TO_BYTE(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_BYTE.h b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_BYTE.h index d49853a01..a646cb377 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_BYTE.h +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_BYTE.h @@ -22,13 +22,13 @@ class FORTE_F_LINT_TO_BYTE: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LINT &IN() { + CIEC_LINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BYTE &OUT() { + CIEC_BYTE &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_DINT.cpp b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_DINT.cpp index 212ca71ab..d9d1b696b 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_DINT.cpp +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_DINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LINT_TO_DINT::scm_stFBInterfaceSpec = { void FORTE_F_LINT_TO_DINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LINT_TO_DINT(IN()); + st_OUT() = LINT_TO_DINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_DINT.h b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_DINT.h index 6ab973b03..dcafabad9 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_DINT.h +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_DINT.h @@ -22,13 +22,13 @@ class FORTE_F_LINT_TO_DINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LINT &IN() { + CIEC_LINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DINT &OUT() { + CIEC_DINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_DWORD.cpp b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_DWORD.cpp index ea7062d91..027ed1660 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_DWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_DWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LINT_TO_DWORD::scm_stFBInterfaceSpec = { void FORTE_F_LINT_TO_DWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LINT_TO_DWORD(IN()); + st_OUT() = LINT_TO_DWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_DWORD.h b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_DWORD.h index 471fff23f..0cefd8b52 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_DWORD.h +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_DWORD.h @@ -22,13 +22,13 @@ class FORTE_F_LINT_TO_DWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LINT &IN() { + CIEC_LINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DWORD &OUT() { + CIEC_DWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_INT.cpp b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_INT.cpp index dccec0447..d4ba158f5 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_INT.cpp +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_INT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LINT_TO_INT::scm_stFBInterfaceSpec = { void FORTE_F_LINT_TO_INT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LINT_TO_INT(IN()); + st_OUT() = LINT_TO_INT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_INT.h b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_INT.h index fd77ce1fe..0718dff5d 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_INT.h +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_INT.h @@ -22,13 +22,13 @@ class FORTE_F_LINT_TO_INT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LINT &IN() { + CIEC_LINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_INT &OUT() { + CIEC_INT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_LREAL.cpp b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_LREAL.cpp index 480161441..80324eb83 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_LREAL.cpp +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_LREAL.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LINT_TO_LREAL::scm_stFBInterfaceSpec = { void FORTE_F_LINT_TO_LREAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LINT_TO_LREAL(IN()); + st_OUT() = LINT_TO_LREAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_LREAL.h b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_LREAL.h index 745800ec4..753bf47c5 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_LREAL.h +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_LREAL.h @@ -22,13 +22,13 @@ class FORTE_F_LINT_TO_LREAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LINT &IN() { + CIEC_LINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LREAL &OUT() { + CIEC_LREAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_LWORD.cpp b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_LWORD.cpp index b55db8004..7c4664ce2 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_LWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_LWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LINT_TO_LWORD::scm_stFBInterfaceSpec = { void FORTE_F_LINT_TO_LWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LINT_TO_LWORD(IN()); + st_OUT() = LINT_TO_LWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_LWORD.h b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_LWORD.h index 238b761d1..bfcf02a29 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_LWORD.h +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_LWORD.h @@ -22,13 +22,13 @@ class FORTE_F_LINT_TO_LWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LINT &IN() { + CIEC_LINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LWORD &OUT() { + CIEC_LWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_REAL.cpp b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_REAL.cpp index ed9425d28..6d06e262e 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_REAL.cpp +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_REAL.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LINT_TO_REAL::scm_stFBInterfaceSpec = { void FORTE_F_LINT_TO_REAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LINT_TO_REAL(IN()); + st_OUT() = LINT_TO_REAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_REAL.h b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_REAL.h index 2394919a5..fce3966f8 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_REAL.h +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_REAL.h @@ -22,13 +22,13 @@ class FORTE_F_LINT_TO_REAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LINT &IN() { + CIEC_LINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_REAL &OUT() { + CIEC_REAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_SINT.cpp b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_SINT.cpp index 5b10b436e..0b48f6e90 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_SINT.cpp +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_SINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LINT_TO_SINT::scm_stFBInterfaceSpec = { void FORTE_F_LINT_TO_SINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LINT_TO_SINT(IN()); + st_OUT() = LINT_TO_SINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_SINT.h b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_SINT.h index a05cc3b20..768f439a5 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_SINT.h +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_SINT.h @@ -22,13 +22,13 @@ class FORTE_F_LINT_TO_SINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LINT &IN() { + CIEC_LINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_SINT &OUT() { + CIEC_SINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_STRING.cpp b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_STRING.cpp index 84d7092fc..03cd271d0 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_STRING.cpp +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_STRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LINT_TO_STRING::scm_stFBInterfaceSpec = { void FORTE_F_LINT_TO_STRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LINT_TO_STRING(IN()); + st_OUT() = LINT_TO_STRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_STRING.h b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_STRING.h index ffa432020..4d442defa 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_STRING.h +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_STRING.h @@ -22,13 +22,13 @@ class FORTE_F_LINT_TO_STRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LINT &IN() { + CIEC_LINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_STRING &OUT() { + CIEC_STRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_UDINT.cpp b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_UDINT.cpp index 953f801bd..ca0b1f839 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_UDINT.cpp +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_UDINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LINT_TO_UDINT::scm_stFBInterfaceSpec = { void FORTE_F_LINT_TO_UDINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LINT_TO_UDINT(IN()); + st_OUT() = LINT_TO_UDINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_UDINT.h b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_UDINT.h index a9082b876..d424f3533 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_UDINT.h +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_UDINT.h @@ -22,13 +22,13 @@ class FORTE_F_LINT_TO_UDINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LINT &IN() { + CIEC_LINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UDINT &OUT() { + CIEC_UDINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_UINT.cpp b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_UINT.cpp index 9bae4f2de..c2bad5dd9 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_UINT.cpp +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_UINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LINT_TO_UINT::scm_stFBInterfaceSpec = { void FORTE_F_LINT_TO_UINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LINT_TO_UINT(IN()); + st_OUT() = LINT_TO_UINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_UINT.h b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_UINT.h index 6bba13013..140375700 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_UINT.h +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_UINT.h @@ -22,13 +22,13 @@ class FORTE_F_LINT_TO_UINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LINT &IN() { + CIEC_LINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UINT &OUT() { + CIEC_UINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_ULINT.cpp b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_ULINT.cpp index 8c6135643..654937bf6 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_ULINT.cpp +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_ULINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LINT_TO_ULINT::scm_stFBInterfaceSpec = { void FORTE_F_LINT_TO_ULINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LINT_TO_ULINT(IN()); + st_OUT() = LINT_TO_ULINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_ULINT.h b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_ULINT.h index 9bccb6616..d577b37e2 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_ULINT.h +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_ULINT.h @@ -22,13 +22,13 @@ class FORTE_F_LINT_TO_ULINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LINT &IN() { + CIEC_LINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ULINT &OUT() { + CIEC_ULINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_USINT.cpp b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_USINT.cpp index bc8949fed..2b1125161 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_USINT.cpp +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_USINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LINT_TO_USINT::scm_stFBInterfaceSpec = { void FORTE_F_LINT_TO_USINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LINT_TO_USINT(IN()); + st_OUT() = LINT_TO_USINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_USINT.h b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_USINT.h index 5ad6c61f2..150f24cce 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_USINT.h +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_USINT.h @@ -22,13 +22,13 @@ class FORTE_F_LINT_TO_USINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LINT &IN() { + CIEC_LINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_USINT &OUT() { + CIEC_USINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_WORD.cpp b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_WORD.cpp index a8d90294d..122bfd31c 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_WORD.cpp +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_WORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LINT_TO_WORD::scm_stFBInterfaceSpec = { void FORTE_F_LINT_TO_WORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LINT_TO_WORD(IN()); + st_OUT() = LINT_TO_WORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_WORD.h b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_WORD.h index 387f90aa2..e5045750a 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_WORD.h +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_WORD.h @@ -22,13 +22,13 @@ class FORTE_F_LINT_TO_WORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LINT &IN() { + CIEC_LINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WORD &OUT() { + CIEC_WORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_WSTRING.cpp b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_WSTRING.cpp index f35735f22..607a67636 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_WSTRING.cpp +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_WSTRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LINT_TO_WSTRING::scm_stFBInterfaceSpec = { void FORTE_F_LINT_TO_WSTRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LINT_TO_WSTRING(IN()); + st_OUT() = LINT_TO_WSTRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_WSTRING.h b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_WSTRING.h index 671694d13..31bc61251 100644 --- a/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_WSTRING.h +++ b/src/modules/IEC61131-3/Conversion/LINT/F_LINT_TO_WSTRING.h @@ -22,13 +22,13 @@ class FORTE_F_LINT_TO_WSTRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LINT &IN() { + CIEC_LINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WSTRING &OUT() { + CIEC_WSTRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_DINT.cpp b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_DINT.cpp index 0b9129042..284af89fa 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_DINT.cpp +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_DINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LREAL_TO_DINT::scm_stFBInterfaceSpec = { void FORTE_F_LREAL_TO_DINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LREAL_TO_DINT(IN()); + st_OUT() = LREAL_TO_DINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_DINT.h b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_DINT.h index e7eb1e657..be51bf2b8 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_DINT.h +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_DINT.h @@ -22,13 +22,13 @@ class FORTE_F_LREAL_TO_DINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LREAL &IN() { + CIEC_LREAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DINT &OUT() { + CIEC_DINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_INT.cpp b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_INT.cpp index 16f3bae6f..b82590871 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_INT.cpp +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_INT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LREAL_TO_INT::scm_stFBInterfaceSpec = { void FORTE_F_LREAL_TO_INT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LREAL_TO_INT(IN()); + st_OUT() = LREAL_TO_INT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_INT.h b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_INT.h index 382903247..6b9d8261a 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_INT.h +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_INT.h @@ -22,13 +22,13 @@ class FORTE_F_LREAL_TO_INT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LREAL &IN() { + CIEC_LREAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_INT &OUT() { + CIEC_INT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_LINT.cpp b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_LINT.cpp index c902e4fc0..d75c9fced 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_LINT.cpp +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_LINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LREAL_TO_LINT::scm_stFBInterfaceSpec = { void FORTE_F_LREAL_TO_LINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LREAL_TO_LINT(IN()); + st_OUT() = LREAL_TO_LINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_LINT.h b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_LINT.h index 2e84b78ac..d7cb54a32 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_LINT.h +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_LINT.h @@ -22,13 +22,13 @@ class FORTE_F_LREAL_TO_LINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LREAL &IN() { + CIEC_LREAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LINT &OUT() { + CIEC_LINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_LWORD.cpp b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_LWORD.cpp index a000df974..2d053857b 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_LWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_LWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LREAL_TO_LWORD::scm_stFBInterfaceSpec = { void FORTE_F_LREAL_TO_LWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LREAL_TO_LWORD(IN()); + st_OUT() = LREAL_TO_LWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_LWORD.h b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_LWORD.h index a2deede4b..c877c3c31 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_LWORD.h +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_LWORD.h @@ -22,13 +22,13 @@ class FORTE_F_LREAL_TO_LWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LREAL &IN() { + CIEC_LREAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LWORD &OUT() { + CIEC_LWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_REAL.cpp b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_REAL.cpp index cec93f800..29de56b02 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_REAL.cpp +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_REAL.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LREAL_TO_REAL::scm_stFBInterfaceSpec = { void FORTE_F_LREAL_TO_REAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LREAL_TO_REAL(IN()); + st_OUT() = LREAL_TO_REAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_REAL.h b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_REAL.h index 1d3701bad..989ba40e3 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_REAL.h +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_REAL.h @@ -22,13 +22,13 @@ class FORTE_F_LREAL_TO_REAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LREAL &IN() { + CIEC_LREAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_REAL &OUT() { + CIEC_REAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_SINT.cpp b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_SINT.cpp index 900bd2e30..dd12c9854 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_SINT.cpp +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_SINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LREAL_TO_SINT::scm_stFBInterfaceSpec = { void FORTE_F_LREAL_TO_SINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LREAL_TO_SINT(IN()); + st_OUT() = LREAL_TO_SINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_SINT.h b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_SINT.h index 209080536..fd693560d 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_SINT.h +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_SINT.h @@ -22,13 +22,13 @@ class FORTE_F_LREAL_TO_SINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LREAL &IN() { + CIEC_LREAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_SINT &OUT() { + CIEC_SINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_STRING.cpp b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_STRING.cpp index 1638b9c9c..56226320d 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_STRING.cpp +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_STRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LREAL_TO_STRING::scm_stFBInterfaceSpec = { void FORTE_F_LREAL_TO_STRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LREAL_TO_STRING(IN()); + st_OUT() = LREAL_TO_STRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_STRING.h b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_STRING.h index afe6d4838..9b08e1620 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_STRING.h +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_STRING.h @@ -22,13 +22,13 @@ class FORTE_F_LREAL_TO_STRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LREAL &IN() { + CIEC_LREAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_STRING &OUT() { + CIEC_STRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_UDINT.cpp b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_UDINT.cpp index eb9da2233..df39f3063 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_UDINT.cpp +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_UDINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LREAL_TO_UDINT::scm_stFBInterfaceSpec = { void FORTE_F_LREAL_TO_UDINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LREAL_TO_UDINT(IN()); + st_OUT() = LREAL_TO_UDINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_UDINT.h b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_UDINT.h index 584ed918f..28e6bfd6b 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_UDINT.h +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_UDINT.h @@ -22,13 +22,13 @@ class FORTE_F_LREAL_TO_UDINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LREAL &IN() { + CIEC_LREAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UDINT &OUT() { + CIEC_UDINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_UINT.cpp b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_UINT.cpp index 969258097..884f18f15 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_UINT.cpp +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_UINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_LREAL_TO_UINT::scm_stFBInterfaceSpec = { void FORTE_F_LREAL_TO_UINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LREAL_TO_UINT(IN()); + st_OUT() = LREAL_TO_UINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_UINT.h b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_UINT.h index a9b825a6c..3b868cbf2 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_UINT.h +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_UINT.h @@ -21,13 +21,13 @@ class FORTE_F_LREAL_TO_UINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LREAL &IN() { + CIEC_LREAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UINT &OUT() { + CIEC_UINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_ULINT.cpp b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_ULINT.cpp index 85b770c1b..96ef8ff70 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_ULINT.cpp +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_ULINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LREAL_TO_ULINT::scm_stFBInterfaceSpec = { void FORTE_F_LREAL_TO_ULINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LREAL_TO_ULINT(IN()); + st_OUT() = LREAL_TO_ULINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_ULINT.h b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_ULINT.h index 40814b8ff..0fe44aa36 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_ULINT.h +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_ULINT.h @@ -22,13 +22,13 @@ class FORTE_F_LREAL_TO_ULINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LREAL &IN() { + CIEC_LREAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ULINT &OUT() { + CIEC_ULINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_USINT.cpp b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_USINT.cpp index c96ae4b06..17c7844cc 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_USINT.cpp +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_USINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LREAL_TO_USINT::scm_stFBInterfaceSpec = { void FORTE_F_LREAL_TO_USINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LREAL_TO_USINT(IN()); + st_OUT() = LREAL_TO_USINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_USINT.h b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_USINT.h index ca2f645f2..890e6e899 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_USINT.h +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_USINT.h @@ -22,13 +22,13 @@ class FORTE_F_LREAL_TO_USINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LREAL &IN() { + CIEC_LREAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_USINT &OUT() { + CIEC_USINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_WSTRING.cpp b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_WSTRING.cpp index f460ce2af..8cc71f2dc 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_WSTRING.cpp +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_WSTRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LREAL_TO_WSTRING::scm_stFBInterfaceSpec = { void FORTE_F_LREAL_TO_WSTRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LREAL_TO_WSTRING(IN()); + st_OUT() = LREAL_TO_WSTRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_WSTRING.h b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_WSTRING.h index 5da056fd7..aaa7f4d49 100644 --- a/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_WSTRING.h +++ b/src/modules/IEC61131-3/Conversion/LREAL/F_LREAL_TO_WSTRING.h @@ -22,13 +22,13 @@ class FORTE_F_LREAL_TO_WSTRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LREAL &IN() { + CIEC_LREAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WSTRING &OUT() { + CIEC_WSTRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_BYTE.cpp b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_BYTE.cpp index cb6a37471..18a7cd3ba 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_BYTE.cpp +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_BYTE.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LWORD_TO_BYTE::scm_stFBInterfaceSpec = { void FORTE_F_LWORD_TO_BYTE::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LWORD_TO_BYTE(IN()); + st_OUT() = LWORD_TO_BYTE(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_BYTE.h b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_BYTE.h index a2b0c6ce2..87074762e 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_BYTE.h +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_BYTE.h @@ -22,13 +22,13 @@ class FORTE_F_LWORD_TO_BYTE: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LWORD &IN() { + CIEC_LWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BYTE &OUT() { + CIEC_BYTE &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_DINT.cpp b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_DINT.cpp index 5be3ecbb3..3c549cd76 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_DINT.cpp +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_DINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LWORD_TO_DINT::scm_stFBInterfaceSpec = { void FORTE_F_LWORD_TO_DINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LWORD_TO_DINT(IN()); + st_OUT() = LWORD_TO_DINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_DINT.h b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_DINT.h index 9c34ed44a..43e058e41 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_DINT.h +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_DINT.h @@ -22,13 +22,13 @@ class FORTE_F_LWORD_TO_DINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LWORD &IN() { + CIEC_LWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DINT &OUT() { + CIEC_DINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_DWORD.cpp b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_DWORD.cpp index 059d4b91b..01137dcb9 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_DWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_DWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LWORD_TO_DWORD::scm_stFBInterfaceSpec = { void FORTE_F_LWORD_TO_DWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LWORD_TO_DWORD(IN()); + st_OUT() = LWORD_TO_DWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_DWORD.h b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_DWORD.h index a905d431c..7cc6d0082 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_DWORD.h +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_DWORD.h @@ -22,13 +22,13 @@ class FORTE_F_LWORD_TO_DWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LWORD &IN() { + CIEC_LWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DWORD &OUT() { + CIEC_DWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_INT.cpp b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_INT.cpp index d9980a043..cdf8bfecd 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_INT.cpp +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_INT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LWORD_TO_INT::scm_stFBInterfaceSpec = { void FORTE_F_LWORD_TO_INT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LWORD_TO_INT(IN()); + st_OUT() = LWORD_TO_INT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_INT.h b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_INT.h index 4e9f54b04..b99e0a3bb 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_INT.h +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_INT.h @@ -22,13 +22,13 @@ class FORTE_F_LWORD_TO_INT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LWORD &IN() { + CIEC_LWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_INT &OUT() { + CIEC_INT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_LINT.cpp b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_LINT.cpp index b990650b8..f6c556057 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_LINT.cpp +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_LINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LWORD_TO_LINT::scm_stFBInterfaceSpec = { void FORTE_F_LWORD_TO_LINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LWORD_TO_LINT(IN()); + st_OUT() = LWORD_TO_LINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_LINT.h b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_LINT.h index 2aebf5c8c..ffa729b3c 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_LINT.h +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_LINT.h @@ -22,13 +22,13 @@ class FORTE_F_LWORD_TO_LINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LWORD &IN() { + CIEC_LWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LINT &OUT() { + CIEC_LINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_LREAL.cpp b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_LREAL.cpp index b72840a5b..3661f315f 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_LREAL.cpp +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_LREAL.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LWORD_TO_LREAL::scm_stFBInterfaceSpec = { void FORTE_F_LWORD_TO_LREAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LWORD_TO_LREAL(IN()); + st_OUT() = LWORD_TO_LREAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_LREAL.h b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_LREAL.h index 43bbf8b34..962d80f87 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_LREAL.h +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_LREAL.h @@ -22,13 +22,13 @@ class FORTE_F_LWORD_TO_LREAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LWORD &IN() { + CIEC_LWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LREAL &OUT() { + CIEC_LREAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_SINT.cpp b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_SINT.cpp index 534a54028..6ee56361c 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_SINT.cpp +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_SINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LWORD_TO_SINT::scm_stFBInterfaceSpec = { void FORTE_F_LWORD_TO_SINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LWORD_TO_SINT(IN()); + st_OUT() = LWORD_TO_SINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_SINT.h b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_SINT.h index 2982cf35e..ac86dcf24 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_SINT.h +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_SINT.h @@ -22,13 +22,13 @@ class FORTE_F_LWORD_TO_SINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LWORD &IN() { + CIEC_LWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_SINT &OUT() { + CIEC_SINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_STRING.cpp b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_STRING.cpp index e8779f7b8..0dd000c3e 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_STRING.cpp +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_STRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LWORD_TO_STRING::scm_stFBInterfaceSpec = { void FORTE_F_LWORD_TO_STRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LWORD_TO_STRING(IN()); + st_OUT() = LWORD_TO_STRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_STRING.h b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_STRING.h index 810e4c1fa..4bd648e69 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_STRING.h +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_STRING.h @@ -22,13 +22,13 @@ class FORTE_F_LWORD_TO_STRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LWORD &IN() { + CIEC_LWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_STRING &OUT() { + CIEC_STRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_UDINT.cpp b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_UDINT.cpp index 030739b32..1c6f8b68c 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_UDINT.cpp +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_UDINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LWORD_TO_UDINT::scm_stFBInterfaceSpec = { void FORTE_F_LWORD_TO_UDINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LWORD_TO_UDINT(IN()); + st_OUT() = LWORD_TO_UDINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_UDINT.h b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_UDINT.h index 43478b959..58a9e9469 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_UDINT.h +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_UDINT.h @@ -22,13 +22,13 @@ class FORTE_F_LWORD_TO_UDINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LWORD &IN() { + CIEC_LWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UDINT &OUT() { + CIEC_UDINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_UINT.cpp b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_UINT.cpp index 41e139fee..fb9323178 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_UINT.cpp +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_UINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LWORD_TO_UINT::scm_stFBInterfaceSpec = { void FORTE_F_LWORD_TO_UINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LWORD_TO_UINT(IN()); + st_OUT() = LWORD_TO_UINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_UINT.h b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_UINT.h index 7ee8ea922..aeb091ea9 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_UINT.h +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_UINT.h @@ -22,13 +22,13 @@ class FORTE_F_LWORD_TO_UINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LWORD &IN() { + CIEC_LWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UINT &OUT() { + CIEC_UINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_ULINT.cpp b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_ULINT.cpp index 552e4eac1..e22426440 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_ULINT.cpp +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_ULINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LWORD_TO_ULINT::scm_stFBInterfaceSpec = { void FORTE_F_LWORD_TO_ULINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LWORD_TO_ULINT(IN()); + st_OUT() = LWORD_TO_ULINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_ULINT.h b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_ULINT.h index 24d8ba572..f229ee68a 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_ULINT.h +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_ULINT.h @@ -22,13 +22,13 @@ class FORTE_F_LWORD_TO_ULINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LWORD &IN() { + CIEC_LWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ULINT &OUT() { + CIEC_ULINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_USINT.cpp b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_USINT.cpp index 90807341a..cd20515f3 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_USINT.cpp +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_USINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LWORD_TO_USINT::scm_stFBInterfaceSpec = { void FORTE_F_LWORD_TO_USINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LWORD_TO_USINT(IN()); + st_OUT() = LWORD_TO_USINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_USINT.h b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_USINT.h index 1ec70a907..a216f42db 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_USINT.h +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_USINT.h @@ -22,13 +22,13 @@ class FORTE_F_LWORD_TO_USINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LWORD &IN() { + CIEC_LWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_USINT &OUT() { + CIEC_USINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_WORD.cpp b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_WORD.cpp index 2c30c3cb6..550037169 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_WORD.cpp +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_WORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LWORD_TO_WORD::scm_stFBInterfaceSpec = { void FORTE_F_LWORD_TO_WORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LWORD_TO_WORD(IN()); + st_OUT() = LWORD_TO_WORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_WORD.h b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_WORD.h index 201543f53..1592c500c 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_WORD.h +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_WORD.h @@ -22,13 +22,13 @@ class FORTE_F_LWORD_TO_WORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LWORD &IN() { + CIEC_LWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WORD &OUT() { + CIEC_WORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_WSTRING.cpp b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_WSTRING.cpp index 15c8693df..df5776db6 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_WSTRING.cpp +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_WSTRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_LWORD_TO_WSTRING::scm_stFBInterfaceSpec = { void FORTE_F_LWORD_TO_WSTRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = LWORD_TO_WSTRING(IN()); + st_OUT() = LWORD_TO_WSTRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_WSTRING.h b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_WSTRING.h index 1bfcf06d8..dcee8976f 100644 --- a/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_WSTRING.h +++ b/src/modules/IEC61131-3/Conversion/LWORD/F_LWORD_TO_WSTRING.h @@ -22,13 +22,13 @@ class FORTE_F_LWORD_TO_WSTRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_LWORD &IN() { + CIEC_LWORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WSTRING &OUT() { + CIEC_WSTRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_DINT.cpp b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_DINT.cpp index f17b26fad..323e89fc7 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_DINT.cpp +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_DINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_REAL_TO_DINT::scm_stFBInterfaceSpec = { void FORTE_F_REAL_TO_DINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = REAL_TO_DINT(IN()); + st_OUT() = REAL_TO_DINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_DINT.h b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_DINT.h index 584726cee..6e5ff431a 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_DINT.h +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_DINT.h @@ -21,13 +21,13 @@ class FORTE_F_REAL_TO_DINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_REAL &IN() { + CIEC_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DINT &OUT() { + CIEC_DINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_DWORD.cpp b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_DWORD.cpp index 17bcbda65..9d8866c14 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_DWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_DWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_REAL_TO_DWORD::scm_stFBInterfaceSpec = { void FORTE_F_REAL_TO_DWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = REAL_TO_DWORD(IN()); + st_OUT() = REAL_TO_DWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_DWORD.h b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_DWORD.h index 92ba3bbf8..d742c0405 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_DWORD.h +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_DWORD.h @@ -22,13 +22,13 @@ class FORTE_F_REAL_TO_DWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_REAL &IN() { + CIEC_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DWORD &OUT() { + CIEC_DWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_INT.cpp b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_INT.cpp index 8a83de55f..e83922f40 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_INT.cpp +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_INT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_REAL_TO_INT::scm_stFBInterfaceSpec = { void FORTE_F_REAL_TO_INT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = REAL_TO_INT(IN()); + st_OUT() = REAL_TO_INT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_INT.h b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_INT.h index 8b50e0a98..605ee4958 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_INT.h +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_INT.h @@ -21,13 +21,13 @@ class FORTE_F_REAL_TO_INT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_REAL &IN() { + CIEC_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_INT &OUT() { + CIEC_INT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_LINT.cpp b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_LINT.cpp index adcc2dddc..1811abde1 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_LINT.cpp +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_LINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_REAL_TO_LINT::scm_stFBInterfaceSpec = { void FORTE_F_REAL_TO_LINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = REAL_TO_LINT(IN()); + st_OUT() = REAL_TO_LINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_LINT.h b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_LINT.h index baffa63b8..b35fc1508 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_LINT.h +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_LINT.h @@ -22,13 +22,13 @@ class FORTE_F_REAL_TO_LINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_REAL &IN() { + CIEC_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LINT &OUT() { + CIEC_LINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_LREAL.cpp b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_LREAL.cpp index 0af414b79..72e98045d 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_LREAL.cpp +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_LREAL.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_REAL_TO_LREAL::scm_stFBInterfaceSpec = { void FORTE_F_REAL_TO_LREAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = REAL_TO_LREAL(IN()); + st_OUT() = REAL_TO_LREAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_LREAL.h b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_LREAL.h index 257981f53..28a1749e4 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_LREAL.h +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_LREAL.h @@ -22,13 +22,13 @@ class FORTE_F_REAL_TO_LREAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_REAL &IN() { + CIEC_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LREAL &OUT() { + CIEC_LREAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_SINT.cpp b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_SINT.cpp index ad9ad2722..ada9915b6 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_SINT.cpp +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_SINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_REAL_TO_SINT::scm_stFBInterfaceSpec = { void FORTE_F_REAL_TO_SINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = REAL_TO_SINT(IN()); + st_OUT() = REAL_TO_SINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_SINT.h b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_SINT.h index f269b58ec..8209693ab 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_SINT.h +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_SINT.h @@ -22,13 +22,13 @@ class FORTE_F_REAL_TO_SINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_REAL &IN() { + CIEC_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_SINT &OUT() { + CIEC_SINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_STRING.cpp b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_STRING.cpp index 3c53ab024..d1d304b5b 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_STRING.cpp +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_STRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_REAL_TO_STRING::scm_stFBInterfaceSpec = { void FORTE_F_REAL_TO_STRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = REAL_TO_STRING(IN()); + st_OUT() = REAL_TO_STRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_STRING.h b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_STRING.h index 7ce018ac3..ec2cb3648 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_STRING.h +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_STRING.h @@ -22,13 +22,13 @@ class FORTE_F_REAL_TO_STRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_REAL &IN() { + CIEC_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_STRING &OUT() { + CIEC_STRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_UDINT.cpp b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_UDINT.cpp index 3fcb84dc5..897c04de8 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_UDINT.cpp +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_UDINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_REAL_TO_UDINT::scm_stFBInterfaceSpec = { void FORTE_F_REAL_TO_UDINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = REAL_TO_UDINT(IN()); + st_OUT() = REAL_TO_UDINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_UDINT.h b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_UDINT.h index 9806e4489..cde67c375 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_UDINT.h +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_UDINT.h @@ -21,13 +21,13 @@ class FORTE_F_REAL_TO_UDINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_REAL &IN() { + CIEC_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UDINT &OUT() { + CIEC_UDINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_UINT.cpp b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_UINT.cpp index a66088d79..86f7141bd 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_UINT.cpp +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_UINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_REAL_TO_UINT::scm_stFBInterfaceSpec = { void FORTE_F_REAL_TO_UINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = REAL_TO_UINT(IN()); + st_OUT() = REAL_TO_UINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_UINT.h b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_UINT.h index 2001dfb13..346d9c615 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_UINT.h +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_UINT.h @@ -21,13 +21,13 @@ class FORTE_F_REAL_TO_UINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_REAL &IN() { + CIEC_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UINT &OUT() { + CIEC_UINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_ULINT.cpp b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_ULINT.cpp index 039f45855..7f8f9c6d6 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_ULINT.cpp +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_ULINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_REAL_TO_ULINT::scm_stFBInterfaceSpec = { void FORTE_F_REAL_TO_ULINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = REAL_TO_ULINT(IN()); + st_OUT() = REAL_TO_ULINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_ULINT.h b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_ULINT.h index 6ee296a07..98e359155 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_ULINT.h +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_ULINT.h @@ -22,13 +22,13 @@ class FORTE_F_REAL_TO_ULINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_REAL &IN() { + CIEC_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ULINT &OUT() { + CIEC_ULINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_USINT.cpp b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_USINT.cpp index 31ad2fb12..f5de0a3f6 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_USINT.cpp +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_USINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_REAL_TO_USINT::scm_stFBInterfaceSpec = { void FORTE_F_REAL_TO_USINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = REAL_TO_USINT(IN()); + st_OUT() = REAL_TO_USINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_USINT.h b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_USINT.h index 829c047ea..753b38f79 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_USINT.h +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_USINT.h @@ -22,13 +22,13 @@ class FORTE_F_REAL_TO_USINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_REAL &IN() { + CIEC_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_USINT &OUT() { + CIEC_USINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_WSTRING.cpp b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_WSTRING.cpp index 50bc20dda..59f0ffcd9 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_WSTRING.cpp +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_WSTRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_REAL_TO_WSTRING::scm_stFBInterfaceSpec = { void FORTE_F_REAL_TO_WSTRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = REAL_TO_WSTRING(IN()); + st_OUT() = REAL_TO_WSTRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_WSTRING.h b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_WSTRING.h index 31d6ca422..adfb66745 100644 --- a/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_WSTRING.h +++ b/src/modules/IEC61131-3/Conversion/REAL/F_REAL_TO_WSTRING.h @@ -22,13 +22,13 @@ class FORTE_F_REAL_TO_WSTRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_REAL &IN() { + CIEC_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WSTRING &OUT() { + CIEC_WSTRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_BYTE.cpp b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_BYTE.cpp index 6b9a0456c..84c32e02f 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_BYTE.cpp +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_BYTE.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SINT_TO_BYTE::scm_stFBInterfaceSpec = { void FORTE_F_SINT_TO_BYTE::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = SINT_TO_BYTE(IN()); + st_OUT() = SINT_TO_BYTE(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_BYTE.h b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_BYTE.h index ba83bf7c4..e6174d9a6 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_BYTE.h +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_BYTE.h @@ -22,13 +22,13 @@ class FORTE_F_SINT_TO_BYTE: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_SINT &IN() { + CIEC_SINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BYTE &OUT() { + CIEC_BYTE &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_DINT.cpp b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_DINT.cpp index 5fca3f2d8..b27a5e497 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_DINT.cpp +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_DINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SINT_TO_DINT::scm_stFBInterfaceSpec = { void FORTE_F_SINT_TO_DINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = SINT_TO_DINT(IN()); + st_OUT() = SINT_TO_DINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_DINT.h b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_DINT.h index 9e8801ddb..7c9a22486 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_DINT.h +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_DINT.h @@ -22,13 +22,13 @@ class FORTE_F_SINT_TO_DINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_SINT &IN() { + CIEC_SINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DINT &OUT() { + CIEC_DINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_DWORD.cpp b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_DWORD.cpp index bf6eeb80a..2c661deda 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_DWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_DWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SINT_TO_DWORD::scm_stFBInterfaceSpec = { void FORTE_F_SINT_TO_DWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = SINT_TO_DWORD(IN()); + st_OUT() = SINT_TO_DWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_DWORD.h b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_DWORD.h index 0cedc53fb..fd66a01e8 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_DWORD.h +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_DWORD.h @@ -22,13 +22,13 @@ class FORTE_F_SINT_TO_DWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_SINT &IN() { + CIEC_SINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DWORD &OUT() { + CIEC_DWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_INT.cpp b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_INT.cpp index 25c382b32..417b7fe1f 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_INT.cpp +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_INT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SINT_TO_INT::scm_stFBInterfaceSpec = { void FORTE_F_SINT_TO_INT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = SINT_TO_INT(IN()); + st_OUT() = SINT_TO_INT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_INT.h b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_INT.h index 31dcd2107..6d37c2505 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_INT.h +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_INT.h @@ -22,13 +22,13 @@ class FORTE_F_SINT_TO_INT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_SINT &IN() { + CIEC_SINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_INT &OUT() { + CIEC_INT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LINT.cpp b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LINT.cpp index dd898790b..ee1555ea7 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LINT.cpp +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SINT_TO_LINT::scm_stFBInterfaceSpec = { void FORTE_F_SINT_TO_LINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = SINT_TO_LINT(IN()); + st_OUT() = SINT_TO_LINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LINT.h b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LINT.h index b24e1f714..f8768cfbb 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LINT.h +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LINT.h @@ -22,13 +22,13 @@ class FORTE_F_SINT_TO_LINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_SINT &IN() { + CIEC_SINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LINT &OUT() { + CIEC_LINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LREAL.cpp b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LREAL.cpp index 7af365e89..14248c0e1 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LREAL.cpp +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LREAL.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SINT_TO_LREAL::scm_stFBInterfaceSpec = { void FORTE_F_SINT_TO_LREAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = SINT_TO_LREAL(IN()); + st_OUT() = SINT_TO_LREAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LREAL.h b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LREAL.h index 12bc057f5..f92629b78 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LREAL.h +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LREAL.h @@ -22,13 +22,13 @@ class FORTE_F_SINT_TO_LREAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_SINT &IN() { + CIEC_SINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LREAL &OUT() { + CIEC_LREAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LWORD.cpp b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LWORD.cpp index 78cbab09d..6c5483b27 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SINT_TO_LWORD::scm_stFBInterfaceSpec = { void FORTE_F_SINT_TO_LWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = SINT_TO_LWORD(IN()); + st_OUT() = SINT_TO_LWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LWORD.h b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LWORD.h index 6be8a32e4..4633a03c3 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LWORD.h +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_LWORD.h @@ -22,13 +22,13 @@ class FORTE_F_SINT_TO_LWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_SINT &IN() { + CIEC_SINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LWORD &OUT() { + CIEC_LWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_REAL.cpp b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_REAL.cpp index 01a24d2f0..8b8e38a35 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_REAL.cpp +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_REAL.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SINT_TO_REAL::scm_stFBInterfaceSpec = { void FORTE_F_SINT_TO_REAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = SINT_TO_REAL(IN()); + st_OUT() = SINT_TO_REAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_REAL.h b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_REAL.h index 7745aaa60..b919ba26c 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_REAL.h +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_REAL.h @@ -22,13 +22,13 @@ class FORTE_F_SINT_TO_REAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_SINT &IN() { + CIEC_SINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_REAL &OUT() { + CIEC_REAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_STRING.cpp b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_STRING.cpp index 900abbcc5..c9c75e155 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_STRING.cpp +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_STRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SINT_TO_STRING::scm_stFBInterfaceSpec = { void FORTE_F_SINT_TO_STRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = SINT_TO_STRING(IN()); + st_OUT() = SINT_TO_STRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_STRING.h b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_STRING.h index abe70cb3f..2f24dfd6b 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_STRING.h +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_STRING.h @@ -22,13 +22,13 @@ class FORTE_F_SINT_TO_STRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_SINT &IN() { + CIEC_SINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_STRING &OUT() { + CIEC_STRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_UDINT.cpp b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_UDINT.cpp index 548599ed0..aa220ee61 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_UDINT.cpp +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_UDINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SINT_TO_UDINT::scm_stFBInterfaceSpec = { void FORTE_F_SINT_TO_UDINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = SINT_TO_UDINT(IN()); + st_OUT() = SINT_TO_UDINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_UDINT.h b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_UDINT.h index 70949e3eb..bf220df25 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_UDINT.h +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_UDINT.h @@ -22,13 +22,13 @@ class FORTE_F_SINT_TO_UDINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_SINT &IN() { + CIEC_SINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UDINT &OUT() { + CIEC_UDINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_UINT.cpp b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_UINT.cpp index 0ec1feafa..4e8b6d270 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_UINT.cpp +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_UINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SINT_TO_UINT::scm_stFBInterfaceSpec = { void FORTE_F_SINT_TO_UINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = SINT_TO_UINT(IN()); + st_OUT() = SINT_TO_UINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_UINT.h b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_UINT.h index 11a95dc43..2b55b10c0 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_UINT.h +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_UINT.h @@ -22,13 +22,13 @@ class FORTE_F_SINT_TO_UINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_SINT &IN() { + CIEC_SINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UINT &OUT() { + CIEC_UINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_ULINT.cpp b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_ULINT.cpp index ae0d6e0cb..bbd0d8678 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_ULINT.cpp +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_ULINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SINT_TO_ULINT::scm_stFBInterfaceSpec = { void FORTE_F_SINT_TO_ULINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = SINT_TO_ULINT(IN()); + st_OUT() = SINT_TO_ULINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_ULINT.h b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_ULINT.h index a08b4cf1c..774ed9ceb 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_ULINT.h +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_ULINT.h @@ -22,13 +22,13 @@ class FORTE_F_SINT_TO_ULINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_SINT &IN() { + CIEC_SINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ULINT &OUT() { + CIEC_ULINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_USINT.cpp b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_USINT.cpp index a99592e18..a8731f155 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_USINT.cpp +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_USINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SINT_TO_USINT::scm_stFBInterfaceSpec = { void FORTE_F_SINT_TO_USINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = SINT_TO_USINT(IN()); + st_OUT() = SINT_TO_USINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_USINT.h b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_USINT.h index 983bbc47f..56f9c247b 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_USINT.h +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_USINT.h @@ -22,13 +22,13 @@ class FORTE_F_SINT_TO_USINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_SINT &IN() { + CIEC_SINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_USINT &OUT() { + CIEC_USINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_WORD.cpp b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_WORD.cpp index 1467b5db7..308001721 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_WORD.cpp +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_WORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SINT_TO_WORD::scm_stFBInterfaceSpec = { void FORTE_F_SINT_TO_WORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = SINT_TO_WORD(IN()); + st_OUT() = SINT_TO_WORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_WORD.h b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_WORD.h index 951331430..7481be7e0 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_WORD.h +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_WORD.h @@ -22,13 +22,13 @@ class FORTE_F_SINT_TO_WORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_SINT &IN() { + CIEC_SINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WORD &OUT() { + CIEC_WORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_WSTRING.cpp b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_WSTRING.cpp index 0a5978cfb..02f4bb0cc 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_WSTRING.cpp +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_WSTRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_SINT_TO_WSTRING::scm_stFBInterfaceSpec = { void FORTE_F_SINT_TO_WSTRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = SINT_TO_WSTRING(IN()); + st_OUT() = SINT_TO_WSTRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_WSTRING.h b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_WSTRING.h index a3ec99a78..f41796074 100644 --- a/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_WSTRING.h +++ b/src/modules/IEC61131-3/Conversion/SINT/F_SINT_TO_WSTRING.h @@ -22,13 +22,13 @@ class FORTE_F_SINT_TO_WSTRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_SINT &IN() { + CIEC_SINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WSTRING &OUT() { + CIEC_WSTRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_BOOL.cpp b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_BOOL.cpp index 35c4ac4d8..1bc33805f 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_BOOL.cpp +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_BOOL.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_STRING_TO_BOOL::scm_stFBInterfaceSpec = { void FORTE_F_STRING_TO_BOOL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = STRING_TO_BOOL(IN()); + st_OUT() = STRING_TO_BOOL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_BOOL.h b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_BOOL.h index bc094a10d..e8d4fad5a 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_BOOL.h +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_BOOL.h @@ -22,13 +22,13 @@ class FORTE_F_STRING_TO_BOOL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_STRING &IN() { + CIEC_STRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BOOL &OUT() { + CIEC_BOOL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_BYTE.cpp b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_BYTE.cpp index 9175cc53a..f355899a4 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_BYTE.cpp +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_BYTE.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_STRING_TO_BYTE::scm_stFBInterfaceSpec = { void FORTE_F_STRING_TO_BYTE::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = STRING_TO_BYTE(IN()); + st_OUT() = STRING_TO_BYTE(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_BYTE.h b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_BYTE.h index 5204547f5..60c0c027d 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_BYTE.h +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_BYTE.h @@ -22,13 +22,13 @@ class FORTE_F_STRING_TO_BYTE: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_STRING &IN() { + CIEC_STRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BYTE &OUT() { + CIEC_BYTE &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_DINT.cpp b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_DINT.cpp index 88883ba41..198816293 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_DINT.cpp +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_DINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_STRING_TO_DINT::scm_stFBInterfaceSpec = { void FORTE_F_STRING_TO_DINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = STRING_TO_DINT(IN()); + st_OUT() = STRING_TO_DINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_DINT.h b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_DINT.h index fedeb18b6..51962c959 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_DINT.h +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_DINT.h @@ -22,13 +22,13 @@ class FORTE_F_STRING_TO_DINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_STRING &IN() { + CIEC_STRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DINT &OUT() { + CIEC_DINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_DWORD.cpp b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_DWORD.cpp index d87daf9a2..3ec771d25 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_DWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_DWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_STRING_TO_DWORD::scm_stFBInterfaceSpec = { void FORTE_F_STRING_TO_DWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = STRING_TO_DWORD(IN()); + st_OUT() = STRING_TO_DWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_DWORD.h b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_DWORD.h index 1d590f4dc..c16cc39dc 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_DWORD.h +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_DWORD.h @@ -22,13 +22,13 @@ class FORTE_F_STRING_TO_DWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_STRING &IN() { + CIEC_STRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DWORD &OUT() { + CIEC_DWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_INT.cpp b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_INT.cpp index 9f4b001c9..26b06708d 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_INT.cpp +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_INT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_STRING_TO_INT::scm_stFBInterfaceSpec = { void FORTE_F_STRING_TO_INT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = STRING_TO_INT(IN()); + st_OUT() = STRING_TO_INT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_INT.h b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_INT.h index 7b205131e..b0fe97073 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_INT.h +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_INT.h @@ -22,13 +22,13 @@ class FORTE_F_STRING_TO_INT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_STRING &IN() { + CIEC_STRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_INT &OUT() { + CIEC_INT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LINT.cpp b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LINT.cpp index 68cd1247c..02d0d21a2 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LINT.cpp +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_STRING_TO_LINT::scm_stFBInterfaceSpec = { void FORTE_F_STRING_TO_LINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = STRING_TO_LINT(IN()); + st_OUT() = STRING_TO_LINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LINT.h b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LINT.h index bccb0ea39..13d026419 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LINT.h +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LINT.h @@ -22,13 +22,13 @@ class FORTE_F_STRING_TO_LINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_STRING &IN() { + CIEC_STRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LINT &OUT() { + CIEC_LINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LREAL.cpp b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LREAL.cpp index 9e08ba455..38ae8358a 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LREAL.cpp +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LREAL.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_STRING_TO_LREAL::scm_stFBInterfaceSpec = { void FORTE_F_STRING_TO_LREAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = STRING_TO_LREAL(IN()); + st_OUT() = STRING_TO_LREAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LREAL.h b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LREAL.h index 456a1858c..3cc13586c 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LREAL.h +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LREAL.h @@ -22,13 +22,13 @@ class FORTE_F_STRING_TO_LREAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_STRING &IN() { + CIEC_STRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LREAL &OUT() { + CIEC_LREAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LWORD.cpp b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LWORD.cpp index 570e3f199..e0386991d 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_STRING_TO_LWORD::scm_stFBInterfaceSpec = { void FORTE_F_STRING_TO_LWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = STRING_TO_LWORD(IN()); + st_OUT() = STRING_TO_LWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LWORD.h b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LWORD.h index 3bb75c1f5..d66bbdc3f 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LWORD.h +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_LWORD.h @@ -22,13 +22,13 @@ class FORTE_F_STRING_TO_LWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_STRING &IN() { + CIEC_STRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LWORD &OUT() { + CIEC_LWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_REAL.cpp b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_REAL.cpp index 8321bdb36..95a76f7fd 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_REAL.cpp +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_REAL.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_STRING_TO_REAL::scm_stFBInterfaceSpec = { void FORTE_F_STRING_TO_REAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = STRING_TO_REAL(IN()); + st_OUT() = STRING_TO_REAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_REAL.h b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_REAL.h index 9f36bb873..6936632e8 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_REAL.h +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_REAL.h @@ -22,13 +22,13 @@ class FORTE_F_STRING_TO_REAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_STRING &IN() { + CIEC_STRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_REAL &OUT() { + CIEC_REAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_SINT.cpp b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_SINT.cpp index 6a18eb3d1..4db2add4e 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_SINT.cpp +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_SINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_STRING_TO_SINT::scm_stFBInterfaceSpec = { void FORTE_F_STRING_TO_SINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = STRING_TO_SINT(IN()); + st_OUT() = STRING_TO_SINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_SINT.h b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_SINT.h index db5dc1207..fc8b716bc 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_SINT.h +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_SINT.h @@ -22,13 +22,13 @@ class FORTE_F_STRING_TO_SINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_STRING &IN() { + CIEC_STRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_SINT &OUT() { + CIEC_SINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_TIME.cpp b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_TIME.cpp index e073166fb..b69654131 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_TIME.cpp +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_TIME.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_STRING_TO_TIME::scm_stFBInterfaceSpec = { void FORTE_F_STRING_TO_TIME::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = STRING_TO_TIME(IN()); + st_OUT() = STRING_TO_TIME(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_TIME.h b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_TIME.h index 5c323d603..272398a00 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_TIME.h +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_TIME.h @@ -22,13 +22,13 @@ class FORTE_F_STRING_TO_TIME: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_STRING &IN() { + CIEC_STRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_TIME &OUT() { + CIEC_TIME &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_UDINT.cpp b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_UDINT.cpp index aa195da7a..8214580e3 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_UDINT.cpp +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_UDINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_STRING_TO_UDINT::scm_stFBInterfaceSpec = { void FORTE_F_STRING_TO_UDINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = STRING_TO_UDINT(IN()); + st_OUT() = STRING_TO_UDINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_UDINT.h b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_UDINT.h index 5ab5117e9..fa998b0cd 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_UDINT.h +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_UDINT.h @@ -22,13 +22,13 @@ class FORTE_F_STRING_TO_UDINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_STRING &IN() { + CIEC_STRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UDINT &OUT() { + CIEC_UDINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_UINT.cpp b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_UINT.cpp index 3933e5153..73d55130e 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_UINT.cpp +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_UINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_STRING_TO_UINT::scm_stFBInterfaceSpec = { void FORTE_F_STRING_TO_UINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = STRING_TO_UINT(IN()); + st_OUT() = STRING_TO_UINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_UINT.h b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_UINT.h index 28502c559..1adc5f4f2 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_UINT.h +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_UINT.h @@ -22,13 +22,13 @@ class FORTE_F_STRING_TO_UINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_STRING &IN() { + CIEC_STRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UINT &OUT() { + CIEC_UINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_ULINT.cpp b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_ULINT.cpp index 518526db9..88ec39edf 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_ULINT.cpp +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_ULINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_STRING_TO_ULINT::scm_stFBInterfaceSpec = { void FORTE_F_STRING_TO_ULINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = STRING_TO_ULINT(IN()); + st_OUT() = STRING_TO_ULINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_ULINT.h b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_ULINT.h index fe17baa16..51f476131 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_ULINT.h +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_ULINT.h @@ -22,13 +22,13 @@ class FORTE_F_STRING_TO_ULINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_STRING &IN() { + CIEC_STRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ULINT &OUT() { + CIEC_ULINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_USINT.cpp b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_USINT.cpp index d98525688..582164175 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_USINT.cpp +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_USINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_STRING_TO_USINT::scm_stFBInterfaceSpec = { void FORTE_F_STRING_TO_USINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = STRING_TO_USINT(IN()); + st_OUT() = STRING_TO_USINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_USINT.h b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_USINT.h index e32c410e8..96d6ba616 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_USINT.h +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_USINT.h @@ -22,13 +22,13 @@ class FORTE_F_STRING_TO_USINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_STRING &IN() { + CIEC_STRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_USINT &OUT() { + CIEC_USINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_WORD.cpp b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_WORD.cpp index e41bdd58d..d310649c7 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_WORD.cpp +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_WORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_STRING_TO_WORD::scm_stFBInterfaceSpec = { void FORTE_F_STRING_TO_WORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = STRING_TO_WORD(IN()); + st_OUT() = STRING_TO_WORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_WORD.h b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_WORD.h index 3ee90618c..03a76b348 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_WORD.h +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_WORD.h @@ -22,13 +22,13 @@ class FORTE_F_STRING_TO_WORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_STRING &IN() { + CIEC_STRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WORD &OUT() { + CIEC_WORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_WSTRING.cpp b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_WSTRING.cpp index d1e987949..db72f07b5 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_WSTRING.cpp +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_WSTRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_STRING_TO_WSTRING::scm_stFBInterfaceSpec = { void FORTE_F_STRING_TO_WSTRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = STRING_TO_WSTRING(IN()); + st_OUT() = STRING_TO_WSTRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_WSTRING.h b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_WSTRING.h index 3ada0ee27..9af7d6251 100644 --- a/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_WSTRING.h +++ b/src/modules/IEC61131-3/Conversion/STRING/F_STRING_TO_WSTRING.h @@ -22,13 +22,13 @@ class FORTE_F_STRING_TO_WSTRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_STRING &IN() { + CIEC_STRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WSTRING &OUT() { + CIEC_WSTRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_LINT.cpp b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_LINT.cpp index e1f6aafd5..c0e81115f 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_LINT.cpp +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_LINT.cpp @@ -42,7 +42,7 @@ const SFBInterfaceSpec FORTE_F_TIME_IN_MS_TO_LINT::scm_stFBInterfaceSpec = { }; void FORTE_F_TIME_IN_MS_TO_LINT::alg_REQ(void){ -OUT() = TIME_IN_MS_TO_LINT((IN())); + st_OUT() = TIME_IN_MS_TO_LINT((st_IN())); } diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_LINT.h b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_LINT.h index 428e3d3a4..e3476ea46 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_LINT.h +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_LINT.h @@ -24,13 +24,13 @@ class FORTE_F_TIME_IN_MS_TO_LINT: public CSimpleFB{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_TIME &IN() { + CIEC_TIME &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LINT &OUT() { + CIEC_LINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_LREAL.cpp b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_LREAL.cpp index 9c6027140..1e10f033f 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_LREAL.cpp +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_LREAL.cpp @@ -42,7 +42,7 @@ const SFBInterfaceSpec FORTE_F_TIME_IN_MS_TO_LREAL::scm_stFBInterfaceSpec = { }; void FORTE_F_TIME_IN_MS_TO_LREAL::alg_REQ(void){ -OUT() = TIME_IN_MS_TO_LREAL((IN())); + st_OUT() = TIME_IN_MS_TO_LREAL((st_IN())); } diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_LREAL.h b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_LREAL.h index dd20ce0a5..8e27d9b21 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_LREAL.h +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_LREAL.h @@ -24,13 +24,13 @@ class FORTE_F_TIME_IN_MS_TO_LREAL: public CSimpleFB{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_TIME &IN() { + CIEC_TIME &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LREAL &OUT() { + CIEC_LREAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_ULINT.cpp b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_ULINT.cpp index 0fb17cf96..042076565 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_ULINT.cpp +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_ULINT.cpp @@ -42,7 +42,7 @@ const SFBInterfaceSpec FORTE_F_TIME_IN_MS_TO_ULINT::scm_stFBInterfaceSpec = { }; void FORTE_F_TIME_IN_MS_TO_ULINT::alg_REQ(void){ -OUT() = TIME_IN_MS_TO_ULINT((IN())); + st_OUT() = TIME_IN_MS_TO_ULINT((st_IN())); } diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_ULINT.h b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_ULINT.h index a97cd4cb8..245261418 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_ULINT.h +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_MS_TO_ULINT.h @@ -24,13 +24,13 @@ class FORTE_F_TIME_IN_MS_TO_ULINT: public CSimpleFB{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_TIME &IN() { + CIEC_TIME &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ULINT &OUT() { + CIEC_ULINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_LINT.cpp b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_LINT.cpp index 1824958b7..a8dc74f38 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_LINT.cpp +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_LINT.cpp @@ -42,7 +42,7 @@ const SFBInterfaceSpec FORTE_F_TIME_IN_NS_TO_LINT::scm_stFBInterfaceSpec = { }; void FORTE_F_TIME_IN_NS_TO_LINT::alg_REQ(void){ -OUT() = TIME_IN_NS_TO_LINT((IN())); + st_OUT() = TIME_IN_NS_TO_LINT((st_IN())); } diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_LINT.h b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_LINT.h index 7156796d9..01ec7ccf0 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_LINT.h +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_LINT.h @@ -24,13 +24,13 @@ class FORTE_F_TIME_IN_NS_TO_LINT: public CSimpleFB{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_TIME &IN() { + CIEC_TIME &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LINT &OUT() { + CIEC_LINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_LREAL.cpp b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_LREAL.cpp index 742d85f39..e724d6786 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_LREAL.cpp +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_LREAL.cpp @@ -42,7 +42,7 @@ const SFBInterfaceSpec FORTE_F_TIME_IN_NS_TO_LREAL::scm_stFBInterfaceSpec = { }; void FORTE_F_TIME_IN_NS_TO_LREAL::alg_REQ(void){ -OUT() = TIME_IN_NS_TO_LREAL((IN())); + st_OUT() = TIME_IN_NS_TO_LREAL((st_IN())); } diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_LREAL.h b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_LREAL.h index 8ae0ad179..53e319889 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_LREAL.h +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_LREAL.h @@ -24,13 +24,13 @@ class FORTE_F_TIME_IN_NS_TO_LREAL: public CSimpleFB{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_TIME &IN() { + CIEC_TIME &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LREAL &OUT() { + CIEC_LREAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_ULINT.cpp b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_ULINT.cpp index f4c3ef8fb..9635d319f 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_ULINT.cpp +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_ULINT.cpp @@ -42,7 +42,7 @@ const SFBInterfaceSpec FORTE_F_TIME_IN_NS_TO_ULINT::scm_stFBInterfaceSpec = { }; void FORTE_F_TIME_IN_NS_TO_ULINT::alg_REQ(void){ -OUT() = TIME_IN_NS_TO_ULINT((IN())); + st_OUT() = TIME_IN_NS_TO_ULINT((st_IN())); } diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_ULINT.h b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_ULINT.h index 4108558b5..ee46286ed 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_ULINT.h +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_NS_TO_ULINT.h @@ -24,13 +24,13 @@ class FORTE_F_TIME_IN_NS_TO_ULINT: public CSimpleFB{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_TIME &IN() { + CIEC_TIME &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ULINT &OUT() { + CIEC_ULINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_LINT.cpp b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_LINT.cpp index 1140e155f..20e055258 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_LINT.cpp +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_LINT.cpp @@ -42,7 +42,7 @@ const SFBInterfaceSpec FORTE_F_TIME_IN_S_TO_LINT::scm_stFBInterfaceSpec = { }; void FORTE_F_TIME_IN_S_TO_LINT::alg_REQ(void){ -OUT() = TIME_IN_S_TO_LINT((IN())); + st_OUT() = TIME_IN_S_TO_LINT((st_IN())); } diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_LINT.h b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_LINT.h index d07d9f242..ded748d03 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_LINT.h +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_LINT.h @@ -24,13 +24,13 @@ class FORTE_F_TIME_IN_S_TO_LINT: public CSimpleFB{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_TIME &IN() { + CIEC_TIME &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LINT &OUT() { + CIEC_LINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_LREAL.cpp b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_LREAL.cpp index 6de0b7099..71fa71c0f 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_LREAL.cpp +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_LREAL.cpp @@ -42,7 +42,7 @@ const SFBInterfaceSpec FORTE_F_TIME_IN_S_TO_LREAL::scm_stFBInterfaceSpec = { }; void FORTE_F_TIME_IN_S_TO_LREAL::alg_REQ(void){ -OUT() = TIME_IN_S_TO_LREAL((IN())); + st_OUT() = TIME_IN_S_TO_LREAL((st_IN())); } diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_LREAL.h b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_LREAL.h index 28d5bdbea..6a54bfa1a 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_LREAL.h +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_LREAL.h @@ -24,13 +24,13 @@ class FORTE_F_TIME_IN_S_TO_LREAL: public CSimpleFB{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_TIME &IN() { + CIEC_TIME &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LREAL &OUT() { + CIEC_LREAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_ULINT.cpp b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_ULINT.cpp index 832c260bf..b8f7faf4d 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_ULINT.cpp +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_ULINT.cpp @@ -42,7 +42,7 @@ const SFBInterfaceSpec FORTE_F_TIME_IN_S_TO_ULINT::scm_stFBInterfaceSpec = { }; void FORTE_F_TIME_IN_S_TO_ULINT::alg_REQ(void){ -OUT() = TIME_IN_S_TO_ULINT((IN())); + st_OUT() = TIME_IN_S_TO_ULINT((st_IN())); } diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_ULINT.h b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_ULINT.h index ef7deab21..46e37a0f0 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_ULINT.h +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_S_TO_ULINT.h @@ -24,13 +24,13 @@ class FORTE_F_TIME_IN_S_TO_ULINT: public CSimpleFB{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_TIME &IN() { + CIEC_TIME &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ULINT &OUT() { + CIEC_ULINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_LINT.cpp b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_LINT.cpp index 35e38bbeb..9b1636e4c 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_LINT.cpp +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_LINT.cpp @@ -42,7 +42,7 @@ const SFBInterfaceSpec FORTE_F_TIME_IN_US_TO_LINT::scm_stFBInterfaceSpec = { }; void FORTE_F_TIME_IN_US_TO_LINT::alg_REQ(void){ -OUT() = TIME_IN_US_TO_LINT((IN())); + st_OUT() = TIME_IN_US_TO_LINT((st_IN())); } diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_LINT.h b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_LINT.h index ff8b4f6f3..694448076 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_LINT.h +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_LINT.h @@ -24,13 +24,13 @@ class FORTE_F_TIME_IN_US_TO_LINT: public CSimpleFB{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_TIME &IN() { + CIEC_TIME &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LINT &OUT() { + CIEC_LINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_LREAL.cpp b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_LREAL.cpp index 45d67a9a4..7f8e0fc30 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_LREAL.cpp +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_LREAL.cpp @@ -42,7 +42,7 @@ const SFBInterfaceSpec FORTE_F_TIME_IN_US_TO_LREAL::scm_stFBInterfaceSpec = { }; void FORTE_F_TIME_IN_US_TO_LREAL::alg_REQ(void){ -OUT() = TIME_IN_US_TO_LREAL((IN())); + st_OUT() = TIME_IN_US_TO_LREAL((st_IN())); } diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_LREAL.h b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_LREAL.h index 870b8a23c..49edfbe06 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_LREAL.h +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_LREAL.h @@ -24,13 +24,13 @@ class FORTE_F_TIME_IN_US_TO_LREAL: public CSimpleFB{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_TIME &IN() { + CIEC_TIME &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LREAL &OUT() { + CIEC_LREAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_ULINT.cpp b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_ULINT.cpp index cf9990f45..7df6f623a 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_ULINT.cpp +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_ULINT.cpp @@ -42,7 +42,7 @@ const SFBInterfaceSpec FORTE_F_TIME_IN_US_TO_ULINT::scm_stFBInterfaceSpec = { }; void FORTE_F_TIME_IN_US_TO_ULINT::alg_REQ(void){ -OUT() = TIME_IN_US_TO_ULINT((IN())); + st_OUT() = TIME_IN_US_TO_ULINT((st_IN())); } diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_ULINT.h b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_ULINT.h index aa59b6d78..e41a69b6c 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_ULINT.h +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_IN_US_TO_ULINT.h @@ -24,13 +24,13 @@ class FORTE_F_TIME_IN_US_TO_ULINT: public CSimpleFB{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_TIME &IN() { + CIEC_TIME &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ULINT &OUT() { + CIEC_ULINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_TO_STRING.cpp b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_TO_STRING.cpp index c6e005e41..7189f8145 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_TO_STRING.cpp +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_TO_STRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_TIME_TO_STRING::scm_stFBInterfaceSpec = { void FORTE_F_TIME_TO_STRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = TIME_TO_STRING(IN()); + st_OUT() = TIME_TO_STRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_TO_STRING.h b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_TO_STRING.h index 61a2ecd39..59b72bd41 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_TO_STRING.h +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_TO_STRING.h @@ -22,13 +22,13 @@ class FORTE_F_TIME_TO_STRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_TIME &IN() { + CIEC_TIME &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_STRING &OUT() { + CIEC_STRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_TO_WSTRING.cpp b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_TO_WSTRING.cpp index 6e9ffbc14..dc07e27f9 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_TO_WSTRING.cpp +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_TO_WSTRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_TIME_TO_WSTRING::scm_stFBInterfaceSpec = { void FORTE_F_TIME_TO_WSTRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = TIME_TO_WSTRING(IN()); + st_OUT() = TIME_TO_WSTRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_TO_WSTRING.h b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_TO_WSTRING.h index 90cec7528..303b78307 100644 --- a/src/modules/IEC61131-3/Conversion/TIME/F_TIME_TO_WSTRING.h +++ b/src/modules/IEC61131-3/Conversion/TIME/F_TIME_TO_WSTRING.h @@ -22,13 +22,13 @@ class FORTE_F_TIME_TO_WSTRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_TIME &IN() { + CIEC_TIME &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WSTRING &OUT() { + CIEC_WSTRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_BYTE.cpp b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_BYTE.cpp index 7ab399430..587bb5cf4 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_BYTE.cpp +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_BYTE.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_UDINT_TO_BYTE::scm_stFBInterfaceSpec = { void FORTE_F_UDINT_TO_BYTE::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UDINT_TO_BYTE(IN()); + st_OUT() = UDINT_TO_BYTE(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_BYTE.h b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_BYTE.h index d3b2c2df6..69870440e 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_BYTE.h +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_BYTE.h @@ -22,13 +22,13 @@ class FORTE_F_UDINT_TO_BYTE: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UDINT &IN() { + CIEC_UDINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BYTE &OUT() { + CIEC_BYTE &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_DINT.cpp b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_DINT.cpp index a7ec82492..7da76acb0 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_DINT.cpp +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_DINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_UDINT_TO_DINT::scm_stFBInterfaceSpec = { void FORTE_F_UDINT_TO_DINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UDINT_TO_DINT(IN()); + st_OUT() = UDINT_TO_DINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_DINT.h b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_DINT.h index d98e5e308..7273a547d 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_DINT.h +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_DINT.h @@ -22,13 +22,13 @@ class FORTE_F_UDINT_TO_DINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UDINT &IN() { + CIEC_UDINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DINT &OUT() { + CIEC_DINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_DWORD.cpp b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_DWORD.cpp index 4c4fa417e..79022c2a4 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_DWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_DWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_UDINT_TO_DWORD::scm_stFBInterfaceSpec = { void FORTE_F_UDINT_TO_DWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UDINT_TO_DWORD(IN()); + st_OUT() = UDINT_TO_DWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_DWORD.h b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_DWORD.h index 5efe5bf38..916b1c7db 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_DWORD.h +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_DWORD.h @@ -22,13 +22,13 @@ class FORTE_F_UDINT_TO_DWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UDINT &IN() { + CIEC_UDINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DWORD &OUT() { + CIEC_DWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_INT.cpp b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_INT.cpp index 3140c3b05..9e1e3e7c4 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_INT.cpp +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_INT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_UDINT_TO_INT::scm_stFBInterfaceSpec = { void FORTE_F_UDINT_TO_INT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UDINT_TO_INT(IN()); + st_OUT() = UDINT_TO_INT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_INT.h b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_INT.h index c053ee214..4556d5692 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_INT.h +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_INT.h @@ -22,13 +22,13 @@ class FORTE_F_UDINT_TO_INT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UDINT &IN() { + CIEC_UDINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_INT &OUT() { + CIEC_INT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LINT.cpp b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LINT.cpp index 2ec164a72..2ba84e36a 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LINT.cpp +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_UDINT_TO_LINT::scm_stFBInterfaceSpec = { void FORTE_F_UDINT_TO_LINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UDINT_TO_LINT(IN()); + st_OUT() = UDINT_TO_LINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LINT.h b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LINT.h index bb9dbfaf8..27461c7de 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LINT.h +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LINT.h @@ -22,13 +22,13 @@ class FORTE_F_UDINT_TO_LINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UDINT &IN() { + CIEC_UDINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LINT &OUT() { + CIEC_LINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LREAL.cpp b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LREAL.cpp index bca40b66a..2633bd901 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LREAL.cpp +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LREAL.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_UDINT_TO_LREAL::scm_stFBInterfaceSpec = { void FORTE_F_UDINT_TO_LREAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UDINT_TO_LREAL(IN()); + st_OUT() = UDINT_TO_LREAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LREAL.h b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LREAL.h index 6b44d86b5..b8d45a1fa 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LREAL.h +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LREAL.h @@ -22,13 +22,13 @@ class FORTE_F_UDINT_TO_LREAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UDINT &IN() { + CIEC_UDINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LREAL &OUT() { + CIEC_LREAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LWORD.cpp b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LWORD.cpp index 4e9064211..0481e37a9 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_UDINT_TO_LWORD::scm_stFBInterfaceSpec = { void FORTE_F_UDINT_TO_LWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UDINT_TO_LWORD(IN()); + st_OUT() = UDINT_TO_LWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LWORD.h b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LWORD.h index 1006dc77a..30e5b9496 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LWORD.h +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_LWORD.h @@ -22,13 +22,13 @@ class FORTE_F_UDINT_TO_LWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UDINT &IN() { + CIEC_UDINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LWORD &OUT() { + CIEC_LWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_REAL.cpp b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_REAL.cpp index 22deafe3c..ce26bda36 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_REAL.cpp +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_REAL.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_UDINT_TO_REAL::scm_stFBInterfaceSpec = { void FORTE_F_UDINT_TO_REAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UDINT_TO_REAL(IN()); + st_OUT() = UDINT_TO_REAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_REAL.h b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_REAL.h index 47de6b8ae..8df79f774 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_REAL.h +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_REAL.h @@ -21,13 +21,13 @@ class FORTE_F_UDINT_TO_REAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UDINT &IN() { + CIEC_UDINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_REAL &OUT() { + CIEC_REAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_SINT.cpp b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_SINT.cpp index 9858aaad1..dd1fe1fc2 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_SINT.cpp +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_SINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_UDINT_TO_SINT::scm_stFBInterfaceSpec = { void FORTE_F_UDINT_TO_SINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UDINT_TO_SINT(IN()); + st_OUT() = UDINT_TO_SINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_SINT.h b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_SINT.h index 5f3c722dd..2b737f2b1 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_SINT.h +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_SINT.h @@ -22,13 +22,13 @@ class FORTE_F_UDINT_TO_SINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UDINT &IN() { + CIEC_UDINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_SINT &OUT() { + CIEC_SINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_STRING.cpp b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_STRING.cpp index e5074820a..6b222fcdb 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_STRING.cpp +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_STRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_UDINT_TO_STRING::scm_stFBInterfaceSpec = { void FORTE_F_UDINT_TO_STRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UDINT_TO_STRING(IN()); + st_OUT() = UDINT_TO_STRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_STRING.h b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_STRING.h index 1bcd83224..4f4a01e86 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_STRING.h +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_STRING.h @@ -22,13 +22,13 @@ class FORTE_F_UDINT_TO_STRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UDINT &IN() { + CIEC_UDINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_STRING &OUT() { + CIEC_STRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_UINT.cpp b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_UINT.cpp index afe4dc7ce..dace21d0d 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_UINT.cpp +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_UINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_UDINT_TO_UINT::scm_stFBInterfaceSpec = { void FORTE_F_UDINT_TO_UINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UDINT_TO_UINT(IN()); + st_OUT() = UDINT_TO_UINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_UINT.h b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_UINT.h index a5548bce5..9a550158b 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_UINT.h +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_UINT.h @@ -22,13 +22,13 @@ class FORTE_F_UDINT_TO_UINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UDINT &IN() { + CIEC_UDINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UINT &OUT() { + CIEC_UINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_ULINT.cpp b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_ULINT.cpp index f09577a52..522e3391c 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_ULINT.cpp +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_ULINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_UDINT_TO_ULINT::scm_stFBInterfaceSpec = { void FORTE_F_UDINT_TO_ULINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UDINT_TO_ULINT(IN()); + st_OUT() = UDINT_TO_ULINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_ULINT.h b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_ULINT.h index 172de142a..a1a9570d8 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_ULINT.h +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_ULINT.h @@ -22,13 +22,13 @@ class FORTE_F_UDINT_TO_ULINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UDINT &IN() { + CIEC_UDINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ULINT &OUT() { + CIEC_ULINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_USINT.cpp b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_USINT.cpp index 762a82ef7..52a9a0761 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_USINT.cpp +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_USINT.cpp @@ -41,7 +41,7 @@ const SFBInterfaceSpec FORTE_F_UDINT_TO_USINT::scm_stFBInterfaceSpec = { void FORTE_F_UDINT_TO_USINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UDINT_TO_USINT(IN()); + st_OUT() = UDINT_TO_USINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_USINT.h b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_USINT.h index 8979eed74..5de38a161 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_USINT.h +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_USINT.h @@ -22,13 +22,13 @@ class FORTE_F_UDINT_TO_USINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UDINT &IN() { + CIEC_UDINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_USINT &OUT() { + CIEC_USINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_WORD.cpp b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_WORD.cpp index ef72fb247..8b8268b9a 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_WORD.cpp +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_WORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_UDINT_TO_WORD::scm_stFBInterfaceSpec = { void FORTE_F_UDINT_TO_WORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UDINT_TO_WORD(IN()); + st_OUT() = UDINT_TO_WORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_WORD.h b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_WORD.h index caed026f9..4cb7d4ab8 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_WORD.h +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_WORD.h @@ -22,13 +22,13 @@ class FORTE_F_UDINT_TO_WORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UDINT &IN() { + CIEC_UDINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WORD &OUT() { + CIEC_WORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_WSTRING.cpp b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_WSTRING.cpp index bfb3ffb74..7ed798136 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_WSTRING.cpp +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_WSTRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_UDINT_TO_WSTRING::scm_stFBInterfaceSpec = { void FORTE_F_UDINT_TO_WSTRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UDINT_TO_WSTRING(IN()); + st_OUT() = UDINT_TO_WSTRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_WSTRING.h b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_WSTRING.h index 1844da46e..9ad8e2451 100644 --- a/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_WSTRING.h +++ b/src/modules/IEC61131-3/Conversion/UDINT/F_UDINT_TO_WSTRING.h @@ -22,13 +22,13 @@ class FORTE_F_UDINT_TO_WSTRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UDINT &IN() { + CIEC_UDINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WSTRING &OUT() { + CIEC_WSTRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_BYTE.cpp b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_BYTE.cpp index 0b72b2428..e44091667 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_BYTE.cpp +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_BYTE.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_UINT_TO_BYTE::scm_stFBInterfaceSpec = { void FORTE_F_UINT_TO_BYTE::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UINT_TO_BYTE(IN()); + st_OUT() = UINT_TO_BYTE(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_BYTE.h b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_BYTE.h index 0639542ab..e0c116787 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_BYTE.h +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_BYTE.h @@ -21,13 +21,13 @@ class FORTE_F_UINT_TO_BYTE: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UINT &IN() { + CIEC_UINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BYTE &OUT() { + CIEC_BYTE &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_DINT.cpp b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_DINT.cpp index 87320f5e3..b7d2fe027 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_DINT.cpp +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_DINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_UINT_TO_DINT::scm_stFBInterfaceSpec = { void FORTE_F_UINT_TO_DINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UINT_TO_DINT(IN()); + st_OUT() = UINT_TO_DINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_DINT.h b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_DINT.h index ca6def72e..2036ed580 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_DINT.h +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_DINT.h @@ -21,13 +21,13 @@ class FORTE_F_UINT_TO_DINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UINT &IN() { + CIEC_UINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DINT &OUT() { + CIEC_DINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_DWORD.cpp b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_DWORD.cpp index 4ca1698d5..1ffbf5a36 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_DWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_DWORD.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_UINT_TO_DWORD::scm_stFBInterfaceSpec = { void FORTE_F_UINT_TO_DWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UINT_TO_DWORD(IN()); + st_OUT() = UINT_TO_DWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_DWORD.h b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_DWORD.h index 71a3b44e6..d95b506c6 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_DWORD.h +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_DWORD.h @@ -21,13 +21,13 @@ class FORTE_F_UINT_TO_DWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UINT &IN() { + CIEC_UINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DWORD &OUT() { + CIEC_DWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_INT.cpp b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_INT.cpp index 665125ffa..04930f6c9 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_INT.cpp +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_INT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_UINT_TO_INT::scm_stFBInterfaceSpec = { void FORTE_F_UINT_TO_INT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UINT_TO_INT(IN()); + st_OUT() = UINT_TO_INT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_INT.h b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_INT.h index 7ed1a8f93..668501b47 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_INT.h +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_INT.h @@ -21,13 +21,13 @@ class FORTE_F_UINT_TO_INT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UINT &IN() { + CIEC_UINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_INT &OUT() { + CIEC_INT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LINT.cpp b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LINT.cpp index 0941b23ba..53f73abbf 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LINT.cpp +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_UINT_TO_LINT::scm_stFBInterfaceSpec = { void FORTE_F_UINT_TO_LINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UINT_TO_LINT(IN()); + st_OUT() = UINT_TO_LINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LINT.h b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LINT.h index d09ef2f7b..62c484ab6 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LINT.h +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LINT.h @@ -21,13 +21,13 @@ class FORTE_F_UINT_TO_LINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UINT &IN() { + CIEC_UINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LINT &OUT() { + CIEC_LINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LREAL.cpp b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LREAL.cpp index dac00d16c..51d163026 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LREAL.cpp +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LREAL.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_UINT_TO_LREAL::scm_stFBInterfaceSpec = { void FORTE_F_UINT_TO_LREAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UINT_TO_LREAL(IN()); + st_OUT() = UINT_TO_LREAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LREAL.h b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LREAL.h index e157afb91..2d194a909 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LREAL.h +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LREAL.h @@ -21,13 +21,13 @@ class FORTE_F_UINT_TO_LREAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UINT &IN() { + CIEC_UINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LREAL &OUT() { + CIEC_LREAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LWORD.cpp b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LWORD.cpp index fc068c844..e02f70fbf 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LWORD.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_UINT_TO_LWORD::scm_stFBInterfaceSpec = { void FORTE_F_UINT_TO_LWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UINT_TO_LWORD(IN()); + st_OUT() = UINT_TO_LWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LWORD.h b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LWORD.h index 92e85d921..b4ef644c8 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LWORD.h +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_LWORD.h @@ -21,13 +21,13 @@ class FORTE_F_UINT_TO_LWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UINT &IN() { + CIEC_UINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LWORD &OUT() { + CIEC_LWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_REAL.cpp b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_REAL.cpp index 4ffde4f8f..f4fa80cd0 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_REAL.cpp +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_REAL.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_UINT_TO_REAL::scm_stFBInterfaceSpec = { void FORTE_F_UINT_TO_REAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UINT_TO_REAL(IN()); + st_OUT() = UINT_TO_REAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_REAL.h b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_REAL.h index 2dc92c654..fec25dc02 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_REAL.h +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_REAL.h @@ -21,13 +21,13 @@ class FORTE_F_UINT_TO_REAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UINT &IN() { + CIEC_UINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_REAL &OUT() { + CIEC_REAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_SINT.cpp b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_SINT.cpp index f9bd19989..62b1560ff 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_SINT.cpp +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_SINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_UINT_TO_SINT::scm_stFBInterfaceSpec = { void FORTE_F_UINT_TO_SINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UINT_TO_SINT(IN()); + st_OUT() = UINT_TO_SINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_SINT.h b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_SINT.h index 76e7a0721..013f44a24 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_SINT.h +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_SINT.h @@ -21,13 +21,13 @@ class FORTE_F_UINT_TO_SINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UINT &IN() { + CIEC_UINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_SINT &OUT() { + CIEC_SINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_STRING.cpp b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_STRING.cpp index 1c977f7b4..93d350d5c 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_STRING.cpp +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_STRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_UINT_TO_STRING::scm_stFBInterfaceSpec = { void FORTE_F_UINT_TO_STRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UINT_TO_STRING(IN()); + st_OUT() = UINT_TO_STRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_STRING.h b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_STRING.h index a38c088fc..79e268c6d 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_STRING.h +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_STRING.h @@ -22,13 +22,13 @@ class FORTE_F_UINT_TO_STRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UINT &IN() { + CIEC_UINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_STRING &OUT() { + CIEC_STRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_UDINT.cpp b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_UDINT.cpp index c02b5bc7e..3e2ffcd64 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_UDINT.cpp +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_UDINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_UINT_TO_UDINT::scm_stFBInterfaceSpec = { void FORTE_F_UINT_TO_UDINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UINT_TO_UDINT(IN()); + st_OUT() = UINT_TO_UDINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_UDINT.h b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_UDINT.h index 75f0d44b1..d210144c5 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_UDINT.h +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_UDINT.h @@ -21,13 +21,13 @@ class FORTE_F_UINT_TO_UDINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UINT &IN() { + CIEC_UINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UDINT &OUT() { + CIEC_UDINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_ULINT.cpp b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_ULINT.cpp index 804b68d3b..52ac6c6e5 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_ULINT.cpp +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_ULINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_UINT_TO_ULINT::scm_stFBInterfaceSpec = { void FORTE_F_UINT_TO_ULINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UINT_TO_ULINT(IN()); + st_OUT() = UINT_TO_ULINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_ULINT.h b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_ULINT.h index 23c36d75e..565f21ab3 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_ULINT.h +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_ULINT.h @@ -21,13 +21,13 @@ class FORTE_F_UINT_TO_ULINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UINT &IN() { + CIEC_UINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ULINT &OUT() { + CIEC_ULINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_USINT.cpp b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_USINT.cpp index 9e11468b1..e8d171729 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_USINT.cpp +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_USINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_UINT_TO_USINT::scm_stFBInterfaceSpec = { void FORTE_F_UINT_TO_USINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UINT_TO_USINT(IN()); + st_OUT() = UINT_TO_USINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_USINT.h b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_USINT.h index fa87f44ed..c84ebc78a 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_USINT.h +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_USINT.h @@ -21,13 +21,13 @@ class FORTE_F_UINT_TO_USINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UINT &IN() { + CIEC_UINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_USINT &OUT() { + CIEC_USINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_WORD.cpp b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_WORD.cpp index 85575c3e6..d13a072d5 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_WORD.cpp +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_WORD.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_UINT_TO_WORD::scm_stFBInterfaceSpec = { void FORTE_F_UINT_TO_WORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UINT_TO_WORD(IN()); + st_OUT() = UINT_TO_WORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_WORD.h b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_WORD.h index d93cebac7..47acea2c1 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_WORD.h +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_WORD.h @@ -21,13 +21,13 @@ class FORTE_F_UINT_TO_WORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UINT &IN() { + CIEC_UINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WORD &OUT() { + CIEC_WORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_WSTRING.cpp b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_WSTRING.cpp index a578894f0..6e97f76bd 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_WSTRING.cpp +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_WSTRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_UINT_TO_WSTRING::scm_stFBInterfaceSpec = { void FORTE_F_UINT_TO_WSTRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = UINT_TO_WSTRING(IN()); + st_OUT() = UINT_TO_WSTRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_WSTRING.h b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_WSTRING.h index d2359616b..cae9a9b7c 100644 --- a/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_WSTRING.h +++ b/src/modules/IEC61131-3/Conversion/UINT/F_UINT_TO_WSTRING.h @@ -22,13 +22,13 @@ class FORTE_F_UINT_TO_WSTRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_UINT &IN() { + CIEC_UINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WSTRING &OUT() { + CIEC_WSTRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_BYTE.cpp b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_BYTE.cpp index 894d5dac2..8b499898e 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_BYTE.cpp +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_BYTE.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_ULINT_TO_BYTE::scm_stFBInterfaceSpec = { void FORTE_F_ULINT_TO_BYTE::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = ULINT_TO_BYTE(IN()); + st_OUT() = ULINT_TO_BYTE(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_BYTE.h b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_BYTE.h index f4d5f8b18..56b747866 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_BYTE.h +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_BYTE.h @@ -21,13 +21,13 @@ class FORTE_F_ULINT_TO_BYTE: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ULINT &IN() { + CIEC_ULINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BYTE &OUT() { + CIEC_BYTE &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_DINT.cpp b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_DINT.cpp index 30e6065c0..bcee56f0e 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_DINT.cpp +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_DINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_ULINT_TO_DINT::scm_stFBInterfaceSpec = { void FORTE_F_ULINT_TO_DINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = ULINT_TO_DINT(IN()); + st_OUT() = ULINT_TO_DINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_DINT.h b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_DINT.h index 30ed05986..a29317b77 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_DINT.h +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_DINT.h @@ -21,13 +21,13 @@ class FORTE_F_ULINT_TO_DINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ULINT &IN() { + CIEC_ULINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DINT &OUT() { + CIEC_DINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_DWORD.cpp b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_DWORD.cpp index 31b8541eb..7696b5e22 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_DWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_DWORD.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_ULINT_TO_DWORD::scm_stFBInterfaceSpec = { void FORTE_F_ULINT_TO_DWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = ULINT_TO_DWORD(IN()); + st_OUT() = ULINT_TO_DWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_DWORD.h b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_DWORD.h index 8dec4634e..b6c369f1c 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_DWORD.h +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_DWORD.h @@ -21,13 +21,13 @@ class FORTE_F_ULINT_TO_DWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ULINT &IN() { + CIEC_ULINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DWORD &OUT() { + CIEC_DWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_INT.cpp b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_INT.cpp index 06592033a..be71c7c3f 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_INT.cpp +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_INT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_ULINT_TO_INT::scm_stFBInterfaceSpec = { void FORTE_F_ULINT_TO_INT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = ULINT_TO_INT(IN()); + st_OUT() = ULINT_TO_INT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_INT.h b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_INT.h index 758297aed..e062c23b9 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_INT.h +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_INT.h @@ -21,13 +21,13 @@ class FORTE_F_ULINT_TO_INT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ULINT &IN() { + CIEC_ULINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_INT &OUT() { + CIEC_INT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LINT.cpp b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LINT.cpp index bb6c0a078..4b1223866 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LINT.cpp +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_ULINT_TO_LINT::scm_stFBInterfaceSpec = { void FORTE_F_ULINT_TO_LINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = ULINT_TO_LINT(IN()); + st_OUT() = ULINT_TO_LINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LINT.h b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LINT.h index db570bc09..915752ba9 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LINT.h +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LINT.h @@ -21,13 +21,13 @@ class FORTE_F_ULINT_TO_LINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ULINT &IN() { + CIEC_ULINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LINT &OUT() { + CIEC_LINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LREAL.cpp b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LREAL.cpp index ae5d2f437..fb3f372a6 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LREAL.cpp +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LREAL.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_ULINT_TO_LREAL::scm_stFBInterfaceSpec = { void FORTE_F_ULINT_TO_LREAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = ULINT_TO_LREAL(IN()); + st_OUT() = ULINT_TO_LREAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LREAL.h b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LREAL.h index d3f41b0a2..4626fed69 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LREAL.h +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LREAL.h @@ -21,13 +21,13 @@ class FORTE_F_ULINT_TO_LREAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ULINT &IN() { + CIEC_ULINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LREAL &OUT() { + CIEC_LREAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LWORD.cpp b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LWORD.cpp index 89f429039..a31abb06c 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LWORD.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_ULINT_TO_LWORD::scm_stFBInterfaceSpec = { void FORTE_F_ULINT_TO_LWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = ULINT_TO_LWORD(IN()); + st_OUT() = ULINT_TO_LWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LWORD.h b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LWORD.h index bf7f6474b..498da322f 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LWORD.h +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_LWORD.h @@ -21,13 +21,13 @@ class FORTE_F_ULINT_TO_LWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ULINT &IN() { + CIEC_ULINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LWORD &OUT() { + CIEC_LWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_REAL.cpp b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_REAL.cpp index c5c837636..2a80ba7dc 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_REAL.cpp +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_REAL.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_ULINT_TO_REAL::scm_stFBInterfaceSpec = { void FORTE_F_ULINT_TO_REAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = ULINT_TO_REAL(IN()); + st_OUT() = ULINT_TO_REAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_REAL.h b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_REAL.h index 1ba51b860..641a082ce 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_REAL.h +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_REAL.h @@ -21,13 +21,13 @@ class FORTE_F_ULINT_TO_REAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ULINT &IN() { + CIEC_ULINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_REAL &OUT() { + CIEC_REAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_SINT.cpp b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_SINT.cpp index 484dcbbff..4c92657d7 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_SINT.cpp +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_SINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_ULINT_TO_SINT::scm_stFBInterfaceSpec = { void FORTE_F_ULINT_TO_SINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = ULINT_TO_SINT(IN()); + st_OUT() = ULINT_TO_SINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_SINT.h b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_SINT.h index 41b9c29a3..ff712efae 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_SINT.h +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_SINT.h @@ -21,13 +21,13 @@ class FORTE_F_ULINT_TO_SINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ULINT &IN() { + CIEC_ULINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_SINT &OUT() { + CIEC_SINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_STRING.cpp b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_STRING.cpp index fe283cbbd..99f240577 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_STRING.cpp +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_STRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_ULINT_TO_STRING::scm_stFBInterfaceSpec = { void FORTE_F_ULINT_TO_STRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = ULINT_TO_STRING(IN()); + st_OUT() = ULINT_TO_STRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_STRING.h b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_STRING.h index 191c4a1f5..70036bdf6 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_STRING.h +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_STRING.h @@ -22,13 +22,13 @@ class FORTE_F_ULINT_TO_STRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ULINT &IN() { + CIEC_ULINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_STRING &OUT() { + CIEC_STRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_UDINT.cpp b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_UDINT.cpp index aebad7b00..1bf2231a8 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_UDINT.cpp +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_UDINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_ULINT_TO_UDINT::scm_stFBInterfaceSpec = { void FORTE_F_ULINT_TO_UDINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = ULINT_TO_UDINT(IN()); + st_OUT() = ULINT_TO_UDINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_UDINT.h b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_UDINT.h index 55e451eb3..2981dff41 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_UDINT.h +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_UDINT.h @@ -21,13 +21,13 @@ class FORTE_F_ULINT_TO_UDINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ULINT &IN() { + CIEC_ULINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UDINT &OUT() { + CIEC_UDINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_UINT.cpp b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_UINT.cpp index 4e56523ce..21b83fea5 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_UINT.cpp +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_UINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_ULINT_TO_UINT::scm_stFBInterfaceSpec = { void FORTE_F_ULINT_TO_UINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = ULINT_TO_UINT(IN()); + st_OUT() = ULINT_TO_UINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_UINT.h b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_UINT.h index bc952f9cd..368d5ba6f 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_UINT.h +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_UINT.h @@ -21,13 +21,13 @@ class FORTE_F_ULINT_TO_UINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ULINT &IN() { + CIEC_ULINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UINT &OUT() { + CIEC_UINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_USINT.cpp b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_USINT.cpp index 7a0aa990b..70e2da508 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_USINT.cpp +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_USINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_ULINT_TO_USINT::scm_stFBInterfaceSpec = { void FORTE_F_ULINT_TO_USINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = ULINT_TO_USINT(IN()); + st_OUT() = ULINT_TO_USINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_USINT.h b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_USINT.h index ee8010be0..c0d637dab 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_USINT.h +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_USINT.h @@ -21,13 +21,13 @@ class FORTE_F_ULINT_TO_USINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ULINT &IN() { + CIEC_ULINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_USINT &OUT() { + CIEC_USINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_WORD.cpp b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_WORD.cpp index 3b2e5091d..be0abd54b 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_WORD.cpp +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_WORD.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_ULINT_TO_WORD::scm_stFBInterfaceSpec = { void FORTE_F_ULINT_TO_WORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = ULINT_TO_WORD(IN()); + st_OUT() = ULINT_TO_WORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_WORD.h b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_WORD.h index 640030f76..bd91c1e7f 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_WORD.h +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_WORD.h @@ -21,13 +21,13 @@ class FORTE_F_ULINT_TO_WORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ULINT &IN() { + CIEC_ULINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WORD &OUT() { + CIEC_WORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_WSTRING.cpp b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_WSTRING.cpp index f8fdcad8d..f3b7c2432 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_WSTRING.cpp +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_WSTRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_ULINT_TO_WSTRING::scm_stFBInterfaceSpec = { void FORTE_F_ULINT_TO_WSTRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = ULINT_TO_WSTRING(IN()); + st_OUT() = ULINT_TO_WSTRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_WSTRING.h b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_WSTRING.h index 431d4970c..08e34d8cc 100644 --- a/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_WSTRING.h +++ b/src/modules/IEC61131-3/Conversion/ULINT/F_ULINT_TO_WSTRING.h @@ -22,13 +22,13 @@ class FORTE_F_ULINT_TO_WSTRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ULINT &IN() { + CIEC_ULINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WSTRING &OUT() { + CIEC_WSTRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_BYTE.cpp b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_BYTE.cpp index 63ddae9fb..ce951270e 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_BYTE.cpp +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_BYTE.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_USINT_TO_BYTE::scm_stFBInterfaceSpec = { void FORTE_F_USINT_TO_BYTE::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = USINT_TO_BYTE(IN()); + st_OUT() = USINT_TO_BYTE(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_BYTE.h b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_BYTE.h index c3baf0b5d..8aa0fa9fe 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_BYTE.h +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_BYTE.h @@ -21,13 +21,13 @@ class FORTE_F_USINT_TO_BYTE: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_USINT &IN() { + CIEC_USINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BYTE &OUT() { + CIEC_BYTE &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_DINT.cpp b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_DINT.cpp index 512d5d21c..1cf617a53 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_DINT.cpp +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_DINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_USINT_TO_DINT::scm_stFBInterfaceSpec = { void FORTE_F_USINT_TO_DINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = USINT_TO_DINT(IN()); + st_OUT() = USINT_TO_DINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_DINT.h b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_DINT.h index 0759cda95..829785ab8 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_DINT.h +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_DINT.h @@ -21,13 +21,13 @@ class FORTE_F_USINT_TO_DINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_USINT &IN() { + CIEC_USINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DINT &OUT() { + CIEC_DINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_DWORD.cpp b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_DWORD.cpp index 19d962d51..e74c35cbb 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_DWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_DWORD.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_USINT_TO_DWORD::scm_stFBInterfaceSpec = { void FORTE_F_USINT_TO_DWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = USINT_TO_DWORD(IN()); + st_OUT() = USINT_TO_DWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_DWORD.h b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_DWORD.h index 8e86e4bdd..5bf80e038 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_DWORD.h +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_DWORD.h @@ -21,13 +21,13 @@ class FORTE_F_USINT_TO_DWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_USINT &IN() { + CIEC_USINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DWORD &OUT() { + CIEC_DWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_INT.cpp b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_INT.cpp index 4ad7566e5..986054ee8 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_INT.cpp +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_INT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_USINT_TO_INT::scm_stFBInterfaceSpec = { void FORTE_F_USINT_TO_INT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = USINT_TO_INT(IN()); + st_OUT() = USINT_TO_INT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_INT.h b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_INT.h index 602bfbf61..75f53aad2 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_INT.h +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_INT.h @@ -21,13 +21,13 @@ class FORTE_F_USINT_TO_INT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_USINT &IN() { + CIEC_USINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_INT &OUT() { + CIEC_INT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LINT.cpp b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LINT.cpp index 808198881..0bdf0d264 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LINT.cpp +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_USINT_TO_LINT::scm_stFBInterfaceSpec = { void FORTE_F_USINT_TO_LINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = USINT_TO_LINT(IN()); + st_OUT() = USINT_TO_LINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LINT.h b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LINT.h index d1e3e706f..1612b4c40 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LINT.h +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LINT.h @@ -21,13 +21,13 @@ class FORTE_F_USINT_TO_LINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_USINT &IN() { + CIEC_USINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LINT &OUT() { + CIEC_LINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LREAL.cpp b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LREAL.cpp index cb7374bb8..5a749c67a 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LREAL.cpp +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LREAL.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_USINT_TO_LREAL::scm_stFBInterfaceSpec = { void FORTE_F_USINT_TO_LREAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = USINT_TO_LREAL(IN()); + st_OUT() = USINT_TO_LREAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LREAL.h b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LREAL.h index 2e5858a63..6cb21cbf8 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LREAL.h +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LREAL.h @@ -21,13 +21,13 @@ class FORTE_F_USINT_TO_LREAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_USINT &IN() { + CIEC_USINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LREAL &OUT() { + CIEC_LREAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LWORD.cpp b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LWORD.cpp index d4ffe5756..05f9cba70 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LWORD.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_USINT_TO_LWORD::scm_stFBInterfaceSpec = { void FORTE_F_USINT_TO_LWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = USINT_TO_LWORD(IN()); + st_OUT() = USINT_TO_LWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LWORD.h b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LWORD.h index 2fda0cfc1..72031166f 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LWORD.h +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_LWORD.h @@ -21,13 +21,13 @@ class FORTE_F_USINT_TO_LWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_USINT &IN() { + CIEC_USINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LWORD &OUT() { + CIEC_LWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_REAL.cpp b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_REAL.cpp index afbb642db..8c71637c6 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_REAL.cpp +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_REAL.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_USINT_TO_REAL::scm_stFBInterfaceSpec = { void FORTE_F_USINT_TO_REAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = USINT_TO_REAL(IN()); + st_OUT() = USINT_TO_REAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_REAL.h b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_REAL.h index ec09ddaa4..0dd6264b8 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_REAL.h +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_REAL.h @@ -21,13 +21,13 @@ class FORTE_F_USINT_TO_REAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_USINT &IN() { + CIEC_USINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_REAL &OUT() { + CIEC_REAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_SINT.cpp b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_SINT.cpp index 2eae2186a..c90d8156c 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_SINT.cpp +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_SINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_USINT_TO_SINT::scm_stFBInterfaceSpec = { void FORTE_F_USINT_TO_SINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = USINT_TO_SINT(IN()); + st_OUT() = USINT_TO_SINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_SINT.h b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_SINT.h index eb50ceb92..22186d093 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_SINT.h +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_SINT.h @@ -21,13 +21,13 @@ class FORTE_F_USINT_TO_SINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_USINT &IN() { + CIEC_USINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_SINT &OUT() { + CIEC_SINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_STRING.cpp b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_STRING.cpp index 0db995ceb..88e87893b 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_STRING.cpp +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_STRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_USINT_TO_STRING::scm_stFBInterfaceSpec = { void FORTE_F_USINT_TO_STRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = USINT_TO_STRING(IN()); + st_OUT() = USINT_TO_STRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_STRING.h b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_STRING.h index 3b410fd50..c7f949e77 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_STRING.h +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_STRING.h @@ -22,13 +22,13 @@ class FORTE_F_USINT_TO_STRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_USINT &IN() { + CIEC_USINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_STRING &OUT() { + CIEC_STRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_UDINT.cpp b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_UDINT.cpp index 4fc63a968..73e839ee0 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_UDINT.cpp +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_UDINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_USINT_TO_UDINT::scm_stFBInterfaceSpec = { void FORTE_F_USINT_TO_UDINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = USINT_TO_UDINT(IN()); + st_OUT() = USINT_TO_UDINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_UDINT.h b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_UDINT.h index b824a53bf..ed5e5a4bb 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_UDINT.h +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_UDINT.h @@ -21,13 +21,13 @@ class FORTE_F_USINT_TO_UDINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_USINT &IN() { + CIEC_USINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UDINT &OUT() { + CIEC_UDINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_UINT.cpp b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_UINT.cpp index bef0b211b..4b3f7811d 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_UINT.cpp +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_UINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_USINT_TO_UINT::scm_stFBInterfaceSpec = { void FORTE_F_USINT_TO_UINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = USINT_TO_UINT(IN()); + st_OUT() = USINT_TO_UINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_UINT.h b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_UINT.h index b41d72bf5..33e55d0ff 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_UINT.h +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_UINT.h @@ -21,13 +21,13 @@ class FORTE_F_USINT_TO_UINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_USINT &IN() { + CIEC_USINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UINT &OUT() { + CIEC_UINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_ULINT.cpp b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_ULINT.cpp index 088722a2c..0b7e77c51 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_ULINT.cpp +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_ULINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_USINT_TO_ULINT::scm_stFBInterfaceSpec = { void FORTE_F_USINT_TO_ULINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = USINT_TO_ULINT(IN()); + st_OUT() = USINT_TO_ULINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_ULINT.h b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_ULINT.h index 7f0eefdfa..10805255f 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_ULINT.h +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_ULINT.h @@ -21,13 +21,13 @@ class FORTE_F_USINT_TO_ULINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_USINT &IN() { + CIEC_USINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ULINT &OUT() { + CIEC_ULINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_WORD.cpp b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_WORD.cpp index 32e00c35c..4753365fa 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_WORD.cpp +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_WORD.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_USINT_TO_WORD::scm_stFBInterfaceSpec = { void FORTE_F_USINT_TO_WORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = USINT_TO_WORD(IN()); + st_OUT() = USINT_TO_WORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_WORD.h b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_WORD.h index b94a3cf89..4b54ba0dd 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_WORD.h +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_WORD.h @@ -21,13 +21,13 @@ class FORTE_F_USINT_TO_WORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_USINT &IN() { + CIEC_USINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WORD &OUT() { + CIEC_WORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_WSTRING.cpp b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_WSTRING.cpp index a64f66bc8..da26cb913 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_WSTRING.cpp +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_WSTRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_USINT_TO_WSTRING::scm_stFBInterfaceSpec = { void FORTE_F_USINT_TO_WSTRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = USINT_TO_WSTRING(IN()); + st_OUT() = USINT_TO_WSTRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_WSTRING.h b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_WSTRING.h index 021126fb0..fa6efa41e 100644 --- a/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_WSTRING.h +++ b/src/modules/IEC61131-3/Conversion/USINT/F_USINT_TO_WSTRING.h @@ -22,13 +22,13 @@ class FORTE_F_USINT_TO_WSTRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_USINT &IN() { + CIEC_USINT &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WSTRING &OUT() { + CIEC_WSTRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_BYTE.cpp b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_BYTE.cpp index 91dba7eea..46a8ac701 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_BYTE.cpp +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_BYTE.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_WORD_TO_BYTE::scm_stFBInterfaceSpec = { void FORTE_F_WORD_TO_BYTE::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WORD_TO_BYTE(IN()); + st_OUT() = WORD_TO_BYTE(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_BYTE.h b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_BYTE.h index 4011fe981..6c4225e0f 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_BYTE.h +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_BYTE.h @@ -21,13 +21,13 @@ class FORTE_F_WORD_TO_BYTE: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WORD &IN() { + CIEC_WORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BYTE &OUT() { + CIEC_BYTE &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_DINT.cpp b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_DINT.cpp index 7dceb0b63..3758215fd 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_DINT.cpp +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_DINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_WORD_TO_DINT::scm_stFBInterfaceSpec = { void FORTE_F_WORD_TO_DINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WORD_TO_DINT(IN()); + st_OUT() = WORD_TO_DINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_DINT.h b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_DINT.h index 7facbae0e..13b85f47b 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_DINT.h +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_DINT.h @@ -21,13 +21,13 @@ class FORTE_F_WORD_TO_DINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WORD &IN() { + CIEC_WORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DINT &OUT() { + CIEC_DINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_DWORD.cpp b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_DWORD.cpp index e8719c64b..9843798ae 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_DWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_DWORD.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_WORD_TO_DWORD::scm_stFBInterfaceSpec = { void FORTE_F_WORD_TO_DWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WORD_TO_DWORD(IN()); + st_OUT() = WORD_TO_DWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_DWORD.h b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_DWORD.h index 8e56927b0..1258c46ac 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_DWORD.h +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_DWORD.h @@ -21,13 +21,13 @@ class FORTE_F_WORD_TO_DWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WORD &IN() { + CIEC_WORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DWORD &OUT() { + CIEC_DWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_INT.cpp b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_INT.cpp index 93883abce..25bab3beb 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_INT.cpp +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_INT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_WORD_TO_INT::scm_stFBInterfaceSpec = { void FORTE_F_WORD_TO_INT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WORD_TO_INT(IN()); + st_OUT() = WORD_TO_INT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_INT.h b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_INT.h index de42a5500..9122b5064 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_INT.h +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_INT.h @@ -21,13 +21,13 @@ class FORTE_F_WORD_TO_INT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WORD &IN() { + CIEC_WORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_INT &OUT() { + CIEC_INT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_LINT.cpp b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_LINT.cpp index 0e5228ff6..069f08519 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_LINT.cpp +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_LINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_WORD_TO_LINT::scm_stFBInterfaceSpec = { void FORTE_F_WORD_TO_LINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WORD_TO_LINT(IN()); + st_OUT() = WORD_TO_LINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_LINT.h b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_LINT.h index 6c53bc1b4..f0f93a689 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_LINT.h +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_LINT.h @@ -21,13 +21,13 @@ class FORTE_F_WORD_TO_LINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WORD &IN() { + CIEC_WORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LINT &OUT() { + CIEC_LINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_LWORD.cpp b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_LWORD.cpp index 53188c9f5..796503426 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_LWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_LWORD.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_WORD_TO_LWORD::scm_stFBInterfaceSpec = { void FORTE_F_WORD_TO_LWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WORD_TO_LWORD(IN()); + st_OUT() = WORD_TO_LWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_LWORD.h b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_LWORD.h index 4d42e7b76..2c9b3ea19 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_LWORD.h +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_LWORD.h @@ -21,13 +21,13 @@ class FORTE_F_WORD_TO_LWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WORD &IN() { + CIEC_WORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LWORD &OUT() { + CIEC_LWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_SINT.cpp b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_SINT.cpp index 563d35ef4..3878dad89 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_SINT.cpp +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_SINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_WORD_TO_SINT::scm_stFBInterfaceSpec = { void FORTE_F_WORD_TO_SINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WORD_TO_SINT(IN()); + st_OUT() = WORD_TO_SINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_SINT.h b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_SINT.h index ed4752852..3728bb891 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_SINT.h +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_SINT.h @@ -21,13 +21,13 @@ class FORTE_F_WORD_TO_SINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WORD &IN() { + CIEC_WORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_SINT &OUT() { + CIEC_SINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_STRING.cpp b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_STRING.cpp index f78b41443..6fb48b28a 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_STRING.cpp +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_STRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_WORD_TO_STRING::scm_stFBInterfaceSpec = { void FORTE_F_WORD_TO_STRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WORD_TO_STRING(IN()); + st_OUT() = WORD_TO_STRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_STRING.h b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_STRING.h index 9f24b2026..46e982369 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_STRING.h +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_STRING.h @@ -22,13 +22,13 @@ class FORTE_F_WORD_TO_STRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WORD &IN() { + CIEC_WORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_STRING &OUT() { + CIEC_STRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_UDINT.cpp b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_UDINT.cpp index dba2d6183..e940ffe31 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_UDINT.cpp +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_UDINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_WORD_TO_UDINT::scm_stFBInterfaceSpec = { void FORTE_F_WORD_TO_UDINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WORD_TO_UDINT(IN()); + st_OUT() = WORD_TO_UDINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_UDINT.h b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_UDINT.h index 95628e623..c3e086ce8 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_UDINT.h +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_UDINT.h @@ -21,13 +21,13 @@ class FORTE_F_WORD_TO_UDINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WORD &IN() { + CIEC_WORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UDINT &OUT() { + CIEC_UDINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_UINT.cpp b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_UINT.cpp index 44b6b65b2..70e8eb08c 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_UINT.cpp +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_UINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_WORD_TO_UINT::scm_stFBInterfaceSpec = { void FORTE_F_WORD_TO_UINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WORD_TO_UINT(IN()); + st_OUT() = WORD_TO_UINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_UINT.h b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_UINT.h index c5f47adfa..e59828cad 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_UINT.h +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_UINT.h @@ -21,13 +21,13 @@ class FORTE_F_WORD_TO_UINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WORD &IN() { + CIEC_WORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UINT &OUT() { + CIEC_UINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_ULINT.cpp b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_ULINT.cpp index 229531a1d..8c1eb8f05 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_ULINT.cpp +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_ULINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_WORD_TO_ULINT::scm_stFBInterfaceSpec = { void FORTE_F_WORD_TO_ULINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WORD_TO_ULINT(IN()); + st_OUT() = WORD_TO_ULINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_ULINT.h b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_ULINT.h index a460ccf69..f4cec8e8d 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_ULINT.h +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_ULINT.h @@ -21,13 +21,13 @@ class FORTE_F_WORD_TO_ULINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WORD &IN() { + CIEC_WORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ULINT &OUT() { + CIEC_ULINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_USINT.cpp b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_USINT.cpp index 443ec78a8..d3de69a61 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_USINT.cpp +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_USINT.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_F_WORD_TO_USINT::scm_stFBInterfaceSpec = { void FORTE_F_WORD_TO_USINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WORD_TO_USINT(IN()); + st_OUT() = WORD_TO_USINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_USINT.h b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_USINT.h index d45b729e3..51d36d492 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_USINT.h +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_USINT.h @@ -21,13 +21,13 @@ class FORTE_F_WORD_TO_USINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WORD &IN() { + CIEC_WORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_USINT &OUT() { + CIEC_USINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_WSTRING.cpp b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_WSTRING.cpp index c8ed66acf..495679039 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_WSTRING.cpp +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_WSTRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_WORD_TO_WSTRING::scm_stFBInterfaceSpec = { void FORTE_F_WORD_TO_WSTRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WORD_TO_WSTRING(IN()); + st_OUT() = WORD_TO_WSTRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_WSTRING.h b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_WSTRING.h index db7052597..0f2ce986a 100644 --- a/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_WSTRING.h +++ b/src/modules/IEC61131-3/Conversion/WORD/F_WORD_TO_WSTRING.h @@ -22,13 +22,13 @@ class FORTE_F_WORD_TO_WSTRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WORD &IN() { + CIEC_WORD &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WSTRING &OUT() { + CIEC_WSTRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_BOOL.cpp b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_BOOL.cpp index d93e2f5a0..5341a2ee7 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_BOOL.cpp +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_BOOL.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_WSTRING_TO_BOOL::scm_stFBInterfaceSpec = { void FORTE_F_WSTRING_TO_BOOL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WSTRING_TO_BOOL(IN()); + st_OUT() = WSTRING_TO_BOOL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_BOOL.h b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_BOOL.h index 5873eb149..f5fb6c8ae 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_BOOL.h +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_BOOL.h @@ -22,13 +22,13 @@ class FORTE_F_WSTRING_TO_BOOL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WSTRING &IN() { + CIEC_WSTRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BOOL &OUT() { + CIEC_BOOL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_BYTE.cpp b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_BYTE.cpp index 5b3889e1b..543527084 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_BYTE.cpp +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_BYTE.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_WSTRING_TO_BYTE::scm_stFBInterfaceSpec = { void FORTE_F_WSTRING_TO_BYTE::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WSTRING_TO_BYTE(IN()); + st_OUT() = WSTRING_TO_BYTE(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_BYTE.h b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_BYTE.h index 62068aa2e..c426f1b89 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_BYTE.h +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_BYTE.h @@ -22,13 +22,13 @@ class FORTE_F_WSTRING_TO_BYTE: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WSTRING &IN() { + CIEC_WSTRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_BYTE &OUT() { + CIEC_BYTE &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_DINT.cpp b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_DINT.cpp index 7fc900b9a..b42f6251c 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_DINT.cpp +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_DINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_WSTRING_TO_DINT::scm_stFBInterfaceSpec = { void FORTE_F_WSTRING_TO_DINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WSTRING_TO_DINT(IN()); + st_OUT() = WSTRING_TO_DINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_DINT.h b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_DINT.h index 42ecc54a4..82bef95d6 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_DINT.h +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_DINT.h @@ -22,13 +22,13 @@ class FORTE_F_WSTRING_TO_DINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WSTRING &IN() { + CIEC_WSTRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DINT &OUT() { + CIEC_DINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_DWORD.cpp b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_DWORD.cpp index 823718692..d89dc1022 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_DWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_DWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_WSTRING_TO_DWORD::scm_stFBInterfaceSpec = { void FORTE_F_WSTRING_TO_DWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WSTRING_TO_DWORD(IN()); + st_OUT() = WSTRING_TO_DWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_DWORD.h b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_DWORD.h index da3bf5fd1..52f5915d8 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_DWORD.h +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_DWORD.h @@ -22,13 +22,13 @@ class FORTE_F_WSTRING_TO_DWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WSTRING &IN() { + CIEC_WSTRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_DWORD &OUT() { + CIEC_DWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_INT.cpp b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_INT.cpp index 58618cbd0..b822b8518 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_INT.cpp +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_INT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_WSTRING_TO_INT::scm_stFBInterfaceSpec = { void FORTE_F_WSTRING_TO_INT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WSTRING_TO_INT(IN()); + st_OUT() = WSTRING_TO_INT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_INT.h b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_INT.h index bef8c097e..4771fc2a1 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_INT.h +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_INT.h @@ -22,13 +22,13 @@ class FORTE_F_WSTRING_TO_INT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WSTRING &IN() { + CIEC_WSTRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_INT &OUT() { + CIEC_INT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LINT.cpp b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LINT.cpp index 431be8625..4b2795ca1 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LINT.cpp +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_WSTRING_TO_LINT::scm_stFBInterfaceSpec = { void FORTE_F_WSTRING_TO_LINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WSTRING_TO_LINT(IN()); + st_OUT() = WSTRING_TO_LINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LINT.h b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LINT.h index 9cc5d76d2..73c527688 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LINT.h +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LINT.h @@ -22,13 +22,13 @@ class FORTE_F_WSTRING_TO_LINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WSTRING &IN() { + CIEC_WSTRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LINT &OUT() { + CIEC_LINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LREAL.cpp b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LREAL.cpp index 86236ab2a..4c2031a66 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LREAL.cpp +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LREAL.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_WSTRING_TO_LREAL::scm_stFBInterfaceSpec = { void FORTE_F_WSTRING_TO_LREAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WSTRING_TO_LREAL(IN()); + st_OUT() = WSTRING_TO_LREAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LREAL.h b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LREAL.h index 849ab6331..067580dc6 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LREAL.h +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LREAL.h @@ -22,13 +22,13 @@ class FORTE_F_WSTRING_TO_LREAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WSTRING &IN() { + CIEC_WSTRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LREAL &OUT() { + CIEC_LREAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LWORD.cpp b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LWORD.cpp index d4b79a3aa..9bfdbc370 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LWORD.cpp +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LWORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_WSTRING_TO_LWORD::scm_stFBInterfaceSpec = { void FORTE_F_WSTRING_TO_LWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WSTRING_TO_LWORD(IN()); + st_OUT() = WSTRING_TO_LWORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LWORD.h b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LWORD.h index f267c087e..5b2d77b5e 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LWORD.h +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_LWORD.h @@ -22,13 +22,13 @@ class FORTE_F_WSTRING_TO_LWORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WSTRING &IN() { + CIEC_WSTRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_LWORD &OUT() { + CIEC_LWORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_REAL.cpp b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_REAL.cpp index df336e64c..d263e1744 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_REAL.cpp +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_REAL.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_WSTRING_TO_REAL::scm_stFBInterfaceSpec = { void FORTE_F_WSTRING_TO_REAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WSTRING_TO_REAL(IN()); + st_OUT() = WSTRING_TO_REAL(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_REAL.h b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_REAL.h index 9d26baec7..769da0c61 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_REAL.h +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_REAL.h @@ -22,13 +22,13 @@ class FORTE_F_WSTRING_TO_REAL: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WSTRING &IN() { + CIEC_WSTRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_REAL &OUT() { + CIEC_REAL &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_SINT.cpp b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_SINT.cpp index fda60465f..b2aa32c84 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_SINT.cpp +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_SINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_WSTRING_TO_SINT::scm_stFBInterfaceSpec = { void FORTE_F_WSTRING_TO_SINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WSTRING_TO_SINT(IN()); + st_OUT() = WSTRING_TO_SINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_SINT.h b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_SINT.h index 90d634faf..38f58195c 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_SINT.h +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_SINT.h @@ -22,13 +22,13 @@ class FORTE_F_WSTRING_TO_SINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WSTRING &IN() { + CIEC_WSTRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_SINT &OUT() { + CIEC_SINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_STRING.cpp b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_STRING.cpp index 7720ab1dd..4261e4b7a 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_STRING.cpp +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_STRING.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_WSTRING_TO_STRING::scm_stFBInterfaceSpec = { void FORTE_F_WSTRING_TO_STRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WSTRING_TO_STRING(IN()); + st_OUT() = WSTRING_TO_STRING(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_STRING.h b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_STRING.h index e35f85ee2..5f3d57dbe 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_STRING.h +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_STRING.h @@ -22,13 +22,13 @@ class FORTE_F_WSTRING_TO_STRING: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WSTRING &IN() { + CIEC_WSTRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_STRING &OUT() { + CIEC_STRING &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_TIME.cpp b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_TIME.cpp index c9d36c2ef..9409a5d6f 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_TIME.cpp +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_TIME.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_WSTRING_TO_TIME::scm_stFBInterfaceSpec = { void FORTE_F_WSTRING_TO_TIME::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WSTRING_TO_TIME(IN()); + st_OUT() = WSTRING_TO_TIME(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_TIME.h b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_TIME.h index b6f771877..6bc037e6d 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_TIME.h +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_TIME.h @@ -22,13 +22,13 @@ class FORTE_F_WSTRING_TO_TIME: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WSTRING &IN() { + CIEC_WSTRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_TIME &OUT() { + CIEC_TIME &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_UDINT.cpp b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_UDINT.cpp index c7abdb9b6..70fbe77ed 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_UDINT.cpp +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_UDINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_WSTRING_TO_UDINT::scm_stFBInterfaceSpec = { void FORTE_F_WSTRING_TO_UDINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WSTRING_TO_UDINT(IN()); + st_OUT() = WSTRING_TO_UDINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_UDINT.h b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_UDINT.h index 2ac1addbd..c3c8abbd5 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_UDINT.h +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_UDINT.h @@ -22,13 +22,13 @@ class FORTE_F_WSTRING_TO_UDINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WSTRING &IN() { + CIEC_WSTRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UDINT &OUT() { + CIEC_UDINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_UINT.cpp b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_UINT.cpp index ce6ed9425..a4355fabb 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_UINT.cpp +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_UINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_WSTRING_TO_UINT::scm_stFBInterfaceSpec = { void FORTE_F_WSTRING_TO_UINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WSTRING_TO_UINT(IN()); + st_OUT() = WSTRING_TO_UINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_UINT.h b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_UINT.h index 1b008a9d7..339199c60 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_UINT.h +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_UINT.h @@ -22,13 +22,13 @@ class FORTE_F_WSTRING_TO_UINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WSTRING &IN() { + CIEC_WSTRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_UINT &OUT() { + CIEC_UINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_ULINT.cpp b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_ULINT.cpp index b3c589849..f3ff14af5 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_ULINT.cpp +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_ULINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_WSTRING_TO_ULINT::scm_stFBInterfaceSpec = { void FORTE_F_WSTRING_TO_ULINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WSTRING_TO_ULINT(IN()); + st_OUT() = WSTRING_TO_ULINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_ULINT.h b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_ULINT.h index 0abd7cc6c..44e43cea0 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_ULINT.h +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_ULINT.h @@ -22,13 +22,13 @@ class FORTE_F_WSTRING_TO_ULINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WSTRING &IN() { + CIEC_WSTRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ULINT &OUT() { + CIEC_ULINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_USINT.cpp b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_USINT.cpp index 895fbcf0c..5d648f5b6 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_USINT.cpp +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_USINT.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_WSTRING_TO_USINT::scm_stFBInterfaceSpec = { void FORTE_F_WSTRING_TO_USINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WSTRING_TO_USINT(IN()); + st_OUT() = WSTRING_TO_USINT(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_USINT.h b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_USINT.h index c0ca5f561..19a8c0165 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_USINT.h +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_USINT.h @@ -22,13 +22,13 @@ class FORTE_F_WSTRING_TO_USINT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WSTRING &IN() { + CIEC_WSTRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_USINT &OUT() { + CIEC_USINT &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_WORD.cpp b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_WORD.cpp index 4bd280b14..7f803d34f 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_WORD.cpp +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_WORD.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_WSTRING_TO_WORD::scm_stFBInterfaceSpec = { void FORTE_F_WSTRING_TO_WORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = WSTRING_TO_WORD(IN()); + st_OUT() = WSTRING_TO_WORD(st_IN()); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_WORD.h b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_WORD.h index 5f99f7238..1f2b44f6e 100644 --- a/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_WORD.h +++ b/src/modules/IEC61131-3/Conversion/WSTRING/F_WSTRING_TO_WORD.h @@ -22,13 +22,13 @@ class FORTE_F_WSTRING_TO_WORD: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_WSTRING &IN() { + CIEC_WSTRING &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_WORD &OUT() { + CIEC_WORD &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Numerical/F_ABS.cpp b/src/modules/IEC61131-3/Numerical/F_ABS.cpp index 4d07dcee0..833c4a5e6 100644 --- a/src/modules/IEC61131-3/Numerical/F_ABS.cpp +++ b/src/modules/IEC61131-3/Numerical/F_ABS.cpp @@ -45,7 +45,7 @@ const SFBInterfaceSpec FORTE_F_ABS::scm_stFBInterfaceSpec = { void FORTE_F_ABS::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyMagnitudeFBHelper(IN().getDataTypeID(), *this); + anyMagnitudeFBHelper(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Numerical/F_ABS.h b/src/modules/IEC61131-3/Numerical/F_ABS.h index 3d92a9747..88c6e8599 100644 --- a/src/modules/IEC61131-3/Numerical/F_ABS.h +++ b/src/modules/IEC61131-3/Numerical/F_ABS.h @@ -22,13 +22,13 @@ class FORTE_F_ABS: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_NUM &IN() { + CIEC_ANY_NUM &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_NUM &OUT() { + CIEC_ANY_NUM &st_OUT() { return *static_cast(getDO(0)); }; @@ -54,8 +54,8 @@ class FORTE_F_ABS: public CFunctionBlock{ template void calculateValue(){ T oIn; - oIn.saveAssign(IN()); - OUT().saveAssign(ABS(oIn)); + oIn.saveAssign(st_IN()); + st_OUT().saveAssign(ABS(oIn)); } virtual ~FORTE_F_ABS(){}; diff --git a/src/modules/IEC61131-3/Numerical/F_ACOS.cpp b/src/modules/IEC61131-3/Numerical/F_ACOS.cpp index ef2e3fb6b..7c0db4908 100644 --- a/src/modules/IEC61131-3/Numerical/F_ACOS.cpp +++ b/src/modules/IEC61131-3/Numerical/F_ACOS.cpp @@ -45,7 +45,7 @@ const SFBInterfaceSpec FORTE_F_ACOS::scm_stFBInterfaceSpec = { void FORTE_F_ACOS::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyRealFBHelper(IN().getDataTypeID(), *this); + anyRealFBHelper(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Numerical/F_ACOS.h b/src/modules/IEC61131-3/Numerical/F_ACOS.h index 29ddf9e7c..e9163afe7 100644 --- a/src/modules/IEC61131-3/Numerical/F_ACOS.h +++ b/src/modules/IEC61131-3/Numerical/F_ACOS.h @@ -22,13 +22,13 @@ class FORTE_F_ACOS: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_REAL &IN() { + CIEC_ANY_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_REAL &OUT() { + CIEC_ANY_REAL &st_OUT() { return *static_cast(getDO(0)); }; @@ -54,8 +54,8 @@ class FORTE_F_ACOS: public CFunctionBlock{ template void calculateValue(){ T oIn; - oIn.saveAssign(IN()); - OUT().saveAssign(ACOS(oIn)); + oIn.saveAssign(st_IN()); + st_OUT().saveAssign(ACOS(oIn)); } virtual ~FORTE_F_ACOS(){}; diff --git a/src/modules/IEC61131-3/Numerical/F_ASIN.cpp b/src/modules/IEC61131-3/Numerical/F_ASIN.cpp index 5ba91b8e6..451b28309 100644 --- a/src/modules/IEC61131-3/Numerical/F_ASIN.cpp +++ b/src/modules/IEC61131-3/Numerical/F_ASIN.cpp @@ -45,7 +45,7 @@ const SFBInterfaceSpec FORTE_F_ASIN::scm_stFBInterfaceSpec = { void FORTE_F_ASIN::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyRealFBHelper(IN().getDataTypeID(), *this); + anyRealFBHelper(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Numerical/F_ASIN.h b/src/modules/IEC61131-3/Numerical/F_ASIN.h index 016af969f..f2593f018 100644 --- a/src/modules/IEC61131-3/Numerical/F_ASIN.h +++ b/src/modules/IEC61131-3/Numerical/F_ASIN.h @@ -22,13 +22,13 @@ class FORTE_F_ASIN: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_REAL &IN() { + CIEC_ANY_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_REAL &OUT() { + CIEC_ANY_REAL &st_OUT() { return *static_cast(getDO(0)); }; @@ -54,8 +54,8 @@ class FORTE_F_ASIN: public CFunctionBlock{ template void calculateValue(){ T oIn; - oIn.saveAssign(IN()); - OUT().saveAssign(ASIN(oIn)); + oIn.saveAssign(st_IN()); + st_OUT().saveAssign(ASIN(oIn)); } virtual ~FORTE_F_ASIN(){}; diff --git a/src/modules/IEC61131-3/Numerical/F_ATAN.cpp b/src/modules/IEC61131-3/Numerical/F_ATAN.cpp index 4fd7e4e18..3bc0c2a68 100644 --- a/src/modules/IEC61131-3/Numerical/F_ATAN.cpp +++ b/src/modules/IEC61131-3/Numerical/F_ATAN.cpp @@ -45,7 +45,7 @@ const SFBInterfaceSpec FORTE_F_ATAN::scm_stFBInterfaceSpec = { void FORTE_F_ATAN::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyRealFBHelper(IN().getDataTypeID(), *this); + anyRealFBHelper(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Numerical/F_ATAN.h b/src/modules/IEC61131-3/Numerical/F_ATAN.h index 0719597ea..20c76ddbe 100644 --- a/src/modules/IEC61131-3/Numerical/F_ATAN.h +++ b/src/modules/IEC61131-3/Numerical/F_ATAN.h @@ -22,13 +22,13 @@ class FORTE_F_ATAN: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_REAL &IN() { + CIEC_ANY_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_REAL &OUT() { + CIEC_ANY_REAL &st_OUT() { return *static_cast(getDO(0)); }; @@ -54,8 +54,8 @@ class FORTE_F_ATAN: public CFunctionBlock{ template void calculateValue(){ T oIn; - oIn.saveAssign(IN()); - OUT().saveAssign(ATAN(oIn)); + oIn.saveAssign(st_IN()); + st_OUT().saveAssign(ATAN(oIn)); } virtual ~FORTE_F_ATAN(){}; diff --git a/src/modules/IEC61131-3/Numerical/F_COS.cpp b/src/modules/IEC61131-3/Numerical/F_COS.cpp index f519e0558..4e361bc80 100644 --- a/src/modules/IEC61131-3/Numerical/F_COS.cpp +++ b/src/modules/IEC61131-3/Numerical/F_COS.cpp @@ -45,7 +45,7 @@ const SFBInterfaceSpec FORTE_F_COS::scm_stFBInterfaceSpec = { void FORTE_F_COS::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyRealFBHelper(IN().getDataTypeID(), *this); + anyRealFBHelper(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Numerical/F_COS.h b/src/modules/IEC61131-3/Numerical/F_COS.h index a752cacb3..9943db41e 100644 --- a/src/modules/IEC61131-3/Numerical/F_COS.h +++ b/src/modules/IEC61131-3/Numerical/F_COS.h @@ -22,13 +22,13 @@ class FORTE_F_COS: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_REAL &IN() { + CIEC_ANY_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_REAL &OUT() { + CIEC_ANY_REAL &st_OUT() { return *static_cast(getDO(0)); }; @@ -54,8 +54,8 @@ class FORTE_F_COS: public CFunctionBlock{ template void calculateValue(){ T oIn; - oIn.saveAssign(IN()); - OUT().saveAssign(COS(oIn)); + oIn.saveAssign(st_IN()); + st_OUT().saveAssign(COS(oIn)); } virtual ~FORTE_F_COS(){}; diff --git a/src/modules/IEC61131-3/Numerical/F_EXP.cpp b/src/modules/IEC61131-3/Numerical/F_EXP.cpp index 1a679a5b4..6e122369b 100644 --- a/src/modules/IEC61131-3/Numerical/F_EXP.cpp +++ b/src/modules/IEC61131-3/Numerical/F_EXP.cpp @@ -44,7 +44,7 @@ const SFBInterfaceSpec FORTE_F_EXP::scm_stFBInterfaceSpec = { void FORTE_F_EXP::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyRealFBHelper(IN().getDataTypeID(), *this); + anyRealFBHelper(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Numerical/F_EXP.h b/src/modules/IEC61131-3/Numerical/F_EXP.h index 4478aa8de..334e6ab78 100644 --- a/src/modules/IEC61131-3/Numerical/F_EXP.h +++ b/src/modules/IEC61131-3/Numerical/F_EXP.h @@ -21,13 +21,13 @@ class FORTE_F_EXP: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_REAL &IN() { + CIEC_ANY_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_REAL &OUT() { + CIEC_ANY_REAL &st_OUT() { return *static_cast(getDO(0)); }; @@ -53,8 +53,8 @@ class FORTE_F_EXP: public CFunctionBlock{ template void calculateValue(){ T oIn; - oIn.saveAssign(IN()); - OUT().saveAssign(EXP(oIn)); + oIn.saveAssign(st_IN()); + st_OUT().saveAssign(EXP(oIn)); } virtual ~FORTE_F_EXP(){}; diff --git a/src/modules/IEC61131-3/Numerical/F_LN.cpp b/src/modules/IEC61131-3/Numerical/F_LN.cpp index 0ce60a06f..97577dc77 100644 --- a/src/modules/IEC61131-3/Numerical/F_LN.cpp +++ b/src/modules/IEC61131-3/Numerical/F_LN.cpp @@ -45,7 +45,7 @@ const SFBInterfaceSpec FORTE_F_LN::scm_stFBInterfaceSpec = { void FORTE_F_LN::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyRealFBHelper(IN().getDataTypeID(), *this); + anyRealFBHelper(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Numerical/F_LN.h b/src/modules/IEC61131-3/Numerical/F_LN.h index 3293268d2..44f27204e 100644 --- a/src/modules/IEC61131-3/Numerical/F_LN.h +++ b/src/modules/IEC61131-3/Numerical/F_LN.h @@ -22,13 +22,13 @@ class FORTE_F_LN: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_REAL &IN() { + CIEC_ANY_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_REAL &OUT() { + CIEC_ANY_REAL &st_OUT() { return *static_cast(getDO(0)); }; @@ -54,8 +54,8 @@ class FORTE_F_LN: public CFunctionBlock{ template void calculateValue(){ T oIn; - oIn.saveAssign(IN()); - OUT().saveAssign(LN(oIn)); + oIn.saveAssign(st_IN()); + st_OUT().saveAssign(LN(oIn)); } virtual ~FORTE_F_LN(){}; diff --git a/src/modules/IEC61131-3/Numerical/F_LOG.cpp b/src/modules/IEC61131-3/Numerical/F_LOG.cpp index ed4c935d2..cc5273184 100644 --- a/src/modules/IEC61131-3/Numerical/F_LOG.cpp +++ b/src/modules/IEC61131-3/Numerical/F_LOG.cpp @@ -45,7 +45,7 @@ const SFBInterfaceSpec FORTE_F_LOG::scm_stFBInterfaceSpec = { void FORTE_F_LOG::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyRealFBHelper(IN().getDataTypeID(), *this); + anyRealFBHelper(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Numerical/F_LOG.h b/src/modules/IEC61131-3/Numerical/F_LOG.h index b85303d2e..0606ffb2b 100644 --- a/src/modules/IEC61131-3/Numerical/F_LOG.h +++ b/src/modules/IEC61131-3/Numerical/F_LOG.h @@ -22,13 +22,13 @@ class FORTE_F_LOG: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_REAL &IN() { + CIEC_ANY_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_REAL &OUT() { + CIEC_ANY_REAL &st_OUT() { return *static_cast(getDO(0)); }; @@ -54,8 +54,8 @@ class FORTE_F_LOG: public CFunctionBlock{ template void calculateValue(){ T oIn; - oIn.saveAssign(IN()); - OUT().saveAssign(LOG(oIn)); + oIn.saveAssign(st_IN()); + st_OUT().saveAssign(LOG(oIn)); } virtual ~FORTE_F_LOG(){}; diff --git a/src/modules/IEC61131-3/Numerical/F_SIN.cpp b/src/modules/IEC61131-3/Numerical/F_SIN.cpp index 3ad182338..1a7cfd7d2 100644 --- a/src/modules/IEC61131-3/Numerical/F_SIN.cpp +++ b/src/modules/IEC61131-3/Numerical/F_SIN.cpp @@ -45,7 +45,7 @@ const SFBInterfaceSpec FORTE_F_SIN::scm_stFBInterfaceSpec = { void FORTE_F_SIN::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyRealFBHelper(IN().getDataTypeID(), *this); + anyRealFBHelper(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Numerical/F_SIN.h b/src/modules/IEC61131-3/Numerical/F_SIN.h index f7f8a883a..2470f1211 100644 --- a/src/modules/IEC61131-3/Numerical/F_SIN.h +++ b/src/modules/IEC61131-3/Numerical/F_SIN.h @@ -22,13 +22,13 @@ class FORTE_F_SIN: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_REAL &IN() { + CIEC_ANY_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_REAL &OUT() { + CIEC_ANY_REAL &st_OUT() { return *static_cast(getDO(0)); }; @@ -54,8 +54,8 @@ class FORTE_F_SIN: public CFunctionBlock{ template void calculateValue(){ T oIn; - oIn.saveAssign(IN()); - OUT().saveAssign(SIN(oIn)); + oIn.saveAssign(st_IN()); + st_OUT().saveAssign(SIN(oIn)); } virtual ~FORTE_F_SIN(){}; diff --git a/src/modules/IEC61131-3/Numerical/F_SQRT.cpp b/src/modules/IEC61131-3/Numerical/F_SQRT.cpp index 1344eca86..fc940c737 100644 --- a/src/modules/IEC61131-3/Numerical/F_SQRT.cpp +++ b/src/modules/IEC61131-3/Numerical/F_SQRT.cpp @@ -45,7 +45,7 @@ const SFBInterfaceSpec FORTE_F_SQRT::scm_stFBInterfaceSpec = { void FORTE_F_SQRT::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyRealFBHelper(IN().getDataTypeID(), *this); + anyRealFBHelper(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Numerical/F_SQRT.h b/src/modules/IEC61131-3/Numerical/F_SQRT.h index aa34d0aa5..d2000fdb2 100644 --- a/src/modules/IEC61131-3/Numerical/F_SQRT.h +++ b/src/modules/IEC61131-3/Numerical/F_SQRT.h @@ -22,13 +22,13 @@ class FORTE_F_SQRT: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_REAL &IN() { + CIEC_ANY_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_REAL &OUT() { + CIEC_ANY_REAL &st_OUT() { return *static_cast(getDO(0)); }; @@ -54,8 +54,8 @@ class FORTE_F_SQRT: public CFunctionBlock{ template void calculateValue(){ T oIn; - oIn.saveAssign(IN()); - OUT().saveAssign(SQRT(oIn)); + oIn.saveAssign(st_IN()); + st_OUT().saveAssign(SQRT(oIn)); } virtual ~FORTE_F_SQRT(){}; diff --git a/src/modules/IEC61131-3/Numerical/F_TAN.cpp b/src/modules/IEC61131-3/Numerical/F_TAN.cpp index 94f37868b..6d95a62a5 100644 --- a/src/modules/IEC61131-3/Numerical/F_TAN.cpp +++ b/src/modules/IEC61131-3/Numerical/F_TAN.cpp @@ -45,7 +45,7 @@ const SFBInterfaceSpec FORTE_F_TAN::scm_stFBInterfaceSpec = { void FORTE_F_TAN::executeEvent(int pa_nEIID){ if (scm_nEventREQID == pa_nEIID) { - anyRealFBHelper(IN().getDataTypeID(), *this); + anyRealFBHelper(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Numerical/F_TAN.h b/src/modules/IEC61131-3/Numerical/F_TAN.h index bc0efeac4..6a0ee7d6a 100644 --- a/src/modules/IEC61131-3/Numerical/F_TAN.h +++ b/src/modules/IEC61131-3/Numerical/F_TAN.h @@ -22,13 +22,13 @@ class FORTE_F_TAN: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ANY_REAL &IN() { + CIEC_ANY_REAL &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_REAL &OUT() { + CIEC_ANY_REAL &st_OUT() { return *static_cast(getDO(0)); }; @@ -54,8 +54,8 @@ class FORTE_F_TAN: public CFunctionBlock{ template void calculateValue(){ T oIn; - oIn.saveAssign(IN()); - OUT().saveAssign(TAN(oIn)); + oIn.saveAssign(st_IN()); + st_OUT().saveAssign(TAN(oIn)); } virtual ~FORTE_F_TAN(){}; diff --git a/src/modules/IEC61131-3/Selection/F_LIMIT.cpp b/src/modules/IEC61131-3/Selection/F_LIMIT.cpp index 343627b4b..dbeec7190 100644 --- a/src/modules/IEC61131-3/Selection/F_LIMIT.cpp +++ b/src/modules/IEC61131-3/Selection/F_LIMIT.cpp @@ -49,7 +49,7 @@ const SFBInterfaceSpec FORTE_F_LIMIT::scm_stFBInterfaceSpec = { 1, void FORTE_F_LIMIT::executeEvent(int pa_nEIID) { if (scm_nEventREQID == pa_nEIID) { - anyElementaryFBHelper(IN().getDataTypeID(), *this); + anyElementaryFBHelper(st_IN().getDataTypeID(), *this); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Selection/F_LIMIT.h b/src/modules/IEC61131-3/Selection/F_LIMIT.h index 54a7c95d2..bf3e705cd 100644 --- a/src/modules/IEC61131-3/Selection/F_LIMIT.h +++ b/src/modules/IEC61131-3/Selection/F_LIMIT.h @@ -26,7 +26,7 @@ class FORTE_F_LIMIT : public CFunctionBlock{ } ; - CIEC_ANY_ELEMENTARY &IN(){ + CIEC_ANY_ELEMENTARY &st_IN(){ return *static_cast(getDI(1)); } ; @@ -38,7 +38,7 @@ class FORTE_F_LIMIT : public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_ELEMENTARY &OUT(){ + CIEC_ANY_ELEMENTARY &st_OUT(){ return *static_cast(getDO(0)); } ; @@ -71,7 +71,7 @@ class FORTE_F_LIMIT : public CFunctionBlock{ oMin.saveAssign(MN()); oMax.saveAssign(MX()); - OUT().saveAssign(LIMIT (oMin, static_cast (IN()), oMax)); + st_OUT().saveAssign(LIMIT (oMin, static_cast (st_IN()), oMax)); } template void calculateValueString() const { diff --git a/src/modules/IEC61131-3/Selection/F_MAX.h b/src/modules/IEC61131-3/Selection/F_MAX.h index bc56b98a5..0debc629d 100644 --- a/src/modules/IEC61131-3/Selection/F_MAX.h +++ b/src/modules/IEC61131-3/Selection/F_MAX.h @@ -31,7 +31,7 @@ class FORTE_F_MAX: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_ELEMENTARY &OUT() { + CIEC_ANY_ELEMENTARY &st_OUT() { return *static_cast(getDO(0)); }; @@ -62,7 +62,7 @@ class FORTE_F_MAX: public CFunctionBlock{ oMin.saveAssign(IN1()); oMax.saveAssign(IN2()); - OUT().saveAssign(MAX (oMin, oMax)); + st_OUT().saveAssign(MAX (oMin, oMax)); } template void calculateValueString() const { diff --git a/src/modules/IEC61131-3/Selection/F_MIN.h b/src/modules/IEC61131-3/Selection/F_MIN.h index 40c0b67af..afc6ffd01 100644 --- a/src/modules/IEC61131-3/Selection/F_MIN.h +++ b/src/modules/IEC61131-3/Selection/F_MIN.h @@ -31,7 +31,7 @@ class FORTE_F_MIN: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY_ELEMENTARY &OUT() { + CIEC_ANY_ELEMENTARY &st_OUT() { return *static_cast(getDO(0)); }; @@ -64,7 +64,7 @@ class FORTE_F_MIN: public CFunctionBlock{ oMin.saveAssign(IN1()); oMax.saveAssign(IN2()); - OUT().saveAssign(MIN (oMin, oMax)); + st_OUT().saveAssign(MIN (oMin, oMax)); } template void calculateValueString() const { diff --git a/src/modules/IEC61131-3/Selection/F_MUX_2.cpp b/src/modules/IEC61131-3/Selection/F_MUX_2.cpp index 3fc345fb7..9100d0e42 100644 --- a/src/modules/IEC61131-3/Selection/F_MUX_2.cpp +++ b/src/modules/IEC61131-3/Selection/F_MUX_2.cpp @@ -47,7 +47,7 @@ void FORTE_F_MUX_2::executeEvent(int pa_nEIID){ if(K().isSigned() && (K().getSignedValue() < 0 || K().getSignedValue() > 1)){ DEVLOG_ERROR("value of input K is not between 0 and 1\n"); }else{ - OUT().saveAssign(*static_cast(getDI( static_cast(K().getUnsignedValue() + 1)))); + st_OUT().saveAssign(*static_cast(getDI( static_cast(K().getUnsignedValue() + 1)))); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/IEC61131-3/Selection/F_MUX_2.h b/src/modules/IEC61131-3/Selection/F_MUX_2.h index b60a0c47a..c137dbef3 100644 --- a/src/modules/IEC61131-3/Selection/F_MUX_2.h +++ b/src/modules/IEC61131-3/Selection/F_MUX_2.h @@ -36,7 +36,7 @@ class FORTE_F_MUX_2: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY &OUT() { + CIEC_ANY &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/IEC61131-3/Selection/F_SEL.h b/src/modules/IEC61131-3/Selection/F_SEL.h index 362a5dd38..5e5057e08 100644 --- a/src/modules/IEC61131-3/Selection/F_SEL.h +++ b/src/modules/IEC61131-3/Selection/F_SEL.h @@ -37,7 +37,7 @@ class FORTE_F_SEL: public CFunctionBlock{ static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ANY &OUT() { + CIEC_ANY &st_OUT() { return *static_cast(getDO(0)); }; @@ -69,7 +69,7 @@ class FORTE_F_SEL: public CFunctionBlock{ oIn0.saveAssign(IN0()); oIn1.saveAssign(IN1()); - OUT().saveAssign(SEL (G(), oIn0, oIn1)); + st_OUT().saveAssign(SEL (G(), oIn0, oIn1)); } template void calculateValueString(){ diff --git a/src/modules/IEC61131-3/Timers/FB_TOF.cpp b/src/modules/IEC61131-3/Timers/FB_TOF.cpp index 59bc7e0f5..70e05b463 100644 --- a/src/modules/IEC61131-3/Timers/FB_TOF.cpp +++ b/src/modules/IEC61131-3/Timers/FB_TOF.cpp @@ -50,7 +50,7 @@ const SFBInterfaceSpec FB_TOF::scm_stFBInterfaceSpec = { void FB_TOF::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - if(IN() == true){ + if(st_IN() == true){ Q() = true; ET() = 0; fallingEdge = false; diff --git a/src/modules/IEC61131-3/Timers/FB_TOF.h b/src/modules/IEC61131-3/Timers/FB_TOF.h index e80b3f67b..137333f4a 100644 --- a/src/modules/IEC61131-3/Timers/FB_TOF.h +++ b/src/modules/IEC61131-3/Timers/FB_TOF.h @@ -43,7 +43,7 @@ class FB_TOF: public CFunctionBlock{ void executeEvent(int pa_nEIID); - CIEC_BOOL& IN() { + CIEC_BOOL& st_IN() { return *static_cast(getDI(0)); } diff --git a/src/modules/IEC61131-3/Timers/FB_TON.cpp b/src/modules/IEC61131-3/Timers/FB_TON.cpp index 5594aa1e8..d50904287 100644 --- a/src/modules/IEC61131-3/Timers/FB_TON.cpp +++ b/src/modules/IEC61131-3/Timers/FB_TON.cpp @@ -50,7 +50,7 @@ const SFBInterfaceSpec FB_TON::scm_stFBInterfaceSpec = { void FB_TON::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - if(IN() == false){ + if(st_IN() == false){ Q() = false; ET() = 0; risingEdge = false; diff --git a/src/modules/IEC61131-3/Timers/FB_TON.h b/src/modules/IEC61131-3/Timers/FB_TON.h index 7b0e6a7f0..5d8f6955b 100644 --- a/src/modules/IEC61131-3/Timers/FB_TON.h +++ b/src/modules/IEC61131-3/Timers/FB_TON.h @@ -42,7 +42,7 @@ class FB_TON: public CFunctionBlock{ void executeEvent(int pa_nEIID); - CIEC_BOOL& IN() { + CIEC_BOOL& st_IN() { return *static_cast(getDI(0)); } diff --git a/src/modules/IEC61131-3/Timers/FB_TP.cpp b/src/modules/IEC61131-3/Timers/FB_TP.cpp index 991527a7a..9761bd0eb 100644 --- a/src/modules/IEC61131-3/Timers/FB_TP.cpp +++ b/src/modules/IEC61131-3/Timers/FB_TP.cpp @@ -61,14 +61,14 @@ void FB_TP::executeEvent(int pa_nEIID){ } } else { - if(IN() == true && ET() == 0){ + if(st_IN() == true && ET() == 0){ Q() = true; edgeFlag = true; start = NOW_MONOTONIC(); DEVLOG_DEBUG("start\n"); } else - if((false == IN()) && (ET()>0)) { + if((false == st_IN()) && (ET()>0)) { ET() = 0; DEVLOG_DEBUG("reset\n"); } diff --git a/src/modules/IEC61131-3/Timers/FB_TP.h b/src/modules/IEC61131-3/Timers/FB_TP.h index c0f849875..d3ffa5656 100644 --- a/src/modules/IEC61131-3/Timers/FB_TP.h +++ b/src/modules/IEC61131-3/Timers/FB_TP.h @@ -41,7 +41,7 @@ class FB_TP: public CFunctionBlock{ void executeEvent(int pa_nEIID); - CIEC_BOOL& IN() { + CIEC_BOOL& st_IN() { return *static_cast(getDI(0)); } diff --git a/src/modules/arrowhead/orchestrator/OrchestrationForm2OrchestrationForm.cpp b/src/modules/arrowhead/orchestrator/OrchestrationForm2OrchestrationForm.cpp index 60da0e8e8..622af15a4 100644 --- a/src/modules/arrowhead/orchestrator/OrchestrationForm2OrchestrationForm.cpp +++ b/src/modules/arrowhead/orchestrator/OrchestrationForm2OrchestrationForm.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_OrchestrationForm2OrchestrationForm::scm_stFBInterf void FORTE_OrchestrationForm2OrchestrationForm::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID) { - OUT() = IN(); + st_OUT() = st_IN(); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/arrowhead/orchestrator/OrchestrationForm2OrchestrationForm.h b/src/modules/arrowhead/orchestrator/OrchestrationForm2OrchestrationForm.h index 1188e17c2..2bc264b11 100644 --- a/src/modules/arrowhead/orchestrator/OrchestrationForm2OrchestrationForm.h +++ b/src/modules/arrowhead/orchestrator/OrchestrationForm2OrchestrationForm.h @@ -22,13 +22,13 @@ class FORTE_OrchestrationForm2OrchestrationForm: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_OrchestrationForm &IN() { + CIEC_OrchestrationForm &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_OrchestrationForm &OUT() { + CIEC_OrchestrationForm &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/arrowhead/serviceRegistry/ServiceRegistryEntry2ServiceRegistryEntry.cpp b/src/modules/arrowhead/serviceRegistry/ServiceRegistryEntry2ServiceRegistryEntry.cpp index 1286998f9..52420ae13 100644 --- a/src/modules/arrowhead/serviceRegistry/ServiceRegistryEntry2ServiceRegistryEntry.cpp +++ b/src/modules/arrowhead/serviceRegistry/ServiceRegistryEntry2ServiceRegistryEntry.cpp @@ -43,7 +43,7 @@ const SFBInterfaceSpec FORTE_ServiceRegistryEntry2ServiceRegistryEntry::scm_stFB void FORTE_ServiceRegistryEntry2ServiceRegistryEntry::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID) { - OUT() = IN(); + st_OUT() = st_IN(); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/arrowhead/serviceRegistry/ServiceRegistryEntry2ServiceRegistryEntry.h b/src/modules/arrowhead/serviceRegistry/ServiceRegistryEntry2ServiceRegistryEntry.h index 315e72946..3ccb07d23 100644 --- a/src/modules/arrowhead/serviceRegistry/ServiceRegistryEntry2ServiceRegistryEntry.h +++ b/src/modules/arrowhead/serviceRegistry/ServiceRegistryEntry2ServiceRegistryEntry.h @@ -22,13 +22,13 @@ class FORTE_ServiceRegistryEntry2ServiceRegistryEntry: public CFunctionBlock{ private: static const CStringDictionary::TStringId scm_anDataInputNames[]; static const CStringDictionary::TStringId scm_anDataInputTypeIds[]; - CIEC_ServiceRegistryEntry &IN() { + CIEC_ServiceRegistryEntry &st_IN() { return *static_cast(getDI(0)); }; static const CStringDictionary::TStringId scm_anDataOutputNames[]; static const CStringDictionary::TStringId scm_anDataOutputTypeIds[]; - CIEC_ServiceRegistryEntry &OUT() { + CIEC_ServiceRegistryEntry &st_OUT() { return *static_cast(getDO(0)); }; diff --git a/src/modules/convert/BOOL2BOOL.cpp b/src/modules/convert/BOOL2BOOL.cpp index 7a1ede896..90beb353a 100644 --- a/src/modules/convert/BOOL2BOOL.cpp +++ b/src/modules/convert/BOOL2BOOL.cpp @@ -50,7 +50,7 @@ const SFBInterfaceSpec BOOL2BOOL::scm_stFBInterfaceSpec = { void BOOL2BOOL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = IN(); + st_OUT() = st_IN(); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/convert/BOOL2BOOL.h b/src/modules/convert/BOOL2BOOL.h index ef4bd7b41..f900a473c 100644 --- a/src/modules/convert/BOOL2BOOL.h +++ b/src/modules/convert/BOOL2BOOL.h @@ -38,11 +38,11 @@ class BOOL2BOOL: public CFunctionBlock{ virtual void executeEvent(int pa_nEIID); -CIEC_BOOL& IN() { +CIEC_BOOL& st_IN() { return *static_cast(getDI(0)); } -CIEC_BOOL& OUT() { +CIEC_BOOL& st_OUT() { return *static_cast(getDO(0)); } diff --git a/src/modules/convert/BYTE2BYTE.cpp b/src/modules/convert/BYTE2BYTE.cpp index d3c1af3cb..4f30c711b 100644 --- a/src/modules/convert/BYTE2BYTE.cpp +++ b/src/modules/convert/BYTE2BYTE.cpp @@ -50,7 +50,7 @@ const SFBInterfaceSpec BYTE2BYTE::scm_stFBInterfaceSpec = { void BYTE2BYTE::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = IN(); + st_OUT() = st_IN(); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/convert/BYTE2BYTE.h b/src/modules/convert/BYTE2BYTE.h index 9c83bd572..afcdeb2ad 100644 --- a/src/modules/convert/BYTE2BYTE.h +++ b/src/modules/convert/BYTE2BYTE.h @@ -38,11 +38,11 @@ class BYTE2BYTE: public CFunctionBlock{ virtual void executeEvent(int pa_nEIID); - CIEC_BYTE& IN() { + CIEC_BYTE& st_IN() { return *static_cast(getDI(0)); } - CIEC_BYTE& OUT() { + CIEC_BYTE& st_OUT() { return *static_cast(getDO(0)); } diff --git a/src/modules/convert/DINT2DINT.cpp b/src/modules/convert/DINT2DINT.cpp index 803a5c3e0..996039610 100644 --- a/src/modules/convert/DINT2DINT.cpp +++ b/src/modules/convert/DINT2DINT.cpp @@ -50,7 +50,7 @@ const SFBInterfaceSpec DINT2DINT::scm_stFBInterfaceSpec = { void DINT2DINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = IN(); + st_OUT() = st_IN(); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/convert/DINT2DINT.h b/src/modules/convert/DINT2DINT.h index 306d83fa7..02addda62 100644 --- a/src/modules/convert/DINT2DINT.h +++ b/src/modules/convert/DINT2DINT.h @@ -38,11 +38,11 @@ class DINT2DINT: public CFunctionBlock{ virtual void executeEvent(int pa_nEIID); - CIEC_DINT& IN() { + CIEC_DINT& st_IN() { return *static_cast(getDI(0)); } - CIEC_DINT& OUT() { + CIEC_DINT& st_OUT() { return *static_cast(getDO(0)); } diff --git a/src/modules/convert/DWORD2DWORD.cpp b/src/modules/convert/DWORD2DWORD.cpp index e374aa7c5..cd5574945 100644 --- a/src/modules/convert/DWORD2DWORD.cpp +++ b/src/modules/convert/DWORD2DWORD.cpp @@ -51,7 +51,7 @@ const SFBInterfaceSpec DWORD2DWORD::scm_stFBInterfaceSpec = { void DWORD2DWORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = IN(); + st_OUT() = st_IN(); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/convert/DWORD2DWORD.h b/src/modules/convert/DWORD2DWORD.h index e03ff333f..63e7c80b3 100644 --- a/src/modules/convert/DWORD2DWORD.h +++ b/src/modules/convert/DWORD2DWORD.h @@ -37,11 +37,11 @@ class DWORD2DWORD: public CFunctionBlock{ virtual void executeEvent(int pa_nEIID); - CIEC_DWORD& IN() { + CIEC_DWORD& st_IN() { return *static_cast(getDI(0)); } - CIEC_DWORD& OUT() { + CIEC_DWORD& st_OUT() { return *static_cast(getDO(0)); } diff --git a/src/modules/convert/GEN_STRUCT_DEMUX.cpp b/src/modules/convert/GEN_STRUCT_DEMUX.cpp index a9e5436c6..0e127bc28 100644 --- a/src/modules/convert/GEN_STRUCT_DEMUX.cpp +++ b/src/modules/convert/GEN_STRUCT_DEMUX.cpp @@ -32,8 +32,8 @@ const TForteInt16 GEN_STRUCT_DEMUX::scm_anEOWithIndexes[] = {0}; void GEN_STRUCT_DEMUX::executeEvent(int paEIID) { if(scm_nEventREQID == paEIID) { - CIEC_ANY *members = IN().getMembers(); - for (size_t i = 0; i < IN().getStructSize(); i++){ + CIEC_ANY *members = st_IN().getMembers(); + for (size_t i = 0; i < st_IN().getStructSize(); i++){ getDO(static_cast(i))->setValue(members[i]); } sendOutputEvent(scm_nEventCNFID); diff --git a/src/modules/convert/GEN_STRUCT_DEMUX.h b/src/modules/convert/GEN_STRUCT_DEMUX.h index 4fede76d0..2d0034769 100644 --- a/src/modules/convert/GEN_STRUCT_DEMUX.h +++ b/src/modules/convert/GEN_STRUCT_DEMUX.h @@ -34,7 +34,7 @@ class GEN_STRUCT_DEMUX : public CGenFunctionBlock { void executeEvent(int paEIID); virtual bool createInterfaceSpec(const char *paConfigString, SFBInterfaceSpec &paInterfaceSpec); - CIEC_STRUCT& IN() { + CIEC_STRUCT& st_IN() { return *static_cast(getDI(0)); } diff --git a/src/modules/convert/GEN_STRUCT_MUX.cpp b/src/modules/convert/GEN_STRUCT_MUX.cpp index b63e25e93..97525513b 100644 --- a/src/modules/convert/GEN_STRUCT_MUX.cpp +++ b/src/modules/convert/GEN_STRUCT_MUX.cpp @@ -30,8 +30,8 @@ const TDataIOID GEN_STRUCT_MUX::scm_anEOWith[] = {0, 255}; void GEN_STRUCT_MUX::executeEvent(int paEIID) { if(scm_nEventREQID == paEIID) { - CIEC_ANY *members = OUT().getMembers(); - for (size_t i = 0; i < OUT().getStructSize(); i++){ + CIEC_ANY *members = st_OUT().getMembers(); + for (size_t i = 0; i < st_OUT().getStructSize(); i++){ members[i].setValue(*getDI(static_cast(i))); } sendOutputEvent(scm_nEventCNFID); diff --git a/src/modules/convert/GEN_STRUCT_MUX.h b/src/modules/convert/GEN_STRUCT_MUX.h index 9f616b87b..b0de1ea63 100644 --- a/src/modules/convert/GEN_STRUCT_MUX.h +++ b/src/modules/convert/GEN_STRUCT_MUX.h @@ -34,7 +34,7 @@ class GEN_STRUCT_MUX : public CGenFunctionBlock { void executeEvent(int paEIID); virtual bool createInterfaceSpec(const char *paConfigString, SFBInterfaceSpec &paInterfaceSpec); - CIEC_STRUCT& OUT() { + CIEC_STRUCT& st_OUT() { return *static_cast(getDO(0)); } diff --git a/src/modules/convert/INT2INT.cpp b/src/modules/convert/INT2INT.cpp index c777d9127..edf71b1de 100644 --- a/src/modules/convert/INT2INT.cpp +++ b/src/modules/convert/INT2INT.cpp @@ -50,7 +50,7 @@ const SFBInterfaceSpec INT2INT::scm_stFBInterfaceSpec = { void INT2INT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = IN(); + st_OUT() = st_IN(); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/convert/INT2INT.h b/src/modules/convert/INT2INT.h index 7bebe6f2b..3a03da82d 100644 --- a/src/modules/convert/INT2INT.h +++ b/src/modules/convert/INT2INT.h @@ -37,11 +37,11 @@ class INT2INT: public CFunctionBlock{ virtual void executeEvent(int pa_nEIID); - CIEC_INT& IN() { + CIEC_INT& st_IN() { return *static_cast(getDI(0)); } - CIEC_INT& OUT() { + CIEC_INT& st_OUT() { return *static_cast(getDO(0)); } diff --git a/src/modules/convert/LREAL2LREAL.cpp b/src/modules/convert/LREAL2LREAL.cpp index 9ac6f7f22..3beb6752c 100644 --- a/src/modules/convert/LREAL2LREAL.cpp +++ b/src/modules/convert/LREAL2LREAL.cpp @@ -50,7 +50,7 @@ const SFBInterfaceSpec LREAL2LREAL::scm_stFBInterfaceSpec = { void LREAL2LREAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = IN(); + st_OUT() = st_IN(); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/convert/LREAL2LREAL.h b/src/modules/convert/LREAL2LREAL.h index 76dd8b8ce..73ba34634 100644 --- a/src/modules/convert/LREAL2LREAL.h +++ b/src/modules/convert/LREAL2LREAL.h @@ -37,11 +37,11 @@ class LREAL2LREAL: public CFunctionBlock{ virtual void executeEvent(int pa_nEIID); - CIEC_LREAL& IN() { + CIEC_LREAL& st_IN() { return *static_cast(getDI(0)); } - CIEC_LREAL& OUT() { + CIEC_LREAL& st_OUT() { return *static_cast(getDO(0)); } diff --git a/src/modules/convert/REAL2REAL.cpp b/src/modules/convert/REAL2REAL.cpp index cdd5afd38..451976b4c 100644 --- a/src/modules/convert/REAL2REAL.cpp +++ b/src/modules/convert/REAL2REAL.cpp @@ -50,7 +50,7 @@ const SFBInterfaceSpec REAL2REAL::scm_stFBInterfaceSpec = { void REAL2REAL::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = IN(); + st_OUT() = st_IN(); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/convert/REAL2REAL.h b/src/modules/convert/REAL2REAL.h index eb8659576..9978c5faa 100644 --- a/src/modules/convert/REAL2REAL.h +++ b/src/modules/convert/REAL2REAL.h @@ -37,11 +37,11 @@ class REAL2REAL: public CFunctionBlock{ virtual void executeEvent(int pa_nEIID); - CIEC_REAL& IN() { + CIEC_REAL& st_IN() { return *static_cast(getDI(0)); } - CIEC_REAL& OUT() { + CIEC_REAL& st_OUT() { return *static_cast(getDO(0)); } diff --git a/src/modules/convert/SINT2SINT.cpp b/src/modules/convert/SINT2SINT.cpp index 688a0818c..410acbb82 100644 --- a/src/modules/convert/SINT2SINT.cpp +++ b/src/modules/convert/SINT2SINT.cpp @@ -50,7 +50,7 @@ const SFBInterfaceSpec SINT2SINT::scm_stFBInterfaceSpec = { void SINT2SINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = IN(); + st_OUT() = st_IN(); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/convert/SINT2SINT.h b/src/modules/convert/SINT2SINT.h index b7d43da81..e643285f1 100644 --- a/src/modules/convert/SINT2SINT.h +++ b/src/modules/convert/SINT2SINT.h @@ -37,11 +37,11 @@ class SINT2SINT: public CFunctionBlock{ virtual void executeEvent(int pa_nEIID); - CIEC_SINT& IN() { + CIEC_SINT& st_IN() { return *static_cast(getDI(0)); } - CIEC_SINT& OUT() { + CIEC_SINT& st_OUT() { return *static_cast(getDO(0)); } diff --git a/src/modules/convert/STRING2STRING.cpp b/src/modules/convert/STRING2STRING.cpp index a216da606..1edd95faf 100644 --- a/src/modules/convert/STRING2STRING.cpp +++ b/src/modules/convert/STRING2STRING.cpp @@ -50,7 +50,7 @@ const SFBInterfaceSpec STRING2STRING::scm_stFBInterfaceSpec = { void STRING2STRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = IN(); + st_OUT() = st_IN(); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/convert/STRING2STRING.h b/src/modules/convert/STRING2STRING.h index 1b7fab3a3..1089efce1 100644 --- a/src/modules/convert/STRING2STRING.h +++ b/src/modules/convert/STRING2STRING.h @@ -37,11 +37,11 @@ class STRING2STRING: public CFunctionBlock{ virtual void executeEvent(int pa_nEIID); - CIEC_STRING& IN() { + CIEC_STRING& st_IN() { return *static_cast(getDI(0)); } - CIEC_STRING& OUT() { + CIEC_STRING& st_OUT() { return *static_cast(getDO(0)); } diff --git a/src/modules/convert/TIME2TIME.cpp b/src/modules/convert/TIME2TIME.cpp index a2d27e3cf..d7a035dc0 100644 --- a/src/modules/convert/TIME2TIME.cpp +++ b/src/modules/convert/TIME2TIME.cpp @@ -47,7 +47,7 @@ const SFBInterfaceSpec TIME2TIME::scm_stFBInterfaceSpec = { void TIME2TIME::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = IN(); + st_OUT() = st_IN(); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/convert/TIME2TIME.h b/src/modules/convert/TIME2TIME.h index 1efa13826..3a2d7ef89 100644 --- a/src/modules/convert/TIME2TIME.h +++ b/src/modules/convert/TIME2TIME.h @@ -37,11 +37,11 @@ class TIME2TIME: public CFunctionBlock{ virtual void executeEvent(int pa_nEIID); - CIEC_TIME& IN() { + CIEC_TIME& st_IN() { return *static_cast(getDI(0)); } - CIEC_TIME& OUT() { + CIEC_TIME& st_OUT() { return *static_cast(getDO(0)); } diff --git a/src/modules/convert/UDINT2UDINT.cpp b/src/modules/convert/UDINT2UDINT.cpp index df6b6a5ac..7f935bd4c 100644 --- a/src/modules/convert/UDINT2UDINT.cpp +++ b/src/modules/convert/UDINT2UDINT.cpp @@ -50,7 +50,7 @@ const SFBInterfaceSpec UDINT2UDINT::scm_stFBInterfaceSpec = { void UDINT2UDINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = IN(); + st_OUT() = st_IN(); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/convert/UDINT2UDINT.h b/src/modules/convert/UDINT2UDINT.h index 9a595cb6b..e6576bf3d 100644 --- a/src/modules/convert/UDINT2UDINT.h +++ b/src/modules/convert/UDINT2UDINT.h @@ -37,11 +37,11 @@ class UDINT2UDINT: public CFunctionBlock{ virtual void executeEvent(int pa_nEIID); - CIEC_UDINT& IN() { + CIEC_UDINT& st_IN() { return *static_cast(getDI(0)); } - CIEC_UDINT& OUT() { + CIEC_UDINT& st_OUT() { return *static_cast(getDO(0)); } diff --git a/src/modules/convert/UINT2UINT.cpp b/src/modules/convert/UINT2UINT.cpp index d98710766..31bade34d 100644 --- a/src/modules/convert/UINT2UINT.cpp +++ b/src/modules/convert/UINT2UINT.cpp @@ -50,7 +50,7 @@ const SFBInterfaceSpec UINT2UINT::scm_stFBInterfaceSpec = { void UINT2UINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = IN(); + st_OUT() = st_IN(); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/convert/UINT2UINT.h b/src/modules/convert/UINT2UINT.h index 329b0a743..497bc833b 100644 --- a/src/modules/convert/UINT2UINT.h +++ b/src/modules/convert/UINT2UINT.h @@ -37,11 +37,11 @@ class UINT2UINT: public CFunctionBlock{ virtual void executeEvent(int pa_nEIID); - CIEC_UINT& IN() { + CIEC_UINT& st_IN() { return *static_cast(getDI(0)); } - CIEC_UINT& OUT() { + CIEC_UINT& st_OUT() { return *static_cast(getDO(0)); } diff --git a/src/modules/convert/USINT2USINT.cpp b/src/modules/convert/USINT2USINT.cpp index 33ebe7f68..07b7ccc5f 100644 --- a/src/modules/convert/USINT2USINT.cpp +++ b/src/modules/convert/USINT2USINT.cpp @@ -50,7 +50,7 @@ const SFBInterfaceSpec USINT2USINT::scm_stFBInterfaceSpec = { void USINT2USINT::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = IN(); + st_OUT() = st_IN(); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/convert/USINT2USINT.h b/src/modules/convert/USINT2USINT.h index c07283ba0..860e254f1 100644 --- a/src/modules/convert/USINT2USINT.h +++ b/src/modules/convert/USINT2USINT.h @@ -37,11 +37,11 @@ class USINT2USINT: public CFunctionBlock{ virtual void executeEvent(int pa_nEIID); - CIEC_USINT& IN() { + CIEC_USINT& st_IN() { return *static_cast(getDI(0)); } - CIEC_USINT& OUT() { + CIEC_USINT& st_OUT() { return *static_cast(getDO(0)); } diff --git a/src/modules/convert/WORD2WORD.cpp b/src/modules/convert/WORD2WORD.cpp index ea3d19cfb..dc6d216fe 100644 --- a/src/modules/convert/WORD2WORD.cpp +++ b/src/modules/convert/WORD2WORD.cpp @@ -50,7 +50,7 @@ const SFBInterfaceSpec WORD2WORD::scm_stFBInterfaceSpec = { void WORD2WORD::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = IN(); + st_OUT() = st_IN(); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/convert/WORD2WORD.h b/src/modules/convert/WORD2WORD.h index 0d5983ea0..6131e4797 100644 --- a/src/modules/convert/WORD2WORD.h +++ b/src/modules/convert/WORD2WORD.h @@ -37,11 +37,11 @@ class WORD2WORD: public CFunctionBlock{ virtual void executeEvent(int pa_nEIID); - CIEC_WORD& IN() { + CIEC_WORD& st_IN() { return *static_cast(getDI(0)); } - CIEC_WORD& OUT() { + CIEC_WORD& st_OUT() { return *static_cast(getDO(0)); } diff --git a/src/modules/convert/WSTRING2WSTRING.cpp b/src/modules/convert/WSTRING2WSTRING.cpp index d2ff968d4..1f80736f2 100644 --- a/src/modules/convert/WSTRING2WSTRING.cpp +++ b/src/modules/convert/WSTRING2WSTRING.cpp @@ -50,7 +50,7 @@ const SFBInterfaceSpec WSTRING2WSTRING::scm_stFBInterfaceSpec = { void WSTRING2WSTRING::executeEvent(int pa_nEIID){ if(scm_nEventREQID == pa_nEIID){ - OUT() = IN(); + st_OUT() = st_IN(); sendOutputEvent(scm_nEventCNFID); } } diff --git a/src/modules/convert/WSTRING2WSTRING.h b/src/modules/convert/WSTRING2WSTRING.h index fff1c7ecd..790a2704e 100644 --- a/src/modules/convert/WSTRING2WSTRING.h +++ b/src/modules/convert/WSTRING2WSTRING.h @@ -37,11 +37,11 @@ class WSTRING2WSTRING: public CFunctionBlock{ virtual void executeEvent(int pa_nEIID); - CIEC_WSTRING& IN() { + CIEC_WSTRING& st_IN() { return *static_cast(getDI(0)); } - CIEC_WSTRING& OUT() { + CIEC_WSTRING& st_OUT() { return *static_cast(getDO(0)); } diff --git a/src/modules/utils/GET_AT_INDEX.cpp b/src/modules/utils/GET_AT_INDEX.cpp index df97c3aff..76588d7eb 100644 --- a/src/modules/utils/GET_AT_INDEX.cpp +++ b/src/modules/utils/GET_AT_INDEX.cpp @@ -48,11 +48,11 @@ void FORTE_GET_AT_INDEX::executeEvent(int pa_nEIID){ if(CIEC_ANY::e_ARRAY == IN_ARRAY().getDataTypeID()){ CIEC_ARRAY &rInArray = static_cast(IN_ARRAY()); //check if data types match - if(rInArray.getElementDataTypeID() == OUT().getDataTypeID()){ + if(rInArray.getElementDataTypeID() == st_OUT().getDataTypeID()){ //now check array length of input array if(INDEX() < rInArray.size()){ //update the output value - OUT().setValue(*rInArray[INDEX()]); + st_OUT().setValue(*rInArray[INDEX()]); QO() = true; } else{ diff --git a/src/modules/utils/GET_AT_INDEX.h b/src/modules/utils/GET_AT_INDEX.h index ba6ceccb1..c4401eecc 100644 --- a/src/modules/utils/GET_AT_INDEX.h +++ b/src/modules/utils/GET_AT_INDEX.h @@ -35,7 +35,7 @@ class FORTE_GET_AT_INDEX: public CFunctionBlock{ return *static_cast(getDO(0)); }; - CIEC_ANY &OUT() { + CIEC_ANY &st_OUT() { return *static_cast(getDO(1)); }; diff --git a/src/modules/utils/OUT_ANY_CONSOLE.cpp b/src/modules/utils/OUT_ANY_CONSOLE.cpp index b7e86e0bd..4ce297aeb 100644 --- a/src/modules/utils/OUT_ANY_CONSOLE.cpp +++ b/src/modules/utils/OUT_ANY_CONSOLE.cpp @@ -60,18 +60,18 @@ void FORTE_OUT_ANY_CONSOLE::executeEvent(int pa_nEIID) { char strbuf1[scm_maxStringBufSize]; LABEL().toString(strbuf1, sizeof(strbuf1)); - if(IN().getDataTypeID() == CIEC_ANY::e_STRING || IN().getDataTypeID() == CIEC_ANY::e_WSTRING){ + if(st_IN().getDataTypeID() == CIEC_ANY::e_STRING || st_IN().getDataTypeID() == CIEC_ANY::e_WSTRING){ //obtain length of string value - nStringLength = (static_cast(&IN()))->length(); + nStringLength = (static_cast(&st_IN()))->length(); //assign value - sOutput.assign((static_cast(&IN()))->getValue(), nStringLength); + sOutput.assign((static_cast(&st_IN()))->getValue(), nStringLength); } else{ //values other than strings //for arrays - if(IN().getDataTypeID() == CIEC_ANY::e_ARRAY){ + if(st_IN().getDataTypeID() == CIEC_ANY::e_ARRAY){ //get number of array elements - TForteUInt16 nArrayElements = (static_cast(&IN()))->size(); + TForteUInt16 nArrayElements = (static_cast(&st_IN()))->size(); //number of required bytes (including brackets '[' ']' and ',' separators nRequiredBytes = static_cast(nArrayElements * scm_maxStringBufSize + nArrayElements + 1); } @@ -82,7 +82,7 @@ void FORTE_OUT_ANY_CONSOLE::executeEvent(int pa_nEIID) { sOutput.reserve(nRequiredBytes); //write StringValue - nUsedBytes = static_cast(IN().toString(sOutput.getValue(), nRequiredBytes)); + nUsedBytes = static_cast(st_IN().toString(sOutput.getValue(), nRequiredBytes)); //maintain the state of the output data value string sOutput.assign(sOutput.getValue(), nUsedBytes); } diff --git a/src/modules/utils/OUT_ANY_CONSOLE.h b/src/modules/utils/OUT_ANY_CONSOLE.h index 0a4a68795..a24193c4f 100644 --- a/src/modules/utils/OUT_ANY_CONSOLE.h +++ b/src/modules/utils/OUT_ANY_CONSOLE.h @@ -31,7 +31,7 @@ class FORTE_OUT_ANY_CONSOLE: public CFunctionBlock { } ; - CIEC_ANY &IN() { + CIEC_ANY &st_IN() { return *static_cast(getDI(2)); } ; diff --git a/src/stdfblib/io/IB.h b/src/stdfblib/io/IB.h index fddcf2b88..1ccc6c4ef 100644 --- a/src/stdfblib/io/IB.h +++ b/src/stdfblib/io/IB.h @@ -15,16 +15,6 @@ #include -#ifdef IN -// cppcheck-suppress ConfigurationNotChecked -#undef IN -#endif - -#ifdef OUT -// cppcheck-suppress ConfigurationNotChecked -#undef OUT -#endif - class FORTE_IB: public CProcessInterface{ DECLARE_FIRMWARE_FB(FORTE_IB) @@ -49,7 +39,7 @@ class FORTE_IB: public CProcessInterface{ return *static_cast(getDO(1)); }; - CIEC_BYTE &IN() { + CIEC_BYTE &st_IN() { return *static_cast(getDO(2)); }; diff --git a/src/stdfblib/io/ID.h b/src/stdfblib/io/ID.h index 2be549b28..69bea0161 100644 --- a/src/stdfblib/io/ID.h +++ b/src/stdfblib/io/ID.h @@ -16,14 +16,6 @@ #include -#ifdef IN -#undef IN -#endif - -#ifdef OUT -#undef OUT -#endif - /*! /brief generic class for IW function blocks providing access to one word physical input * * In order that this FB can be used implementations need to provide a class CProcessInterface @@ -69,7 +61,7 @@ class FORTE_ID: public CProcessInterface{ return *static_cast(getDO(1)); }; - CIEC_DWORD &IN() { + CIEC_DWORD &st_IN() { return *static_cast(getDO(2)); }; diff --git a/src/stdfblib/io/IL.h b/src/stdfblib/io/IL.h index 28bd44a9b..1be4bc747 100644 --- a/src/stdfblib/io/IL.h +++ b/src/stdfblib/io/IL.h @@ -15,14 +15,6 @@ #include -#ifdef IN -#undef IN -#endif - -#ifdef OUT -#undef OUT -#endif - class FORTE_IL: public CProcessInterface{ DECLARE_FIRMWARE_FB(FORTE_IL) @@ -47,7 +39,7 @@ class FORTE_IL: public CProcessInterface{ return *static_cast(getDO(1)); }; - CIEC_LWORD &IN() { + CIEC_LWORD &st_IN() { return *static_cast(getDO(2)); }; diff --git a/src/stdfblib/io/IW.h b/src/stdfblib/io/IW.h index 97392fea1..847cbeda7 100644 --- a/src/stdfblib/io/IW.h +++ b/src/stdfblib/io/IW.h @@ -15,13 +15,6 @@ #include -#ifdef IN -#undef IN -#endif - -#ifdef OUT -#undef OUT -#endif /*! /brief generic class for IW function blocks providing access to one word physical input * @@ -68,7 +61,7 @@ class FORTE_IW: public CProcessInterface{ return *static_cast(getDO(1)); }; - CIEC_WORD &IN() { + CIEC_WORD &st_IN() { return *static_cast(getDO(2)); }; diff --git a/src/stdfblib/io/IX.h b/src/stdfblib/io/IX.h index e61b1ab50..8866d4fec 100644 --- a/src/stdfblib/io/IX.h +++ b/src/stdfblib/io/IX.h @@ -14,13 +14,6 @@ #include -#ifdef IN -#undef IN -#endif - -#ifdef OUT -#undef OUT -#endif /*! /brief generic class for IX function blocks providing access to one boolean physical input * @@ -67,7 +60,7 @@ class FORTE_IX: public CProcessInterface{ return *static_cast(getDO(1)); }; - CIEC_BOOL &IN() { + CIEC_BOOL &st_IN() { return *static_cast(getDO(2)); }; diff --git a/src/stdfblib/io/QB.h b/src/stdfblib/io/QB.h index a065444b4..bc723fd8c 100644 --- a/src/stdfblib/io/QB.h +++ b/src/stdfblib/io/QB.h @@ -15,13 +15,6 @@ #include -#ifdef IN -#undef IN -#endif - -#ifdef OUT -#undef OUT -#endif class FORTE_QB: public CProcessInterface{ DECLARE_FIRMWARE_FB(FORTE_QB) @@ -37,7 +30,7 @@ class FORTE_QB: public CProcessInterface{ return *static_cast(getDI(1)); }; - CIEC_BYTE &OUT() { + CIEC_BYTE &st_OUT() { return *static_cast(getDI(2)); }; diff --git a/src/stdfblib/io/QD.h b/src/stdfblib/io/QD.h index 101779c0e..b0766b51c 100644 --- a/src/stdfblib/io/QD.h +++ b/src/stdfblib/io/QD.h @@ -16,13 +16,6 @@ #include -#ifdef IN -#undef IN -#endif - -#ifdef OUT -#undef OUT -#endif /*! /brief generic class for QW function blocks providing access to one word physical output * @@ -59,7 +52,7 @@ class FORTE_QD: public CProcessInterface{ return *static_cast(getDI(1)); }; - CIEC_DWORD &OUT() { + CIEC_DWORD &st_OUT() { return *static_cast(getDI(2)); }; diff --git a/src/stdfblib/io/QL.h b/src/stdfblib/io/QL.h index b800823df..9e11de163 100644 --- a/src/stdfblib/io/QL.h +++ b/src/stdfblib/io/QL.h @@ -15,13 +15,6 @@ #include -#ifdef IN -#undef IN -#endif - -#ifdef OUT -#undef OUT -#endif class FORTE_QL: public CProcessInterface{ DECLARE_FIRMWARE_FB(FORTE_QL) @@ -37,7 +30,7 @@ class FORTE_QL: public CProcessInterface{ return *static_cast(getDI(1)); }; - CIEC_LWORD &OUT() { + CIEC_LWORD &st_OUT() { return *static_cast(getDI(2)); }; diff --git a/src/stdfblib/io/QW.h b/src/stdfblib/io/QW.h index 602b83fbc..4fc55f046 100644 --- a/src/stdfblib/io/QW.h +++ b/src/stdfblib/io/QW.h @@ -15,13 +15,6 @@ #include -#ifdef IN -#undef IN -#endif - -#ifdef OUT -#undef OUT -#endif /*! /brief generic class for QW function blocks providing access to one word physical output * @@ -58,7 +51,7 @@ class FORTE_QW: public CProcessInterface{ return *static_cast(getDI(1)); }; - CIEC_WORD &OUT() { + CIEC_WORD &st_OUT() { return *static_cast(getDI(2)); }; diff --git a/src/stdfblib/io/QX.h b/src/stdfblib/io/QX.h index 1191005e3..9b548b7e7 100644 --- a/src/stdfblib/io/QX.h +++ b/src/stdfblib/io/QX.h @@ -14,13 +14,6 @@ #include -#ifdef IN -#undef IN -#endif - -#ifdef OUT -#undef OUT -#endif /*! /brief generic class for QX function blocks providing access to one boolean physical output * @@ -57,7 +50,7 @@ class FORTE_QX: public CProcessInterface{ return *static_cast(getDI(1)); }; - CIEC_BOOL &OUT() { + CIEC_BOOL &st_OUT() { return *static_cast(getDI(2)); };