From c36050f455572d8dd866c2f25ff2894a12224580 Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Mon, 23 Jul 2018 17:38:18 +0200 Subject: [PATCH] - renamed iec61850_client_example3 to iec61850_client_example_control - removed outcommented code --- examples/CMakeLists.txt | 2 +- .../iec61850_client_example3/CMakeLists.txt | 17 ----------------- .../CMakeLists.txt | 17 +++++++++++++++++ .../Makefile | 4 ++-- .../client_example_control.c} | 0 src/iec61850/server/mms_mapping/control.c | 6 ------ 6 files changed, 20 insertions(+), 26 deletions(-) delete mode 100644 examples/iec61850_client_example3/CMakeLists.txt create mode 100644 examples/iec61850_client_example_control/CMakeLists.txt rename examples/{iec61850_client_example3 => iec61850_client_example_control}/Makefile (81%) rename examples/{iec61850_client_example3/client_example3.c => iec61850_client_example_control/client_example_control.c} (100%) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index abd77fb7..153ee606 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -15,7 +15,7 @@ add_subdirectory(server_example_substitution) add_subdirectory(iec61850_client_example1) add_subdirectory(iec61850_client_example2) -add_subdirectory(iec61850_client_example3) +add_subdirectory(iec61850_client_example_control) add_subdirectory(iec61850_client_example4) add_subdirectory(iec61850_client_example5) add_subdirectory(iec61850_client_example_reporting) diff --git a/examples/iec61850_client_example3/CMakeLists.txt b/examples/iec61850_client_example3/CMakeLists.txt deleted file mode 100644 index 37b61ff8..00000000 --- a/examples/iec61850_client_example3/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ - -set(iec61850_client_example3_SRCS - client_example3.c -) - -IF(WIN32) -set_source_files_properties(${iec61850_client_example3_SRCS} - PROPERTIES LANGUAGE CXX) -ENDIF(WIN32) - -add_executable(iec61850_client_example3 - ${iec61850_client_example3_SRCS} -) - -target_link_libraries(iec61850_client_example3 - iec61850 -) diff --git a/examples/iec61850_client_example_control/CMakeLists.txt b/examples/iec61850_client_example_control/CMakeLists.txt new file mode 100644 index 00000000..bb612b44 --- /dev/null +++ b/examples/iec61850_client_example_control/CMakeLists.txt @@ -0,0 +1,17 @@ + +set(iec61850_client_example_control_SRCS + client_example_control.c +) + +IF(WIN32) +set_source_files_properties(${iec61850_client_example_control_SRCS} + PROPERTIES LANGUAGE CXX) +ENDIF(WIN32) + +add_executable(client_example_control + ${iec61850_client_example_control_SRCS} +) + +target_link_libraries(client_example_control + iec61850 +) diff --git a/examples/iec61850_client_example3/Makefile b/examples/iec61850_client_example_control/Makefile similarity index 81% rename from examples/iec61850_client_example3/Makefile rename to examples/iec61850_client_example_control/Makefile index 138d4970..1bb8cd1c 100644 --- a/examples/iec61850_client_example3/Makefile +++ b/examples/iec61850_client_example_control/Makefile @@ -1,7 +1,7 @@ LIBIEC_HOME=../.. -PROJECT_BINARY_NAME = client_example3 -PROJECT_SOURCES = client_example3.c +PROJECT_BINARY_NAME = client_example_control +PROJECT_SOURCES = client_example_control.c include $(LIBIEC_HOME)/make/target_system.mk include $(LIBIEC_HOME)/make/stack_includes.mk diff --git a/examples/iec61850_client_example3/client_example3.c b/examples/iec61850_client_example_control/client_example_control.c similarity index 100% rename from examples/iec61850_client_example3/client_example3.c rename to examples/iec61850_client_example_control/client_example_control.c diff --git a/src/iec61850/server/mms_mapping/control.c b/src/iec61850/server/mms_mapping/control.c index 71b3e5ac..b761e3ce 100644 --- a/src/iec61850/server/mms_mapping/control.c +++ b/src/iec61850/server/mms_mapping/control.c @@ -1494,12 +1494,6 @@ Control_writeAccessControlObject(MmsMapping* self, MmsDomain* domain, char* vari setState(controlObject, STATE_WAIT_FOR_EXECUTION); initiateControlTask(controlObject); - -#if (CONFIG_MMS_THREADLESS_STACK == 1) - //TODO call this in single threaded version to increase response time!? - //executeControlTask(controlObject); -#endif - } else { indication = (MmsDataAccessError) checkResult;